Merge branch 'pre-production'

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -1610,7 +1610,8 @@ const onSubmit = () => {
           }
         });
       }
-
+      console.log(form.value,'表单内容');
+      
       // 处理结果
       if (form.value.basis.result?.length) {
         submitData.aftersalesProcessingResultsDTO = {
@@ -1624,7 +1625,7 @@ const onSubmit = () => {
             let resultTypeValue = Processingresultsoptions.value.find(
               res => res.label == item.title
             ).value;
-            if (item.compensationMethod) {
+            if (item.compensationMethod) { 
               PlayName.push(
                 item.Paymentmethod.find(res => res.value == item.compensationMethod).label
               );
@@ -1659,7 +1660,6 @@ const onSubmit = () => {
           delete form.value.basis.resultDescription; //删除无用信息
         }
       }
-
       form.value.Pageloading = true; //关闭页面加载
       //是否直接提交到处理结果(处理完毕)
       if (form.value.Processed) {

src/views/distribution/inventory/CreateOrder.vue

@@ -3603,9 +3603,10 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
         });
       }
 
-      if (!(details.query.totalFreight > 0)) {
-        return ElMessage.warning('请输入大于零的运费');
-      }
+      // if (!(details.query.totalFreight > 0)) {
+      //   return ElMessage.warning('请输入大于零的运费');
+      // }
+      if (totalCost.value === 0) return ElMessage.warning('合计费用不能等于0');
 
       const submitData = {
         ...details.totalObj,

src/views/waybill/CreateZeroOrder.vue

@@ -676,7 +676,6 @@
                         :value-on-clear="0"
                         :controls="false"
                         :precision="2"
-                        disabled
                         :min="0"
                         :step="0.1"
                         v-model="query.deliveryFee"
@@ -686,7 +685,6 @@
                     <el-form-item label="提货费:">
                       <el-input-number
                         :value-on-clear="0"
-                        disabled
                         :controls="false"
                         :precision="2"
                         :min="0"
@@ -2813,7 +2811,8 @@ const handleSubmit = async (formEl: FormInstance | undefined) => {
           if (_arr.includes(val.goodsName)) return ElMessage.warning('存在重复的货物名称，请移除');
         }
 
-        if (!(details.query.totalFreight > 0)) return ElMessage.warning('请输入大于零的运费');
+        // if (!(details.query.totalFreight > 0)) return ElMessage.warning('请输入大于零的运费');
+        if (totalCost.value === 0) return ElMessage.warning('合计费用不能等于0');
 
         console.log('submit!');
         const submitData = {