外协任务执行

src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue

@@ -184,8 +184,7 @@ export default {
         { value: '3', label: 3 },
         { value: '4', label: 4 }],
       form: {
-        设备名称: '',
-        设备编号: '',
+        设备名称: '', 设备编号: '',
         设备型号: '',
         设备性能指标: '',
         设备加工能力: '',

src/views/Outsourcing/OutsourcingTaskExecution/index.vue

@@ -609,7 +609,7 @@ export default {
       this.List3 = []
       getTable(this.num, this.formNumber, this.num1, this.ManufactorNumber, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize).then(response => {
         this.total = parseInt(response.data.total)
-        for (let i = 0; i < response.data.length; i++) {
+        for (let i = 0; i < response.data.rows.length; i++) {
           if (response.data.rows[i].任务下达日期 !== null) {
             response.data.rows[i].任务下达日期 = response.data.rows[i].任务下达日期.substr(0, 10)
           }
@@ -871,7 +871,7 @@ export default {
       sums[4] = '材料费:'
       sums[6] = '其他费用:'
       sums[8] = '运费:'
-      sums[9] = this.freight
+      sums[9] = parseInt(this.freight)
       sums[10] = '合计:'
       for (let i = 0; i < data.length; i++) {
         sums[24] += Math.round(parseFloat(data[i].外协预算总价格) * 100) / 100
@@ -1046,6 +1046,7 @@ export default {
         })
       }
     },
+    // 确定价格
     confirmPrice() {
       this.code1 = 0
       for (let i = 0; i < this.List3.length; i++) {
@@ -1168,6 +1169,7 @@ export default {
         })
       }
     },
+    // 成交
     Deal() {
       this.documentStatus = 2
       this.sign = 1
@@ -1227,7 +1229,7 @@ export default {
     },
     // 提交编辑
     submitEdit() {
-      editData(this.Number, this.ManufactorNumber1, this.form.运费, this.documentStatus, this.sign, this.Explain).then(response => {
+      editData(this.Number, this.ManufactorNumber1, this.form.运费, this.documentStatus, 1, this.Explain).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('编辑成功')
           this.dialogFormVisible = false