From afbc6a6d68513c6d3e40108f37e580c510bfcf9a Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期三, 23 十月 2024 14:59:07 +0800
Subject: [PATCH] 1. 存货档案、计量单位、生产排单修改

---
 src/views/materialManager/unitList.vue      | 1383 +++++-----
 src/views/materialManager/inventoryList.vue | 3431 ++++++++++++------------
 vue.config.js                               |    2 
 src/views/workOrder/produceOrderList.vue    | 2595 +++++++++---------
 src/views/materialManager/unitListBack.vue  |  693 +++++
 5 files changed, 4,416 insertions(+), 3,688 deletions(-)

diff --git a/src/views/materialManager/inventoryList.vue b/src/views/materialManager/inventoryList.vue
index 0762d0a..6b81cd3 100644
--- a/src/views/materialManager/inventoryList.vue
+++ b/src/views/materialManager/inventoryList.vue
@@ -1,1706 +1,1725 @@
-<template>
-  <div>
-    <div class="body" :style="{height:mainHeight+'px'}">
-
-      <div style="display: flex">
-        <div style="width: 300px;margin: 10px 10px 0  0;background:#fff">
-
-          <div style="margin: 20px 10px 0 10px;display: flex;justify-content: space-between;">
-            <div style="display: flex;">
-              <div
-                style="width: 5px;height: 100%;border-radius: 5px;"
-                :style="{background:$store.state.settings.theme}"
-              />
-              <div style="margin-left: 8px;">瀛樿揣妗f</div>
-            </div>
-
-            <div style="margin-right:10px">
-              <el-tooltip v-del-tab-index class="item" effect="dark" content="鏂板" placement="top">
-                <i class="el-icon-plus" style="cursor: pointer;color: #999" @click="treeAddClick('add')" />
-              </el-tooltip>
-            </div>
-
-          </div>
-
-          <el-tree
-            ref="treeLeftRef"
-            style="padding: 10px;overflow: auto"
-            :style="{height:(tableHeight+222)+'px'}"
-            :data="treeLeft"
-            node-key="code"
-            highlight-current
-            :props="defaultPropsLeft"
-            :default-expand-all="true"
-            :expand-on-click-node="false"
-            @node-click="getTMaterielData"
-          >
-            <span slot-scope="{ node, data }" class="custom-tree-node">
-              <span v-if="!data.isEdit" class="ellipsis" style="width:150px;">{{ data.name }}</span>
-              <span v-if="!data.isEdit">
-                <el-tooltip v-del-tab-index class="item" effect="dark" content="缂栬緫" placement="top">
-                  <i
-                    v-if="data.code!=='-1'"
-                    class="el-icon-edit"
-                    style="margin-right:10px;color: #999"
-                    @click.stop="treeEditClick(node,data,'edit')"
-                  />
-                </el-tooltip>
-                <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
-                  <i
-                    v-if="data.code!=='-1'"
-                    class="el-icon-delete"
-                    style="margin-right: 4px;color: #999"
-                    @click.stop="treeDeleteClick(node,data)"
-                  />
-                </el-tooltip>
-              </span>
-            </span>
-          </el-tree>
-        </div>
-
-        <div
-          style=" width:calc(100% - 300px);"
-        >
-          <div class="bodyTopButtonGroup" style="justify-content: space-between">
-            <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
-            <div style="display: flex">
-              <el-button
-                v-waves
-                type="success"
-                icon="el-icon-download"
-                @click="$router.push('./../systemSetting/dataImport?fileCode=8')"
-              >瀵煎叆
-              </el-button>
-              <el-button v-waves icon="el-icon-refresh-right" @click="syncERP">鍚屾瀛樿揣妗f</el-button>
-            </div>
-          </div>
-
-          <div class="bodyTopFormGroup">
-            <el-form
-              ref="form"
-              :model="form"
-              label-width="100px"
-              inline
-              style="display: flex;"
-            >
-              <div class="elForm">
-                <el-form-item label="瀛樿揣缂栫爜" style=" display: flex;">
-                  <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
-                </el-form-item>
-                <el-form-item label="瀛樿揣鍚嶇О" style=" display: flex;">
-                  <el-input v-model="form.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
-                </el-form-item>
-                <el-form-item label="瀛樿揣瑙勬牸" style=" display: flex;">
-                  <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />
-                </el-form-item>
-                <!--                <el-form-item label="鐢ㄦ埛缂栫爜" style=" display: flex;">-->
-                <!--                  <el-input v-model="form.usercode" placeholder="璇疯緭鍏�" style="width: 200px" />-->
-                <!--                </el-form-item>-->
-                <!--                <el-form-item v-show="isExpandForm" label="鐢ㄦ埛鍚嶇О" style=" display: flex;">-->
-                <!--                  <el-input v-model="form.username" placeholder="璇疯緭鍏�" style="width: 200px" />-->
-                <!--                </el-form-item>-->
-                <!--                <el-form-item v-show="isExpandForm" label="鐢ㄦ埛缂栫爜" style=" display: flex;">-->
-                <!--                  <el-input v-model="form.usercode" placeholder="璇疯緭鍏�" style="width: 200px" />-->
-                <!--                </el-form-item>-->
-                <!--                <el-form-item v-show="isExpandForm" label="鐢ㄦ埛鍚嶇О" style=" display: flex;">-->
-                <!--                  <el-input v-model="form.username" placeholder="璇疯緭鍏�" style="width: 200px" />-->
-                <!--                </el-form-item>-->
-                <!--                <el-form-item v-show="isExpandForm" label="鐢ㄦ埛缂栫爜" style=" display: flex;">-->
-                <!--                  <el-input v-model="form.usercode" placeholder="璇疯緭鍏�" style="width: 200px" />-->
-                <!--                </el-form-item>-->
-                <!--                <el-form-item v-show="isExpandForm" label="鐢ㄦ埛鍚嶇О" style=" display: flex;">-->
-                <!--                  <el-input v-model="form.username" placeholder="璇疯緭鍏�" style="width: 200px" />-->
-                <!--                </el-form-item>-->
-              </div>
-              <div
-                class="bodySearchReset"
-                :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
-              >
-                <el-button
-                  v-waves
-                  type="primary"
-                  icon="el-icon-search"
-                  @click="getTMaterielData($refs.treeLeftRef.getCurrentNode())"
-                >鏌ヨ
-                </el-button>
-                <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
-              </div>
-            </el-form>
-            <div
-              class="bodyTopFormExpand"
-              style="height: 5px;"
-            >
-              <!--              <svg-icon-->
-              <!--                v-show="mouseHoverType==='mouseout'"-->
-              <!--                style="cursor: pointer"-->
-              <!--                :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"-->
-              <!--                @mouseenter="mouseHoverType=$event.type"-->
-              <!--              />-->
-              <!--              <svg-icon-->
-              <!--                v-show="mouseHoverType==='mouseenter'"-->
-              <!--                style="cursor: pointer"-->
-              <!--                :icon-class="!isExpandForm?'doubleDown':'doubleUp'"-->
-              <!--                @click="isExpandForm=!isExpandForm"-->
-              <!--                @mouseout="mouseHoverType=$event.type"-->
-              <!--              />-->
-            </div>
-          </div>
-
-          <div class="elTableDiv">
-            <el-table
-              ref="tableDataRef"
-              class="tableFixed"
-              :data="tableData"
-              :height="isExpandForm?tableHeight:(tableHeight+80)+'px'"
-              border
-              row-class-name="custom-row"
-              :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+80)+'px',}"
-              highlight-current-row
-              :header-cell-style="this.$headerCellStyle"
-              :cell-style="this.$cellStyle"
-              @sort-change="sortChange"
-            >
-              <!--            prop="RowNum"-->
-              <el-table-column
-                prop="rowNum"
-                width="50"
-                fixed
-                label="搴忓彿"
-              />
-              <el-table-column
-                prop="partcode"
-                label="瀛樿揣缂栫爜"
-                sortable="custom"
-                width="110"
-              />
-              <el-table-column
-                prop="partname"
-                label="瀛樿揣鍚嶇О"
-                sortable="custom"
-                show-tooltip-when-overflow
-                min-width="200"
-              />
-              <el-table-column
-                prop="partspec"
-                label="瑙勬牸鍨嬪彿"
-                width="110"
-                sortable="custom"
-              >
-                <template slot-scope="{row}">
-                  {{ row.partspec ? row.partspec : '/' }}
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="idinventoryclassname"
-                label="鎵�灞炵被鍒�"
-                sortable="custom"
-                width="110"
-              />
-              <el-table-column
-                label="璁¢噺鍗曚綅"
-                width="110"
-                sortable="custom"
-              >
-                <template slot-scope="{row}">
-                  {{ row.isSingleUnit === '0' ? row.idunitgroupname : row.idunitname }}
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="status"
-                label="瀛樿揣鐘舵��"
-                width="110"
-                sortable="custom"
-              >
-                <template slot-scope="{row}">
-                  <el-tag v-if="row.status==='0'" size="small" type="success">姝e父</el-tag>
-                  <el-tag v-if="row.status==='1'" size="small" type="danger">鍋滅敤</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="瀛樿揣灞炴��"
-                sortable="custom"
-                min-width="220"
-              >
-                <template slot-scope="{row}">
-                  {{ row.isPurchase === '1' ? '澶栬喘' : '' }}
-                  {{ row.isSale === '1' ? '閿�鍞�' : '' }}
-                  {{ row.isMadeSelf === '1' ? '鑷埗' : '' }}
-                  {{ row.isMaterial === '1' ? '鐢熶骇娑堣��' : '' }}
-                  {{ row.isMadeRequest === '1' ? '濮斿' : '' }}
-                </template>
-              </el-table-column>
-
-              <el-table-column
-                label="宸ヨ壓"
-                prop=""
-
-                width="110"
-              >
-                <template slot-scope="{row}">
-
-                  <!--                  <i-->
-                  <!--                    v-if="row.is_retdproc==='Y'"-->
-                  <!--                    :style="{color:$store.state.settings.theme}"-->
-                  <!--                    class="el-icon-share"-->
-                  <!--                    style="cursor: pointer"-->
-                  <!--                    @click="routeClick(row)"-->
-                  <!--                  />-->
-
-                  <i
-                    :style="{color:row.is_retdproc==='Y'?$store.state.settings.theme:`rgb(180 ,181, 185)`,cursor: 'pointer'}"
-                    class="el-icon-share"
-                    @click="mesSetting.route?routeClick(row):routeClick2(row)"
-                  />
-                </template>
-              </el-table-column>
-
-              <!--              <el-table-column-->
-              <!--                label="鏁版嵁鏉ユ簮"-->
-              <!--                prop="data_sources"-->
-              <!--                sortable="custom"-->
-              <!--                width="110"-->
-              <!--              />-->
-              <el-table-column
-                label="鍒涘缓浜哄憳"
-                prop="lm_user"
-                sortable="custom"
-                width="110"
-              />
-              <el-table-column
-                label="鍒涘缓鏃堕棿"
-                prop="lm_date"
-                sortable="custom"
-                width="160"
-              />
-
-              <el-table-column
-                label="鎿嶄綔"
-                width="120"
-                fixed="right"
-              >
-                <template slot-scope="{row}">
-                  <div class="operationClass">
-                    <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
-                      <i
-                        class="el-icon-edit-outline"
-                        :style="{color:$store.state.settings.theme}"
-                        @click="edit('edit',row)"
-                      />
-                    </el-tooltip>
-                    <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
-                      <i
-                        class="el-icon-delete"
-                        :style="{color:$store.state.settings.theme}"
-                        @click="del(row)"
-                      />
-                    </el-tooltip>
-                  </div>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-
-          <!--鍒嗛〉-->
-          <pagination
-            :total="total"
-            :page.sync="form.page"
-            :limit.sync="form.rows"
-            align="right"
-            layout="total,prev, pager, next,sizes,jumper"
-            popper-class="select_bottom"
-            @pagination="getTMaterielData($refs.treeLeftRef.getCurrentNode())"
-          />
-
-        </div>
-      </div>
-    </div>
-
-    <!--    瀛樿揣绫诲埆鏂板淇敼-->
-    <el-dialog
-      v-el-drag-dialog
-      :title="operation==='add'?'鏂板':'缂栬緫'"
-      :visible.sync="dialogClassVisible"
-      width="800px"
-      :close-on-click-modal="false"
-      top="15vh"
-      @closed="handleClassClose"
-      @close="handleClassClose"
-    >
-      <el-form ref="dialogClassForm" inline :rules="dialogClassFormRules" :model="dialogClassForm" label-width="80px">
-        <el-form-item label="鍒嗙被缂栫爜" prop="inventoryclasscode">
-          <el-input v-model="dialogClassForm.inventoryclasscode" :disabled="operation!=='add'" style="width: 200px" />
-        </el-form-item>
-        <el-form-item label="鍒嗙被鍚嶇О" prop="inventoryclassname">
-          <el-input v-model="dialogClassForm.inventoryclassname" style="width: 200px" />
-        </el-form-item>
-        <el-form-item label="涓婄骇鍒嗙被">
-          <el-select
-            v-model="dialogClassForm.parentcode"
-            style="width:200px"
-            placeholder="璇烽�夋嫨"
-            :popper-append-to-body="false"
-            clearable
-          >
-            <el-option
-              v-for="item in treeLeftArr"
-              :key="item.code"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
-        </el-form-item>
-      </el-form>
-
-      <span slot="footer" class="dialog-footer">
-        <div class="footerButton">
-          <el-button v-waves @click="dialogVisibleClassCancel">鍙� 娑�</el-button>
-          <el-button
-            v-waves
-            type="primary"
-            :loading="$store.state.app.buttonIsDisabled"
-            :disabled="$store.state.app.buttonIsDisabled"
-            @click="dialogVisibleClassConfirm"
-          >纭� 瀹�</el-button>
-        </div>
-      </span>
-    </el-dialog>
-
-    <!--    瀛樿揣妗f鏂板淇敼-->
-    <el-dialog
-      v-el-drag-dialog
-      :title="operation==='add'?'鏂板':'缂栬緫'"
-      :visible.sync="dialogVisible"
-      width="1200px"
-      :close-on-click-modal="false"
-      top="15vh"
-      @closed="handleClose"
-      @close="handleClose"
-    >
-
-      <el-form ref="dialogForm" class="" inline :rules="dialogFormRules" :model="dialogForm" label-width="110px">
-        <el-divider content-position="left">鍩烘湰淇℃伅</el-divider>
-        <el-form-item label="瀛樿揣缂栫爜" prop="partcode">
-          <el-input v-model="dialogForm.partcode" :disabled="operation!=='add'" style="width: 200px" />
-        </el-form-item>
-        <el-form-item label="瀛樿揣鍚嶇О" prop="partname">
-          <el-input v-model="dialogForm.partname" style="width: 200px" />
-        </el-form-item>
-        <el-form-item label="瑙勬牸鍨嬪彿">
-          <el-input v-model="dialogForm.partspec" style="width: 200px" />
-        </el-form-item>
-        <el-form-item label="鎵�灞炵被鍒�" prop="inventoryclasscode">
-          <el-select
-            v-model="dialogForm.inventoryclasscode"
-            style="width:200px"
-            placeholder="璇烽�夋嫨"
-            filterable
-            :popper-append-to-body="false"
-          >
-            <el-option
-              v-for="item in treeLeftArr"
-              :key="item.code"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="鎵�灞炰粨搴�" prop="idwarehouse">
-          <el-select
-            v-model="dialogForm.idwarehouse"
-            style="width:200px"
-            placeholder="璇烽�夋嫨"
-            filterable
-            :popper-append-to-body="false"
-          >
-            <el-option
-              v-for="item in idwarehouseArr"
-              :key="item.code"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item required label="瀛樿揣鐘舵��">
-          <el-radio-group v-model="dialogForm.status">
-            <el-radio label="0">姝e父</el-radio>
-            <el-radio label="1">鍋滅敤</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-divider content-position="left">璁¢噺鍗曚綅</el-divider>
-        <el-form-item label="璁¢噺鏂瑰紡" required prop="unittypcode">
-          <el-select
-            v-model="dialogForm.unittypcode"
-            style="width:200px"
-            placeholder="璇烽�夋嫨"
-            filterable
-            :popper-append-to-body="false"
-            @change="unittypcodeChange"
-          >
-            <el-option
-              v-for="item in unittypcodeArr"
-              :key="item.code"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="dialogForm.unittypcode==='1'? '璁¢噺鍗曚綅':'璁¢噺鍗曚綅缁�'" prop="unitcode">
-          <el-select
-            v-if="dialogForm.unittypcode==='1'"
-            v-model="dialogForm.unitcode"
-            style="width:200px"
-            placeholder="璇烽�夋嫨"
-            filterable
-            :popper-append-to-body="false"
-            @change="val=>unitcodeChange(val,'1')"
-          >
-            <el-option
-              v-for="item in unitcodeSingleArr"
-              :key="item.unitcode"
-              :label="item.unitname"
-              :value="item.unitcode"
-            />
-          </el-select>
-          <el-select
-            v-if="dialogForm.unittypcode!=='1'"
-            v-model="dialogForm.unitcode"
-            style="width:200px"
-            placeholder="璇烽�夋嫨"
-            filterable
-            :popper-append-to-body="false"
-            @change="val=>unitcodeChange(val,'0')"
-          >
-            <el-option
-              v-for="item in unitcodeGroupArr"
-              :key="item.unitcode"
-              :label="item.unitname"
-              :value="item.unitcode"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="鎶ヨ〃杈呭崟浣�">
-          <el-select
-            v-model="dialogForm.idSubUnitByReport"
-            style="width:200px"
-            placeholder="璇烽�夋嫨"
-            filterable
-            :disabled="dialogForm.unittypcode==='1'"
-            :popper-append-to-body="false"
-          >
-            <el-option
-              v-for="item in idSubUnitByReportArr"
-              :key="item.unitcode"
-              :label="item.unitname"
-              :value="item.unitcode"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="搴撳瓨甯哥敤鍗曚綅">
-          <el-select
-            v-model="dialogForm.idUnitByStock"
-            style="width:200px"
-            placeholder="璇烽�夋嫨"
-            filterable
-            :disabled="dialogForm.unittypcode==='1'"
-            :popper-append-to-body="false"
-          >
-            <el-option
-              v-for="item in idUnitBvStockArr"
-              :key="item.unitcode"
-              :label="item.unitname"
-              :value="item.unitcode"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="閲囪喘甯哥敤鍗曚綅">
-          <el-select
-            v-model="dialogForm.idUnitByPurchase"
-            style="width:200px"
-            placeholder="璇烽�夋嫨"
-            filterable
-            :disabled="dialogForm.unittypcode==='1'"
-            :popper-append-to-body="false"
-          >
-            <el-option
-              v-for="item in idUnitBvStockArr"
-              :key="item.unitcode"
-              :label="item.unitname"
-              :value="item.unitcode"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="閿�鍞父鐢ㄥ崟浣�">
-          <el-select
-            v-model="dialogForm.idUnitBySale"
-            style="width:200px"
-            placeholder="璇烽�夋嫨"
-            filterable
-            :disabled="dialogForm.unittypcode==='1'"
-            :popper-append-to-body="false"
-          >
-            <el-option
-              v-for="item in idUnitBvStockArr"
-              :key="item.unitcode"
-              :label="item.unitname"
-              :value="item.unitcode"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="鐢熶骇甯哥敤鍗曚綅">
-          <el-select
-            v-model="dialogForm.idunitbymanufacture"
-            style="width:200px"
-            placeholder="璇烽�夋嫨"
-            filterable
-            :disabled="dialogForm.unittypcode==='1'"
-            :popper-append-to-body="false"
-          >
-            <el-option
-              v-for="item in idUnitBvStockArr"
-              :key="item.unitcode"
-              :label="item.unitname"
-              :value="item.unitcode"
-            />
-          </el-select>
-        </el-form-item>
-        <el-divider content-position="left">瀛樿揣灞炴��</el-divider>
-        <el-checkbox v-model="dialogForm.isPurchase" style="margin-left: 70px;">澶栬喘</el-checkbox>
-        <el-checkbox v-model="dialogForm.isSale">閿�鍞�</el-checkbox>
-        <el-checkbox v-model="dialogForm.isMadeSelf">鑷埗</el-checkbox>
-        <el-checkbox v-model="dialogForm.isMaterial">鐢熶骇娑堣��</el-checkbox>
-        <el-checkbox v-model="dialogForm.isMadeRequest">濮斿</el-checkbox>
-        <!--        <el-divider content-position="left">瀛樿揣鎻忚堪</el-divider>-->
-        <!--        <el-form-item label="瀛樿揣鎻忚堪">-->
-        <!--          <el-input-->
-        <!--            v-model="dialogForm.username"-->
-        <!--            type="textarea"-->
-        <!--            :autosize="{ minRows: 2, maxRows: 4}"-->
-        <!--            style="width: 490px;"-->
-        <!--          />-->
-        <!--        </el-form-item>-->
-
-      </el-form>
-
-      <span slot="footer" class="dialog-footer">
-        <div class="footerButton">
-          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
-          <el-button
-            v-waves
-            type="primary"
-            :loading="$store.state.app.buttonIsDisabled"
-            :disabled="$store.state.app.buttonIsDisabled"
-            @click="dialogVisibleConfirm"
-          >纭� 瀹�</el-button>
-        </div>
-      </span>
-    </el-dialog>
-
-    <!--    宸ヨ壓璺嚎瀵硅瘽妗�-->
-    <el-dialog
-      v-el-drag-dialog
-      :close-on-click-modal="false"
-      title="鍏宠仈宸ヨ壓璺嚎"
-      :visible.sync="dialogVisibleRoute"
-      width="800px"
-      top="5vh"
-      class="dialogVisibleRoute"
-      @closed="handleCloseRoute"
-      @close="handleCloseRoute"
-    >
-      <div>
-        <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 浜у搧鍚嶇О锛歿{
-          dialogFormRoute.projectName
-        }}
-      </div>
-      <el-divider />
-      <div style="margin-bottom: 10px">
-        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 宸ヨ壓璺嚎闆嗗悎
-      </div>
-
-      <div class="myCheckboxGroup">
-        <div
-          v-for="item in dialogFormRoute.routeOperationArr"
-          :key="item.code"
-          :style="{border:item.isSelected1?'1px solid '+$store.state.settings.theme:'1px solid #eee'}"
-          class="myCheckbox"
-          @click="myCheckboxClick(item)"
-        >
-          <!--          <input-->
-          <!--            class="myCheckboxInput"-->
-          <!--            type="checkbox"-->
-          <!--            :value="item.code"-->
-          <!--            :name="item.name"-->
-          <!--            :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
-          <!--            @click="myCheckboxInputClick(item)"-->
-          <!--          >{{ item.name }}-->
-          <!--            鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
-          <!--            onClick="event.cancelBubble = true"-->
-          <el-checkbox
-            :key="item.code"
-            v-model="item.isSelected2"
-            class="myCheckboxInput"
-            :value="item.code"
-            :name="item.name"
-            :label="item.name"
-            :checked="item.isSelected2"
-            @change="myCheckboxInputClick(item)"
-          />
-          <div class="myCheckboxInputLabel">{{ item.name }}</div>
-
-        </div>
-      </div>
-
-      <el-divider />
-      <div>
-        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 榛樿宸ヨ壓璺嚎
-      </div>
-      <div style="margin-top: 20px">
-        <el-select
-          v-model="defaultroute_code"
-          filterable
-          style="width: 200px;"
-          placeholder="璇烽�夋嫨"
-          class="defaultroute_code"
-        >
-          <el-option
-            v-for="item in defaultroute_codeArr"
-            :key="item.code"
-            :label="item.name"
-            :value="item.code"
-          />
-        </el-select>
-      </div>
-      <el-divider />
-      <div style="margin-bottom: 10px">
-        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 宸ュ簭鍒楄〃
-      </div>
-      <div style="overflow-y: scroll">
-        <el-table
-          ref="projectTableData"
-          :data="projectTableData"
-          border
-          height="280"
-          :row-class-name="tableRowClassName"
-          highlight-current-row
-          :header-cell-style="this.$headerCellStyle"
-          :cell-style="this.$cellStyle"
-        >
-          <el-table-column
-            prop="seq"
-            width="100"
-            label="宸ュ簭搴忓彿"
-            fixed
-          />
-          <el-table-column
-            prop="stepcode"
-            show-tooltip-when-overflow
-            label="宸ュ簭缂栫爜"
-          />
-          <el-table-column
-            prop="stepname"
-            label="宸ュ簭鍚嶇О"
-            show-tooltip-when-overflow
-          />
-          <el-table-column
-            prop="enable"
-            label="鍚敤鐘舵��"
-            show-tooltip-when-overflow
-            fixed="right"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.enable==='Y'">
-                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
-                鏄�
-              </div>
-              <div v-if="row.enable==='N'">
-                <i class="el-icon-info" style="margin-right: 2px" />
-                鍚�
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <div class="footerButton">
-          <el-button v-waves @click="routeDialogVisibleCancel">鍙� 娑�</el-button>
-          <el-button
-            v-waves
-            type="primary"
-            :loading="$store.state.app.buttonIsDisabled"
-            :disabled="$store.state.app.buttonIsDisabled"
-            @click="routeDialogVisibleConfirm"
-          >纭� 瀹�</el-button>
-        </div>
-      </span>
-    </el-dialog>
-
-    <!--    鎸夊伐鑹鸿蛋  宸ュ簭瀵硅瘽妗�-->
-    <el-dialog
-      v-el-drag-dialog
-      :close-on-click-modal="false"
-      title="鍏宠仈宸ュ簭"
-      :visible.sync="dialogVisibleStep"
-      width="800px"
-      top="15vh"
-      class="dialogVisibleStep"
-      @closed="handleCloseStep"
-      @close="handleCloseStep"
-    >
-
-      <div style="display: flex;align-items: center">
-        <div style="font-weight: bolder">宸ュ簭閫夋嫨锛�</div>
-        <el-drag-select
-          v-model="stepSelectedValue"
-          style="width:570px;"
-          multiple
-          placeholder="璇烽�夋嫨鐩稿搴斿伐搴�"
-        >
-          <!--            :disabled="!(dialogForm.mesorderstus==='NEW'||dialogForm.mesorderstus==='ALLO')"-->
-          <el-option
-            v-for="item in stepSelectArr"
-            :key="item.stepcode"
-            :label="item.stepname"
-            :value="item.stepcode"
-          />
-        </el-drag-select>
-      </div>
-
-      <el-table
-        ref="stepTableDataRef"
-        :data="stepTableData"
-        border
-        :row-class-name="tableRowClassName"
-        height="300"
-        style="width: 100%;margin-top: 15px;"
-        highlight-current-row
-        :header-cell-style="this.$headerCellStyle"
-        :cell-style="this.$cellStyle"
-        row-key="stepcode"
-      >
-        <el-table-column
-          type="index"
-          label="搴忓彿"
-          width="50"
-        />
-        <el-table-column
-          prop="stepcode"
-          show-tooltip-when-overflow
-          label="宸ュ簭缂栫爜"
-        />
-        <el-table-column
-          prop="stepname"
-          label="宸ュ簭鍚嶇О"
-          show-tooltip-when-overflow
-        />
-        <!--        <el-table-column-->
-        <!--          prop="stepprice"-->
-        <!--          label="鐢熶骇鍗曚环"-->
-        <!--          show-tooltip-when-overflow-->
-        <!--        >-->
-        <!--          <template slot-scope="{row}">-->
-        <!--            <el-input-->
-        <!--              v-model="row.stepprice"-->
-        <!--              placeholder="璇疯緭鍏ュ伐搴忓崟浠�"-->
-        <!--              oninput="value=value.replace(/[^0-9.]/g,'')"-->
-        <!--              style="width: 100%"-->
-        <!--              @click.stop=""-->
-        <!--            />-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
-        <el-table-column
-          label="鎿嶄綔"
-          width="120"
-        >
-          <template slot-scope="{row}">
-            <div class="operationClass">
-              <!--                <el-tooltip class="item" effect="dark" content="绉诲姩" placement="top">-->
-              <i
-                class="el-icon-rank"
-                :style="{color:$store.state.settings.theme}"
-                style="cursor: move"
-              />
-              <!--                </el-tooltip>-->
-              <!--                @click="edit('edit',row)"-->
-
-              <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
-                <i
-                  class="el-icon-delete"
-                  :style="{color:$store.state.settings.theme}"
-                  style="margin-left: 15px;"
-                  @click="stepDel(row)"
-                />
-              </el-tooltip>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <span slot="footer" class="dialog-footer">
-        <div class="footerButton">
-          <el-button v-waves @click="stepDialogVisibleCancel">鍙� 娑�</el-button>
-          <el-button
-            v-waves
-            type="primary"
-            :loading="$store.state.app.buttonIsDisabled"
-            :disabled="$store.state.app.buttonIsDisabled"
-            @click="stepDialogVisibleConfirm"
-          >纭� 瀹�</el-button>
-        </div>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import waves from '@/directive/waves'
-import Pagination from '@/components/Pagination'
-import { validateCode } from '@/utils/global'
-import elDragDialog from '@/directive/el-drag-dialog'
-import {
-  SaveTMaterielFile,
-  TMaterielAddUpdate,
-  TMaterielClassTree,
-  TMaterielClassTreeAddUpdate,
-  TMaterielClassTreeDelete,
-  TMaterielData, TMaterielDelete, TMaterielFileAssociationRoute
-} from '@/api/ProductModel'
-import arrayToTree from 'array-to-tree'
-import { StepData, UnitSerch, WareHouse } from '@/api/GeneralBasicData'
-import { SaveSearchMateriel_Info } from '@/api/ErpSyncMes'
-import $ from 'jquery'
-import Sortable from 'sortablejs'
-import ElDragSelect from '@/components/DragSelect'
-
-export default {
-  name: 'InventoryList',
-  directives: { waves, elDragDialog },
-  components: {
-    Pagination, ElDragSelect
-  },
-  data() {
-    return {
-      mouseHoverType: 'mouseout',
-      isExpandForm: false,
-      mainHeight: 0,
-      tableHeight: 0,
-      operation: '',
-
-      treeLeft: [
-        {
-          code: '-1',
-          name: '鍏ㄩ儴'
-        }
-      ], // 宸︿晶鏍�
-      treeLeftArr: [],
-      defaultPropsLeft: {
-        children: 'children',
-        label: 'name'
-      },
-
-      tableData: [],
-      form: {
-        inventoryclasscode: '',
-        partcode: '',
-        partname: '',
-        partspec: '',
-        page: 1,
-        rows: 20,
-        prop: 'lm_date', // 鎺掑簭瀛楁
-        order: 'desc' // 鎺掑簭瀛楁
-      },
-      total: 0,
-      dialogClassVisible: false,
-      dialogClassForm: {
-        data_sources: '', // 鏁版嵁鏉ユ簮:ERP/MES
-        inventoryclasscode: '', // 瀛樿揣鍒嗙被缂栫爜
-        inventoryclassname: '', // 瀛樿揣鍒嗙被鍚嶇О
-        parentcode: '', // 涓婄骇鍒嗙被缂栫爜
-        OperType: ''// OperType
-      },
-      classArr: [],
-      dialogClassFormRules: {
-        inventoryclasscode: [
-          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
-        ],
-        inventoryclassname: [
-          { required: true, message: '璇疯緭瀛樿揣绫诲瀷鍚嶇О', trigger: ['blur', 'change'] }
-        ]
-      },
-
-      dialogVisible: false,
-      dialogForm: {
-        data_sources: 'MES', // 鏁版嵁鏉ユ簮锛汦RP/MES
-        partcode: '', // 瀛樿揣缂栫爜
-        partname: '', // 瀛樿揣鍚嶇О
-        partspec: '', // 瑙勬牸鍨嬪彿
-        inventoryclasscode: '', // 瀛樿揣绫诲瀷缂栫爜
-        unittypcode: '1', // 璁¢噺鏂瑰紡(0:澶氳閲�,1:鍗曡閲�)
-        unitcode: '', // 璁¢噺鍗曚綅缂栫爜/璁¢噺鍗曚綅缁勭紪鐮�
-        unitsubcode: '', // 璁¢噺鍗曚綅缁勫瓙椤圭紪鐮侊紙瀵瑰簲鐨勬槸  涓昏閲忓崟浣嶇紪鐮侊級
-        idSubUnitByReport: '', // 鎶ヨ〃杈呭崟浣嶇紪鐮�
-        idUnitByStock: '', // 搴撳瓨甯哥敤鍗曚綅缂栫爜
-        idUnitByPurchase: '', // 閲囪喘甯哥敤鍗曚綅缂栫爜
-        idUnitBySale: '', // 閿�鍞父鐢ㄥ崟浣嶇紪鐮�
-        idunitbymanufacture: '', // 鐢熶骇甯哥敤鍗曚綅
-        isPurchase: false, // 鏄惁澶栬喘: 0(鍚�)1(鏄�)
-        isSale: false, // 鏄惁閿�鍞�:0(鍚�)1(鏄�)
-        isMadeSelf: false, // 鏄惁鑷埗: 0(鍚�)1(鏄�)
-        isMaterial: false, // 鏄惁鐢熶骇鑰楃敤: 0(鍚�)1(鏄�)
-        isMadeRequest: false, // 鏄惁濮斿锛�0(鍚�)1(鏄�)
-        idwarehouse: '', // 浠撳簱缂栫爜
-        status: '0', // 浣跨敤鐘舵��: 姝e父(0)鍋滅敤(1)
-        OperType: '' // 鎿嶄綔绫诲瀷
-      },
-      dialogFormRules: {
-        partcode: [
-          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
-        ],
-        partname: [
-          { required: true, message: '璇疯緭鍏ョ粍缁囧悕绉�', trigger: ['blur', 'change'] }
-        ],
-        unitcode: [
-          { required: true, message: '璇烽�夋嫨璁¢噺鍗曚綅(缁�)', trigger: ['blur', 'change'] }
-        ],
-        inventoryclasscode: [
-          { required: true, message: '璇烽�夋嫨鎵�灞炲崟浣�', trigger: ['blur', 'change'] }
-        ]
-      },
-      unittypcodeArr: [
-        { code: '1', name: '鍗曡閲�' },
-        { code: '0', name: '澶氳閲�' }
-      ],
-      unitcodeSingleArr: [],
-      unitcodeGroupArr: [],
-      idSubUnitByReportArr: [],
-      idUnitBvStockArr: [],
-      idwarehouseArr: [],
-
-      // 宸ヨ壓
-      dialogVisibleRoute: false,
-      dialogFormRoute: {
-        projectName: '', // 浜у搧鍚嶇О
-        projectCode: '', // 浜у搧浠g爜
-        routeOperationArr: [] // 宸ヨ壓璺嚎闆嗗悎
-        // routeOperationSelectedArr: [] // 宸ヨ壓璺嚎閫変腑闆嗗悎鏁扮粍
-      },
-      defaultroute_code: '', // 榛樿宸ヨ壓璺嚎閫変腑鍊�
-      defaultroute_codeArr: '', // 榛樿宸ヨ壓璺嚎鏁扮粍
-      projectTableData: [], // 宸ュ簭鍒楄〃
-      mesSetting: JSON.parse(localStorage.getItem('mesSetting')),
-
-      // 鎸夊伐搴忚蛋
-      dialogVisibleStep: false,
-      stepTableData: [],
-      sortable: null,
-      stepSelectArr: [], // 宸ュ簭涓嬫媺鏁版嵁
-      stepSelectedValue: [] // 宸ュ簭涓嬫媺閫変腑鍊�
-    }
-  },
-  watch: {
-    'stepSelectedValue': {
-      // deep: true,
-      handler: function(val) {
-        // do something with the new and old value of stepSelectedValue
-        console.log(val, 1)
-        const arr = JSON.parse(JSON.stringify(this.stepTableData))
-        const arrStepcode = arr.map(i => i.stepcode)
-        this.stepTableData = []
-        val.forEach(i => {
-          this.stepTableData.push(
-            {
-              stepcode: i,
-              stepname: this.stepSelectArr.find(j => j.stepcode === i).stepname
-              // stepprice: arrStepcode.includes(i) ? arr.find(j => j.stepcode === i).stepprice : 0
-            }
-          )
-        })
-      }
-    }
-  },
-
-  activated() {
  window.addEventListener('resize', this.getHeight)
  this.getHeight()
},
created() {
-
-  },
-  mounted() {
-    window.addEventListener('resize', this.getHeight)
-    this.getHeight()
-
-    this.getTMaterielClassTree()
-    this.getSelectApi()
-  },
-  methods: {
-    // 宸ヨ壓鐐瑰嚮 ,鎸夊伐搴忚蛋
-    async routeClick2(row) {
-      this.dialogVisibleStep = true
-      this.dialogFormRoute.projectCode = row.partcode
-
-      const res = await TMaterielFileAssociationRoute({ partcode: this.dialogFormRoute.projectCode })
-      if (res.code === '200' && res.data.length > 0) {
-        this.stepSelectedValue = res.data.map(i => i.step_code)
-      }
-
-      // 鎷栧姩琛ㄦ牸
-      this.$nextTick(() => {
-        this.setSort()
-      })
-    },
-
-    stepDialogVisibleCancel() {
-      this.dialogVisibleStep = false
-    },
-
-    async stepDialogVisibleConfirm() {
-      if (this.stepSelectedValue.length === 0) {
-        return this.$message.info('宸ュ簭鑷冲皯瑕佹湁涓�閬擄紒')
-      }
-      const children = []
-      this.stepSelectedValue.forEach((item, index) => {
-        const t = this.stepSelectArr.find(i => i.stepcode === item)
-        children.push({
-          'code': t.stepcode,
-          'name': t.stepname,
-          'seq': index + 1,
-          'isbott': index === 0 ? 'Y' : 'N',
-          'isend': index === this.stepSelectedValue.length - 1 ? 'Y' : 'N'
-        })
-      })
-      const data = [
-        {
-          'partcode': this.dialogFormRoute.projectCode,
-          'defaultroute_code': '',
-          'children': children
-        }
-      ]
-      this.$store.state.app.buttonIsDisabled = true
-      const res = await SaveTMaterielFile(data)
-      if (res.code === '200') {
-        this.dialogVisibleStep = false
-        this.$message.success('淇濆瓨鎴愬姛锛�')
-        await this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
-        this.$store.state.app.buttonIsDisabled = false
-      }
-    },
-    // 宸ュ簭鍒犻櫎
-    stepDel(row) {
-      const index = this.stepSelectedValue.findIndex(i => i === row.stepcode)
-      this.stepSelectedValue.splice(index, 1)
-    },
-    handleCloseStep() {
-      this.stepTableData = []
-      this.sortable = null
-      this.stepSelectedValue = []
-    },
-
-    setSort() {
-      const el = this.$refs.stepTableDataRef.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
-      this.sortable = Sortable.create(el, {
-        ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
-        setData: function(dataTransfer) {
-          // to avoid Firefox bug
-          // Detail see : https://github.com/RubaXa/Sortable/issues/1012
-          dataTransfer.setData('Text', '')
-        },
-        onEnd: evt => {
-          const targetRow = this.stepTableData.splice(evt.oldIndex, 1)[0]
-          this.stepTableData.splice(evt.newIndex, 0, targetRow)
-
-          this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
-          // for show the changes, you can delete in you code
-          // const tempIndex = this.newList.splice(evt.oldIndex, 1)[0]
-          // this.newList.splice(evt.newIndex, 0, tempIndex)
-        }
-      })
-    },
-
-    tableRowClassName({ row, rowIndex }) {
-      return 'custom-row'
-    },
-
-    /* 鐐瑰嚮鍏宠仈宸ヨ壓璺嚎妯″潡*/
-    // 宸ヨ壓璺嚎鐐瑰嚮
-    routeClick(row) {
-      const loading = this.$loading({
-        lock: true,
-        text: '姝e湪鍔犺浇鏁版嵁锛岃绋嶇瓑...',
-        spinner: 'el-icon-loading',
-        customClass: 'osloading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-
-      this.defaultroute_code = row.default_route
-      this.dialogFormRoute.projectCode = row.partcode
-      this.dialogFormRoute.projectName = row.partname
-
-      TMaterielFileAssociationRoute({ partcode: this.dialogFormRoute.projectCode }).then(res => {
-        if (res.code === '200') {
-          setTimeout(() => {
-            loading.close()
-            this.dialogVisibleRoute = true
-            this.dialogFormRoute.routeOperationArr = res.data
-            // let waitFlag = false// 鍥炴樉绛夊緟鏄惁鏀捐
-
-            this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
-              item.isSelected1 = false
-              item.isSelected2 = false
-              if (index === 0) {
-                item.isSelected1 = true
-                this.projectTableData = item.Data
-              }
-              if (item.flag === 'Y') {
-                item.isSelected2 = true
-                this.$nextTick(() => {
-                  $('input:checkbox').eq(index).prop('checked', true)
-                })
-
-                // const interval = setInterval(() => {
-                //   if ($('input:checkbox').length > 0) {
-                //     waitFlag = true
-                //   }
-                //   if (waitFlag) {
-                //     clearInterval(interval)
-                //     this.$nextTick(() => {
-                //       $('input:checkbox').eq(index).prop('checked', true)
-                //     })
-                //   }
-                // }, 100)
-              }
-            })
-
-            this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.flag === 'Y')
-          }, 1000)
-        } else {
-          loading.close()
-        }
-      })
-    },
-    // 瀵硅瘽妗嗗叧闂�
-    handleCloseRoute() {
-      this.dialogFormRoute.routeOperationArr = []
-      this.defaultroute_codeArr = []
-    },
-    // 鍙栨秷
-    routeDialogVisibleCancel() {
-      this.dialogVisibleRoute = false
-    },
-    // 纭畾
-    async routeDialogVisibleConfirm() {
-      if (!this.defaultroute_code || this.defaultroute_code === 'null') {
-        return this.$message.info('榛樿宸ヨ壓璺嚎涓嶈兘涓虹┖锛�')
-      }
-
-      // 鎻愪氦鏍煎紡
-      const data = []
-      this.dialogFormRoute.routeOperationArr.forEach(item => {
-        if (item.isSelected2) {
-          data.push({ code: item.code, name: item.name })
-        }
-      })
-
-      const D = [{
-        'partcode': this.dialogFormRoute.projectCode,
-        'defaultroute_code': this.defaultroute_code,
-        'children': data
-      }]
-
-      this.$store.state.app.buttonIsDisabled = true
-      const res = await SaveTMaterielFile(D)
-      if (res.code === '200') {
-        this.dialogVisibleRoute = false
-        this.$message.success('淇濆瓨鎴愬姛锛�')
-        await this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
-        this.$store.state.app.buttonIsDisabled = false
-      }
-    },
-    // 澶х洅瀛愮偣鍑讳簨浠�
-    myCheckboxClick(val) {
-      console.log(val, 1)
-      this.dialogFormRoute.routeOperationArr.forEach(item => {
-        item.isSelected1 = val.code === item.code
-      })
-
-      this.projectTableData = val.Data
-    },
-    // 灏忕洅瀛愮偣鍑讳簨浠�
-    myCheckboxInputClick(val) {
-      // console.log(val, 2)
-      val.isSelected2 = !!val.isSelected2
-
-      this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
-        if (val.code === item.code) {
-          item.flag = !item.flag
-        }
-      })
-      if (val.code === this.defaultroute_code) {
-        this.defaultroute_code = ''
-      }
-      this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
-    },
-
-    async getSelectApi() {
-      const { data: res } = await UnitSerch({ tunittype: 'M' })
-      this.unitcodeGroupArr = res
-
-      const { data: res2 } = await UnitSerch({ tunittype: 'S' })
-      this.unitcodeSingleArr = res2
-
-      const { data: res3 } = await WareHouse()
-      this.idwarehouseArr = res3
-
-      // 鑾峰彇宸ュ簭
-      const { data: res4 } = await StepData()
-      this.stepSelectArr = res4
-    },
-
-    async getTMaterielClassTree() {
-      const res = await TMaterielClassTree()
-      res.data.forEach(i => {
-        i.idparent = i.idparent ? i.idparent : '-1'
-      })
-      this.treeLeftArr = res.data
-      this.treeLeftArr.forEach(e => {
-        e.name = e.code + ' ' + e.name
-      })
-      this.treeLeft = arrayToTree(this.treeLeft.concat(res.data), {
-        parentProperty: 'idparent',
-        customID: 'code',
-        childrenProperty: 'children'
-      })
-
-      this.$nextTick(() => {
-        this.$refs.treeLeftRef.setCurrentKey('-1')
-        this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
-      })
-    },
-    async getTMaterielData(node) {
-      const result = this.getChildrenCodeMethod(node, [])
-      if (result.includes('-1')) {
-        result.shift()
-      }
-      this.form.inventoryclasscode = result.join(',')
-      const res = await TMaterielData(this.form)
-
-      this.tableData = res.data
-      this.total = res.count
-    },
-
-    // 鑾峰彇椤甸潰楂樺害
-    getHeight() {
-      this.$nextTick(() => {
-        this.mainHeight = window.innerHeight - 85
-        this.tableHeight = this.mainHeight - 280
-        this.$refs.tableDataRef.doLayout()
-      })
-    },
-    sortChange({ column, prop, order }) {
-      if (order === 'descending') {
-        order = 'desc'
-      } else if (order === 'ascending') {
-        order = 'asc'
-      } else {
-        order = 'desc'
-      }
-      this.form.order = order
-      this.form.prop = prop
-      this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
-    },
-    // 鏂板鎸夐挳
-    add(operation) {
-      this.operation = operation
-      this.dialogVisible = true
-      this.dialogForm.OperType = 'Add'
-    },
-    // 淇敼鎸夐挳
-    async edit(operation, row) {
-      this.operation = operation
-      this.dialogVisible = true
-      this.dialogForm.OperType = 'Update'
-
-      this.$nextTick(() => {
-        this.dialogForm.data_sources = row.data_sources
-        this.dialogForm.partcode = row.partcode
-        this.dialogForm.partname = row.partname
-        this.dialogForm.partspec = row.partspec
-        this.dialogForm.inventoryclasscode = row.idinventoryclasscode
-        this.dialogForm.unittypcode = row.isSingleUnit
-        // 璁¢噺鏂瑰紡(0:澶氳閲�,1:鍗曡閲�)
-        if (this.dialogForm.unittypcode === '1') {
-          this.dialogForm.unitcode = row.idunitcode
-          this.dialogForm.unitsubcode = ''
-          this.dialogForm.idSubUnitByReport = ''
-          const unitname = this.unitcodeSingleArr.find(i => i.unitcode === this.dialogForm.unitcode).unitname
-
-          this.dialogForm.idUnitByStock = unitname
-          this.dialogForm.idUnitByPurchase = unitname
-          this.dialogForm.idUnitBySale = unitname
-          this.dialogForm.idunitbymanufacture = unitname
-        }
-
-        if (this.dialogForm.unittypcode === '0') {
-          this.dialogForm.unitcode = row.idunitgroupcode
-
-          const t = this.unitcodeGroupArr.find(i => i.unitcode === this.dialogForm.unitcode).children
-
-          this.idSubUnitByReportArr = t.filter(i => i.isMainUnit !== '1')
-          this.idUnitBvStockArr = t
-
-          const mainUnitCode = t.find(i => i.isMainUnit === '1').unitcode
-          this.dialogForm.unitsubcode = mainUnitCode
-          this.dialogForm.idSubUnitByReport = this.idSubUnitByReportArr[0].unitcode
-
-          this.dialogForm.idUnitByStock = mainUnitCode
-          this.dialogForm.idUnitByPurchase = mainUnitCode
-          this.dialogForm.idUnitBySale = mainUnitCode
-          this.dialogForm.idunitbymanufacture = mainUnitCode
-        }
-
-        this.dialogForm.isPurchase = row.isPurchase === '1'
-        this.dialogForm.isSale = row.isSale === '1'
-        this.dialogForm.isMadeSelf = row.isMadeSelf === '1'
-        this.dialogForm.isMaterial = row.isMaterial === '1'
-        this.dialogForm.isMadeRequest = row.isMadeRequest === '1'
-
-        this.dialogForm.idwarehouse = row.idwarehousecode
-        this.dialogForm.status = row.status
-      })
-    },
-    del(row) {
-      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
-        confirmButtonText: '纭畾',
-        cancelButtonText: '鍙栨秷',
-        type: 'warning'
-      }).then(() => {
-        TMaterielDelete({ partcode: row.partcode, data_sources: row.data_sources }).then(res => {
-          if (res.code === '200') {
-            this.$notify.success('鍒犻櫎鎴愬姛!')
-            this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
-          }
-        })
-      }).catch(() => {
-        this.$notify.info('宸插彇娑堝垹闄�')
-      })
-    },
-    reset() {
-      this.form.inventoryclasscode = ''
-      this.form.partcode = ''
-      this.form.partname = ''
-      this.form.partspec = ''
-      this.$refs.treeLeftRef.setCurrentKey('-1')
-      this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
-    },
-    // 瀵硅瘽妗嗗叧闂簨浠�
-    handleClose() {
-      this.dialogForm.data_sources = 'MES'
-      this.dialogForm.partcode = ''
-      this.dialogForm.partname = ''
-      this.dialogForm.partspec = ''
-      this.dialogForm.inventoryclasscode = ''
-      this.dialogForm.unittypcode = '1'
-      this.dialogForm.unitcode = ''
-      this.dialogForm.unitsubcode = ''
-      this.dialogForm.idSubUnitByReport = ''
-      this.dialogForm.idUnitByStock = ''
-      this.dialogForm.idUnitByPurchase = ''
-      this.dialogForm.idUnitBySale = ''
-      this.dialogForm.idunitbymanufacture = ''
-      this.dialogForm.isPurchase = false
-      this.dialogForm.isSale = false
-      this.dialogForm.isMadeSelf = false
-      this.dialogForm.isMaterial = false
-      this.dialogForm.isMadeRequest = false
-      this.dialogForm.idwarehouse = ''
-      this.dialogForm.status = '0'
-      this.$refs.dialogForm.clearValidate()
-    },
-    // 瀵硅瘽妗嗗彇娑�
-    dialogVisibleCancel() {
-      this.dialogVisible = false
-    },
-    // 瀵硅瘽妗嗙‘璁�
-    dialogVisibleConfirm() {
-      this.$refs.dialogForm.validate(valid => {
-        if (valid) {
-          if (!(this.dialogForm.isPurchase || this.dialogForm.isSale || this.dialogForm.isMadeSelf || this.dialogForm.isMaterial || this.dialogForm.isMadeRequest)) {
-            return this.$message.info('瀛樿揣灞炴�т笉鑳戒负绌猴紒')
-          }
-          this.dialogForm.isPurchase = this.dialogForm.isPurchase ? '1' : '0'
-          this.dialogForm.isSale = this.dialogForm.isSale ? '1' : '0'
-          this.dialogForm.isMadeSelf = this.dialogForm.isMadeSelf ? '1' : '0'
-          this.dialogForm.isMaterial = this.dialogForm.isMaterial ? '1' : '0'
-          this.dialogForm.isMadeRequest = this.dialogForm.isMadeRequest ? '1' : '0'
-          // console.log(JSON.parse(JSON.stringify(this.dialogForm)), 1)
-
-          if (this.dialogForm.unittypcode === '1') {
-            this.dialogForm.idUnitByStock = this.dialogForm.unitcode
-            this.dialogForm.idUnitByPurchase = this.dialogForm.unitcode
-            this.dialogForm.idUnitBySale = this.dialogForm.unitcode
-            this.dialogForm.idunitbymanufacture = this.dialogForm.unitcode
-          }
-          this.$store.state.app.buttonIsDisabled = true
-          TMaterielAddUpdate(this.dialogForm).then(res => {
-            if (res.code === '200') {
-              this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
-              this.dialogVisible = false
-              this.$store.state.app.buttonIsDisabled = false
-              this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
-            } else {
-              this.$store.state.app.buttonIsDisabled = false
-              this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
-            }
-          })
-        }
-      })
-    },
-
-    // 閫掑綊鍙栧瓙闆嗙殑鎵�鏈塩ode
-    getChildrenCodeMethod(node, result) {
-      result.push(node.code)
-      if (node.children && node.children.length > 0) {
-        node.children.forEach(i => {
-          this.getChildrenCodeMethod(i, result)
-        })
-      }
-      return result
-    },
-
-    treeEditClick(node, data, operation) {
-      this.dialogClassForm.data_sources = data.data_sources
-      this.dialogClassForm.inventoryclasscode = data.code
-      this.dialogClassForm.inventoryclassname = data.name.split(' ')[1]
-      this.dialogClassForm.parentcode = data.idparent === '-1' ? '' : data.idparent
-      this.dialogClassForm.OperType = 'Update'
-      this.operation = operation
-      this.dialogClassVisible = true
-    },
-    treeDeleteClick(node, data) {
-      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
-        confirmButtonText: '纭畾',
-        cancelButtonText: '鍙栨秷',
-        type: 'warning'
-      }).then(() => {
-        const result = this.getChildrenCodeMethod(data, [])
-        TMaterielClassTreeDelete({ inventoryclasscode: result.join(',') }).then(res => {
-          if (res.code === '200') {
-            this.$notify.success('鍒犻櫎鎴愬姛!')
-            this.getTMaterielClassTree()
-          }
-        })
-      }).catch(() => {
-        this.$notify.info('宸插彇娑堝垹闄�')
-      })
-    },
-    treeAddClick(operation) {
-      this.operation = operation
-      this.dialogClassVisible = true
-      this.dialogClassForm.OperType = 'Add'
-      this.dialogClassForm.data_sources = 'MES'
-    },
-
-    handleClassClose() {
-      this.dialogClassForm.data_sources = ''
-      this.dialogClassForm.inventoryclasscode = ''
-      this.dialogClassForm.inventoryclassname = ''
-      this.dialogClassForm.parentcode = ''
-      this.dialogClassForm.OperType = ''
-      this.$refs.dialogClassForm.clearValidate()
-    },
-    dialogVisibleClassCancel() {
-      this.dialogClassVisible = false
-    },
-    dialogVisibleClassConfirm() {
-      this.$refs.dialogClassForm.validate(valid => {
-        if (valid) {
-          TMaterielClassTreeAddUpdate(this.dialogClassForm).then(res => {
-            if (res.code === '200') {
-              this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
-              this.dialogClassVisible = false
-              this.$store.state.app.buttonIsDisabled = false
-              this.getTMaterielClassTree()
-            } else {
-              this.$store.state.app.buttonIsDisabled = false
-              this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
-            }
-          })
-        }
-      })
-    },
-    unittypcodeChange(val) {
-      console.log(val)
-
-      this.dialogForm.unitcode = ''
-      this.dialogForm.unitsubcode = ''
-      this.dialogForm.idSubUnitByReport = ''
-      this.dialogForm.idUnitByStock = ''
-      this.dialogForm.idUnitByPurchase = ''
-      this.dialogForm.idUnitBySale = ''
-      this.dialogForm.idunitbymanufacture = ''
-      // this.$refs.dialogForm.clearValidate()
-      // this.$forceUpdate()
-    },
-    unitcodeChange(val, type) {
-      console.log(val)
-
-      if (type === '1') {
-        // this.dialogForm.unitcode = val
-        this.dialogForm.unitsubcode = ''
-        this.dialogForm.idSubUnitByReport = ''
-
-        const unitname = this.unitcodeSingleArr.find(i => i.unitcode === val).unitname
-
-        this.dialogForm.idUnitByStock = unitname
-        this.dialogForm.idUnitByPurchase = unitname
-        this.dialogForm.idUnitBySale = unitname
-        this.dialogForm.idunitbymanufacture = unitname
-      }
-
-      if (type === '0') {
-        const t = this.unitcodeGroupArr.find(i => i.unitcode === val).children
-
-        this.idSubUnitByReportArr = t.filter(i => i.isMainUnit !== '1')
-        this.idUnitBvStockArr = t
-
-        const mainUnitCode = t.find(i => i.isMainUnit === '1').unitcode
-        this.dialogForm.unitsubcode = mainUnitCode
-        this.dialogForm.idSubUnitByReport = this.idSubUnitByReportArr[0].unitcode
-
-        this.dialogForm.idUnitByStock = mainUnitCode
-        this.dialogForm.idUnitByPurchase = mainUnitCode
-        this.dialogForm.idUnitBySale = mainUnitCode
-        this.dialogForm.idunitbymanufacture = mainUnitCode
-      }
-    },
-    // 鍚屾ERP
-    syncERP() {
-      const loading = this.$loading({
-        lock: true,
-        text: '姝e湪鍚屾ERP锛岃绋嶇瓑...',
-        spinner: 'el-icon-loading',
-        customClass: 'osloading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-
-      SaveSearchMateriel_Info().then(res => {
-        if (res.code === '200') {
-          setTimeout(() => {
-            this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
-            this.getTMaterielClassTree()
-            loading.close()
-            this.$notify.success('鍚屾鎴愬姛锛�')
-          }, 2000)
-        }
-        // else if (res.code === '300') {
-        //   setTimeout(() => {
-        //     loading.close()
-        //     this.$message.error('鍚屾澶辫触锛�')
-        //   }, 10000)
-        // }
-      }).catch(e => {
-        loading.close()
-      })
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-$main_color: #42b983;
-.custom-tree-node {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  font-size: 14px;
-  padding-right: 8px;
-}
-
-//::v-deep .el-checkbox__label {
-//  width: 55px;
-//}
-//
-.el-icon-plus:hover, .el-icon-edit:hover, .el-icon-delete:hover {
-  color: #000 !important;
-}
-
-.dialogVisibleRoute {
-  .myCheckboxGroup {
-    display: flex;
-    flex-wrap: wrap;
-
-    .myCheckbox {
-      //border: 1px solid $main_color;
-      border: 1px solid #eee;
-      display: flex;
-      min-width: 100px;
-      padding: 10px;
-      margin: 10px 30px 0 0;
-      border-radius: 5px;
-      cursor: default;
-      position: relative;
-
-      .myCheckboxInput {
-        margin: 1px 5px 0 0;
-        cursor: pointer;
-      }
-
-      .myCheckboxInputLabel {
-        position: absolute;
-        left: 29px;
-        padding: 5px;
-        top: 6px;
-        color: transparent;
-      }
-
-    }
-
-    //.myCheckbox{
-    //  border: 1px solid $main_color;
-    //}
-
-    input[type=checkbox] {
-      cursor: pointer;
-      position: relative;
-      width: 14px;
-      height: 14px;
-      font-size: 14px;
-    }
-
-    input[type=checkbox]::after {
-      position: absolute;
-      top: 0;
-      //color: rgb(130, 35, 35);
-      color: $main_color;
-      width: 14px;
-      height: 14px;
-      display: inline-block;
-      visibility: visible;
-      padding-left: 0px;
-      text-align: center;
-      content: ' ';
-      border-radius: 3px
-    }
-
-    input[type=checkbox]:checked::after {
-      //content: "鉁�";
-      content: "鈭�";
-      color: #fff;
-      font-size: 12px;
-      font-weight: bold;
-      background-color: $main_color;
-    }
-  }
-}
-
-.defaultroute_code ::v-deep .el-input__suffix-inner {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: -3px;
-}
-
-::v-deep .el-select__caret {
-  display: flex !important;
-  justify-content: center !important;
-  align-items: center !important;
-}
-
-</style>
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+
+      <div style="display: flex">
+        <div style="width: 300px;margin: 10px 10px 0  0;background:#fff">
+
+          <div style="margin: 20px 10px 0 10px;display: flex;justify-content: space-between;">
+            <div style="display: flex;">
+              <div
+                style="width: 5px;height: 100%;border-radius: 5px;"
+                :style="{background:$store.state.settings.theme}"
+              />
+              <div style="margin-left: 8px;">瀛樿揣妗f</div>
+            </div>
+
+            <div style="margin-right:10px">
+              <el-tooltip v-del-tab-index class="item" effect="dark" content="鏂板" placement="top">
+                <i class="el-icon-plus" style="cursor: pointer;color: #999" @click="treeAddClick('add')" />
+              </el-tooltip>
+            </div>
+
+          </div>
+
+          <el-tree
+            ref="treeLeftRef"
+            style="padding: 10px;overflow: auto"
+            :style="{height:(tableHeight+222)+'px'}"
+            :data="treeLeft"
+            node-key="code"
+            highlight-current
+            :props="defaultPropsLeft"
+            :default-expand-all="true"
+            :expand-on-click-node="false"
+            @node-click="getTMaterielData"
+          >
+            <span slot-scope="{ node, data }" class="custom-tree-node">
+              <span v-if="!data.isEdit" class="ellipsis" style="width:150px;">{{ data.name }}</span>
+              <span v-if="!data.isEdit">
+                <el-tooltip v-del-tab-index class="item" effect="dark" content="缂栬緫" placement="top">
+                  <i
+                    v-if="data.code!=='-1'"
+                    class="el-icon-edit"
+                    style="margin-right:10px;color: #999"
+                    @click.stop="treeEditClick(node,data,'edit')"
+                  />
+                </el-tooltip>
+                <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+                  <i
+                    v-if="data.code!=='-1'"
+                    class="el-icon-delete"
+                    style="margin-right: 4px;color: #999"
+                    @click.stop="treeDeleteClick(node,data)"
+                  />
+                </el-tooltip>
+              </span>
+            </span>
+          </el-tree>
+        </div>
+
+        <div
+          style=" width:calc(100% - 300px);"
+        >
+          <div class="bodyTopButtonGroup" style="justify-content: space-between">
+            <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+            <div style="display: flex">
+              <el-button
+                v-waves
+                type="success"
+                icon="el-icon-download"
+                @click="$router.push('./../systemSetting/dataImport?fileCode=8')"
+              >瀵煎叆
+              </el-button>
+              <el-button v-waves icon="el-icon-refresh-right" @click="syncERP">鍚屾瀛樿揣妗f</el-button>
+            </div>
+          </div>
+
+          <div class="bodyTopFormGroup">
+            <el-form
+              ref="form"
+              :model="form"
+              label-width="100px"
+              inline
+              style="display: flex;"
+            >
+              <div class="elForm">
+                <el-form-item label="瀛樿揣缂栫爜" style=" display: flex;">
+                  <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+                </el-form-item>
+                <el-form-item label="瀛樿揣鍚嶇О" style=" display: flex;">
+                  <el-input v-model="form.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
+                </el-form-item>
+                <el-form-item label="瀛樿揣瑙勬牸" style=" display: flex;">
+                  <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />
+                </el-form-item>
+                <!--                <el-form-item label="鐢ㄦ埛缂栫爜" style=" display: flex;">-->
+                <!--                  <el-input v-model="form.usercode" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+                <!--                </el-form-item>-->
+                <!--                <el-form-item v-show="isExpandForm" label="鐢ㄦ埛鍚嶇О" style=" display: flex;">-->
+                <!--                  <el-input v-model="form.username" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+                <!--                </el-form-item>-->
+                <!--                <el-form-item v-show="isExpandForm" label="鐢ㄦ埛缂栫爜" style=" display: flex;">-->
+                <!--                  <el-input v-model="form.usercode" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+                <!--                </el-form-item>-->
+                <!--                <el-form-item v-show="isExpandForm" label="鐢ㄦ埛鍚嶇О" style=" display: flex;">-->
+                <!--                  <el-input v-model="form.username" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+                <!--                </el-form-item>-->
+                <!--                <el-form-item v-show="isExpandForm" label="鐢ㄦ埛缂栫爜" style=" display: flex;">-->
+                <!--                  <el-input v-model="form.usercode" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+                <!--                </el-form-item>-->
+                <!--                <el-form-item v-show="isExpandForm" label="鐢ㄦ埛鍚嶇О" style=" display: flex;">-->
+                <!--                  <el-input v-model="form.username" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+                <!--                </el-form-item>-->
+              </div>
+              <div
+                class="bodySearchReset"
+                :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+              >
+                <el-button
+                  v-waves
+                  type="primary"
+                  icon="el-icon-search"
+                  @click="getTMaterielData($refs.treeLeftRef.getCurrentNode())"
+                >鏌ヨ
+                </el-button>
+                <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+              </div>
+            </el-form>
+            <div
+              class="bodyTopFormExpand"
+              style="height: 5px;"
+            >
+              <!--              <svg-icon-->
+              <!--                v-show="mouseHoverType==='mouseout'"-->
+              <!--                style="cursor: pointer"-->
+              <!--                :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"-->
+              <!--                @mouseenter="mouseHoverType=$event.type"-->
+              <!--              />-->
+              <!--              <svg-icon-->
+              <!--                v-show="mouseHoverType==='mouseenter'"-->
+              <!--                style="cursor: pointer"-->
+              <!--                :icon-class="!isExpandForm?'doubleDown':'doubleUp'"-->
+              <!--                @click="isExpandForm=!isExpandForm"-->
+              <!--                @mouseout="mouseHoverType=$event.type"-->
+              <!--              />-->
+            </div>
+          </div>
+
+          <div class="elTableDiv">
+            <el-table
+              ref="tableDataRef"
+              class="tableFixed"
+              :data="tableData"
+              :height="isExpandForm?tableHeight:(tableHeight+80)+'px'"
+              border
+              row-class-name="custom-row"
+              :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+80)+'px',}"
+              highlight-current-row
+              :header-cell-style="this.$headerCellStyle"
+              :cell-style="this.$cellStyle"
+              @sort-change="sortChange"
+            >
+              <!--            prop="RowNum"-->
+              <el-table-column
+                prop="rowNum"
+                width="50"
+                fixed
+                label="搴忓彿"
+              />
+              <el-table-column
+                prop="partcode"
+                label="瀛樿揣缂栫爜"
+                sortable="custom"
+                width="110"
+              />
+              <el-table-column
+                prop="partname"
+                label="瀛樿揣鍚嶇О"
+                sortable="custom"
+                show-tooltip-when-overflow
+                min-width="200"
+              />
+              <el-table-column
+                prop="partspec"
+                label="瑙勬牸鍨嬪彿"
+                width="110"
+                sortable="custom"
+              >
+                <template slot-scope="{row}">
+                  {{ row.partspec ? row.partspec : '/' }}
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="idinventoryclassname"
+                label="鎵�灞炵被鍒�"
+                sortable="custom"
+                width="110"
+              />
+              <el-table-column
+                label="璁¢噺鍗曚綅"
+                width="110"
+                sortable="custom"
+              >
+                <template slot-scope="{row}">
+                  {{ row.isSingleUnit === '0' ? row.idunitgroupname : row.idunitname }}
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="status"
+                label="瀛樿揣鐘舵��"
+                width="110"
+                sortable="custom"
+              >
+                <template slot-scope="{row}">
+                  <el-tag v-if="row.status==='0'" size="small" type="success">姝e父</el-tag>
+                  <el-tag v-if="row.status==='1'" size="small" type="danger">鍋滅敤</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="瀛樿揣灞炴��"
+                sortable="custom"
+                min-width="220"
+              >
+                <template slot-scope="{row}">
+                  {{ row.isPurchase === '1' ? '澶栬喘' : '' }}
+                  {{ row.isSale === '1' ? '閿�鍞�' : '' }}
+                  {{ row.isMadeSelf === '1' ? '鑷埗' : '' }}
+                  {{ row.isMaterial === '1' ? '鐢熶骇娑堣��' : '' }}
+                  {{ row.isMadeRequest === '1' ? '濮斿' : '' }}
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                label="宸ヨ壓"
+                prop=""
+
+                width="110"
+              >
+                <template slot-scope="{row}">
+
+                  <!--                  <i-->
+                  <!--                    v-if="row.is_retdproc==='Y'"-->
+                  <!--                    :style="{color:$store.state.settings.theme}"-->
+                  <!--                    class="el-icon-share"-->
+                  <!--                    style="cursor: pointer"-->
+                  <!--                    @click="routeClick(row)"-->
+                  <!--                  />-->
+
+                  <i
+                    :style="{color:row.is_retdproc==='Y'?$store.state.settings.theme:`rgb(180 ,181, 185)`,cursor: 'pointer'}"
+                    class="el-icon-share"
+                    @click="mesSetting.route?routeClick(row):routeClick2(row)"
+                  />
+                </template>
+              </el-table-column>
+
+              <!--              <el-table-column-->
+              <!--                label="鏁版嵁鏉ユ簮"-->
+              <!--                prop="data_sources"-->
+              <!--                sortable="custom"-->
+              <!--                width="110"-->
+              <!--              />-->
+              <el-table-column
+                label="鍒涘缓浜哄憳"
+                prop="lm_user"
+                sortable="custom"
+                width="110"
+              />
+              <el-table-column
+                label="鍒涘缓鏃堕棿"
+                prop="lm_date"
+                sortable="custom"
+                width="160"
+              />
+
+              <el-table-column
+                label="鎿嶄綔"
+                width="120"
+                fixed="right"
+              >
+                <template slot-scope="{row}">
+                  <div class="operationClass">
+                    <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+                      <i
+                        class="el-icon-edit-outline"
+                        :style="{color:$store.state.settings.theme}"
+                        @click="edit('edit',row)"
+                      />
+                    </el-tooltip>
+                    <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+                      <i
+                        class="el-icon-delete"
+                        :style="{color:$store.state.settings.theme}"
+                        @click="del(row)"
+                      />
+                    </el-tooltip>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+
+          <!--鍒嗛〉-->
+          <pagination
+            :total="total"
+            :page.sync="form.page"
+            :limit.sync="form.rows"
+            align="right"
+            layout="total,prev, pager, next,sizes,jumper"
+            popper-class="select_bottom"
+            @pagination="getTMaterielData($refs.treeLeftRef.getCurrentNode())"
+          />
+
+        </div>
+      </div>
+    </div>
+
+    <!--    瀛樿揣绫诲埆鏂板淇敼-->
+    <el-dialog
+      v-el-drag-dialog
+      :title="operation==='add'?'鏂板':'缂栬緫'"
+      :visible.sync="dialogClassVisible"
+      width="800px"
+      :close-on-click-modal="false"
+      top="15vh"
+      @closed="handleClassClose"
+      @close="handleClassClose"
+    >
+      <el-form ref="dialogClassForm" inline :rules="dialogClassFormRules" :model="dialogClassForm" label-width="80px">
+        <el-form-item label="鍒嗙被缂栫爜" prop="inventoryclasscode">
+          <el-input v-model="dialogClassForm.inventoryclasscode" :disabled="operation!=='add'" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鍒嗙被鍚嶇О" prop="inventoryclassname">
+          <el-input v-model="dialogClassForm.inventoryclassname" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="涓婄骇鍒嗙被">
+          <el-select
+            v-model="dialogClassForm.parentcode"
+            style="width:200px"
+            placeholder="璇烽�夋嫨"
+            :popper-append-to-body="false"
+            :clearable="false"
+          >
+            <el-option
+              v-for="item in treeLeftArr"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+              :disabled="item.disabled"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button v-waves @click="dialogVisibleClassCancel">鍙� 娑�</el-button>
+          <el-button
+            v-waves
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleClassConfirm"
+          >纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+
+    <!--    瀛樿揣妗f鏂板淇敼-->
+    <el-dialog
+      v-el-drag-dialog
+      :title="operation==='add'?'鏂板':'缂栬緫'"
+      :visible.sync="dialogVisible"
+      width="1200px"
+      :close-on-click-modal="false"
+      top="15vh"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+
+      <el-form ref="dialogForm" class="" inline :rules="dialogFormRules" :model="dialogForm" label-width="110px">
+        <el-divider content-position="left">鍩烘湰淇℃伅</el-divider>
+        <el-form-item label="瀛樿揣缂栫爜" prop="partcode">
+          <el-input v-model="dialogForm.partcode" :disabled="operation!=='add'" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="瀛樿揣鍚嶇О" prop="partname">
+          <el-input v-model="dialogForm.partname" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="瑙勬牸鍨嬪彿">
+          <el-input v-model="dialogForm.partspec" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鎵�灞炵被鍒�" prop="inventoryclasscode">
+          <el-select
+            v-model="dialogForm.inventoryclasscode"
+            style="width:200px"
+            placeholder="璇烽�夋嫨"
+            filterable
+            :popper-append-to-body="false"
+          >
+            <el-option
+              v-for="item in treeLeftArr"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="鎵�灞炰粨搴�" prop="idwarehouse">
+          <el-select
+            v-model="dialogForm.idwarehouse"
+            style="width:200px"
+            placeholder="璇烽�夋嫨"
+            filterable
+            :popper-append-to-body="false"
+          >
+            <el-option
+              v-for="item in idwarehouseArr"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item required label="瀛樿揣鐘舵��">
+          <el-radio-group v-model="dialogForm.status">
+            <el-radio label="0">姝e父</el-radio>
+            <el-radio label="1">鍋滅敤</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-divider content-position="left">璁¢噺鍗曚綅</el-divider>
+        <el-form-item label="璁¢噺鏂瑰紡" required prop="unittypcode">
+          <el-select
+            v-model="dialogForm.unittypcode"
+            style="width:200px"
+            placeholder="璇烽�夋嫨"
+            filterable
+            :popper-append-to-body="false"
+            disabled
+            @change="unittypcodeChange"
+          >
+            <el-option
+              v-for="item in unittypcodeArr"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="dialogForm.unittypcode==='1'? '璁¢噺鍗曚綅':'璁¢噺鍗曚綅缁�'" prop="unitcode">
+          <el-select
+            v-if="dialogForm.unittypcode==='1'"
+            v-model="dialogForm.unitcode"
+            style="width:200px"
+            placeholder="璇烽�夋嫨"
+            filterable
+            :popper-append-to-body="false"
+            @change="val=>unitcodeChange(val,'1')"
+          >
+            <el-option
+              v-for="item in unitcodeSingleArr"
+              :key="item.unitcode"
+              :label="item.unitname"
+              :value="item.unitcode"
+            />
+          </el-select>
+          <el-select
+            v-if="dialogForm.unittypcode!=='1'"
+            v-model="dialogForm.unitcode"
+            style="width:200px"
+            placeholder="璇烽�夋嫨"
+            filterable
+            :popper-append-to-body="false"
+            @change="val=>unitcodeChange(val,'0')"
+          >
+            <el-option
+              v-for="item in unitcodeGroupArr"
+              :key="item.unitcode"
+              :label="item.unitname"
+              :value="item.unitcode"
+            />
+          </el-select>
+        </el-form-item>
+        <!--        :disabled="dialogForm.unittypcode==='1'"-->
+        <!--        idSubUnitByReportArr-->
+        <el-form-item label="鎶ヨ〃杈呭崟浣�">
+          <el-select
+            v-model="dialogForm.idSubUnitByReport"
+            style="width:200px"
+            placeholder="璇烽�夋嫨"
+            filterable
+
+            :popper-append-to-body="false"
+          >
+            <el-option
+              v-for="item in unitcodeSingleArr"
+              :key="item.unitcode"
+              :label="item.unitname"
+              :value="item.unitcode"
+            />
+          </el-select>
+        </el-form-item>
+        <!--        :disabled="dialogForm.unittypcode==='1'"-->
+        <el-form-item label="搴撳瓨甯哥敤鍗曚綅">
+          <el-select
+            v-model="dialogForm.idUnitByStock"
+            style="width:200px"
+            placeholder="璇烽�夋嫨"
+            filterable
+
+            :popper-append-to-body="false"
+          >
+            <el-option
+              v-for="item in unitcodeSingleArr"
+              :key="item.unitcode"
+              :label="item.unitname"
+              :value="item.unitcode"
+            />
+          </el-select>
+        </el-form-item>
+        <!--        :disabled="dialogForm.unittypcode==='1'"-->
+        <el-form-item label="閲囪喘甯哥敤鍗曚綅">
+          <el-select
+            v-model="dialogForm.idUnitByPurchase"
+            style="width:200px"
+            placeholder="璇烽�夋嫨"
+            filterable
+
+            :popper-append-to-body="false"
+          >
+            <el-option
+              v-for="item in unitcodeSingleArr"
+              :key="item.unitcode"
+              :label="item.unitname"
+              :value="item.unitcode"
+            />
+          </el-select>
+        </el-form-item>
+        <!--        :disabled="dialogForm.unittypcode==='1'"-->
+        <el-form-item label="閿�鍞父鐢ㄥ崟浣�">
+          <el-select
+            v-model="dialogForm.idUnitBySale"
+            style="width:200px"
+            placeholder="璇烽�夋嫨"
+            filterable
+
+            :popper-append-to-body="false"
+          >
+            <el-option
+              v-for="item in unitcodeSingleArr"
+              :key="item.unitcode"
+              :label="item.unitname"
+              :value="item.unitcode"
+            />
+          </el-select>
+        </el-form-item>
+        <!--        :disabled="dialogForm.unittypcode==='1'"-->
+        <el-form-item label="鐢熶骇甯哥敤鍗曚綅">
+          <el-select
+            v-model="dialogForm.idunitbymanufacture"
+            style="width:200px"
+            placeholder="璇烽�夋嫨"
+            filterable
+
+            :popper-append-to-body="false"
+          >
+            <el-option
+              v-for="item in unitcodeSingleArr"
+              :key="item.unitcode"
+              :label="item.unitname"
+              :value="item.unitcode"
+            />
+          </el-select>
+        </el-form-item>
+        <el-divider content-position="left">瀛樿揣灞炴��</el-divider>
+        <el-checkbox v-model="dialogForm.isPurchase" style="margin-left: 70px;">澶栬喘</el-checkbox>
+        <el-checkbox v-model="dialogForm.isSale">閿�鍞�</el-checkbox>
+        <el-checkbox v-model="dialogForm.isMadeSelf">鑷埗</el-checkbox>
+        <el-checkbox v-model="dialogForm.isMaterial">鐢熶骇娑堣��</el-checkbox>
+        <el-checkbox v-model="dialogForm.isMadeRequest">濮斿</el-checkbox>
+        <!--        <el-divider content-position="left">瀛樿揣鎻忚堪</el-divider>-->
+        <!--        <el-form-item label="瀛樿揣鎻忚堪">-->
+        <!--          <el-input-->
+        <!--            v-model="dialogForm.username"-->
+        <!--            type="textarea"-->
+        <!--            :autosize="{ minRows: 2, maxRows: 4}"-->
+        <!--            style="width: 490px;"-->
+        <!--          />-->
+        <!--        </el-form-item>-->
+
+      </el-form>
+
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button
+            v-waves
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleConfirm"
+          >纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+
+    <!--    宸ヨ壓璺嚎瀵硅瘽妗�-->
+    <el-dialog
+      v-el-drag-dialog
+      :close-on-click-modal="false"
+      title="鍏宠仈宸ヨ壓璺嚎"
+      :visible.sync="dialogVisibleRoute"
+      width="800px"
+      top="5vh"
+      class="dialogVisibleRoute"
+      @closed="handleCloseRoute"
+      @close="handleCloseRoute"
+    >
+      <div>
+        <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 浜у搧鍚嶇О锛歿{
+          dialogFormRoute.projectName
+        }}
+      </div>
+      <el-divider />
+      <div style="margin-bottom: 10px">
+        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 宸ヨ壓璺嚎闆嗗悎
+      </div>
+
+      <div class="myCheckboxGroup">
+        <div
+          v-for="item in dialogFormRoute.routeOperationArr"
+          :key="item.code"
+          :style="{border:item.isSelected1?'1px solid '+$store.state.settings.theme:'1px solid #eee'}"
+          class="myCheckbox"
+          @click="myCheckboxClick(item)"
+        >
+          <!--          <input-->
+          <!--            class="myCheckboxInput"-->
+          <!--            type="checkbox"-->
+          <!--            :value="item.code"-->
+          <!--            :name="item.name"-->
+          <!--            :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
+          <!--            @click="myCheckboxInputClick(item)"-->
+          <!--          >{{ item.name }}-->
+          <!--            鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
+          <!--            onClick="event.cancelBubble = true"-->
+          <el-checkbox
+            :key="item.code"
+            v-model="item.isSelected2"
+            class="myCheckboxInput"
+            :value="item.code"
+            :name="item.name"
+            :label="item.name"
+            :checked="item.isSelected2"
+            @change="myCheckboxInputClick(item)"
+          />
+          <div class="myCheckboxInputLabel">{{ item.name }}</div>
+
+        </div>
+      </div>
+
+      <el-divider />
+      <div>
+        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 榛樿宸ヨ壓璺嚎
+      </div>
+      <div style="margin-top: 20px">
+        <el-select
+          v-model="defaultroute_code"
+          filterable
+          style="width: 200px;"
+          placeholder="璇烽�夋嫨"
+          class="defaultroute_code"
+        >
+          <el-option
+            v-for="item in defaultroute_codeArr"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </div>
+      <el-divider />
+      <div style="margin-bottom: 10px">
+        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 宸ュ簭鍒楄〃
+      </div>
+      <div style="overflow-y: scroll">
+        <el-table
+          ref="projectTableData"
+          :data="projectTableData"
+          border
+          height="280"
+          :row-class-name="tableRowClassName"
+          highlight-current-row
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+        >
+          <el-table-column
+            prop="seq"
+            width="100"
+            label="宸ュ簭搴忓彿"
+            fixed
+          />
+          <el-table-column
+            prop="stepcode"
+            show-tooltip-when-overflow
+            label="宸ュ簭缂栫爜"
+          />
+          <el-table-column
+            prop="stepname"
+            label="宸ュ簭鍚嶇О"
+            show-tooltip-when-overflow
+          />
+          <el-table-column
+            prop="enable"
+            label="鍚敤鐘舵��"
+            show-tooltip-when-overflow
+            fixed="right"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.enable==='Y'">
+                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+                鏄�
+              </div>
+              <div v-if="row.enable==='N'">
+                <i class="el-icon-info" style="margin-right: 2px" />
+                鍚�
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button v-waves @click="routeDialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button
+            v-waves
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="routeDialogVisibleConfirm"
+          >纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+
+    <!--    鎸夊伐鑹鸿蛋  宸ュ簭瀵硅瘽妗�-->
+    <el-dialog
+      v-el-drag-dialog
+      :close-on-click-modal="false"
+      title="鍏宠仈宸ュ簭"
+      :visible.sync="dialogVisibleStep"
+      width="800px"
+      top="15vh"
+      class="dialogVisibleStep"
+      @closed="handleCloseStep"
+      @close="handleCloseStep"
+    >
+
+      <div style="display: flex;align-items: center">
+        <div style="font-weight: bolder">宸ュ簭閫夋嫨锛�</div>
+        <el-drag-select
+          v-model="stepSelectedValue"
+          style="width:570px;"
+          multiple
+          placeholder="璇烽�夋嫨鐩稿搴斿伐搴�"
+        >
+          <!--            :disabled="!(dialogForm.mesorderstus==='NEW'||dialogForm.mesorderstus==='ALLO')"-->
+          <el-option
+            v-for="item in stepSelectArr"
+            :key="item.stepcode"
+            :label="item.stepname"
+            :value="item.stepcode"
+          />
+        </el-drag-select>
+      </div>
+
+      <el-table
+        ref="stepTableDataRef"
+        :data="stepTableData"
+        border
+        :row-class-name="tableRowClassName"
+        height="300"
+        style="width: 100%;margin-top: 15px;"
+        highlight-current-row
+        :header-cell-style="this.$headerCellStyle"
+        :cell-style="this.$cellStyle"
+        row-key="stepcode"
+      >
+        <el-table-column
+          type="index"
+          label="搴忓彿"
+          width="50"
+        />
+        <el-table-column
+          prop="stepcode"
+          show-tooltip-when-overflow
+          label="宸ュ簭缂栫爜"
+        />
+        <el-table-column
+          prop="stepname"
+          label="宸ュ簭鍚嶇О"
+          show-tooltip-when-overflow
+        />
+        <!--        <el-table-column-->
+        <!--          prop="stepprice"-->
+        <!--          label="鐢熶骇鍗曚环"-->
+        <!--          show-tooltip-when-overflow-->
+        <!--        >-->
+        <!--          <template slot-scope="{row}">-->
+        <!--            <el-input-->
+        <!--              v-model="row.stepprice"-->
+        <!--              placeholder="璇疯緭鍏ュ伐搴忓崟浠�"-->
+        <!--              oninput="value=value.replace(/[^0-9.]/g,'')"-->
+        <!--              style="width: 100%"-->
+        <!--              @click.stop=""-->
+        <!--            />-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column
+          label="鎿嶄綔"
+          width="120"
+        >
+          <template slot-scope="{row}">
+            <div class="operationClass">
+              <!--                <el-tooltip class="item" effect="dark" content="绉诲姩" placement="top">-->
+              <i
+                class="el-icon-rank"
+                :style="{color:$store.state.settings.theme}"
+                style="cursor: move"
+              />
+              <!--                </el-tooltip>-->
+              <!--                @click="edit('edit',row)"-->
+
+              <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+                <i
+                  class="el-icon-delete"
+                  :style="{color:$store.state.settings.theme}"
+                  style="margin-left: 15px;"
+                  @click="stepDel(row)"
+                />
+              </el-tooltip>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button v-waves @click="stepDialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button
+            v-waves
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="stepDialogVisibleConfirm"
+          >纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import waves from '@/directive/waves'
+import Pagination from '@/components/Pagination'
+import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import {
+  SaveTMaterielFile,
+  TMaterielAddUpdate,
+  TMaterielClassTree,
+  TMaterielClassTreeAddUpdate,
+  TMaterielClassTreeDelete,
+  TMaterielData, TMaterielDelete, TMaterielFileAssociationRoute
+} from '@/api/ProductModel'
+import arrayToTree from 'array-to-tree'
+import { StepData, UnitSerch, WareHouse } from '@/api/GeneralBasicData'
+import { SaveSearchMateriel_Info } from '@/api/ErpSyncMes'
+import $ from 'jquery'
+import Sortable from 'sortablejs'
+import ElDragSelect from '@/components/DragSelect'
+
+export default {
+  name: 'InventoryList',
+  directives: { waves, elDragDialog },
+  components: {
+    Pagination, ElDragSelect
+  },
+  data() {
+    return {
+      mouseHoverType: 'mouseout',
+      isExpandForm: false,
+      mainHeight: 0,
+      tableHeight: 0,
+      operation: '',
+
+      treeLeft: [
+        // {
+        //   code: '-1',
+        //   name: '鍏ㄩ儴'
+        // }
+      ], // 宸︿晶鏍�
+      treeLeftArr: [],
+      defaultPropsLeft: {
+        children: 'children',
+        label: 'name'
+      },
+
+      tableData: [],
+      form: {
+        inventoryclasscode: '',
+        partcode: '',
+        partname: '',
+        partspec: '',
+        page: 1,
+        rows: 20,
+        prop: 'lm_date', // 鎺掑簭瀛楁
+        order: 'desc' // 鎺掑簭瀛楁
+      },
+      total: 0,
+      dialogClassVisible: false,
+      dialogClassForm: {
+        data_sources: '', // 鏁版嵁鏉ユ簮:ERP/MES
+        inventoryclasscode: '', // 瀛樿揣鍒嗙被缂栫爜
+        inventoryclassname: '', // 瀛樿揣鍒嗙被鍚嶇О
+        parentcode: '', // 涓婄骇鍒嗙被缂栫爜
+        OperType: ''// OperType
+      },
+      classArr: [],
+      dialogClassFormRules: {
+        inventoryclasscode: [
+          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
+        ],
+        inventoryclassname: [
+          { required: true, message: '璇疯緭瀛樿揣绫诲瀷鍚嶇О', trigger: ['blur', 'change'] }
+        ]
+      },
+
+      dialogVisible: false,
+      dialogForm: {
+        data_sources: 'MES', // 鏁版嵁鏉ユ簮锛汦RP/MES
+        partcode: '', // 瀛樿揣缂栫爜
+        partname: '', // 瀛樿揣鍚嶇О
+        partspec: '', // 瑙勬牸鍨嬪彿
+        inventoryclasscode: '', // 瀛樿揣绫诲瀷缂栫爜
+        unittypcode: '1', // 璁¢噺鏂瑰紡(0:澶氳閲�,1:鍗曡閲�)
+        unitcode: '', // 璁¢噺鍗曚綅缂栫爜/璁¢噺鍗曚綅缁勭紪鐮�
+        unitsubcode: '', // 璁¢噺鍗曚綅缁勫瓙椤圭紪鐮侊紙瀵瑰簲鐨勬槸  涓昏閲忓崟浣嶇紪鐮侊級
+        idSubUnitByReport: '', // 鎶ヨ〃杈呭崟浣嶇紪鐮�
+        idUnitByStock: '', // 搴撳瓨甯哥敤鍗曚綅缂栫爜
+        idUnitByPurchase: '', // 閲囪喘甯哥敤鍗曚綅缂栫爜
+        idUnitBySale: '', // 閿�鍞父鐢ㄥ崟浣嶇紪鐮�
+        idunitbymanufacture: '', // 鐢熶骇甯哥敤鍗曚綅
+        isPurchase: false, // 鏄惁澶栬喘: 0(鍚�)1(鏄�)
+        isSale: false, // 鏄惁閿�鍞�:0(鍚�)1(鏄�)
+        isMadeSelf: false, // 鏄惁鑷埗: 0(鍚�)1(鏄�)
+        isMaterial: false, // 鏄惁鐢熶骇鑰楃敤: 0(鍚�)1(鏄�)
+        isMadeRequest: false, // 鏄惁濮斿锛�0(鍚�)1(鏄�)
+        idwarehouse: '', // 浠撳簱缂栫爜
+        status: '0', // 浣跨敤鐘舵��: 姝e父(0)鍋滅敤(1)
+        OperType: '' // 鎿嶄綔绫诲瀷
+      },
+      dialogFormRules: {
+        partcode: [
+          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
+        ],
+        partname: [
+          { required: true, message: '璇疯緭鍏ョ粍缁囧悕绉�', trigger: ['blur', 'change'] }
+        ],
+        unitcode: [
+          { required: true, message: '璇烽�夋嫨璁¢噺鍗曚綅(缁�)', trigger: ['blur', 'change'] }
+        ],
+        inventoryclasscode: [
+          { required: true, message: '璇烽�夋嫨鎵�灞炲崟浣�', trigger: ['blur', 'change'] }
+        ]
+      },
+      unittypcodeArr: [
+        { code: '1', name: '鍗曡閲�' },
+        { code: '0', name: '澶氳閲�' }
+      ],
+      unitcodeSingleArr: [],
+      unitcodeGroupArr: [],
+      idSubUnitByReportArr: [],
+      idUnitBvStockArr: [],
+      idwarehouseArr: [],
+
+      // 宸ヨ壓
+      dialogVisibleRoute: false,
+      dialogFormRoute: {
+        projectName: '', // 浜у搧鍚嶇О
+        projectCode: '', // 浜у搧浠g爜
+        routeOperationArr: [] // 宸ヨ壓璺嚎闆嗗悎
+        // routeOperationSelectedArr: [] // 宸ヨ壓璺嚎閫変腑闆嗗悎鏁扮粍
+      },
+      defaultroute_code: '', // 榛樿宸ヨ壓璺嚎閫変腑鍊�
+      defaultroute_codeArr: '', // 榛樿宸ヨ壓璺嚎鏁扮粍
+      projectTableData: [], // 宸ュ簭鍒楄〃
+      mesSetting: JSON.parse(localStorage.getItem('mesSetting')),
+
+      // 鎸夊伐搴忚蛋
+      dialogVisibleStep: false,
+      stepTableData: [],
+      sortable: null,
+      stepSelectArr: [], // 宸ュ簭涓嬫媺鏁版嵁
+      stepSelectedValue: [] // 宸ュ簭涓嬫媺閫変腑鍊�
+    }
+  },
+  watch: {
+    'stepSelectedValue': {
+      // deep: true,
+      handler: function(val) {
+        // do something with the new and old value of stepSelectedValue
+        console.log(val, 1)
+        const arr = JSON.parse(JSON.stringify(this.stepTableData))
+        const arrStepcode = arr.map(i => i.stepcode)
+        this.stepTableData = []
+        val.forEach(i => {
+          this.stepTableData.push(
+            {
+              stepcode: i,
+              stepname: this.stepSelectArr.find(j => j.stepcode === i).stepname
+              // stepprice: arrStepcode.includes(i) ? arr.find(j => j.stepcode === i).stepprice : 0
+            }
+          )
+        })
+      }
+    }
+  },
+
+  activated() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  created() {
+
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+
+    this.getTMaterielClassTree()
+    this.getSelectApi()
+  },
+  methods: {
+    // 宸ヨ壓鐐瑰嚮 ,鎸夊伐搴忚蛋
+    async routeClick2(row) {
+      this.dialogVisibleStep = true
+      this.dialogFormRoute.projectCode = row.partcode
+
+      const res = await TMaterielFileAssociationRoute({ partcode: this.dialogFormRoute.projectCode })
+      if (res.code === '200' && res.data.length > 0) {
+        this.stepSelectedValue = res.data.map(i => i.step_code)
+      }
+
+      // 鎷栧姩琛ㄦ牸
+      this.$nextTick(() => {
+        this.setSort()
+      })
+    },
+
+    stepDialogVisibleCancel() {
+      this.dialogVisibleStep = false
+    },
+
+    async stepDialogVisibleConfirm() {
+      if (this.stepSelectedValue.length === 0) {
+        return this.$message.info('宸ュ簭鑷冲皯瑕佹湁涓�閬擄紒')
+      }
+      const children = []
+      this.stepSelectedValue.forEach((item, index) => {
+        const t = this.stepSelectArr.find(i => i.stepcode === item)
+        children.push({
+          'code': t.stepcode,
+          'name': t.stepname,
+          'seq': index + 1,
+          'isbott': index === 0 ? 'Y' : 'N',
+          'isend': index === this.stepSelectedValue.length - 1 ? 'Y' : 'N'
+        })
+      })
+      const data = [
+        {
+          'partcode': this.dialogFormRoute.projectCode,
+          'defaultroute_code': '',
+          'children': children
+        }
+      ]
+      this.$store.state.app.buttonIsDisabled = true
+      const res = await SaveTMaterielFile(data)
+      if (res.code === '200') {
+        this.dialogVisibleStep = false
+        this.$message.success('淇濆瓨鎴愬姛锛�')
+        await this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
+        this.$store.state.app.buttonIsDisabled = false
+      }
+    },
+    // 宸ュ簭鍒犻櫎
+    stepDel(row) {
+      const index = this.stepSelectedValue.findIndex(i => i === row.stepcode)
+      this.stepSelectedValue.splice(index, 1)
+    },
+    handleCloseStep() {
+      this.stepTableData = []
+      this.sortable = null
+      this.stepSelectedValue = []
+    },
+
+    setSort() {
+      const el = this.$refs.stepTableDataRef.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
+      this.sortable = Sortable.create(el, {
+        ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
+        setData: function(dataTransfer) {
+          // to avoid Firefox bug
+          // Detail see : https://github.com/RubaXa/Sortable/issues/1012
+          dataTransfer.setData('Text', '')
+        },
+        onEnd: evt => {
+          const targetRow = this.stepTableData.splice(evt.oldIndex, 1)[0]
+          this.stepTableData.splice(evt.newIndex, 0, targetRow)
+
+          this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
+          // for show the changes, you can delete in you code
+          // const tempIndex = this.newList.splice(evt.oldIndex, 1)[0]
+          // this.newList.splice(evt.newIndex, 0, tempIndex)
+        }
+      })
+    },
+
+    tableRowClassName({ row, rowIndex }) {
+      return 'custom-row'
+    },
+
+    /* 鐐瑰嚮鍏宠仈宸ヨ壓璺嚎妯″潡*/
+    // 宸ヨ壓璺嚎鐐瑰嚮
+    routeClick(row) {
+      const loading = this.$loading({
+        lock: true,
+        text: '姝e湪鍔犺浇鏁版嵁锛岃绋嶇瓑...',
+        spinner: 'el-icon-loading',
+        customClass: 'osloading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+
+      this.defaultroute_code = row.default_route
+      this.dialogFormRoute.projectCode = row.partcode
+      this.dialogFormRoute.projectName = row.partname
+
+      TMaterielFileAssociationRoute({ partcode: this.dialogFormRoute.projectCode }).then(res => {
+        if (res.code === '200') {
+          setTimeout(() => {
+            loading.close()
+            this.dialogVisibleRoute = true
+            this.dialogFormRoute.routeOperationArr = res.data
+            // let waitFlag = false// 鍥炴樉绛夊緟鏄惁鏀捐
+
+            this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
+              item.isSelected1 = false
+              item.isSelected2 = false
+              if (index === 0) {
+                item.isSelected1 = true
+                this.projectTableData = item.Data
+              }
+              if (item.flag === 'Y') {
+                item.isSelected2 = true
+                this.$nextTick(() => {
+                  $('input:checkbox').eq(index).prop('checked', true)
+                })
+
+                // const interval = setInterval(() => {
+                //   if ($('input:checkbox').length > 0) {
+                //     waitFlag = true
+                //   }
+                //   if (waitFlag) {
+                //     clearInterval(interval)
+                //     this.$nextTick(() => {
+                //       $('input:checkbox').eq(index).prop('checked', true)
+                //     })
+                //   }
+                // }, 100)
+              }
+            })
+
+            this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.flag === 'Y')
+          }, 1000)
+        } else {
+          loading.close()
+        }
+      })
+    },
+    // 瀵硅瘽妗嗗叧闂�
+    handleCloseRoute() {
+      this.dialogFormRoute.routeOperationArr = []
+      this.defaultroute_codeArr = []
+    },
+    // 鍙栨秷
+    routeDialogVisibleCancel() {
+      this.dialogVisibleRoute = false
+    },
+    // 纭畾
+    async routeDialogVisibleConfirm() {
+      if (!this.defaultroute_code || this.defaultroute_code === 'null') {
+        return this.$message.info('榛樿宸ヨ壓璺嚎涓嶈兘涓虹┖锛�')
+      }
+
+      // 鎻愪氦鏍煎紡
+      const data = []
+      this.dialogFormRoute.routeOperationArr.forEach(item => {
+        if (item.isSelected2) {
+          data.push({ code: item.code, name: item.name })
+        }
+      })
+
+      const D = [{
+        'partcode': this.dialogFormRoute.projectCode,
+        'defaultroute_code': this.defaultroute_code,
+        'children': data
+      }]
+
+      this.$store.state.app.buttonIsDisabled = true
+      const res = await SaveTMaterielFile(D)
+      if (res.code === '200') {
+        this.dialogVisibleRoute = false
+        this.$message.success('淇濆瓨鎴愬姛锛�')
+        await this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
+        this.$store.state.app.buttonIsDisabled = false
+      }
+    },
+    // 澶х洅瀛愮偣鍑讳簨浠�
+    myCheckboxClick(val) {
+      console.log(val, 1)
+      this.dialogFormRoute.routeOperationArr.forEach(item => {
+        item.isSelected1 = val.code === item.code
+      })
+
+      this.projectTableData = val.Data
+    },
+    // 灏忕洅瀛愮偣鍑讳簨浠�
+    myCheckboxInputClick(val) {
+      // console.log(val, 2)
+      val.isSelected2 = !!val.isSelected2
+
+      this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
+        if (val.code === item.code) {
+          item.flag = !item.flag
+        }
+      })
+      if (val.code === this.defaultroute_code) {
+        this.defaultroute_code = ''
+      }
+      this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
+    },
+
+    async getSelectApi() {
+      const { data: res } = await UnitSerch({ tunittype: 'M' })
+      this.unitcodeGroupArr = res
+
+      const { data: res2 } = await UnitSerch({ tunittype: 'S' })
+      this.unitcodeSingleArr = res2
+
+      const { data: res3 } = await WareHouse()
+      this.idwarehouseArr = res3
+
+      // 鑾峰彇宸ュ簭
+      const { data: res4 } = await StepData()
+      this.stepSelectArr = res4
+    },
+
+    async getTMaterielClassTree() {
+      const res = await TMaterielClassTree()
+      res.data.forEach(i => {
+        i.code = i.code === '0' ? '-1' : i.code
+        i.idparent = i.idparent === '0' ? '-1' : i.idparent
+      })
+
+      this.treeLeftArr = res.data
+      // this.treeLeftArr.forEach(e => {
+      //   e.name = e.code + ' ' + e.name
+      // })
+      this.treeLeft = arrayToTree(this.treeLeft.concat(res.data), {
+        parentProperty: 'idparent',
+        customID: 'code',
+        childrenProperty: 'children'
+      })
+      this.$nextTick(() => {
+        this.$refs.treeLeftRef.setCurrentKey('-1')
+        this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
+      })
+    },
+    async getTMaterielData(node) {
+      const result = this.getChildrenCodeMethod(node, [])
+      if (result.includes('-1')) {
+        result.shift()
+      }
+      this.form.inventoryclasscode = result.join(',')
+      const res = await TMaterielData(this.form)
+
+      this.tableData = res.data
+      this.total = res.count
+    },
+
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 280
+        this.$refs.tableDataRef.doLayout()
+      })
+    },
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
+    },
+    // 鏂板鎸夐挳
+    add(operation) {
+      this.operation = operation
+      this.dialogVisible = true
+      this.dialogForm.OperType = 'Add'
+    },
+    // 淇敼鎸夐挳
+    async edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+      this.dialogForm.OperType = 'Update'
+
+      this.$nextTick(() => {
+        this.dialogForm.data_sources = row.data_sources
+        this.dialogForm.partcode = row.partcode
+        this.dialogForm.partname = row.partname
+        this.dialogForm.partspec = row.partspec
+        this.dialogForm.inventoryclasscode = row.idinventoryclasscode
+        this.dialogForm.unittypcode = row.isSingleUnit
+        // 璁¢噺鏂瑰紡(0:澶氳閲�,1:鍗曡閲�)
+        if (this.dialogForm.unittypcode === '1') {
+          this.dialogForm.unitcode = row.idunitcode
+          this.dialogForm.unitsubcode = ''
+          this.dialogForm.idSubUnitByReport = ''
+          const unitname = this.unitcodeSingleArr.find(i => i.unitcode === this.dialogForm.unitcode).unitname
+
+          this.dialogForm.idUnitByStock = unitname
+          this.dialogForm.idUnitByPurchase = unitname
+          this.dialogForm.idUnitBySale = unitname
+          this.dialogForm.idunitbymanufacture = unitname
+        }
+
+        if (this.dialogForm.unittypcode === '0') {
+          this.dialogForm.unitcode = row.idunitgroupcode
+
+          const t = this.unitcodeGroupArr.find(i => i.unitcode === this.dialogForm.unitcode).children
+
+          this.idSubUnitByReportArr = t.filter(i => i.isMainUnit !== '1')
+          this.idUnitBvStockArr = t
+
+          const mainUnitCode = t.find(i => i.isMainUnit === '1').unitcode
+          this.dialogForm.unitsubcode = mainUnitCode
+          this.dialogForm.idSubUnitByReport = this.idSubUnitByReportArr[0].unitcode
+
+          this.dialogForm.idUnitByStock = mainUnitCode
+          this.dialogForm.idUnitByPurchase = mainUnitCode
+          this.dialogForm.idUnitBySale = mainUnitCode
+          this.dialogForm.idunitbymanufacture = mainUnitCode
+        }
+
+        this.dialogForm.isPurchase = row.isPurchase === '1'
+        this.dialogForm.isSale = row.isSale === '1'
+        this.dialogForm.isMadeSelf = row.isMadeSelf === '1'
+        this.dialogForm.isMaterial = row.isMaterial === '1'
+        this.dialogForm.isMadeRequest = row.isMadeRequest === '1'
+
+        this.dialogForm.idwarehouse = row.idwarehousecode
+        this.dialogForm.status = row.status
+      })
+    },
+    del(row) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        TMaterielDelete({ partcode: row.partcode, data_sources: row.data_sources }).then(res => {
+          if (res.code === '200') {
+            this.$notify.success('鍒犻櫎鎴愬姛!')
+            this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
+          }
+        })
+      }).catch(() => {
+        this.$notify.info('宸插彇娑堝垹闄�')
+      })
+    },
+    reset() {
+      this.form.inventoryclasscode = ''
+      this.form.partcode = ''
+      this.form.partname = ''
+      this.form.partspec = ''
+      this.$refs.treeLeftRef.setCurrentKey('-1')
+      this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.dialogForm.data_sources = 'MES'
+      this.dialogForm.partcode = ''
+      this.dialogForm.partname = ''
+      this.dialogForm.partspec = ''
+      this.dialogForm.inventoryclasscode = ''
+      this.dialogForm.unittypcode = '1'
+      this.dialogForm.unitcode = ''
+      this.dialogForm.unitsubcode = ''
+      this.dialogForm.idSubUnitByReport = ''
+      this.dialogForm.idUnitByStock = ''
+      this.dialogForm.idUnitByPurchase = ''
+      this.dialogForm.idUnitBySale = ''
+      this.dialogForm.idunitbymanufacture = ''
+      this.dialogForm.isPurchase = false
+      this.dialogForm.isSale = false
+      this.dialogForm.isMadeSelf = false
+      this.dialogForm.isMaterial = false
+      this.dialogForm.isMadeRequest = false
+      this.dialogForm.idwarehouse = ''
+      this.dialogForm.status = '0'
+      this.$refs.dialogForm.clearValidate()
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          if (!(this.dialogForm.isPurchase || this.dialogForm.isSale || this.dialogForm.isMadeSelf || this.dialogForm.isMaterial || this.dialogForm.isMadeRequest)) {
+            return this.$message.info('瀛樿揣灞炴�т笉鑳戒负绌猴紒')
+          }
+          this.dialogForm.isPurchase = this.dialogForm.isPurchase ? '1' : '0'
+          this.dialogForm.isSale = this.dialogForm.isSale ? '1' : '0'
+          this.dialogForm.isMadeSelf = this.dialogForm.isMadeSelf ? '1' : '0'
+          this.dialogForm.isMaterial = this.dialogForm.isMaterial ? '1' : '0'
+          this.dialogForm.isMadeRequest = this.dialogForm.isMadeRequest ? '1' : '0'
+          // console.log(JSON.parse(JSON.stringify(this.dialogForm)), 1)
+
+          if (this.dialogForm.unittypcode === '1') {
+            this.dialogForm.idUnitByStock = this.dialogForm.unitcode
+            this.dialogForm.idUnitByPurchase = this.dialogForm.unitcode
+            this.dialogForm.idUnitBySale = this.dialogForm.unitcode
+            this.dialogForm.idunitbymanufacture = this.dialogForm.unitcode
+          }
+          this.$store.state.app.buttonIsDisabled = true
+          TMaterielAddUpdate(this.dialogForm).then(res => {
+            if (res.code === '200') {
+              this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.dialogVisible = false
+              this.$store.state.app.buttonIsDisabled = false
+              this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
+            } else {
+              this.$store.state.app.buttonIsDisabled = false
+              this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+            }
+          })
+        }
+      })
+    },
+
+    // 閫掑綊鍙栧瓙闆嗙殑鎵�鏈塩ode
+    getChildrenCodeMethod(node, result) {
+      result.push(node.code)
+      if (node.children && node.children.length > 0) {
+        node.children.forEach(i => {
+          this.getChildrenCodeMethod(i, result)
+        })
+      }
+      return result
+    },
+
+    treeEditClick(node, data, operation) {
+      this.dialogClassForm.data_sources = data.data_sources
+      this.dialogClassForm.inventoryclasscode = data.code
+      // this.dialogClassForm.inventoryclassname = data.name.split(' ')[1]
+      this.dialogClassForm.inventoryclassname = data.name
+      this.dialogClassForm.parentcode = data.idparent === '-1' ? '-1' : data.idparent
+      this.dialogClassForm.OperType = 'Update'
+      this.operation = operation
+      this.dialogClassVisible = true
+
+      this.treeLeftArr.forEach(i => {
+        i.disabled = i.code === data.code
+      })
+    },
+    treeDeleteClick(node, data) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        const result = this.getChildrenCodeMethod(data, [])
+        TMaterielClassTreeDelete({ inventoryclasscode: result.join(',') }).then(res => {
+          if (res.code === '200') {
+            this.$notify.success('鍒犻櫎鎴愬姛!')
+            this.getTMaterielClassTree()
+          }
+        })
+      }).catch(() => {
+        this.$notify.info('宸插彇娑堝垹闄�')
+      })
+    },
+    treeAddClick(operation) {
+      this.operation = operation
+      this.dialogClassVisible = true
+      this.dialogClassForm.OperType = 'Add'
+      this.dialogClassForm.data_sources = 'MES'
+    },
+
+    handleClassClose() {
+      this.dialogClassForm.data_sources = ''
+      this.dialogClassForm.inventoryclasscode = ''
+      this.dialogClassForm.inventoryclassname = ''
+      this.dialogClassForm.parentcode = ''
+      this.dialogClassForm.OperType = ''
+      this.$refs.dialogClassForm.clearValidate()
+    },
+    dialogVisibleClassCancel() {
+      this.dialogClassVisible = false
+    },
+    dialogVisibleClassConfirm() {
+      this.$refs.dialogClassForm.validate(valid => {
+        if (valid) {
+          TMaterielClassTreeAddUpdate(this.dialogClassForm).then(res => {
+            if (res.code === '200') {
+              this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.dialogClassVisible = false
+              this.$store.state.app.buttonIsDisabled = false
+              this.getTMaterielClassTree()
+            } else {
+              this.$store.state.app.buttonIsDisabled = false
+              this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+            }
+          })
+        }
+      })
+    },
+    unittypcodeChange(val) {
+      console.log(val)
+
+      this.dialogForm.unitcode = ''
+      this.dialogForm.unitsubcode = ''
+      this.dialogForm.idSubUnitByReport = ''
+      this.dialogForm.idUnitByStock = ''
+      this.dialogForm.idUnitByPurchase = ''
+      this.dialogForm.idUnitBySale = ''
+      this.dialogForm.idunitbymanufacture = ''
+      // this.$refs.dialogForm.clearValidate()
+      // this.$forceUpdate()
+    },
+    unitcodeChange(val, type) {
+      console.log(val)
+
+      if (type === '1') {
+        // this.dialogForm.unitcode = val
+        this.dialogForm.unitsubcode = ''
+        this.dialogForm.idSubUnitByReport = ''
+
+        const unitname = this.unitcodeSingleArr.find(i => i.unitcode === val).unitname
+
+        this.dialogForm.idUnitByStock = unitname
+        this.dialogForm.idUnitByPurchase = unitname
+        this.dialogForm.idUnitBySale = unitname
+        this.dialogForm.idunitbymanufacture = unitname
+        this.dialogForm.idSubUnitByReport = unitname
+      }
+
+      if (type === '0') {
+        const t = this.unitcodeGroupArr.find(i => i.unitcode === val).children
+
+        this.idSubUnitByReportArr = t.filter(i => i.isMainUnit !== '1')
+        this.idUnitBvStockArr = t
+
+        const mainUnitCode = t.find(i => i.isMainUnit === '1').unitcode
+        this.dialogForm.unitsubcode = mainUnitCode
+        this.dialogForm.idSubUnitByReport = this.idSubUnitByReportArr[0].unitcode
+
+        this.dialogForm.idUnitByStock = mainUnitCode
+        this.dialogForm.idUnitByPurchase = mainUnitCode
+        this.dialogForm.idUnitBySale = mainUnitCode
+        this.dialogForm.idunitbymanufacture = mainUnitCode
+      }
+    },
+    // 鍚屾ERP
+    syncERP() {
+      const loading = this.$loading({
+        lock: true,
+        text: '姝e湪鍚屾ERP锛岃绋嶇瓑...',
+        spinner: 'el-icon-loading',
+        customClass: 'osloading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+
+      SaveSearchMateriel_Info().then(res => {
+        if (res.code === '200') {
+          setTimeout(() => {
+            this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
+            this.getTMaterielClassTree()
+            loading.close()
+            this.$notify.success('鍚屾鎴愬姛锛�')
+          }, 2000)
+        }
+        // else if (res.code === '300') {
+        //   setTimeout(() => {
+        //     loading.close()
+        //     this.$message.error('鍚屾澶辫触锛�')
+        //   }, 10000)
+        // }
+      }).catch(e => {
+        loading.close()
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+$main_color: #42b983;
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
+}
+
+//::v-deep .el-checkbox__label {
+//  width: 55px;
+//}
+//
+.el-icon-plus:hover, .el-icon-edit:hover, .el-icon-delete:hover {
+  color: #000 !important;
+}
+
+.dialogVisibleRoute {
+  .myCheckboxGroup {
+    display: flex;
+    flex-wrap: wrap;
+
+    .myCheckbox {
+      //border: 1px solid $main_color;
+      border: 1px solid #eee;
+      display: flex;
+      min-width: 100px;
+      padding: 10px;
+      margin: 10px 30px 0 0;
+      border-radius: 5px;
+      cursor: default;
+      position: relative;
+
+      .myCheckboxInput {
+        margin: 1px 5px 0 0;
+        cursor: pointer;
+      }
+
+      .myCheckboxInputLabel {
+        position: absolute;
+        left: 29px;
+        padding: 5px;
+        top: 6px;
+        color: transparent;
+      }
+
+    }
+
+    //.myCheckbox{
+    //  border: 1px solid $main_color;
+    //}
+
+    input[type=checkbox] {
+      cursor: pointer;
+      position: relative;
+      width: 14px;
+      height: 14px;
+      font-size: 14px;
+    }
+
+    input[type=checkbox]::after {
+      position: absolute;
+      top: 0;
+      //color: rgb(130, 35, 35);
+      color: $main_color;
+      width: 14px;
+      height: 14px;
+      display: inline-block;
+      visibility: visible;
+      padding-left: 0px;
+      text-align: center;
+      content: ' ';
+      border-radius: 3px
+    }
+
+    input[type=checkbox]:checked::after {
+      //content: "鉁�";
+      content: "鈭�";
+      color: #fff;
+      font-size: 12px;
+      font-weight: bold;
+      background-color: $main_color;
+    }
+  }
+}
+
+.defaultroute_code ::v-deep .el-input__suffix-inner {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: -3px;
+}
+
+::v-deep .el-select__caret {
+  display: flex !important;
+  justify-content: center !important;
+  align-items: center !important;
+}
+
+</style>
diff --git a/src/views/materialManager/unitList.vue b/src/views/materialManager/unitList.vue
index 301ab2b..a16ee7f 100644
--- a/src/views/materialManager/unitList.vue
+++ b/src/views/materialManager/unitList.vue
@@ -1,689 +1,694 @@
-<template>
-  <div>
-    <div class="body" :style="{height:mainHeight+'px'}">
-      <div style="display: flex">
-        <!--        background:rgba(248,248,250,1);-->
-        <div style="width: 300px;margin: 10px 10px 0  0;background: #fff">
-
-          <div style="margin: 20px 10px 0 10px;display: flex;justify-content: space-between;">
-            <div style="display: flex;">
-              <div
-                style="width: 5px;height: 100%;border-radius: 5px;"
-                :style="{background:$store.state.settings.theme}"
-              />
-              <div style="margin-left: 8px;">璁¢噺鍗曚綅</div>
-            </div>
-
-            <!--            <div style="margin-right:10px">-->
-            <!--              <i class="el-icon-plus" style="cursor: pointer;color: #999" />-->
-            <!--            </div>-->
-
-          </div>
-
-          <el-tree
-            ref="treeLeftRef"
-            key="treeLeftKey"
-            style="padding: 10px;overflow: auto;"
-            :style="{height:(tableHeight+150)+'px'}"
-            :data="treeLeft"
-            node-key="code"
-            highlight-current
-            :props="defaultPropsLeft"
-            :default-expand-all="true"
-            :expand-on-click-node="false"
-            @node-click="nodeClick"
-          />
-
-        </div>
-
-        <div style="width: calc(100% - 300px)">
-          <div class="bodyTopButtonGroup">
-            <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
-            <el-button v-waves type="info" icon="el-icon-refresh" @click="getSaveSearchUnit">鍚屾璁¢噺鍗曚綅</el-button>
-          </div>
-
-          <div class="elTableDiv">
-            <el-table
-              ref="tableDataRef"
-              class="tableFixed"
-              :data="tableData"
-              :height="isExpandForm?tableHeight:(tableHeight+80)+'px'"
-              border
-              row-class-name="custom-row"
-              :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+80)+'px',}"
-              highlight-current-row
-              :header-cell-style="this.$headerCellStyle"
-              :cell-style="this.$cellStyle"
-              @sort-change="sortChange"
-            >
-              <el-table-column
-                prop="rowNum"
-                width="50"
-                fixed
-                label="搴忓彿"
-              />
-              <el-table-column
-                prop="code"
-                label="璁¢噺鍗曚綅缂栫爜"
-                sortable="custom"
-              >
-                <template slot-scope="{row}">
-                  {{ row.isGroup === '0' ? row.code :(!isMainUnitHidden?row.code:'') }}
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="name"
-                label="璁¢噺鍗曚綅鍚嶇О"
-                sortable="custom"
-              />
-              <el-table-column
-                v-if="!isMainUnitHidden"
-                prop="isMainUnit"
-                label="涓昏閲�"
-                sortable="custom"
-              >
-                <template slot-scope="{row}">
-                  {{ row.isMainUnit === '1' ? '鏄�' : '鍚�' }}
-                </template>
-              </el-table-column>
-              <el-table-column
-                v-if="!isMainUnitHidden"
-                prop="changeRate"
-                label="鎹㈢畻鐜�"
-                sortable="custom"
-              />
-
-              <!--              <el-table-column-->
-              <!--                prop="data_sources"-->
-              <!--                label="鏁版嵁鏉ユ簮"-->
-              <!--                sortable="custom"-->
-              <!--              />-->
-              <el-table-column
-                prop="lm_user"
-                label="鍒涘缓浜哄憳"
-                sortable="custom"
-              />
-              <el-table-column
-                prop="lm_date"
-                label="鍒涘缓鏃堕棿"
-                sortable="custom"
-              />
-              <el-table-column
-                label="鎿嶄綔"
-                width="120"
-                fixed="right"
-              >
-                <template slot-scope="{row}">
-                  <div class="operationClass">
-                    <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
-                      <i
-                        class="el-icon-edit-outline"
-                        :style="{color:$store.state.settings.theme}"
-                        @click="edit('edit',row)"
-                      />
-                    </el-tooltip>
-
-                    <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
-                      <i
-                        class="el-icon-delete"
-                        :style="{color:$store.state.settings.theme}"
-                        @click="del(row)"
-                      />
-                    </el-tooltip>
-                  </div>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-          <!--鍒嗛〉-->
-          <pagination
-            :total="total"
-            :page.sync="form.page"
-            :limit.sync="form.rows"
-            align="right"
-            layout="total,prev, pager, next,sizes,jumper"
-            popper-class="select_bottom"
-            @pagination="getTUnitData"
-          />
-        </div>
-
-      </div>
-
-    </div>
-
-    <el-dialog
-      v-el-drag-dialog
-      :title="operation==='add'?'鏂板':'缂栬緫'"
-      :visible.sync="dialogVisible"
-      width="800px"
-      :close-on-click-modal="false"
-      top="15vh"
-      @closed="handleClose"
-      @close="handleClose"
-    >
-      <el-form
-        ref="dialogForm"
-        inline
-        :rules="dialogFormRules"
-        :model="dialogForm"
-        label-width="120px"
-        style="display: flex;justify-content: space-between;align-content: flex-end"
-      >
-
-        <el-form-item :label="dialogForm.tunittype==='S'? '璁¢噺鍗曚綅鍚嶇О':'璁¢噺鍗曚綅缁勫悕绉�'" prop="unitname">
-          <el-input v-model="dialogForm.unitname" style="width: 200px" />
-        </el-form-item>
-
-        <el-form-item v-if="dialogForm.tunittype==='M'">
-          <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="tableDataDialogAdd">鏂板琛�
-          </el-button>
-        </el-form-item>
-
-      </el-form>
-
-      <div v-if="dialogForm.tunittype==='M'">
-        <el-table
-          ref="tableDataDialogRef"
-          class="tableFixed"
-          :data="tableDataDialog"
-          row-class-name="custom-row"
-          height="400"
-          border
-          :style="{width: 100+'%',height:'400px',}"
-          highlight-current-row
-          :header-cell-style="this.$headerCellStyle"
-          :cell-style="this.$cellStyle"
-        >
-
-          <el-table-column
-            type="index"
-            width="50"
-            fixed
-            label="搴忓彿"
-          />
-          <el-table-column
-            prop="unitname"
-            label="璁¢噺鍗曚綅鍚嶇О"
-          >
-            <template slot-scope="{row}">
-              <el-input
-                v-if="row.isVisible===1"
-                v-model="row.unitname"
-                placeholder="璇疯緭鍏�"
-              />
-              <div v-else> {{ row.unitname }}</div>
-            </template>
-
-          </el-table-column>
-          <el-table-column
-
-            label="涓昏閲�"
-            prop="checkboxSelected"
-          >
-            <template slot-scope="{row}">
-
-              <el-select
-                v-if="row.isVisible===1"
-                v-model="row.checkboxSelected"
-                :popper-append-to-body="false"
-                :disabled="row.checkboxSelected==='1'"
-                placeholder="璇烽�夋嫨"
-                filterable
-                @change="val=>checkboxSelectedChange(val,row)"
-              >
-                <el-option
-                  v-for="item in checkboxSelectedArr"
-                  :key="item.code"
-                  :label="item.name"
-                  :value="item.code"
-                />
-              </el-select>
-              <div v-else> {{ row.checkboxSelected === '1' ? '鏄�' : '鍚�' }}</div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="changeRate"
-            label="鎹㈢畻鐜�"
-          >
-            <template slot-scope="{row}">
-              <el-input
-                v-if="row.isVisible===1"
-                v-model="row.changeRate"
-                :disabled="row.checkboxSelected==='1'"
-                placeholder="璇疯緭鍏�"
-                oninput="value=value.replace(/[^0-9.]/g,'')"
-              />
-              <div v-else> {{ row.changeRate }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="rateDescription"
-            label="鎹㈢畻璇存槑"
-          />
-          <el-table-column
-            label="鎿嶄綔"
-            width="120"
-            fixed="right"
-          >
-            <template slot-scope="{row}">
-              <div class="operationClass">
-                <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
-                  <i
-                    v-if="row.isVisible===0&&tableDataDialog.filter(i=>i.isVisible===1).length===0"
-                    class="el-icon-edit-outline"
-                    :style="{color:$store.state.settings.theme}"
-                    @click="tableDataDialogEdit(row)"
-                  />
-                </el-tooltip>
-                <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
-                  <i
-                    v-if="row.isVisible===0&&tableDataDialog.filter(i=>i.isVisible===1).length===0"
-                    class="el-icon-delete"
-                    :style="{color:$store.state.settings.theme}"
-                    @click="tableDataDialogDel(row)"
-                  />
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="淇濆瓨" placement="top">
-                  <i
-                    v-if="row.isVisible===1"
-                    class="el-icon-circle-check"
-                    style="cursor:pointer;"
-                    :style="{color:$store.state.settings.theme}"
-                    @click="tableDataDialogSave(row)"
-                  />
-                </el-tooltip>
-              </div>
-            </template>
-          </el-table-column>
-
-        </el-table>
-
-      </div>
-
-      <span slot="footer" class="dialog-footer">
-        <div class="footerButton">
-          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
-          <el-button
-            v-waves
-            type="primary"
-            :loading="$store.state.app.buttonIsDisabled"
-            :disabled="$store.state.app.buttonIsDisabled"
-            @click="dialogVisibleConfirm"
-          >纭� 瀹�</el-button>
-        </div>
-      </span>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-import Pagination from '@/components/Pagination'
-import elDragDialog from '@/directive/el-drag-dialog'
-import waves from '@/directive/waves'
-import { SaveSearchUnit } from '@/api/ErpSyncMes'
-import { AddUpdateTUnit, DeleteTUnit, TUnitData, TUnitGroup, TUnitGroupProject } from '@/api/ProductModel'
-
-export default {
-  name: 'UnitList',
-  components: {
-    Pagination
-  },
-  directives: { elDragDialog, waves },
-  data() {
-    return {
-      // mouseHoverType: 'mouseout',
-      isExpandForm: false,
-      mainHeight: 0,
-      tableHeight: 0,
-      form: {
-        tunittype: '', // 鍗曡閲�(S) 澶氳閲�(M)
-        tunitgroupcode: '', // 璁¢噺鍗曚綅缁勭紪鐮�
-        prop: 'isGroup', // 鎺掑簭瀛楁
-        order: 'asc', // 鎺掑簭瀛楁
-        page: 1, // 绗嚑椤�
-        rows: 20 // 姣忛〉澶氬皯鏉�
-      },
-      total: 10,
-      tableData: [],
-      dialogVisible: false,
-      dialogForm: {
-        tunittype: '', // 鍗曡閲�(S) 澶氳閲�(M)
-        tunitgroupcode: '', // 璁¢噺鍗曚綅缁勭紪鐮�
-        unitcode: '',
-        unitname: '',
-        data_sources: 'MES'
-      },
-      operation: '',
-      dialogFormRules: {
-        unitname: [
-          { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
-        ]
-      },
-
-      defaultPropsLeft: {
-        children: 'children',
-        label: 'name'
-      },
-      treeLeft: [],
-
-      tableDataDialog: [],
-
-      checkboxSelectedArr: [
-        { code: '0', name: '鍚�' },
-        { code: '1', name: '鏄�' }
-      ],
-
-      isMainUnitHidden: true
-
-    }
-  },
-  activated() {
  window.addEventListener('resize', this.getHeight)
  this.getHeight()
},
created() {
-
-  },
-  mounted() {
-    window.addEventListener('resize', this.getHeight)
-    this.getHeight()
-    this.handleGetApi('')
-  },
-  methods: {
-    async handleGetApi(code) {
-      await this.getTUnitGroup(code)
-      await this.getTUnitData()
-    },
-    async getSaveSearchUnit() {
-      const res = await SaveSearchUnit()
-      if (res.code === '200') {
-        await this.handleGetApi(this.$refs.treeLeftRef.getCurrentKey())
-        this.$notify.success('璁¢噺鍗曚綅鍚屾鎴愬姛锛�')
-      }
-    },
-    async getTUnitGroup(code) {
-      const { data: res } = await TUnitGroup()
-
-      this.treeLeft = [
-        {
-          code: '', name: '鍏ㄩ儴', children: [
-            { code: 'S', name: '鍗曡閲�' },
-            { code: 'M', name: '澶氳閲�', children: res }
-          ]
-        }
-      ]
-      this.$nextTick(() => {
-        this.$refs.treeLeftRef.setCurrentKey(code)
-      })
-    },
-    async getTUnitData() {
-      const res = await TUnitData(this.form)
-
-      this.tableData = res.data
-      this.total = res.count
-    },
-
-    async getTUnitGroupProject(unitcode) {
-      const data = {
-        unitcode, isgroup: '1'
-      }
-      const res = await TUnitGroupProject(data)
-      res.data.forEach((i, index) => {
-        i.unitname = i.name
-        i.unitcode = i.code
-        i.uuid = new Date().getTime() + index
-        i.isVisible = 0
-        // i.idunitgroup = unitcode
-        i.checkboxSelected = i.isMainUnit === '1' ? '1' : '0'
-      })
-      this.tableDataDialog = res.data
-    },
-
-    // 鎺掑簭鏀瑰彉鏃�
-    sortChange({ column, prop, order }) {
-      if (order === 'descending') {
-        order = 'desc'
-      } else if (order === 'ascending') {
-        order = 'asc'
-      } else {
-        order = 'desc'
-      }
-      this.form.order = order
-      this.form.prop = prop
-      this.getTUnitData()
-    },
-    async nodeClick(obj, Node, VueComponent) {
-      if (obj.code === 'S' || obj.code === 'M' || obj.code === '') {
-        this.form.tunittype = obj.code
-        this.form.tunitgroupcode = ''
-        await this.getTUnitData(obj.code)
-        this.isMainUnitHidden = true
-        this.$nextTick(() => {
-          this.$refs.tableDataRef.doLayout()
-        })
-      } else {
-        this.form.tunittype = 'M'
-        this.form.tunitgroupcode = obj.code
-        await this.getTUnitData(obj.code)
-        this.isMainUnitHidden = false
-        this.$nextTick(() => {
-          this.$refs.tableDataRef.doLayout()
-        })
-      }
-    },
-    add(operation) {
-      if (this.$refs.treeLeftRef.getCurrentKey() === 'S' || this.$refs.treeLeftRef.getCurrentKey() === 'M') {
-        this.dialogForm.tunittype = this.$refs.treeLeftRef.getCurrentKey()
-      } else {
-        return this.$message.error('璇峰厛閫夋嫨鏍戜笂鐨勫崟璁¢噺鎴栧璁¢噺锛�')
-      }
-      this.operation = operation
-      this.dialogVisible = true
-      this.dialogForm.OperType = 'Add'
-    },
-    // 淇敼鎸夐挳
-    async edit(operation, row) {
-      this.operation = operation
-      this.dialogVisible = true
-      this.dialogForm.OperType = 'Update'
-
-      this.$nextTick(() => {
-        if (this.$refs.treeLeftRef.getCurrentKey() === 'S' || this.$refs.treeLeftRef.getCurrentKey() === 'M' || this.$refs.treeLeftRef.getCurrentKey() === '') {
-          this.dialogForm.tunittype = row.isGroup === '0' ? 'S' : 'M'
-          this.dialogForm.tunitgroupcode = row.isGroup === '0' ? row.code : row.idunitgroup
-          this.dialogForm.unitcode = row.code
-          this.dialogForm.unitname = row.name
-          this.dialogForm.data_sources = row.data_sources
-        } else {
-          this.dialogForm.tunittype = 'M'
-          this.dialogForm.tunitgroupcode = row.idunitgroup
-          this.dialogForm.unitcode = row.idunitgroup
-          this.dialogForm.unitname = this.treeLeft[0].children[1].children.find(i => i.code === this.$refs.treeLeftRef.getCurrentKey()).name
-          this.dialogForm.data_sources = row.data_sources
-        }
-
-        if (this.dialogForm.tunittype === 'M') {
-          this.getTUnitGroupProject(row.idunitgroup)
-        }
-      })
-    },
-
-    // 鍒犻櫎鎸夐挳
-    async del(row) {
-      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
-        confirmButtonText: '纭畾',
-        cancelButtonText: '鍙栨秷',
-        type: 'warning'
-      }).then(() => {
-        if (this.$refs.treeLeftRef.getCurrentKey() === 'S' || this.$refs.treeLeftRef.getCurrentKey() === 'M' || this.$refs.treeLeftRef.getCurrentKey() === '') {
-          // this.dialogForm.tunittype = this.$refs.treeLeftRef.getCurrentKey()
-        } else {
-          if (row.isMainUnit === '1' || this.tableData.length === 2) {
-            return this.$message.info('璁¢噺鍗曚綅缁勪笅锛屽繀椤绘湁涓�涓富璁¢噺鍜岃嚦灏戜竴涓緟璁¢噺锛�')
-          }
-        }
-
-        const data = {
-          data_sources: row.data_sources,
-          tunittype: row.isGroup === '0' ? 'S' : 'M',
-
-          tunitgroupcode: row.isGroup === '0' ? '' : row.idunitgroup,
-          tunitcode: row.isGroup === '0' ? row.code : (this.$refs.treeLeftRef.getCurrentKey() === 'M' ? '' : row.code)
-        }
-        DeleteTUnit(data).then(res => {
-          if (res.code === '200') {
-            this.$notify.success('鍒犻櫎鎴愬姛!')
-            if (this.form.page > 1 && this.tableData.length === 1) {
-              this.form.page--
-            }
-
-            this.handleGetApi(this.$refs.treeLeftRef.getCurrentKey())
-          }
-        })
-      }).catch(() => {
-        this.$notify.info('宸插彇娑堝垹闄�')
-      })
-    },
-    // 瀵硅瘽妗嗗叧闂簨浠�
-    handleClose() {
-      this.dialogForm.tunittype = ''
-      this.dialogForm.tunitgroupcode = ''
-      this.dialogForm.unitcode = ''
-      this.dialogForm.unitname = ''
-      this.dialogForm.data_sources = 'MES'
-      this.tableDataDialog = []
-      this.$refs.dialogForm.clearValidate()
-    },
-    // 瀵硅瘽妗嗗彇娑�
-    dialogVisibleCancel() {
-      this.dialogVisible = false
-    },
-    // 瀵硅瘽妗嗙‘璁�
-    dialogVisibleConfirm() {
-      this.$refs.dialogForm.validate(valid => {
-        if (valid) {
-          if (this.tableDataDialog.find(i => i.isVisible === 1)) {
-            return this.$message.info('璇峰厛淇濆瓨褰撳墠琛岋紒')
-          }
-
-          let data
-          if (this.dialogForm.tunittype === 'S') { // 鍗曡閲忔柊澧烇紝淇敼
-            data = [{
-              unitcode: this.dialogForm.unitcode,
-              unitname: this.dialogForm.unitname,
-              children: [
-                {
-                  'unitcode': this.dialogForm.unitcode,
-                  'unitname': this.dialogForm.unitname,
-                  'isMainUnit': '0',
-                  'changeRate': '1',
-                  'isSingleUnit': '1',
-                  'disabled': '0',
-                  'isGroup': '0',
-                  'rateDescription': '',
-                  'idunitgroup': ''
-                }
-              ]
-            }]
-          }
-          if (this.dialogForm.tunittype === 'M') { // 澶氳閲忔柊澧烇紝淇敼
-            if (this.tableDataDialog.length === 0) {
-              return this.$message.info('璁¢噺鍗曚綅缁勪腑鑷冲皯鍖呭惈涓�涓閲忓崟浣嶏紒')
-            }
-            if (this.tableDataDialog.length === 1) {
-              return this.$message.info('璁¢噺鍗曚綅缁勪笅锛屽繀椤绘湁涓�涓富璁¢噺鍜岃嚦灏戜竴涓緟璁¢噺锛�')
-            }
-
-            this.tableDataDialog.forEach((i, index) => {
-              i.unitcode = i.unitcode ? i.unitcode : 'U' + index.toString()
-              i.isMainUnit = i.checkboxSelected === '1' ? '1' : '0'
-              i.isSingleUnit = '0'
-              i.disabled = '0'
-              i.isGroup = '1'
-              i.idunitgroup = this.dialogForm.tunitgroupcode
-            })
-            data = [{
-              unitcode: this.dialogForm.unitcode,
-              unitname: this.dialogForm.unitname,
-              children: this.tableDataDialog
-            }]
-          }
-          console.log(data)
-          this.$store.state.app.buttonIsDisabled = true
-          AddUpdateTUnit(data, this.dialogForm.data_sources, this.dialogForm.tunittype, this.dialogForm.tunitgroupcode, this.dialogForm.OperType).then(res => {
-            if (res.code === '200') {
-              this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
-              this.dialogVisible = false
-              this.$store.state.app.buttonIsDisabled = false
-              this.handleGetApi(this.$refs.treeLeftRef.getCurrentKey())
-            } else {
-              this.$store.state.app.buttonIsDisabled = false
-              this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
-            }
-          })
-        }
-      })
-    },
-
-    tableDataDialogAdd() {
-      if (this.tableDataDialog.find(i => i.isVisible === 1)) {
-        return this.$message.info('璇峰厛淇濆瓨涓婁竴鏉℃暟鎹紒')
-      }
-
-      this.tableDataDialog.push({
-        unitname: '',
-        changeRate: 1,
-        uuid: new Date().getTime(),
-        checkboxSelected: this.tableDataDialog.length === 0 ? '1' : '0',
-        isVisible: 1,
-        data_sources: 'MES'
-      })
-      console.log(this.tableDataDialog)
-    },
-    tableDataDialogEdit(row) {
-      row.isVisible = 1
-    },
-    tableDataDialogDel(row) {
-      if (row.checkboxSelected === '1') {
-        return this.$message.info('涓昏閲忓崟浣嶄笉鑳藉垹闄わ紒')
-      }
-      this.tableDataDialog = this.tableDataDialog.filter(i => i.uuid !== row.uuid)
-    },
-    tableDataDialogSave(row) {
-      if (!row.unitname) {
-        return this.$message.info('璁¢噺鍗曚綅鍚嶇О涓嶈兘涓虹┖锛�')
-      }
-      if (!row.changeRate) {
-        return this.$message.info('鎹㈢畻鐜囦笉鑳戒负绌猴紒')
-      }
-      if (this.tableDataDialog.filter(i => i.unitname === row.unitname).length > 1) {
-        return this.$message.info('澶氳閲忕粍鍐呰閲忓崟浣嶅悕绉颁笉鑳介噸澶嶏紒')
-      }
-      // console.log(row, 234)
-      row.isVisible = 0
-      if (this.tableDataDialog.length > 1) {
-        const unitname = this.tableDataDialog.find(i => i.checkboxSelected === '1').unitname
-        this.tableDataDialog.forEach(i => {
-          if (i.checkboxSelected === '0') {
-            i.rateDescription = '1' + i.unitname + '=' + i.changeRate + unitname
-          } else {
-            i.rateDescription = ''
-          }
-        })
-      }
-    },
-    checkboxSelectedChange(val, row) {
-      row.changeRate = 1
-      this.tableDataDialog.forEach(item => {
-        item.checkboxSelected = item.uuid === row.uuid ? '1' : '0'
-      })
-    },
-    // 鑾峰彇椤甸潰楂樺害
-    getHeight() {
-      this.$nextTick(() => {
-        this.mainHeight = window.innerHeight - 85
-        this.tableHeight = this.mainHeight - 220
-        this.$refs.tableDataRef.doLayout()
-      })
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+      <div style="display: flex">
+        <!--        background:rgba(248,248,250,1);-->
+        <div style="width: 300px;margin: 10px 10px 0  0;background: #fff">
+
+          <div style="margin: 20px 10px 0 10px;display: flex;justify-content: space-between;">
+            <div style="display: flex;">
+              <div
+                style="width: 5px;height: 100%;border-radius: 5px;"
+                :style="{background:$store.state.settings.theme}"
+              />
+              <div style="margin-left: 8px;">璁¢噺鍗曚綅</div>
+            </div>
+
+            <!--            <div style="margin-right:10px">-->
+            <!--              <i class="el-icon-plus" style="cursor: pointer;color: #999" />-->
+            <!--            </div>-->
+
+          </div>
+
+          <el-tree
+            ref="treeLeftRef"
+            key="treeLeftKey"
+            style="padding: 10px;overflow: auto;"
+            :style="{height:(tableHeight+150)+'px'}"
+            :data="treeLeft"
+            node-key="code"
+            highlight-current
+            :props="defaultPropsLeft"
+            :default-expand-all="true"
+            :expand-on-click-node="false"
+            @node-click="nodeClick"
+          />
+
+        </div>
+
+        <div style="width: calc(100% - 300px)">
+          <div class="bodyTopButtonGroup">
+            <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+            <el-button v-waves type="info" icon="el-icon-refresh" @click="getSaveSearchUnit">鍚屾璁¢噺鍗曚綅</el-button>
+          </div>
+
+          <div class="elTableDiv">
+            <el-table
+              ref="tableDataRef"
+              class="tableFixed"
+              :data="tableData"
+              :height="isExpandForm?tableHeight:(tableHeight+80)+'px'"
+              border
+              row-class-name="custom-row"
+              :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+80)+'px',}"
+              highlight-current-row
+              :header-cell-style="this.$headerCellStyle"
+              :cell-style="this.$cellStyle"
+              @sort-change="sortChange"
+            >
+              <el-table-column
+                prop="rowNum"
+                width="50"
+                fixed
+                label="搴忓彿"
+              />
+              <el-table-column
+                prop="code"
+                label="璁¢噺鍗曚綅缂栫爜"
+                sortable="custom"
+              >
+                <template slot-scope="{row}">
+                  {{ row.isGroup === '0' ? row.code : (!isMainUnitHidden ? row.code : '') }}
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="name"
+                label="璁¢噺鍗曚綅鍚嶇О"
+                sortable="custom"
+              />
+              <el-table-column
+                v-if="!isMainUnitHidden"
+                prop="isMainUnit"
+                label="涓昏閲�"
+                sortable="custom"
+              >
+                <template slot-scope="{row}">
+                  {{ row.isMainUnit === '1' ? '鏄�' : '鍚�' }}
+                </template>
+              </el-table-column>
+              <el-table-column
+                v-if="!isMainUnitHidden"
+                prop="changeRate"
+                label="鎹㈢畻鐜�"
+                sortable="custom"
+              />
+
+              <!--              <el-table-column-->
+              <!--                prop="data_sources"-->
+              <!--                label="鏁版嵁鏉ユ簮"-->
+              <!--                sortable="custom"-->
+              <!--              />-->
+              <el-table-column
+                prop="lm_user"
+                label="鍒涘缓浜哄憳"
+                sortable="custom"
+              />
+              <el-table-column
+                prop="lm_date"
+                label="鍒涘缓鏃堕棿"
+                sortable="custom"
+              />
+              <el-table-column
+                label="鎿嶄綔"
+                width="120"
+                fixed="right"
+              >
+                <template slot-scope="{row}">
+                  <div class="operationClass">
+                    <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+                      <i
+                        class="el-icon-edit-outline"
+                        :style="{color:$store.state.settings.theme}"
+                        @click="edit('edit',row)"
+                      />
+                    </el-tooltip>
+
+                    <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+                      <i
+                        class="el-icon-delete"
+                        :style="{color:$store.state.settings.theme}"
+                        @click="del(row)"
+                      />
+                    </el-tooltip>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <!--鍒嗛〉-->
+          <pagination
+            :total="total"
+            :page.sync="form.page"
+            :limit.sync="form.rows"
+            align="right"
+            layout="total,prev, pager, next,sizes,jumper"
+            popper-class="select_bottom"
+            @pagination="getTUnitData"
+          />
+        </div>
+
+      </div>
+
+    </div>
+
+    <el-dialog
+      v-el-drag-dialog
+      :title="operation==='add'?'鏂板':'缂栬緫'"
+      :visible.sync="dialogVisible"
+      width="800px"
+      :close-on-click-modal="false"
+      top="15vh"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+      <el-form
+        ref="dialogForm"
+        inline
+        :rules="dialogFormRules"
+        :model="dialogForm"
+        label-width="120px"
+        style="display: flex;justify-content: space-between;align-content: flex-end"
+      >
+
+        <el-form-item :label="dialogForm.tunittype==='S'? '璁¢噺鍗曚綅鍚嶇О':'璁¢噺鍗曚綅缁勫悕绉�'" prop="unitname">
+          <el-input v-model="dialogForm.unitname" style="width: 200px" />
+        </el-form-item>
+
+        <el-form-item v-if="dialogForm.tunittype==='M'">
+          <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="tableDataDialogAdd">鏂板琛�
+          </el-button>
+        </el-form-item>
+
+      </el-form>
+
+      <div v-if="dialogForm.tunittype==='M'">
+        <el-table
+          ref="tableDataDialogRef"
+          class="tableFixed"
+          :data="tableDataDialog"
+          row-class-name="custom-row"
+          height="400"
+          border
+          :style="{width: 100+'%',height:'400px',}"
+          highlight-current-row
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+        >
+
+          <el-table-column
+            type="index"
+            width="50"
+            fixed
+            label="搴忓彿"
+          />
+          <el-table-column
+            prop="unitname"
+            label="璁¢噺鍗曚綅鍚嶇О"
+          >
+            <template slot-scope="{row}">
+              <el-input
+                v-if="row.isVisible===1"
+                v-model="row.unitname"
+                placeholder="璇疯緭鍏�"
+              />
+              <div v-else> {{ row.unitname }}</div>
+            </template>
+
+          </el-table-column>
+          <el-table-column
+
+            label="涓昏閲�"
+            prop="checkboxSelected"
+          >
+            <template slot-scope="{row}">
+
+              <el-select
+                v-if="row.isVisible===1"
+                v-model="row.checkboxSelected"
+                :popper-append-to-body="false"
+                :disabled="row.checkboxSelected==='1'"
+                placeholder="璇烽�夋嫨"
+                filterable
+                @change="val=>checkboxSelectedChange(val,row)"
+              >
+                <el-option
+                  v-for="item in checkboxSelectedArr"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+              <div v-else> {{ row.checkboxSelected === '1' ? '鏄�' : '鍚�' }}</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="changeRate"
+            label="鎹㈢畻鐜�"
+          >
+            <template slot-scope="{row}">
+              <el-input
+                v-if="row.isVisible===1"
+                v-model="row.changeRate"
+                :disabled="row.checkboxSelected==='1'"
+                placeholder="璇疯緭鍏�"
+                oninput="value=value.replace(/[^0-9.]/g,'')"
+              />
+              <div v-else> {{ row.changeRate }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="rateDescription"
+            label="鎹㈢畻璇存槑"
+          />
+          <el-table-column
+            label="鎿嶄綔"
+            width="120"
+            fixed="right"
+          >
+            <template slot-scope="{row}">
+              <div class="operationClass">
+                <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+                  <i
+                    v-if="row.isVisible===0&&tableDataDialog.filter(i=>i.isVisible===1).length===0"
+                    class="el-icon-edit-outline"
+                    :style="{color:$store.state.settings.theme}"
+                    @click="tableDataDialogEdit(row)"
+                  />
+                </el-tooltip>
+                <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+                  <i
+                    v-if="row.isVisible===0&&tableDataDialog.filter(i=>i.isVisible===1).length===0"
+                    class="el-icon-delete"
+                    :style="{color:$store.state.settings.theme}"
+                    @click="tableDataDialogDel(row)"
+                  />
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="淇濆瓨" placement="top">
+                  <i
+                    v-if="row.isVisible===1"
+                    class="el-icon-circle-check"
+                    style="cursor:pointer;"
+                    :style="{color:$store.state.settings.theme}"
+                    @click="tableDataDialogSave(row)"
+                  />
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+
+        </el-table>
+
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button
+            v-waves
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleConfirm"
+          >纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import { SaveSearchUnit } from '@/api/ErpSyncMes'
+import { AddUpdateTUnit, DeleteTUnit, TUnitData, TUnitGroup, TUnitGroupProject } from '@/api/ProductModel'
+
+export default {
+  name: 'UnitList',
+  components: {
+    Pagination
+  },
+  directives: { elDragDialog, waves },
+  data() {
+    return {
+      // mouseHoverType: 'mouseout',
+      isExpandForm: false,
+      mainHeight: 0,
+      tableHeight: 0,
+      form: {
+        tunittype: 'S', // 鍗曡閲�(S) 澶氳閲�(M)
+        tunitgroupcode: '', // 璁¢噺鍗曚綅缁勭紪鐮�
+        prop: 'isGroup', // 鎺掑簭瀛楁
+        order: 'asc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+      total: 10,
+      tableData: [],
+      dialogVisible: false,
+      dialogForm: {
+        tunittype: '', // 鍗曡閲�(S) 澶氳閲�(M)
+        tunitgroupcode: '', // 璁¢噺鍗曚綅缁勭紪鐮�
+        unitcode: '',
+        unitname: '',
+        data_sources: 'MES'
+      },
+      operation: '',
+      dialogFormRules: {
+        unitname: [
+          { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+        ]
+      },
+
+      defaultPropsLeft: {
+        children: 'children',
+        label: 'name'
+      },
+      treeLeft: [],
+
+      tableDataDialog: [],
+
+      checkboxSelectedArr: [
+        { code: '0', name: '鍚�' },
+        { code: '1', name: '鏄�' }
+      ],
+
+      isMainUnitHidden: true
+
+    }
+  },
+  activated() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  created() {
+
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.handleGetApi('S')
+  },
+  methods: {
+    async handleGetApi(code) {
+      await this.getTUnitGroup(code)
+      await this.getTUnitData()
+    },
+    async getSaveSearchUnit() {
+      const res = await SaveSearchUnit()
+      if (res.code === '200') {
+        await this.handleGetApi(this.$refs.treeLeftRef.getCurrentKey())
+        this.$notify.success('璁¢噺鍗曚綅鍚屾鎴愬姛锛�')
+      }
+    },
+    async getTUnitGroup(code) {
+      // const { data: res } = await TUnitGroup()
+
+      this.treeLeft = [
+        {
+          code: 'S', name: '璁¢噺鍗曚綅'
+          // , children: [
+          //   { code: 'S', name: '璁¢噺鍗曚綅' }
+          //   // { code: 'M', name: '澶氳閲�', children: res }
+          // ]
+        }
+      ]
+      this.$nextTick(() => {
+        this.$refs.treeLeftRef.setCurrentKey(code)
+      })
+    },
+    async getTUnitData() {
+      const res = await TUnitData(this.form)
+
+      this.tableData = res.data
+      this.total = res.count
+    },
+
+    async getTUnitGroupProject(unitcode) {
+      const data = {
+        unitcode, isgroup: '1'
+      }
+      const res = await TUnitGroupProject(data)
+      res.data.forEach((i, index) => {
+        i.unitname = i.name
+        i.unitcode = i.code
+        i.uuid = new Date().getTime() + index
+        i.isVisible = 0
+        // i.idunitgroup = unitcode
+        i.checkboxSelected = i.isMainUnit === '1' ? '1' : '0'
+      })
+      this.tableDataDialog = res.data
+    },
+
+    // 鎺掑簭鏀瑰彉鏃�
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getTUnitData()
+    },
+    async nodeClick(obj, Node, VueComponent) {
+      if (obj.code === 'S' || obj.code === 'M' || obj.code === '') {
+        this.form.tunittype = obj.code
+        this.form.tunitgroupcode = ''
+        await this.getTUnitData(obj.code)
+        this.isMainUnitHidden = true
+        this.$nextTick(() => {
+          this.$refs.tableDataRef.doLayout()
+        })
+      } else {
+        this.form.tunittype = 'M'
+        this.form.tunitgroupcode = obj.code
+        await this.getTUnitData(obj.code)
+        this.isMainUnitHidden = false
+        this.$nextTick(() => {
+          this.$refs.tableDataRef.doLayout()
+        })
+      }
+    },
+    add(operation) {
+      if (this.$refs.treeLeftRef.getCurrentKey() === 'S' || this.$refs.treeLeftRef.getCurrentKey() === 'M') {
+        this.dialogForm.tunittype = this.$refs.treeLeftRef.getCurrentKey()
+      } else {
+        return this.$message.error('璇峰厛閫夋嫨鏍戜笂鐨勫崟璁¢噺鎴栧璁¢噺锛�')
+      }
+      this.operation = operation
+      this.dialogVisible = true
+      this.dialogForm.OperType = 'Add'
+    },
+    // 淇敼鎸夐挳
+    async edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+      this.dialogForm.OperType = 'Update'
+
+      this.$nextTick(() => {
+        if (this.$refs.treeLeftRef.getCurrentKey() === 'S' || this.$refs.treeLeftRef.getCurrentKey() === 'M' || this.$refs.treeLeftRef.getCurrentKey() === '') {
+          this.dialogForm.tunittype = row.isGroup === '0' ? 'S' : 'M'
+          this.dialogForm.tunitgroupcode = row.isGroup === '0' ? row.code : row.idunitgroup
+          this.dialogForm.unitcode = row.code
+          this.dialogForm.unitname = row.name
+          this.dialogForm.data_sources = row.data_sources
+        } else {
+          this.dialogForm.tunittype = 'M'
+          this.dialogForm.tunitgroupcode = row.idunitgroup
+          this.dialogForm.unitcode = row.idunitgroup
+          this.dialogForm.unitname = this.treeLeft[0].children[1].children.find(i => i.code === this.$refs.treeLeftRef.getCurrentKey()).name
+          this.dialogForm.data_sources = row.data_sources
+        }
+
+        if (this.dialogForm.tunittype === 'M') {
+          this.getTUnitGroupProject(row.idunitgroup)
+        }
+      })
+    },
+
+    // 鍒犻櫎鎸夐挳
+    async del(row) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        if (this.$refs.treeLeftRef.getCurrentKey() === 'S' || this.$refs.treeLeftRef.getCurrentKey() === 'M' || this.$refs.treeLeftRef.getCurrentKey() === '') {
+          // this.dialogForm.tunittype = this.$refs.treeLeftRef.getCurrentKey()
+        } else {
+          if (row.isMainUnit === '1' || this.tableData.length === 2) {
+            return this.$message.info('璁¢噺鍗曚綅缁勪笅锛屽繀椤绘湁涓�涓富璁¢噺鍜岃嚦灏戜竴涓緟璁¢噺锛�')
+          }
+        }
+
+        const data = {
+          data_sources: row.data_sources,
+          tunittype: row.isGroup === '0' ? 'S' : 'M',
+
+          tunitgroupcode: row.isGroup === '0' ? '' : row.idunitgroup,
+          tunitcode: row.isGroup === '0' ? row.code : (this.$refs.treeLeftRef.getCurrentKey() === 'M' ? '' : row.code)
+        }
+        DeleteTUnit(data).then(res => {
+          if (res.code === '200') {
+            this.$notify.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
+
+            this.handleGetApi(this.$refs.treeLeftRef.getCurrentKey())
+          }
+        })
+      }).catch(() => {
+        this.$notify.info('宸插彇娑堝垹闄�')
+      })
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.dialogForm.tunittype = ''
+      this.dialogForm.tunitgroupcode = ''
+      this.dialogForm.unitcode = ''
+      this.dialogForm.unitname = ''
+      this.dialogForm.data_sources = 'MES'
+      this.tableDataDialog = []
+      this.$refs.dialogForm.clearValidate()
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          if (this.tableDataDialog.find(i => i.isVisible === 1)) {
+            return this.$message.info('璇峰厛淇濆瓨褰撳墠琛岋紒')
+          }
+
+          let data
+          if (this.dialogForm.tunittype === 'S') { // 鍗曡閲忔柊澧烇紝淇敼
+            data = [{
+              unitcode: this.dialogForm.unitcode,
+              unitname: this.dialogForm.unitname,
+              children: [
+                {
+                  'unitcode': this.dialogForm.unitcode,
+                  'unitname': this.dialogForm.unitname,
+                  'isMainUnit': '0',
+                  'changeRate': '1',
+                  'isSingleUnit': '1',
+                  'disabled': '0',
+                  'isGroup': '0',
+                  'rateDescription': '',
+                  'idunitgroup': ''
+                }
+              ]
+            }]
+          }
+          if (this.dialogForm.tunittype === 'M') { // 澶氳閲忔柊澧烇紝淇敼
+            if (this.tableDataDialog.length === 0) {
+              return this.$message.info('璁¢噺鍗曚綅缁勪腑鑷冲皯鍖呭惈涓�涓閲忓崟浣嶏紒')
+            }
+            if (this.tableDataDialog.length === 1) {
+              return this.$message.info('璁¢噺鍗曚綅缁勪笅锛屽繀椤绘湁涓�涓富璁¢噺鍜岃嚦灏戜竴涓緟璁¢噺锛�')
+            }
+
+            this.tableDataDialog.forEach((i, index) => {
+              i.unitcode = i.unitcode ? i.unitcode : 'U' + index.toString()
+              i.isMainUnit = i.checkboxSelected === '1' ? '1' : '0'
+              i.isSingleUnit = '0'
+              i.disabled = '0'
+              i.isGroup = '1'
+              i.idunitgroup = this.dialogForm.tunitgroupcode
+            })
+            data = [{
+              unitcode: this.dialogForm.unitcode,
+              unitname: this.dialogForm.unitname,
+              children: this.tableDataDialog
+            }]
+          }
+          console.log(data)
+          this.$store.state.app.buttonIsDisabled = true
+          AddUpdateTUnit(data, this.dialogForm.data_sources, this.dialogForm.tunittype, this.dialogForm.tunitgroupcode, this.dialogForm.OperType).then(res => {
+            if (res.code === '200') {
+              this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.dialogVisible = false
+              this.$store.state.app.buttonIsDisabled = false
+              this.handleGetApi(this.$refs.treeLeftRef.getCurrentKey())
+            } else {
+              this.$store.state.app.buttonIsDisabled = false
+              this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+            }
+          })
+        }
+      })
+    },
+
+    tableDataDialogAdd() {
+      if (this.tableDataDialog.find(i => i.isVisible === 1)) {
+        return this.$message.info('璇峰厛淇濆瓨涓婁竴鏉℃暟鎹紒')
+      }
+
+      this.tableDataDialog.push({
+        unitname: '',
+        changeRate: 1,
+        uuid: new Date().getTime(),
+        checkboxSelected: this.tableDataDialog.length === 0 ? '1' : '0',
+        isVisible: 1,
+        data_sources: 'MES'
+      })
+      console.log(this.tableDataDialog)
+    },
+    tableDataDialogEdit(row) {
+      row.isVisible = 1
+    },
+    tableDataDialogDel(row) {
+      if (row.checkboxSelected === '1') {
+        return this.$message.info('涓昏閲忓崟浣嶄笉鑳藉垹闄わ紒')
+      }
+      this.tableDataDialog = this.tableDataDialog.filter(i => i.uuid !== row.uuid)
+    },
+    tableDataDialogSave(row) {
+      if (!row.unitname) {
+        return this.$message.info('璁¢噺鍗曚綅鍚嶇О涓嶈兘涓虹┖锛�')
+      }
+      if (!row.changeRate) {
+        return this.$message.info('鎹㈢畻鐜囦笉鑳戒负绌猴紒')
+      }
+      if (this.tableDataDialog.filter(i => i.unitname === row.unitname).length > 1) {
+        return this.$message.info('澶氳閲忕粍鍐呰閲忓崟浣嶅悕绉颁笉鑳介噸澶嶏紒')
+      }
+      // console.log(row, 234)
+      row.isVisible = 0
+      if (this.tableDataDialog.length > 1) {
+        const unitname = this.tableDataDialog.find(i => i.checkboxSelected === '1').unitname
+        this.tableDataDialog.forEach(i => {
+          if (i.checkboxSelected === '0') {
+            i.rateDescription = '1' + i.unitname + '=' + i.changeRate + unitname
+          } else {
+            i.rateDescription = ''
+          }
+        })
+      }
+    },
+    checkboxSelectedChange(val, row) {
+      row.changeRate = 1
+      this.tableDataDialog.forEach(item => {
+        item.checkboxSelected = item.uuid === row.uuid ? '1' : '0'
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 220
+        this.$refs.tableDataRef.doLayout()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/materialManager/unitListBack.vue b/src/views/materialManager/unitListBack.vue
new file mode 100644
index 0000000..20be9ca
--- /dev/null
+++ b/src/views/materialManager/unitListBack.vue
@@ -0,0 +1,693 @@
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+      <div style="display: flex">
+        <!--        background:rgba(248,248,250,1);-->
+        <div style="width: 300px;margin: 10px 10px 0  0;background: #fff">
+
+          <div style="margin: 20px 10px 0 10px;display: flex;justify-content: space-between;">
+            <div style="display: flex;">
+              <div
+                style="width: 5px;height: 100%;border-radius: 5px;"
+                :style="{background:$store.state.settings.theme}"
+              />
+              <div style="margin-left: 8px;">璁¢噺鍗曚綅</div>
+            </div>
+
+            <!--            <div style="margin-right:10px">-->
+            <!--              <i class="el-icon-plus" style="cursor: pointer;color: #999" />-->
+            <!--            </div>-->
+
+          </div>
+
+          <el-tree
+            ref="treeLeftRef"
+            key="treeLeftKey"
+            style="padding: 10px;overflow: auto;"
+            :style="{height:(tableHeight+150)+'px'}"
+            :data="treeLeft"
+            node-key="code"
+            highlight-current
+            :props="defaultPropsLeft"
+            :default-expand-all="true"
+            :expand-on-click-node="false"
+            @node-click="nodeClick"
+          />
+
+        </div>
+
+        <div style="width: calc(100% - 300px)">
+          <div class="bodyTopButtonGroup">
+            <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+            <el-button v-waves type="info" icon="el-icon-refresh" @click="getSaveSearchUnit">鍚屾璁¢噺鍗曚綅</el-button>
+          </div>
+
+          <div class="elTableDiv">
+            <el-table
+              ref="tableDataRef"
+              class="tableFixed"
+              :data="tableData"
+              :height="isExpandForm?tableHeight:(tableHeight+80)+'px'"
+              border
+              row-class-name="custom-row"
+              :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+80)+'px',}"
+              highlight-current-row
+              :header-cell-style="this.$headerCellStyle"
+              :cell-style="this.$cellStyle"
+              @sort-change="sortChange"
+            >
+              <el-table-column
+                prop="rowNum"
+                width="50"
+                fixed
+                label="搴忓彿"
+              />
+              <el-table-column
+                prop="code"
+                label="璁¢噺鍗曚綅缂栫爜"
+                sortable="custom"
+              >
+                <template slot-scope="{row}">
+                  {{ row.isGroup === '0' ? row.code : (!isMainUnitHidden ? row.code : '') }}
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="name"
+                label="璁¢噺鍗曚綅鍚嶇О"
+                sortable="custom"
+              />
+              <el-table-column
+                v-if="!isMainUnitHidden"
+                prop="isMainUnit"
+                label="涓昏閲�"
+                sortable="custom"
+              >
+                <template slot-scope="{row}">
+                  {{ row.isMainUnit === '1' ? '鏄�' : '鍚�' }}
+                </template>
+              </el-table-column>
+              <el-table-column
+                v-if="!isMainUnitHidden"
+                prop="changeRate"
+                label="鎹㈢畻鐜�"
+                sortable="custom"
+              />
+
+              <!--              <el-table-column-->
+              <!--                prop="data_sources"-->
+              <!--                label="鏁版嵁鏉ユ簮"-->
+              <!--                sortable="custom"-->
+              <!--              />-->
+              <el-table-column
+                prop="lm_user"
+                label="鍒涘缓浜哄憳"
+                sortable="custom"
+              />
+              <el-table-column
+                prop="lm_date"
+                label="鍒涘缓鏃堕棿"
+                sortable="custom"
+              />
+              <el-table-column
+                label="鎿嶄綔"
+                width="120"
+                fixed="right"
+              >
+                <template slot-scope="{row}">
+                  <div class="operationClass">
+                    <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+                      <i
+                        class="el-icon-edit-outline"
+                        :style="{color:$store.state.settings.theme}"
+                        @click="edit('edit',row)"
+                      />
+                    </el-tooltip>
+
+                    <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+                      <i
+                        class="el-icon-delete"
+                        :style="{color:$store.state.settings.theme}"
+                        @click="del(row)"
+                      />
+                    </el-tooltip>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <!--鍒嗛〉-->
+          <pagination
+            :total="total"
+            :page.sync="form.page"
+            :limit.sync="form.rows"
+            align="right"
+            layout="total,prev, pager, next,sizes,jumper"
+            popper-class="select_bottom"
+            @pagination="getTUnitData"
+          />
+        </div>
+
+      </div>
+
+    </div>
+
+    <el-dialog
+      v-el-drag-dialog
+      :title="operation==='add'?'鏂板':'缂栬緫'"
+      :visible.sync="dialogVisible"
+      width="800px"
+      :close-on-click-modal="false"
+      top="15vh"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+      <el-form
+        ref="dialogForm"
+        inline
+        :rules="dialogFormRules"
+        :model="dialogForm"
+        label-width="120px"
+        style="display: flex;justify-content: space-between;align-content: flex-end"
+      >
+
+        <el-form-item :label="dialogForm.tunittype==='S'? '璁¢噺鍗曚綅鍚嶇О':'璁¢噺鍗曚綅缁勫悕绉�'" prop="unitname">
+          <el-input v-model="dialogForm.unitname" style="width: 200px" />
+        </el-form-item>
+
+        <el-form-item v-if="dialogForm.tunittype==='M'">
+          <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="tableDataDialogAdd">鏂板琛�
+          </el-button>
+        </el-form-item>
+
+      </el-form>
+
+      <div v-if="dialogForm.tunittype==='M'">
+        <el-table
+          ref="tableDataDialogRef"
+          class="tableFixed"
+          :data="tableDataDialog"
+          row-class-name="custom-row"
+          height="400"
+          border
+          :style="{width: 100+'%',height:'400px',}"
+          highlight-current-row
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+        >
+
+          <el-table-column
+            type="index"
+            width="50"
+            fixed
+            label="搴忓彿"
+          />
+          <el-table-column
+            prop="unitname"
+            label="璁¢噺鍗曚綅鍚嶇О"
+          >
+            <template slot-scope="{row}">
+              <el-input
+                v-if="row.isVisible===1"
+                v-model="row.unitname"
+                placeholder="璇疯緭鍏�"
+              />
+              <div v-else> {{ row.unitname }}</div>
+            </template>
+
+          </el-table-column>
+          <el-table-column
+
+            label="涓昏閲�"
+            prop="checkboxSelected"
+          >
+            <template slot-scope="{row}">
+
+              <el-select
+                v-if="row.isVisible===1"
+                v-model="row.checkboxSelected"
+                :popper-append-to-body="false"
+                :disabled="row.checkboxSelected==='1'"
+                placeholder="璇烽�夋嫨"
+                filterable
+                @change="val=>checkboxSelectedChange(val,row)"
+              >
+                <el-option
+                  v-for="item in checkboxSelectedArr"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+              <div v-else> {{ row.checkboxSelected === '1' ? '鏄�' : '鍚�' }}</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="changeRate"
+            label="鎹㈢畻鐜�"
+          >
+            <template slot-scope="{row}">
+              <el-input
+                v-if="row.isVisible===1"
+                v-model="row.changeRate"
+                :disabled="row.checkboxSelected==='1'"
+                placeholder="璇疯緭鍏�"
+                oninput="value=value.replace(/[^0-9.]/g,'')"
+              />
+              <div v-else> {{ row.changeRate }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="rateDescription"
+            label="鎹㈢畻璇存槑"
+          />
+          <el-table-column
+            label="鎿嶄綔"
+            width="120"
+            fixed="right"
+          >
+            <template slot-scope="{row}">
+              <div class="operationClass">
+                <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+                  <i
+                    v-if="row.isVisible===0&&tableDataDialog.filter(i=>i.isVisible===1).length===0"
+                    class="el-icon-edit-outline"
+                    :style="{color:$store.state.settings.theme}"
+                    @click="tableDataDialogEdit(row)"
+                  />
+                </el-tooltip>
+                <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+                  <i
+                    v-if="row.isVisible===0&&tableDataDialog.filter(i=>i.isVisible===1).length===0"
+                    class="el-icon-delete"
+                    :style="{color:$store.state.settings.theme}"
+                    @click="tableDataDialogDel(row)"
+                  />
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="淇濆瓨" placement="top">
+                  <i
+                    v-if="row.isVisible===1"
+                    class="el-icon-circle-check"
+                    style="cursor:pointer;"
+                    :style="{color:$store.state.settings.theme}"
+                    @click="tableDataDialogSave(row)"
+                  />
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+
+        </el-table>
+
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button
+            v-waves
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleConfirm"
+          >纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import { SaveSearchUnit } from '@/api/ErpSyncMes'
+import { AddUpdateTUnit, DeleteTUnit, TUnitData, TUnitGroup, TUnitGroupProject } from '@/api/ProductModel'
+
+export default {
+  name: 'UnitList',
+  components: {
+    Pagination
+  },
+  directives: { elDragDialog, waves },
+  data() {
+    return {
+      // mouseHoverType: 'mouseout',
+      isExpandForm: false,
+      mainHeight: 0,
+      tableHeight: 0,
+      form: {
+        tunittype: '', // 鍗曡閲�(S) 澶氳閲�(M)
+        tunitgroupcode: '', // 璁¢噺鍗曚綅缁勭紪鐮�
+        prop: 'isGroup', // 鎺掑簭瀛楁
+        order: 'asc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+      total: 10,
+      tableData: [],
+      dialogVisible: false,
+      dialogForm: {
+        tunittype: '', // 鍗曡閲�(S) 澶氳閲�(M)
+        tunitgroupcode: '', // 璁¢噺鍗曚綅缁勭紪鐮�
+        unitcode: '',
+        unitname: '',
+        data_sources: 'MES'
+      },
+      operation: '',
+      dialogFormRules: {
+        unitname: [
+          { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+        ]
+      },
+
+      defaultPropsLeft: {
+        children: 'children',
+        label: 'name'
+      },
+      treeLeft: [],
+
+      tableDataDialog: [],
+
+      checkboxSelectedArr: [
+        { code: '0', name: '鍚�' },
+        { code: '1', name: '鏄�' }
+      ],
+
+      isMainUnitHidden: true
+
+    }
+  },
+  activated() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  created() {
+
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.handleGetApi('')
+  },
+  methods: {
+    async handleGetApi(code) {
+      await this.getTUnitGroup(code)
+      await this.getTUnitData()
+    },
+    async getSaveSearchUnit() {
+      const res = await SaveSearchUnit()
+      if (res.code === '200') {
+        await this.handleGetApi(this.$refs.treeLeftRef.getCurrentKey())
+        this.$notify.success('璁¢噺鍗曚綅鍚屾鎴愬姛锛�')
+      }
+    },
+    async getTUnitGroup(code) {
+      const { data: res } = await TUnitGroup()
+
+      this.treeLeft = [
+        {
+          code: '', name: '鍏ㄩ儴', children: [
+            { code: 'S', name: '鍗曡閲�' },
+            { code: 'M', name: '澶氳閲�', children: res }
+          ]
+        }
+      ]
+      this.$nextTick(() => {
+        this.$refs.treeLeftRef.setCurrentKey(code)
+      })
+    },
+    async getTUnitData() {
+      const res = await TUnitData(this.form)
+
+      this.tableData = res.data
+      this.total = res.count
+    },
+
+    async getTUnitGroupProject(unitcode) {
+      const data = {
+        unitcode, isgroup: '1'
+      }
+      const res = await TUnitGroupProject(data)
+      res.data.forEach((i, index) => {
+        i.unitname = i.name
+        i.unitcode = i.code
+        i.uuid = new Date().getTime() + index
+        i.isVisible = 0
+        // i.idunitgroup = unitcode
+        i.checkboxSelected = i.isMainUnit === '1' ? '1' : '0'
+      })
+      this.tableDataDialog = res.data
+    },
+
+    // 鎺掑簭鏀瑰彉鏃�
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getTUnitData()
+    },
+    async nodeClick(obj, Node, VueComponent) {
+      if (obj.code === 'S' || obj.code === 'M' || obj.code === '') {
+        this.form.tunittype = obj.code
+        this.form.tunitgroupcode = ''
+        await this.getTUnitData(obj.code)
+        this.isMainUnitHidden = true
+        this.$nextTick(() => {
+          this.$refs.tableDataRef.doLayout()
+        })
+      } else {
+        this.form.tunittype = 'M'
+        this.form.tunitgroupcode = obj.code
+        await this.getTUnitData(obj.code)
+        this.isMainUnitHidden = false
+        this.$nextTick(() => {
+          this.$refs.tableDataRef.doLayout()
+        })
+      }
+    },
+    add(operation) {
+      if (this.$refs.treeLeftRef.getCurrentKey() === 'S' || this.$refs.treeLeftRef.getCurrentKey() === 'M') {
+        this.dialogForm.tunittype = this.$refs.treeLeftRef.getCurrentKey()
+      } else {
+        return this.$message.error('璇峰厛閫夋嫨鏍戜笂鐨勫崟璁¢噺鎴栧璁¢噺锛�')
+      }
+      this.operation = operation
+      this.dialogVisible = true
+      this.dialogForm.OperType = 'Add'
+    },
+    // 淇敼鎸夐挳
+    async edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+      this.dialogForm.OperType = 'Update'
+
+      this.$nextTick(() => {
+        if (this.$refs.treeLeftRef.getCurrentKey() === 'S' || this.$refs.treeLeftRef.getCurrentKey() === 'M' || this.$refs.treeLeftRef.getCurrentKey() === '') {
+          this.dialogForm.tunittype = row.isGroup === '0' ? 'S' : 'M'
+          this.dialogForm.tunitgroupcode = row.isGroup === '0' ? row.code : row.idunitgroup
+          this.dialogForm.unitcode = row.code
+          this.dialogForm.unitname = row.name
+          this.dialogForm.data_sources = row.data_sources
+        } else {
+          this.dialogForm.tunittype = 'M'
+          this.dialogForm.tunitgroupcode = row.idunitgroup
+          this.dialogForm.unitcode = row.idunitgroup
+          this.dialogForm.unitname = this.treeLeft[0].children[1].children.find(i => i.code === this.$refs.treeLeftRef.getCurrentKey()).name
+          this.dialogForm.data_sources = row.data_sources
+        }
+
+        if (this.dialogForm.tunittype === 'M') {
+          this.getTUnitGroupProject(row.idunitgroup)
+        }
+      })
+    },
+
+    // 鍒犻櫎鎸夐挳
+    async del(row) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        if (this.$refs.treeLeftRef.getCurrentKey() === 'S' || this.$refs.treeLeftRef.getCurrentKey() === 'M' || this.$refs.treeLeftRef.getCurrentKey() === '') {
+          // this.dialogForm.tunittype = this.$refs.treeLeftRef.getCurrentKey()
+        } else {
+          if (row.isMainUnit === '1' || this.tableData.length === 2) {
+            return this.$message.info('璁¢噺鍗曚綅缁勪笅锛屽繀椤绘湁涓�涓富璁¢噺鍜岃嚦灏戜竴涓緟璁¢噺锛�')
+          }
+        }
+
+        const data = {
+          data_sources: row.data_sources,
+          tunittype: row.isGroup === '0' ? 'S' : 'M',
+
+          tunitgroupcode: row.isGroup === '0' ? '' : row.idunitgroup,
+          tunitcode: row.isGroup === '0' ? row.code : (this.$refs.treeLeftRef.getCurrentKey() === 'M' ? '' : row.code)
+        }
+        DeleteTUnit(data).then(res => {
+          if (res.code === '200') {
+            this.$notify.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
+
+            this.handleGetApi(this.$refs.treeLeftRef.getCurrentKey())
+          }
+        })
+      }).catch(() => {
+        this.$notify.info('宸插彇娑堝垹闄�')
+      })
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.dialogForm.tunittype = ''
+      this.dialogForm.tunitgroupcode = ''
+      this.dialogForm.unitcode = ''
+      this.dialogForm.unitname = ''
+      this.dialogForm.data_sources = 'MES'
+      this.tableDataDialog = []
+      this.$refs.dialogForm.clearValidate()
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          if (this.tableDataDialog.find(i => i.isVisible === 1)) {
+            return this.$message.info('璇峰厛淇濆瓨褰撳墠琛岋紒')
+          }
+
+          let data
+          if (this.dialogForm.tunittype === 'S') { // 鍗曡閲忔柊澧烇紝淇敼
+            data = [{
+              unitcode: this.dialogForm.unitcode,
+              unitname: this.dialogForm.unitname,
+              children: [
+                {
+                  'unitcode': this.dialogForm.unitcode,
+                  'unitname': this.dialogForm.unitname,
+                  'isMainUnit': '0',
+                  'changeRate': '1',
+                  'isSingleUnit': '1',
+                  'disabled': '0',
+                  'isGroup': '0',
+                  'rateDescription': '',
+                  'idunitgroup': ''
+                }
+              ]
+            }]
+          }
+          if (this.dialogForm.tunittype === 'M') { // 澶氳閲忔柊澧烇紝淇敼
+            if (this.tableDataDialog.length === 0) {
+              return this.$message.info('璁¢噺鍗曚綅缁勪腑鑷冲皯鍖呭惈涓�涓閲忓崟浣嶏紒')
+            }
+            if (this.tableDataDialog.length === 1) {
+              return this.$message.info('璁¢噺鍗曚綅缁勪笅锛屽繀椤绘湁涓�涓富璁¢噺鍜岃嚦灏戜竴涓緟璁¢噺锛�')
+            }
+
+            this.tableDataDialog.forEach((i, index) => {
+              i.unitcode = i.unitcode ? i.unitcode : 'U' + index.toString()
+              i.isMainUnit = i.checkboxSelected === '1' ? '1' : '0'
+              i.isSingleUnit = '0'
+              i.disabled = '0'
+              i.isGroup = '1'
+              i.idunitgroup = this.dialogForm.tunitgroupcode
+            })
+            data = [{
+              unitcode: this.dialogForm.unitcode,
+              unitname: this.dialogForm.unitname,
+              children: this.tableDataDialog
+            }]
+          }
+          console.log(data)
+          this.$store.state.app.buttonIsDisabled = true
+          AddUpdateTUnit(data, this.dialogForm.data_sources, this.dialogForm.tunittype, this.dialogForm.tunitgroupcode, this.dialogForm.OperType).then(res => {
+            if (res.code === '200') {
+              this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.dialogVisible = false
+              this.$store.state.app.buttonIsDisabled = false
+              this.handleGetApi(this.$refs.treeLeftRef.getCurrentKey())
+            } else {
+              this.$store.state.app.buttonIsDisabled = false
+              this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+            }
+          })
+        }
+      })
+    },
+
+    tableDataDialogAdd() {
+      if (this.tableDataDialog.find(i => i.isVisible === 1)) {
+        return this.$message.info('璇峰厛淇濆瓨涓婁竴鏉℃暟鎹紒')
+      }
+
+      this.tableDataDialog.push({
+        unitname: '',
+        changeRate: 1,
+        uuid: new Date().getTime(),
+        checkboxSelected: this.tableDataDialog.length === 0 ? '1' : '0',
+        isVisible: 1,
+        data_sources: 'MES'
+      })
+      console.log(this.tableDataDialog)
+    },
+    tableDataDialogEdit(row) {
+      row.isVisible = 1
+    },
+    tableDataDialogDel(row) {
+      if (row.checkboxSelected === '1') {
+        return this.$message.info('涓昏閲忓崟浣嶄笉鑳藉垹闄わ紒')
+      }
+      this.tableDataDialog = this.tableDataDialog.filter(i => i.uuid !== row.uuid)
+    },
+    tableDataDialogSave(row) {
+      if (!row.unitname) {
+        return this.$message.info('璁¢噺鍗曚綅鍚嶇О涓嶈兘涓虹┖锛�')
+      }
+      if (!row.changeRate) {
+        return this.$message.info('鎹㈢畻鐜囦笉鑳戒负绌猴紒')
+      }
+      if (this.tableDataDialog.filter(i => i.unitname === row.unitname).length > 1) {
+        return this.$message.info('澶氳閲忕粍鍐呰閲忓崟浣嶅悕绉颁笉鑳介噸澶嶏紒')
+      }
+      // console.log(row, 234)
+      row.isVisible = 0
+      if (this.tableDataDialog.length > 1) {
+        const unitname = this.tableDataDialog.find(i => i.checkboxSelected === '1').unitname
+        this.tableDataDialog.forEach(i => {
+          if (i.checkboxSelected === '0') {
+            i.rateDescription = '1' + i.unitname + '=' + i.changeRate + unitname
+          } else {
+            i.rateDescription = ''
+          }
+        })
+      }
+    },
+    checkboxSelectedChange(val, row) {
+      row.changeRate = 1
+      this.tableDataDialog.forEach(item => {
+        item.checkboxSelected = item.uuid === row.uuid ? '1' : '0'
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 220
+        this.$refs.tableDataRef.doLayout()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index 6ca4d42..c1a0866 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -1,1292 +1,1303 @@
-<template>
-  <div>
-    <div class="body" :style="{height:mainHeight+'px'}">
-
-      <div class="bodyTopButtonGroup" style="justify-content: space-between">
-        <el-button
-          v-waves
-          icon="el-icon-refresh-right"
-          @click="syncERP"
-        >鍚屾ERP
-        </el-button>
-        <div style="display: flex">
-          <el-button
-            v-waves
-            type="primary"
-            icon="el-icon-bottom"
-            @click="batchHandle"
-          >鎵归噺涓嬭揪
-          </el-button>
-        </div>
-
-      </div>
-
-      <div class="bodyTopFormGroup">
-        <el-form
-          ref="form"
-          :model="form"
-          label-width="100px"
-          inline
-          style="display: flex;"
-        >
-          <div class="elForm">
-            <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
-              <el-select
-                v-model="form.wkshopcode"
-                filterable
-                :popper-append-to-body="false"
-                style="width: 200px"
-                placeholder="璇烽�夋嫨"
-              >
-                <el-option
-                  v-for="item in wkshopcodeArr"
-                  :key="item.torg_code"
-                  :label="item.torg_name"
-                  :value="item.torg_code"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
-              <el-select
-                v-model="form.erporderstus"
-                filterable
-                :popper-append-to-body="false"
-                style="width: 200px"
-                placeholder="璇烽�夋嫨"
-              >
-                <el-option
-                  v-for="item in erporderstusArr"
-                  :key="item.code"
-                  :label="item.name"
-                  :value="item.code"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
-              <el-input v-model="form.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
-            </el-form-item>
-
-            <el-form-item label="閿�鍞鍗�" style=" display: flex;">
-              <el-input v-model="form.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
-            </el-form-item>
-
-            <el-form-item v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
-              <el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
-            </el-form-item>
-
-            <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
-              <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
-            </el-form-item>
-            <el-form-item v-show="isExpandForm" label="浜у搧瑙勬牸" style=" display: flex;">
-              <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
-            </el-form-item>
-
-            <DateType
-              ref="DateTypeRef"
-              :is-expand-form="isExpandForm"
-              style="display:flex;justify-content: center;align-items: center;position: relative"
-              @DateTypeChange="DateTypeChange"
-              @cycleTimeChange="cycleTimeChange"
-            />
-
-            <!--            <el-form-item-->
-            <!--              v-show="isExpandForm"-->
-            <!--              label="棰勮寮�宸ユ椂闂�"-->
-            <!--              label-width="100px"-->
-            <!--              style="display: flex;font-size: 14px;align-items: center"-->
-            <!--            >-->
-            <!--              <el-date-picker-->
-            <!--                v-model="form.paystartdate"-->
-            <!--                type="datetimerange"-->
-            <!--                range-separator="~"-->
-            <!--                class="timeMini"-->
-            <!--                size="mini"-->
-            <!--                style="width: 200px;display: flex;line-height: 34px;height: 34px;"-->
-            <!--                :clearable="false"-->
-            <!--                start-placeholder="寮�濮嬫棩鏈�"-->
-            <!--                end-placeholder="缁撴潫鏃ユ湡"-->
-            <!--                :picker-options="pickerOptions"-->
-            <!--                value-format="yyyy-MM-dd"-->
-            <!--                @change="pickerChange"-->
-            <!--              />-->
-            <!--            </el-form-item>-->
-
-            <!--            <el-form-item-->
-            <!--              v-show="isExpandForm"-->
-            <!--              label="棰勮瀹屽伐鏃堕棿"-->
-            <!--              label-width="100px"-->
-            <!--              style=" display: flex;font-size: 14px;align-items: center"-->
-            <!--            >-->
-            <!--              <el-date-picker-->
-            <!--                v-model="form.payenddate"-->
-            <!--                type="daterange"-->
-            <!--                :clearable="false"-->
-            <!--                class="timeMini"-->
-            <!--                range-separator="~"-->
-            <!--                start-placeholder="寮�濮嬫棩鏈�"-->
-            <!--                style="width: 200px;display: flex;line-height: 34px ;height: 34px ;"-->
-            <!--                end-placeholder="缁撴潫鏃ユ湡"-->
-            <!--                size="mini"-->
-            <!--              />-->
-            <!--            </el-form-item>-->
-          </div>
-
-          <div
-            class="bodySearchReset"
-            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
-          >
-            <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
-            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
-          </div>
-
-        </el-form>
-
-        <div
-          class="bodyTopFormExpand"
-        >
-          <svg-icon
-            v-show="mouseHoverType==='mouseout'"
-            style="cursor: pointer"
-            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
-            @mouseenter="mouseHoverType=$event.type"
-          />
-          <svg-icon
-            v-show="mouseHoverType==='mouseenter'"
-            style="cursor: pointer"
-            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
-            @click="isExpandForm=!isExpandForm"
-            @mouseout="mouseHoverType=$event.type"
-          />
-        </div>
-      </div>
-
-      <div class="elTableDiv">
-        <el-table
-          ref="tableDataRef"
-          class="tableFixed"
-          :data="tableData"
-          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
-          border
-          :row-class-name="tableRowClassName"
-          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
-          highlight-current-row
-          :header-cell-style="this.$headerCellStyle"
-          :cell-style="this.$cellStyle"
-          :summary-method="getSummaries"
-          show-summary
-          @sort-change="sortChange"
-          @selection-change="handleSelectionChange"
-        >
-          <!--          @row-click="rowClick"-->
-          <el-table-column
-            type="selection"
-            width="50"
-            :selectable="selected"
-          />
-          <!--          <el-table-column-->
-          <!--            width="50"-->
-          <!--            fixed-->
-          <!--          >-->
-          <!--            <template slot-scope="{row}">-->
-          <!--              <el-radio-->
-          <!--                v-model="radioSelectedId"-->
-          <!--                :label="row.id"-->
-          <!--                style="color: transparent;padding-left: 10px;"-->
-          <!--              />-->
-          <!--              &lt;!&ndash;              @change.native="getCurrentRow(row.id)"&ndash;&gt;-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <el-table-column
-            prop="rowNum"
-            width="50"
-            fixed
-            label="搴忓彿"
-          />
-          <el-table-column
-            prop="status"
-            label="璁㈠崟鐘舵��"
-            sortable="custom"
-            width="110"
-            show-tooltip-when-overflow
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.status==='NEW'">鏂拌鍗�</div>
-              <div v-if="row.status==='CREATING'">閮ㄥ垎涓嬭揪</div>
-              <div v-if="row.status==='CREATED'">鍏ㄩ儴涓嬭揪</div>
-              <div v-if="row.status==='CLOSED'">宸插叧闂�</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="wo"
-            label="璁㈠崟缂栧彿"
-            show-tooltip-when-overflow
-            sortable="custom"
-            min-width="150"
-          />
-          <el-table-column
-            show-tooltip-when-overflow
-            prop="saleOrderCode"
-            label="閿�鍞鍗�"
-            sortable="custom"
-            width="150"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
-              <div v-else>/</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="partcode"
-            label="浜у搧缂栫爜"
-            sortable="custom"
-            show-tooltip-when-overflow
-            min-width="150"
-          />
-          <el-table-column
-            prop="partname"
-            label="浜у搧鍚嶇О"
-            sortable="custom"
-            min-width="200"
-            show-tooltip-when-overflow
-          />
-          <el-table-column
-            prop="partspec"
-            label="浜у搧瑙勬牸"
-            sortable="custom"
-            show-tooltip-when-overflow
-            min-width="110"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.partspec">{{ row.partspec }}</div>
-              <div v-else>/</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="qty"
-            label="璁㈠崟鏁伴噺"
-            width="150"
-            show-tooltip-when-overflow
-            sortable="custom"
-          />
-          <el-table-column
-            prop="relse_qty"
-            label="宸蹭笅鍗曟暟閲�"
-            show-tooltip-when-overflow
-            width="150"
-            sortable="custom"
-          />
-          <el-table-column
-            prop="clerkuser"
-            label="閿�鍞笟鍔″憳"
-            show-tooltip-when-overflow
-            width="150"
-            sortable="custom"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.clerkuser">{{ row.clerkuser }}</div>
-              <div v-else>/</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="wkshp_name"
-            label="鐢熶骇杞﹂棿"
-            show-tooltip-when-overflow
-            sortable="custom"
-            width="150"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
-              <div v-else>/</div>
-            </template>
-          </el-table-column>
-          <!--          <el-table-column-->
-          <!--            prop="planstartdate"-->
-          <!--            show-tooltip-when-overflow-->
-          <!--            label="棰勮寮�宸ユ椂闂�"-->
-          <!--            sortable="custom"-->
-          <!--            width="130"-->
-          <!--          >-->
-          <!--            <template slot-scope="{row}">-->
-          <!--              <div v-if="row.planstartdate">{{ row.planstartdate.substring(0, 11) }}</div>-->
-          <!--              <div v-else>/</div>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column-->
-          <!--            prop="planenddate"-->
-          <!--            label="棰勮瀹屽伐鏃堕棿"-->
-          <!--            show-tooltip-when-overflow-->
-          <!--            sortable="custom"-->
-          <!--            width="130"-->
-          <!--          >-->
-          <!--            <template slot-scope="{row}">-->
-          <!--              <div v-if="row.planenddate">{{ row.planenddate.substring(0, 11) }}</div>-->
-          <!--              <div v-else>/</div>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <el-table-column
-            prop="planenddate"
-            label="棰勮寮�宸ユ棩鏈�"
-            sortable="custom"
-            show-tooltip-when-overflow
-            width="130"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.planenddate">{{ row.planenddate.substring(0, 11) }}</div>
-              <div v-else>/</div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="planstartdate"
-            label="棰勮瀹屽伐鏃ユ湡"
-            sortable="custom"
-            show-tooltip-when-overflow
-            width="130"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.planstartdate">{{ row.planstartdate.substring(0, 11) }}</div>
-              <div v-else>/</div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop="saleOrderDeliveryDate"
-            label="棰勮浜や粯鏃ユ湡"
-            sortable="custom"
-            show-tooltip-when-overflow
-            width="130"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.saleOrderDeliveryDate">{{ row.saleOrderDeliveryDate.substring(0, 11) }}</div>
-              <div v-else>/</div>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            show-tooltip-when-overflow
-            prop="createuser"
-            label="鍒涘缓浜哄憳"
-            sortable="custom"
-            width="150"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.createuser">{{ row.createuser }}</div>
-              <div v-else>/</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="createdate"
-            label="鍒涘缓鏃堕棿"
-            width="130"
-            show-tooltip-when-overflow
-            sortable="custom"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.createdate">{{ row.createdate.substring(0, 11) }}</div>
-              <div v-else>/</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="鎿嶄綔"
-            fixed="right"
-            width="120"
-          >
-            <template slot-scope="{row}">
-              <div class="operationClass">
-                <el-tooltip class="item" effect="dark" content="涓嬭揪" placement="top">
-                  <!--                <el-button v-waves type="text" @click="edit('edit',row)">涓嬭揪</el-button>-->
-                  <i
-                    class="el-icon-bottom"
-                    :style="{color:$store.state.settings.theme}"
-                    style="cursor: pointer;margin-left: 5px"
-                    @click="edit('edit',row)"
-                  />
-                </el-tooltip>
-                <el-tooltip v-del-tab-index class="item" effect="dark" content="璁㈠崟鍏抽棴" placement="top">
-                  <i
-                    class="el-icon-switch-button"
-                    :style="{color:$store.state.settings.theme}"
-                    style="cursor: pointer;margin-left: 15px"
-                    @click="orderClose(row.id)"
-                  />
-                </el-tooltip>
-
-                <el-tooltip v-del-tab-index class="item" effect="dark" content="璁㈠崟鍒犻櫎" placement="top">
-                  <i
-                    class="el-icon-delete"
-                    :style="{color:$store.state.settings.theme}"
-                    style="cursor: pointer;margin-left: 15px"
-                    @click="orderDel(row.id)"
-                  />
-                </el-tooltip>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <!--鍒嗛〉-->
-      <pagination
-        :total="total"
-        :page.sync="form.page"
-        :limit.sync="form.rows"
-        align="right"
-        layout="total,prev, pager, next,sizes,jumper"
-        popper-class="select_bottom"
-        @pagination="getErpOrderSearch"
-      />
-    </div>
-
-    <el-dialog
-      v-el-drag-dialog
-      :title="operation==='add'?'鏂板':'涓嬭揪'"
-      :visible.sync="dialogVisible"
-      width="900px"
-      top="12vh"
-      :close-on-click-modal="false"
-      @closed="handleClose"
-      @close="handleClose"
-    >
-      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="106px">
-        <el-form-item label="璁㈠崟缂栧彿" prop="erpordercode">
-          <el-input v-model="dialogForm.erpordercode" disabled style="width: 200px" />
-        </el-form-item>
-        <el-form-item label="浜у搧缂栫爜" prop="partcode">
-          <el-input v-model="dialogForm.partcode" disabled style="width: 200px" />
-        </el-form-item>
-        <el-form-item label="浜у搧鍚嶇О" prop="partname">
-          <el-input v-model="dialogForm.partname" disabled style="width: 200px" />
-        </el-form-item>
-
-        <el-form-item label="浜у搧瑙勬牸" prop="partspec">
-          <el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
-        </el-form-item>
-        <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopname">
-          <el-input v-model="dialogForm.wkshopname" disabled style="width: 200px" />
-        </el-form-item>
-        <el-form-item label="鎵�灞炰粨搴�" prop="warehousename">
-          <el-input v-model="dialogForm.warehousename" disabled style="width: 200px" />
-        </el-form-item>
-        <el-form-item label="璁㈠崟鏁伴噺" prop="erpqty">
-          <el-input v-model="dialogForm.erpqty" disabled style="width: 200px" />
-        </el-form-item>
-        <el-form-item label="宸蹭笅鍗曟暟" prop="relse_qty">
-          <el-input
-            v-model="dialogForm.relse_qty"
-            disabled
-            oninput="value=value.replace(/[^0-9.]/g,'')"
-            style="width: 200px"
-          />
-        </el-form-item>
-        <el-form-item label="涓嬪崟鏁伴噺" prop="markqty">
-          <el-input
-            v-model="dialogForm.markqty"
-            oninput="value=value.replace(/[^0-9.]/g,'')"
-            style="width: 200px"
-          />
-        </el-form-item>
-        <el-form-item label="涓嬪崟鍗曟暟" prop="ordernum">
-          <el-input
-            v-model="dialogForm.ordernum"
-            oninput="value=value.replace(/[^0-9.]/g,'')"
-            style="width: 200px"
-          />
-        </el-form-item>
-
-        <el-form-item label="閿�鍞笟鍔″憳" prop="">
-          <el-input
-            v-model="dialogForm.clerkuser"
-            disabled
-            style="width: 200px"
-          />
-        </el-form-item>
-        <!--        :picker-options="pickerOptions"-->
-
-        <el-form-item label="棰勮浜や粯鏃ユ湡" prop="saleOrderDeliveryDate">
-          <el-date-picker
-            v-model="dialogForm.saleOrderDeliveryDate"
-            type="date"
-            size="mini"
-            :clearable="false"
-            class="dateMini"
-            format="yyyy-MM-dd"
-            style="width: 200px"
-            placeholder="閫夋嫨鏃ユ湡"
-            :disabled="dialogForm.saleOrderDeliveryDateIsDisabled"
-          />
-        </el-form-item>
-
-        <div style="display: flex">
-          <el-form-item label="棰勮寮�宸ユ棩鏈�" prop="" style="display: flex">
-            <el-date-picker
-              v-model="dialogForm.paystartdate"
-              type="date"
-              size="mini"
-              style="width: 200px"
-              :clearable="false"
-              class="dateMini"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
-              placeholder="閫夋嫨鏃ユ湡"
-            />
-          </el-form-item>
-
-          <el-form-item label="棰勮瀹屽伐鏃ユ湡" prop="" style="display: flex">
-            <el-date-picker
-              v-model="dialogForm.payenddate"
-              type="date"
-              size="mini"
-              style="width: 200px"
-              :clearable="false"
-              class="dateMini"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
-              placeholder="閫夋嫨鏃ユ湡"
-            />
-          </el-form-item>
-
-        </div>
-
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <div class="footerButton">
-          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
-          <el-button
-            v-waves
-            type="primary"
-            :loading="$store.state.app.buttonIsDisabled"
-            :disabled="$store.state.app.buttonIsDisabled"
-            @click="dialogVisibleConfirm"
-          >涓� 杈�</el-button>
-        </div>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from '@/components/Pagination'
-import { handleDatetime } from '@/utils/global'
-import elDragDialog from '@/directive/el-drag-dialog'
-import waves from '@/directive/waves'
-import {
-  ClosedErpOrder,
-  DeleteErpOrder,
-  ErpOrderSearch,
-  MarkBatchSaveErpOrder,
-  MarkSaveErpOrder
-} from '@/api/WorkOrder'
-import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
-import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
-import DateType from '@/components/DateType'
-
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
-export default {
-  name: 'ProduceOrderList',
-  components: {
-    Pagination, DateType
-  },
-  directives: { elDragDialog, waves },
-  data() {
-    const validateName = (rule, value, callback) => {
-      if (!value) {
-        return callback(new Error('璇疯緭鍏ョ紪鐮�'))
-      } else {
-        if (SER_HZ.test(value)) {
-          return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
-        } else {
-          callback()
-        }
-      }
-    }
-    return {
-      mouseHoverType: 'mouseout',
-      isExpandForm: false,
-      mainHeight: 0,
-      tableHeight: 0,
-      form: {
-        wkshopcode: '', // 杞﹂棿缂栫爜
-        erporderstus: '', // 璁㈠崟鐘舵�佺爜
-        erpordercode: '', // 璁㈠崟缂栧彿
-        partcode: '', // 浜у搧缂栫爜
-        partname: '', // 浜у搧鍚嶇О
-        partspec: '', // 浜у搧瑙勬牸
-        creatuser: '', // 鍒涘缓浜哄憳
-        saleordercode: '', // 閿�鍞鍗�
-        // paystartdate: '', // 浜や粯鏃堕棿
-        paystartdate: '', // 棰勮寮�宸ユ椂闂�
-        payenddate: '', // 棰勮瀹屽伐鏃堕棿
-        createdate: '', // 鍒涘缓鏃堕棿
-
-        datatype: 'ED', // 鏃堕棿绫诲瀷
-        timeValue: [], // 鏃堕棿鍊�
-
-        prop: 'wo', // 鎺掑簭瀛楁
-        order: 'desc', // 鎺掑簭瀛楁
-        page: 1, // 绗嚑椤�
-        rows: 20 // 姣忛〉澶氬皯鏉�
-      },
-
-      erporderstusArr: [
-        { code: 'NEW', name: '鏂拌鍗�' },
-        { code: 'CREATING', name: '閮ㄥ垎涓嬭揪' },
-        { code: 'CREATED', name: '鍏ㄩ儴涓嬭揪' },
-        { code: 'CLOSED', name: '宸插叧闂�' }
-      ],
-      wkshopcodeArr: [],
-      total: 10,
-      radioSelectedId: '',
-      tableData: [],
-      dialogVisible: false,
-      dialogForm: {
-        erporderid: '', // 璁㈠崟id
-        sbid: '', // 璁㈠崟鏄庣粏id
-        erpordercode: '', // 璁㈠崟缂栧彿
-        saleordercode: '', // 閿�鍞鍗�
-
-        partcode: '', // 浜у搧缂栫爜
-        partname: '', // 浜у搧鍚嶇О
-        partspec: '', // 浜у搧瑙勬牸
-
-        wkshopcode: '', // 杞﹂棿缂栫爜
-        wkshopname: '', // 杞﹂棿鍚嶇О
-
-        warehousecode: '', // 浠撳簱缂栫爜
-        warehousename: '', // 浠撳簱鍚嶇О
-
-        erpqty: '', // 璁㈠崟鏁伴噺
-        markqty: '', // 涓嬪崟鏁伴噺
-        ordernum: '', // 涓嬪崟鍗曟暟
-        relse_qty: '', // 宸蹭笅鍗曟暟閲�
-
-        clerkuser: '', // 閿�鍞笟鍔″憳
-
-        saleOrderDeliveryDate: '', // 棰勮浜や粯鏃ユ湡
-
-        paystartdate: '', //   棰勮寮�宸ユ棩鏈�
-        payenddate: ''//  棰勮瀹屽伐鏃ユ湡
-      },
-      operation: '',
-      dialogFormRules: {
-        // OrgType: [
-        //   { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
-        // ],
-        // OrgCode: [
-        //   { required: true, validator: validateName, trigger: ['blur', 'change'] }
-        // ],
-        markqty: [
-          { required: true, message: '璇疯緭鍏ヤ笅鍗曟暟閲�', trigger: ['blur', 'change'] }
-        ],
-        ordernum: [
-          { required: true, message: '璇疯緭鍏ヤ笅鍗曞崟鏁�', trigger: ['blur', 'change'] }
-        ],
-        saleOrderDeliveryDate: [
-          { required: true, message: '璇烽�夋嫨棰勮浜や粯鏃ユ湡', trigger: ['blur', 'change'] }
-        ]
-
-      },
-      pickerOptions: {
-        disabledDate(time) {
-          return time.getTime() < Date.now() - 8.64e7
-        }
-      },
-      multipleSelection: []
-
-      // expireTimeOption: {
-      //   disabledDate(time) {
-      //     return time.getTime() > Date.now() - 8.64e6 // 濡傛灉娌℃湁鍚庨潰鐨�-8.64e6灏辨槸涓嶅彲浠ラ�夋嫨浠婂ぉ鐨�
-      //   }
-      // }
-
-    }
-  },
-  activated() {
  window.addEventListener('resize', this.getHeight)
  this.getHeight()
},
created() {
-    this.getErpOrderSearch()
-    // this.getPartSelect()// 鑾峰彇浜у搧缂栫爜淇℃伅
-
-    this.getPrentOrganizationNoCompany()
-  },
-  mounted() {
-    window.addEventListener('resize', this.getHeight)
-    this.getHeight()
-  },
-  methods: {
-
-    DateTypeChange(value) {
-      this.form.datatype = value
-    },
-    cycleTimeChange(val) {
-      this.form.timeValue = val
-    },
-
-    pickerChange(value) {
-      console.log(value, 123)
-      this.cycleTime = null
-    },
-
-    async getPrentOrganizationNoCompany() {
-      const { data: res } = await PrentOrganizationNoCompany()
-      this.wkshopcodeArr = res
-    },
-    async getErpOrderSearch() {
-      console.log(this.form, 1)
-      // let tempDate2 = this.form.paystartdate
-      // if (tempDate2.length > 0) {
-      //   tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
-      // }
-      //
-      // let tempDate = this.form.payenddate
-      // if (tempDate.length > 0) {
-      //   tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
-      // }
-
-      const data = {
-
-        erporderstus: this.form.erporderstus, // 璁㈠崟鐘舵�佺爜
-        wkshopcode: this.form.wkshopcode, // 杞﹂棿缂栫爜
-        erpordercode: this.form.erpordercode, // 璁㈠崟缂栧彿
-        saleordercode: this.form.saleordercode, // 閿�鍞崟鍙�
-
-        partcode: this.form.partcode, // 浜у搧缂栫爜
-        partname: this.form.partname, // 浜у搧鍚嶇О
-        partspec: this.form.partspec, // 浜у搧瑙勬牸
-
-        datatype: this.form.datatype, // 鏃ユ湡绫诲瀷(璁″垝寮�宸�(PS)銆佽鍒掑畬宸�(PE)銆侀璁′氦浠�(ED))
-        searchdate: this.form.timeValue.join('~'), // 鏃堕棿娈�
-        // paystartdate: tempDate2, // 浜や粯鏃堕棿
-        // payenddate: tempDate, // 浜や粯鏃堕棿
-
-        creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
-
-        prop: this.form.prop, // 鎺掑簭瀛楁
-        order: this.form.order, // 鎺掑簭瀛楁
-        page: this.form.page, // 绗嚑椤�
-        rows: this.form.rows // 姣忛〉澶氬皯鏉�
-
-      }
-
-      const res = await ErpOrderSearch(data)
-      this.tableData = res.data
-      this.total = res.count
-    },
-    // 鎺掑簭鏀瑰彉鏃�
-    sortChange({ column, prop, order }) {
-      if (order === 'descending') {
-        order = 'desc'
-      } else if (order === 'ascending') {
-        order = 'asc'
-      } else {
-        order = 'desc'
-      }
-      this.form.order = order
-      this.form.prop = prop
-      this.getErpOrderSearch()
-    },
-    // 鍚屾ERP
-    syncERP() {
-      const loading = this.$loading({
-        lock: true,
-        text: '姝e湪鍚屾ERP锛岃绋嶇瓑...',
-        spinner: 'el-icon-loading',
-        customClass: 'osloading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-
-      SeaveSearchErpOrder().then(res => {
-        console.log(res, 11)
-        if (res.code === '200') {
-          setTimeout(() => {
-            this.getErpOrderSearch()
-            loading.close()
-            this.$message.success('鍚屾鎴愬姛锛�')
-          }, 2000)
-        }
-        // else if (res.code === '300') {
-        //   setTimeout(() => {
-        //     loading.close()
-        //     this.$message.error('鍚屾澶辫触锛�')
-        //   }, 10000)
-        // }
-      }).catch(e => {
-        loading.close()
-      })
-    },
-    // 鏌ヨ
-    search() {
-      this.getErpOrderSearch()
-    },
-    // 閲嶇疆
-    reset() {
-      this.form.wkshopcode = ''
-      this.form.erporderstus = ''
-      this.form.erpordercode = ''
-      this.form.partcode = ''
-      this.form.partname = ''
-      this.form.partspec = ''
-      this.form.paystartdate = ''
-      this.form.payenddate = ''
-      this.form.creatuser = ''
-      this.form.saleordercode = ''
-      this.form.createdate = ''
-
-      this.form.timeValue = []
-      this.cycleTime = null
-
-      this.$refs.DateTypeRef.clearValue()
-
-      this.getErpOrderSearch()
-    },
-    // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
-    // getCurrentRow(id) {
-    //   this.radioSelectedId = id
-    // },
-    // rowClick(row) {
-    //   this.radioSelectedId = row.id
-    // },
-
-    // 璁㈠崟鍒犻櫎
-    orderDel(id) {
-      this.tableData.forEach(item => {
-        if (item.id === id) {
-          if (item.status === 'CLOSED') {
-            return this.$message.info('姝よ鍗曞凡鍏抽棴锛屾棤娉曞垹闄わ紒')
-          } else {
-            this.$confirm('鏄惁纭鍏抽棴璁㈠崟?', '鎻愮ず', {
-              confirmButtonText: '纭畾',
-              cancelButtonText: '鍙栨秷',
-              type: 'warning'
-            }).then(() => {
-              DeleteErpOrder({ erpordercode: item.wo, erporderid: id }).then(res => {
-                if (res.code === '200') {
-                  this.$message.success('璁㈠崟鍒犻櫎鎴愬姛!')
-                  this.getErpOrderSearch()
-                }
-              })
-            }).catch(() => {
-              this.$message.info('宸插彇娑堝垹闄わ紒')
-            })
-          }
-        }
-      })
-    },
-    // 璁㈠崟鍏抽棴
-    async orderClose(id) {
-      this.tableData.forEach(item => {
-        if (item.id === id) {
-          if (item.status !== 'NEW') {
-            return this.$message.info('姝よ鍗曢潪鏂拌鍗曪紝鏃犳硶鍏抽棴锛�')
-          } else {
-            this.$confirm('鏄惁纭鍏抽棴璁㈠崟?', '鎻愮ず', {
-              confirmButtonText: '纭畾',
-              cancelButtonText: '鍙栨秷',
-              type: 'warning'
-            }).then(() => {
-              ClosedErpOrder({ erpordercode: item.wo, erporderid: id }).then(res => {
-                if (res.code === '200') {
-                  this.$message.success('璁㈠崟鍏抽棴鎴愬姛!')
-                  this.getErpOrderSearch()
-                }
-              })
-            }).catch(() => {
-              this.$message.info('宸插彇娑堝叧闂紒')
-            })
-          }
-        }
-      })
-    },
-    batchHandle() {
-      this.$confirm('鏄惁鎵归噺涓嬭揪?', '鎻愮ず', {
-        confirmButtonText: '纭畾',
-        cancelButtonText: '鍙栨秷',
-        type: 'warning'
-      }).then(() => {
-        if (this.multipleSelection.length === 0) {
-          return this.$message.info('璇峰厛閫夋嫨璁㈠崟锛�')
-        }
-        // console.log(JSON.parse(JSON.stringify(this.multipleSelection)))
-        const data = []
-        this.multipleSelection.forEach(i => {
-          data.push({
-            'erporderid': i.id,
-            'sbid': i.sbid,
-            'erpordercode': i.wo,
-            'partcode': i.partcode,
-            'wkshopcode': i.wkshp_code,
-            'warehousecode': i.stck_code,
-            'erpqty': i.qty,
-            'markqty': i.qty,
-            'ordernum': 1,
-            'clerkuser': i.clerkuser,
-            'relse_qty': i.qty,
-            'saleordercode': i.saleOrderCode,
-            // 'saleOrderDeliveryDate': i.saleOrderDeliveryDate
-            'saleOrderDeliveryDate': handleDatetime(new Date()) + ' 00:00:00',
-
-            'paystartdate': i.planstartdate,
-            'payenddate': i.planenddate
-          })
-        })
-        // console.log(JSON.parse(JSON.stringify(data)))
-        MarkBatchSaveErpOrder(data).then(res => {
-          if (res.code === '200') {
-            this.multipleSelection = []
-            this.$message.success('鎵归噺涓嬭揪鎴愬姛锛�')
-            this.getErpOrderSearch()
-          } else {
-            this.$message.error('鎵归噺涓嬭揪澶辫触锛�')
-          }
-        })
-      }).catch(() => {
-        this.$message.info('宸插彇娑堜笅杈撅紒')
-      })
-    },
-    selected(row, index) {
-      return row.status === 'NEW'
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 鏂板鎸夐挳
-    add(operation) {
-      this.operation = operation
-      this.dialogVisible = true
-    },
-    // 淇敼鎸夐挳
-    edit(operation, row) {
-      if (parseFloat(row.qty) === parseFloat(row.relse_qty) || row.status === 'CLOSED') {
-        return this.$message.info('姝ゅ伐鍗曞凡鍏ㄩ儴涓嬭揪锛�')
-      }
-
-      this.operation = operation
-      this.dialogVisible = true
-
-      this.$nextTick(() => {
-        this.dialogForm.sbid = row.sbid
-        this.dialogForm.erporderid = row.id
-        this.dialogForm.erpordercode = row.wo
-        this.dialogForm.saleordercode = row.saleOrderCode
-
-        this.dialogForm.partcode = row.partcode
-        this.dialogForm.partname = row.partname
-        this.dialogForm.partspec = row.partspec
-
-        this.dialogForm.wkshopcode = row.wkshp_code
-        this.dialogForm.wkshopname = row.wkshp_name
-
-        this.dialogForm.warehousecode = row.stck_code
-        this.dialogForm.warehousename = row.stck_name
-
-        this.dialogForm.saleOrderDeliveryDate = row.saleOrderDeliveryDate
-
-        this.dialogForm.erpqty = row.qty
-        this.dialogForm.markqty = parseFloat(row.qty) - parseFloat(row.relse_qty)
-        this.dialogForm.ordernum = 1
-        this.dialogForm.relse_qty = row.relse_qty
-        this.dialogForm.clerkuser = row.clerkuser
-
-        this.dialogForm.paystartdate = row.planstartdate
-        this.dialogForm.payenddate = row.planenddate
-      })
-    },
-    // 瀵硅瘽妗嗗叧闂簨浠�
-    handleClose() {
-      this.dialogForm = {
-        erporderid: '', // 璁㈠崟id
-        sbid: '', // 璁㈠崟鏄庣粏id
-        erpordercode: '', // 璁㈠崟缂栧彿
-        saleordercode: '', // 閿�鍞鍗�
-
-        partcode: '', // 浜у搧缂栫爜
-        partname: '', // 浜у搧鍚嶇О
-        partspec: '', // 浜у搧瑙勬牸
-
-        wkshopcode: '', // 杞﹂棿缂栫爜
-        wkshopname: '', // 杞﹂棿鍚嶇О
-
-        warehousecode: '', // 浠撳簱缂栫爜
-        warehousename: '', // 浠撳簱鍚嶇О
-
-        erpqty: '', // 璁㈠崟鏁伴噺
-        markqty: '', // 涓嬪崟鏁伴噺
-        ordernum: '', // 涓嬪崟鍗曟暟
-        relse_qty: '', // 宸蹭笅鍗曟暟閲�
-
-        payenddate: '', // 棰勮瀹屽伐鏃ユ湡
-        paystartdate: '', // 棰勮寮�宸ユ棩鏈�
-
-        saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
-      }
-      this.$refs.dialogForm.clearValidate()
-    },
-    // 瀵硅瘽妗嗗彇娑�
-    dialogVisibleCancel() {
-      this.dialogVisible = false
-    },
-    // 瀵硅瘽妗嗙‘璁�
-    dialogVisibleConfirm() {
-      this.dialogForm.markqty = parseFloat(this.dialogForm.markqty)
-      this.dialogForm.erpqty = parseFloat(this.dialogForm.erpqty)
-      this.dialogForm.relse_qty = parseFloat(this.dialogForm.relse_qty)
-      this.dialogForm.ordernum = parseFloat(this.dialogForm.ordernum)
-      if (this.dialogForm.markqty < 1 || this.dialogForm.markqty > this.dialogForm.erpqty - this.dialogForm.relse_qty) {
-        return this.$message.info('涓嬪崟鏁伴噺瓒呭嚭鍙笅鍗曟暟鐨勮寖鍥达紒')
-      }
-
-      if (this.dialogForm.ordernum < 1 || this.dialogForm.ordernum > this.dialogForm.markqty) {
-        return this.$message.info('涓嬪崟鍗曟暟瓒呭嚭鍙笅鍗曞崟鏁扮殑鑼冨洿锛�')
-      }
-
-      this.$refs.dialogForm.validate(valid => {
-        if (valid) {
-          this.$store.state.app.buttonIsDisabled = true
-          const data = {
-            'sbid': this.dialogForm.sbid,
-            'erporderid': this.dialogForm.erporderid,
-            'erpordercode': this.dialogForm.erpordercode,
-            'saleordercode': this.dialogForm.saleordercode,
-            'partcode': this.dialogForm.partcode,
-            'wkshopcode': this.dialogForm.wkshopcode,
-            'warehousecode': this.dialogForm.warehousecode,
-            'clerkuser': this.dialogForm.clerkuser,
-            'erpqty': this.dialogForm.erpqty,
-            'markqty': this.dialogForm.markqty,
-            'ordernum': this.dialogForm.ordernum,
-            'payenddate': this.dialogForm.payenddate,
-            'paystartdate': this.dialogForm.paystartdate,
-            'relse_qty': this.dialogForm.relse_qty,
-            'saleOrderDeliveryDate': handleDatetime(this.dialogForm.saleOrderDeliveryDate) + ' 00:00:00'
-          }
-
-          MarkSaveErpOrder(data).then(res => {
-            if (res.code === '200') {
-              this.dialogVisible = false
-              this.$message.success('涓嬭揪鎴愬姛锛�')
-              this.getErpOrderSearch()
-              this.$store.state.app.buttonIsDisabled = false
-            } else {
-              this.$message.error('涓嬭揪澶辫触锛�')
-            }
-          })
-        }
-      })
-    },
-    // 鑾峰彇椤甸潰楂樺害
-    getHeight() {
-      this.$nextTick(() => {
-        this.mainHeight = window.innerHeight - 85
-        this.tableHeight = this.mainHeight - 250
-
-        this.$refs.tableDataRef.doLayout()
-      })
-    },
-    tableRowClassName({ row, rowIndex }) {
-      return 'custom-row'
-    },
-    getSummaries(param) {
-      const { columns, data } = param
-      const sums = []
-      const i = 7
-      columns.forEach((column, index) => {
-        if (index === i) {
-          sums[index] = '鎬绘暟'
-          return
-        }
-        const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'qty') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-              // return Math.round(prev * 100) / 100 + Math.round(curr * 100) / 100
-            }
-          }, 0)
-
-          sums[index] += ' 鍗�'
-        }
-        if (column.property === 'relse_qty') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-              // return Math.round(prev * 100) / 100 + Math.round(curr * 100) / 100
-            }
-          }, 0)
-
-          sums[index] += ' 鍗�'
-        }
-      })
-
-      this.$nextTick(() => {
-        this.$refs.tableDataRef.doLayout()
-      })
-      return sums
-    }
-  }
-}
-</script>
-
-<!--鍏叡椤甸潰鏍峰紡-->
-<style lang="scss" scoped>
-$main_color: #42b983;
-
-::v-deep .el-range__icon {
-  line-height: 28px !important;
-}
-
-::v-deep .el-range-separator {
-  line-height: 28px !important;
-}
-
-::v-deep .el-range-input {
-  font-size: 14px;
-}
-
-::v-deep .el-range-separator {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
-  color: $main_color;
-  cursor: pointer;
-}
-
-.el-icon-edit-outline {
-  margin-right: 15px;
-}
-
-//::v-deep .el-button--primary, .el-button--default, .el-button--info {
-//  height: 34px;
-//  display: flex;
-//  align-items: center;
-//  padding: 0 15px;
-//}
-
-::v-deep .el-button--primary {
-  //background-color: $main_color !important;
-}
-
-::v-deep .el-button--default {
-  background-color: #f8f8fa;
-  border: none;
-}
-
-::v-deep .el-input__inner {
-  height: 34px;
-  line-height: 34px;
-  //color: #a7a7a7;
-}
-
-::v-deep .el-dialog__body {
-  padding: 20px 100px !important;
-}
-
-::v-deep .dialogVisibleRoles .el-dialog__body {
-  padding: 20px 20px !important;
-}
-
-::v-deep .importPickerClass .el-dialog__body {
-  padding: 20px 20px !important;
-}
-
-::v-deep .el-dialog__footer {
-  display: flex;
-  justify-content: flex-end;
-}
-
-::v-deep .el-table .caret-wrapper {
-  transform: scale(0.8);
-}
-
-::v-deep .cell {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-::v-deep .el-table::before {
-  height: 0;
-}
-
-::v-deep .el-table__body-wrapper {
-  background-color: #f8f8fa;
-}
-
-::v-deep .el-table__body .el-table__row.hover-row td {
-  background-color: #eaecef;
-}
-
-::v-deep .el-form--inline .el-form-item__label {
-  color: #a7a7a7;
-}
-
-.body ::v-deep .el-divider {
-  border: 1px solid #eee;
-  width: 99%;
-  margin: 10px auto;
-}
-
-.body ::v-deep .el-form-item {
-  margin-bottom: 0;
-}
-
-.userDialogVisible ::v-deep .el-form-item {
-  margin-bottom: 0;
-}
-
-.elTableDiv {
-  ::v-deep .el-radio__label {
-    display: none;
-  }
-}
-
-.tableFixed {
-  ::v-deep .el-table__fixed-right {
-    height: 100% !important;
-  }
-
-  ::v-deep .el-table__fixed {
-    height: 100% !important;
-  }
-}
-
-.dateMini {
-  ::v-deep .el-input__inner {
-    line-height: 34px;
-    height: 34px;
-    width: 200px;
-    display: flex;
-    font-size: 14px !important;
-    align-items: center !important;
-  }
-
-  ::v-deep .el-input__prefix {
-    margin-top: -3px;
-  }
-}
-
-::v-deep .el-icon-delete {
-  cursor: pointer;
-  margin-right: 0px !important;
-}
-</style>
-<style>
-.el-table .custom-row {
-  background: #f8f8fa;
-}
-
-.osloading {
-  font-size: 26px !important;
-}
-
-.el-loading-text {
-  font-size: 26px !important;
-}
-
-.el-picker-panel__footer {
-  display: flex !important;
-  justify-content: flex-end !important;
-}
-
-</style>
-
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+
+      <div class="bodyTopButtonGroup" style="justify-content: space-between">
+        <el-button
+          v-waves
+          icon="el-icon-refresh-right"
+          @click="syncERP"
+        >鍚屾ERP
+        </el-button>
+        <div style="display: flex">
+          <el-button
+            v-waves
+            type="primary"
+            icon="el-icon-bottom"
+            @click="batchHandle"
+          >鎵归噺涓嬭揪
+          </el-button>
+        </div>
+
+      </div>
+
+      <div class="bodyTopFormGroup">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="100px"
+          inline
+          style="display: flex;"
+        >
+          <div class="elForm">
+            <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
+              <el-select
+                v-model="form.wkshopcode"
+                filterable
+                :popper-append-to-body="false"
+                style="width: 200px"
+                placeholder="璇烽�夋嫨"
+              >
+                <el-option
+                  v-for="item in wkshopcodeArr"
+                  :key="item.torg_code"
+                  :label="item.torg_name"
+                  :value="item.torg_code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
+              <el-select
+                v-model="form.erporderstus"
+                filterable
+                :popper-append-to-body="false"
+                style="width: 200px"
+                placeholder="璇烽�夋嫨"
+              >
+                <el-option
+                  v-for="item in erporderstusArr"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
+              <el-input v-model="form.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+
+            <el-form-item label="閿�鍞鍗�" style=" display: flex;">
+              <el-input v-model="form.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+
+            <el-form-item v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
+              <el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+
+            <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+            <el-form-item v-show="isExpandForm" label="浜у搧瑙勬牸" style=" display: flex;">
+              <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+
+            <DateType
+              ref="DateTypeRef"
+              :is-expand-form="isExpandForm"
+              style="display:flex;justify-content: center;align-items: center;position: relative"
+              @DateTypeChange="DateTypeChange"
+              @cycleTimeChange="cycleTimeChange"
+            />
+
+            <!--            <el-form-item-->
+            <!--              v-show="isExpandForm"-->
+            <!--              label="棰勮寮�宸ユ椂闂�"-->
+            <!--              label-width="100px"-->
+            <!--              style="display: flex;font-size: 14px;align-items: center"-->
+            <!--            >-->
+            <!--              <el-date-picker-->
+            <!--                v-model="form.paystartdate"-->
+            <!--                type="datetimerange"-->
+            <!--                range-separator="~"-->
+            <!--                class="timeMini"-->
+            <!--                size="mini"-->
+            <!--                style="width: 200px;display: flex;line-height: 34px;height: 34px;"-->
+            <!--                :clearable="false"-->
+            <!--                start-placeholder="寮�濮嬫棩鏈�"-->
+            <!--                end-placeholder="缁撴潫鏃ユ湡"-->
+            <!--                :picker-options="pickerOptions"-->
+            <!--                value-format="yyyy-MM-dd"-->
+            <!--                @change="pickerChange"-->
+            <!--              />-->
+            <!--            </el-form-item>-->
+
+            <!--            <el-form-item-->
+            <!--              v-show="isExpandForm"-->
+            <!--              label="棰勮瀹屽伐鏃堕棿"-->
+            <!--              label-width="100px"-->
+            <!--              style=" display: flex;font-size: 14px;align-items: center"-->
+            <!--            >-->
+            <!--              <el-date-picker-->
+            <!--                v-model="form.payenddate"-->
+            <!--                type="daterange"-->
+            <!--                :clearable="false"-->
+            <!--                class="timeMini"-->
+            <!--                range-separator="~"-->
+            <!--                start-placeholder="寮�濮嬫棩鏈�"-->
+            <!--                style="width: 200px;display: flex;line-height: 34px ;height: 34px ;"-->
+            <!--                end-placeholder="缁撴潫鏃ユ湡"-->
+            <!--                size="mini"-->
+            <!--              />-->
+            <!--            </el-form-item>-->
+          </div>
+
+          <div
+            class="bodySearchReset"
+            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+          >
+            <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+          </div>
+
+        </el-form>
+
+        <div
+          class="bodyTopFormExpand"
+        >
+          <svg-icon
+            v-show="mouseHoverType==='mouseout'"
+            style="cursor: pointer"
+            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+            @mouseenter="mouseHoverType=$event.type"
+          />
+          <svg-icon
+            v-show="mouseHoverType==='mouseenter'"
+            style="cursor: pointer"
+            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+            @click="isExpandForm=!isExpandForm"
+            @mouseout="mouseHoverType=$event.type"
+          />
+        </div>
+      </div>
+
+      <div class="elTableDiv">
+        <el-table
+          ref="tableDataRef"
+          class="tableFixed"
+          :data="tableData"
+          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
+          border
+          :row-class-name="tableRowClassName"
+          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
+          highlight-current-row
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+          :summary-method="getSummaries"
+          show-summary
+          @sort-change="sortChange"
+          @selection-change="handleSelectionChange"
+        >
+          <!--          @row-click="rowClick"-->
+          <el-table-column
+            type="selection"
+            width="50"
+            :selectable="selected"
+          />
+          <!--          <el-table-column-->
+          <!--            width="50"-->
+          <!--            fixed-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <el-radio-->
+          <!--                v-model="radioSelectedId"-->
+          <!--                :label="row.id"-->
+          <!--                style="color: transparent;padding-left: 10px;"-->
+          <!--              />-->
+          <!--              &lt;!&ndash;              @change.native="getCurrentRow(row.id)"&ndash;&gt;-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column
+            prop="rowNum"
+            width="50"
+            fixed
+            label="搴忓彿"
+          />
+          <el-table-column
+            prop="status"
+            label="璁㈠崟鐘舵��"
+            sortable="custom"
+            width="110"
+            show-tooltip-when-overflow
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.status==='NEW'">鏂拌鍗�</div>
+              <div v-if="row.status==='CREATING'">閮ㄥ垎涓嬭揪</div>
+              <div v-if="row.status==='CREATED'">鍏ㄩ儴涓嬭揪</div>
+              <div v-if="row.status==='CLOSED'">宸插叧闂�</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="wo"
+            label="璁㈠崟缂栧彿"
+            show-tooltip-when-overflow
+            sortable="custom"
+            min-width="150"
+          />
+          <el-table-column
+            show-tooltip-when-overflow
+            prop="saleOrderCode"
+            label="閿�鍞鍗�"
+            sortable="custom"
+            width="150"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="partcode"
+            label="浜у搧缂栫爜"
+            sortable="custom"
+            show-tooltip-when-overflow
+            min-width="150"
+          />
+          <el-table-column
+            prop="partname"
+            label="浜у搧鍚嶇О"
+            sortable="custom"
+            min-width="200"
+            show-tooltip-when-overflow
+          />
+          <el-table-column
+            prop="partspec"
+            label="浜у搧瑙勬牸"
+            sortable="custom"
+            show-tooltip-when-overflow
+            min-width="110"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.partspec">{{ row.partspec }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="qty"
+            label="璁㈠崟鏁伴噺"
+            width="150"
+            show-tooltip-when-overflow
+            sortable="custom"
+          />
+          <el-table-column
+            prop="relse_qty"
+            label="宸蹭笅鍗曟暟閲�"
+            show-tooltip-when-overflow
+            width="150"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="clerkuser"
+            label="閿�鍞笟鍔″憳"
+            show-tooltip-when-overflow
+            width="150"
+            sortable="custom"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.clerkuser">{{ row.clerkuser }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="wkshp_name"
+            label="鐢熶骇杞﹂棿"
+            show-tooltip-when-overflow
+            sortable="custom"
+            width="150"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+          <!--          <el-table-column-->
+          <!--            prop="planstartdate"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            label="棰勮寮�宸ユ椂闂�"-->
+          <!--            sortable="custom"-->
+          <!--            width="130"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.planstartdate">{{ row.planstartdate.substring(0, 11) }}</div>-->
+          <!--              <div v-else>/</div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            prop="planenddate"-->
+          <!--            label="棰勮瀹屽伐鏃堕棿"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            sortable="custom"-->
+          <!--            width="130"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.planenddate">{{ row.planenddate.substring(0, 11) }}</div>-->
+          <!--              <div v-else>/</div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column
+            prop="planenddate"
+            label="棰勮寮�宸ユ棩鏈�"
+            sortable="custom"
+            show-tooltip-when-overflow
+            width="130"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.planenddate">{{ row.planenddate.substring(0, 11) }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="planstartdate"
+            label="棰勮瀹屽伐鏃ユ湡"
+            sortable="custom"
+            show-tooltip-when-overflow
+            width="130"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.planstartdate">{{ row.planstartdate.substring(0, 11) }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="saleOrderDeliveryDate"
+            label="棰勮浜や粯鏃ユ湡"
+            sortable="custom"
+            show-tooltip-when-overflow
+            width="130"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.saleOrderDeliveryDate">{{ row.saleOrderDeliveryDate.substring(0, 11) }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            show-tooltip-when-overflow
+            prop="createuser"
+            label="鍒涘缓浜哄憳"
+            sortable="custom"
+            width="150"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.createuser">{{ row.createuser }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="createdate"
+            label="鍒涘缓鏃堕棿"
+            width="130"
+            show-tooltip-when-overflow
+            sortable="custom"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.createdate">{{ row.createdate.substring(0, 11) }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="鎿嶄綔"
+            fixed="right"
+            width="120"
+          >
+            <template slot-scope="{row}">
+              <div class="operationClass">
+                <el-tooltip class="item" effect="dark" content="涓嬭揪" placement="top">
+                  <!--                <el-button v-waves type="text" @click="edit('edit',row)">涓嬭揪</el-button>-->
+                  <i
+                    class="el-icon-bottom"
+                    :style="{color:$store.state.settings.theme}"
+                    style="cursor: pointer;margin-left: 5px"
+                    @click="edit('edit',row)"
+                  />
+                </el-tooltip>
+                <el-tooltip v-del-tab-index class="item" effect="dark" content="璁㈠崟鍏抽棴" placement="top">
+                  <i
+                    class="el-icon-switch-button"
+                    :style="{color:$store.state.settings.theme}"
+                    style="cursor: pointer;margin-left: 15px"
+                    @click="orderClose(row.id)"
+                  />
+                </el-tooltip>
+
+                <el-tooltip v-del-tab-index class="item" effect="dark" content="璁㈠崟鍒犻櫎" placement="top">
+                  <i
+                    class="el-icon-delete"
+                    :style="{color:$store.state.settings.theme}"
+                    style="cursor: pointer;margin-left: 15px"
+                    @click="orderDel(row.id)"
+                  />
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!--鍒嗛〉-->
+      <pagination
+        :total="total"
+        :page.sync="form.page"
+        :limit.sync="form.rows"
+        align="right"
+        layout="total,prev, pager, next,sizes,jumper"
+        popper-class="select_bottom"
+        @pagination="getErpOrderSearch"
+      />
+    </div>
+
+    <el-dialog
+      v-el-drag-dialog
+      :title="operation==='add'?'鏂板':'涓嬭揪'"
+      :visible.sync="dialogVisible"
+      width="900px"
+      top="12vh"
+      :close-on-click-modal="false"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="106px">
+        <el-form-item label="璁㈠崟缂栧彿" prop="erpordercode">
+          <el-input v-model="dialogForm.erpordercode" disabled style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="浜у搧缂栫爜" prop="partcode">
+          <el-input v-model="dialogForm.partcode" disabled style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="浜у搧鍚嶇О" prop="partname">
+          <el-input v-model="dialogForm.partname" disabled style="width: 200px" />
+        </el-form-item>
+
+        <el-form-item label="浜у搧瑙勬牸" prop="partspec">
+          <el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopname">
+          <el-input v-model="dialogForm.wkshopname" disabled style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鎵�灞炰粨搴�" prop="warehousename">
+          <el-input v-model="dialogForm.warehousename" disabled style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="璁㈠崟鏁伴噺" prop="erpqty">
+          <el-input v-model="dialogForm.erpqty" disabled style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="宸蹭笅鍗曟暟" prop="relse_qty">
+          <el-input
+            v-model="dialogForm.relse_qty"
+            disabled
+            oninput="value=value.replace(/[^0-9.]/g,'')"
+            style="width: 200px"
+          />
+        </el-form-item>
+        <el-form-item label="涓嬪崟鏁伴噺" prop="markqty">
+          <el-input
+            v-model="dialogForm.markqty"
+            oninput="value=value.replace(/[^0-9.]/g,'')"
+            style="width: 200px"
+          />
+        </el-form-item>
+        <el-form-item label="涓嬪崟鍗曟暟" prop="ordernum">
+          <el-input
+            v-model="dialogForm.ordernum"
+            oninput="value=value.replace(/[^0-9.]/g,'')"
+            style="width: 200px"
+          />
+        </el-form-item>
+
+        <el-form-item label="閿�鍞笟鍔″憳" prop="">
+          <el-input
+            v-model="dialogForm.clerkuser"
+            disabled
+            style="width: 200px"
+          />
+        </el-form-item>
+        <!--        :picker-options="pickerOptions"-->
+
+        <el-form-item label="棰勮浜や粯鏃ユ湡" prop="saleOrderDeliveryDate">
+          <el-date-picker
+            v-model="dialogForm.saleOrderDeliveryDate"
+            type="date"
+            size="mini"
+            :clearable="false"
+            class="dateMini"
+            format="yyyy-MM-dd"
+            style="width: 200px"
+            placeholder="閫夋嫨鏃ユ湡"
+            :disabled="dialogForm.saleOrderDeliveryDateIsDisabled"
+          />
+        </el-form-item>
+
+        <div style="display: flex">
+          <el-form-item label="棰勮寮�宸ユ棩鏈�" prop="" style="display: flex">
+            <el-date-picker
+              v-model="dialogForm.paystartdate"
+              type="date"
+              size="mini"
+              style="width: 200px"
+              :clearable="false"
+              class="dateMini"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              placeholder="閫夋嫨鏃ユ湡"
+            />
+          </el-form-item>
+
+          <el-form-item label="棰勮瀹屽伐鏃ユ湡" prop="" style="display: flex">
+            <el-date-picker
+              v-model="dialogForm.payenddate"
+              type="date"
+              size="mini"
+              style="width: 200px"
+              :clearable="false"
+              class="dateMini"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              placeholder="閫夋嫨鏃ユ湡"
+            />
+          </el-form-item>
+
+        </div>
+
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button
+            v-waves
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleConfirm"
+          >涓� 杈�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { handleDatetime } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import {
+  ClosedErpOrder,
+  DeleteErpOrder,
+  ErpOrderSearch,
+  MarkBatchSaveErpOrder,
+  MarkSaveErpOrder
+} from '@/api/WorkOrder'
+import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
+import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
+import DateType from '@/components/DateType'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
+export default {
+  name: 'ProduceOrderList',
+  components: {
+    Pagination, DateType
+  },
+  directives: { elDragDialog, waves },
+  data() {
+    const validateName = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('璇疯緭鍏ョ紪鐮�'))
+      } else {
+        if (SER_HZ.test(value)) {
+          return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
+        } else {
+          callback()
+        }
+      }
+    }
+    return {
+      mouseHoverType: 'mouseout',
+      isExpandForm: false,
+      mainHeight: 0,
+      tableHeight: 0,
+      form: {
+        wkshopcode: '', // 杞﹂棿缂栫爜
+        erporderstus: '', // 璁㈠崟鐘舵�佺爜
+        erpordercode: '', // 璁㈠崟缂栧彿
+        partcode: '', // 浜у搧缂栫爜
+        partname: '', // 浜у搧鍚嶇О
+        partspec: '', // 浜у搧瑙勬牸
+        creatuser: '', // 鍒涘缓浜哄憳
+        saleordercode: '', // 閿�鍞鍗�
+        // paystartdate: '', // 浜や粯鏃堕棿
+        paystartdate: '', // 棰勮寮�宸ユ椂闂�
+        payenddate: '', // 棰勮瀹屽伐鏃堕棿
+        createdate: '', // 鍒涘缓鏃堕棿
+
+        datatype: 'ED', // 鏃堕棿绫诲瀷
+        timeValue: [], // 鏃堕棿鍊�
+
+        prop: 'wo', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+
+      erporderstusArr: [
+        { code: 'NEW', name: '鏂拌鍗�' },
+        { code: 'CREATING', name: '閮ㄥ垎涓嬭揪' },
+        { code: 'CREATED', name: '鍏ㄩ儴涓嬭揪' },
+        { code: 'CLOSED', name: '宸插叧闂�' }
+      ],
+      wkshopcodeArr: [],
+      total: 10,
+      radioSelectedId: '',
+      tableData: [],
+      dialogVisible: false,
+      dialogForm: {
+        erporderid: '', // 璁㈠崟id
+        sbid: '', // 璁㈠崟鏄庣粏id
+        erpordercode: '', // 璁㈠崟缂栧彿
+        saleordercode: '', // 閿�鍞鍗�
+
+        partcode: '', // 浜у搧缂栫爜
+        partname: '', // 浜у搧鍚嶇О
+        partspec: '', // 浜у搧瑙勬牸
+
+        wkshopcode: '', // 杞﹂棿缂栫爜
+        wkshopname: '', // 杞﹂棿鍚嶇О
+
+        warehousecode: '', // 浠撳簱缂栫爜
+        warehousename: '', // 浠撳簱鍚嶇О
+
+        erpqty: '', // 璁㈠崟鏁伴噺
+        markqty: '', // 涓嬪崟鏁伴噺
+        ordernum: '', // 涓嬪崟鍗曟暟
+        relse_qty: '', // 宸蹭笅鍗曟暟閲�
+
+        clerkuser: '', // 閿�鍞笟鍔″憳
+
+        saleOrderDeliveryDate: '', // 棰勮浜や粯鏃ユ湡
+
+        deptcode: '',
+
+        paystartdate: '', //   棰勮寮�宸ユ棩鏈�
+        payenddate: ''//  棰勮瀹屽伐鏃ユ湡
+      },
+      operation: '',
+      dialogFormRules: {
+        // OrgType: [
+        //   { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+        // ],
+        // OrgCode: [
+        //   { required: true, validator: validateName, trigger: ['blur', 'change'] }
+        // ],
+        markqty: [
+          { required: true, message: '璇疯緭鍏ヤ笅鍗曟暟閲�', trigger: ['blur', 'change'] }
+        ],
+        ordernum: [
+          { required: true, message: '璇疯緭鍏ヤ笅鍗曞崟鏁�', trigger: ['blur', 'change'] }
+        ],
+        saleOrderDeliveryDate: [
+          { required: true, message: '璇烽�夋嫨棰勮浜や粯鏃ユ湡', trigger: ['blur', 'change'] }
+        ]
+
+      },
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7
+        }
+      },
+      multipleSelection: []
+
+      // expireTimeOption: {
+      //   disabledDate(time) {
+      //     return time.getTime() > Date.now() - 8.64e6 // 濡傛灉娌℃湁鍚庨潰鐨�-8.64e6灏辨槸涓嶅彲浠ラ�夋嫨浠婂ぉ鐨�
+      //   }
+      // }
+
+    }
+  },
+  activated() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  created() {
+    this.getErpOrderSearch()
+    // this.getPartSelect()// 鑾峰彇浜у搧缂栫爜淇℃伅
+
+    this.getPrentOrganizationNoCompany()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  methods: {
+
+    DateTypeChange(value) {
+      this.form.datatype = value
+    },
+    cycleTimeChange(val) {
+      this.form.timeValue = val
+    },
+
+    pickerChange(value) {
+      console.log(value, 123)
+      this.cycleTime = null
+    },
+
+    async getPrentOrganizationNoCompany() {
+      const { data: res } = await PrentOrganizationNoCompany()
+      this.wkshopcodeArr = res
+    },
+    async getErpOrderSearch() {
+      console.log(this.form, 1)
+      // let tempDate2 = this.form.paystartdate
+      // if (tempDate2.length > 0) {
+      //   tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
+      // }
+      //
+      // let tempDate = this.form.payenddate
+      // if (tempDate.length > 0) {
+      //   tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+      // }
+
+      const data = {
+
+        erporderstus: this.form.erporderstus, // 璁㈠崟鐘舵�佺爜
+        wkshopcode: this.form.wkshopcode, // 杞﹂棿缂栫爜
+        erpordercode: this.form.erpordercode, // 璁㈠崟缂栧彿
+        saleordercode: this.form.saleordercode, // 閿�鍞崟鍙�
+
+        partcode: this.form.partcode, // 浜у搧缂栫爜
+        partname: this.form.partname, // 浜у搧鍚嶇О
+        partspec: this.form.partspec, // 浜у搧瑙勬牸
+
+        datatype: this.form.datatype, // 鏃ユ湡绫诲瀷(璁″垝寮�宸�(PS)銆佽鍒掑畬宸�(PE)銆侀璁′氦浠�(ED))
+        searchdate: this.form.timeValue.join('~'), // 鏃堕棿娈�
+        // paystartdate: tempDate2, // 浜や粯鏃堕棿
+        // payenddate: tempDate, // 浜や粯鏃堕棿
+
+        creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
+
+        prop: this.form.prop, // 鎺掑簭瀛楁
+        order: this.form.order, // 鎺掑簭瀛楁
+        page: this.form.page, // 绗嚑椤�
+        rows: this.form.rows // 姣忛〉澶氬皯鏉�
+
+      }
+
+      const res = await ErpOrderSearch(data)
+      this.tableData = res.data
+      this.total = res.count
+    },
+    // 鎺掑簭鏀瑰彉鏃�
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getErpOrderSearch()
+    },
+    // 鍚屾ERP
+    syncERP() {
+      const loading = this.$loading({
+        lock: true,
+        text: '姝e湪鍚屾ERP锛岃绋嶇瓑...',
+        spinner: 'el-icon-loading',
+        customClass: 'osloading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+
+      SeaveSearchErpOrder().then(res => {
+        console.log(res, 11)
+        if (res.code === '200') {
+          setTimeout(() => {
+            this.getErpOrderSearch()
+            loading.close()
+            this.$message.success('鍚屾鎴愬姛锛�')
+          }, 2000)
+        }
+        // else if (res.code === '300') {
+        //   setTimeout(() => {
+        //     loading.close()
+        //     this.$message.error('鍚屾澶辫触锛�')
+        //   }, 10000)
+        // }
+      }).catch(e => {
+        loading.close()
+      })
+    },
+    // 鏌ヨ
+    search() {
+      this.getErpOrderSearch()
+    },
+    // 閲嶇疆
+    reset() {
+      this.form.wkshopcode = ''
+      this.form.erporderstus = ''
+      this.form.erpordercode = ''
+      this.form.partcode = ''
+      this.form.partname = ''
+      this.form.partspec = ''
+      this.form.paystartdate = ''
+      this.form.payenddate = ''
+      this.form.creatuser = ''
+      this.form.saleordercode = ''
+      this.form.createdate = ''
+
+      this.form.timeValue = []
+      this.cycleTime = null
+
+      this.$refs.DateTypeRef.clearValue()
+
+      this.getErpOrderSearch()
+    },
+    // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
+    // getCurrentRow(id) {
+    //   this.radioSelectedId = id
+    // },
+    // rowClick(row) {
+    //   this.radioSelectedId = row.id
+    // },
+
+    // 璁㈠崟鍒犻櫎
+    orderDel(id) {
+      this.tableData.forEach(item => {
+        if (item.id === id) {
+          if (item.status === 'CLOSED') {
+            return this.$message.info('姝よ鍗曞凡鍏抽棴锛屾棤娉曞垹闄わ紒')
+          } else {
+            this.$confirm('鏄惁纭鍏抽棴璁㈠崟?', '鎻愮ず', {
+              confirmButtonText: '纭畾',
+              cancelButtonText: '鍙栨秷',
+              type: 'warning'
+            }).then(() => {
+              DeleteErpOrder({ erpordercode: item.wo, erporderid: id }).then(res => {
+                if (res.code === '200') {
+                  this.$message.success('璁㈠崟鍒犻櫎鎴愬姛!')
+                  this.getErpOrderSearch()
+                }
+              })
+            }).catch(() => {
+              this.$message.info('宸插彇娑堝垹闄わ紒')
+            })
+          }
+        }
+      })
+    },
+    // 璁㈠崟鍏抽棴
+    async orderClose(id) {
+      this.tableData.forEach(item => {
+        if (item.id === id) {
+          if (item.status !== 'NEW') {
+            return this.$message.info('姝よ鍗曢潪鏂拌鍗曪紝鏃犳硶鍏抽棴锛�')
+          } else {
+            this.$confirm('鏄惁纭鍏抽棴璁㈠崟?', '鎻愮ず', {
+              confirmButtonText: '纭畾',
+              cancelButtonText: '鍙栨秷',
+              type: 'warning'
+            }).then(() => {
+              ClosedErpOrder({ erpordercode: item.wo, erporderid: id }).then(res => {
+                if (res.code === '200') {
+                  this.$message.success('璁㈠崟鍏抽棴鎴愬姛!')
+                  this.getErpOrderSearch()
+                }
+              })
+            }).catch(() => {
+              this.$message.info('宸插彇娑堝叧闂紒')
+            })
+          }
+        }
+      })
+    },
+    batchHandle() {
+      this.$confirm('鏄惁鎵归噺涓嬭揪?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        if (this.multipleSelection.length === 0) {
+          return this.$message.info('璇峰厛閫夋嫨璁㈠崟锛�')
+        }
+        // console.log(JSON.parse(JSON.stringify(this.multipleSelection)))
+        const data = []
+        this.multipleSelection.forEach(i => {
+          data.push({
+            'erporderid': i.id,
+            'sbid': i.sbid,
+            'erpordercode': i.wo,
+            'partcode': i.partcode,
+            'wkshopcode': i.wkshp_code,
+            'warehousecode': i.stck_code,
+            'erpqty': i.qty,
+            'markqty': i.qty,
+            'ordernum': 1,
+            'clerkuser': i.clerkuser,
+            'relse_qty': i.qty,
+            'saleordercode': i.saleOrderCode,
+            // 'saleOrderDeliveryDate': i.saleOrderDeliveryDate
+            'saleOrderDeliveryDate': handleDatetime(new Date()) + ' 00:00:00',
+            deptcode: i.dept_code,
+            'paystartdate': i.planstartdate,
+            'payenddate': i.planenddate
+          })
+        })
+        // console.log(JSON.parse(JSON.stringify(data)))
+        MarkBatchSaveErpOrder(data).then(res => {
+          if (res.code === '200') {
+            this.multipleSelection = []
+            this.$message.success('鎵归噺涓嬭揪鎴愬姛锛�')
+            this.getErpOrderSearch()
+          } else {
+            this.$message.error('鎵归噺涓嬭揪澶辫触锛�')
+          }
+        })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堜笅杈撅紒')
+      })
+    },
+    selected(row, index) {
+      return row.status === 'NEW'
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 鏂板鎸夐挳
+    add(operation) {
+      this.operation = operation
+      this.dialogVisible = true
+    },
+    // 淇敼鎸夐挳
+    edit(operation, row) {
+      if (parseFloat(row.qty) === parseFloat(row.relse_qty) || row.status === 'CLOSED') {
+        return this.$message.info('姝ゅ伐鍗曞凡鍏ㄩ儴涓嬭揪锛�')
+      }
+
+      this.operation = operation
+      this.dialogVisible = true
+
+      this.$nextTick(() => {
+        this.dialogForm.sbid = row.sbid
+        this.dialogForm.erporderid = row.id
+        this.dialogForm.erpordercode = row.wo
+        this.dialogForm.saleordercode = row.saleOrderCode
+
+        this.dialogForm.partcode = row.partcode
+        this.dialogForm.partname = row.partname
+        this.dialogForm.partspec = row.partspec
+
+        this.dialogForm.wkshopcode = row.wkshp_code
+        this.dialogForm.wkshopname = row.wkshp_name
+
+        this.dialogForm.warehousecode = row.stck_code
+        this.dialogForm.warehousename = row.stck_name
+
+        this.dialogForm.saleOrderDeliveryDate = row.saleOrderDeliveryDate
+
+        this.dialogForm.erpqty = row.qty
+        this.dialogForm.markqty = parseFloat(row.qty) - parseFloat(row.relse_qty)
+        this.dialogForm.ordernum = 1
+        this.dialogForm.relse_qty = row.relse_qty
+        this.dialogForm.clerkuser = row.clerkuser
+
+        this.dialogForm.paystartdate = row.planstartdate
+        this.dialogForm.payenddate = row.planenddate
+
+        this.dialogForm.deptcode = row.dept_code
+      })
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.dialogForm = {
+        erporderid: '', // 璁㈠崟id
+        sbid: '', // 璁㈠崟鏄庣粏id
+        erpordercode: '', // 璁㈠崟缂栧彿
+        saleordercode: '', // 閿�鍞鍗�
+
+        partcode: '', // 浜у搧缂栫爜
+        partname: '', // 浜у搧鍚嶇О
+        partspec: '', // 浜у搧瑙勬牸
+
+        wkshopcode: '', // 杞﹂棿缂栫爜
+        wkshopname: '', // 杞﹂棿鍚嶇О
+
+        warehousecode: '', // 浠撳簱缂栫爜
+        warehousename: '', // 浠撳簱鍚嶇О
+
+        erpqty: '', // 璁㈠崟鏁伴噺
+        markqty: '', // 涓嬪崟鏁伴噺
+        ordernum: '', // 涓嬪崟鍗曟暟
+        relse_qty: '', // 宸蹭笅鍗曟暟閲�
+
+        payenddate: '', // 棰勮瀹屽伐鏃ユ湡
+        paystartdate: '', // 棰勮寮�宸ユ棩鏈�
+
+        deptcode: '',
+
+        saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
+      }
+      this.$refs.dialogForm.clearValidate()
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.dialogForm.markqty = parseFloat(this.dialogForm.markqty)
+      this.dialogForm.erpqty = parseFloat(this.dialogForm.erpqty)
+      this.dialogForm.relse_qty = parseFloat(this.dialogForm.relse_qty)
+      this.dialogForm.ordernum = parseFloat(this.dialogForm.ordernum)
+      if (this.dialogForm.markqty < 1 || this.dialogForm.markqty > this.dialogForm.erpqty - this.dialogForm.relse_qty) {
+        return this.$message.info('涓嬪崟鏁伴噺瓒呭嚭鍙笅鍗曟暟鐨勮寖鍥达紒')
+      }
+
+      if (this.dialogForm.ordernum < 1 || this.dialogForm.ordernum > this.dialogForm.markqty) {
+        return this.$message.info('涓嬪崟鍗曟暟瓒呭嚭鍙笅鍗曞崟鏁扮殑鑼冨洿锛�')
+      }
+
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          this.$store.state.app.buttonIsDisabled = true
+          const data = {
+            'sbid': this.dialogForm.sbid,
+            'erporderid': this.dialogForm.erporderid,
+            'erpordercode': this.dialogForm.erpordercode,
+            'saleordercode': this.dialogForm.saleordercode,
+            'partcode': this.dialogForm.partcode,
+            'wkshopcode': this.dialogForm.wkshopcode,
+            'warehousecode': this.dialogForm.warehousecode,
+            'clerkuser': this.dialogForm.clerkuser,
+            'erpqty': this.dialogForm.erpqty,
+            'markqty': this.dialogForm.markqty,
+            'ordernum': this.dialogForm.ordernum,
+            'payenddate': this.dialogForm.payenddate,
+            'paystartdate': this.dialogForm.paystartdate,
+            'relse_qty': this.dialogForm.relse_qty,
+            deptcode: this.dialogForm.deptcode,
+            'saleOrderDeliveryDate': handleDatetime(this.dialogForm.saleOrderDeliveryDate) + ' 00:00:00'
+          }
+
+          MarkSaveErpOrder(data).then(res => {
+            if (res.code === '200') {
+              this.dialogVisible = false
+              this.$message.success('涓嬭揪鎴愬姛锛�')
+              this.getErpOrderSearch()
+              this.$store.state.app.buttonIsDisabled = false
+            } else {
+              this.$message.error('涓嬭揪澶辫触锛�')
+            }
+          })
+        }
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 250
+
+        this.$refs.tableDataRef.doLayout()
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      return 'custom-row'
+    },
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      const i = 7
+      columns.forEach((column, index) => {
+        if (index === i) {
+          sums[index] = '鎬绘暟'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'qty') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+              // return Math.round(prev * 100) / 100 + Math.round(curr * 100) / 100
+            }
+          }, 0)
+
+          sums[index] += ' 鍗�'
+        }
+        if (column.property === 'relse_qty') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+              // return Math.round(prev * 100) / 100 + Math.round(curr * 100) / 100
+            }
+          }, 0)
+
+          sums[index] += ' 鍗�'
+        }
+      })
+
+      this.$nextTick(() => {
+        this.$refs.tableDataRef.doLayout()
+      })
+      return sums
+    }
+  }
+}
+</script>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+
+::v-deep .el-range__icon {
+  line-height: 28px !important;
+}
+
+::v-deep .el-range-separator {
+  line-height: 28px !important;
+}
+
+::v-deep .el-range-input {
+  font-size: 14px;
+}
+
+::v-deep .el-range-separator {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+  color: $main_color;
+  cursor: pointer;
+}
+
+.el-icon-edit-outline {
+  margin-right: 15px;
+}
+
+//::v-deep .el-button--primary, .el-button--default, .el-button--info {
+//  height: 34px;
+//  display: flex;
+//  align-items: center;
+//  padding: 0 15px;
+//}
+
+::v-deep .el-button--primary {
+  //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+  background-color: #f8f8fa;
+  border: none;
+}
+
+::v-deep .el-input__inner {
+  height: 34px;
+  line-height: 34px;
+  //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+  padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+  display: flex;
+  justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+  transform: scale(0.8);
+}
+
+::v-deep .cell {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+  height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+  background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+  background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+  color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+  border: 1px solid #eee;
+  width: 99%;
+  margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+.elTableDiv {
+  ::v-deep .el-radio__label {
+    display: none;
+  }
+}
+
+.tableFixed {
+  ::v-deep .el-table__fixed-right {
+    height: 100% !important;
+  }
+
+  ::v-deep .el-table__fixed {
+    height: 100% !important;
+  }
+}
+
+.dateMini {
+  ::v-deep .el-input__inner {
+    line-height: 34px;
+    height: 34px;
+    width: 200px;
+    display: flex;
+    font-size: 14px !important;
+    align-items: center !important;
+  }
+
+  ::v-deep .el-input__prefix {
+    margin-top: -3px;
+  }
+}
+
+::v-deep .el-icon-delete {
+  cursor: pointer;
+  margin-right: 0px !important;
+}
+</style>
+<style>
+.el-table .custom-row {
+  background: #f8f8fa;
+}
+
+.osloading {
+  font-size: 26px !important;
+}
+
+.el-loading-text {
+  font-size: 26px !important;
+}
+
+.el-picker-panel__footer {
+  display: flex !important;
+  justify-content: flex-end !important;
+}
+
+</style>
+
diff --git a/vue.config.js b/vue.config.js
index 21847fe..d1d9c54 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -52,7 +52,7 @@
     },
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        target: 'http://121.196.36.24:8034', // 鏈湴
+        target: 'http://121.196.36.24:8036', // 鏈湴
         // target: 'http://192.168.0.99:8000', // 娉颁赴
         changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
         pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃

--
Gitblit v1.9.3