包件明细新增显示字段

src/views/distribution/artery/addTripartiteTransfer.vue

@@ -298,7 +298,6 @@
           <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
             <el-pagination
               style="zoom: 0.9"
-              align="right"
               background
               @size-change="sizeChange"
               @current-change="currentChange"
@@ -386,6 +385,7 @@
               </template>
             </template>
           </tablecmt>
+          <div>共 {{ details.newData.length }} 条</div>
         </div>
 
         <!-- <el-button></el-button> -->
@@ -400,6 +400,7 @@
           class="submitButton"
           icon="Promotion"
           type="primary"
+          :loading="details.loadingObj.submitLoading"
           @click="handleSubmit(ruleFormRef)"
         >
           提交
@@ -566,6 +567,8 @@ const details = reactive<any>({
     carrierName: false,
     /** 司机 */
     driverName: false,
+    /** 提交 */
+    submitLoading: false,
   },
   /** 列表复选框选中的数据 */
   selectionList: [],
@@ -636,7 +639,7 @@ onMounted(() => {
 });
 
 /** 请求页面数据 */
-const onLoad = async (page: any) => {
+const onLoad = async () => {
   const res = await postloadFindLoadInitData();
   const { code, data } = res.data;
   if (code !== 200) return;
@@ -672,7 +675,7 @@ const initOriginWarehouseOrder = async (params = {}) => {
     const { code, data } = res.data;
     if (code !== 200) return;
     details.oldData = data.records;
-    details.page.total = data.total;
+    details.oldPage.total = data.total;
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
@@ -854,11 +857,10 @@ const setnewcolum = (newarr, headarr, type) => {
 
 /** 加入调度池 */
 const handleAddWaybill = () => {
-  details.newData = details.selectionList.map(val => {
+  details.selectionList.forEach(val => {
     val.planNum = val.stockNum;
     val.loadingNum = 0;
-
-    return val;
+    details.newData.push(val);
   });
   details.orderCodeList = [
     ...new Set([
@@ -928,6 +930,9 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
   formEl.validate(async (valid, fields) => {
     if (valid) {
       console.log('details.pageInfo :>> ', details.pageInfo);
+      details.loadingObj.submitLoading = true;
+
+      try {
         const submitData = {
           ...form.value,
           carsLoadLineList: [
@@ -968,6 +973,11 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
         });
         back();
         console.log('res :>> ', res);
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.submitLoading = false;
+      }
     } else {
       console.log('error submit!', fields);
     }

src/views/distribution/inventory/distributionStockArticleDetails.vue

@@ -106,9 +106,7 @@
       <h3>包件信息</h3>
       <div class="plck">
         <el-button type="primary" @click="allhandleQRCode">批量查看二维码</el-button>
-        <el-button type="primary" @click="handleMaterialList()"
-          >补充物料信息</el-button
-        >
+        <el-button type="primary" @click="handleMaterialList()">补充物料信息</el-button>
       </div>
       <el-row>
         <!-- 列表模块 -->
@@ -1236,7 +1234,7 @@ export default {
     },
     async handleMaterial(row, index) {
       // console.log('row>>>', row);
-      if(index === "2"){
+      if (index === '2') {
         this.titleMaterial = '修改物料';
         this.formMaterial = row;
         this.loading = true;
@@ -1247,15 +1245,15 @@ export default {
           this.formMaterial.sku = res.data.data.records[0].sku;
         });
         this.loading = false;
-        this.optionsName = [{id: row.materialId,name: row.materialName}]
-        this.optionsCode = [{id: row.materialId,productCode: row.materialCode}]
+        this.optionsName = [{ id: row.materialId, name: row.materialName }];
+        this.optionsCode = [{ id: row.materialId, productCode: row.materialCode }];
         // console.log("333333",this.optionsCode[0]);
       } else {
         this.titleMaterial = '补充物料';
         this.formMaterial.id = row.id;
       }
       this.materialBox = true;
-      console.log("_+_+_+_+_+_+_",index);
+      console.log('_+_+_+_+_+_+_', index);
     },
     allhandleQRCode() {
       console.log(this.selectionList);

src/views/warehouse/parcelList/distributionParcelList.vue

@@ -130,12 +130,7 @@
     :columnList="columnList"
   ></edittablehead>
 
-  <el-dialog
-          title="二维码"
-          :visible.sync="dialogVisibleF"
-          width="780px"
-          v-model="dialogVisibleF"
-  >
+  <el-dialog title="二维码" :visible.sync="dialogVisibleF" width="780px" v-model="dialogVisibleF">
     <div>
       <div v-html="html"></div>
     </div>
@@ -145,7 +140,6 @@
       <el-button @click="dialogVisibleF = false">取 消</el-button>
     </span>
   </el-dialog>
-
 </template>
 
 <script>
@@ -192,7 +186,57 @@ export default {
           sortable: false,
           head: false,
         },
-
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: true,
+          sortable: false,
+          head: false,
+        },
+        {
+          prop: 'materialCode',
+          label: '物料编码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'trainNumber',
+          label: '配送车次',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: 'materialName',
+        //   label: '配送时间',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        // {
+        //   prop: 'materialName',
+        //   label: '签收时间',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'warehouse',
           label: '仓库',
@@ -266,7 +310,6 @@ export default {
           head: false,
         },
 
-
         {
           prop: 'firsts',
           label: '一级品',
@@ -383,7 +426,6 @@ export default {
           sortable: true,
           isshowSummary: true,
         },
-
       ],
       drawerShow: false,
       height: 0,
@@ -508,12 +550,12 @@ export default {
         this.$message.warning('请选择包件');
         return;
       }
-      const data = this.selectionList.map((item)=>{
+      const data = this.selectionList.map(item => {
         return item.id;
       });
       let qr = {
-        ids:data.join(',')
-      }
+        ids: data.join(','),
+      };
       this.html = '';
       showOrderPackgeCode(qr).then(res => {
         // this.orderPackageCode = res.data
@@ -521,8 +563,6 @@ export default {
         this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
       });
       this.dialogVisibleF = true;
-
-
     },
     //查看二维码
     handleQRCode(scope) {
@@ -541,7 +581,6 @@ export default {
       });
 
       this.dialogVisibleF = true;
-
     },
     handleExportInfo() {
       let row = {};
@@ -584,7 +623,6 @@ export default {
         if (value === '') delete this.query.orderPackageGroundingStatus;
       }
 
-
       if (row.prop === 'orderPackageStatusName') {
         this.query.orderPackageStatus = value;
         if (value === '') delete this.query.orderPackageStatus;
@@ -751,16 +789,13 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        
-
         const data = res.data.data;
         console.log(res, '获取到的页面初始值');
         res.data.data.records.forEach(item => {
           if (item.warehouseEntryTimeEnd) {
-            item.warehouseEntryTimeEnd=  this.formatDateTime(item.warehouseEntryTimeEnd)
+            item.warehouseEntryTimeEnd = this.formatDateTime(item.warehouseEntryTimeEnd);
           }
-         
-        })
+        });
         this.page.total = data.total;
         this.data = data.records.map(val => {
           val.conditionsType = val.conditions === 1 ? '定制品' : '库存品';