Merge branch 'dev' of http://git.echepei.com/tire-platform/Smart_platform_ui into dev

src/util/date.js

@@ -282,66 +282,78 @@ export function checkFullWidthSymbols_bak(text) {
 }
 // wfg
 export function checkFullWidthSymbols(text) {
-    if (text) {
-        const fullWidthRegex = /[\u4e00-\u9fa5\u3000-\u303f\uff00-\uffef\u3400-\u4dbf]/g;
-        const matchesItem = [];
-        // TAB 键转为空格
-        let lines = text.trimEnd().replaceAll("\t", " ").split('\n')
-        let match;
-        lines.forEach((ln, index, array) => {
-            ln=ln.trimEnd();
-            lines[index]=ln
-            while ((match = fullWidthRegex.exec(ln)) !== null) {
-                matchesItem.push({
-                    row: index + 1,         // 行号
-                    index: match.index,     // 符号的位置
-                    symbol: match[0],       // 符号本身
-                    input: match.input      // 行
-                });
-            }
-        })
-        let resetText = lines.join("\n")
-        let isResetText = resetText != text
-        let message=[]
-        matchesItem.forEach(m=>{
-            message.push(`第 ${m.row} 行第 ${m.index} 个字符 ${m.symbol} 不符合要求，存在全角字符或汉字等！`)
-        })
-        return {
-            hasFullWidth: matchesItem.length > 0, // 是否包含全角符号
-            positions: matchesItem,               // 符号的详细位置和内容
-            message: message.join("<br>"),
-            isResetText: isResetText,  // 是否重设文本
-            resetText: resetText,      // 重设的文本
-        };
-    } else {
-        return {
-            hasFullWidth: false, // 是否包含全角符号
-            positions: [],                // 符号的详细位置和内容
-            message: "",
-            isResetText:false,  // 是否重设文本
-            resetText: "",      // 重设的文本
-        };
-    }
+  if (text) {
+    const fullWidthRegex = /[\u4e00-\u9fa5\u3000-\u303f\uff00-\uffef\u3400-\u4dbf]/g;
+    const matchesItem = [];
+    // TAB 键转为空格
+    let lines = text
+      .trimEnd()
+      .replaceAll("\t", " ")
+      .split("\n");
+    let match;
+    lines.forEach((ln, index, array) => {
+      ln = ln.trimEnd();
+      lines[index] = ln;
+      while ((match = fullWidthRegex.exec(ln)) !== null) {
+        matchesItem.push({
+          row: index + 1, // 行号
+          index: match.index, // 符号的位置
+          symbol: match[0], // 符号本身
+          input: match.input // 行
+        });
+      }
+    });
+    let resetText = lines.join("\n");
+    let isResetText = resetText != text;
+    let message = [];
+    matchesItem.forEach(m => {
+      message.push(`第 ${m.row} 行第 ${m.index} 个字符 ${m.symbol} 不符合要求，存在全角字符或汉字等！`);
+    });
+    return {
+      hasFullWidth: matchesItem.length > 0, // 是否包含全角符号
+      positions: matchesItem, // 符号的详细位置和内容
+      message: message.join("<br>"),
+      isResetText: isResetText, // 是否重设文本
+      resetText: resetText // 重设的文本
+    };
+  } else {
+    return {
+      hasFullWidth: false, // 是否包含全角符号
+      positions: [], // 符号的详细位置和内容
+      message: "",
+      isResetText: false, // 是否重设文本
+      resetText: "" // 重设的文本
+    };
+  }
 }
 //判断是否超过设置天数
 export function overdueJudgment(date1, date2) {
-  const overDay = localStorage.getItem('lockTermDays')
-  console.log('overdueJudgment', overDay, date1, date2)
-  if (overDay) {
-    let r = false;
-    const nowDate = new Date(dateFormat(new Date(),'yyyy-MM-dd'))
-    const startDate1 = new Date(dateFormat(new Date(date1),'yyyy-MM-dd'))
-    startDate1.setDate(startDate1.getDate() + Number(overDay))
-    r = startDate1 < nowDate
-    if(r===true && date2){
-      console.log('overdueJudgment, date2')
-      const startDate2 = new Date(dateFormat(new Date(date2),'yyyy-MM-dd'))
-      startDate2.setDate(startDate2.getDate() + Number(overDay))
-      r = startDate2 < nowDate
-    }
+  let lockTermGlobal = localStorage.getItem("lockTermGlobal");
 
-    return r
-  } else {
-    return false
+  if (lockTermGlobal === "1") {
+    const overDay = localStorage.getItem("lockTermDays");
+    console.log("overdueJudgment", overDay, date1, date2);
+    if (overDay) {
+      let r = false;
+      const nowDate = new Date(dateFormat(new Date(), "yyyy-MM-dd"));
+      const startDate1 = new Date(dateFormat(new Date(date1), "yyyy-MM-dd"));
+      startDate1.setDate(startDate1.getDate() + Number(overDay));
+      r = startDate1 < nowDate;
+      if (r === true && date2) {
+        const overDay2 = localStorage.getItem("secondLockTermDays");
+        if(overDay2) {
+          console.log("overdueJudgment, date2", overDay2);
+          const startDate2 = new Date(dateFormat(new Date(date2), "yyyy-MM-dd"));
+          startDate2.setDate(startDate2.getDate() + Number(overDay2));
+          r = startDate2 < nowDate;
+        }
+      }
+
+      return r;
+    } else {
+      return false;
+    }
+  }else{
+    return false;
   }
 }

src/util/messageReminder.js

@@ -50,8 +50,20 @@ export const popupReminder = (form,data)=>{
               }
           })
       }
-    if (b && !form[item.value]) {
-      sum += item.name.toUpperCase()+' ，'
+    // if (b && !form[item.value]) {
+    //   sum += item.name.toUpperCase()+' ，'
+    // }
+    if(b){
+      let vals = item.value.split(',')
+      b=false
+      vals.forEach(val=>{
+        if(form[val]){
+          b = true
+        }
+      })
+      if(!b){
+        sum += item.name.toUpperCase()+' ，'
+      }
     }
   }
   if(sum.length>0){

src/views/approveDataH/configuration/mainList.json

@@ -7,7 +7,7 @@
     "dialogWidth": "60%",
     "align": "center",
     "height": "auto",
-    "searchSpan": 8,
+    "searchSpan": 6,
     "searchMenuPosition": "right",
     "border": true,
     "index": true,
@@ -127,7 +127,6 @@
             "prop": "corpId",
             "search": false,
             "hide": true,
-            "showColumn": false,
             "overHidden": true,
             "width": 100,
             "index": 9,
@@ -140,7 +139,6 @@
             "width": 100,
             "index": 10,
             "hide": true,
-            "showColumn": false,
             "sortable": true
         },
         {
@@ -150,7 +148,6 @@
             "width": 100,
             "index": 12,
             "hide": true,
-            "showColumn": false,
             "sortable": true
         },
         {
@@ -160,7 +157,6 @@
             "width": 100,
             "index": 13,
             "hide": true,
-            "showColumn": false,
             "sortable": true
         },
         {
@@ -171,7 +167,6 @@
             "width": 100,
             "index": 14,
             "hide": true,
-            "showColumn": false,
             "sortable": true
         },
         {
@@ -192,7 +187,6 @@
             "width": 100,
             "index": 15,
             "hide": true,
-            "showColumn": false,
             "sortable": true
         },
         {
@@ -210,7 +204,6 @@
             "width": 100,
             "index": 16,
             "hide": true,
-            "showColumn": false,
             "sortable": true
         },
         {
@@ -256,7 +249,6 @@
             "index": 18,
             "width": 150,
             "hide": true,
-            "showColumn": false,
             "sortable": true
         },
         {
@@ -291,7 +283,6 @@
             "width": 100,
             "index": 19,
             "hide": true,
-            "showColumn": false,
             "sortable": true
         },
         {
@@ -302,7 +293,6 @@
             "width": 100,
             "index": 20,
             "hide": true,
-            "showColumn": false,
             "sortable": true
         },
         {
@@ -318,7 +308,6 @@
             "index": 21,
             "width": 150,
             "hide": true,
-            "showColumn": false,
             "sortable": true
         },
         {
@@ -344,7 +333,6 @@
             "search": false,
             "index": 22,
             "hide": true,
-            "showColumn": false,
             "sortable": true
         },
         {
@@ -355,7 +343,6 @@
             "search": false,
             "index": 23,
             "hide": true,
-            "showColumn": false,
             "sortable": true
         },
         {
@@ -366,7 +353,6 @@
             "width": 100,
             "index": 24,
             "hide": true,
-            "showColumn": false,
             "sortable": true
         }
     ]

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -25,9 +25,9 @@
           <div style="display: flex;align-items: center;justify-content: space-between">
             <div>
               <!--<el-button type="primary" size="small" @click="DistributionBox">配箱</el-button>-->
-              <el-button type="success" size="small" plain :disabled="seeDisabled" @click.stop="equalDistribution2()">配箱 </el-button>
-              <el-button type="success" size="small" plain :disabled="seeDisabled" @click.stop="equalDistribution(1)">按TEU配箱 </el-button>
-              <el-button type="success" size="small" plain :disabled="seeDisabled" @click.stop="equalDistribution(2)">按箱量配箱 </el-button>
+              <el-button type="success" size="small" plain :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType || showLock" @click.stop="equalDistribution2()">配箱 </el-button>
+              <el-button type="success" size="small" plain :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType || showLock" @click.stop="equalDistribution(1)">按TEU配箱 </el-button>
+              <el-button type="success" size="small" plain :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType || showLock" @click.stop="equalDistribution(2)">按箱量配箱 </el-button>
               <el-button type="primary" size="small" :disabled="detailData.seeDisabled || pleasereviewType || showLock" @click="rootEditfun"
                 >一键编辑
               </el-button>

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -877,6 +877,59 @@
             </el-form-item>
             <div>
               <el-col :span="12">
+            <el-form-item label="船舶代理" prop="shippingAgencyCname" label-width="80px" >
+              <span slot="label">
+                <span style="color: #1e9fff">船舶代理</span>
+              </span>
+                <el-input
+                  type="age"
+                  style="width: 100%;"
+                  v-model="assemblyForm.shippingAgencyCname"
+                  size="small"
+                  autocomplete="off"
+                  :disabled="detailData.seeDisabled"
+                  clearable
+                  placeholder="请输入船舶代理"
+                ></el-input>
+                <!--
+                <search-query
+                  :datalist="bookingAgentData"
+                  :selectValue="assemblyForm.bookingAgentCnName"
+                  :filterable="true"
+                  :clearable="true"
+                  :remote="true"
+                  :disabled="detailData.seeDisabled"
+                  :buttonIf="false"
+                  placeholder="请选择订舱代理"
+                  :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                  @remoteMethod="remoteMethod($event, 'bookingAgent')"
+                  @corpChange="corpChange($event, 'bookingAgent')"
+                  @corpFocus="remoteMethod($event, 'bookingAgent')"
+                >
+                </search-query>
+                -->
+            </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="电话" prop="shippingAgencyEname" label-width="50px" >
+              <span slot="label">
+                <span style="color: #1e9fff">电话</span>
+              </span>
+                <el-input
+                  type="age"
+                  style="width: 100%; margin-right: -10px;"
+                  v-model="assemblyForm.shippingAgencyEname"
+                  size="small"
+                  autocomplete="off"
+                  :disabled="detailData.seeDisabled"
+                  clearable
+                  placeholder="船舶代理电话"
+                ></el-input>
+                </el-form-item>
+              </el-col>
+            </div>
+            <div>
+              <el-col :span="12">
                 <el-form-item label="件数" prop="quantity" label-width="80px" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                   <span slot="label">
                     <span style="color: #1e9fff">件数</span>

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -144,7 +144,7 @@ export default {
                         label: "尺码箱型",
                         prop: "cntrTypeCode",
                         formslot: true,
-                        width: '120',
+                        width: 120,
                         cell: true,
                         rules: [{
                             required: true,
@@ -156,7 +156,7 @@ export default {
                         label: "箱量",
                         prop: "quantity",
                         type: "number",
-                        width: '70',
+                        width: 70,
                         cell: true,
                         controls: false,
                         precision: 0,
@@ -166,11 +166,27 @@ export default {
                             trigger: "blur"
                         }]
                     },
+                  {
+                    label: "温度",
+                    prop: "temperature",
+                    cell: true,
+                    controls: false,
+                    // type:"number",
+                    width: 100
+                  },
+                  {
+                    label: "通风度",
+                    prop: "ventilation",
+                    cell: true,
+                    controls: false,
+                    // type:"number",
+                    width: 100
+                  },
                     {
                         label: "件数",
                         prop: "number",
                         type: "number",
-                        width: '70',
+                        width: 70,
                         // cell:true,
                         controls: false,
                         precision: 0,
@@ -178,7 +194,7 @@ export default {
                     {
                         label: "毛重(KGS)",
                         prop: "grossWeight",
-                        width: '120',
+                        width: 120,
                         type: "number",
                         // cell:true,
                         controls: false,
@@ -186,7 +202,7 @@ export default {
                     {
                         label: "体积(CBM)",
                         prop: "measurement",
-                        width: '120',
+                        width: 120,
                         type: "number",
                         // cell:true,
                         controls: false,
@@ -194,19 +210,11 @@ export default {
                     {
                         label: "净重(KGS)",
                         prop: "netWeight",
-                        width: '120',
+                        width: 120,
                         type: "number",
                         cell: true,
                         controls: false,
                     },
-                    {
-                        label: "温度",
-                        prop: "temperature",
-                        cell: true,
-                        controls: false,
-                        // type:"number",
-                        width: "120"
-                    },
                     // {
                     //     label: "温度单位",
                     //     prop: "temperatureUnit",
@@ -221,25 +229,17 @@ export default {
                     //     }]
                     // },
                     {
-                        label: "通风度",
-                        prop: "ventilation",
-                        cell: true,
-                        controls: false,
-                        // type:"number",
-                        width: "120"
-                    },
-                    {
                         label: "湿度",
                         prop: "humidity",
                         cell: true,
                         controls: false,
                         // type:"number",
-                        width: "120"
+                        width: 120
                     },
                     {
                         label: "SOC",
                         prop: "isSoc",
-                        width: '80',
+                        width: 80,
                         type: 'select',
                         cell: true,
                         dicData: [{
@@ -255,7 +255,7 @@ export default {
                         prop: "isOneway",
                         type: 'select',
                         cell: true,
-                      width: '80',
+                      width: 80,
                         dicData: [{
                             label: '否',
                             value: 0
@@ -267,7 +267,7 @@ export default {
                     {
                         label: "NOR",
                         prop: "nor",
-                        width: '80',
+                        width: 80,
                         type: 'select',
                         cell: true,
                         dicData: [{
@@ -281,7 +281,7 @@ export default {
                     {
                         label: "OOG",
                         prop: "oog",
-                        width: '80',
+                        width: 80,
                         type: 'select',
                         cell: true,
                         dicData: [{
@@ -295,7 +295,7 @@ export default {
                   {
                     label: "危险品",
                     prop: "isDanger",
-                    width: '80',
+                    width: 80,
                     type: 'select',
                     cell: true,
                     dicData: [{
@@ -310,6 +310,7 @@ export default {
                         label: "左超(CM)",
                         prop: "overLeft",
                         type: "number",
+                      width: 80,
                         cell: true,
                         controls: false,
                     },
@@ -317,6 +318,7 @@ export default {
                         label: "右超(CM)",
                         prop: "overRight",
                         type: "number",
+                      width: 80,
                         cell: true,
                         controls: false,
                     },
@@ -324,6 +326,7 @@ export default {
                         label: "前超(CM)",
                         prop: "overFront",
                         type: "number",
+                      width: 80,
                         cell: true,
                         controls: false,
                     },
@@ -331,6 +334,7 @@ export default {
                         label: "后超(CM)",
                         prop: "overBack",
                         type: "number",
+                      width: 80,
                         cell: true,
                         controls: false,
                     },
@@ -338,6 +342,7 @@ export default {
                         label: "超高(CM)",
                         prop: "overHeight",
                         type: "number",
+                      width: 80,
                         cell: true,
                         controls: false,
                     },
@@ -346,7 +351,7 @@ export default {
                         prop: "remarks",
                         span: 24,
                         type: 'textarea',
-                        width: "180",
+                        width: 180,
                         slot: true,
                         minRows: 3,
                     },

src/views/iosBasicData/SeafreightExportF/bills/assembly/edicode.vue

@@ -474,6 +474,19 @@ export default {
             if (!this.assemblyForm.id) {
                 return this.$message.error('请先保存数据');
             }
+            if(!this.assemblyForm.hmmEdi.emsDeclarationIdentification){
+              this.assemblyForm.hmmEdi.emsDeclarationIdentification = 'B'
+            }
+            if(!this.assemblyForm.hmmEdi.europeanLineSign){
+              this.assemblyForm.hmmEdi.europeanLineSign = 1
+            }
+            if(!this.assemblyForm.hmmEdi.manifestType){
+              this.assemblyForm.hmmEdi.manifestType = 'S'
+            }
+            if(!this.assemblyForm.hmmEdi.chemicalIdentification){
+              this.assemblyForm.hmmEdi.chemicalIdentification = 'N'
+            }
+
             this.dialogVisible = true
         },
         inHmmEdi() {

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/receiptNotice_ONE.vue

@@ -180,8 +180,22 @@
               </el-time-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="船代:" prop="corpCnName">
+          <el-col :span="10">
+            <el-form-item label="船名代码:" prop="reserve10">
+              <el-input
+                type="age"
+                style="width: 100%;"
+                v-model="documentForm.reserve10"
+                size="small"
+                autocomplete="off"
+                clearable
+                placeholder="船名代码"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="14">
+            <el-form-item label="船代:" prop="shippingAgencyCname">
               <el-input
                 type="age"
                 style="width: 100%;"
@@ -223,7 +237,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="联系人:" prop="corpCnName">
+            <el-form-item label="联系人:" prop="cyContacts">
               <el-input
                 type="age"
                 style="width: 100%;"
@@ -237,7 +251,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="联系电话:" prop="corpCnName">
+            <el-form-item label="联系电话:" prop="cyTel">
               <el-input type="age" style="width: 100%;" v-model="documentForm.cyTel" size="small" autocomplete="off" clearable placeholder="联系电话">
               </el-input>
             </el-form-item>

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

@@ -4,8 +4,8 @@
       <div class="customer-back">
         <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left" @click="backToList">返回列表 </el-button>
-        <el-button v-if="form.id && pageIds.length" type="text" @click="lastPage">上一票</el-button>
-        <el-button v-if="form.id && pageIds.length" type="text" @click="nextPage">下一票</el-button>
+        <el-button v-if="pageIds.length" type="text" @click="lastPage">上一票</el-button>
+        <el-button v-if="pageIds.length" type="text" @click="nextPage">下一票</el-button>
       </div>
       <div class="add-customer-btn">
         <!--<el-popover-->
@@ -29,7 +29,7 @@
           >一键校验收发通
         </el-button>
         <el-dropdown style="line-height: 0" v-if="importTemplate == 1">
-          <el-button size="small" type="warning" style="margin-right: 8px" :disabled="form.status > 0 || showLock || !form.id">
+          <el-button size="small" type="warning" style="margin-right: 8px" :disabled="detailData.seeDisabled || form.status > 0 || showLock || !form.id">
             导入模板<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
@@ -82,7 +82,7 @@
           style="margin-right: 8px"
           :disabled="detailData.seeDisabled || showLock"
           :loading="saveLoading"
-          @click="editCustomer"
+          @click="editCustomer('user-save')"
           >保 存
         </el-button>
         <el-button v-if="lockBtn && business == 1" size="small" type="success" style="margin-right: 8px" @click="applyUnlock">
@@ -742,7 +742,7 @@ export default {
             type: "select",
             dicData: [],
             disabled: false,
-            clearable: false,
+            clearable: true, // false,
             buttonIf: true,
             joinData: true,
             slot: "bcorps",
@@ -754,7 +754,7 @@ export default {
             },
             rules: [
               {
-                required: true,
+                required: false,
                 message: " ",
                 trigger: "blur"
               }
@@ -998,7 +998,7 @@ export default {
         },
         {
           name: "MBLNO",
-          value: "mblno"
+          value: "mblno,bookingNo"
         },
         // {
         //     name: 'booking NO',
@@ -1024,10 +1024,10 @@ export default {
           name: "装货港",
           value: "polCnName"
         },
-        {
-          name: "目的港",
-          value: "destinationNamePrint"
-        },
+        // {
+        //   name: "目的港",
+        //   value: "destinationNamePrint"
+        // },
         {
           name: "包装单位",
           value: "packingUnit"
@@ -1169,9 +1169,11 @@ export default {
   },
   methods: {
     lastPage() {
+      this.editCustomer()
+
       if (this.pageIds.length) {
         const index = this.pageIds.indexOf(this.form.id);
-        if (index == 0) {
+        if (index <= 0) {
           return this.$message.error("没有上一票了");
         }
         const lastIndex = index - 1;
@@ -1188,6 +1190,8 @@ export default {
       }
     },
     nextPage() {
+      this.editCustomer()
+
       if (this.pageIds.length) {
         const index = this.pageIds.indexOf(this.form.id);
         if (this.pageIds[this.pageIds.length - 1] == this.form.id) {
@@ -1278,6 +1282,8 @@ export default {
       let changed =
         !this.form.id ||
         contrastObj(this.form, this.oldForm) ||
+        contrastObj(this.form.hmmEdi, this.oldForm.hmmEdi) ||
+        contrastObj(this.form.detail, this.oldForm.detail) ||
         contrastList(this.form.preContainersList, this.oldForm.preContainersList) ||
         contrastList(this.form.containersList, this.oldForm.containersList) ||
         contrastList(this.form.feeCenterListC, this.oldForm.feeCenterListC) ||
@@ -2279,9 +2285,10 @@ export default {
           // 如果点击清空按钮把值赋值为空
           this.form.corpCnName = "";
           this.form.corpEnName = "";
-          this.form.corpId = "";
+          this.form.corpId = 0;
           this.form.corpCode = "";
           this.form.shortName = "";
+          this.form.corpShortName = "";
           this.form.corpSource = "";
           if (this.business == 1) {
             this.form.accountPeriodType = "";
@@ -2305,6 +2312,7 @@ export default {
             this.form.corpId = item.id;
             this.form.corpCode = item.code;
             this.form.shortName = item.shortName;
+            this.form.corpShortName = item.shortName;
             this.form.corpSource = item.corpSource;
             if (this.business == 1) {
               agreementpriceList({ corpId: item.id, status: 0, validDate: getCurrentDate("dateTime") }).then(res => {
@@ -2855,6 +2863,10 @@ export default {
           this.$emit(status);
         }
 
+        if(status == "user-save") {
+          this.$message.success("未更改，无需保存！");
+        }
+
         return
         // 未更改，无需保存
       }

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

@@ -42,11 +42,11 @@
           <el-button type="primary" size="small" plain @click="CopyDocumentsfun">复制单据 </el-button>
           <el-button type="primary" size="small" @click="allClick('修改单据类型')">修改单据类型 </el-button>
           <el-button type="success" size="small" plain @click="increaseMawb">分单->主单 </el-button>
-          <el-button type="warning" size="small" plain v-if="query.billStatus == 0 || query.billStatus == 999" @click="Disembarkingfun(4)"
+          <el-button type="warning" size="small" plain v-if="query.billStatus == 0 || query.billStatus == 888" @click="Disembarkingfun(4)"
             >暂停</el-button
           >
           <el-button type="primary" size="small" plain v-if="query.billStatus == 4" @click="revokeWithdrawalfun(4)">撤销暂停 </el-button>
-          <el-button type="warning" size="small" plain v-if="query.billStatus == 0 || query.billStatus == 999" @click="Disembarkingfun(1)"
+          <el-button type="warning" size="small" plain v-if="query.billStatus == 0 || query.billStatus == 888" @click="Disembarkingfun(1)"
             >退舱</el-button
           >
           <el-button type="primary" size="small" plain v-if="query.billStatus == 1" @click="revokeWithdrawalfun(1)">撤销退舱 </el-button>
@@ -89,7 +89,8 @@
           </el-dropdown>
           <div style="margin-top: 10px">
             <el-tabs type="card" v-model="query.billStatus" @tab-click="handleClick">
-              <el-tab-pane label="全部" name="999"></el-tab-pane>
+<!--              <el-tab-pane label="全部" name="999"></el-tab-pane>-->
+              <el-tab-pane label="处理中" name="888"></el-tab-pane>
               <el-tab-pane label="接单" name="0">
                 <span slot="label">接单</span>
               </el-tab-pane>
@@ -522,7 +523,7 @@ export default {
       etaList: [defaultDate(1)[0] + " 00:00", defaultDate(1)[1] + " 23:59"],
       // 表格的检索条件
       query: {
-        billStatus: "999",
+        billStatus: "888", // 999 全部 888 处理中
         billSort: "3"
       },
       // 弹窗的搜索项
@@ -615,7 +616,7 @@ export default {
           {
             label: "MB/L NO",
             prop: "mblno",
-            width: "160",
+            width: 160,
             overHidden: true,
             search: true,
             span: 6,
@@ -627,7 +628,7 @@ export default {
           {
             label: "booking NO",
             prop: "bookingNo",
-            width: "160",
+            width: 160,
             overHidden: true,
             search: true,
             span: 6,
@@ -639,7 +640,7 @@ export default {
           {
             label: "HB/L NO",
             prop: "hblno",
-            width: "160",
+            width: 160,
             overHidden: true,
             search: true,
             span: 6,
@@ -651,7 +652,7 @@ export default {
           {
             label: "M/PayMode",
             prop: "mpaymode",
-            width: "140",
+            width: 140,
             filterable: true,
             filters: true,
             sortable: true,
@@ -660,7 +661,7 @@ export default {
           {
             label: "H/PayMode",
             prop: "hpaymode",
-            width: "140",
+            width: 140,
             filterable: true,
             filters: true,
             sortable: true,
@@ -672,7 +673,7 @@ export default {
             type: "select",
             search: true,
             span: 6,
-            width: "140",
+            width: 140,
             filterable: true,
             filters: true,
             sortable: true,
@@ -696,7 +697,7 @@ export default {
           {
             label: "单据编号",
             prop: "billNo",
-            width: "120",
+            width: 120,
             overHidden: true,
             search: true,
             span: 6,
@@ -730,7 +731,7 @@ export default {
             label: "船名",
             prop: "vesselEnName",
             overHidden: true,
-            width: "120",
+            width: 120,
             filterable: true,
             filters: true,
             sortable: true
@@ -738,7 +739,7 @@ export default {
           {
             label: "航次",
             prop: "voyageNo",
-            width: "100",
+            width: 100,
             overHidden: true,
             search: true,
             span: 6,
@@ -750,7 +751,7 @@ export default {
           {
             label: "REF MBLNO",
             prop: "refno",
-            width: "120",
+            width: 120,
             overHidden: true,
             search: true,
             span: 6,
@@ -765,7 +766,7 @@ export default {
             prop: "etd",
             searchProp: "etdList",
             type: "date",
-            width: "120",
+            width: 120,
             unlinkPanels: true,
             searchRange: true,
             overHidden: true,
@@ -782,7 +783,7 @@ export default {
           {
             label: "到港日期",
             prop: "eta",
-            width: "80",
+            width: 80,
             overHidden: true,
             searchProp: "etaList",
             type: "date",
@@ -824,7 +825,7 @@ export default {
             label: "船公司",
             prop: "carrierShortName",
             overHidden: true,
-            width: "140",
+            width: 140,
             filterable: true,
             filters: true,
             sortable: true
@@ -832,7 +833,7 @@ export default {
           {
             label: "装货港",
             prop: "polEnName",
-            width: "140",
+            width: 140,
             filterable: true,
             filters: true,
             sortable: true,
@@ -841,7 +842,7 @@ export default {
           {
             label: "卸货港",
             prop: "podEnName",
-            width: "140",
+            width: 140,
             filterable: true,
             filters: true,
             sortable: true,
@@ -850,7 +851,7 @@ export default {
           {
             label: "目的港",
             prop: "destinationName",
-            width: "120",
+            width: 120,
             overHidden: true,
             type: "select",
             filterable: true,
@@ -870,13 +871,13 @@ export default {
           // {
           //     label: "交货地",
           //     prop: "placeDeliveryName",
-          //     width: "120",
+          //     width: 120,
           //     overHidden: true,
           // },
           {
             label: "航线",
             prop: "lineCnName",
-            width: "120",
+            width: 120,
             overHidden: true,
             type: "select",
             filterable: true,
@@ -896,7 +897,7 @@ export default {
           {
             label: "场站",
             prop: "cyCnName",
-            width: "160",
+            width: 160,
             overHidden: true,
             type: "select",
             filterable: true,
@@ -921,13 +922,13 @@ export default {
             filterable: true,
             filters: true,
             sortable: true,
-            width: "140",
+            width: 140,
             overHidden: true
           },
           {
             label: "箱型/箱量",
             prop: "quantityCntrDescr",
-            width: "140",
+            width: 140,
             filterable: true,
             filters: true,
             sortable: true,
@@ -936,7 +937,7 @@ export default {
           // {
           //   label: "箱量",
           //   prop: "CntrDescr",
-          //     width:"120",
+          //     width: 120,
           //     overHidden:true,
           // },
           {
@@ -946,7 +947,7 @@ export default {
             filterable: true,
             filters: true,
             sortable: true,
-            width: "140",
+            width: 140,
             dicData: [
               {
                 label: "公司",
@@ -969,7 +970,7 @@ export default {
           {
             label: "来源详情",
             prop: "srcCnName",
-            width: "140",
+            width: 140,
             overHidden: true,
             search: true,
             span: 6,
@@ -985,7 +986,7 @@ export default {
             filterable: true,
             filters: true,
             sortable: true,
-            width: "140",
+            width: 140,
             dicData: [
               {
                 label: "整箱",
@@ -1005,7 +1006,7 @@ export default {
             filterable: true,
             filters: true,
             sortable: true,
-            width: "140",
+            width: 140,
             dicData: [
               {
                 label: "普货",
@@ -1025,7 +1026,7 @@ export default {
           {
             label: "创建部门",
             prop: "createDeptName",
-            width: "140",
+            width: 140,
             overHidden: true,
             type: "tree",
             dicUrl: "/api/blade-system/dept/tree",
@@ -1044,7 +1045,7 @@ export default {
           {
             label: "订舱代理",
             prop: "bookingAgentCnName",
-            width: "120",
+            width: 120,
             overHidden: true,
             type: "select",
             filterable: true,
@@ -1064,7 +1065,7 @@ export default {
           {
             label: "收货人",
             prop: "hconsigneeCnName",
-            width: "120",
+            width: 120,
             overHidden: true,
             type: "select",
             filterable: true,
@@ -1084,7 +1085,7 @@ export default {
           {
             label: "签单方式",
             prop: "issueType",
-            width: "120",
+            width: 120,
             overHidden: true,
             type: "select",
             // audit_status_los
@@ -1103,7 +1104,7 @@ export default {
           {
             label: "唛头",
             prop: "marks",
-            width: "180",
+            width: 180,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1115,7 +1116,7 @@ export default {
             filterable: true,
             filters: true,
             sortable: true,
-            width: "140",
+            width: 140,
             overHidden: true
           },
           {
@@ -1124,13 +1125,13 @@ export default {
             filterable: true,
             filters: true,
             sortable: true,
-            width: "140",
+            width: 140,
             overHidden: true
           },
           // {
           //     label: "净重 (KGM)",
           //     prop: "netWeight",
-          //   width: "140",
+          //   width: 140,
           //   filterable: true,
           //   filters: true,
           //   sortable: true,
@@ -1139,7 +1140,7 @@ export default {
           {
             label: "体积 (CBM)",
             prop: "measurement",
-            width: "140",
+            width: 140,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1148,7 +1149,7 @@ export default {
           {
             label: "TEU箱数",
             prop: "teu",
-            width: "140",
+            width: 140,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1157,7 +1158,7 @@ export default {
           {
             label: "V20",
             prop: "quantityV20",
-            width: "100",
+            width: 100,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1166,7 +1167,7 @@ export default {
           {
             label: "V40",
             prop: "quantityV40",
-            width: "100",
+            width: 100,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1175,7 +1176,7 @@ export default {
           {
             label: "40HC",
             prop: "quantityV40hc",
-            width: "100",
+            width: 100,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1184,7 +1185,7 @@ export default {
           {
             label: "V45",
             prop: "quantityV45",
-            width: "100",
+            width: 100,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1193,7 +1194,7 @@ export default {
           {
             label: "V48",
             prop: "quantityV48",
-            width: "100",
+            width: 100,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1241,38 +1242,38 @@ export default {
           // {
           //   label: "应收(CNY)",
           //   prop: "amountDr",
-          //     width: "160",
+          //     width: 160,
           //     overHidden:true,
           // },
           // {
           //   label: "应付(CNY)",
           //   prop: "amountCr",
-          //     width: "160",
+          //     width: 160,
           //     overHidden:true,
           // },
           // {
           //   label: "利润(CNY)",
           //   prop: "amountProfit",
-          //     width: "160",
+          //     width: 160,
           //     overHidden:true,
           // },
           // {
           //     // label: "综合 USD 应付(USD) - 非 USD 外币转换为 USD",
           //   label: "综合应付(USD)",
           //   prop: "amountCrUsd",
-          //     width: "120",
+          //     width: 120,
           //     overHidden:true,
           // },
           // {
           //   label: "综合利润(USD)",
           //   prop: "amountProfitUsd",
-          //     width: "120",
+          //     width: 120,
           //     overHidden:true,
           // },
           {
             label: "合计应收(CNY )",
             prop: "amountDrLoc",
-            width: "160",
+            width: 160,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1281,7 +1282,7 @@ export default {
           {
             label: "合计应付(CNY)",
             prop: "amountCrLoc",
-            width: "160",
+            width: 160,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1290,7 +1291,7 @@ export default {
           {
             label: "合计利润(CNY)",
             prop: "amountProfitLoc",
-            width: "160",
+            width: 160,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1299,7 +1300,7 @@ export default {
           {
             label: "付费申请状态",
             prop: "checkCrStatusDescr",
-            width: "160",
+            width: 160,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1308,7 +1309,7 @@ export default {
           {
             label: "应收对账状态",
             prop: "checkDrStatusDescr",
-            width: "160",
+            width: 160,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1317,7 +1318,7 @@ export default {
           // {
           //   label: "应付对账状态",
           //   prop: "checkCrStatusDescr",
-          //     width:"160",
+          //     width:160,
           //     overHidden:true,
           // },
           {
@@ -1342,7 +1343,7 @@ export default {
                 value: "结清"
               }
             ],
-            width: "160",
+            width: 160,
             searchLabelWidth: "100",
             overHidden: true,
             searchOrder: 21
@@ -1369,7 +1370,7 @@ export default {
                 value: "结清"
               }
             ],
-            width: "160",
+            width: 160,
             searchLabelWidth: "100",
             overHidden: true,
             searchOrder: 22
@@ -1377,7 +1378,7 @@ export default {
           {
             label: "销项发票状态",
             prop: "invoiceDrStatusDescr",
-            width: "160",
+            width: 160,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1429,7 +1430,7 @@ export default {
             label: "创建人",
             prop: "createUserName",
             search: true,
-            width: "140",
+            width: 140,
             rules: [
               {
                 required: true,
@@ -1446,7 +1447,7 @@ export default {
           {
             label: "创建时间",
             prop: "createTime",
-            width: "160",
+            width: 160,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1459,7 +1460,7 @@ export default {
             filterable: true,
             filters: true,
             sortable: true,
-            width: "160",
+            width: 160,
             dicData: [
               {
                 label: "未发送",
@@ -1481,7 +1482,7 @@ export default {
               label: "dictValue",
               value: "dictKey"
             },
-            width: "140",
+            width: 140,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1496,7 +1497,7 @@ export default {
               label: "dictValue",
               value: "dictKey"
             },
-            width: "140",
+            width: 140,
             filterable: true,
             filters: true,
             sortable: true,
@@ -1509,7 +1510,7 @@ export default {
             search: true,
             searchOrder: 26,
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=audit_status_los",
-            width: "140",
+            width: 140,
             props: {
               label: "dictValue",
               value: "dictKey"
@@ -1600,13 +1601,13 @@ export default {
           {
             label: "卸货港",
             prop: "podCnName",
-            width: "120",
+            width: 120,
             overHidden: true
           },
           {
             label: "单据编号",
             prop: "billNo",
-            width: "160",
+            width: 160,
             overHidden: true
           },
           {
@@ -1647,7 +1648,7 @@ export default {
           {
             label: "单据日期",
             prop: "billDate",
-            width: "150",
+            width: 150,
             overHidden: true
           }
         ]
@@ -1708,14 +1709,6 @@ export default {
     // 获取当前登录人个人信息
     this.saberUserInfo = JSON.parse(localStorage.getItem("saber-userInfo")).content;
 
-    // this.optionBack.column.forEach((col, index) => {
-    //   col.index = index + 1;
-    //   col.filters = false;
-    // });
-    // this.mawbOptionBack.column.forEach((col, index) => {
-    //   col.index = index + 1;
-    // });
-
     this.option = await this.getColumnData(this.getColumnName(309), this.optionBack);
     this.mawbOption = await this.getColumnData(this.getColumnName(309.7), this.mawbOptionBack); // 主单列表
 
@@ -1726,12 +1719,7 @@ export default {
     // if (this.$route.query.id) {
     //     this.rowCellfun(this.$route.query.id)
     // }
-    // this.option = await this.getColumnData(this.getColumnName(309), this.optionBack);
-    // if (localStorage.getItem(this.getColumnName(309))) {
-    //     this.optionBack = JSON.parse(
-    //         localStorage.getItem(this.getColumnName(309))
-    //     );
-    // }
+
     this.billStatusWorkDictsfun(); // 获取业务状态字典数据
     this.accountStatusWorkDictsfun(); // 获取财务状态字典数据
     this.statusWorkDictsfun(); // 业务审核类型
@@ -2167,6 +2155,11 @@ export default {
       // if (this.query.billStatus == 4) {
       //     this.query.billStatus = null;
       // }
+      this.page = {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      }
       this.onLoad(this.page, this.query);
     },
     // 获取委托人数据
@@ -2424,6 +2417,10 @@ export default {
     // 新增弹窗开启
     addbtnfun(type) {
       this.pageIds = [];
+      this.data.forEach(item => {
+        this.pageIds.push(item.id);
+      });
+
       this.detailData.seeDisabled = false;
       this.detailData.billType = type;
       // this.detailData.copyId=this.selectionList[0].id
@@ -2702,8 +2699,12 @@ export default {
       done();
     },
     searchReset() {
-      this.query = {};
-      this.query.billSort = this.query.billSort ? this.query.billSort : "3";
+      let q = JSON.parse(JSON.stringify(this.query));
+      this.query = {
+        billStatus: q.billStatus ? q.billStatus : "888",
+        billSort: q.billSort ? q.billSort : "3",
+      };
+      // this.query.billSort = this.query.billSort ? this.query.billSort : "3";
       this.onLoad(this.page);
     },
     // 搜索
@@ -2826,7 +2827,6 @@ export default {
        * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
        * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
        */
-      // wfg option -> optionBack ?
       const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
       if (inSave) {
         this.$message.success("保存成功");
@@ -2837,8 +2837,6 @@ export default {
     },
     //自定义列重置
     async resetColumn(ref, option, optionBack, code) {
-      console.log("resetColumn.option", option, this[option]);
-      console.log("resetColumn.optionBack", optionBack, this[optionBack]);
       this[option] = this[optionBack];
       const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (inSave) {

src/views/system/businessUnlocking/index.vue

@@ -1,26 +1,31 @@
 <template>
   <div>
     <basic-container>
-        <!--                 @resetColumn="resetColumn('crud', 'option', 'optionBack', 458)"-->
-        <!--                 @saveColumn="saveColumn('crud', 'option', 'optionBack', 458)"-->
-      <avue-crud :option="option" :data="dataList" ref="crud" v-model="form" :page.sync="page"
-                 :search.sync="search"
-                 :table-loading="loading"
-                 @search-change="searchChange"
-                 @current-change="currentChange"
-                 @size-change="sizeChange"
-                 @refresh-change="refreshChange"
-                 @on-load="onLoad"
-        @selection-change="selectionChange">
+      <!--                 @resetColumn="resetColumn('crud', 'option', 'optionBack', 458)"-->
+      <!--                 @saveColumn="saveColumn('crud', 'option', 'optionBack', 458)"-->
+      <avue-crud
+        :option="option"
+        :data="dataList"
+        ref="crud"
+        v-model="form"
+        :page.sync="page"
+        :search.sync="search"
+        :table-loading="loading"
+        @search-change="searchChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
+        @on-load="onLoad"
+        @selection-change="selectionChange"
+      >
         <template slot="menu" slot-scope="{ row, index }">
           <!-- <el-button v-if="row.locked==0" type="text" icon="el-icon-unlock" size="small" @click="rowUnlock(row, index)">加锁</el-button> -->
           <!-- <el-button v-if="row.locked==1" type="text" icon="el-icon-unlock" size="small" @click="rowOnlock(row, index)">解锁</el-button> -->
-          <el-button :disabled="row.locked != 0" type="text" icon="el-icon-delete" size="small"
-            @click="rowDel(row, index)">删除</el-button>
+          <el-button v-if="row.locked == 0" type="text" icon="el-icon-unlock" size="small" @click="allClick(row)">解锁</el-button>
+          <el-button :disabled="row.locked != 0" type="text" icon="el-icon-delete" size="small" @click="rowDel(row, index)">删除</el-button>
         </template>
         <template slot="menuLeft">
-          <el-button type="primary" size="small" @click="allClick" :disabled="selectionList.length == 0">一键解锁
-          </el-button>
+          <el-button type="primary" size="small" @click="allClick()" :disabled="selectionList.length == 0">一键解锁 </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -38,9 +43,9 @@ export default {
       selectionList: [],
       option: {},
       optionBack: {
-        height: 'auto',
+        height: "auto",
         calcHeight: 30,
-        menuWidth: 80,
+        menuWidth: 120,
         tip: false,
         searchShow: true,
         searchMenuSpan: 6,
@@ -52,21 +57,21 @@ export default {
         delBtn: false,
         selection: true,
         searchIcon: true,
-        align: 'center',
+        align: "center",
         searchIndex: 4,
         column: [
           {
             label: "业务编号",
             prop: "srcBillNo",
-            width: "120",
+            width: 120,
             search: true,
             overHidden: true,
-              sortable: true
+            sortable: true
           },
           {
             label: "单据日期",
             prop: "billDate",
-            width: "120",
+            width: 120,
             overHidden: true,
             search: true,
             searchProp: "billDateList",
@@ -76,67 +81,67 @@ export default {
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             searchDefaultTime: ["00:00:00", "23:59:59"],
-              sortable: true
+            sortable: true
           },
           {
             label: "船名",
             prop: "srcVesselEnName",
-            width: "120",
+            width: 120,
             overHidden: true,
-              search: true,
-              sortable: true
+            search: true,
+            sortable: true
           },
           {
             label: "航次",
             prop: "srcVoyageNo",
-            width: "120",
+            width: 120,
             overHidden: true,
-              search: true,
-              sortable: true
+            search: true,
+            sortable: true
           },
           {
             label: "MBLNO",
             prop: "srcMblno",
-            width: "120",
+            width: 120,
             overHidden: true,
-              search: true,
-              sortable: true
+            search: true,
+            sortable: true
           },
           {
             label: "Reference",
             prop: "rcRefno",
-            width: "120",
+            width: 120,
             overHidden: true,
-              search: true,
-              sortable: true
+            search: true,
+            sortable: true
           },
           {
             label: "加解锁操作时间",
             prop: "lockedTime",
-            width: "120",
+            width: 120,
             overHidden: true,
-              sortable: true
+            sortable: true
           },
           {
             label: "累计已解锁次数",
             prop: "unlockedCount",
-            width: "120",
-            overHidden: true,
+            width: 120,
+            overHidden: true
           },
           {
             label: "操作人",
             prop: "operatorName",
-            width: "120",
-            overHidden: true,
+            width: 120,
+            overHidden: true
           },
-            {
-                label: "业务类型",
-                prop: "businessTypeName",
-                width: "120",
-                search: true,
-                overHidden: true,
-                sortable: true
-            },
+          {
+            label: "业务类型",
+            prop: "businessTypeName",
+            width: 120,
+            search: true,
+            overHidden: true,
+            sortable: true
+          }
         ]
       },
       dataList: [],
@@ -147,7 +152,7 @@ export default {
         total: 0
       },
       search: {},
-      loading: false,
+      loading: false
     };
   },
   async created() {
@@ -167,7 +172,7 @@ export default {
   },
   methods: {
     selectionChange(list) {
-      this.selectionList = list
+      this.selectionList = list;
     },
     searchChange(params, done) {
       this.onLoad(this.page, params);
@@ -200,7 +205,7 @@ export default {
             this.$set(item, "loading", true);
           });
           this.$nextTick(() => {
-            this.$refs.crud.refreshTable()
+            this.$refs.crud.refreshTable();
           });
         })
         .finally(() => {
@@ -212,16 +217,15 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      })
-        .then(() => {
-          lockRemove({ids:row.id}).then(res => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          })
-        })
+      }).then(() => {
+        lockRemove({ ids: row.id }).then(res => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+      });
     },
     // 解锁
     rowUnlock(row, index) {
@@ -251,26 +255,40 @@ export default {
         this.onLoad(this.page, this.search);
       });
     },
-    allClick() {
-      let arr = []
-      let ids = null
-      this.selectionList.forEach(e => {
-        arr.push(e.id)
-      })
-      ids = arr.join(',')
+    allClick(row) {
+      let arr = [];
+      let ids = null;
+      if (row) {
+        arr.push(row.id);
+      } else {
+        this.selectionList.forEach(e => {
+          if (e.locked == 0) {
+            arr.push(e.id);
+          }
+        });
+      }
+
+      if (arr.length == 0) {
+        this.$message.warning("请勾选未解锁的业务！");
+        return;
+      }
+
+      console.log(arr);
+
+      ids = arr.join(",");
       // this.$confirm("是否确认解锁？", "提示", {
       //   confirmButtonText: "确定",
       //   cancelButtonText: "取消",
       //   type: "warning"
       // }).then(() => {
-        unLock({ ids: ids }).then(() => {
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          this.page.currentPage = 1;
-          this.onLoad(this.page, { parentId: 0 });
+      unLock({ ids: ids }).then(() => {
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
+        this.page.currentPage = 1;
+        this.onLoad(this.page, { parentId: 0 });
+      });
       // })
     },
     //自定义列保存
@@ -285,7 +303,7 @@ export default {
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.searchReset()
+        this.searchReset();
       }
     },
     //自定义列重置
@@ -295,9 +313,9 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.searchReset()
+        this.searchReset();
       }
-    },
+    }
   }
 };
 </script>

src/views/wel/index.vue

@@ -93,8 +93,14 @@ export default {
             localStorage.setItem('sysitemType', this.billType)
             localStorage.setItem('sysitemData', JSON.stringify(res.data.data))
         });
+        isProcurement({ "param": "lock.term.global" }).then(res => {
+            localStorage.setItem('lockTermGlobal', res.data.data)
+        })
         isProcurement({ "param": "lock.term.Days" }).then(res => {
-              localStorage.setItem('lockTermDays', res.data.data)
+            localStorage.setItem('lockTermDays', res.data.data)
+        })
+        isProcurement({ "param": "second.lock.term.Days" }).then(res => {
+            localStorage.setItem('secondLockTermDays', res.data.data)
         })
         getLazyList().then(res => {
           console.log("user-Information", res)
@@ -105,7 +111,6 @@ export default {
                 localStorage.setItem('areaTypeTree', JSON.stringify(res.data.data));
             })
         }
-
     },
     components: {
         tireindex,