Merge branch 'zhang'

src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue

@@ -8,7 +8,7 @@
     </el-card>
 
     <el-card>
-      <el-table :data="List" highlight-current-row border>
+      <el-table :data="List" style="height: 550px" border size="small">
         <el-table-column label="设备名称" align="center" >
           <template slot-scope="scope">
             {{ scope.row.设备名称 }}
@@ -184,8 +184,7 @@ export default {
         { value: '3', label: 3 },
         { value: '4', label: 4 }],
       form: {
-        设备名称: '',
-        设备编号: '',
+        设备名称: '', 设备编号: '',
         设备型号: '',
         设备性能指标: '',
         设备加工能力: '',

src/views/Outsourcing/OutsourcingTaskExecution/index.vue

@@ -5,7 +5,9 @@
       <span>表单号:</span>
       <el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:200px"/>
       <span>外协厂家:</span>
-      <el-input v-model="manufacturers" readonly size="small" placeholder="外协厂家" style="width:200px" clearable @dblclick.native="onFocus1();param=0"/>
+      <el-input v-model="manufacturers" readonly size="small" placeholder="外协厂家" style="width:250px" clearable>
+        <el-button slot="append" icon="el-icon-search" @click="onFocus1();param=0"/>
+      </el-input>
       <span>下达任务日期:</span>
       <el-date-picker
         v-model="time"
@@ -446,8 +448,12 @@ import { getTable, getData1, getTable1, getprocedure, searchManufactor, sparePar
 import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
 import { convertCurrency } from '@/vendor/int2Chinese'
 import { mapGetters } from 'vuex'
+import elInput from 'element-ui/packages/input'
 
 export default {
+  components: {
+    elInput
+  },
   data() {
     return {
       bianliang: [],
@@ -609,7 +615,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 +877,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 +1052,7 @@ export default {
         })
       }
     },
+    // 确定价格
     confirmPrice() {
       this.code1 = 0
       for (let i = 0; i < this.List3.length; i++) {
@@ -1168,6 +1175,7 @@ export default {
         })
       }
     },
+    // 成交
     Deal() {
       this.documentStatus = 2
       this.sign = 1
@@ -1227,7 +1235,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