陆运修改 收付对账 货代修改禅道问题

src/views/approveDataH/configuration/mainList.json

@@ -3,7 +3,7 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 24,
+  "searchMenuSpan": 8,
   "dialogWidth": "60%",
   "align": "center",
   "height": "auto",
@@ -195,6 +195,22 @@
       "overHidden": true,
       "width": 100,
       "index": 17
+    },
+    {
+      "label": "业务员",
+      "prop": "srcCnName",
+      "search": true,
+      "type": "select",
+      "hide": true,
+      "showColumn": false,
+      "props": {
+        "label": "name",
+        "value": "name"
+      },
+      "dicData":[],
+      "overHidden": true,
+      "width": 100,
+      "index": 18
     }
   ]
 }

src/views/approveDataH/index.vue

@@ -131,7 +131,7 @@ import { finstlbillsDetail } from "../../api/iosBasicData/finstlbills";
 import { reportsGetReportData } from "@/api/iosBasicData/reports";
 import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
 import { getList as getreportsList } from "@/api/iosBasicData/reports";
-
+import { selectListLos } from "@/api/approval/processConfig";
 let previousRouterName = "";
 let checkRefresh = "";
 export default {
@@ -208,6 +208,10 @@ export default {
         this.findObject(this.option.column, "processType").dicData =
           res.data.data;
       });
+      selectListLos('业务员').then(res => {
+        this.findObject(this.option.column, "srcCnName").dicData =
+          res.data.data;
+      });
     });
     // 供应商
     // corpsDescListAll({corpType: "GYS"}).then(res => {

src/views/financialManagement/paymentSettleFleet/paymentSettleDetailsPage.vue

@@ -731,26 +731,26 @@ export default {
     },
     // 跳转页面
     jumpPage(row, index) {
-      if (this.category == 2) {
-        this.$router.$avueRouter.closeTag("/businessManagement/salesOrder/index");
+      if (row.srcType == 1) {
+        this.$router.$avueRouter.closeTag("/landTransportation/dispatchingCars/index");
         this.$router.push({
-          path: "/businessManagement/salesOrder/index",
+          path: "/landTransportation/dispatchingCars/index",
           query: {
             params: row.srcParentId
           },
         });
-      } else if (this.category == 3) {
-        this.$router.$avueRouter.closeTag("/salesManagement/salesContract/index");
+      } else if (row.srcType == 2) {
+        this.$router.$avueRouter.closeTag("/landTransportation/dispatchingCars/index");
         this.$router.push({
-          path: "/salesManagement/salesContract/index",
+          path: "/landTransportation/dispatchingCars/index",
           query: {
             params: row.srcParentId
           },
         });
-      } else if (this.category == 4) {
-        this.$router.$avueRouter.closeTag("/exportTrade/salesContract/index");
+      } else if (this.srcType == 3) {
+        this.$router.$avueRouter.closeTag("/landTransportation/bulkCargo/index");
         this.$router.push({
-          path: "/exportTrade/salesContract/index",
+          path: "/landTransportation/bulkCargo/index",
           query: {
             params: row.srcParentId
           },

src/views/financialManagement/receiptSettleFleet/receiptSettleDetailsPage.vue

@@ -732,26 +732,26 @@ export default {
     },
     // 跳转页面
     jumpPage(row, index) {
-      if (this.category == 2) {
-        this.$router.$avueRouter.closeTag("/businessManagement/salesOrder/index");
+      if (row.srcType == 1) {
+        this.$router.$avueRouter.closeTag("/landTransportation/dispatchingCars/index");
         this.$router.push({
-          path: "/businessManagement/salesOrder/index",
+          path: "/landTransportation/dispatchingCars/index",
           query: {
             params: row.srcParentId
           },
         });
-      } else if (this.category == 3) {
-        this.$router.$avueRouter.closeTag("/salesManagement/salesContract/index");
+      } else if (row.srcType == 2) {
+        this.$router.$avueRouter.closeTag("/landTransportation/dispatchingCars/index");
         this.$router.push({
-          path: "/salesManagement/salesContract/index",
+          path: "/landTransportation/dispatchingCars/index",
           query: {
             params: row.srcParentId
           },
         });
-      } else if (this.category == 4) {
-        this.$router.$avueRouter.closeTag("/exportTrade/salesContract/index");
+      } else if (this.srcType == 3) {
+        this.$router.$avueRouter.closeTag("/landTransportation/bulkCargo/index");
         this.$router.push({
-          path: "/exportTrade/salesContract/index",
+          path: "/landTransportation/bulkCargo/index",
           query: {
             params: row.srcParentId
           },

src/views/financialManagement/reconciliationC/configuration/mainList.json

@@ -70,7 +70,7 @@
       "index": 6
     },
     {
-      "label": "状态",
+      "label": "对账状态",
       "prop": "financeStatus",
       "type": "select",
       "search": true,
@@ -78,16 +78,12 @@
       "index": 7,
       "dicData": [
         {
-          "label": "暂存",
-          "value":"暂存"
+          "label": "未对账",
+          "value":"未对账"
         },
         {
-          "label": "审核中",
-          "value": "审核中"
-        },
-        {
-          "label": "审核完成",
-          "value": "审核完成"
+          "label": "已对账",
+          "value": "已对账"
         }
       ]
     },

src/views/financialManagement/reconciliationC/detailsPage.vue

@@ -12,7 +12,7 @@
             :loading="buttonLoading">发送消息</el-button>
           <el-button type="warning" size="small" class="el-button--small-yh" :loading="buttonLoading"
             :disabled="!form.id || editDisable" v-if="form.id" @click.stop="confirmSettlement(financeDisabled)">{{
-              financeDisabled ? "付费" : "撤销付费" }}
+              financeDisabled ? "确认对账" : "撤销对账" }}
           </el-button>
           <el-button class="el-button--small-yh" type="primary" size="small" :loading="buttonLoading"
             :disabled="!financeDisabled || editDisable" @click.stop="saveSettlement">保存数据
@@ -113,7 +113,7 @@
       </el-dialog>
     </div>
     <messagePost v-if="messageVisble" ref="messagePost" @closeDialog="closeDialog"></messagePost>
-    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="吉永-付款" @onClose="onClose()" />
+    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="应付对账" @onClose="onClose()" />
   </div>
 </template>
 
@@ -260,7 +260,7 @@ export default {
       },
       billDetailDialog: false,
       financeDisabled: true,
-      billType: "付费",
+      billType: "对账付",
       // 明细本次金额总计
       allAmount: 0,
       // 消息弹窗
@@ -479,8 +479,8 @@ export default {
       if (!this.form.corpId) return this.$message.error('往来单位不能为空')
       this.$refs["form"].validate((valid, done) => {
         done();
-        if (valid && this.verificationData('付费')) {
-          this.$confirm("是否确认" + (this.financeDisabled ? '付费' : '撤销付费'), "提示", {
+        if (valid && this.verificationData('对账付')) {
+          this.$confirm("是否确认" + (this.financeDisabled ? '确认对账' : '撤销对账'), "提示", {
             confirmButtonText: "确认",
             cancelButtonText: "取消",
             type: "warning",
@@ -508,13 +508,13 @@ export default {
               } else if (Number(this.allAmount) > 0 && (Number(this.form.amount) < Number(this.allAmount))) {
                 this.form.caseOverPayment = (Number(this.allAmount) - Number(this.form.amount)).toFixed(2)
                 if (Number(this.form.caseOverPayment) > Number(this.form.overPayment)) {
-                  return this.$message.error('溢付款余额不足，无法付费')
+                  return this.$message.error('溢付款余额不足，无法对账')
                 }
               }
             }
             const params = {
               ...this.form,
-              billType: "付费",
+              billType: "对账付",
               itemsList: this.dataList
             }
             this.buttonLoading = true
@@ -611,7 +611,7 @@ export default {
         this.dataList = data.itemsList
         this.oldDataList = this.deepClone(data.itemsList)
       }
-      if (type == '付费') {
+      if (type == '对账付') {
         this.confirmSettlement()
       }
     },
@@ -726,26 +726,26 @@ export default {
     },
     // 跳转页面
     jumpPage(row, index) {
-      if (this.category == 2) {
-        this.$router.$avueRouter.closeTag("/businessManagement/salesOrder/index");
+      if (row.srcType == 1) {
+        this.$router.$avueRouter.closeTag("/landTransportation/dispatchingCars/index");
         this.$router.push({
-          path: "/businessManagement/salesOrder/index",
+          path: "/landTransportation/dispatchingCars/index",
           query: {
             params: row.srcParentId
           },
         });
-      } else if (this.category == 3) {
-        this.$router.$avueRouter.closeTag("/salesManagement/salesContract/index");
+      } else if (row.srcType == 2) {
+        this.$router.$avueRouter.closeTag("/landTransportation/dispatchingCars/index");
         this.$router.push({
-          path: "/salesManagement/salesContract/index",
+          path: "/landTransportation/dispatchingCars/index",
           query: {
             params: row.srcParentId
           },
         });
-      } else if (this.category == 4) {
-        this.$router.$avueRouter.closeTag("/exportTrade/salesContract/index");
+      } else if (this.srcType == 3) {
+        this.$router.$avueRouter.closeTag("/landTransportation/bulkCargo/index");
         this.$router.push({
-          path: "/exportTrade/salesContract/index",
+          path: "/landTransportation/bulkCargo/index",
           query: {
             params: row.srcParentId
           },

src/views/financialManagement/reconciliationD/configuration/mainList.json

@@ -70,7 +70,7 @@
       "index": 6
     },
     {
-      "label": "状态",
+      "label": "对账状态",
       "prop": "financeStatus",
       "type": "select",
       "search": true,
@@ -78,16 +78,12 @@
       "index": 7,
       "dicData": [
         {
-          "label": "暂存",
-          "value":"暂存"
+          "label": "未对账",
+          "value":"未对账"
         },
         {
-          "label": "审核中",
-          "value": "审核中"
-        },
-        {
-          "label": "审核完成",
-          "value": "审核完成"
+          "label": "已对账",
+          "value": "已对账"
         }
       ]
     },

src/views/financialManagement/reconciliationD/detailsPage.vue

@@ -12,7 +12,7 @@
             :loading="buttonLoading">发送消息</el-button>
           <el-button type="warning" size="small" class="el-button--small-yh" :loading="buttonLoading"
             :disabled="!form.id || editDisable" v-if="form.id" @click.stop="confirmSettlement(financeDisabled)">{{
-              financeDisabled ? "收费" : "撤销收费" }}
+              financeDisabled ? "确认对账" : "撤销对账" }}
           </el-button>
           <el-button class="el-button--small-yh" type="primary" size="small" :loading="buttonLoading"
             :disabled="!financeDisabled || editDisable" @click.stop="saveSettlement">保存数据
@@ -114,7 +114,7 @@
       </el-dialog>
     </div>
     <messagePost v-if="messageVisble" ref="messagePost" @closeDialog="closeDialog"></messagePost>
-    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="吉永-收款" @onClose="onClose()" />
+    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="应收对账" @onClose="onClose()" />
   </div>
 </template>
 
@@ -263,7 +263,7 @@ export default {
       },
       billDetailDialog: false,
       financeDisabled: true,
-      billType: "收费",
+      billType: "对账收",
       // 明细本次金额总计
       allAmount: 0,
       // 消息弹窗
@@ -482,8 +482,8 @@ export default {
       if (!this.form.corpId) return this.$message.error('往来单位不能为空')
       this.$refs["form"].validate((valid, done) => {
         done();
-        if (valid && this.verificationData('收费')) {
-          this.$confirm("是否确认" + (this.financeDisabled ? '收费' : '撤销收费'), "提示", {
+        if (valid && this.verificationData('对账收')) {
+          this.$confirm("是否确认" + (this.financeDisabled ? '确认对账' : '撤销对账'), "提示", {
             confirmButtonText: "确认",
             cancelButtonText: "取消",
             type: "warning",
@@ -511,13 +511,13 @@ export default {
               } else if (Number(this.allAmount) > 0 && (Number(this.form.amount) < Number(this.allAmount))) {
                 this.form.caseOverPayment = (Number(this.allAmount) - Number(this.form.amount)).toFixed(2)
                 if (Number(this.form.caseOverPayment) > Number(this.form.overPayment)) {
-                  return this.$message.error('溢付款余额不足，无法收费')
+                  return this.$message.error('溢付款余额不足，无法对账')
                 }
               }
             }
             const params = {
               ...this.form,
-              billType: "收费",
+              billType: "对账收",
               itemsList: this.dataList
             }
             this.buttonLoading = true
@@ -614,7 +614,7 @@ export default {
         this.dataList = data.itemsList
         this.oldDataList = this.deepClone(data.itemsList)
       }
-      if (type == '收费') {
+      if (type == '对账收') {
         this.confirmSettlement()
       }
     },
@@ -729,26 +729,26 @@ export default {
     },
     // 跳转页面
     jumpPage(row, index) {
-      if (this.category == 2) {
-        this.$router.$avueRouter.closeTag("/businessManagement/salesOrder/index");
+      if (row.srcType == 1) {
+        this.$router.$avueRouter.closeTag("/landTransportation/dispatchingCars/index");
         this.$router.push({
-          path: "/businessManagement/salesOrder/index",
+          path: "/landTransportation/dispatchingCars/index",
           query: {
             params: row.srcParentId
           },
         });
-      } else if (this.category == 3) {
-        this.$router.$avueRouter.closeTag("/salesManagement/salesContract/index");
+      } else if (row.srcType == 2) {
+        this.$router.$avueRouter.closeTag("/landTransportation/dispatchingCars/index");
         this.$router.push({
-          path: "/salesManagement/salesContract/index",
+          path: "/landTransportation/dispatchingCars/index",
           query: {
             params: row.srcParentId
           },
         });
-      } else if (this.category == 4) {
-        this.$router.$avueRouter.closeTag("/exportTrade/salesContract/index");
+      } else if (this.srcType == 3) {
+        this.$router.$avueRouter.closeTag("/landTransportation/bulkCargo/index");
         this.$router.push({
-          path: "/exportTrade/salesContract/index",
+          path: "/landTransportation/bulkCargo/index",
           query: {
             params: row.srcParentId
           },

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -404,7 +404,7 @@ export default {
             // 绑定的数据
             form: {
                 dc: null,
-                billDate: dateFormat(new Date())
+                billDate: dateFormat(new Date()),
             },
             handleSelectionData: [], // 表格选择的数据
             corpData: [], // 结算单位 数据

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

@@ -3,9 +3,9 @@
     <basic-container>
       <avue-crud :option="option" :table-loading="loading" :data="assemblyForm.containersList"
         :permission="permissionList" :before-open="beforeOpen" v-model="form" id="out-table"
-        :header-cell-class-name="headerClassName" ref="crud" :row-style="{ height: '20px' }" :cell-style="{ padding: '0px' }"
-        @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @selection-change="selectionChange"
-        @refresh-change="refreshChange">
+        :header-cell-class-name="headerClassName" ref="crud" :row-style="{ height: '20px' }"
+        :cell-style="{ padding: '0px' }" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
+        @selection-change="selectionChange" @refresh-change="refreshChange">
         <template slot="menuLeft">
           <div style="display: flex;align-items: center;justify-content: space-between">
             <div>
@@ -18,22 +18,31 @@
               <!--           :disabled="detailData.seeDisabled || pleasereviewType"-->
               <!--           @click="wholeRevokefun">全部撤销-->
               <!--</el-button>-->
-              <el-button type="warning" size="small" :disabled="detailData.seeDisabled || pleasereviewType||disabled"
+              <!-- <el-button type="warning" size="small" :disabled="detailData.seeDisabled || pleasereviewType || disabled"
                 @click="cleanCntrNofun">清除箱号
+              </el-button> -->
+              <el-button type="success" size="small" plain :disabled="seeDisabled" @click.stop="equalDistribution2()">配箱
               </el-button>
-              <el-button type="info" plain size="small" :disabled="detailData.seeDisabled || pleasereviewType||disabled"
+              <el-button type="primary" size="small" :disabled="detailData.seeDisabled || pleasereviewType || showLock"
                 @click="oneclickEditing">一键编辑
               </el-button>
-              <el-button type="primary" size="small" :disabled="detailData.seeDisabled || pleasereviewType||disabled"
+              <el-button type="primary" size="small" :disabled="detailData.seeDisabled || pleasereviewType || disabled"
                 @click="containersSubmitListfun">一键保存
               </el-button>
-              <el-button type="danger" size="small" :disabled="detailData.seeDisabled || pleasereviewType||disabled"
+              <!-- <el-button type="danger" size="small" :disabled="detailData.seeDisabled || pleasereviewType || disabled"
                 @click="handleDelete">一键删除
-              </el-button>
+              </el-button> -->
               <el-button type="success" size="small"
-                :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType||disabled"
-                @click="excelBox = true">导入箱号,铅封号
+                :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType || showLock"
+                @click="oepnexcelBox">导入箱号铅封号
               </el-button>
+              <el-button type="danger" size="small" :disabled="detailData.seeDisabled || pleasereviewType || showLock"
+                @click="handleDelete">删除配箱
+              </el-button>
+              <!-- <el-button type="success" size="small"
+                :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType || disabled"
+                @click="excelBox = true">导入箱号,铅封号
+              </el-button> -->
               <!--<el-button type="warning" size="small"-->
               <!--           :disabled="numberfalsefun() || assemblyForm.id"-->
               <!--           @click="equalDistribution">平均分配</el-button>-->
@@ -125,7 +134,7 @@ import {
   containersRemove,
   containersCleanBoxNo,
   containersRevoke,
-  containersEqualDistribution,
+  distributionBox,
   containersSubmitList,
   containersExportContainers, containersImportBoxNo, containersList
 } from "@/api/iosBasicData/containers";
@@ -144,7 +153,7 @@ export default {
     pleasereviewType: {
       type: Boolean,
       default: false,
-    }, 
+    },
     disabled: {
       type: Boolean,
       default: false,
@@ -319,6 +328,17 @@ export default {
         this.assemblyForm.containersList = res.data.data.records
       })
     },
+    oepnexcelBox() {
+      if (!this.assemblyForm.id) {
+        this.$message({
+          message: '请先点击右上角保存按钮，保存数据之后才能添加！',
+          type: 'warning'
+        });
+        return
+      }
+      this.findObject(this.excelOption.column, "excelFile").action = "/api/blade-los/containers/importBoxNo?billId=" + this.assemblyForm.id
+      this.excelBox = true
+    },
     // 下载模板
     handleGet() {
       window.open(
@@ -450,7 +470,29 @@ export default {
         })
       })
     },
+    equalDistribution2() {
+      if (!this.assemblyForm.id) {
+        this.$message({
+          message: '请先点击右上角保存按钮，保存数据之后才能添加！',
+          type: 'warning'
+        });
+        return
+      }
+      this.$confirm("是否确认配箱?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        distributionBox({ billId: this.assemblyForm.id }).then(res => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          })
+          this.$emit('billsDetailfun')
+        })
+      })
 
+    },
     rowSave(row, done, loading) {
       containersSubmit(row).then(() => {
         // this.onLoad(this.page);

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

@@ -561,6 +561,10 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
+                            <el-form-item label="　　" prop="dgFlashPoint">
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
                             <el-form-item label="易燃易爆品闪点" prop="dgFlashPoint">
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgFlashPoint"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled"

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

@@ -1,17 +1,17 @@
 <template>
     <basic-container>
-        <avue-crud style="height: 200px;"  :option="option" :table-loading="loading" :data="assemblyForm.preContainersList" :page.sync="page"
-            :permission="permissionList" :before-open="beforeOpen" v-model="form" ref="crud"
-            :cell-style="{ padding: '0px', textAlign: 'center' }" @row-update="rowUpdate" @row-save="rowSave"
-            @row-del="rowDel" @selection-change="selectionChange" @refresh-change="refreshChange"
-            @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 309.1)"
+        <avue-crud style="height: 200px;" :option="option" :table-loading="loading"
+            :data="assemblyForm.preContainersList" :page.sync="page" :permission="permissionList"
+            :before-open="beforeOpen" v-model="form" ref="crud" :cell-style="{ padding: '0px', textAlign: 'center' }"
+            @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @selection-change="selectionChange"
+            @refresh-change="refreshChange" @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 309.1)"
             @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 309.1)">
             <template slot="menuLeft">
                 <el-button type="primary" size="small" :disabled="seeDisabled" @click.stop="addfun">新 增</el-button>
-                <el-button type="danger" size="small" plain :disabled="seeDisabled" @click.stop="handleDelete">一键删除
+                <el-button type="danger" size="small" plain :disabled="seeDisabled||assemblyForm.preContainersList.length==0" @click.stop="handleDelete">一键删除
                 </el-button>
-                <el-button type="primary" size="small" :disabled="seeDisabled" @click="batchSavefun">一键保存</el-button>
-                <el-button type="info" plain size="small" :disabled="seeDisabled" @click="onclickEdit">一键编辑 </el-button>
+                <el-button type="primary" size="small" :disabled="seeDisabled||assemblyForm.preContainersList.length==0" @click="batchSavefun">一键保存</el-button>
+                <el-button type="info" plain size="small" :disabled="seeDisabled||assemblyForm.preContainersList.length==0" @click="onclickEdit">一键编辑 </el-button>
                 <!--<el-button type="success" size="small" plain :disabled="seeDisabled"-->
                 <!--           @click.stop="equalDistribution">均分箱量-->
                 <!--</el-button>-->
@@ -63,7 +63,7 @@
             <template slot="measurement" slot-scope="{ row }">
                 <el-input v-if="row.$cellEdit" style="width: 100%;" v-model="row.measurement" size="small"
                     autocomplete="off" min="0" @blur="measurementBlur(row)" clearable placeholder="请输入尺码"></el-input>
-                <span v-else>{{row.measurement}}</span>
+                <span v-else>{{ row.measurement }}</span>
             </template>
 
         </avue-crud>
@@ -414,18 +414,12 @@ export default {
                 }
                 item.pid = this.assemblyForm.id
             }
-            this.$confirm("批量保存后，需要重新配箱，确认继续?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
-                precontainersSubmitList(this.assemblyForm.preContainersList).then(res => {
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    });
-                    this.$emit('billsDetailfun')
-                })
+            precontainersSubmitList(this.assemblyForm.preContainersList).then(res => {
+                this.$message({
+                    type: "success",
+                    message: "操作成功!"
+                });
+                this.$emit('billsDetailfun')
             })
         },
         // 平均箱量
@@ -775,15 +769,15 @@ export default {
         //自定义列重置
         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;
-              }
-          },
+            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+            if (inSave) {
+                this.$message.success("重置成功");
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
 
     }
-  };
+};
 </script>
 
 <style></style>

src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue

@@ -54,7 +54,7 @@
             <el-table-column prop="currentStlAmountRMB" label="本次CNY" width="100px">
                 <template slot-scope="scope">
                     <el-input style="width: 100%;" v-model="scope.row.currentStlAmountRMB"
-                        :disabled="scope.row.curCode != 'CNY' || settlementdistar||!(form.status == '0' || form.status == '4')" v-if="(brfalse && !editSave)"
+                        :disabled="scope.row.curCode != 'CNY' || settlementdistar||!(form.status == '0' || form.status == '4'|| form.status == null)" v-if="(brfalse && !editSave)"
                         size="mini" autocomplete="off" clearable placeholder="请输入USD" @change="armbChange(scope.row)">
                     </el-input>
                     <span v-else>{{ scope.row.currentStlAmountRMB }}</span>

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

@@ -8,10 +8,10 @@
             @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 309.1)">
             <template slot="menuLeft">
                 <el-button type="primary" size="small" :disabled="seeDisabled" @click.stop="addfun">新 增</el-button>
-                <el-button type="danger" size="small" plain :disabled="seeDisabled" @click.stop="handleDelete">一键删除
+                <el-button type="danger" size="small" plain :disabled="seeDisabled||assemblyForm.preContainersList.length==0" @click.stop="handleDelete">一键删除
                 </el-button>
-                <el-button type="primary" size="small" :disabled="seeDisabled" @click="batchSavefun">一键保存</el-button>
-                <el-button type="info" plain size="small" :disabled="seeDisabled" @click="onclickEdit">一键编辑
+                <el-button type="primary" size="small" :disabled="seeDisabled||assemblyForm.preContainersList.length==0" @click="batchSavefun">一键保存</el-button>
+                <el-button type="info" plain size="small" :disabled="seeDisabled||assemblyForm.preContainersList.length==0" @click="onclickEdit">一键编辑
                 </el-button>
             </template>
             <template slot-scope="scope" slot="menu">

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

@@ -44,12 +44,12 @@
                 </el-dropdown>
                 <el-dropdown style="line-height: 0">
                     <el-button size="small" type="success" style="margin-right: 8px" :loading="saveLoading"
-                               :disabled="!form.id || showLock">
+                        :disabled="!form.id || showLock">
                         发送 SI EDI<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item v-for="item in ediData_SI" :key="item.id" class="dropdown-max"
-                                          @click.native="editypesSendingEdifun(item)">{{ item.cnName }}
+                            @click.native="editypesSendingEdifun(item)">{{ item.cnName }}
                         </el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
@@ -95,7 +95,9 @@
                                                         <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;"
-                                                                @click="applyforfun(item[0].label)">{{form.hblno?'删除':'申请'  }} {{ item[0].label }}
+                                                                @click="applyforfun(item[0].label)">{{ form.hblno ? '删除'
+                                                                    : '申请'
+                                                                }} {{ item[0].label }}
                                                             </span>
                                                             <span v-else style="color: #1e9fff">{{ item[0].label
                                                                 }}</span>
@@ -424,7 +426,7 @@ export default {
                 potEnName: '',
                 potNamePrint: '',
                 detail: {},
-                hmmEdi:{},
+                hmmEdi: {},
             },
             oldForm: {
                 billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
@@ -464,7 +466,7 @@ export default {
                 potEnName: '',
                 potNamePrint: '',
                 detail: {},
-                hmmEdi:{},
+                hmmEdi: {},
             },
             // 循环的配置
             basicData: {
@@ -977,33 +979,49 @@ export default {
         // 上传成功
         onSuccess(res, done, loading, column) {
             //    const obj = Object.assign(res,this.removeEmptyValues(this.form));
-            this.$confirm('此操作将覆盖数据, 是否继续?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                this.form = res;
-                this.excelBox = false;
-                this.$message.success("导入成功！");
-                loading = false;
-                done();
-            }).catch(() => {
-                this.$message({
-                    type: 'info',
-                    message: '已取消操作'
-                });
-                this.excelBox = false;
-                loading = false;
-                done();
-            });
+            if (res) {
+                this.$confirm('此操作将覆盖数据, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    // this.form = res;
+                    Object.keys(res).forEach(key => {
+                        if (res[key]) {
+                            if (key != 'detail') {
+                                this.form[key] = res[key]
+                            }
+                            if (key == 'detail') {
+                                Object.keys(res.detail).forEach(key => {
+                                    if (res.detail[key]) {
+                                        this.form.detail[key] = res.detail[key]
+                                    }
+                                });
+                            }
 
+                        }
+                    });
+                    this.excelBox = false;
+                    this.$message.success("导入成功！");
+                    loading = false;
+                    done();
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消操作'
+                    });
+                    this.excelBox = false;
+                    loading = false;
+                    done();
+                });
+            }
         },
         // 获取EDI列表数据
         editypesListfun() {
             editypesList(1, 1000).then(res => {
                 this.ediData = res.data.data.records
-                this.ediData_SO = res.data.data.records.filter(r=>r.groupName=='SO')
-                this.ediData_SI = res.data.data.records.filter(r=>r.groupName=='SI')
+                this.ediData_SO = res.data.data.records.filter(r => r.groupName == 'SO')
+                this.ediData_SI = res.data.data.records.filter(r => r.groupName == 'SI')
             })
         },
         // 发送edi

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -728,7 +728,10 @@
                 <el-table-column prop="fileName" label="文件名" />
                 <el-table-column prop="url" label="文件地址" :show-overflow-tooltip="true">
                   <template slot-scope="scope">
-                    <el-link type="primary" :href="scope.row.url">{{ scope.row.url }}</el-link>
+                    <!-- <el-link type="primary" :href="scope.row.url">{{ scope.row.url }}</el-link> -->
+                    <span @click="openPreview(scope.row)">
+                      {{ scope.row.url }}
+                    </span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="status" label="状态">
@@ -740,6 +743,7 @@
                 <el-table-column prop="remarks" label="备注" />
                 <el-table-column fixed="right" label="操作" width="180">
                   <template slot-scope="scope">
+                    <el-button type="text" size="small" @click="openPreview(scope.row)">查看</el-button>
                     <el-button type="text" size="small" @click="corpsAttnHandle(scope)">编辑</el-button>
                     <el-button type="text" size="small" @click="corpsAttnDelete(scope)">删除</el-button>
                   </template>
@@ -978,7 +982,7 @@
           </el-form-item>
           <el-form-item label="增值税税率" prop="taxRate">
             <!-- <el-input v-model="corpsAttnForm.taxRate"></el-input> -->
-            <el-input-number v-model="formData.taxRate" controls-position="right" @change="handleChange" :min="0"
+            <el-input-number v-model="corpsAttnForm.taxRate" controls-position="right" @change="handleChange" :min="0"
               :precision="2" :step="1" :style="{ width: '100%' }"></el-input-number>
           </el-form-item>
           <!-- <el-form-item label="发票类型" prop="invoiceType">
@@ -1004,6 +1008,9 @@
               placeholder="选择日期" :style="{ width: '100%' }">
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="版本" prop="version">
+            <el-input v-model="corpsAttnForm.version"></el-input>
+          </el-form-item>
           <el-form-item label="状态" prop="status">
             <el-select v-model="corpsAttnForm.status" placeholder="请选择状态" :style="{ width: '100%' }">
               <el-option label="正常" :value="0"></el-option>
@@ -1091,7 +1098,7 @@ import { getRateList } from "@/api/iosBasicData/rateManagement";
 import { bcorpstypedefineList } from "@/api/iosBasicData/bcorpstypedefine"
 
 import { getWorkDicts } from "@/api/system/dictbiz"
-
+import { isProcurement } from "@/api/basicData/configuration";
 // import { getBcorpsattnList, getBcorpsattnDetail, removevBcorpsattn, addBcorpsattn, updateBcorpsattn } from "@/api/iosBasicData/bcorpsattn";
 import bcountrys from '@/views/iosBasicData/bcountrys/index.vue'
 import user from '@/views/system/user.vue'
@@ -1261,6 +1268,11 @@ export default {
           message: ' ',
           trigger: 'change'
         }],
+        corpSource: [{
+          required: false,
+          message: ' ',
+          trigger: 'change'
+        }],
         srcCnName: [{
           required: true,
           message: ' ',
@@ -1378,10 +1390,36 @@ export default {
       }
     });
     this.getAllWorkDicts()
+    isProcurement({ "param": "corpSource.required" }).then(res => {
+      // res.data.data === '1'
+      if (res.data.data==1) {
+        this.rules.corpSource = [{
+          required: true,
+          message: ' ',
+          trigger: 'change'
+        }]
+        this.rules.sourceType = [{
+          required: false,
+          message: ' ',
+          trigger: 'change'
+        }]
+      }
 
+    })
   },
   mounted() { },
   methods: {
+    openPreview(row) {
+      this.$ImagePreview([{ url: row.url }], 0, {
+        closeOnClickModal: true,
+        // click: (data, index) => {
+        //   this.$message.success('点击事件' + index)
+        // },
+        // beforeClose: () => {
+        //   this.$message.success('关闭回调')
+        // }
+      });
+    },
     addDic() {
       this.$refs.dictbiz.open()
     },

src/views/landTransportation/bulkCargo/index.vue

@@ -1108,6 +1108,9 @@ export default {
       this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
       this.home = true
     }
+    if (this.$route.query.params){
+      this.rowCell({id:this.$route.query.params},0)
+    }
   },
   async created() {
     // this.option = this.optionListOne

src/views/landTransportation/dispatchingCars/index.vue

@@ -320,9 +320,9 @@ export default {
       this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
       this.home = true
     }
-    // if (this.$route.query.params){
-    //   this.rowCell({id:this.$route.query.params},0)
-    // }
+    if (this.$route.query.params){
+      this.rowCell({id:this.$route.query.params},0)
+    }
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(86), this.optionList);