From 37ba046b02d4b49b41d11063026ec2eb1fed883b Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 8 Mar 2024 15:07:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=80=97=E6=9D=90=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                         |   4 +-
 src/views/basic/product/productAdd.vue  |   4 +-
 src/views/basic/product/productEdit.vue |  17 ++
 src/views/purchase/purPlan/purPlan.vue  | 324 +++++++++++++-----------
 4 files changed, 193 insertions(+), 156 deletions(-)

diff --git a/.env.production b/.env.production
index 72e7f3d4..27d1db4c 100644
--- a/.env.production
+++ b/.env.production
@@ -41,7 +41,7 @@ ENV = 'production'
 
 
 # 长泰医院
-VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
 
 # 三明大田医院
 # VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/'
@@ -71,7 +71,7 @@ VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
 
 
 # 南靖
-# VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://192.168.73.128:9150/UDI_WMS_MC/'
 # 测试NIGINX
 # VUE_APP_BASE_API = 'https://test.udims.com/UDI_WMS_MC/'
diff --git a/src/views/basic/product/productAdd.vue b/src/views/basic/product/productAdd.vue
index 5d0a10d2..5dba43f1 100644
--- a/src/views/basic/product/productAdd.vue
+++ b/src/views/basic/product/productAdd.vue
@@ -113,7 +113,7 @@
 </template>
 
 <script>
-import { addProduct } from '@/api/basic/product/udiRelevance'
+import {addProduct} from '@/api/basic/product/udiRelevance'
 
 export default {
   name: 'productAdd',
@@ -141,7 +141,7 @@ export default {
         tyshxydm: null,
         qxlb: null,
         cpms: null,
-        attributeType: null
+        attributeType: null, hcType: null,
       },
       thirdSys: []
     }
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 7b54fe55..6e157bbd 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -374,6 +374,23 @@
               </el-col>
             </el-row>
             <el-divider></el-divider>
+            <el-row>
+              <el-col span="5">
+                <span class="sptext">耗材类别</span>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-select v-model="editQuery.hcType" style="width: 65%" placeholder="选择耗材类别" clearable>
+                  <el-option label="高值耗材" :value="1"></el-option>
+                  <el-option label="普通耗材" :value="2"></el-option>
+                </el-select>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="13">
+                <span class="sptext">产品属性</span>
+              </el-col>
+            </el-row>
+            <el-divider></el-divider>
             <el-row>
               <el-col span="5">
                 <span class="sptext">多次/重复使用耗材</span>
diff --git a/src/views/purchase/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
index 9a05cd3d..a1fbc589 100644
--- a/src/views/purchase/purPlan/purPlan.vue
+++ b/src/views/purchase/purPlan/purPlan.vue
@@ -1,74 +1,76 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" label-width="100px" >
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="采购单号">-->
-<!--              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
+               label-width="100px">
+        <!--        <el-row>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item label="采购单号">-->
+        <!--              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
 
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="采购部门">-->
-<!--              <el-select v-model="filterQuery.deptCode" @change="getInvList" placeholder="请选择申购部门" style="width: 90%">-->
-<!--                <el-option-->
-<!--                  v-for="item in deptList"-->
-<!--                  :key="item.code"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code"-->
-<!--                >-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item label="采购部门">-->
+        <!--              <el-select v-model="filterQuery.deptCode" @change="getInvList" placeholder="请选择申购部门" style="width: 90%">-->
+        <!--                <el-option-->
+        <!--                  v-for="item in deptList"-->
+        <!--                  :key="item.code"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.code"-->
+        <!--                >-->
+        <!--                  <span style="float: left">{{ item.name }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
 
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="采购仓库">-->
-<!--              <el-select v-model="filterQuery.invCode" style="width: 90%"  clearable placeholder="请选择所属仓库">-->
-<!--                <el-option-->
-<!--                  v-for="item in invList"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item label="采购仓库">-->
+        <!--              <el-select v-model="filterQuery.invCode" style="width: 90%"  clearable placeholder="请选择所属仓库">-->
+        <!--                <el-option-->
+        <!--                  v-for="item in invList"-->
+        <!--                  :key="item.name"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.code">-->
+        <!--                  <span style="float: left">{{ item.name }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
 
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="紧急程度：" prop="emergency">-->
-<!--              <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>-->
-<!--                <el-option label="正常" :value=1></el-option>-->
-<!--                <el-option label="较急" :value=2></el-option>-->
-<!--                <el-option label="特急" :value=3></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="创建时间:">-->
-<!--              <el-date-picker-->
-<!--                :picker-options="pickerOptions"-->
-<!--                v-model="actDateRange"-->
-<!--                type="daterange"-->
-<!--                format="yyyy 年 MM 月 dd 日"-->
-<!--                style="width: 90%"-->
-<!--                value-format="yyyy-MM-dd"-->
-<!--                range-separator="至"-->
-<!--                start-placeholder="开始日期"-->
-<!--                end-placeholder="结束日期"-->
-<!--              >-->
-<!--              </el-date-picker>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
+        <!--        <el-row>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item label="紧急程度：" prop="emergency">-->
+        <!--              <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>-->
+        <!--                <el-option label="正常" :value=1></el-option>-->
+        <!--                <el-option label="较急" :value=2></el-option>-->
+        <!--                <el-option label="特急" :value=3></el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item label="创建时间:">-->
+        <!--              <el-date-picker-->
+        <!--                :picker-options="pickerOptions"-->
+        <!--                v-model="actDateRange"-->
+        <!--                type="daterange"-->
+        <!--                format="yyyy 年 MM 月 dd 日"-->
+        <!--                style="width: 90%"-->
+        <!--                value-format="yyyy-MM-dd"-->
+        <!--                range-separator="至"-->
+        <!--                start-placeholder="开始日期"-->
+        <!--                end-placeholder="结束日期"-->
+        <!--              >-->
+        <!--              </el-date-picker>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
-          <template v-for="(item, index) in queryList" >
-            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+          <template v-for="(item, index) in queryList">
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -77,7 +79,8 @@
                 clearable
               ></el-input>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select v-model="filterQuery[item.columnName]"
                          :placeholder="item.columnDesc"
                          :disabled="executeEval(null,item.disabledFuc,false)"
@@ -90,7 +93,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -107,7 +111,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
@@ -119,7 +124,8 @@
                 end-placeholder="结束日期"
               ></el-date-picker>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 v-model="filterQuery[item.columnName]"
                 :style="`width:${item.width+'px'}`"
@@ -146,34 +152,34 @@
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
                 @current-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
-                :default-sort="defaultSort"   @sort-change="handleSortChange">
-<!--        <el-table-column label="序号" type="index" width="60"></el-table-column>-->
-<!--        <el-table-column label="采购单号" prop="billNo"></el-table-column>-->
-<!--        <el-table-column label="采购部门" prop="deptName"></el-table-column>-->
-<!--        <el-table-column label="采购仓库" prop="invName"></el-table-column>-->
-<!--        <el-table-column label="紧急程度" prop="emergency">-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ emergencyMap[scope.row.emergency] }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="到货截止" prop="arrivalTime"></el-table-column>-->
-<!--        <el-table-column label="单据状态" prop="status">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-tag :type="(scope.row.status) | statusFilterType">-->
-<!--              {{ statusMap[scope.row.status] }}-->
-<!--            </el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="创建时间" prop="createTime"-->
-<!--                         sortable="custom"   :sort-orders="['ascending', 'descending']"></el-table-column>-->
+                :default-sort="defaultSort" @sort-change="handleSortChange">
+        <!--        <el-table-column label="序号" type="index" width="60"></el-table-column>-->
+        <!--        <el-table-column label="采购单号" prop="billNo"></el-table-column>-->
+        <!--        <el-table-column label="采购部门" prop="deptName"></el-table-column>-->
+        <!--        <el-table-column label="采购仓库" prop="invName"></el-table-column>-->
+        <!--        <el-table-column label="紧急程度" prop="emergency">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ emergencyMap[scope.row.emergency] }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="到货截止" prop="arrivalTime"></el-table-column>-->
+        <!--        <el-table-column label="单据状态" prop="status">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag :type="(scope.row.status) | statusFilterType">-->
+        <!--              {{ statusMap[scope.row.status] }}-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="创建时间" prop="createTime"-->
+        <!--                         sortable="custom"   :sort-orders="['ascending', 'descending']"></el-table-column>-->
 
-<!--        <el-table-column label="操作" width="120">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑-->
-<!--            </el-button>-->
-<!--            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column label="操作" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑-->
+        <!--            </el-button>-->
+        <!--            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <template v-for="(item, index) in tableHeader">
           <el-table-column
             v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@@ -194,7 +200,7 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template  slot-scope="scope">
+            <template slot-scope="scope">
               <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
             </template>
           </el-table-column>
@@ -207,8 +213,10 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template   slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
+                  item.lableRuleObj[scope.row[item.columnName]]
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -220,9 +228,12 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template   slot-scope="scope">
-              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
-                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+            <template slot-scope="scope">
+              <el-tag
+                :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{
+                    item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+                  }}</span>
               </el-tag>
             </template>
           </el-table-column>
@@ -257,7 +268,9 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                  scope.row[item.columnName]
+                }}</span>
             </template>
           </el-table-column>
         </template>
@@ -275,15 +288,15 @@
     </el-card>
     <el-card class="el-card">
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
-<!--        <el-table-column label="序号" type="index" width="60"></el-table-column>-->
-<!--        <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>-->
-<!--        <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>-->
-<!--        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>-->
-<!--        <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>-->
-<!--        <el-table-column label="申购数量" prop="count"></el-table-column>-->
-<!--        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>-->
-<!--        <el-table-column label="生产厂家" prop="manufactory"></el-table-column>-->
-<!--        <el-table-column label="供应商" prop="supName"></el-table-column>-->
+        <!--        <el-table-column label="序号" type="index" width="60"></el-table-column>-->
+        <!--        <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>-->
+        <!--        <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>-->
+        <!--        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>-->
+        <!--        <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>-->
+        <!--        <el-table-column label="申购数量" prop="count"></el-table-column>-->
+        <!--        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>-->
+        <!--        <el-table-column label="生产厂家" prop="manufactory"></el-table-column>-->
+        <!--        <el-table-column label="供应商" prop="supName"></el-table-column>-->
         <template v-for="(item, index) in tableHeader2">
           <el-table-column
             v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@@ -304,7 +317,7 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template  slot-scope="scope">
+            <template slot-scope="scope">
               <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
             </template>
           </el-table-column>
@@ -317,8 +330,10 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template   slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
+                  item.lableRuleObj[scope.row[item.columnName]]
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -330,9 +345,12 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template   slot-scope="scope">
-              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
-                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+            <template slot-scope="scope">
+              <el-tag
+                :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{
+                    item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+                  }}</span>
               </el-tag>
             </template>
           </el-table-column>
@@ -367,7 +385,9 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                  scope.row[item.columnName]
+                }}</span>
             </template>
           </el-table-column>
         </template>
@@ -397,11 +417,11 @@
 import purPlanEdit from "./purPlanEditDialog";
 import {delApply, inserThrOrderWeb, listPlan, listApplyDetail, delPlanDetailAll} from "@/api/purchase/purPlan";
 import {delApplyDetailAll} from "@/api/purchase/purApply";
-import { getInvListByUser } from '@/api/system/invWarehouse'
+import {getInvListByUser} from '@/api/system/invWarehouse'
 import {getDeptListByUser, getDeptListByUserOptimize} from '@/api/auth/authDept'
 import {filterSubAll, filterSubAllOptimize} from "@/api/system/invSubWarehouse";
 import {
-  getHead,executeFuc
+  getHead, executeFuc
 } from "@/utils/customConfig";
 
 export default {
@@ -421,11 +441,11 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
-        emergency:'',
-        deptCode:'',
-        invCode:null
+        emergency: '',
+        deptCode: '',
+        invCode: null
       },
-      invCodebe:null,
+      invCodebe: null,
       formName: null,
       formMap: {
         add: "新增采购计划",
@@ -439,15 +459,15 @@ export default {
       },
       idQuery: {},
       total: 0,
-      tableHeader:[],
-      queryList:[],
-      fromList:[],
-      tableHeader2:[],
-      queryList2:[],
-      fromList2:[],
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
+      tableHeader2: [],
+      queryList2: [],
+      fromList2: [],
       options: {
-        getInvList:[],
-        getDeptList:[],
+        getInvList: [],
+        getDeptList: [],
       },
       thirdSys: [],
       thirdSysDetail: null,
@@ -457,13 +477,13 @@ export default {
       detailList: [],
       loading: false,
       actDateRange: [],
-      emergencyMap:{
+      emergencyMap: {
         1: "正常",
         2: "较急",
         3: "特急",
       },
-      invList:{},
-      deptList:{},
+      invList: {},
+      deptList: {},
       newSpDistributionVisible: false,
       pickerOptions: {
         shortcuts: [
@@ -517,7 +537,7 @@ export default {
         type: 1,
         editStatus: 1,
         deptCode: this.invCodebe,
-        invCode:null
+        invCode: null
       };
       this.actDateRange = [];
       this.getInvList(this)
@@ -543,7 +563,7 @@ export default {
             this.newSpDistributionVisible = false
           }
         });
-      }else{
+      } else {
         this.newSpDistributionVisible = false
       }
 
@@ -581,7 +601,7 @@ export default {
           if (response.code == 20000) {
             this.list = response.data.list || [];
             this.total = response.data.total || 0;
-            this.detailList=[]
+            this.detailList = []
           } else {
             this.$message.error(response.message);
           }
@@ -593,7 +613,7 @@ export default {
           this.total = 0;
         });
     },
-    handleDetail(_this,row) {
+    handleDetail(_this, row) {
       let query = {orderIdFk: row.id};
       _this.loading = true;
       listApplyDetail(query) //查找该单号下的所有条码
@@ -636,7 +656,7 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(_this,row) {
+    deleteDialog(_this, row) {
       _this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -672,8 +692,8 @@ export default {
       this.detailList = [];
     },
     getInvList(_this) {
-      var query={
-        parentId:this.filterQuery.deptCode
+      var query = {
+        parentId: this.filterQuery.deptCode
       }
       this.filterQuery.invCode = null
       filterSubAllOptimize(query).then((res) => {
@@ -683,9 +703,9 @@ export default {
     getDeptList(_this) {
       getDeptListByUserOptimize().then((res) => {
         _this.options.getDeptList = res.data || [];
-        if( _this.options.getDeptList.length>0){
-          _this.filterQuery.deptCode= _this.options.getDeptList[0].code
-          _this.invCodebe=this.filterQuery.deptCode
+        if (_this.options.getDeptList.length > 0) {
+          _this.filterQuery.deptCode = _this.options.getDeptList[0].code
+          _this.invCodebe = this.filterQuery.deptCode
         }
         _this.getList();
         _this.getInvList(_this);
@@ -694,7 +714,7 @@ export default {
 
 
     newDistributionForm(_this, row) {
-      if(_this == null){
+      if (_this == null) {
         _this = this
       }
       _this.idQuery.id = '';
@@ -706,11 +726,11 @@ export default {
         _this.formName = "add";
       _this.newSpDistributionVisible = true;
     },
-    executeFuc(row,type,clickFuc,value){
-      return executeFuc(this,row,type,clickFuc,value);
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
     },
-    executeEval(row,expression,defaultRet){
-      if(expression){
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
         return eval(expression);
       }
       return defaultRet;
@@ -738,14 +758,14 @@ export default {
   created() {
     this.getDeptList(this);
     // this.finCorpList();
-    getHead("purPlan-1","1").then((re) => {
+    getHead("purPlan-1", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;
       this.queryList = re.data.queryList;
       this.fromList = re.data.fromList;
     });
-    getHead("purPlan-2","1").then((re) => {
+    getHead("purPlan-2", "1").then((re) => {
       // 处理返回的数据
       this.tableObj2 = re.data;
       this.tableHeader2 = re.data.tableList;