添加典型装配工艺模块及修复一些问题

src/views/ManufacturingCenter/GroupMatching/index.vue

@@ -19,9 +19,9 @@
           :value="item.value"/>
       </el-select>
       <span>机床号:</span>
-      <el-input v-model="machineToolNumber" placeholder="机床号" size="small" clearable style="width:200px" @change="empty1" @dblclick.native="SearchMachine"/>
+      <el-input v-model="machineToolNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @change="empty1" @dblclick.native="SearchMachine"/>
       <span>组号:</span>
-      <el-input v-model="groupNumber" placeholder="组号" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
+      <el-input v-model="groupNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
       <span>年:</span>
       <el-date-picker
         v-model="year"
@@ -155,7 +155,9 @@
           @size-change="handleSizeChange1"
           @current-change="handleCurrentChange1"/>
       </div>
-      <el-button type="primary" style="margin-left: 350px;margin-top: 20px" @click="submitName">提交</el-button>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitName">提交</el-button>
+      </div>
     </el-dialog>
 
     <el-dialog :visible.sync="dialogFormVisible3" title="选择组号" center style="min-height: 300px">
@@ -202,7 +204,9 @@
           @size-change="handleSizeChange3"
           @current-change="handleCurrentChange3"/>
       </div>
-      <el-button type="primary" style="margin-left: 350px;margin-top: 20px" @click="submitGroup">提交</el-button>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitGroup">提交</el-button>
+      </div>
     </el-dialog>
   </div>
 </template>

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -299,7 +299,7 @@
             style="width:200px"/>
         </el-form-item>
 
-        <el-form-item label="请购人" prop="请购人">
+        <el-form-item label="请购人">
           <el-input
             v-model="name"
             size="small"
@@ -496,6 +496,12 @@ export default {
         this.check4 = 0
       }
       searchTable1(this.PurchaseOrder, this.check4).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          console.log(response.data[i].请购时间)
+          if (response.data[i].请购时间 !== '') {
+            response.data[i].请购时间 = (response.data[i].请购时间).split(' ')[0]
+          }
+        }
         this.tableData4 = response.data
       })
     },

src/views/ManufacturingCenter/StatusQuery/index.vue

@@ -20,9 +20,9 @@
           :value="item.value"/>
       </el-select>
       <span>机床号:</span>
-      <el-input v-model="machineToolNumber" placeholder="机床号" size="small" clearable style="width:200px" @dblclick.native="SearchMachine" @change="empty1"/>
+      <el-input v-model="machineToolNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="SearchMachine" @change="empty1"/>
       <span>组号:</span>
-      <el-input v-model="groupNumber" placeholder="组号" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
+      <el-input v-model="groupNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
       <span>零件号:</span>
       <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px"/>
       <br>
@@ -187,7 +187,9 @@
           @size-change="handleSizeChange1"
           @current-change="handleCurrentChange1"/>
       </div>
-      <el-button type="primary" style="margin-left: 350px;margin-top: 20px" @click="submitName">提交</el-button>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitName">提交</el-button>
+      </div>
     </el-dialog>
 
     <el-dialog :visible.sync="dialogFormVisible3" title="选择组号" center style="min-height: 300px">
@@ -234,7 +236,9 @@
           @size-change="handleSizeChange3"
           @current-change="handleCurrentChange3"/>
       </div>
-      <el-button type="primary" style="margin-left: 350px;margin-top: 20px" @click="submitGroup">提交</el-button>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitGroup">提交</el-button>
+      </div>
     </el-dialog>
 
   </div>

src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue

@@ -253,6 +253,7 @@ export default {
       this.form.设备型号 = row.设备型号
       this.form.设备性能指标 = row.设备性能指标
       this.form.设备加工能力 = row.设备加工能力工时
+      this.form.设备加工工艺 = parseInt(row.工艺属性代码)
       this.form.班次类型 = row.班次类型
       this.form.设备工时系数 = row.设备工时系数
       this.form.整改工时系数 = row.整改工时比例