Merge remote-tracking branch 'origin/master'

src/api/mes/reportWork.js

@@ -352,3 +352,15 @@ export function deleteReportNow(reportCode) {
 		method: 'delete'
 	});
 }
+
+//预报工
+export function preReportRow(reportCode) {
+	const data = {
+		reportCode
+	}
+	return request({
+		url: '/mes/reportWork/preReportRow',
+		method: 'post',
+		data: data
+	});
+}

src/api/plan/workorder.js

@@ -135,4 +135,42 @@ export function getUnReadComment(data){
 	  method:'post',
 	  data:data
 	})
-  }  
+}
+
+export function getWorkOrderBatch(workOrderId) {
+	return request({
+		url: '/plan/pro/workorder/getWorkOrderBatch/' + workOrderId,
+		method: 'get'
+		});
+}
+
+export function getWorkOrderBatchInfo(query) {
+	return request({
+		url: '/plan/pro/workorder/getWorkOrderBatchInfo',
+		method: 'get',
+    params: query
+	});
+}
+
+export function insertWorkOrderBatch(data){
+	return request({
+	  url:'/plan/pro/workorder/insertWorkOrderBatch',
+	  method:'post',
+	  data:data
+	})
+}
+  export function updateWorkOrderBatch(data){
+    return request({
+      url:'/plan/pro/workorder/updateWorkOrderBatch',
+      method:'put',
+      data:data
+    })
+  }
+
+export function removeWorkOrderBatch(batchCode,workorderCode) {
+	return request({
+		url: '/plan/pro/workorder/removeWorkOrderBatch/' +batchCode+ '/' +workorderCode,
+		method: 'delete',
+	});
+}
+

src/views/device/faultReport/index.vue

@@ -196,13 +196,13 @@
           >
         </template>
       </el-table-column>
-      <el-table-column 
+      <el-table-column
-        label="处理状态" 
+        label="处理状态"
         align="center"
         prop="orderStatus" />
-        <el-table-column 
+        <el-table-column
-        label="报修来源" 
+        label="报修来源"
-        align="center" 
+        align="center"
         prop="orderSource" />
       <el-table-column
         label="报修去向"
@@ -810,7 +810,7 @@
                 form.workPlanTime
               }}</el-descriptions-item>
               <el-descriptions-item label="是否停机维修">{{
-                form.workDownMachine ? "是" : "否"
+                form.workDownMachine ? "否" : "是"
               }}</el-descriptions-item>
               <el-descriptions-item label="计划停机时间">{{
                 form.workPlanDownTime
@@ -832,7 +832,7 @@
                 form.workPlanTime
               }}</el-descriptions-item>
               <el-descriptions-item label="是否停机维修">{{
-                form.workDownMachine ? "是" : "否"
+                form.workDownMachine ? "否" : "是"
               }}</el-descriptions-item>
               <el-descriptions-item label="计划停机时间">{{
                 form.workPlanDownTime
@@ -922,7 +922,7 @@
                 v-model="form.orderBreakdownTime"
                 type="datetime"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="报修时间"
+                placeholder="故障时间"
                 style="width: 200px"
               >
               </el-date-picker>
@@ -956,10 +956,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="报修人编号" prop="orderRepairmanCode">
+            <el-form-item label="报修人工号" prop="orderRepairmanCode">
               <el-input
                 v-model="form.orderRepairmanCode"
-                placeholder="请选择报修人编号"
+                placeholder="请选择报修人工号"
                 style="width: 200px"
               >
                 <el-button
@@ -1331,6 +1331,12 @@ export default {
         orderTime: [
           { required: true, message: "报修时间不能为空", trigger: "blur" },
         ],
+        orderDesc: [
+          { required: true, message: "故障描述不能为空", trigger: "blur" },
+        ],
+        orderRepairmanCode: [
+          { required: true, message: "报修人工号不能为空", trigger: "blur" },
+        ],
       },
     };
   },
@@ -1433,6 +1439,8 @@ export default {
         orderTime: null,
         orderHandle: null,
         orderRepairman: null,
+        orderRepairmanCode: null,
+        orderRepairmanName: null,
         orderConnection: null,
         orderStatus: null,
         orderRelevance: null,

src/views/device/upkeepOrder/index.vue

@@ -447,6 +447,14 @@
           />
         </template>
       </el-table-column>
+      <el-table-column label="检验状态" align="center" prop="orderInspect">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.device_inspect_status"
+            :value="scope.row.orderInspect"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         v-if="false"
         label="主键"
@@ -568,14 +576,6 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="检验状态" align="center" prop="orderInspect">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.device_inspect_status"
-            :value="scope.row.orderInspect"
-          />
-        </template>
-      </el-table-column>
       <el-table-column label="工单费用" align="center" prop="orderCost" />
       <el-table-column label="保养人" align="center" prop="planPerson" />
       <el-table-column
@@ -1555,6 +1555,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      // 多个保养单号
+      orderCodes: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -1741,6 +1743,7 @@ export default {
       const data = {
         ids: this.ids,
         inspect: this.inspect,
+        orderCodes: this.orderCodes,
       };
 
       subInspect(data).then((response) => {
@@ -2137,6 +2140,9 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.orderId);
+      this.orderCodes = selection.map((item) => item.orderCode);
+      console.log('this.ids',this.ids);
+      console.log('this.orderCodes',this.orderCodes);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },

src/views/mes/reportWork/index.vue

@@ -362,30 +362,42 @@
 							:show-overflow-tooltip="true">
 							<template slot-scope="scope">
 								<el-input type="number" size="small" v-model="scope.row.quantityFeedback"
-									@change="handleEdit(scope.$index, scope.row)"></el-input>
+									@change="handleEdit(scope.$index, scope.row)"
+                  :disabled="scope.row.attr1=='1'"
+                  ></el-input>
 							</template>
 						</el-table-column>
 						<el-table-column label="工时数" align="center" prop="workTime"  width="120">
 							<template slot-scope="scope">
 								<el-input type="number" size="small" v-model="scope.row.workTime"
-									@change="handleEdit(scope.$index, scope.row)"></el-input>
+									@change="handleEdit(scope.$index, scope.row)"
+                  :disabled="scope.row.attr1=='1'"
+                  ></el-input>
 							</template>
 						</el-table-column>
 						<el-table-column label="用人数" align="center" prop="useMan">
 							<template slot-scope="scope">
 								<el-input type="number" size="small" v-model="scope.row.useMan"
-									@change="handleEdit(scope.$index, scope.row)"></el-input>
+									@change="handleEdit(scope.$index, scope.row)"
+                  :disabled="scope.row.attr1=='1'"
+                  ></el-input>
 							</template>
 						</el-table-column>
             <el-table-column label="报工单编号" align="center" prop="reportCode" width="120" />
 						<el-table-column label="创建时间" align="center" prop="createTime" width="150" />
-            <el-table-column fixed="right" label="操作" width="90">
+            <!--
+            <el-table-column fixed="right" label="操作" width="160">
 							<template slot-scope="scope">
 								<el-button @click.native.prevent="deleteReportRow(scope.$index, item.libList)" size="small" type="danger" plain 
-                v-if="item.libId == 'order1'">
+                v-if="item.libId == 'order1'&&scope.row.uploadStatus!='1'&&scope.row.attr1!= '1'">
 									删除</el-button>
+
+                  <el-button @click.native.prevent="preReportRow(scope.$index, item.libList)" size="small" type="success" plain 
+                v-if="item.libId == 'order1'&&scope.row.attr1!='1'&&scope.row.uploadStatus!='1'" >
+									预报工</el-button>
 							</template>
 						</el-table-column>
+            -->
 					</el-table>
 
 					<div class="demo-input-suffix">
@@ -398,7 +410,7 @@
 			</el-tabs>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="cancel" v-if="optType == 'view'">返回</el-button>
-				<el-button type="primary" @click="submitReport" v-else>确 定</el-button>
+				<el-button type="primary" :disabled="loading" @click="submitReport" v-else>确 定</el-button>
 				<el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
@@ -645,7 +657,7 @@ import {
   submitReportPS,
   submitReportPSSAP,
   getCKList,
-  getPutInOrderList,
+  getPutInOrderList,preReportRow
 } from "@/api/mes/reportWork";
 import {
   getConsumeList,
@@ -1227,7 +1239,7 @@ export default {
       this.pReportRows = allRows.reduce((acc, cur) => {
         const hasDuplicate = acc.some(
           (item) =>
-            item.batch === cur.batch && item.workorderCode === cur.workorderCode
+            item.batch === cur.batch && item.workorderCode === cur.workorderCode && item.reportCode === cur.reportCode
         );
         if (!hasDuplicate) {
           acc.push(cur);
@@ -1257,7 +1269,7 @@ export default {
       this.pReportRows = allRows.reduce((acc, cur) => {
         const hasDuplicate = acc.some(
           (item) =>
-            item.batch === cur.batch && item.workorderCode === cur.workorderCode
+            item.batch === cur.batch && item.workorderCode === cur.workorderCode && item.reportCode === cur.reportCode
         );
         if (!hasDuplicate) {
           acc.push(cur);
@@ -1545,12 +1557,37 @@ export default {
 			}).catch(() => {});
     },
 
+    //报工详情表格--预报工
+    preReportRow(index, rows) {
+      let _this = this;
+      this.$modal.confirm('是否确认预报工？').then(function() {
+        _this.loading = true;
+				return preReportRow(rows[index].reportCode);
+			}).then(() => {
+          this.$modal.msgSuccess("预报工成功");
+                debugger
+                var sr = rows[index];
+                this.queryParams.workorderCode = sr.workorderCode;
+                this.queryParams.machineCode = sr.machineCode;
+                //查询工单报工记录列表
+                getAllLevelReportList(this.queryParams).then((response) => {
+                  this.queryParams.workorderCode = "";
+                  this.queryParams.machineCode = "";
+                  this.openReport = true;
+                  this.titleReport = "工单报工详情";
+                  this.libTabs = response;
+                });
+          _this.loading = false;      
+			}).catch(() => {});
+    },
+
     //物料损耗表格--删除
     deleteBomRow(index, rows) {
       this.$modal
         .confirm("是否确认删除？确认后，不需要点击下方确定,立马删除！")
         .then(function () {
           if (rows[index].recordId != null) {
+            this.loading = true;
             return deleteBomRowNow(rows[index].recordId);
           }
         })
@@ -1567,6 +1604,7 @@ export default {
           this.pConsumeRows = newPConsumeRows;
           rows.splice(index, 1);
           this.$modal.msgSuccess("删除成功");
+          this.loading = false;
         })
         .catch(() => {});
     },

src/views/plan/workorder/index.vue

@@ -173,6 +173,18 @@
         >切线调拨
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="editBatch"
+          v-hasPermi="['mes:pro:workorder:edit']"
+        >批次编辑
+        </el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -622,6 +634,84 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 批次编辑 -->
+    <el-dialog :title="batchTitle" :visible.sync="batchOpen" width="1000px" append-to-body>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-add"
+            size="mini"
+            @click="handleAddBatch"
+            v-hasPermi="['mes:pro:workorder:edit']"
+          >新增
+          </el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="batchSingle"
+            @click="handleUpdateBatch"
+            v-hasPermi="['mes:pro:workorder:edit']"
+          >修改
+          </el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-remove"
+            size="mini"
+            :disabled="batchSingle"
+            @click="handleRemoveBatch"
+            v-hasPermi="['mes:pro:workorder:edit']"
+          >删除
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table border v-loading="batchLoading" :data="batchData" @selection-change="batchSelectionChange"
+        ref="batchTable" row-key="orderCode"
+      >
+        <el-table-column type="selection" align="center" />
+        <el-table-column label="工单编号" align="center" prop="workorderCode" width="150"/>
+        <el-table-column label="当前批次号" align="center" prop="batchCode"/>
+        <el-table-column label="当前批次数量" align="center" prop="batchQuantity"/>
+        <el-table-column label="新批次号" align="center" prop="newBatchCode"/>
+        <el-table-column label="新批次数量" align="center" prop="newBatchQuantity"/>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="hangleCloseEditBatch">关 闭</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 批次编辑新增/修改页面 -->
+    <el-dialog :title="bEditTitle" :visible.sync="bEditOpen" width="600px" append-to-body>
+      <el-form :model="batchForm" ref="batchForm" :rules="batchRules" label-width="120px">
+        <el-form-item label="工单编号" prop="workorderCode">
+          <el-input v-model="batchForm.workorderCode" placeholder="" disabled></el-input>
+        </el-form-item>
+        <el-form-item v-if="editBatchFlag" label="当前批次号" prop="batchCode">
+          <el-input v-model="batchForm.batchCode" placeholder="请输入当前批次号" disabled></el-input>
+        </el-form-item>
+        <el-form-item v-if="editBatchFlag" label="当前批次数量" prop="batchQuantity">
+          <el-input type="number" v-model.number="batchForm.batchQuantity" placeholder="请输入当前批次数量" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="新批次号" prop="newBatchCode">
+          <el-input v-model="batchForm.newBatchCode" placeholder="请输入新批次号"></el-input>
+        </el-form-item>
+        <el-form-item label="新批次数量" prop="newBatchQuantity">
+          <el-input type="number" v-model.number="batchForm.newBatchQuantity" placeholder="请输入新批次数量"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="batchSubmitForm">确 定</el-button>
+        <el-button @click="batchCancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -634,7 +724,12 @@ import {
   getOrderAndWork,getProSortNo,
   getWorkBatchList,
   subChangeWorkOrderPro,subChangeWorkOrderM,
-  checkWorkOrder
+  checkWorkOrder,
+  getWorkOrderBatch,
+  getWorkOrderBatchInfo,
+  insertWorkOrderBatch,
+  updateWorkOrderBatch,
+  removeWorkOrderBatch
 } from '@/api/plan/workorder'
 import moment from 'moment';
 import { getProEquipment, getProRoutes, getProShifts,selectMaterielList} from '@/api/plan/order'
@@ -714,13 +809,18 @@ export default {
       },
       // 遮罩层
       loading: true,
+      batchLoading: true,
       // 选中数组
       ids: [],
       cods: [],
+      // 批次编辑列表
+      batchData: [],
       // 非单个禁用
       single: true,
+      batchSingle: true,
       // 非多个禁用
       multiple: true,
+      batchMultiple: true,
       // 下达禁用
       statuses: [],
       // 显示搜索条件
@@ -732,9 +832,15 @@ export default {
       // 弹出层标题
       title: "",
       titleM:"",
+      batchTitle: "",
+      bEditTitle: "",
       // 是否显示弹出层
       open: false,
       openM:false,
+      batchOpen: false,
+      bEditOpen: false,
+      // 是否禁止修改批次
+      editBatchFlag: false,
       // 查询参数
       queryParams: {
         productDateArray: [new Date(), new Date()],
@@ -768,6 +874,7 @@ export default {
       },
       // 表单参数
       form: {},
+      batchForm: {},
       // 表单校验
       rules: {
         workorderCode: [
@@ -789,6 +896,17 @@ export default {
           {required: true, message: "单位不能为空", trigger: "blur"}
         ],
       },
+      batchRules: {
+        workorderCode: [
+          {required: true, message: "工单编码不能为空", trigger: "blur"}
+        ],
+        batchCode: [
+          {required: true, message: "当前批次编码不能为空", trigger: "blur"}
+        ],
+        batchQuantity: [
+          {required: true, message: "当前批次数量不能为空", trigger: "blur"}
+        ]
+      },
       /**********************************/
       eRouteProps: {multiple: true},
       eRouteOptions: [],
@@ -1626,6 +1744,17 @@ export default {
       };
       this.resetForm("form");
     },
+    resetBatchForm() {
+      this.batchForm = {
+        workorderCode: null,
+        batchCode: null,
+        batchQuantity: null,
+        newBatchCode: null,
+        newBatchQuantity: null,
+        attr1: null,
+      }
+      this.resetForm("batchForm");
+    },
     // 首-搜索按钮操作
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -1647,6 +1776,13 @@ export default {
       this.multiple = !selection.length
       this.statuses = selection.map(item => item.status)
     },
+    batchSelectionChange(selection) {
+      this.batchids = selection.map(item => item.workorderId)
+      this.bWorkCodes = selection.map(item => item.workorderCode)
+      this.batchCodes = selection.map(item => item.batchCode)
+      this.batchSingle = selection.length !== 1
+      this.batchMultiple = !selection.length
+    },
     // 首-新增按钮操作
     handleAdd() {
       alert("待建设")
@@ -1664,6 +1800,91 @@ export default {
       })
       return value;
     },
+    editBatch() {
+      this.batchLoading = true;
+      const workOrdercode = this.codes[0];
+      getWorkOrderBatch(workOrdercode).then(response => {
+        if(response.code == 200) {
+          this.batchData = response.rows;
+          this.batchOpen = true;
+          this.batchLoading = false;
+          this.batchTitle = "批次编辑";
+        }
+
+      })
+    },
+    hangleCloseEditBatch() {
+      this.batchOpen = false;
+      this.getList();
+    },
+
+    // 批次编辑新增
+    handleAddBatch() {
+      this.resetBatchForm();
+      this.batchForm.workorderCode = this.codes[0];
+      this.bEditOpen = true;
+      this.bEditTitle = "批次新增";
+      this.editBatchFlag = false;
+    },
+    // 批次编辑修改
+    handleUpdateBatch() {
+      this.editBatchFlag = true;
+      this.resetBatchForm();
+      const params = {
+        workorderCode: this.bWorkCodes[0],
+        batchCode: this.batchCodes[0]
+      }
+      getWorkOrderBatchInfo(params).then(response => {
+        this.batchForm = response.data;
+        this.bEditOpen = true;
+        this.bEditTitle = "批次修改";
+      });
+    },
+    // 批次编辑取消
+    batchCancel() {
+      this.bEditOpen = false;
+      this.editBatch();
+    },
+    // 批次编辑提交
+    batchSubmitForm() {
+      this.$refs["batchForm"].validate(valid => {
+				if (valid) {
+					if (this.batchForm.batchCode != null) {
+						updateWorkOrderBatch(this.batchForm).then(response => {
+              if(response.code === 200) {
+                this.$modal.msgSuccess("修改成功");
+              }else{
+                this.$modal.msgError(response.msg);
+              }
+							this.bEditOpen = false;
+							this.editBatch();
+						});
+					} else {
+						insertWorkOrderBatch(this.batchForm).then(response => {
+              if(response.code === 200) {
+                this.$modal.msgSuccess("新增成功");
+              }else{
+                this.$modal.msgError(response.msg);
+              }
+							this.bEditOpen = false;
+							this.editBatch();
+						});
+					}
+				}
+			});
+    },
+    // 删除批次
+    handleRemoveBatch() {
+      const workorderCode = this.bWorkCodes[0];
+      const batchCode = this.batchCodes[0];
+			this.$modal.confirm('是否确认删除批次编号为"' + batchCode + '"的数据项？').then(function() {
+				return removeWorkOrderBatch(batchCode,workorderCode);
+			}).then(() => {
+				this.editBatch();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+    },
+
     //新增-打开组成白坯选择物料窗口
     selectBPMateriel() {
       // 清除搜索缓存

src/views/quality/checkTypeProject/selectProject.vue

@@ -17,13 +17,15 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item v-show="false" label="检测项目名称" prop="projectType">
+          <el-form-item label="检测方案名称" prop="projectType">
-            <el-input
+            <el-select v-model="queryParams.projectType" filterable clearable placeholder="请选择检测方案">
-              v-model="queryParams.projectType"
+              <el-option
-              placeholder="检测方案代码"
+              v-for="(item,index) in projectTypeOptions"
-              clearable
+              :key="index"
-              style="width: 240px"
+              :label="item.projectTypeName"
-            />
+              :value="item.projectTypeCode">
+              </el-option>
+            </el-select>
           </el-form-item>
 
           <el-form-item>
@@ -32,17 +34,7 @@
           </el-form-item>
         </el-form>
         <el-row :gutter="20">
-          <el-col :span="5" :xs="24">
+          <el-col :span="24" :xs="24">
-            <el-tabs v-model="editTabsValue" @tab-click="handleClick" :tab-position="'right'" style="height: 600px;">
-              <el-tab-pane
-              v-for="(item) in projectTypeOptions"
-              :key="item.projectTypeCode"
-              :label="item.projectTypeName"
-              :name="item.projectTypeCode"
-              >{{ item.projectTypeName }}</el-tab-pane>
-            </el-tabs>
-          </el-col>
-          <el-col :span="19" :xs="24">
             <el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
               <el-table-column width="50" align="center" type="selection">
               </el-table-column>

src/views/quality/qcIncome/index.vue

@@ -113,18 +113,17 @@
 					v-hasPermi="['quality:qcIncome:edit']"
 				>修改</el-button>
 			</el-col>
-			<!--
 			<el-col :span="1.5">
 				<el-button
 					type="danger"
 					plain
 					icon="el-icon-delete"
 					size="mini"
-					:disabled="multiple"
+					:disabled="single"
 					@click="handleDelete"
 					v-hasPermi="['quality:qcIncome:remove']"
 				>删除</el-button>
-			</el-col>-->
+			</el-col>
 			<el-col :span="1.5">
 				<el-button
 					type="warning"

src/views/quality/qcInventory/index.vue

@@ -103,18 +103,17 @@
 					v-hasPermi="['quality:qcInventory:edit']"
 				>修改</el-button>
 			</el-col>
-			<!--
 			<el-col :span="1.5">
 				<el-button
 					type="danger"
 					plain
 					icon="el-icon-delete"
 					size="mini"
-					:disabled="multiple"
+					:disabled="single"
 					@click="handleDelete"
 					v-hasPermi="['quality:qcIncome:remove']"
 				>删除</el-button>
-			</el-col>-->
+			</el-col>
 			<el-col :span="1.5">
 				<el-button
 					type="warning"

src/views/quality/qcProduce/index.vue

@@ -141,18 +141,18 @@
 					v-hasPermi="['quality:qcProduce:edit']"
 				>修改</el-button>
 			</el-col>
-			<!--
+			
 			<el-col :span="1.5">
 				<el-button
 					type="danger"
 					plain
 					icon="el-icon-delete"
 					size="mini"
-					:disabled="multiple"
+					:disabled="single"
 					@click="handleDelete"
 					v-hasPermi="['quality:qcProduce:remove']"
 				>删除</el-button>
-			</el-col>-->
+			</el-col>
 			<el-col :span="1.5">
 				<el-button
 					type="warning"
@@ -758,6 +758,7 @@ export default {
            this.form.quality = obj.quality;
 		   this.form.unit = obj.unit;
 		   this.form.incomeTime = obj.incomeTime;
+		   this.form.checkLoc = obj.checkLocName;
 		   getBatchList(obj.workorderCode).then(response => {
 				this.batchList = response;
 			});

src/views/quality/qcProduce/selectWorkOrder.vue

@@ -32,6 +32,7 @@
           <el-table-column label="产品名称"  align="left" prop="materialName" width="200"/>
           <el-table-column label="排产数量"  align="left" prop="quality" width="100" />
           <el-table-column label="单位"  align="left" prop="unit" width="80"/>
+          <el-table-column label="检验地点"  align="left" prop="checkLocName" width="80"/>
           <el-table-column label="生产日期"  align="left" prop="incomeTime" width="100" >
           			<template slot-scope="scope">
                   <span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d}') }}</span>

src/views/quality/qcWarehousing/index.vue

@@ -1,6 +1,18 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+
+           <el-form-item label="检验节点" prop="checkType">
+				<el-select v-model="queryParams.checkType" clearable placeholder="请选择检验节点">
+					<el-option
+						v-for="dict in checkTypes"
+						:key="dict.id"
+						:label="dict.checkName"
+						:value="dict.id"
+					></el-option>
+				</el-select>
+			</el-form-item>
+
 			<el-form-item label="任务编号" prop="checkNo">
 				<el-input
 					v-model="queryParams.checkNo"
@@ -43,7 +55,7 @@
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
-			</el-form-item>-->
+			</el-form-item>
 			<el-form-item label="仓库名称" prop="supplierName">
 				<el-input
 					v-model="queryParams.supplierName"
@@ -51,7 +63,7 @@
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
-			</el-form-item>
+			</el-form-item>-->
 			<el-form-item label="入库时间" prop="incomeTimeArray">
                 <el-date-picker
 				v-model="queryParams.incomeTimeArray"
@@ -131,7 +143,7 @@
 					v-hasPermi="['quality:qcWarehousing:edit']"
 				>修改</el-button>
 			</el-col>
-			<!-- <el-col :span="1.5">
+			<el-col :span="1.5">
 				<el-button
 					type="danger"
 					plain
@@ -141,7 +153,7 @@
 					@click="handleDelete"
 					v-hasPermi="['quality:qcWarehousing:remove']"
 				>删除</el-button>
-			</el-col>-->
+			</el-col>
 			<el-col :span="1.5">
 				<el-button
 					type="warning"
@@ -166,15 +178,16 @@
           }}</el-button>
         </template>
       </el-table-column>
-		<!--<el-table-column label="批次号" align="center" prop="incomeBatchNo" width="200" :show-overflow-tooltip="true"/>-->
 			<el-table-column label="订单号" align="center" prop="orderNo" width="130"/>
+		    <el-table-column label="批次号" align="center" prop="incomeBatchNo" width="200" :show-overflow-tooltip="true"/>
+			<el-table-column label="检验节点" align="center" prop="checkName" />
 			<el-table-column label="物料号" align="center" prop="materialCode" width="170" />
 			<el-table-column label="物料名称" align="center" prop="materialName" width="250" :show-overflow-tooltip="true"/>
 			<el-table-column label="数量" align="center" prop="quality" />
 			<el-table-column label="单位" align="center" prop="unit" />
-			<el-table-column label="仓库编码" align="center" prop="supplierCode" width="120"/>
+			<el-table-column label="车间编码" align="center" prop="supplierCode" width="120"/>
-			<el-table-column label="仓库名称" align="center" prop="supplierName" width="120"/>
+			<el-table-column label="车间名称" align="center" prop="supplierName" width="120"/>
-			<el-table-column label="入库时间" align="center" prop="incomeTime" width="180">
+			<el-table-column label="任务时间" align="center" prop="incomeTime" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
@@ -205,14 +218,6 @@
 						@click="handleCheckProject(scope.row)"
 						v-hasPermi="['quality:qcWarehousing:edit']"
 					>检验</el-button>
-					<!--
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['quality:qcWarehousing:remove']"
-					>删除</el-button>-->
 				</template>
 			</el-table-column>
 		</el-table>
@@ -321,6 +326,7 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
+					<!--
 					<el-col :span="8">
 						<el-form-item label="仓库名称" prop="supplierName">
 							<el-input v-model="form.supplierName" placeholder="请选择仓库名称">
@@ -332,8 +338,19 @@
 						<el-form-item label="仓库编码" prop="supplierCode">
 							<el-input v-model="form.supplierCode" placeholder="请输入仓库编码" disabled/>
 						</el-form-item>
+					</el-col>-->
+					<el-col :span="8">
+						<el-form-item label="车间名称" prop="supplierName">
+							<el-input v-model="form.supplierName" placeholder="请输入所属车间名称" >
+							<el-button slot="append" @click="handleSelectWorkCenter" icon="el-icon-search"></el-button>
+							</el-input>
+						</el-form-item>
 					</el-col>
-
+				   <el-col :span="8">
+						<el-form-item label="车间编码" prop="supplierCode">
+							<el-input v-model="form.supplierCode" placeholder="请输入所属车间编码" disabled/>
+						</el-form-item>
+                    </el-col>
 				</el-row>
 				<el-row>
 					<el-col :span="8">
@@ -370,11 +387,16 @@
 				ref="itemSelectMaterial"
 				@onSelected="onSelectMaterial"
 			></ItemSelectMaterial>
-			<!--仓库选择弹窗-->
+			<!--仓库选择弹窗
 			<ItemSelectLoc
 				ref="itemSelectLoc"
 				@onSelected="onSelectLoc"
-			></ItemSelectLoc>
+			></ItemSelectLoc>-->
+			<!--工作中心(车间)选择弹窗-->
+			<ItemSelectWorkCenter
+				ref="itemSelectWorkCenter"
+				@onSelected="onSelectWorkCenter"
+			></ItemSelectWorkCenter>
 			<!--人员选择弹窗-->
 			<ItemSelectUser
 				ref="itemSelectUser"
@@ -392,16 +414,18 @@
 import { listWarehousing, getWarehousing, delWarehousing, addWarehousing, updateWarehousing } from "@/api/quality/warehousing";
 import { getBatchList} from "@/api/quality/qcProduce";
 import { getCheckTypes } from "@/api/quality/qcProduce";
-import ItemSelectWorkOrder from "./selectProductWorkOrder.vue";
+//import ItemSelectWorkOrder from "./selectProductWorkOrder.vue";
+import ItemSelectWorkOrder from "../qcProduce/selectWorkOrder.vue";
+import ItemSelectWorkCenter from "../qcProduce/selectWorkCenter";
 import ItemSelectMaterial from "../qcIncome/selectMaterial.vue";
-import ItemSelectLoc from "./selectLoc.vue";
+//import ItemSelectLoc from "./selectLoc.vue";
 import ItemSelectUser from "../qcIncome/selectUser.vue";
 import ItemSelectProject from "../qcIncome/checkProjectType.vue";
 import moment from 'moment';
 import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
 export default {
 	name: "Warehousing",
-	components: { ItemSelectMaterial,ItemSelectLoc,ItemSelectUser,ItemSelectProject,ItemSelectWorkOrder},
+	components: { ItemSelectMaterial,ItemSelectWorkCenter,ItemSelectUser,ItemSelectProject,ItemSelectWorkOrder},
 	dicts: ["unit","check_status","check_result"],
 	data() {
 		return {
@@ -476,9 +500,9 @@ export default {
 				incomeTime: [
 					{ required: true, message: "入库时间不能为空", trigger: "blur" }
 				],
-				checkManName: [
+				//checkManName: [
-					{ required: true, message: "检测人不能为空", trigger: "blur" }
+				//	{ required: true, message: "检测人不能为空", trigger: "blur" }
-				],
+				//],
 				checkLoc: [
 					{ required: true, message: "检测地点不能为空", trigger: "blur" }
 				]
@@ -677,6 +701,7 @@ export default {
            this.form.quality = obj.quality;
 		   this.form.unit = obj.unit;
 		   this.form.incomeTime = obj.incomeTime;
+		   this.form.checkLoc = obj.checkLocName;
 		   getBatchList(obj.workorderCode).then(response => {
 				this.batchList = response;
 			});
@@ -691,6 +716,16 @@ export default {
 		   this.form.materialName = obj.name;
 		},
 
+		/**工作中心选择弹出框**/
+		handleSelectWorkCenter() {
+		  this.$refs.itemSelectWorkCenter.showFlag = true;
+		},
+		//工作中心选择确认
+		onSelectWorkCenter(obj) {
+           this.form.supplierCode = obj.code;
+		   this.form.supplierName = obj.name;
+		},
+
 		/**仓库选择弹出框**/
 		handleSelectLoc() {
 		  this.$refs.itemSelectLoc.showFlag = true;