提交木材陆运

src/api/bidingDocument/issueTender.js

@@ -7,6 +7,14 @@ export function selectInvoiceList(data) {
         params: data
     })
 }
+// 列表查询
+export function allList(data) {
+    return request({
+        url: '/api/blade-client/port/allList',
+        method: 'get',
+        params: data
+    })
+}
 // 标书保存
 export function saveSaveList(data) {
     return request({

src/api/purchasingManagement/inventoryAccount.js

@@ -20,3 +20,10 @@ export function remove(data) {
         params: data
     })
 }
+export function generalLedgerTotal(data) {
+    return request({
+        url: '/api/trade-purchase/woodHarvestingCloud/generalLedgerTotal',
+        method: 'get',
+        params: data
+    })
+}

src/views/InventoryManagement/inventoryAccount/index.vue

@@ -13,8 +13,8 @@
         @search-criteria-switch="searchCriteriaSwitch"
         @resetColumn="resetColumn"
         @saveColumn="saveColumn"
-        @refresh-change="refreshChange"
-    >
+        :summary-method="summaryMethod"
+        @refresh-change="refreshChange">
       <template slot="itemId" slot-scope="{row,index}">
         {{ row.goodsName }}
       </template>
@@ -56,7 +56,7 @@
 </template>
 
 <script>
-import {generalLedgerListByGoods, getList} from "@/api/purchasingManagement/inventoryAccount";
+import {generalLedgerListByGoods, getList,generalLedgerTotal} from "@/api/purchasingManagement/inventoryAccount";
 import {getToken} from "@/util/auth";
 
 export default {
@@ -67,6 +67,7 @@ export default {
         isIssue:3,
       },
       data: [],
+      total: [],
       query: {},
       page: {
         pageSize: 10,
@@ -284,6 +285,26 @@ export default {
     }
   },
   methods: {
+    summaryMethod({ columns, data }){
+      const sums = [];
+      if (columns.length > 0) {
+        columns.forEach((column, index) => {
+          let prop=column.property
+          if (['sliceNumber','balanceNumber','balanceMoney'].includes(prop) ) {
+            if(prop=='sliceNumber'){
+              sums[index]=this.total.sliceNumber
+            }else if(prop=='balanceNumber'){
+              sums[index]=this.total.balanceNumber
+            }else if(prop=='balanceMoney'){
+              sums[index]=this.total.balanceMoney
+            }
+          } else {
+            sums[0] = '合计'
+          }
+        });
+      }
+      return sums;
+    },
     cellClick(row, column, cell, event) {
       for (let item of this.commodityLabel) {
         if (row.label == item.label) {
@@ -302,6 +323,9 @@ export default {
         this.data = res.data.data.records
         this.page.total = res.data.data.total
         this.option.height = window.innerHeight - 230;
+        generalLedgerTotal(queryParams).then(res=>{
+          this.total = res.data.data
+        })
       })
     },
     //搜索

src/views/approveData/configuration/mainList4.json

@@ -128,25 +128,39 @@
       "index": 10
     },
     {
+      "label": "提单号",
+      "prop": "morderNo",
+      "overHidden": true,
+      "width": 100,
+      "index": 11
+    },
+    {
+      "label": "箱号",
+      "prop": "caseNo",
+      "overHidden": true,
+      "width": 100,
+      "index": 11
+    },
+    {
       "label": "应收金额",
       "prop": "amountReceivable",
       "overHidden": true,
       "width": 100,
-      "index": 11
+      "index": 12
     },
     {
       "label": "应付金额",
       "prop": "payAmount",
       "overHidden": true,
       "width": 100,
-      "index": 11
+      "index": 13
     },
     {
       "label": "订单备注",
       "prop": "orderRemark",
       "overHidden": true,
       "width": 100,
-      "index": 12
+      "index": 14
     }
   ]
-}
+}

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -12,7 +12,7 @@
         </el-button>
         <el-button type="primary" @click="openFlow" size="small" :disabled="!form.id">审 核
         </el-button>
-        <el-button type="primary" :disabled="disabled" @click="editCustomer" size="small">{{  form.id ? "确认修改" : "确认新增" 
+        <el-button type="primary" :disabled="disabled" @click="editCustomer" size="small">{{  form.id ? "确认修改" : "确认新增"
           }}
         </el-button>
       </div>
@@ -54,11 +54,16 @@
                     :value="item.dictValue">
                   </el-option>
                 </el-select>
+                <el-select v-else-if="item.prop === 'line'" size="small" style="width: 100%;"
+                  v-model="form[item.prop]" clearable placeholder="请选择" multiple collapse-tags>
+                  <el-option v-for="item in lineList" :key="item.id" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
                 <crop-select v-else-if="item.prop === 'belongtocompany'" v-model="form[item.prop]"
                   @getCorpData="getCorpName" corpType="GS"></crop-select>
                 <el-input type="text" v-else-if="item.prop === 'initials'" v-model="form[item.prop]" size="small"
                   autocomplete="off" :disabled="item.disabled" show-word-limit maxlength="1"></el-input>
-                <el-input type="textarea" v-else-if="item.prop === 'remarks'" :rows="2" placeholder="请输入内容"
+                <el-input type="textarea" v-else-if="item.prop === 'remarks'" :rows="1" placeholder="请输入内容"
                   v-model="form[item.prop]">
                 </el-input>
                 <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off"
@@ -213,6 +218,7 @@ export default {
       formData: {},
       formDataTwo: {},
       creditRatingList: [],
+      lineList: [],
       optionData: {
         span: 8,
         menuBtn: false,
@@ -748,6 +754,10 @@ export default {
             label: "首字母",
             prop: "initials",
             span: 8
+          },{
+            label: "优势航线",
+            prop: "line",
+            span: 8
           },
           // {
           //   label: "总返利",
@@ -776,7 +786,7 @@ export default {
           {
             label: "备注",
             prop: "remarks",
-            span: 24,
+            span: 16,
             mock: {
               type: "county"
             }
@@ -865,6 +875,9 @@ export default {
     this.getWorkDicts("credit_rating").then(res => {
       this.creditRatingList = res.data.data;
     });
+    this.getWorkDicts("dominant_route").then(res => {
+      this.lineList = res.data.data;
+    });
     if (this.$route.query.customerName) {
       this.returnButton = true
     } else {
@@ -875,6 +888,9 @@ export default {
         if (res.data.data.adminProfiles) {
           res.data.data.adminProfiles = res.data.data.adminProfiles.split(",");
         }
+        if (res.data.data.line !== ""){
+          res.data.data.line = res.data.data.line.split(",")
+        }
         this.form = res.data.data;
         this.contactsData = this.form.corpsAttnList;
         this.bankOfDepositData = this.form.corpsBankList;
@@ -1220,6 +1236,7 @@ export default {
           if (typeof this.form.corpsTypeId == "object") {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",");
           }
+          this.form.line = this.form.line.join(",")
           this.disabled = true;
 
           if (this.form.belongtoarea) {
@@ -1250,6 +1267,7 @@ export default {
                   ","
                 );
               }
+              this.form.line = this.form.line.split(",")
               this.form = res.data.data;
               this.contactsData = res.data.data.corpsAttnList;
               if (this.form.belongtoarea) {

src/views/basicData/portinformation/configuration/mainList.json

@@ -69,7 +69,16 @@
     {
       "label": "航线",
       "prop": "line",
-      "width": 120
+      "width": 120,
+      "type": "select",
+      "index": 3,
+      "slot": true,
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=dominant_route",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "overHidden": true
     },
     {
       "label": "UNCODE",

src/views/bidingDocument/issueTender/detailsPageEdit.vue

@@ -76,6 +76,15 @@
           >删 除
           </el-button>
         </template>
+        <template slot="menuLeft">
+          <el-button
+              type="success"
+              size="small"
+              icon="el-icon-bottom"
+              @click="dialogVisible = true"
+          >导入
+          </el-button>
+        </template>
       </avue-crud>
     </trade-card>
     <trade-card title="投标对比">
@@ -101,6 +110,75 @@
       </avue-crud>
     </trade-card>
     <el-dialog
+        v-dialogdrag
+        title="导入客户"
+        :fullscreen="dialogFull"
+        :visible.sync="dialogVisible"
+        class="el-dialogDeep"
+        append-to-body
+        :close-on-click-modal="false"
+        width="80%"
+    >
+      <template slot="title">
+        <span class="el-dialog__title">
+          <span
+              style="display:inline-block;background-color: #3478f5;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px"
+          ></span>
+          导入客户
+        </span>
+        <div
+            style="float: right"
+            class="avue-crud__dialog__menu"
+            @click="dialogFull ? (dialogFull = false) : (dialogFull = true)"
+        >
+          <i class="el-icon-full-screen"></i>
+        </div>
+      </template>
+      <el-row style="height: 0">
+        <el-col :span="5">
+          <div class="box">
+            <el-scrollbar>
+              <basic-container>
+                <avue-tree
+                    :option="treeOption"
+                    :data="treeData"
+                    @node-click="nodeClick"
+                />
+              </basic-container>
+            </el-scrollbar>
+          </div>
+        </el-col>
+        <el-col :span="19">
+          <basic-container>
+            <avue-crud
+                :option="option"
+                :data="dataList"
+                ref="crud"
+                v-model="form"
+                :page.sync="page"
+                :before-close="beforeClose"
+                @search-change="searchChange"
+                @search-reset="searchReset"
+                @refresh-change="refreshChange"
+                @selection-change="selectionChange"
+                @on-load="onLoad"
+                @saveColumn="saveColumn('crud','option','option',47)"
+                @tree-load="treeLoad"
+            >
+            </avue-crud>
+          </basic-container>
+        </el-col>
+      </el-row>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button
+            type="primary"
+            @click="confirmSelection"
+            :disabled="selection.length > 0 ? false : true"
+        >确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
         append-to-body
         title="审批"
         class="el-dialogDeep"
@@ -146,11 +224,14 @@ import {
   saveSaveList,
   boxDelete,
   agentDelete,
-  confirmRelease, confirmVoid, confirmPleaseCheck, confirmWinningTheBid
+  confirmRelease, confirmVoid, confirmPleaseCheck, confirmWinningTheBid,allList
 } from "@/api/bidingDocument/issueTender";
 import check from "@/components/check/check";
 import checkSchedule from "@/components/check/checkSchedule";
 import {dateFormat} from "@/util/date";
+import option from "@/components/selectComponent/configuration/mainList.json";
+import {customerList, getDeptLazyTree} from "@/api/basicData/customerInformation";
+import {customerParameter} from "@/enums/management-type";
 export default {
   name: "detailsPageEdit",
   components:{
@@ -180,20 +261,64 @@ export default {
           this.$set(this.optionForm,'disabled',false)
           this.findObject(this.optionForm.column, "status").disabled = true
           this.$set(this.optionBox,'disabled',false)
-          this.findObject(this.optionBox.column, "status").disabled = true
+          if (this.optionBox.column){
+            this.findObject(this.optionBox.column, "status").disabled = true
+          }
           this.$set(this.optionAgent,'disabled',false)
-          this.findObject(this.optionAgent.column, "status").disabled = true
+          if (this.optionAgent.column){
+            this.findObject(this.optionAgent.column, "status").disabled = true
+          }
         }
       }
     }
   },
   data() {
     return {
+      dialogVisible:false,
+      option:{},
+      treeOption: {
+        nodeKey: "id",
+        lazy: true,
+        treeLoad: function (node, resolve) {
+          const parentId = node.level === 0 ? 0 : node.data.id;
+          getDeptLazyTree({
+            parentId: parentId,
+            corpType: customerParameter.code
+          }).then(res => {
+            resolve(
+                res.data.data.map(item => {
+                  return {
+                    ...item,
+                    leaf: !item.hasChildren
+                  };
+                })
+            );
+          });
+        },
+        addBtn: false,
+        menu: false,
+        size: "small",
+        props: {
+          labelText: "标题",
+          label: "title",
+          value: "value",
+          children: "children"
+        }
+      },
+      dataList:[],
+      page: {
+        pageSize: 10,
+        pagerCount: 5,
+        total: 0
+      },
+      dialogFull: false,
       checkDialog:false,
       checkScheduleDialog:false,
       checkId: '',
       batchNo:'',
+      line:'',
       key:0,
+      selection:[],
       checkData: {},
       fullscreenLoading: false,
       optionForm: {
@@ -267,6 +392,15 @@ export default {
             label: "name",
             value: "name"
           },
+          change:(data)=>{
+            allList().then(res=>{
+              for (let item of res.data.data){
+                if (data.value == item.name){
+                  this.line = item.line
+                }
+              }
+            })
+          },
           rules: [{
             required: true,
             message: " ",
@@ -608,6 +742,7 @@ export default {
     }
   },
   async created() {
+    this.option = await this.getColumnData(this.getColumnName(47), option);
     if (this.id) {
       this.refreshData(this.id)
     }
@@ -621,6 +756,87 @@ export default {
     this.key++
   },
   methods: {
+    nodeClick(data) {
+      this.treeDeptId = data.id;
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    //确认导出触发
+    confirmSelection() {
+      console.log(this.selection);
+      for (let item of this.selection){
+        console.log(item)
+        this.dataListAgent.push({
+          $cellEdit: true,
+          agentId:item.id,
+          contacts:item.attn,
+          phone:item.tel
+        })
+      }
+      this.selection = [];
+      this.dialogVisible = false;
+    },
+    //点击新增时触发
+    beforeClose(done) {
+      this.parentId = "";
+      const column = this.findObject(this.option.column, "parentId");
+      column.value = "";
+      column.addDisabled = false;
+      done();
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      console.log(params);
+      this.treeDeptId = "";
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    //搜索重置按钮触发
+    searchReset() {
+      this.treeDeptId = "";
+      this.onLoad(this.page);
+    },
+    //刷新触发
+    refreshChange() {
+      this.page = {
+        pageSize: 10,
+        pagerCount: 5,
+        total: 0
+      };
+    },
+    //选中触发
+    selectionChange(selection) {
+      this.selection = selection;
+    },
+    //树桩列点击展开触发
+    treeLoad(tree, treeNode, resolve) {
+      const parentId = tree.id;
+      customerList({
+        parentId: parentId,
+        corpType: this.corpType ? this.corpType : "KH"
+      }).then(res => {
+        resolve(res.data.data.records);
+      });
+    },
+    onLoad(page, params = { parentId: 0 }) {
+      let queryParams = Object.assign({}, params, {
+        size: page.pageSize,
+        current: page.currentPage,
+        corpsTypeId: this.treeDeptId,
+        corpType: this.corpType ? this.corpType : "KH",
+        line:this.line
+      });
+      customerList(queryParams).then(res => {
+        this.dataList = res.data.data.records;
+        this.page.total = res.data.data.total;
+        if (this.page.total) {
+          this.option.height = window.innerHeight - 500;
+        } else {
+          this.option.height = window.innerHeight - 200;
+        }
+      });
+    },
     //自定义列保存
     async saveColumn(ref, option, optionBack, code) {
       /**

src/views/dealer/sales/config/customerContact.json

@@ -20,10 +20,6 @@
       "decimals": 0
     },
     {
-      "name": "price",
-      "type": "sum"
-    },
-    {
       "name": "amount",
       "type": "sum"
     }

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -1028,9 +1028,10 @@
           :basic="true"
           deleteUrl="/api/blade-client/common-file/remove"
           :data="orderList"
-          :disabled="goodsForm.status !== 0"
           :enumerationValue="85.71"
       ></c-upload>
+<!--附件是否禁用-->
+<!--      :disabled="goodsForm.status !== 0"-->
       <span slot="footer" class="dialog-footer">
           <el-button @click="enclosure = false" size="small">取 消</el-button>
           <el-button type="primary" @click="saveAnnex" size="small">保 存</el-button>
@@ -1136,6 +1137,7 @@ export default {
           this.goodsForm.status = 5
           this.goodsOptionFormC.disabled = true
           this.goodsOptionForm.disabled = true
+          this.findObject(this.goodsOptionFormTwo.column, 'freightPay').display = false
           // this.goodsOptionFormTwo.disabled = true
         }
       }
@@ -2879,6 +2881,11 @@ export default {
           // this.goodsOptionFormTwo.disabled = true
           this.$set(this.goodsOptionFormTwo, 'disabled', false)
           this.findObject(this.goodsOptionFormTwo.column,"freightPay").disabled = false
+          this.findObject(this.goodsOptionFormTwo.column,"fleetId").disabled = false
+          this.findObject(this.goodsOptionFormTwo.column,"plateNo").disabled = false
+          this.findObject(this.goodsOptionFormTwo.column,"driverId").disabled = false
+          this.findObject(this.goodsOptionFormTwo.column,"driverTel").disabled = false
+          this.findObject(this.goodsOptionFormTwo.column,"fleetRemarks").disabled = false
         }
       } else {
         this.goodsOptionFormC.disabled = false

src/views/landTransportation/bulkReportAnalysis/index.vue

@@ -31,7 +31,7 @@
           ></crop-select>
         </template>
         <template slot-scope="{row}" slot="fleetId">
-          <span>{{ row.fleetName }}</span>
+          <span>{{ row.fleetShortName }}</span>
         </template>
         <template slot="billNo" slot-scope="{row,index}">
           <span v-if="roleName.indexOf('车队') !== -1" style="cursor: pointer">{{ row.billNo }}</span>
@@ -45,12 +45,6 @@
           <span class="el-button--text" style="cursor: pointer"
                 @click.stop="celJump(row,index)">{{ row.dispatchNumber }}</span>
         </template>
-        <template slot-scope="{row}" slot="fleetIdSearch">
-          <crop-select
-              v-model="row.fleetId"
-              corpType="CD"
-          ></crop-select>
-        </template>
         <template slot-scope="{row,index}" slot="menu">
           <span v-if="row.extraAmountD>0">
             <el-button
@@ -445,17 +439,17 @@ export default {
           prop: 'fleetVolum'
         }, {
           label: '车队',
-          prop: 'fleetShortName',
+          prop: 'fleetId',
           index: 10,
           width: 90,
-          searchProp: 'fleetId',
           type: 'select',
-          cascader: ['plateNo'],
+          dicUrl: "/api/blade-client/corpsdesc/fleetList",
+          filterable: true,
           props: {
-            label: "cname",
+            label: "shortName",
             value: "id"
           },
-          filterable: true,
+          cascader: ['plateNo'],
           search: true,
           overHidden: true,
         }, {
@@ -653,17 +647,17 @@ export default {
           prop: 'fleetVolum'
         }, {
           label: '车队',
-          prop: 'fleetShortName',
-          index: 10,
-          width: 90,
-          searchProp: 'fleetId',
+          prop: 'fleetId',
           type: 'select',
-          cascader: ['plateNo'],
+          dicUrl: "/api/blade-client/corpsdesc/fleetList",
+          filterable: true,
           props: {
-            label: "cname",
+            label: "shortName",
             value: "id"
           },
-          filterable: true,
+          index: 10,
+          width: 90,
+          cascader: ['plateNo'],
           search: true,
           overHidden: true,
         }, {
@@ -872,17 +866,17 @@ export default {
           prop: 'fleetVolum'
         }, {
           label: '车队',
-          prop: 'fleetShortName',
-          index: 9,
-          width: 90,
-          searchProp: 'fleetId',
+          prop: 'fleetId',
           type: 'select',
-          cascader: ['plateNo'],
+          dicUrl: "/api/blade-client/corpsdesc/fleetList",
+          filterable: true,
           props: {
-            label: "cname",
+            label: "shortName",
             value: "id"
           },
-          filterable: true,
+          index: 9,
+          width: 90,
+          cascader: ['plateNo'],
           search: true,
           overHidden: true,
         }, {
@@ -968,10 +962,6 @@ export default {
     getSalesman().then(res=>{
       this.findObject(this.goodsOptionCrud.column, "salesmanName").dicData = res.data.data
     })
-
-    fleetList().then(res=>{
-      this.findObject(this.option.column, "fleetShortName").dicData = res.data.data
-    })
     this.key++
     this.calculateHu()
   },

src/views/purchasingManagement/inStock/config/mainList.json

@@ -40,7 +40,7 @@
     {
       "label": "提单号",
       "prop": "billNo",
-      "index": 6,
+      "index": 3,
       "width": 120,
       "search": true,
       "searchSpan": 8,
@@ -49,7 +49,7 @@
     {
       "label": "箱号",
       "prop": "caseNo",
-      "index": 5,
+      "index": 4,
       "width": 100,
       "search": true,
       "disabled": true,
@@ -58,7 +58,7 @@
     },{
       "label": "车船号",
       "prop": "vehicleShipNumber",
-      "index": 9,
+      "index": 11,
       "width": 120,
       "search": true,
       "searchSpan": 8,
@@ -75,7 +75,7 @@
       "checkStrictly": true,
       "showAllLevels": false,
       "emitPath": false,
-      "index": 7,
+      "index": 10,
       "width": 120,
       "search": true,
       "searchSpan": 8,
@@ -91,7 +91,7 @@
     },{
       "label": "入库日期",
       "prop": "stockTime",
-      "index": 4,
+      "index": 9,
       "width": 120,
       "type": "date",
       "format": "yyyy-MM-dd",
@@ -101,7 +101,7 @@
     },{
       "label": "供应商",
       "prop": "corpId",
-      "index": 8,
+      "index": 7,
       "width": 120,
       "search": true,
       "searchSpan": 8,
@@ -109,7 +109,7 @@
     },{
       "label": "业务类型",
       "prop": "businessType",
-      "index": 3,
+      "index": 14,
       "width": 120,
       "type": "select",
       "props": {
@@ -123,7 +123,7 @@
     },{
       "label": "备注",
       "prop": "orderRemark",
-      "index": 17,
+      "index": 16,
       "width": 120,
       "search": true,
       "searchSpan": 8,
@@ -131,32 +131,32 @@
     },{
       "label": "实际入库数量",
       "prop": "storageQuantity",
-      "index": 12,
+      "index": 6,
       "width": 120
     },{
       "label": "实际品名",
       "prop": "specialRemarks",
-      "index": 13,
+      "index": 5,
       "width": 120
     },
     {
       "label": "制单人",
       "prop": "salesName",
-      "index": 14,
+      "index": 12,
       "width": 120,
       "overHidden": true
     },
     {
       "label": "创建时间",
       "prop": "createTime",
-      "index": 15,
+      "index": 13,
       "width": 120,
       "overHidden": true
     },
     {
       "label": "审核状态",
       "prop": "status",
-      "index": 16,
+      "index": 8,
       "width": 120,
       "type": "select",
       "dataType": "number",
@@ -166,6 +166,12 @@
       },
       "dicData": [],
       "overHidden": true
+    },{
+      "label": "明细件数",
+      "prop": "issueNumber",
+      "index": 15,
+      "width": 80,
+      "overHidden": true
     }
   ]
 }

src/views/purchasingManagement/inStock/detailsPage.vue

@@ -1029,6 +1029,9 @@ export default {
                 this.getDetail(this.form.id)
               })
             })
+          }).catch(()=>{
+            this.subLoading = false
+            this.getDetail(this.form.id)
           })
         })
       } else {
@@ -1113,6 +1116,9 @@ export default {
               this.getDetail(this.form.id)
             })
           })
+        }).catch(()=>{
+          this.subLoading = false
+          this.getDetail(this.form.id)
         })
       }
     },

src/views/reimbursement/config/mainList.json

@@ -56,6 +56,19 @@
       "overHidden": true,
       "minWidth": 120,
       "search": false
+    },
+    {
+      "label": "实报金额",
+      "prop": "totalAmount",
+      "overHidden": true,
+      "minWidth": 120,
+      "search": false
+    },
+    {
+      "label": "备注",
+      "prop": "remarks",
+      "overHidden": true,
+      "minWidth": 120
     }
   ]
 }

src/views/salesManagement/outStock/config/mainList.json

@@ -44,7 +44,7 @@
     },{
       "label": "提单号",
       "prop": "billNo",
-      "index": 7,
+      "index": 3,
       "width": 120,
       "search": true,
       "searchSpan": 8,
@@ -52,7 +52,7 @@
     },{
       "label": "箱号",
       "prop": "caseNo",
-      "index": 6,
+      "index": 4,
       "width": 100,
       "search": true,
       "disabled": true,
@@ -61,7 +61,7 @@
     },{
       "label": "车船号",
       "prop": "vehicleShipNumber",
-      "index": 9,
+      "index": 11,
       "width": 120,
       "search": true,
       "searchSpan": 8,
@@ -69,7 +69,7 @@
     },{
       "label": "司机",
       "prop": "otherCorpAttn",
-      "index": 10,
+      "index": 12,
       "width": 120,
       "search": true,
       "searchSpan": 8,
@@ -86,7 +86,7 @@
       "checkStrictly": true,
       "showAllLevels": false,
       "emitPath": false,
-      "index": 5,
+      "index": 10,
       "width": 120,
       "search": true,
       "searchSpan": 8,
@@ -102,7 +102,7 @@
     },{
       "label": "出库日期",
       "prop": "stockTime",
-      "index": 4,
+      "index": 9,
       "width": 120,
       "type": "date",
       "format": "yyyy-MM-dd",
@@ -112,7 +112,7 @@
     },{
       "label": "供应商",
       "prop": "corpId",
-      "index": 8,
+      "index": 7,
       "width": 120,
       "search": true,
       "searchSpan": 8,
@@ -120,7 +120,7 @@
     },{
       "label": "业务类型",
       "prop": "businessType",
-      "index": 3,
+      "index": 17,
       "width": 120,
       "type": "select",
       "props": {
@@ -134,12 +134,12 @@
     },{
       "label": "实际出库数量",
       "prop": "storageQuantity",
-      "index": 11,
+      "index": 6,
       "width": 120
     },{
       "label": "实际品名",
       "prop": "specialRemarks",
-      "index": 12,
+      "index": 5,
       "width": 120
     },{
       "label": "计划出库数量",
@@ -169,7 +169,7 @@
     {
       "label": "审核状态",
       "prop": "status",
-      "index": 17,
+      "index": 8,
       "width": 120,
       "type": "select",
       "dataType": "number",
@@ -179,11 +179,17 @@
       },
       "dicData": [],
       "overHidden": true
+    },{
+      "label": "明细件数",
+      "prop": "issueNumber",
+      "index": 18,
+      "width": 80,
+      "overHidden": true
     },
     {
       "label": "备注",
       "prop": "orderRemark",
-      "index": 18,
+      "index": 19,
       "width": 120,
       "search": true,
       "searchSpan": 8,

src/views/salesManagement/outStock/detailsPage.vue

@@ -564,13 +564,15 @@ export default {
         })
         delete data[data.length - 1].id
       }
-      let dataList = this.form.billNo.split(',')
+      console.log(this.form.billNo.split(','))
+      let dataList = this.form.billNo?this.form.billNo.split(',') : []
       for (let item of this.goodsListSave){
         dataList.push(item.mainBillNo)
       }
       let list = dataList.filter(function(value,index,self){
-        return self.indexOf(value) ===index;
+        return self.indexOf(value) === index;
       });
+      console.log(list)
       this.form.billNo = list.join(',')
       this.itemsVOList = this.itemsVOList.concat(data)
       this.goodsListSave = []
@@ -928,6 +930,9 @@ export default {
                     this.subLoading = false
                     this.getDetail(this.form.id)
                   })
+                }).catch(()=>{
+                  this.subLoading = false
+                  this.getDetail(this.form.id)
                 })
               } else {
                 this.$confirm(res.data.data, {
@@ -1052,6 +1057,9 @@ export default {
                   this.subLoading = false
                   this.getDetail(this.form.id)
                 })
+              }).catch(()=>{
+                this.subLoading = false
+                this.getDetail(this.form.id)
               })
             } else {
               this.$confirm(res.data.data, {