修改bug

src/api/tirePartsMall/salesManagement/saleOrder.js

@@ -304,4 +304,16 @@ export const revokeCheckOrderRW = (data) => {
     method: 'POST',
     data: data
   })
+}
+
+export const getParamservice = (current, size, params) => {
+  return request({
+    url: '/api/blade-system/paramservice/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
 }

src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -279,6 +279,7 @@ import {
     aeabillsDetail,
     aeabillsRevokeCheckBills, aeabillsSubmit
 } from "@/api/iosBasicData/aeabills";
+import { contrastObj, contrastList } from "@/util/contrastData";
 export default {
     components: {
         checkSchedule,
@@ -341,6 +342,29 @@ export default {
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
             },
+            oldForm: {
+                billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
+                operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
+                operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
+                createUserName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // 默认登录人
+                createUserId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // 默认登录人
+                businessType: 'AE', // 业务类型 默认
+                billType: 'DD', // 单据类型 默认 直单
+                accDeptName: '',// 核算部门 默认登录人的部门
+                issueType: 'ORI', // 签单方式 默认 正本
+                mpaymode: 'PP', // 主单付费方式 默认PP
+                hpaymode: 'PP', // 分单付费方式 默认 PP
+                loadType: 'FCL', // 装箱方式默认整箱
+                srcType: 'OWN', // 业务来源默认公司   来源 内容 默认登录人所属公司
+                numberOfObl: 'THREE', // 正本份数 默认 THREE
+                numberOfCopy: 'ONE', // 副本份数 默认 ONE
+                seaType: '直航',
+                marks: 'N/M',
+                filesList: [], // 文件中心
+                feeCenterListD: [], // 收
+                feeCenterListC: [], // 付
+                preContainersList: [], // 箱
+            },
             // 循环的配置
             basicData: {
                 column: [
@@ -1177,7 +1201,26 @@ export default {
         },
         //返回列表
         backToList() {
-            this.$emit('goBack')
+            if (contrastObj(this.form, this.oldForm)
+                || contrastList(this.form.feeCenterListC, this.oldForm.feeCenterListC)
+                || contrastList(this.form.feeCenterListD, this.oldForm.feeCenterListD)
+                || contrastList(this.form.filesList, this.oldForm.filesList)
+            ) {
+                this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                })
+                    .then(() => {
+                        this.editCustomer('goBack')
+                    })
+                    .catch(() => {
+                        this.$emit('goBack')
+                    });
+            } else {
+                this.$emit('goBack')
+            }
+      
         },
         // 单据请核
         DocumentApproval() {
@@ -1488,6 +1531,9 @@ export default {
                     type: "success",
                     message: "操作成功!"
                 });
+                if (status == 'goBack') {
+                    this.$emit('goBack')
+                }
                 // this.detailData.seeDisabled = true
                 this.billsDetailfun(res.data.data.id, status)
             }).catch(err => {
@@ -1853,11 +1899,10 @@ export default {
                             this.form.corpCnName = this.form.corpCnName + ' - ' + e.shortName
                         }
                     })
+                    this.oldForm = this.deepClone(this.form);
                     // this.form.corpCnName = this.form.corpCnName + ' - ' + res.data.data.records[0].shortName
                 })
             }
-
-
         },
 
 

src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -274,6 +274,7 @@ import { popupReminder } from "@/util/messageReminder";
 import editypes from "@/views/iosBasicData/editypes/index.vue";
 import { editypesList } from "@/api/iosBasicData/editypes";
 import { verifyEnglish } from "@/util/date";
+import { contrastObj, contrastList } from "@/util/contrastData";
 import {
     aeabillsCheckBills,
     aeabillsCopyBills,
@@ -342,6 +343,29 @@ export default {
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
             },
+            oldForm: {
+                billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
+                operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
+                operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
+                createUserName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // 默认登录人
+                createUserId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // 默认登录人
+                businessType: 'AI', // 业务类型 默认
+                billType: 'DD', // 单据类型 默认 直单
+                accDeptName: '',// 核算部门 默认登录人的部门
+                issueType: 'ORI', // 签单方式 默认 正本
+                mpaymode: 'PP', // 主单付费方式 默认PP
+                hpaymode: 'PP', // 分单付费方式 默认 PP
+                loadType: 'FCL', // 装箱方式默认整箱
+                srcType: 'OWN', // 业务来源默认公司   来源 内容 默认登录人所属公司
+                numberOfObl: 'THREE', // 正本份数 默认 THREE
+                numberOfCopy: 'ONE', // 副本份数 默认 ONE
+                seaType: '直航',
+                marks: 'N/M',
+                filesList: [], // 文件中心
+                feeCenterListD: [], // 收
+                feeCenterListC: [], // 付
+                preContainersList: [], // 箱
+            },
             // 循环的配置
             basicData: {
                 column: [
@@ -1172,7 +1196,25 @@ export default {
         },
         //返回列表
         backToList() {
-            this.$emit('goBack')
+            if (contrastObj(this.form, this.oldForm)
+                || contrastList(this.form.feeCenterListC, this.oldForm.feeCenterListC)
+                || contrastList(this.form.feeCenterListD, this.oldForm.feeCenterListD)
+                || contrastList(this.form.filesList, this.oldForm.filesList)
+            ) {
+                this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                })
+                    .then(() => {
+                        this.editCustomer('goBack')
+                    })
+                    .catch(() => {
+                        this.$emit('goBack')
+                    });
+            } else {
+                this.$emit('goBack')
+            }
         },
         // 单据请核
         DocumentApproval() {
@@ -1483,6 +1525,9 @@ export default {
                     type: "success",
                     message: "操作成功!"
                 });
+                if (status == 'goBack') {
+                    this.$emit('goBack')
+                }
                 // this.detailData.seeDisabled = true
                 this.billsDetailfun(res.data.data.id, status)
             }).catch(err => {
@@ -1849,6 +1894,7 @@ export default {
                             this.form.corpCnName = this.form.corpCnName + ' - ' + e.shortName
                         }
                     })
+                    this.oldForm = this.deepClone(this.form);
                     // this.form.corpCnName = this.form.corpCnName + ' - ' + res.data.data.records[0].shortName
                 })
             }

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -1103,7 +1103,7 @@ export default {
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
                 corpIds: row.id,
-                curCode:row.curCode,
+                curCode: row.curCode,
                 type: 'HYJK'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
@@ -1164,7 +1164,7 @@ export default {
                     this.printingLoading = false
                     res.data.data.forEach(e => {
                         e.$cellEdit = true
-                        e.curCode=null
+                        e.curCode = null
                     })
                     this.PrintingData = res.data.data
                 })
@@ -1383,9 +1383,9 @@ export default {
                 // obj.usdAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmountNet
             } else {
                 // 往来单位拿主表客户名称
-                // obj.corpId = this.assemblyForm.corpId
-                // obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
-                // obj.corpEnName = this.assemblyForm.corpEnName
+                obj.corpId = this.assemblyForm.corpId
+                obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
+                obj.corpEnName = this.assemblyForm.corpEnName
                 // 预付/到付
                 obj.paymode = this.assemblyForm.mpaymode
             }
@@ -1457,9 +1457,9 @@ export default {
                 // obj.usdAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmountNet
             } else {
                 // 往来单位拿主表客户名称
-                // obj.corpId = this.assemblyForm.corpId
-                // obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
-                // obj.corpEnName = this.assemblyForm.corpEnName
+                obj.corpId = this.assemblyForm.corpId
+                obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
+                obj.corpEnName = this.assemblyForm.corpEnName
                 // 预付/到付
                 obj.paymode = this.assemblyForm.mpaymode
             }

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -31,17 +31,17 @@
                 </el-button>
                 <el-button size="small" style="margin-right: 8px" :loading="saveLoading" @click="previewDialogfun">预 览
                 </el-button>
-                <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled||showLock"
+                <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled || showLock"
                     v-if="form.status == 1" @click.stop="revokeDocumentApproval">撤销单据请核
                 </el-button>
-                <el-button size="small" type="success" :disabled="!form.id || detailData.seeDisabled||showLock"
+                <el-button size="small" type="success" :disabled="!form.id || detailData.seeDisabled || showLock"
                     v-if="form.status == 0 || form.status == 4" @click.stop="DocumentApproval">单据请核
                 </el-button>
                 <!--<el-button  size="small" type="primary" style="margin-right: 8px" v-if="detailData.seeDisabled"-->
                 <!--            :loading="saveLoading" @click="editHandle">编 辑-->
                 <!--</el-button>-->
-                <el-button size="small" type="primary" style="margin-right: 8px" :disabled="detailData.seeDisabled||showLock"
-                    :loading="saveLoading" @click="editCustomer">保 存
+                <el-button size="small" type="primary" style="margin-right: 8px"
+                    :disabled="detailData.seeDisabled || showLock" :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
                 <el-dropdown style="line-height: 0">
                     <el-button type="warning" :loading="saveLoading" :disabled="!form.id" size="small">
@@ -72,7 +72,8 @@
                                             <el-row>
                                                 <el-col :span="item[0].span ? item[0].span : 12">
                                                     <el-form-item :label="item[0].label" :prop="item[0].prop"
-                                                        :rules="item[0].rules" :label-width="item[0].labelWidth" :disabled="showLock">
+                                                        :rules="item[0].rules" :label-width="item[0].labelWidth"
+                                                        :disabled="showLock">
                                                         <span slot="label" v-if="item[0].label">
                                                             <span v-if="item[0].label == 'HB/L NO'"
                                                                 style="color: #4c9e44;cursor: pointer;text-decoration: underline;"
@@ -89,7 +90,7 @@
                                                             :datalist="item[0].dicData" :selectValue="form[item[0].prop]"
                                                             :filterable="true" :allowCreate="item[0].allowCreate || false"
                                                             :clearable="false" :remote="true"
-                                                            :disabled="detailData.seeDisabled || item[0].disabled||showLock"
+                                                            :disabled="detailData.seeDisabled || item[0].disabled || showLock"
                                                             :buttonIf="false" :placeholder="`${item[0].text || ''}`"
                                                             :forParameter="item[0].forParameter"
                                                             @remoteMethod="remoteMethod($event, item[0].prop)"
@@ -98,26 +99,27 @@
                                                         </search-query>
                                                         <el-input v-else type="age" style="width: 100%;"
                                                             v-model="form[item[0].prop]" size="small" autocomplete="off"
-                                                            :disabled="detailData.seeDisabled || item[0].disabled||showLock"
+                                                            :disabled="detailData.seeDisabled || item[0].disabled || showLock"
                                                             :placeholder="item[0].text || ''"></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                                 <el-col :span="item[1].span ? item[1].span : 12">
                                                     <el-form-item :label="item[1].label" :prop="item[1].prop"
-                                                        :rules="item[1].rules" :label-width="item[1].labelWidth" :disabled="showLock">
+                                                        :rules="item[1].rules" :label-width="item[1].labelWidth"
+                                                        :disabled="showLock">
                                                         <span slot="label" v-if="item[1].label">
                                                             <span style="color: #1e9fff">{{ item[1].label }}</span>
                                                         </span>
                                                         <el-date-picker v-if="item[1].type == 'date'"
                                                             v-model="form[item[1].prop]" clearable style="width: 100%;"
                                                             type="date" size="small"
-                                                            :disabled="detailData.seeDisabled || item[1].disabled||showLock"
+                                                            :disabled="detailData.seeDisabled || item[1].disabled || showLock"
                                                             value-format="yyyy-MM-dd HH:mm" placeholder="选择日期">
                                                         </el-date-picker>
                                                         <search-query v-else-if="item[1].type == 'select'"
                                                             :datalist="item[1].dicData" :selectValue="form[item[1].prop]"
                                                             :filterable="true" :clearable="false" :remote="true"
-                                                            :disabled="detailData.seeDisabled || item[1].disabled||showLock"
+                                                            :disabled="detailData.seeDisabled || item[1].disabled || showLock"
                                                             :buttonIf="false" :placeholder="`${item[1].text || ''}`"
                                                             :forParameter="item[1].forParameter"
                                                             @remoteMethod="remoteMethod($event, item[1].prop)"
@@ -128,7 +130,7 @@
                                                         <tree-select v-else-if="item[1].type == 'tree'"
                                                             v-model="form[item[1].prop]" filterable :data="item[1].dicData"
                                                             :props="item[1].forParameter" nodeKey="title" size="small"
-                                                            :disabled="detailData.seeDisabled || item[1].disabled||showLock"
+                                                            :disabled="detailData.seeDisabled || item[1].disabled || showLock"
                                                             :multiple="false" :clearable="false"
                                                             :placeholder="`${item[1].text || ''}`"
                                                             @input="corpChange($event, item[1].prop)">
@@ -136,20 +138,21 @@
 
                                                         <el-input v-else type="age" style="width: 100%;"
                                                             v-model="form[item[1].prop]" size="small" autocomplete="off"
-                                                            :disabled="detailData.seeDisabled || item[1].disabled||showLock"
+                                                            :disabled="detailData.seeDisabled || item[1].disabled || showLock"
                                                             :placeholder="item[1].text || ''"></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                                 <el-col v-if="item[2]" :span="item[2].span ? item[2].span : 12">
                                                     <el-form-item :label="item[2].label" :prop="item[2].prop"
-                                                        :rules="item[2].rules" :label-width="item[2].labelWidth" :disabled="detailData.seeDisabled || item[2].disabled||showLock">
+                                                        :rules="item[2].rules" :label-width="item[2].labelWidth"
+                                                        :disabled="detailData.seeDisabled || item[2].disabled || showLock">
                                                         <span slot="label" v-if="item[2].label">
                                                             <span style="color: #1e9fff">{{ item[2].label }}</span>
                                                         </span>
                                                         <search-query v-if="item[2].type == 'select'"
                                                             :datalist="item[2].dicData" :selectValue="form[item[2].prop]"
                                                             :filterable="true" :clearable="false" :remote="true"
-                                                            :disabled="detailData.seeDisabled || item[2].disabled||showLock"
+                                                            :disabled="detailData.seeDisabled || item[2].disabled || showLock"
                                                             :buttonIf="false" :forParameter="item[2].forParameter"
                                                             :placeholder="`${item[2].text || ''}`"
                                                             @remoteMethod="remoteMethod($event, item[2].prop)"
@@ -158,7 +161,7 @@
                                                         </search-query>
                                                         <el-input v-else type="age" style="width: 100%;"
                                                             v-model="form[item[2].prop]" size="small" autocomplete="off"
-                                                            :disabled="detailData.seeDisabled || item[1].disabled||showLock"
+                                                            :disabled="detailData.seeDisabled || item[1].disabled || showLock"
                                                             :placeholder="item[2].text || ''"></el-input>
                                                     </el-form-item>
                                                 </el-col>
@@ -166,14 +169,15 @@
                                         </div>
                                         <!--对象-->
                                         <div v-else>
-                                            <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules" :disabled="showLock">
+                                            <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules"
+                                                :disabled="showLock">
                                                 <span slot="label" v-if="item.label">
                                                     <span style="color: #1e9fff">{{ item.label }}</span>
                                                 </span>
                                                 <search-query v-if="item.type == 'select'" ref="searchQueryRef"
                                                     :datalist="item.dicData" :selectValue="form[item.prop]"
                                                     :filterable="true" :clearable="false" :remote="true"
-                                                    :disabled="detailData.seeDisabled || item.disabled||showLock"
+                                                    :disabled="detailData.seeDisabled || item.disabled || showLock"
                                                     :buttonIf="item.buttonIf" :forParameter="item.forParameter"
                                                     :placeholder="`${item.text || ''}`"
                                                     @remoteMethod="remoteMethod($event, item.prop)"
@@ -188,7 +192,7 @@
                                                 </search-query>
                                                 <el-input v-else type="age" style="width: 100%;" v-model="form[item.prop]"
                                                     size="small" autocomplete="off"
-                                                    :disabled="detailData.seeDisabled || item.disabled||showLock"
+                                                    :disabled="detailData.seeDisabled || item.disabled || showLock"
                                                     :placeholder="item.text || ''"></el-input>
                                             </el-form-item>
                                         </div>
@@ -202,8 +206,9 @@
                         <basic-container :showBtn="true">
                             <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
                                 <el-tab-pane label="委托详情" name="first">
-                                    <entrustment-lnformation :assemblyForm="form" :detailData="detailData" :disabled="showLock"
-                                        :generateBillsfalse="generateBillsfalse" @billsDetailfun="billsDetailfun(form.id)">
+                                    <entrustment-lnformation :assemblyForm="form" :detailData="detailData"
+                                        :disabled="showLock" :generateBillsfalse="generateBillsfalse"
+                                        @billsDetailfun="billsDetailfun(form.id)">
                                     </entrustment-lnformation>
                                 </el-tab-pane>
                                 <el-tab-pane label="配箱信息" name="second">
@@ -216,8 +221,8 @@
                                 <!--</el-tab-pane>-->
                                 <el-tab-pane label="报表管理" name="fourth"
                                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('报表管理') != -1 ? true : false">
-                                    <reports :id="form.id" :assemblyForm="form" :disabled="detailData.seeDisabled||showLock"
-                                        businessValue="HYJK"></reports>
+                                    <reports :id="form.id" :assemblyForm="form"
+                                        :disabled="detailData.seeDisabled || showLock" businessValue="HYJK"></reports>
                                 </el-tab-pane>
                                 <!--<el-tab-pane label="EDI CODE" name="sixth">-->
                                 <!--    <edicode :assemblyForm="form" :detailData="detailData"></edicode>-->
@@ -236,15 +241,17 @@
                 </el-tab-pane>
                 <el-tab-pane label="费用信息" name="fy" class="scrollable-container"
                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1 || roleName.indexOf('应收查看') != -1 || roleName.indexOf('应付查看') != -1">
-                    <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData"  :disabled="showLock"
-                        :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)">
+                    <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData"
+                        :disabled="showLock" :pleasereviewType="pleasereviewType" :pid="form.id"
+                        @billsDetailfun="billsDetailfun(form.id)">
                     </feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz" class="scrollable-container">
-                    <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form"  :disabled="showLock"></document-center>
+                    <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form"
+                        :disabled="showLock"></document-center>
                 </el-tab-pane>
                 <el-tab-pane label="分单列表" name="fd" class="scrollable-container" v-if="form.billType == 'MM'">
-                    <Split-list :detailData="detailData" :assemblyForm="form" :data="billsListAllData"  :disabled="showLock"
+                    <Split-list :detailData="detailData" :assemblyForm="form" :data="billsListAllData" :disabled="showLock"
                         @billsListAllfun="billsListAllfun(form.id)"></Split-list>
                 </el-tab-pane>
             </el-tabs>
@@ -302,6 +309,7 @@ import { popupReminder } from "@/util/messageReminder";
 import editypes from "@/views/iosBasicData/editypes/index.vue";
 import { editypesList } from "@/api/iosBasicData/editypes";
 import { verifyEnglish } from "@/util/date";
+import { contrastObj, contrastList } from "@/util/contrastData";
 export default {
     components: {
         checkSchedule,
@@ -329,7 +337,7 @@ export default {
     },
     data() {
         return {
-            showLock:false,
+            showLock: false,
             ediData: [], // edi 列表数据
             previewDialog: false, // 预览报表弹窗开启
             generateBillsfalse: false, // 如果生成账单就禁用
@@ -365,6 +373,29 @@ export default {
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
             },
+            oldForm: {
+                billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
+                operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
+                operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
+                businessType: 'SI', // 业务类型 默认 海运出口
+                seaType: 'I', // 进出口 默认出口 E=出口 I=进口"
+                billType: 'DD', // 单据类型 默认 直单
+                accDeptName: '',// 核算部门 默认登录人的部门
+                issueType: 'ORI', // 签单方式 默认 正本
+                mpaymode: 'PP', // 主单付费方式 默认PP
+                hpaymode: 'PP', // 分单付费方式 默认 PP
+                loadType: 'FCL', // 装箱方式默认整箱
+                srcType: 'OWN', // 业务来源默认公司   来源 内容 默认登录人所属公司
+                numberOfObl: 'THREE', // 正本份数 默认 THREE
+                numberOfCopy: 'ONE', // 副本份数 默认 ONE
+                cargoType: 'dry', // 货物类型默认普货
+                marks: 'N/M',
+                dgPackingLevel: '0', // 危险品包装等级
+                filesList: [], // 文件中心
+                feeCenterListD: [], // 收
+                feeCenterListC: [], // 付
+                preContainersList: [], // 箱
+            },
             // 循环的配置
             basicData: {
                 column: [
@@ -826,7 +857,7 @@ export default {
         },
         // 获取客户名称数据 往来单位数据
         getBcorpsListfun(cnName) {
-            getBcorpsList(1, 10, { shortName:cnName, status: 0 }).then(res => {
+            getBcorpsList(1, 10, { shortName: cnName, status: 0 }).then(res => {
                 this.columnforfun('corpCnName').dicData = res.data.data.records.map(item => {
                     item.cnName = item.cnName + ' - ' + item.shortName
                     return item
@@ -1205,15 +1236,44 @@ export default {
         },
         //返回列表
         backToList() {
-            if(this.form.id){
-                this.unLock({
-                moduleName: "SI",
-                tableName: "SI_order",
-                billId: this.form.id,
-                billNo: this.form.mblno
-            });
+            if (contrastObj(this.form, this.oldForm)
+                || contrastList(this.form.preContainersList, this.oldForm.preContainersList)
+                || contrastList(this.form.containersList, this.oldForm.containersList)
+                || contrastList(this.form.feeCenterListC, this.oldForm.feeCenterListC)
+                || contrastList(this.form.feeCenterListD, this.oldForm.feeCenterListD)
+                || contrastList(this.form.filesList, this.oldForm.filesList)
+                || contrastList(this.form.waitingBoxList, this.oldForm.waitingBoxList)
+            ) {
+                this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                })
+                    .then(() => {
+                        this.editCustomer('goBack')
+                    })
+                    .catch(() => {
+                        if (this.form.id) {
+                            this.unLock({
+                                moduleName: "SI",
+                                tableName: "SI_order",
+                                billId: this.form.id,
+                                billNo: this.form.mblno
+                            });
+                        }
+                        this.$emit('goBack')
+                    });
+            } else {
+                if (this.form.id) {
+                    this.unLock({
+                        moduleName: "SI",
+                        tableName: "SI_order",
+                        billId: this.form.id,
+                        billNo: this.form.mblno
+                    });
+                }
+                this.$emit('goBack')
             }
-            this.$emit('goBack')
         },
         // 单据请核
         DocumentApproval() {
@@ -1495,6 +1555,17 @@ export default {
                     type: "success",
                     message: "操作成功!"
                 });
+                if (status == 'goBack') {
+                    if (this.form.id) {
+                        this.unLock({
+                            moduleName: "SI",
+                            tableName: "SI_order",
+                            billId: this.form.id,
+                            billNo: this.form.mblno
+                        });
+                    }
+                    this.$emit('goBack')
+                }
                 // this.detailData.seeDisabled = true
                 this.billsDetailfun(res.data.data.id, status)
             }).catch(err => {
@@ -1768,9 +1839,9 @@ export default {
                 let corpTypeName = '船公司'
                 getBcorpslistByType(1, 10, { cnName: this.form.carrierCnName, status: 0, corpTypeName }).then(res => {
                     // this.form.carrierCnName = this.form.carrierCnName + ' - ' + res.data.data.records[0].code
-                    res.data.data.records.forEach(e=>{
-                        if(this.form.carrierCnName==e.cnName)
-                        this.form.carrierCnName = this.form.carrierCnName + ' - ' + e.code
+                    res.data.data.records.forEach(e => {
+                        if (this.form.carrierCnName == e.cnName)
+                            this.form.carrierCnName = this.form.carrierCnName + ' - ' + e.code
                     })
                 })
                 // this.form.carrierCnName = this.form.carrierCnName + ' - ' + this.form.carrierCode
@@ -1798,9 +1869,9 @@ export default {
             // 船名
             if (this.form.vesselCnName) {
                 getBvesselsList(1, 10, { cnName: this.form.vesselCnName }).then(res => {
-                    res.data.data.records.forEach(e=>{
-                        if(this.form.vesselCnName==e.cnName)
-                        this.form.vesselCnName = this.form.vesselCnName + ' - ' + e.code
+                    res.data.data.records.forEach(e => {
+                        if (this.form.vesselCnName == e.cnName)
+                            this.form.vesselCnName = this.form.vesselCnName + ' - ' + e.code
                     })
                     // this.form.vesselCnName = this.form.vesselCnName + ' - ' + res.data.data.records[0].code
                 })
@@ -1808,10 +1879,11 @@ export default {
             // 客户名称
             if (this.form.corpCnName) {
                 getBcorpslistByType(1, 10, { cnName: this.form.corpCnName }).then(res => {
-                    res.data.data.records.forEach(e=>{
-                        if(this.form.corpCnName==e.cnName)
-                        this.form.corpCnName = this.form.corpCnName + ' - ' + e.shortName
+                    res.data.data.records.forEach(e => {
+                        if (this.form.corpCnName == e.cnName)
+                            this.form.corpCnName = this.form.corpCnName + ' - ' + e.shortName
                     })
+                    this.oldForm = this.deepClone(this.form);
                 })
             }
 

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -327,6 +327,7 @@ import { popupReminder } from "@/util/messageReminder";
 import editypes from "@/views/iosBasicData/editypes/index.vue";
 import { editypesList } from "@/api/iosBasicData/editypes";
 import { verifyEnglish } from "@/util/date";
+import { contrastObj, contrastList } from "@/util/contrastData";
 export default {
     components: {
         checkSchedule,
@@ -391,6 +392,30 @@ export default {
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
             },
+            oldForm: {
+                billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
+                operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
+                operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
+                businessType: 'SE', // 业务类型 默认 海运出口
+                billType: 'DD', // 单据类型 默认 直单
+                accDeptName: '',// 核算部门 默认登录人的部门
+                issueType: "ORI", // 签单方式 默认 正本提单
+                mpaymode: 'PP', // 主单付费方式 默认PP
+                hpaymode: 'PP', // 分单付费方式 默认 PP
+                loadType: 'FCL', // 装箱方式默认整箱
+                srcType: 'OWN', // 业务来源默认公司   来源 内容 默认登录人所属公司
+                numberOfObl: 'THREE', // 正本份数 默认 THREE
+                numberOfCopy: 'ONE', // 副本份数 默认 ONE
+                seaType: 'E', // 进出口 默认出口 E=出口 I=进口"
+                cargoType: 'dry', // 货物类型默认普货
+                marks: 'N/M',
+                dgPackingLevel: '0', // 危险品包装等级
+                serviceTerms: 'CY to CY', // 服务方式
+                filesList: [], // 文件中心
+                feeCenterListD: [], // 收
+                feeCenterListC: [], // 付
+                preContainersList: [], // 箱
+            },
             // 循环的配置
             basicData: {
                 column: [
@@ -1388,15 +1413,43 @@ export default {
         },
         //返回列表
         backToList() {
-            if (this.form.id) {
-                this.unLock({
-                    moduleName: "SE",
-                    tableName: "SE_order",
-                    billId: this.form.id,
-                    billNo: this.form.mblno
-                });
+            if (contrastObj(this.form, this.oldForm)
+                || contrastList(this.form.preContainersList, this.oldForm.preContainersList) || contrastList(this.form.containersList, this.oldForm.containersList)
+                || contrastList(this.form.feeCenterListC, this.oldForm.feeCenterListC)
+                || contrastList(this.form.feeCenterListD, this.oldForm.feeCenterListD)
+                || contrastList(this.form.filesList, this.oldForm.filesList)
+                || contrastList(this.form.waitingBoxList, this.oldForm.waitingBoxList)
+            ) {
+                this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                })
+                    .then(() => {
+                        this.editCustomer('goBack')
+                    })
+                    .catch(() => {
+                        if (this.form.id) {
+                            this.unLock({
+                                moduleName: "SE",
+                                tableName: "SE_order",
+                                billId: this.form.id,
+                                billNo: this.form.mblno
+                            });
+                        }
+                        this.$emit('goBack')
+                    });
+            } else {
+                if (this.form.id) {
+                    this.unLock({
+                        moduleName: "SE",
+                        tableName: "SE_order",
+                        billId: this.form.id,
+                        billNo: this.form.mblno
+                    });
+                }
+                this.$emit('goBack')
             }
-            this.$emit('goBack')
         },
         // 单据请核
         DocumentApproval() {
@@ -1557,7 +1610,7 @@ export default {
                     // if (!verifyEnglish(this.form.cyRemarks)) {
                     //     msgsList.push('场站备注')
                     // }
-                    if (msgsList .length > 0) {
+                    if (msgsList.length > 0) {
                         this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
                         return;
                     }
@@ -1688,6 +1741,17 @@ export default {
                     type: "success",
                     message: "操作成功!"
                 });
+                if (status == 'goBack') {
+                    if (this.form.id) {
+                        this.unLock({
+                            moduleName: "SE",
+                            tableName: "SE_order",
+                            billId: this.form.id,
+                            billNo: this.form.mblno
+                        });
+                    }
+                    this.$emit('goBack')
+                }
                 // this.detailData.seeDisabled = true
                 this.billsDetailfun(res.data.data.id, status)
             }).catch(err => {
@@ -1885,7 +1949,6 @@ export default {
             if (status == 'toAddEdit') {
                 this.$emit(status)
             }
-
         },
         // tbas切换
         handleClick(tba, event) {
@@ -2070,6 +2133,7 @@ export default {
                             this.form.corpCnName = this.form.corpCnName + ' - ' + e.shortName
                         }
                     })
+                    this.oldForm = this.deepClone(this.form);
                 })
             }
         },

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -1,13 +1,12 @@
 <template>
     <div>
         <basic-container v-if="isShow">
-            <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" id="out-table"
+            <avue-crud :option="optionBack" :table-loading="loading" :data="data" :page.sync="page" id="out-table"
                 :header-cell-class-name="headerClassName" :permission="permissionList" :before-open="beforeOpen"
                 v-model="form" ref="crud" :search.sync="query" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
                 @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
                 @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
-                @expand-change="expandChange" @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 309)"
-                @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 309)">
+                @expand-change="expandChange" @resetColumn="resetColumnTwo('crud',309)" @saveColumn="saveColumnTwo('crud',optionBack,309)">
                 <!--#region-->
                 <!--<template slot="search" slot-scope="{row,size}">-->
                 <!--    <el-form ref="form" :model="row" label-width="80px" :style="fold?'width: 100%':'width: 70%'">-->
@@ -408,11 +407,10 @@
             :key="datekey"></bills-details>
 
         <el-dialog title="主单列表" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
-            <avue-crud :option="mawbOption" :table-loading="mawbloading" :data="mawbData" :page.sync="mawbPage"
+            <avue-crud :option="mawbOptionBack" :table-loading="mawbloading" :data="mawbData" :page.sync="mawbPage"
                 :search="mawbQuery" ref="mawbOptionCrud" id="out-table" :header-cell-class-name="headerClassName"
                 @search-change="mawbSearch" @size-change="mawbSizeChange" @current-change="mawbCurrentChange"
-                @resetColumn="resetColumnTwo('mawbOptionCrud', 'mawbOption', 'mawbOptionBack', 309.7)"
-                @saveColumn="saveColumnTwo('mawbOptionCrud', 'mawbOption', 'mawbOptionBack', 309.7)">
+                @resetColumn="resetColumnTwo('mawbOptionCrud',309.7)" @saveColumn="saveColumnTwo('mawbOptionCrud',mawbOptionBack,309.7)">
                 <template slot="radio" slot-scope="{row}">
                     <el-radio v-model="dialogRadio" :label="row.id" @input="radioInput(row)"></el-radio>
                 </template>
@@ -585,7 +583,6 @@ export default {
                         overHidden: true,
                         search: true,
                         type: 'select',
-                        dicData: [],
                         filterable: true,
                         remote: true,
                         dicUrl: "/api/blade-los/bcorps/listByType?shortName={{key}}",
@@ -654,7 +651,6 @@ export default {
                         prop: "vesselCnName",
                         overHidden: true,
                         type: 'select',
-                        dicData: [],
                         filterable: true,
                         remote: true,
                         dicUrl: "/api/blade-los/bvessels/list?cnName={{key}}",
@@ -721,7 +717,6 @@ export default {
                         prop: "carrierCnName",
                         overHidden: true,
                         type: 'select',
-                        dicData: [],
                         filterable: true,
                         remote: true,
                         dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
@@ -746,7 +741,6 @@ export default {
                         width: "120",
                         overHidden: true,
                         type: 'select',
-                        dicData: [],
                         filterable: true,
                         remote: true,
                         dicUrl: "/api/blade-los/bports/list?enName={{key}}",
@@ -765,7 +759,6 @@ export default {
                         width: "120",
                         overHidden: true,
                         type: 'select',
-                        dicData: [],
                         filterable: true,
                         remote: true,
                         dicUrl: "/api/blade-los/blines/list?cnName={{key}}",
@@ -784,7 +777,6 @@ export default {
                         width: "120",
                         overHidden: true,
                         type: 'select',
-                        dicData: [],
                         filterable: true,
                         remote: true,
                         dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
@@ -876,7 +868,6 @@ export default {
                         width: "120",
                         overHidden: true,
                         type: 'tree',
-                        dicData: [],
                         dicUrl: "/api/blade-system/dept/tree",
                         props: {
                             label: 'title',
@@ -893,7 +884,6 @@ export default {
                         width: "120",
                         overHidden: true,
                         type: 'select',
-                        dicData: [],
                         filterable: true,
                         remote: true,
                         dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
@@ -912,7 +902,6 @@ export default {
                         width: "120",
                         overHidden: true,
                         type: 'select',
-                        dicData: [],
                         filterable: true,
                         remote: true,
                         dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
@@ -931,8 +920,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         type: 'select',
-                        dicData: [],
-                        dicUrl: "/api/blade-system/dict-biz/dictionary",
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=audit_status_los",
                         props: {
                             label: 'dictValue',
                             value: 'dictKey',
@@ -1177,7 +1165,7 @@ export default {
                         label: "业务状态",
                         prop: "billStatus",
                         type: "select",
-                        dicData: [],
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=bill_status",
                         props: {
                             label: "dictValue",
                             value: "dictKey"
@@ -1189,7 +1177,7 @@ export default {
                         label: "财务状态",
                         prop: "accountStatus",
                         type: "select",
-                        dicData: [],
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=account_status",
                         props: {
                             label: "dictValue",
                             value: "dictKey"
@@ -1201,7 +1189,7 @@ export default {
                         label: "审核状态",
                         prop: "status",
                         type: 'select',
-                        dicData: [],
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=audit_status_los",
                         width: '120',
                         props: {
                             label: "dictValue",
@@ -1361,7 +1349,7 @@ export default {
             return ids.join(",");
         }
     },
-    async created() {
+    created() {
         // 获取当前登录人个人信息
         this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
         // 首页快捷跳转进来的
@@ -1371,23 +1359,19 @@ export default {
         // if (this.$route.query.id) {
         //     this.rowCellfun(this.$route.query.id)
         // }
-        this.option = await this.getColumnData(this.getColumnName(309), this.optionBack);
-        this.mawbOption = await this.getColumnData(this.getColumnName(309.7), this.mawbOptionBack); // 主单列表
+        // this.option = await this.getColumnData(this.getColumnName(309), this.optionBack);
+        // this.mawbOption = await this.getColumnData(this.getColumnName(309.7), this.mawbOptionBack); // 主单列表
+        if(localStorage.getItem(this.getColumnName(309))){
+            this.optionBack = JSON.parse(localStorage.getItem(this.getColumnName(309)))
+        }
         this.billStatusWorkDictsfun() // 获取业务状态字典数据
         this.accountStatusWorkDictsfun() // 获取财务状态字典数据
-        this.corpBcorpslistByType() // 获取客户名数据
-        this.vesselBvesselsListfun() // 获取船名数据
-        this.carrierBcorpslistByTypefun() // 获取船公司数据
-        this.podBportsListfun() // 获取目的港数据
-        this.lineBlinesListfun() // 获取航线数据
-        this.cyBcorpslistByType() // 获取场站数据
-        this.hConsigneeBcorpslistByType() // 获取收货人数据
-        this.createDeptLzylistfun() // 获取创建部门数据
-        this.bookingAgentBcorpsListfun() // 获取订舱代理数据
-        this.getWorkDictsfun() // 获取签单方式字典数据
         this.statusWorkDictsfun() // 业务审核类型
         this.editypesListfun() // edi 数据获取
     },
+    mounted(){
+
+    },
     activated() {
         if (this.$route.query.id) {
             if (!this.$store.getters.seaFEStatus) {
@@ -1459,18 +1443,18 @@ export default {
 
         // tabs切换筛选
         handleClick(tab, event) {
-            if(this.query.billStatus==4){
-                this.query.billStatus=null
+            if (this.query.billStatus == 4) {
+                this.query.billStatus = null
             }
             this.onLoad(this.page, this.query);
         },
         // 获取委托人数据
-        corpBcorpslistByType(cnName) {
-            getBcorpslistByType(1, 10, { cnName, status: 0 }).then(res => {
-                this.corpData = res.data.data.records
-                this.findObject(this.option.column, "corpCnName").dicData = res.data.data.records
-            })
-        },
+        // corpBcorpslistByType(cnName) {
+        //     getBcorpslistByType(1, 10, { cnName, status: 0 }).then(res => {
+        //         this.corpData = res.data.data.records
+        //         this.findObject(this.option.column, "corpCnName").dicData = res.data.data.records
+        //     })
+        // },
         // 获取收货人数据
         hConsigneeBcorpslistByType(cnName) {
             getBcorpslistByType(1, 10, { cnName, status: 0 }).then(res => {
@@ -1533,21 +1517,18 @@ export default {
         // 获取业务状态字典数据
         billStatusWorkDictsfun() {
             getWorkDicts('bill_status').then(res => {
-                this.findObject(this.option.column, "billStatus").dicData = res.data.data;
                 this.billStatusData = res.data.data
             })
         },
         // 获取财务状态字典数据
         accountStatusWorkDictsfun() {
             getWorkDicts('account_status').then(res => {
-                this.findObject(this.option.column, "accountStatus").dicData = res.data.data;
                 this.accountStatusData = res.data.data
             })
         },
         // 获取业务审核状态
         statusWorkDictsfun() {
             getWorkDicts('audit_status_los').then(res => {
-                this.findObject(this.option.column, "status").dicData = res.data.data;
                 this.auditStatusList = res.data.data;
             })
         },
@@ -1681,7 +1662,7 @@ export default {
         },
         // 弹窗关闭
         handleClose(done) {
-   done();
+            done();
         },
         toAddEdit() {
             this.datekey = Date.now()
@@ -1893,6 +1874,10 @@ export default {
                     item.status = item.status + ''
                     return item
                 })
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                    this.$refs.crud.dicInit();
+                });
                 this.loading = false;
                 this.selectionClear();
             });
@@ -1927,27 +1912,24 @@ export default {
         },
 
         //自定义列保存
-        async saveColumnTwo(ref, option, optionBack, code) {
+        saveColumnTwo(ref, option, code) {
             /**
              * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
              * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
              * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
              */
-            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
-            if (inSave) {
-                this.$message.success("保存成功");
-                //关闭窗口
-                this.$refs[ref].$refs.dialogColumn.columnBox = false;
-            }
+            console.log(ref, option, code)
+            localStorage.setItem(this.getColumnName(code), JSON.stringify(option))
+            this.$message.success("保存成功");
+            //关闭窗口
+            this.$refs[ref].$refs.dialogColumn.columnBox = false;
         },
         //自定义列重置
-        async resetColumnTwo(ref, option, optionBack, code) {
-            this[option] = this[optionBack];
-            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
-            if (inSave) {
-                this.$message.success("重置成功");
-                this.$refs[ref].$refs.dialogColumn.columnBox = false;
-            }
+        resetColumnTwo(ref, code) {
+            this.optionBack= this.$options.data().optionBack
+            localStorage.removeItem(this.getColumnName(code));
+            this.$message.success("重置成功");
+            this.$refs[ref].$refs.dialogColumn.columnBox = false;
         },
 
         // 更改表格颜色

src/views/iosBasicData/aeamends/amendsDetails.vue

@@ -311,6 +311,7 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
 import { aeabillsGetDetail } from "@/api/iosBasicData/aeabills";
 import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
 import { getList as getreportsList } from "@/api/iosBasicData/reports";
+import { contrastObj, contrastList } from "@/util/contrastData";
 
 export default {
     components: { reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated },
@@ -406,6 +407,12 @@ export default {
                 feeCenterListC: [],
                 feeCenterList: []
             },
+            oldForm: {
+                createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
+                feeCenterListD: [],
+                feeCenterListC: [],
+                feeCenterList: []
+            },
             // 业务类型 数据
             origSeaTypeData: [
                 {
@@ -656,6 +663,7 @@ export default {
             amendsDetail(id).then(res => {
                 this.pageLoading = false
                 this.form = res.data.data
+                this.oldForm = this.deepClone(res.data.data);
                 // 把编辑状态变成不可编辑
                 for (let item of this.form.feeCenterList) {
                     this.$delete(item, 'editType')
@@ -1143,7 +1151,25 @@ export default {
         },
         //返回列表
         backToList() {
-            this.$emit('goBack')
+            if (contrastObj(this.form, this.oldForm)
+                || contrastList(this.form.feeCenterListC, this.oldForm.feeCenterListC)
+                || contrastList(this.form.feeCenterListD, this.oldForm.feeCenterListD)
+                || contrastList(this.form.feeCenterList, this.oldForm.feeCenterList)
+            ) {
+                this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                })
+                    .then(() => {
+                        this.amendsSubmitfun('goBack')
+                    })
+                    .catch(() => {
+                        this.$emit('goBack')
+                    });
+            } else {
+                this.$emit('goBack')
+            }
         },
         // 预览报表
         handleReportPreview(url, data) {

src/views/iosBasicData/aiamends/amendsDetails.vue

@@ -319,6 +319,7 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
 import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
 import { aeabillsGetDetail } from "@/api/iosBasicData/aeabills";
 import { getList as getreportsList } from "@/api/iosBasicData/reports";
+import { contrastObj, contrastList } from "@/util/contrastData";
 export default {
     components: { reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated },
     data() {
@@ -419,6 +420,12 @@ export default {
                 feeCenterListC: [],
                 feeCenterList: []
             },
+            oldForm: {
+                voucherDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
+                feeCenterListD: [],
+                feeCenterListC: [],
+                feeCenterList: []
+            },
             // 业务类型 数据
             origSeaTypeData: [
                 {
@@ -587,7 +594,7 @@ export default {
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
                 corpIds: row.id,
-                curCode:row.curCode,
+                curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
@@ -669,6 +676,7 @@ export default {
             amendsDetail(id).then(res => {
                 this.pageLoading = false
                 this.form = res.data.data
+                this.oldForm = this.deepClone(res.data.data);
                 // 把编辑状态变成不可编辑
                 for (let item of this.form.feeCenterList) {
                     this.$delete(item, 'editType')
@@ -1154,7 +1162,26 @@ export default {
         },
         //返回列表
         backToList() {
-            this.$emit('goBack')
+            console.log(this.form, this.oldForm)
+            if (contrastObj(this.form, this.oldForm)
+                || contrastList(this.form.feeCenterListC, this.oldForm.feeCenterListC)
+                || contrastList(this.form.feeCenterListD, this.oldForm.feeCenterListD)
+                || contrastList(this.form.feeCenterList, this.oldForm.feeCenterList)
+            ) {
+                this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                })
+                    .then(() => {
+                        this.amendsSubmitfun('goBack')
+                    })
+                    .catch(() => {
+                        this.$emit('goBack')
+                    });
+            } else {
+                this.$emit('goBack')
+            }
         },
         // 预览报表
         handleReportPreview(url, data) {

src/views/iosBasicData/seamends/amendsDetails.vue

@@ -321,7 +321,7 @@ import { reportsGetReportData } from "@/api/iosBasicData/reports";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
 import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
 import { getList as getreportsList } from "@/api/iosBasicData/reports";
-
+import { contrastObj, contrastList } from "@/util/contrastData";
 export default {
     components: { reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated },
     data() {
@@ -421,6 +421,12 @@ export default {
                 feeCenterListC: [],
                 feeCenterList: []
             },
+            oldForm: {
+                createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
+                feeCenterListD: [],
+                feeCenterListC: [],
+                feeCenterList: []
+            },
             // 业务类型 数据
             origSeaTypeData: [
                 {
@@ -593,7 +599,7 @@ export default {
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
                 corpIds: row.id,
-                curCode:row.curCode,
+                curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
@@ -677,6 +683,7 @@ export default {
             amendsDetail(id).then(res => {
                 this.pageLoading = false
                 this.form = res.data.data
+                this.oldForm = this.deepClone(res.data.data);
                 // 把编辑状态变成不可编辑状态
                 for (let item of this.form.feeCenterList) {
                     this.$delete(item, 'editType')
@@ -1010,7 +1017,7 @@ export default {
             }
         },
         // 保存
-        amendsSubmitfun() {
+        amendsSubmitfun(status) {
             // 判断是否填写 AMEND原因
             if (!this.form.responsibleParty) {
                 return this.$message.warning('请填写AMEND原因')
@@ -1089,6 +1096,9 @@ export default {
                     type: "success",
                     message: "操作成功!"
                 });
+                if (status == 'goBack') {
+                    this.$emit('goBack')
+                }
                 this.amendsDetailfun(res.data.data.id)
             }).finally(() => {
                 this.saveLoading = false
@@ -1185,7 +1195,25 @@ export default {
         },
         //返回列表
         backToList() {
-            this.$emit('goBack')
+            if (contrastObj(this.form, this.oldForm)
+                || contrastList(this.form.feeCenterListC, this.oldForm.feeCenterListC)
+                || contrastList(this.form.feeCenterListD, this.oldForm.feeCenterListD)
+                || contrastList(this.form.feeCenterList, this.oldForm.feeCenterList)
+            ) {
+                this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                })
+                    .then(() => {
+                        this.amendsSubmitfun('goBack')
+                    })
+                    .catch(() => {
+                        this.$emit('goBack')
+                    });
+            } else {
+                this.$emit('goBack')
+            }
         },
         // 预览报表
         handleReportPreview(url, data) {

src/views/iosBasicData/siamends/amendsDetails.vue

@@ -307,6 +307,7 @@ import { reportsGetReportData } from "@/api/iosBasicData/reports";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
 import { getList as getreportsList } from "@/api/iosBasicData/reports";
 import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
+import { contrastObj, contrastList } from "@/util/contrastData";
 
 export default {
     components: { reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated },
@@ -402,6 +403,12 @@ export default {
                 feeCenterListC: [],
                 feeCenterList: []
             },
+            oldForm: {
+                createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
+                feeCenterListD: [],
+                feeCenterListC: [],
+                feeCenterList: []
+            },
             // 业务类型 数据
             origSeaTypeData: [
                 {
@@ -655,6 +662,7 @@ export default {
             amendsDetail(id).then(res => {
                 this.pageLoading = false
                 this.form = res.data.data
+                this.oldForm = this.deepClone(res.data.data);
                 // 把编辑状态变成不可编辑
                 for (let item of this.form.feeCenterList) {
                     this.$delete(item, 'editType')
@@ -1064,6 +1072,9 @@ export default {
                     type: "success",
                     message: "操作成功!"
                 });
+                if (status == 'goBack') {
+                    this.$emit('goBack')
+                }
                 this.amendsDetailfun(res.data.data.id)
             }).finally(() => {
                 this.saveLoading = false
@@ -1158,7 +1169,25 @@ export default {
         },
         //返回列表
         backToList() {
-            this.$emit('goBack')
+            if (contrastObj(this.form, this.oldForm)
+                || contrastList(this.form.feeCenterListC, this.oldForm.feeCenterListC)
+                || contrastList(this.form.feeCenterListD, this.oldForm.feeCenterListD)
+                || contrastList(this.form.feeCenterList, this.oldForm.feeCenterList)
+            ) {
+                this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                })
+                    .then(() => {
+                        this.amendsSubmitfun('goBack')
+                    })
+                    .catch(() => {
+                        this.$emit('goBack')
+                    });
+            } else {
+                this.$emit('goBack')
+            }
         },
         // 预览报表
         handleReportPreview(url, data) {

src/views/tirePartsMall/financialManagement/collectionSettlement/detailsPage.vue

@@ -142,7 +142,7 @@ export default {
           click: () => {
             this.$refs.form.dicInit()
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=1',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH',
           rules: [{
             required: true,
             message: " ",

src/views/tirePartsMall/financialManagement/collectionSettlement/index.vue

@@ -98,7 +98,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=1',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH',
             change: (row, column, value) => {
                 console.log(row,132)
                 console.log(column,133)

src/views/tirePartsMall/financialManagement/paymentSettlement/detailsPage.vue

@@ -117,7 +117,7 @@ export default {
           click: () => {
             this.$refs.form.dicInit()
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=1',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS',
           rules: [{
             required: true,
             message: " ",

src/views/tirePartsMall/financialManagement/paymentSettlement/index.vue

@@ -106,7 +106,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=1',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS',
         },{
             label: '结算日期',
             prop: "settlementDate",

src/views/tirePartsMall/financialManagement/purchaseDetail/index.vue

@@ -99,7 +99,7 @@ export default {
                 businesDateStart: defaultDate3()[0],
                 businesDateEnd: defaultDate3()[1],
                 isContain: 1,
-                bsType: 'CG,TKCG',
+                bsType: 'CG,TKCG,RZCG',
             },
             page: {
                 pageSize: 10,

src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -22,14 +22,14 @@
             </template>
             <template slot="brandNameSearch">
                 <search-query :datalist="brandData" :selectValue="query.brandName" :clearable="true" :buttonIf="false"
-                    :forParameter="{ key: 'id', label: 'cname', value: 'cname' }" placeholder="请选择品牌" @corpFocus="listAllfun"
-                    @corpChange="corpChange($event, 'brandName')">
+                    :forParameter="{ key: 'id', label: 'cname', value: 'cname' }" placeholder="请选择品牌"
+                    @corpFocus="listAllfun" @corpChange="corpChange($event, 'brandName')">
                 </search-query>
             </template>
             <template slot="storageIdSearch">
                 <search-query :datalist="storageData" :selectValue="query.storageId" :clearable="true" :buttonIf="false"
-                    :forParameter="{ key: 'id', label: 'cname', value: 'id' }" placeholder="请选择品牌"
-                    @corpFocus="storageIdfun" @corpChange="corpChange($event, 'storageId')">
+                    :forParameter="{ key: 'id', label: 'cname', value: 'id' }" placeholder="请选择品牌" @corpFocus="storageIdfun"
+                    @corpChange="corpChange($event, 'storageId')">
                 </search-query>
             </template>
             <!--<template slot="goodsNameSearch">-->
@@ -48,8 +48,8 @@
             <!--</template>-->
             <template slot="salerNameSearch">
                 <search-query :datalist="salerData" :selectValue="query.salerName" :clearable="true" :buttonIf="false"
-                    :forParameter="{ key: 'id', label: 'name', value: 'name' }" placeholder="请选择业务员" @corpFocus="YWYgetListfun"
-                    @corpChange="corpChange($event, 'salerName')">
+                    :forParameter="{ key: 'id', label: 'name', value: 'name' }" placeholder="请选择业务员"
+                    @corpFocus="YWYgetListfun" @corpChange="corpChange($event, 'salerName')">
                 </search-query>
             </template>
             <template slot="actualPaymentStatusSearch">
@@ -68,6 +68,10 @@
             <template slot="isContainSearch">
                 <el-checkbox v-model="query.isContain" :true-label="1" :false-label="0"></el-checkbox>
             </template>
+            <template slot-scope="{ row, index }" slot="ordNo">
+                <span style="color: #409EFF;cursor: pointer" @click.stop="Jump(row)">{{ row.ordNo }}
+                </span>
+            </template>
             <template slot="status" slot-scope="{ row }">
                 <span>{{ row.status }}</span>
             </template>
@@ -85,7 +89,7 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import { getToken } from "@/util/auth";
 import { getSalesman } from "@/api/landTransportation";
-import { listAll ,storageDesc} from "@/api/tirePartsMall/basicData/listingManagement";
+import { listAll, storageDesc } from "@/api/tirePartsMall/basicData/listingManagement";
 
 export default {
     components: { SearchQuery },
@@ -94,7 +98,7 @@ export default {
             key: 0,
             data: [],
             total: [],
-            storageData:[],
+            storageData: [],
             query: {
                 businesDateStart: defaultDate3()[0],
                 businesDateEnd: defaultDate3()[1],
@@ -119,7 +123,7 @@ export default {
                 // searchIndex: 2,
                 // highlightCurrentRow: true,
                 border: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 6,
                 addBtn: false,
                 showSummary: true,
                 summaryText: "合计",
@@ -300,6 +304,18 @@ export default {
                     searchslot: true,
                     searchOrder: 8
                 }, {
+                    label: "业务来源",
+                    prop: "businessSource",
+                    overHidden: true,
+                    search: true,
+                    type: 'select',
+                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=business_Source",
+                    props: {
+                        label: "dictValue",
+                        value: "dictKey"
+                    },
+                    searchOrder: 8
+                }, {
                     label: '包含未发货',
                     prop: 'isContain',
                     overHidden: true,
@@ -334,20 +350,26 @@ export default {
                 id: 4,
                 label: '销售毛利',
                 prop: 'profit'
-            }, {
+            },
+            {
                 id: 5,
+                label: '运费',
+                prop: 'freight',
+            },
+            {
+                id: 6,
                 label: '已取消数量',
                 prop: 'goodsSumCancellation'
             }, {
-                id: 6,
+                id: 7,
                 label: '已取消金额',
                 prop: 'amountCancellation'
             }, {
-                id: 7,
+                id: 8,
                 label: '已取消成本',
                 prop: 'costprieCancellation'
             }, {
-                id: 8,
+                id: 9,
                 label: '已取消毛利',
                 prop: 'profitCancellation'
             }],
@@ -358,11 +380,19 @@ export default {
         getWorkDicts('xs_business_Type').then(res => {
             this.bsTypeData = res.data.data
         })
-        this.query=this.deepClone(this.query)
+        this.query = this.deepClone(this.query)
     },
     methods: {
-        resetChange(){
-            this.query=this.$options.data().query
+        Jump(row) {
+            // this.$router.push({
+            //     path: "/tirePartsMall/salesManagement/saleOrder/index",
+            //     query: {
+            //         jumpId: row.id
+            //     }
+            // })
+        },
+        resetChange() {
+            this.query = this.$options.data().query
         },
         cellStyle({ row, rowIndex }) {
             if (row.status == '已取消') {
@@ -402,9 +432,9 @@ export default {
                 this.brandData = res.data.data
             })
         },
-        storageIdfun(){
-            storageDesc().then(res=>{
-                this.storageData= res.data.data
+        storageIdfun() {
+            storageDesc().then(res => {
+                this.storageData = res.data.data
             })
         },
         // 获取客户数据
@@ -464,6 +494,10 @@ export default {
                 // generalLedgerTotal(queryParams).then(res=>{
                 //     this.total = res.data.data
                 // })
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                    this.$refs.crud.dicInit();
+                });
                 statisticsSaleDetailSum({ ...Object.assign(params, this.query) }).then(re => {
                     this.commodityData = [re.data.data]
 

src/views/tirePartsMall/financialManagement/salesAnalysis/index.vue

@@ -171,7 +171,7 @@ export default {
                     searchslot: true,
                     hide: true,
                     searchOrder: 6,
-                    clearable:false,
+                    clearable: false,
                     dicData: [{
                         label: '客户',
                         value: 1
@@ -222,20 +222,29 @@ export default {
                     id: 1,
                     label: '销售数量',
                     prop: 'salesQuantity',
-                }, {
+                },
+                {
                     id: 2,
                     label: '退货数量',
                     prop: 'returnQuantity'
-                }, {
+                },
+                {
                     id: 3,
+                    label: '运费',
+                    prop: 'freight',
+                },
+                {
+                    id: 4,
                     label: '销售金额',
                     prop: 'salesAmount',
-                }, {
-                    id: 4,
+                },
+                {
+                    id: 5,
                     label: '退货金额',
                     prop: 'returnAmount'
-                }, {
-                    id: 5,
+                },
+                {
+                    id: 6,
                     label: '销售利润',
                     prop: 'salesProfit'
                 }],
@@ -243,7 +252,7 @@ export default {
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(369), this.optionList);
-        this.query=this.deepClone(this.query)
+        this.query = this.deepClone(this.query)
     },
     methods: {
         resetChange() {

src/views/tirePartsMall/purchaseService/Task/index.vue

@@ -5,14 +5,14 @@
         ref="crud" :key="key" @selection-change="selectionChange" @on-load="onLoad" @search-change="searchChange"
         @row-del="rowDel" @refresh-change="refreshChange"
         @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 355)"
-        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 355)" :page.sync="page"
-        @row-update="rowUpdate">
-        <template slot-scope="{type,size,row,index}" slot="menu" >
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 355)" :page.sync="page" @row-update="rowUpdate">
+        <template slot-scope="{type,size,row,index}" slot="menu">
           <!--<el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>-->
-          <el-button type="text" size="small" :disabled="Number(row.sendTotalNum) == Number(row.goodsTotalNum)" @click="rowCell(row, index)">{{ row.$cellEdit ? '保存' : '修改' }}
+          <el-button type="text" size="small" :disabled="Number(row.sendTotalNum) == Number(row.goodsTotalNum)"
+            @click="rowCell(row, index)">{{ row.$cellEdit ? '保存' : '修改' }}
           </el-button>
-            <!--<el-button style="color: red" type="text" size="small" v-if="row.statusName == '已派工'" @click="shipRevokeWorkOrderfun(row, index)">撤销派工-->
-            <!--</el-button>-->
+          <!--<el-button style="color: red" type="text" size="small" v-if="row.statusName == '已派工'" @click="shipRevokeWorkOrderfun(row, index)">撤销派工-->
+          <!--</el-button>-->
           <!-- <el-button :disabled="row.statusName === '已派工'" :size="size" :type="type"
             @click="$refs.crud.rowDel(row, index)">删除
           </el-button> -->
@@ -20,15 +20,21 @@
         <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="GYS" :refresh="false"></crop-select>
         </template>
+        <tempalte slot="stockClerkNameForm" slot-scope="{ row }">
+          <dic-select v-if="row.$cellEdit" v-model="row.stockClerkName" placeholder="库管" key="id" label="realName"
+            url="/blade-user/stockClerkList" :filterable="true"
+            @selectChange="dicChange('stockClerkName', $event, row)"></dic-select>
+          <span v-else>{{ row.stockClerkName }}</span>
+        </tempalte>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <!--  <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新增</el-button>-->
           <!--  <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>-->
           <el-button type="success" icon="el-icon-finished" size="small" @click="dispatching"
             :disabled="selectionList.length <= 0">派工
           </el-button>
-            <el-button type="success" icon="el-icon-finished" size="small" @click="shipRevokeWorkOrderfun"
-                       :disabled="!chexiaofun()">撤销派工
-            </el-button>
+          <el-button type="success" icon="el-icon-finished" size="small" @click="shipRevokeWorkOrderfun"
+            :disabled="!chexiaofun()">撤销派工
+          </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -38,27 +44,29 @@
 
 <script>
 import {
-    getList,
-    remove,
-    outboundWorkOrder,
-    typeSave,
-    generateWarehousing,
-    shipRevokeWorkOrder
+  getList,
+  remove,
+  outboundWorkOrder,
+  typeSave,
+  generateWarehousing,
+  shipRevokeWorkOrder
 } from "@/api/tirePartsMall/purchaseService/outboundTask";
 import da from "element-ui/src/locale/lang/da";
 import fa from "element-ui/src/locale/lang/fa";
 // import detailsPage from "./detailsPage"
+import dicSelect from "@/components/dicSelect/main";
 
 export default {
   name: "index",
   components: {
     // detailsPage
+    dicSelect
   },
   data() {
     return {
       detailsOpen: false,
       loading: false,
-      search: { statusName:'待处理' },
+      search: { statusName: '待处理' },
       form: {},
       dataList: [],
       selectionList: [],
@@ -94,56 +102,56 @@ export default {
         dialogWidth: "70%",
         summaryText: "合计",
         showSummary: true,
-        sumColumnList: [ {
-            name: 'goodsTotalNum',
-            type: 'sum',
-            decimals: 0
-          }, {
-            name: 'sendTotalNum',
-            type: 'sum',
-            decimals: 0
-          },],
+        sumColumnList: [{
+          name: 'goodsTotalNum',
+          type: 'sum',
+          decimals: 0
+        }, {
+          name: 'sendTotalNum',
+          type: 'sum',
+          decimals: 0
+        },],
         column: [{
           label: '来源单号',
           prop: "ordNo",
           search: true,
-          searchOrder:1,
+          searchOrder: 1,
           width: 140,
           overHidden: true,
-        },{
-            label: '单据编号',
-            prop: "billno",
-            search: true,
-            searchOrder:1,
-            width: 140,
-            overHidden: true,
         }, {
-            label: '状态',
-            prop: "statusName",
-            searchOrder:2,
-            width: 100,
-            search: true,
-            type: 'select',
-            overHidden: true,
-            dicData: [{
-                label: '待处理',
-                value: '待处理'
-            }, {
-                label: '已派工',
-                value: '已派工'
-            }, {
-                label: '未完成',
-                value: '未完成'
-            }, {
-                label: '已完成',
-                value: '已完成'
-            }],
-            change: ({ value }) => {
-                console.log(value,133)
-                // this.option.column[1].searchValue = value;
-            },
-            searchValue:'待处理',
-            value:'待处理'
+          label: '单据编号',
+          prop: "billno",
+          search: true,
+          searchOrder: 1,
+          width: 140,
+          overHidden: true,
+        }, {
+          label: '状态',
+          prop: "statusName",
+          searchOrder: 2,
+          width: 100,
+          search: true,
+          type: 'select',
+          overHidden: true,
+          dicData: [{
+            label: '待处理',
+            value: '待处理'
+          }, {
+            label: '已派工',
+            value: '已派工'
+          }, {
+            label: '未完成',
+            value: '未完成'
+          }, {
+            label: '已完成',
+            value: '已完成'
+          }],
+          change: ({ value }) => {
+            console.log(value, 133)
+            // this.option.column[1].searchValue = value;
+          },
+          searchValue: '待处理',
+          value: '待处理'
         }, {
           label: '业务对象',
           prop: "customerName",
@@ -151,8 +159,8 @@ export default {
           width: 140,
           type: 'select',
           overHidden: true,
-          filterable:true,
-          remote:true,
+          filterable: true,
+          remote: true,
           props: {
             label: 'cname',
             value: 'cname',
@@ -192,7 +200,7 @@ export default {
           width: 100,
           search: true,
           overHidden: true,
-          cell:false,
+          cell: false,
           type: 'select',
           props: {
             label: 'cname',
@@ -200,18 +208,14 @@ export default {
           },
           dicUrl: '/api/blade-sales-part/storageDesc/listAll',
         },
-         {
+        {
           label: '库管',
           prop: "stockClerkName",
           width: 100,
-          cell:false,
+          cell: true,
+          slot: true,
+          formslot: true,
           overHidden: true,
-          type: 'select',
-          props: {
-            label: 'realName',
-            value: 'realName'
-          },
-          dicUrl: '/api/blade-user/stockClerkList',
         },
         // {
         //   label: '收货地址',
@@ -239,7 +243,7 @@ export default {
           label: '备注',
           prop: "remarks",
           width: 200,
-          cell:false,
+          cell: false,
           overHidden: true,
         }, {
           label: '业务日期',
@@ -275,44 +279,53 @@ export default {
     }
   },
   methods: {
-      // 撤销派工的数据判断
-      chexiaofun(){
-          let typefalse = false
-          for(let item of this.selectionList) {
-              if (item.statusName == '已派工') {
-                  typefalse = true
-              }else {
+    dicChange(name, row, el) {
+      if (name == 'stockClerkName') {
+        if (row) {
+          el.stockClerkId = row.id
+        } else {
+          el.stockClerkId = null
+        }
+      }
+    },
+    // 撤销派工的数据判断
+    chexiaofun() {
+      let typefalse = false
+      for (let item of this.selectionList) {
+        if (item.statusName == '已派工') {
+          typefalse = true
+        } else {
 
-                  typefalse = false
-                  break;
-              }
-          }
-          return typefalse
-      },
+          typefalse = false
+          break;
+        }
+      }
+      return typefalse
+    },
     selectionChange(list) {
       console.log(list);
       this.selectionList = list
     },
-      // 撤销派工
-      shipRevokeWorkOrderfun(){
-          this.$confirm('是否要撤销派工?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-          }).then(()=>{
-              const data = []
-              for(let i in this.selectionList) {
-                  data.push(this.selectionList[i].id)
-              }
-              shipRevokeWorkOrder(data.join(',')).then(res=>{
-                  this.$message({
-                      type: 'success',
-                      message: '撤销派工成功!'
-                  });
-                  this.onLoad(this.page)
-              })
-          })
-      },
+    // 撤销派工
+    shipRevokeWorkOrderfun() {
+      this.$confirm('是否要撤销派工?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const data = []
+        for (let i in this.selectionList) {
+          data.push(this.selectionList[i].id)
+        }
+        shipRevokeWorkOrder(data.join(',')).then(res => {
+          this.$message({
+            type: 'success',
+            message: '撤销派工成功!'
+          });
+          this.onLoad(this.page)
+        })
+      })
+    },
     dispatching() {
       this.$confirm('是否确认派工?', '提示', {
         confirmButtonText: '确定',
@@ -351,7 +364,7 @@ export default {
     rowUpdate(form, index, done) {
       console.log(form);
       typeSave(form).then(res => {
-        this.$message({type: "success", message: form.id ? "修改成功!" : "新增成功!"});
+        this.$message({ type: "success", message: form.id ? "修改成功!" : "新增成功!" });
         // this.page.currentPage = 1;
         // this.onLoad(this.page);
         //成功关闭此页面回到列表页
@@ -363,7 +376,7 @@ export default {
     refreshChange() {
       this.onLoad(this.page, this.search)
     },
-    rowCell(row,index){
+    rowCell(row, index) {
       this.findObject(this.option.column, "storageName").cell = true
       this.findObject(this.optionList.column, "storageName").cell = true
       this.findObject(this.option.column, "stockClerkName").cell = true
@@ -390,7 +403,7 @@ export default {
       });
     },
     searchChange(params, done) {
-        this.page.currentPage = 1
+      this.page.currentPage = 1
       done();
       this.onLoad(this.page, params)
     },
@@ -401,7 +414,7 @@ export default {
         size: page.pageSize,
         bizTypeName: "TKFHRW",
         ...Object.assign(params, this.search),
-        customerName : params.$customerName
+        customerName: params.$customerName
       }
       console.log(params);
       this.loading = true
@@ -445,8 +458,8 @@ export default {
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }
       this.option.selectable = (row, index) => {
-      return Number(row.sendTotalNum) !== Number(row.goodsTotalNum);
-    }
+        return Number(row.sendTotalNum) !== Number(row.goodsTotalNum);
+      }
     }
   }
 }

src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -17,6 +17,11 @@
                     :disabled="isDisabledTask || form.status !== '待确认' && form.status !== '待收货'" @click="generateOutbound">
                     {{ buttonText }}
                 </el-button>
+                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="info" size="small"
+                    :disabled="form.status != '已收货' || form.returnsNumber == form.goodsTotalNum || editButton"
+                    @click="getReturns">
+                    采购退货
+                </el-button>
                 <el-dropdown style="padding: 0 6px;line-height: 0">
                     <el-button v-show="!(!form.id || viewDisabled)" type="danger" :loading="buttonLoading"
                         :disabled="!form.id || viewDisabled" size="small">
@@ -932,20 +937,20 @@ export default {
                     editDisplay: false,
                     addDisplay: false
                 },
-                {
-                    label: '退货数量',
-                    prop: "returnsNumber",
-                    overHidden: true,
-                    width: 100,
-                    disabled: true,
-                },
-                {
-                    label: '退货金额',
-                    prop: "returnsAmount",
-                    overHidden: true,
-                    width: 100,
-                    disabled: true,
-                },
+                // {
+                //     label: '退货数量',
+                //     prop: "returnsNumber",
+                //     overHidden: true,
+                //     width: 100,
+                //     disabled: true,
+                // },
+                // {
+                //     label: '退货金额',
+                //     prop: "returnsAmount",
+                //     overHidden: true,
+                //     width: 100,
+                //     disabled: true,
+                // },
                 // {
                 //     label: '利润',
                 //     prop: 'profit',

src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue

@@ -390,8 +390,8 @@ export default {
           overHidden: true,
         },
         {
-          label: '可用金额',
-          prop: "availableAmount",
+          label: '保证金',
+          prop: "bondAmount",
           overHidden: true,
         },
         {

src/views/tirePartsMall/salesManagement/Inventory/detailsPage.vue

@@ -166,7 +166,7 @@ export default {
                 pageSize: 20,
                 currentPage: 1,
                 total: 0,
-                pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+                pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500,1000]
             },
             inventoryDataList:[], // 弹窗数据
             inventoryOption: {},

src/views/tirePartsMall/salesManagement/Inventory/index.vue

@@ -449,7 +449,6 @@ export default {
   },
   activated() {
     setTimeout(() => {
-      console.log(this.$route.query,400);
       // 库存明细跳过来的
       if(this.$route.query.orderId) {
           this.detailData.id = this.$route.query.orderId

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -319,7 +319,8 @@ import {
     generateReturns,
     whetherExistenceFinancing,
     checkOrderRW,
-    revokeCheckOrderRW
+    revokeCheckOrderRW,
+    getParamservice
 } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { dotList, goodsDetail } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
 import reportDialog from "@/components/report-dialog/main";
@@ -1937,23 +1938,93 @@ export default {
                     if (this.form.orderItemsList.length <= 0) {
                         this.$message.error('请录入明细');
                     } else {
-                        const loading = this.$loading({
-                            lock: true,
-                            text: '加载中',
-                            spinner: 'el-icon-loading',
-                            background: 'rgba(255,255,255,0.7)'
-                        });
                         this.$set(this.optionForm, 'disabled', true)
                         this.$set(this.optionContactsBack, 'disabled', true)
                         this.$refs["form"].validate((valid, done) => {
                             done();
                             if (valid) {
-                                console.log(111)
-                                whetherExistenceFinancing({
-                                    bsType: "XS",
-                                    ...this.form
-                                }).then(res => {
-                                    if (res.data.data == true) {
+                                const loading = this.$loading({
+                                    lock: true,
+                                    text: '加载中',
+                                    spinner: 'el-icon-loading',
+                                    background: 'rgba(255,255,255,0.7)'
+                                });
+                                getParamservice(1, 10, { paramKey: 'whether.financing' }).then(res => {
+                                    if (res.data.data.records.length) {
+                                        res.data.data.records.forEach(e => {
+                                            if (e.paramValue == 1) {
+                                                whetherExistenceFinancing({
+                                                    bsType: "XS",
+                                                    ...this.form
+                                                }).then(res => {
+                                                    this.$confirm(res.data.data, '提示', {
+                                                        confirmButtonText: '确定',
+                                                        cancelButtonText: '取消',
+                                                        type: 'warning'
+                                                    }).then(() => {
+                                                        checkOrderRW({
+                                                            bsType: "XS",
+                                                            ...this.form
+                                                        }).then(res => {
+                                                            this.$message.success("提交成功");
+                                                            // 将按钮文本更改为"撤销任务"
+                                                            this.buttonText = '撤销任务';
+                                                            // 将按钮颜色更改为对应的颜色
+                                                            this.buttonColor = 'warning'; // 比如改为warning
+                                                            this.refresh(res.data.data.id)
+                                                            this.refreshs(res.data.data.id, true)
+                                                            this.isContacts = true
+                                                            this.isApplySettlement = false
+                                                            this.isAdd = true
+                                                            this.isDisabled = true
+                                                            this.isAddBtn = true
+                                                            this.isDisabledTask = true
+                                                            this.editButton = true
+                                                        }).finally(() => {
+                                                            loading.close();
+                                                        })
+                                                    })
+                                                }).catch(() => {
+                                                    loading.close();
+                                                })
+                                            } else {
+                                                submit({
+                                                    bsType: "XS",
+                                                    ...this.form
+                                                }).then(res => {
+                                                    // this.refresh(res.data.data.id)
+                                                    this.isDisabledTask = false
+                                                    const loading = this.$loading({
+                                                        lock: true,
+                                                        text: '加载中',
+                                                        spinner: 'el-icon-loading',
+                                                        background: 'rgba(255,255,255,0.7)'
+                                                    });
+                                                    generateShipTask(this.form).then(res => {
+                                                        this.$message.success("生成出库任务成功");
+                                                        // 将按钮文本更改为"撤销任务"
+                                                        this.buttonText = '撤销任务';
+                                                        // 将按钮颜色更改为对应的颜色
+                                                        this.buttonColor = 'warning'; // 比如改为warning
+                                                        this.refresh(res.data.data.id)
+                                                        this.refreshs(res.data.data.id, true)
+                                                        this.isContacts = true
+                                                        this.isApplySettlement = false
+                                                        this.isAdd = true
+                                                        this.isDisabled = true
+                                                        this.isAddBtn = true
+                                                        this.isDisabledTask = true
+                                                        this.editButton = true // 把编辑按钮显示出来
+                                                    }).finally(() => {
+                                                        loading.close();
+                                                    })
+                                                }).catch(() => {
+                                                    loading.close();
+                                                })
+                                            }
+                                        })
+                                    }
+                                    if (res.data.data.records.length == 0) {
                                         const loading = this.$loading({
                                             lock: true,
                                             text: '加载中',
@@ -1984,45 +2055,10 @@ export default {
                                             }).finally(() => {
                                                 loading.close();
                                             })
-                                        }).finally(() => {
+                                        }).catch(() => {
                                             loading.close();
                                         })
-                                    } else {
-                                        this.$confirm(res.data.data, '提示', {
-                                            confirmButtonText: '确定',
-                                            cancelButtonText: '取消',
-                                            type: 'warning'
-                                        }).then(() => {
-                                            const loading = this.$loading({
-                                                lock: true,
-                                                text: '加载中',
-                                                spinner: 'el-icon-loading',
-                                                background: 'rgba(255,255,255,0.7)'
-                                            });
-                                            checkOrderRW({
-                                                bsType: "XS",
-                                                ...this.form
-                                            }).then(res => {
-                                                this.$message.success("提交成功");
-                                                // 将按钮文本更改为"撤销任务"
-                                                this.buttonText = '撤销任务';
-                                                // 将按钮颜色更改为对应的颜色
-                                                this.buttonColor = 'warning'; // 比如改为warning
-                                                this.refresh(res.data.data.id)
-                                                this.refreshs(res.data.data.id, true)
-                                                this.isContacts = true
-                                                this.isApplySettlement = false
-                                                this.isAdd = true
-                                                this.isDisabled = true
-                                                this.isAddBtn = true
-                                                this.isDisabledTask = true
-                                            }).finally(() => {
-                                                loading.close();
-                                            })
-                                        })
                                     }
-                                }).finally(() => {
-                                    loading.close();
                                 })
 
                                 done();
@@ -2030,7 +2066,6 @@ export default {
                                 this.$message.error('请选择仓库')
                                 this.$set(this.optionForm, 'disabled', false)
                                 this.$set(this.optionContactsBack, 'disabled', false)
-                                loading.close();
                             }
                         })
                     }
@@ -2407,6 +2442,12 @@ export default {
             })
         },
         refreshs(id, type) {
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
             getDetails({ id: id }).then(res => {
                 this.form = res.data.data
                 let ordForm = { srcBillNo: this.form.ordNo }
@@ -2487,8 +2528,9 @@ export default {
                         items.grossProfit = items.subTotalMoney - items.costprie
                     }
                 })
-            }).catch(() => {
-            })
+            }).finally(() => {
+                loading.close();
+            });
         },
         //请核关闭
         choceScheduleFun() {

src/views/tirePartsMall/salesService/Task/index.vue

@@ -5,12 +5,12 @@
         ref="crud" :key="key" @selection-change="selectionChange" @on-load="onLoad" @search-change="searchChange"
         @row-del="rowDel" @refresh-change="refreshChange"
         @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 346)"
-        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 346)" :page.sync="page"
-        @row-update="rowUpdate">
-        <template slot-scope="{type,size,row,index}" slot="menu" >
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 346)" :page.sync="page" @row-update="rowUpdate">
+        <template slot-scope="{type,size,row,index}" slot="menu">
           <!--<el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>-->
           <!--  :disabled="Number(row.sendTotalNum) == Number(row.goodsTotalNum)" 之前的判断是否修改的条件 -->
-          <el-button type="text" size="small" :disabled="row.statusName != '待处理'" @click="rowCell(row, index)">{{ row.$cellEdit ? '保存' : '修改' }}
+          <el-button type="text" size="small" :disabled="row.statusName != '待处理'" @click="rowCell(row, index)">{{
+            row.$cellEdit ? '保存' : '修改' }}
           </el-button>
           <!-- <el-button :disabled="row.statusName === '已派工'" :size="size" :type="type"
             @click="$refs.crud.rowDel(row, index)">删除
@@ -19,6 +19,12 @@
         <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
         </template>
+        <tempalte slot="stockClerkNameForm" slot-scope="{ row }">
+          <dic-select v-if="row.$cellEdit" v-model="row.stockClerkName" placeholder="库管" key="id" label="realName"
+            url="/blade-user/stockClerkList" :filterable="true"
+            @selectChange="dicChange('stockClerkName', $event, row)"></dic-select>
+          <span v-else>{{ row.stockClerkName }}</span>
+        </tempalte>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <!--  <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新增</el-button>-->
           <!--  <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>-->
@@ -26,9 +32,9 @@
             :disabled="selectionList.length <= 0">派工
           </el-button>
 
-            <el-button type="success" icon="el-icon-finished" size="small" @click="shipRevokeWorkOrderfun"
-                       :disabled="!chexiaofun()">撤销派工
-            </el-button>
+          <el-button type="success" icon="el-icon-finished" size="small" @click="shipRevokeWorkOrderfun"
+            :disabled="!chexiaofun()">撤销派工
+          </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -37,7 +43,8 @@
 </template>
 
 <script>
-import { getList, remove, outboundWorkOrder,typeSave,shipRevokeWorkOrder } from "@/api/tirePartsMall/salesService/outboundTask";
+import { getList, remove, outboundWorkOrder, typeSave, shipRevokeWorkOrder } from "@/api/tirePartsMall/salesService/outboundTask";
+import dicSelect from "@/components/dicSelect/main";
 import da from "element-ui/src/locale/lang/da";
 // import detailsPage from "./detailsPage"
 
@@ -45,6 +52,7 @@ export default {
   name: "index",
   components: {
     // detailsPage
+    dicSelect
   },
   data() {
     return {
@@ -86,51 +94,51 @@ export default {
         dialogWidth: "70%",
         summaryText: "合计",
         showSummary: true,
-        sumColumnList: [ {
-            name: 'goodsTotalNum',
-            type: 'sum',
-            decimals: 0
-          }, {
-            name: 'sendTotalNum',
-            type: 'sum',
-            decimals: 0
-          },],
+        sumColumnList: [{
+          name: 'goodsTotalNum',
+          type: 'sum',
+          decimals: 0
+        }, {
+          name: 'sendTotalNum',
+          type: 'sum',
+          decimals: 0
+        },],
         column: [{
           label: '来源单号',
           prop: "ordNo",
-          searchOrder:1,
+          searchOrder: 1,
           search: true,
           width: 140,
           overHidden: true,
-        },{
-            label: '单据编号',
-            prop: "billno",
-            searchOrder:1,
-            search: true,
-            width: 140,
-            overHidden: true,
         }, {
-            label: '状态',
-            prop: "statusName",
-            searchOrder:2,
-            width: 100,
-            search: true,
-            type: 'select',
-            overHidden: true,
-            searchValue:'待处理',
-            dicData: [{
-                label: '待处理',
-                value: '待处理'
-            }, {
-                label: '已派工',
-                value: '已派工'
-            },{
-                label: '未完成',
-                value: '未完成'
-            }, {
-                label: '已完成',
-                value: '已完成'
-            }],
+          label: '单据编号',
+          prop: "billno",
+          searchOrder: 1,
+          search: true,
+          width: 140,
+          overHidden: true,
+        }, {
+          label: '状态',
+          prop: "statusName",
+          searchOrder: 2,
+          width: 100,
+          search: true,
+          type: 'select',
+          overHidden: true,
+          searchValue: '待处理',
+          dicData: [{
+            label: '待处理',
+            value: '待处理'
+          }, {
+            label: '已派工',
+            value: '已派工'
+          }, {
+            label: '未完成',
+            value: '未完成'
+          }, {
+            label: '已完成',
+            value: '已完成'
+          }],
         }, {
           label: '业务对象',
           prop: "customerName",
@@ -138,21 +146,21 @@ export default {
           width: 140,
           type: 'select',
           overHidden: true,
-          filterable:true,
-          remote:true,
+          filterable: true,
+          remote: true,
           props: {
             label: 'cname',
             value: 'cname',
             res: 'data.records'
           },
           dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=KH&cname={{key}}',
-        }, 
-          // , {
-          //     label: "商品种类",
-          //     prop: "corpId",
-          //     width: 100,
-          //     overHidden: true,
-          // }
+        },
+        // , {
+        //     label: "商品种类",
+        //     prop: "corpId",
+        //     width: 100,
+        //     overHidden: true,
+        // }
         // {
         //   label: '业务来源',
         //   prop: "bsType",
@@ -178,7 +186,7 @@ export default {
           width: 100,
           search: true,
           overHidden: true,
-          cell:false,
+          cell: false,
           type: 'select',
           props: {
             label: 'cname',
@@ -186,18 +194,14 @@ export default {
           },
           dicUrl: '/api/blade-sales-part/storageDesc/listAll',
         },
-         {
+        {
           label: '库管',
           prop: "stockClerkName",
           width: 100,
-          cell:false,
+          cell: true,
+          slot: true,
+          formslot: true,
           overHidden: true,
-          type: 'select',
-          props: {
-            label: 'realName',
-            value: 'realName'
-          },
-          dicUrl: '/api/blade-user/stockClerkList',
         },
         // {
         //   label: '收货地址',
@@ -225,7 +229,7 @@ export default {
           label: '备注',
           prop: "remarks",
           width: 200,
-          cell:false,
+          cell: false,
           overHidden: true,
         }, {
           label: '业务日期',
@@ -263,43 +267,52 @@ export default {
 
   },
   methods: {
-      // 撤销派工的数据判断
-      chexiaofun(){
-          let typefalse = false
-          for(let item of this.selectionList) {
-              if (item.statusName == '已派工') {
-                  typefalse = true
-              }else {
+    dicChange(name, row, el) {
+      if (name == 'stockClerkName') {
+        if (row) {
+          el.stockClerkId = row.id
+        } else {
+          el.stockClerkId = null
+        }
+      }
+    },
+    // 撤销派工的数据判断
+    chexiaofun() {
+      let typefalse = false
+      for (let item of this.selectionList) {
+        if (item.statusName == '已派工') {
+          typefalse = true
+        } else {
 
-                  typefalse = false
-                  break;
-              }
-          }
-          return typefalse
-      },
+          typefalse = false
+          break;
+        }
+      }
+      return typefalse
+    },
     selectionChange(list) {
       this.selectionList = list
     },
-      // 撤销派工
-      shipRevokeWorkOrderfun(){
-          this.$confirm('是否要撤销派工?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-          }).then(()=>{
-              const data = []
-              for(let i in this.selectionList) {
-                  data.push(this.selectionList[i].id)
-              }
-              shipRevokeWorkOrder(data.join(',')).then(res=>{
-                  this.$message({
-                      type: 'success',
-                      message: '撤销派工成功!'
-                  });
-                  this.onLoad(this.page)
-              })
-          })
-      },
+    // 撤销派工
+    shipRevokeWorkOrderfun() {
+      this.$confirm('是否要撤销派工?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const data = []
+        for (let i in this.selectionList) {
+          data.push(this.selectionList[i].id)
+        }
+        shipRevokeWorkOrder(data.join(',')).then(res => {
+          this.$message({
+            type: 'success',
+            message: '撤销派工成功!'
+          });
+          this.onLoad(this.page)
+        })
+      })
+    },
     dispatching() {
       this.$confirm('是否确认派工?', '提示', {
         confirmButtonText: '确定',
@@ -336,9 +349,8 @@ export default {
     },
     //列表更新
     rowUpdate(form, index, done) {
-      console.log(form);
       typeSave(form).then(res => {
-        this.$message({type: "success", message: form.id ? "修改成功!" : "新增成功!"});
+        this.$message({ type: "success", message: form.id ? "修改成功!" : "新增成功!" });
         // this.page.currentPage = 1;
         // this.onLoad(this.page);
         //成功关闭此页面回到列表页
@@ -350,7 +362,7 @@ export default {
     refreshChange() {
       this.onLoad(this.page, this.search)
     },
-    rowCell(row,index){
+    rowCell(row, index) {
       this.findObject(this.option.column, "storageName").cell = true
       this.findObject(this.optionList.column, "storageName").cell = true
       this.findObject(this.option.column, "stockClerkName").cell = true
@@ -387,9 +399,9 @@ export default {
         current: page.currentPage,
         size: page.pageSize,
         bizTypeName: "THSHRW",
-          statusName:'待处理',
+        statusName: '待处理',
         ...Object.assign(params, this.search),
-        customerName : params.$customerName
+        customerName: params.$customerName
       }
       console.log(params);
       this.loading = true
@@ -433,8 +445,8 @@ export default {
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }
       this.option.selectable = (row, index) => {
-      return Number(row.sendTotalNum) !== Number(row.goodsTotalNum);
-    }
+        return Number(row.sendTotalNum) !== Number(row.goodsTotalNum);
+      }
     }
   }
 }