提交木材

src/components/bill/billDetailList.vue

@@ -89,6 +89,10 @@
         this.onLoad(this.page);
       },
       searchChange(params,done){
+        if (params.createStart){
+          params.createStartDate = params.createStart[0]
+          params.createEndDate = params.createStart[1]
+        }
         this.onLoad(this.page, params);
         done()
       },

src/components/bill/config/mainList.json

@@ -107,6 +107,21 @@
       "overHidden": true,
       "index": 13,
       "width": 250
+    },
+    {
+      "prop": "createStart",
+      "label": "日期",
+      "type": "date",
+      "searchRange": true,
+      "searchDefaultTime": ["00:00:00", "23:59:59"],
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "search": true,
+      "hide": true,
+      "showColumn": false,
+      "index": 14,
+      "width": 250
     }
   ]
 }

src/components/fee-info/config/wood.json

@@ -0,0 +1,85 @@
+{
+  "tip": false,
+  "addBtn": false,
+  "editBtn": false,
+  "addRowBtn": false,
+  "cellBtn": false,
+  "cancelBtn": false,
+  "delBtn":false,
+  "border": true,
+  "index": true,
+  "selection": true,
+  "refreshBtn": false,
+  "menuWidth": 130,
+  "align":"center",
+  "showSummary": true,
+  "lazy": true,
+  "simplePage": true,
+  "dialogWidth": "60%",
+  "tree": true,
+  "dialogClickModal": false,
+  "indexSlot":true,
+  "column": [
+    {
+      "label": "结算单位",
+      "prop": "corpId",
+      "index": 1,
+      "overHidden": true,
+      "width": 220
+    },
+    {
+      "label": "费用名称",
+      "prop": "feeName",
+      "index": 2,
+      "width": 180,
+      "overHidden": true
+    },
+    {
+      "label": "计价单位",
+      "prop": "unit",
+      "index": 3,
+      "slot": true,
+      "overHidden": true,
+      "width": 100
+    },
+    {
+      "label": "单价",
+      "prop": "price",
+      "index": 4,
+      "slot": true,
+      "overHidden": true,
+      "width": 100
+    },
+    {
+      "label": "数量",
+      "prop": "quantity",
+      "index": 5,
+      "overHidden": true,
+      "width": 100
+    },
+    {
+      "label": "金额",
+      "prop": "amount",
+      "index": 6,
+      "cell": true,
+      "overHidden": true,
+      "width": 130
+    },
+    {
+      "label": "币别",
+      "prop": "currency",
+      "value": "CNY",
+      "index": 7,
+      "overHidden": true,
+      "width": 100
+    },
+    {
+      "label": "备注",
+      "prop": "remarks",
+      "index": 8,
+      "cell": true,
+      "overHidden": true,
+      "width": 150
+    }
+  ]
+}

src/components/fee-info/main.vue

@@ -127,6 +127,7 @@
 
 <script>
 import feeOption from "./config/feeInfo.json";
+import woodOption from "./config/wood.json";
 import option from "./config/feeList.json";
 import { getDeptLazyTree, customerList } from "@/api/basicData/basicFeesDesc";
 import { delItem, delItem2, getfeesDetails } from "@/api/feeInfo/fee-info";
@@ -239,6 +240,9 @@ export default {
     feeUrl: {
       type: String
     },
+    typeName: {
+      type: String
+    },
     billUrl: {
       type: String
     },
@@ -306,10 +310,7 @@ export default {
   async created() {
     // 判断tabShow的activeName默认的显示
     this.activeName = this.tabShow == 1 ? "first" : this.tabShow == 2 ? "first" : "second";
-    this.feeOption = await this.getColumnData(
-      this.getColumnName(33),
-      feeOption
-    );
+    this.feeOption = await this.getColumnData( this.getColumnName(33),this.typeName === "wood" ? woodOption : feeOption);
     if (this.$store.getters.userInfo.tenant_id === "888390") {
       this.feeOption.column.forEach(item => {
         if (item.prop === "billNo") {
@@ -544,8 +545,10 @@ export default {
     rowAdd() {
       if (this.inCropId) {
         const params = {
-          feesType: this.selectTab
+          feesType: this.selectTab,
+          corpId:this.corpId
         };
+        if (this.typeName === "wood") params.corpId = this.corpId
         this.$refs.feeCrud.rowCellAdd(params);
       } else {
         if (!this.corpId) return this.$message.error("请选择往来单位");
@@ -788,10 +791,7 @@ export default {
       return sums;
     },
     async saveColumn() {
-      const inSave = await this.saveColumnData(
-        this.getColumnName(33),
-        this.feeOption
-      );
+      const inSave = await this.saveColumnData(this.getColumnName(33),this.feeOption);
       if (inSave) {
         this.$message.success("保存成功");
         //关闭窗口
@@ -799,13 +799,10 @@ export default {
       }
     },
     async resetColumn() {
-      const inSave = await this.delColumnData(
-        this.getColumnName(33),
-        feeOption
-      );
+      const inSave = await this.delColumnData(this.getColumnName(33),this.typeName === "wood" ? woodOption : feeOption);
       if (inSave) {
         this.$message.success("重置成功");
-        this.feeOption = feeOption;
+        this.feeOption = this.typeName === "wood" ? woodOption : feeOption;
         //关闭窗口
         this.$refs.feeCrud.$refs.dialogColumn.columnBox = false;
       }

src/views/InventoryManagement/inventory/detailsPage.vue

@@ -356,7 +356,7 @@ export default {
           delete res.data.data.status
           res.data.data.stockTime = getCurrentDate()
           res.data.data.itemsVOList.forEach(e => {
-            e.surplusLoss = Number(e.inventory ? e.inventory : 0) - Number(e.storageInQuantity ? e.storageInQuantity : 0)
+            e.surplusLoss = (Number(e.inventory ? e.inventory : 0) - Number(e.storageInQuantity ? e.storageInQuantity : 0)).toFixed(2)
             e.srcItemId = e.id
             delete e.id
           })

src/views/InventoryManagement/inventoryAccount/index.vue

@@ -63,7 +63,9 @@ export default {
   data() {
     return {
       key: 0,
-      search: {},
+      search: {
+        isIssue:3,
+      },
       data: [],
       query: {},
       page: {
@@ -102,6 +104,13 @@ export default {
             decimals: 2
           }],
         column: [{
+          label: '货权人',
+          prop: 'purchaser',
+          index: 18,
+          width: 140,
+          overHidden: true,
+          search: true
+        },{
           label: '品名',
           // searchProp: 'goodsName',
           prop: 'itemId',
@@ -116,58 +125,17 @@ export default {
           index: 1,
           search: true
         }, {
-          label: '长',
-          prop: 'length',
-          index: 2,
-          search: true
-        }, {
-          label: '状态',
-          prop: 'isIssue',
-          type: 'select',
+          label: '提单号',
+          prop: 'morderNo',
           index: 19,
-          searchValue: 3,
-          dicData: [{
-            label: "在库",
-            value: 3
-          }, {
-            label: "计划",
-            value: 4
-          }, {
-            label: "待出库",
-            value: 5
-          }, {
-            label: "出库中",
-            value: 6
-          }],
-          search: true
-        }, {
-          label: '厚',
-          prop: 'thickness',
-          index: 5,
           search: true
         }, {
-          label: '捆包号',
-          prop: 'billNo',
+          label: '箱号',
+          prop: 'containerNo',
           index: 6,
           width: 100,
           search: true
         }, {
-          label: '可用片数',
-          prop: 'sliceNumber',
-          index: 7
-        }, {
-          label: '可用库存',
-          prop: 'balanceNumber',
-          index: 8
-        }, {
-          label: '库存单价',
-          prop: 'price',
-          index: 9
-        }, {
-          label: '库存金额',
-          prop: 'balanceMoney',
-          index: 10
-        }, {
           label: '仓库',
           prop: 'warehouseId',
           type: "tree",
@@ -185,13 +153,20 @@ export default {
           "overHidden": true,
           search: true
         }, {
-          label: '库位',
-          prop: 'storageName',
-          index: 12
+          label: '捆包号',
+          prop: 'billNo',
+          index: 6,
+          width: 100,
+          search: true
         }, {
-          label: '品牌',
-          prop: 'itemType',
-          index: 13,
+          label: '长',
+          prop: 'length',
+          index: 2,
+          search: true
+        }, {
+          label: '厚',
+          prop: 'thickness',
+          index: 5,
           search: true
         }, {
           label: '等级',
@@ -206,6 +181,16 @@ export default {
           index: 14,
           search: true
         }, {
+          label: '品牌',
+          prop: 'itemType',
+          index: 13,
+          search: true
+        }, {
+          label: '车船号',
+          prop: 'vehicleShipNumber',
+          index: 17,
+          search: true
+        }, {
           label: '产地',
           prop: 'itemProp',
           index: 15,
@@ -218,23 +203,6 @@ export default {
           overHidden: true,
           search: true
         }, {
-          label: '车船号',
-          prop: 'vehicleShipNumber',
-          index: 17,
-          search: true
-        }, {
-          label: '货权人',
-          prop: 'purchaser',
-          index: 18,
-          width: 140,
-          overHidden: true,
-          search: true
-        }, {
-          label: '提单号',
-          prop: 'morderNo',
-          index: 19,
-          search: true
-        }, {
           label: '状态',
           index: 19,
           prop: 'status',
@@ -245,6 +213,48 @@ export default {
             label: "dictValue",
             value: "dictKey"
           }
+        }, {
+          label: '状态',
+          prop: 'isIssue',
+          type: 'select',
+          index: 19,
+          hide: true,
+          showColumn: false,
+          searchValue: 3,
+          dicData: [{
+            label: "在库",
+            value: 3
+          }, {
+            label: "计划",
+            value: 4
+          }, {
+            label: "待出库",
+            value: 5
+          }, {
+            label: "出库中",
+            value: 6
+          }],
+          search: true
+        }, {
+          label: '可用片数',
+          prop: 'sliceNumber',
+          index: 7
+        }, {
+          label: '可用库存',
+          prop: 'balanceNumber',
+          index: 8
+        }, {
+          label: '库存单价',
+          prop: 'price',
+          index: 9
+        }, {
+          label: '库存金额',
+          prop: 'balanceMoney',
+          index: 10
+        }, {
+          label: '库位',
+          prop: 'storageName',
+          index: 12
         }]
       },
       commodityLabel: [],
@@ -286,7 +296,7 @@ export default {
       let queryParams = {
         size: page.pageSize,
         current: page.currentPage,
-        ...Object.assign(params, this.query)
+        ...Object.assign(params, this.search)
       }
       getList(queryParams).then(res => {
         this.data = res.data.data.records

src/views/bidingDocument/issueTender/detailsPageEdit.vue

@@ -205,6 +205,7 @@ export default {
           type: "datetime",
           format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          value:new Date,
           rules: [{
             required: true,
             message: " ",
@@ -746,6 +747,7 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
+            if (new Date(this.form.deadlineTime) < new Date()) return this.$message.error("截止日期不能小于等于当前日期")
             let form = {
               ...this.form,
               itemsList: this.dataListBox,

src/views/businessManagement/receipt/index.vue

@@ -50,11 +50,19 @@
           <!--            @click.stop="editOpen(scope.row,scope.index)"-->
           <!--          >编辑-->
           <!--          </el-button>-->
-          <el-button type="text" icon="el-icon-delete" size="small" :disabled="scope.row.deliveryStatus !== '录入'"
-                     @click.stop="sendInGoods(scope.row, scope.index)">确认发货
+          <el-button
+              type="text"
+              icon="el-icon-delete"
+              size="small"
+              :disabled="scope.row.deliveryStatus !== '录入'"
+              @click.stop="sendInGoods(scope.row, scope.index)">确认发货
           </el-button>
-          <el-button type="text" icon="el-icon-delete" size="small" :disabled="scope.row.deliveryStatus === '已发货'"
-                     @click.stop="rowDel(scope.row, scope.index)">删除
+          <el-button
+              type="text"
+              icon="el-icon-delete"
+              size="small"
+              :disabled="scope.row.deliveryStatus === '已发货'"
+              @click.stop="rowDel(scope.row, scope.index)">删除
           </el-button>
         </template>
       </avue-crud>

src/views/financialManagement/mBillDetails/billDetails.vue

@@ -41,6 +41,9 @@
       <template slot-scope="scope" slot="billType">
         <span>{{ scope.row.billType == "申请"?"付费":"收费" }}</span>
       </template>
+      <template slot="menuLeft" slot-scope="{size}">
+        <el-button type="warning" :size="size" @click="handleExport">导出</el-button>
+      </template>
       <template slot-scope="scope" slot="menu">
         <el-button
           type="text"
@@ -59,6 +62,7 @@
   import option from "./configuration/mainList.json";
   import { getBillList, removeDetail } from "@/api/financialManagement/paymentRequest";
   import _ from "lodash";
+  import {getToken} from "@/util/auth";
 
   export default {
     data() {
@@ -112,6 +116,17 @@
       // option.height = window.innerHeight - 200 ;
     },
     methods: {
+      async handleExport(){
+        let data = await this.paramsAdjustment(this.search)
+        const routeData = this.$router.resolve({
+          path: '/api/trade-finance/acc/exportAcc',      //跳转目标窗口的地址
+          query: {
+            'Blade-Auth': getToken(),
+            ...data    //括号内是要传递给新窗口的参数
+          }
+        })
+        window.open(routeData.href.slice(1, routeData.href.length));
+      },
       rowStyle(data){
         if(_.subtract(data.row.settlementAmount, data.row.amount) < 0){
           return  {

src/views/financing/financingManagement/detailsPage.vue

@@ -34,6 +34,10 @@
             <crop-select v-model="form.corpId" corpType="KH" :refresh="false" @getCorpData="getKHData"
               :disabled="form.status > 0"></crop-select>
           </template>
+          <template slot="companyId">
+            <crop-select v-model="form.companyId" corpType="GS" :refresh="false" @getCorpData="getKHDataTwo"
+              :disabled="form.status > 0"></crop-select>
+          </template>
         </avue-form>
       </trade-card>
       <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
@@ -88,18 +92,26 @@ export default {
             span: 6
           },
           {
+            label: "通过公司",
+            prop: "companyId",
+            rules: [{
+                required: true,
+                message: "",
+                trigger: "blur"
+            }],
+            span: 6
+          },
+          {
             label: "融资日期",
             prop: "financingDate",
             type: "date",
             format: 'yyyy-MM-dd',
             valueFormat: 'yyyy-MM-dd',
-            rules: [
-              {
+            rules: [{
                 required: true,
                 message: "",
                 trigger: "blur"
-              }
-            ],
+            }],
             span: 6
           },
           {
@@ -112,25 +124,28 @@ export default {
               value: "dictKey"
             },
             dicData: [],
-            rules: [
-              {
+            rules: [{
                 required: true,
                 message: "",
                 trigger: "blur"
-              }
-            ],
+            }],
             span: 6
           },
           {
             label: "融资金额",
             prop: "financingAmount",
-            rules: [
-              {
+            blur:(data)=>{
+              if (data.value < 0){
+                this.form.financingAmount = 0
+              }
+            },
+            controls:false,
+            type:'number',
+            rules: [{
                 required: true,
                 message: "",
                 trigger: "blur"
-              }
-            ],
+            }],
             span: 6
           },
           {
@@ -152,7 +167,7 @@ export default {
             type: "textarea",
             minRows: 2,
             width: 120,
-            span: 12,
+            span: 24,
           },
         ]
 
@@ -207,6 +222,9 @@ export default {
     getKHData(row) {
       this.form.corpName = row.cname
     },
+    getKHDataTwo(row) {
+      this.form.company = row.cname
+    },
     getDetail(id) {
       this.pageLoading = true;
       getDetail(id)

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

@@ -38,41 +38,32 @@
       "overHidden": true
     },
     {
-      "label": "入库单号",
-      "prop": "sysNo",
-      "index": 2,
+      "label": "提单号",
+      "prop": "billNo",
+      "index": 6,
       "width": 120,
       "search": true,
       "searchSpan": 8,
       "overHidden": true
     },
     {
-      "label": "业务类型",
-      "prop": "businessType",
-      "index": 3,
-      "width": 120,
-      "type": "select",
-      "props": {
-        "label": "dictValue",
-        "value": "dictKey"
-      },
-      "dicData": [],
+      "label": "箱号",
+      "prop": "caseNo",
+      "index": 5,
+      "width": 100,
       "search": true,
+      "disabled": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "入库日期",
-      "prop": "stockTime",
-      "index": 4,
+    },{
+      "label": "车船号",
+      "prop": "vehicleShipNumber",
+      "index": 9,
       "width": 120,
-      "type": "date",
-      "format": "yyyy-MM-dd",
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
+    },{
       "label": "仓库",
       "prop": "storageId",
       "type": "cascader",
@@ -84,77 +75,88 @@
       "checkStrictly": true,
       "showAllLevels": false,
       "emitPath": false,
-      "index": 5,
+      "index": 7,
       "width": 120,
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "提单号",
-      "prop": "billNo",
-      "index": 6,
+    },{
+      "label": "入库单号",
+      "prop": "sysNo",
+      "index": 2,
       "width": 120,
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "供应商",
-      "prop": "corpId",
-      "index": 7,
+    },{
+      "label": "入库日期",
+      "prop": "stockTime",
+      "index": 4,
       "width": 120,
+      "type": "date",
+      "format": "yyyy-MM-dd",
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "车船号",
-      "prop": "vehicleShipNumber",
+    },{
+      "label": "供应商",
+      "prop": "corpId",
       "index": 8,
       "width": 120,
       "search": true,
       "searchSpan": 8,
       "overHidden": true
     },{
-      "label": "计划入库数量",
-      "prop": "purchaseQuantity",
-      "index": 9,
-      "width": 120
+      "label": "业务类型",
+      "prop": "businessType",
+      "index": 3,
+      "width": 120,
+      "type": "select",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dicData": [],
+      "search": true,
+      "searchSpan": 8,
+      "overHidden": true
     },{
-      "label": "计划品名",
-      "prop": "planGoodsName",
-      "index": 10,
-      "width": 120
+      "label": "备注",
+      "prop": "orderRemark",
+      "index": 17,
+      "width": 120,
+      "search": true,
+      "searchSpan": 8,
+      "overHidden": true
     },{
       "label": "实际入库数量",
       "prop": "storageQuantity",
-      "index": 11,
+      "index": 12,
       "width": 120
     },{
       "label": "实际品名",
       "prop": "specialRemarks",
-      "index": 12,
+      "index": 13,
       "width": 120
     },
     {
       "label": "制单人",
       "prop": "salesName",
-      "index": 13,
+      "index": 14,
       "width": 120,
       "overHidden": true
     },
     {
       "label": "创建时间",
       "prop": "createTime",
-      "index": 14,
+      "index": 15,
       "width": 120,
       "overHidden": true
     },
     {
       "label": "审核状态",
       "prop": "status",
-      "index": 15,
+      "index": 16,
       "width": 120,
       "type": "select",
       "dataType": "number",
@@ -164,15 +166,6 @@
       },
       "dicData": [],
       "overHidden": true
-    },
-    {
-      "label": "备注",
-      "prop": "orderRemark",
-      "index": 17,
-      "width": 120,
-      "search": true,
-      "searchSpan": 8,
-      "overHidden": true
     }
   ]
 }

src/views/purchasingManagement/inStock/detailsPage.vue

@@ -136,15 +136,14 @@
           </template>
         </avue-crud>
       </trade-card>
-      <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="!(form.status < 3)"
+      <fee-info ref="feeInfo" :orderFeesList="orderFeesList" typeName="wood" :corpId="form.purchaserId" :disabled="!(form.status < 3)"
                 feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :optionType="'CMY'" :itemType="'C'"
-                :inCropId="true" @beforeFinance="beforeFinance" :delType="2" :billingShow="false"/>
+                :inCropId="true" @beforeFinance="beforeFinance" :delType="2" :billingShow="false" />
       <!-- <upload-file ref="uploadFile" title="合同附件" :disabled="detailData.status == 1" :orderFilesList="orderFilesList"
         delUrl="" /> -->
       <containerTitle title="上传附件"></containerTitle>
       <c-upload typeUpload="CD" deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId"
                 :data="orderFilesList" display :enumerationValue="85.6" :disabled="!(form.status < 3)"></c-upload>
-
       <el-dialog append-to-body title="审核进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
                  :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
         <check-schedule :checkId="form.id" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun">
@@ -250,6 +249,7 @@ export default {
             label: "入库日期",
             prop: "stockTime",
             type: "datetime",
+            value: new Date(),
             format: "yyyy-MM-dd HH:mm:ss",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             rules: [
@@ -262,20 +262,33 @@ export default {
             span: 6
           },
           {
-            label: "仓库",
-            prop: "storageId",
-            rules: [
-              {
+            label: "箱号",
+            prop: "caseNo",
+            span: 6,
+            blur: (data) => {
+              for (let item of this.itemsVOList){
+                item.containerNo = data.value
+              }
+            }
+          },
+          {
+            label: "提单号",
+            prop: "billNo",
+            rules: [{
                 required: true,
                 message: "",
                 trigger: "blur"
-              }
-            ],
+            }],
             span: 6
           },
           {
-            label: "提单号",
-            prop: "billNo",
+            label: "仓库",
+            prop: "storageId",
+            rules: [{
+                required: true,
+                message: "",
+                trigger: "blur"
+            }],
             span: 6
           },
           {
@@ -292,6 +305,11 @@ export default {
           {
             label: "车船号",
             prop: "vehicleShipNumber",
+            rules: [{
+              required: true,
+              message: "",
+              trigger: "blur"
+            }],
             span: 6
           },
           {
@@ -356,22 +374,11 @@ export default {
             },
             span: 6
           }, {
-            label: "计划入库数量",
-            prop: "purchaseQuantity",
-            value: 0,
-            minRows: 1,
-            span: 6
-          }, {
-            label: "计划品名",
-            prop: "planGoodsName",
-            minRows: 1,
-            span: 6
-          }, {
             label: "备注",
             prop: "orderRemark",
             type: "textarea",
             minRows: 1,
-            span: 18
+            span: 24
           },
         ]
       },
@@ -506,7 +513,7 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
-          this.itemsVOList.push({$cellEdit: true, unit: '1'});
+          this.itemsVOList.push({$cellEdit: true, unit: '1',containerNo:this.form.caseNo});
           this.getStorage()
         } else {
           return false;
@@ -787,16 +794,20 @@ export default {
       params.valid = true
       params.parentId = this.form.id
       callback(params)
+      console.log('1111')
     },
     getTemplate() {
       window.open(`/api/trade-purchase/woodHarvestingCloud/export-template?${this.website.tokenHeader}=${getToken()}`)
     },
     uploadAfter(res, done, loading, column) {
       if (!res.message) {
-        res.forEach(item => this.itemsVOList.push({
-          ...item,
-          $cellEdit: true
-        }))
+        res.forEach(item => {
+          this.itemsVOList.push({
+            ...item,
+            containerNo:this.form.caseNo,
+            $cellEdit: true
+          })
+        })
         this.excelBox = false
         done();
       } else {

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

@@ -24,9 +24,17 @@
     "overHidden": true,
     "search": true,
     "hide": true,
+    "index": 0,
     "showColumn": false,
     "width": 100
   },{
+    "index": 11,
+    "prop": "containerNo",
+    "label": "箱号",
+    "overHidden": true,
+    "search": true,
+    "width": 100
+  },{
     "prop": "stockTime",
     "label": "入库日期",
     "type": "date",
@@ -177,13 +185,6 @@
       ],
       "width": 100
     },{
-      "index": 11,
-      "prop": "containerNo",
-      "label": "箱号",
-      "overHidden": true,
-      "search": true,
-      "width": 100
-    },{
       "index": 12,
       "prop": "itemType",
       "label": "品牌",

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

@@ -41,43 +41,40 @@
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "出库单号",
-      "prop": "sysNo",
-      "index": 2,
+    },{
+      "label": "提单号",
+      "prop": "billNo",
+      "index": 7,
       "width": 120,
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "业务类型",
-      "prop": "businessType",
-      "index": 3,
+    },{
+      "label": "箱号",
+      "prop": "caseNo",
+      "index": 6,
+      "width": 100,
+      "search": true,
+      "disabled": true,
+      "searchSpan": 8,
+      "overHidden": true
+    },{
+      "label": "车船号",
+      "prop": "vehicleShipNumber",
+      "index": 9,
       "width": 120,
-      "type": "select",
-      "props": {
-        "label": "dictValue",
-        "value": "dictKey"
-      },
-      "dicData": [],
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "出库日期",
-      "prop": "stockTime",
-      "index": 4,
+    },{
+      "label": "司机",
+      "prop": "otherCorpAttn",
+      "index": 10,
       "width": 120,
-      "type": "date",
-      "format": "yyyy-MM-dd",
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
+    },{
       "label": "仓库",
       "prop": "storageId",
       "type": "cascader",
@@ -94,43 +91,46 @@
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "提单号",
-      "prop": "billNo",
-      "index": 6,
+    },{
+      "label": "出库单号",
+      "prop": "sysNo",
+      "index": 2,
       "width": 120,
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "供应商",
-      "prop": "corpId",
-      "index": 7,
+    },{
+      "label": "出库日期",
+      "prop": "stockTime",
+      "index": 4,
       "width": 120,
+      "type": "date",
+      "format": "yyyy-MM-dd",
       "search": true,
       "searchSpan": 8,
       "overHidden": true
-    },
-    {
-      "label": "车船号",
-      "prop": "vehicleShipNumber",
+    },{
+      "label": "供应商",
+      "prop": "corpId",
       "index": 8,
       "width": 120,
       "search": true,
       "searchSpan": 8,
       "overHidden": true
     },{
-      "label": "计划出库数量",
-      "prop": "purchaseQuantity",
-      "index": 9,
-      "width": 120
-    },{
-      "label": "计划品名",
-      "prop": "planGoodsName",
-      "index": 10,
-      "width": 120
+      "label": "业务类型",
+      "prop": "businessType",
+      "index": 3,
+      "width": 120,
+      "type": "select",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dicData": [],
+      "search": true,
+      "searchSpan": 8,
+      "overHidden": true
     },{
       "label": "实际出库数量",
       "prop": "storageQuantity",

src/views/salesManagement/outStock/detailsPage.vue

@@ -288,6 +288,7 @@ export default {
             label: "出库日期",
             prop: "stockTime",
             type: "datetime",
+            value: new Date(),
             format: "yyyy-MM-dd HH:mm:ss",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             rules: [
@@ -300,6 +301,21 @@ export default {
             span: 6
           },
           {
+            label: "箱号",
+            prop: "caseNo",
+            span: 6,
+            blur: (data) => {
+              for (let item of this.itemsVOList){
+                item.containerNo = data.value
+              }
+            }
+          },
+          {
+            label: "提单号",
+            prop: "billNo",
+            span: 6
+          },
+          {
             label: "仓库",
             prop: "storageId",
             rules: [
@@ -312,11 +328,6 @@ export default {
             span: 6
           },
           {
-            label: "提单号",
-            prop: "billNo",
-            span: 6
-          },
-          {
             label: "业务类型",
             prop: "businessType",
             type: "select",
@@ -330,6 +341,31 @@ export default {
           {
             label: "车船号",
             prop: "vehicleShipNumber",
+            rules: [{
+              required: true,
+              message: "",
+              trigger: "blur"
+            }],
+            span: 6
+          },
+          {
+            label: "司机",
+            prop: "otherCorpAttn",
+            rules: [{
+              required: true,
+              message: "",
+              trigger: "blur"
+            }],
+            span: 6
+          },
+          {
+            label: "电话",
+            prop: "corpTel",
+            rules: [{
+              required: true,
+              message: "",
+              trigger: "blur"
+            }],
             span: 6
           }, {
             label: "审核状态",
@@ -398,7 +434,7 @@ export default {
             prop: "orderRemark",
             type: "textarea",
             minRows: 1,
-            span: 18
+            span: 24
           },
         ]
       },