客户信息添加时, 忽略文件上传

src/views/basicdata/brand/basicClient.vue

@@ -691,7 +691,7 @@ export default {
           { type: 'date', required: true, message: '请选择合同开始时间', trigger: 'change' },
         ],
         bladeRegionProvinceId: [{ required: true, message: '请选择地址', trigger: 'change' }],
-        leaseAccessories: [{ required: true, message: '请上传合同文件', trigger: 'blur' }],
+        // leaseAccessories: [{ required: true, message: '请上传合同文件', trigger: 'blur' }],
       },
       bianji: false,
 
@@ -1054,7 +1054,7 @@ export default {
           });
           this.form.leaseAccessories = li.length > 0 ? li.join(',') : null;
         } else {
-          return this.$message.warning('请上传文件！');
+          // return this.$message.warning('请上传文件！');
         }
       } else {
         if (this.fileList.length > 0) {
@@ -1065,7 +1065,7 @@ export default {
           });
           this.form.leaseAccessories = li.length > 0 ? li.join(',') : null;
         } else {
-          return this.$message.warning('请上传文件！');
+          // return this.$message.warning('请上传文件！');
         }
       }
 

src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

@@ -534,6 +534,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'isZero',
+          label: '零担',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'warehouse',
           label: '所在仓库',
@@ -1425,7 +1435,8 @@ export default {
         path: '/distribution/inventory/distrilbutionBillLading',
         query:{
           id: this.ids,
-          type: '1'
+          type: '1',
+          
         }
       });
     },

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -181,7 +181,7 @@
             <el-form-item label="费用" prop="freightMark">
               <el-checkbox-group v-model="form.freightMark" @change="handleCheckedCitiesChange">
                 <el-checkbox
-                  style="min-width: 16%; margin-bottom: 3%"
+                  style="min-width: 16%;  margin-bottom: 8px;"
                   v-for="(item, index) in clientType"
                   :key="item.dictKey"
                   :label="item.dictKey"
@@ -229,6 +229,14 @@
                     @selection="selectionChange"
                   >
                     <template #default="slotProps">
+                      <el-text
+                        v-if="slotProps.scope.row.isZero === '1'"
+                        type="primary"
+                        text
+                        icon="el-icon-delete"
+                        @click="handleZeroOrder(slotProps.scope.row)"
+                        >操作</el-text
+                      >
                       <el-text
                         type="primary"
                         text
@@ -455,6 +463,10 @@
         </span>
       </template>
     </el-dialog>
+
+    <el-dialog v-model="dialogFormZeroOrderVisible" title="修改零担" style="width: 50%">
+
+    </el-dialog>
   </basic-container>
 </template>
 
@@ -494,6 +506,7 @@ export default {
       ],
       dialogFormVisible: false,
       dialogFormOrderVisible: false, //订单详细
+      dialogFormZeroOrderVisible: false, // 零担订单弹出层
       height: 0,
       // 弹框标题
       title: '',
@@ -2420,6 +2433,12 @@ export default {
         this.selectionClear();
       });
     },
+    // 修改零担订单
+    handleZeroOrder(row){
+      console.log('row :>> ', row);
+      console.log('row.isZero', row.isZero)
+      this.dialogFormZeroOrderVisible = true
+    }
   },
   watch: {
     clientType(newVal, oldVal) {
@@ -2463,4 +2482,8 @@ export default {
 :deep(.el-date-editor.el-input, .el-date-editor.el-input__wrapper) {
   height: 100% !important;
 }
+
+.el-checkbox {
+  margin-left: 0;
+}
 </style>