Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

src/views/ManufacturingCenter/SparePartsForScrap/index.vue

@@ -51,36 +51,42 @@
         style="width: 100%; text-align: center"
         @current-change="fetchTableData2">
         <el-table-column
+          align="center"
           prop="province1"
           label="零件号"
         >
           <template slot-scope="scope">{{ scope.row.零件图号 }}</template>
         </el-table-column>
         <el-table-column
+          align="center"
           prop="province2"
           label="零件名称"
         >
           <template slot-scope="scope">{{ scope.row.零件名称 }}</template>
         </el-table-column>
         <el-table-column
+          align="center"
           prop="province4"
           label="批次数量"
         >
           <template slot-scope="scope">{{ scope.row.批次数量 }}</template>
         </el-table-column>
         <el-table-column
+          align="center"
           prop="province5"
           label="开始时间"
         >
           <template slot-scope="scope">{{ scope.row.机加工开始时间 }}</template>
         </el-table-column>
         <el-table-column
+          align="center"
           prop="province6"
           label="结束时间"
         >
           <template slot-scope="scope">{{ scope.row.机加工结束时间 }}</template>
         </el-table-column>
         <el-table-column
+          align="center"
           prop="province7"
           label="批次零件状态"
         >
@@ -90,6 +96,7 @@
           </template>
         </el-table-column>
         <el-table-column
+          align="center"
           fixed="right"
           label="操作"
           width="100px"
@@ -119,7 +126,6 @@
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(226,223,223,1)"
         height="250"
-        highlight-current-row
         border
         stripe
         style="width: 100%">
@@ -377,6 +383,7 @@ export default {
       this.MachineDrawingValue ? this.MachineCode_check = 1 : this.MachineCode_check = 0
       this.TeamValue ? this.TeamCode_check = 1 : this.TeamCode_check = 0
       this.PartDrawing ? this.PartDrawing_check = 1 : this.PartDrawing_check = 0
+      this.tableData2 = []
       this.getTable(TableDataSelect, [this.ProjectCode_check, this.ProjectNameValue, this.MachineCode_check, this.MachineDrawingValue, this.TeamCode_check, this.TeamValue, this.ComponentPartsBasicCattleTaxNumber_check, this.ComponentPartsBasicCattleTaxNumber, this.CutCode_check, this.CutCode, this.CutCodeBefore_check, this.CutCodeBefore, this.Assess_check, this.Assess, this.PartDrawing_check, this.PartDrawing, this.currentPage1, this.pageSize1], ['tableData', 'total1', 'loading'])
     },
     fetchTableData2(row) {

src/views/ManufacturingCenter/StatusQuery/index.vue

@@ -27,7 +27,6 @@
       </el-input>
       <span>零件号:</span>
       <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px"/>
-      <br>
       <span>零件状态:</span>
       <el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px">
         <el-option
@@ -36,14 +35,14 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span>零件类型:</span>
+      <!--<span>零件类型:</span>-->
-      <el-select v-model="partTypeValue" placeholder="零件类型" size="small" clearable style="margin-top: 15px;width: 200px">
+      <!--<el-select v-model="partTypeValue" placeholder="零件类型" size="small" clearable style="margin-top: 15px;width: 200px">-->
-        <el-option
+      <!--<el-option-->
-          v-for="item in partType"
+      <!--v-for="item in partType"-->
-          :key="item.value"
+      <!--:key="item.value"-->
-          :label="item.label"
+      <!--:label="item.label"-->
-          :value="item.value"/>
+      <!--:value="item.value"/>-->
-      </el-select>
+      <!--</el-select>-->
       <el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
     </el-card>
 
@@ -100,15 +99,15 @@
             </el-steps>
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="120px">
+        <!--<el-table-column label="操作" fixed="right" align="center" width="120px">-->
-          <template slot-scope="scope">
+        <!--<template slot-scope="scope">-->
-            <el-button
+        <!--<el-button-->
-              size="mini"
+        <!--size="mini"-->
-              type="primary"
+        <!--type="primary"-->
-              icon="el-icon-edit"
+        <!--icon="el-icon-edit"-->
-              @click="handleEdit(scope.row)">编辑</el-button>
+        <!--@click="handleEdit(scope.row)">编辑</el-button>-->
-          </template>
+        <!--</template>-->
-        </el-table-column>
+        <!--</el-table-column>-->
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
@@ -352,7 +351,6 @@ export default {
       }
       this.loading0 = true
       searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
-        console.log(response.data)
         for (let i = 0; i < response.data.rows.length; i++) {
           response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
           if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
@@ -435,7 +433,6 @@ export default {
       this.dialogFormVisible3 = false
     },
     handleEdit(row) {
-      console.log(row)
       this.title = '编辑'
       this.partStateValue1 = parseInt(row.考核状态) + 2
       this.dialogFormVisible4 = true

src/views/TechnologyCenter/CreatePackingList/index.vue

@@ -293,6 +293,7 @@
                 value-format="yyyy-MM-dd"
                 size="small"
                 type="date"
+                style="width:200px"
                 placeholder="请选择发货节点"/>
             </el-form-item>
           </el-col>