lph 1 жил өмнө
parent
commit
e8484d34a4

+ 4 - 6
zkqy-ui/src/views/orderMange/approve.vue

@@ -684,9 +684,7 @@
                   :label="approveFormStatusLabel"
                   >通过</el-radio
                 >
-                <el-radio v-model="approveForm.status" label="7"
-                  >不通过</el-radio
-                >
+                <el-radio v-model="approveForm.status" label="7">驳回</el-radio>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -1229,9 +1227,9 @@ export default {
         <tr align="center">
           <td>小计:</td>
            <td></td>
-          <td>${amountTotal}</td>
-          <td>${singlTotal}</td>
-          <td>${moneyTotal}</td>
+          <td>${amountTotal.toFixed(2)}</td>
+          <td>${singlTotal.toFixed(2)}</td>
+          <td>${moneyTotal.toFixed(2)}</td>
           <td></td>
           <td></td>
           <td></td>

+ 4 - 4
zkqy-ui/src/views/orderMange/financeApprove.vue

@@ -250,7 +250,7 @@
           <el-col :span="12">
             <el-form-item label="是否通过:" prop="status">
               <el-radio v-model="approveForm.status" label="3">通过</el-radio>
-              <el-radio v-model="approveForm.status" label="7">不通过</el-radio>
+              <el-radio v-model="approveForm.status" label="7">驳回</el-radio>
             </el-form-item>
           </el-col>
         </el-form>
@@ -756,9 +756,9 @@ export default {
         <tr align="center">
           <td>小计:</td>
            <td></td>
-          <td>${amountTotal}</td>
-          <td>${singlTotal}</td>
-          <td>${moneyTotal}</td>
+          <td>${amountTotal.toFixed(2)}</td>
+          <td>${singlTotal.toFixed(2)}</td>
+          <td>${moneyTotal.toFixed(2)}</td>
           <td></td>
           <td></td>
           <td></td>

+ 14 - 13
zkqy-ui/src/views/orderMange/index.vue

@@ -1123,12 +1123,13 @@ export default {
           item.productName.includes(value)
         );
         console.log(target);
-        if (target.length) {
-          this.productionOptions = target;
-          return true;
-        } else {
-          return false;
-        }
+        this.productionOptions = target;
+        // if (target.length) {
+        //   this.productionOptions = target;
+        //   return true;
+        // } else {
+        //   return false;
+        // }
       } else {
         this.productionOptions = this.allProductionOptions.slice(0, 500);
       }
@@ -1154,10 +1155,10 @@ export default {
     // 产品名失焦
     handleProductBlur(productNo, row) {
       console.log("blur", productNo);
-      if (!productNo) {
-        this.productionOptions = this.allProductionOptions.slice(0, 500);
-        row.productType = "";
-      }
+      // if (!productNo) {
+      //   this.productionOptions = this.allProductionOptions.slice(0, 500);
+      //   row.productType = "";
+      // }
     },
     // 产品名称改变
     handleProductChange(productNo, row) {
@@ -3122,9 +3123,9 @@ export default {
         <tr align="center">
           <td>小计:</td>
            <td></td>
-          <td>${amountTotal}</td>
-          <td>${singlTotal}</td>
-          <td>${moneyTotal}</td>
+          <td>${amountTotal.toFixed(2)}</td>
+          <td>${singlTotal.toFixed(2)}</td>
+          <td>${moneyTotal.toFixed(2)}</td>
           <td></td>
           <td></td>
           <td></td>