no message

src/views/engineeringMaintenance/mixins/feel.js

@@ -86,7 +86,7 @@ export default {
                 render: (h, { row, column, index }) => {
                   return (
                     <div style="padding-left:10px">
-                      {({ ACC: "配件物料", SERV: "服务" })[row.chargeType]}
+                      {({ MCC: "辅材物料",ACC: "配件物料", SERV: "服务收费" })[row.chargeType]}
                     </div>
                   )
                 }
@@ -114,6 +114,21 @@ export default {
       },
       {
         md: 8,
+        isShow:this.formData.rpMaterialOrderItems.filter(item => item.chargeType == "MCC").length,
+        name: 'slot-component',
+        formItemAttributes: {
+          label: '辅材费用合计',
+        },
+        render: (h, { props, onInput }) => {
+          var { formData } = props
+          return <span>{[0, 0, 0, ...formData.rpMaterialOrderItems.filter(item => item.chargeType == "MCC").map(item => item.totalAmount)].reduce(function (prev, curr, idx, arr) {
+            return prev + curr;
+          }).toFixed(2)}</span>
+        }
+      },
+      {
+        md: 8,
+        isShow:this.formData.rpMaterialOrderItems.filter(item => item.chargeType == "ACC").length,
         name: 'slot-component',
         formItemAttributes: {
           label: '配件费用合计',
@@ -129,7 +144,7 @@ export default {
         md: 8,
         name: 'slot-component',
         formItemAttributes: {
-          label: '服务费用合计',
+          label: '服务收费费用合计',
         },
         render: (h, { props, onInput }) => {
           var { formData } = props

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/basicInfo.js

@@ -12,7 +12,21 @@ export default {
     }
   },
   created() {
-    listPageV2({ "pageNum": 1, "pageSize": -1, "params": [] }).then(res => {
+    function getTimef(sfm = "00:00:00") {
+      var currentDate = new Date();
+      var year = currentDate.getFullYear();
+      var month = ('0' + (currentDate.getMonth() + 1)).slice(-2); // 月份从0开始，需要加1
+      var day = ('0' + currentDate.getDate()).slice(-2);
+      return year + '-' + month + '-' + day + ' ' + sfm
+    }
+    listPageV2({
+      "pageNum": 1,
+      "pageSize": -1,
+      "params": [
+        { "param": "a.start_time", "compare": "<=", "value": getTimef() },
+        { "param": "a.end_time", "compare": ">=", "value": getTimef() }
+      ]
+    }).then(res => {
       this.wb_project = res.data.records.map(item => {
         return {
           value: item.id,

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/productColumns.js

@@ -356,7 +356,7 @@ export default {
     },
     delProduct(row, index) {
       this.appointVerify(this.getVfyKey(this.isEditIndex), (v) => {
-        if (v && this.id) {
+        if (v && this.id && row.id) {
           orderBaseProductDelete({
             orderProductId: row.id
           }).then(res => {

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/wb_productColumns.js

@@ -361,7 +361,7 @@ export default {
     },
     delProduct_wb(row, index) {
       this.appointVerify(this.getVfyKey_wb(this.isEditIndex), (v) => {
-        if (v && this.id) {
+        if (v && this.id && row.id) {
           orderBaseProductDelete({
             orderProductId: row.id
           }).then(res => {