质量问题修改

src/api/quality/checkTypeProject.js

@@ -73,3 +73,11 @@ export function getProjectInfoList(query) {
 		params: query
 	});
 }
+//方案下拉
+export function getProjectOptions(query) {
+	return request({
+		url: '/quality/checkTypeProject/getProjectOptions',
+		method: 'get',
+		params: query
+	});
+}

src/api/quality/qcTable.js

@@ -25,3 +25,19 @@ export function getWorkcenterList() {
 		method: 'get'
 	});
 }
+
+export function getXJCheckTableList(query) {
+	return request({
+		url: '/quality/staticTable/getXJCheckTableList',
+		method: 'get',
+		params: query
+	});
+}
+
+export function getXJCheckTableDetail(query) {
+	return request({
+		url: '/quality/staticTable/getXJCheckTableDetail',
+		method: 'get',
+		params: query
+	});
+}

src/views/mes/reportWork/index.vue

@@ -92,7 +92,7 @@
 					@click="handleDelete"
 					v-hasPermi="['mes:reportWork:remove']"
 				>删除</el-button>
-			</el-col>-->
+			</el-col>
 			<el-col :span="1.5">
 				<el-button
 					type="success"
@@ -103,7 +103,7 @@
 					@click="handleReportHz"
 					v-hasPermi="['mes:reportWork:report']"
 			    >报工详情</el-button>
-			</el-col>
+			</el-col>-->
 			<el-col :span="1.5">
 				<el-button
 					type="danger"

src/views/quality/checkTypeProject/selectProject.vue

@@ -18,6 +18,18 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+
+          <el-form-item label="检测方案名称">
+            <el-select v-model="queryParams.projectType" filterable placeholder="请选择检测方案">
+              <el-option
+              v-for="item in projectTypeOptions"
+              :key="item.projectTypeCode"
+              :label="item.projectTypeName"
+              :value="item.projectTypeCode">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -76,7 +88,7 @@
 </template>
 <script>
 
-import { getProjectInfoList } from "@/api/quality/checkTypeProject";
+import { getProjectInfoList,getProjectOptions } from "@/api/quality/checkTypeProject";
 export default {
   name: "itemSelectUser",
   dicts: ["qc_rule_prop"],
@@ -110,14 +122,21 @@ export default {
         groupId:null,
         materialCode:null,
         typeCode:null
-      }
+      },
+      projectTypeOptions:[]
     };
   },
   created() {
-    //this.getList();
+    this.getProjectList();
   },
 
   methods: {
+    //获取方案下拉数据
+    getProjectList() {
+      getProjectOptions(this.queryParams).then(response => {
+          this.projectTypeOptions = response;
+      });
+    },
 
     init(groupId,materialCode,typeId){
       this.queryParams.groupId = groupId;

src/views/quality/qcTableXJ/index.vue

@@ -1,41 +1,33 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" class="edit-el-form">
-			<el-form-item label="订单编码" prop="workorderCodeSap">
+			<el-form-item label="订单编码" prop="orderNo">
 				<el-input
-					v-model="queryParams.workorderCodeSap"
+					v-model="queryParams.orderNo"
 					placeholder="请输入订单编码"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="产品编号" prop="productCode">
+			<el-form-item label="产品编号" prop="materialCode">
 				<el-input
-					v-model="queryParams.productCode"
+					v-model="queryParams.materialCode"
 					placeholder="请输入产品编号"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="产品名称" prop="productName">
+			<el-form-item label="批次编码" prop="incomeBatchNo">
 				<el-input
-					v-model="queryParams.productName"
+					v-model="queryParams.incomeBatchNo"
-					placeholder="请输入产品名称"
+					placeholder="请输入批次编码"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<!-- <el-form-item label="规格型号" prop="productSpc">
+			<el-form-item label="工单生产日期" prop="incomeTime">
-				<el-input
-					v-model="queryParams.productSpc"
-					placeholder="请输入规格型号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item> -->
-			<el-form-item label="工单生产日期" prop="productDate">
 				<el-date-picker clearable
-					v-model="queryParams.productDate"
+					v-model="queryParams.incomeTime"
 					type="date"
 					value-format="yyyy-MM-dd"
 					placeholder="请选择工单生产日期"
@@ -62,38 +54,6 @@
 		</el-form>
 
 		<el-row :gutter="10" class="mb8">
-			<!-- <el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['mes:prepare:add']"
-				>新增</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="success"
-					plain
-					icon="el-icon-edit"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['mes:prepare:edit']"
-				>修改</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					plain
-					icon="el-icon-delete"
-					size="mini"
-					:disabled="multiple"
-					@click="handleDelete"
-					v-hasPermi="['mes:prepare:remove']"
-				>删除</el-button>
-			</el-col> -->
 			<el-col :span="1.5">
 				<el-button
 					type="warning"
@@ -104,45 +64,26 @@
 					v-hasPermi="['mes:prepare:export']"
 				>导出</el-button>
 			</el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          :disabled="single"
-          icon="el-icon-download"
-          size="mini"
-          @click="showPrint"
-          v-hasPermi="['mes:prepare:export']"
-        >打印预览</el-button>
-      </el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
 		<el-table v-loading="loading" :data="prepareList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column prop="date" label="生产日期" width="100" align="center"/>
+			<el-table-column prop="orderNo" label="订单编码" width="130" align="center"/>
-			<el-table-column prop="date" label="产品名称" width="150" align="center"/>
+			<el-table-column label="订单批次" align="center" prop="incomeBatchNo" width="180">
-			<el-table-column prop="date" label="产品编码" width="150" align="center"/>
+				 <template slot-scope="scope">
-			<el-table-column prop="date" label="订单编码" width="150" align="center"/>
+					<el-button
-			<el-table-column prop="date" label="订单批次" width="150" align="center"/>
+						type="text"
-            <el-table-column label="上午" align="center" >
+						@click="handleDetail(scope.row)"
-            	<el-table-column prop="name" label="8:00-9:00" width="120" align="center"/>
+					>{{scope.row.incomeBatchNo}}</el-button>
-				<el-table-column prop="name" label="9:00-10:00" width="120" align="center"/>
+				</template>
-				<el-table-column prop="name" label="10:00-11:00" width="120" align="center"/>
-				<el-table-column prop="name" label="11:00-12:00" width="120" align="center"/>
-            </el-table-column>
-            <el-table-column label="下午" align="center" >
-            	<el-table-column prop="name" label="13:30-14:30" width="120" align="center"/>
-				<el-table-column prop="name" label="14:30-15:30" width="120" align="center"/>
-				<el-table-column prop="name" label="15:30-16:30" width="120" align="center"/>
-				<el-table-column prop="name" label="16:30-17:30" width="120" align="center"/>
-            </el-table-column>
-			<el-table-column label="加班" align="center" >
-            	<el-table-column prop="name" label="12:30-13:30" width="120" align="center"/>
-				<el-table-column prop="name" label="18:00-19:00" width="120" align="center"/>
-				<el-table-column prop="name" label="19:00-20:00" width="120" align="center"/>
-				<el-table-column prop="name" label="20:00-21:00" width="120" align="center"/>
 			</el-table-column>
+			<el-table-column prop="incomeTime" label="生产日期" width="100" align="center"/>
+			<el-table-column prop="materialName" label="产品名称"align="center"/>
+			<el-table-column prop="materialCode" label="产品编码" width="150" align="center"
+			:formatter="productCodeFormate"/>
+			<el-table-column prop="quality" label="数量" width="80" align="center"/>
+			<el-table-column prop="unit" label="单位" width="80" align="center"/>
 		</el-table>
 
 		<pagination
@@ -153,161 +94,41 @@
 			@pagination="getList"
 		/>
 
-		<!-- 添加或修改备料单对话框 -->
+		<!-- 报工详情 -->
-		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+		<el-dialog :title="titleReport" :visible.sync="openReport" width="1400px">
-			<el-form ref="form" :model="form" :rules="rules" label-width="110px">
+			<el-table v-loading="loading" :data="pOrderTableList" ref="myPOrderTable"
-				<el-form-item label="工单编码" prop="workorderCode">
-					<el-input v-model="form.workorderCode" placeholder="请输入工单编码" />
-				</el-form-item>
-				<el-form-item label="工单名称" prop="workorderName">
-					<el-input v-model="form.workorderName" placeholder="请输入工单名称" />
-				</el-form-item>
-				<el-form-item label="父工单" prop="parentOrder">
-					<el-input v-model="form.parentOrder" placeholder="请输入父工单" />
-				</el-form-item>
-				<el-form-item label="订单编码" prop="orderCode">
-					<el-input v-model="form.orderCode" placeholder="请输入订单编码" />
-				</el-form-item>
-				<el-form-item label="产品编号" prop="productCode">
-					<el-input v-model="form.productCode" placeholder="请输入产品编号" />
-				</el-form-item>
-				<el-form-item label="产品名称" prop="productName">
-					<el-input v-model="form.productName" placeholder="请输入产品名称" />
-				</el-form-item>
-				<el-form-item label="规格型号" prop="productSpc">
-					<el-input v-model="form.productSpc" placeholder="请输入规格型号" />
-				</el-form-item>
-				<el-form-item label="配料计划明细id" prop="wetDetailPlanId">
-					<el-input v-model="form.wetDetailPlanId" placeholder="请输入配料计划明细id" />
-				</el-form-item>
-				<el-form-item label="工单生产日期" prop="productDate" >
-					<el-date-picker clearable
-						v-model="form.productDate"
-						type="date"
-						value-format="yyyy-MM-dd"
-						placeholder="请选择工单生产日期"
-						style="width:350px">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="班次" prop="shiftId">
-					<el-input v-model="form.shiftId" placeholder="请输入班次" />
-				</el-form-item>
-				<el-form-item label="备注" prop="remark">
-					<el-input v-model="form.remark" placeholder="请输入备注" />
-				</el-form-item>
-				<el-form-item label="工厂编码" prop="factoryCode">
-					<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-			</div>
-		</el-dialog>
-
-    <!-- 打印预览弹出层 -->
-    <el-dialog
-      title="备料信息"
-      :visible.sync="printDialogVisible"
-      width="1000px"
 			>
-      <div id="printFrom" class="my-print-box">
+				<el-table-column label="id" align="center" prop="recordId" v-if="false"/>
-
+				<el-table-column label="序号" type="index" align="center" :index="indexMethod"/>
-        <el-form :ref="formRef" :model="form" :rules="validateRules">
+				<el-table-column label="项目名称" width="160" align="left" prop="ruleName" :show-overflow-tooltip="true" />
-
+				<el-table-column label="上午" align="center" >
-          <!-- 表头-工单信息 -->
+					<el-table-column prop="column080090" label="8:00-9:00" width="80" align="center"/>
-          <el-row class="my-print-head">
+					<el-table-column prop="column090100" label="9:00-10:00" width="90" align="center"/>
-            <el-col :offset="10" :span="5">生产订单备料单(订单物料)</el-col>
+					<el-table-column prop="column100110" label="10:00-11:00" width="100" align="center"/>
-          </el-row>
+					<el-table-column prop="column110120" label="11:00-12:00" width="100" align="center"/>
-          <!-- 导航栏 -->
-          <el-row class="my-print-nav">
-            <el-col :span="4">工厂:{{printData.factory}}</el-col>
-            <el-col :span="4">工作中心:{{printData.workCenter}}</el-col>
-            <el-col :span="4">生产日期:{{printData.productDate}}</el-col>
-            <el-col :span="4">打印日期:{{printData.printDate}}</el-col>
-            <el-col :span="4">页次:  1/  1</el-col>
-          </el-row>
-          <!-- 主数据 -->
-          <el-table
-            v-if="refreshNewWorkerTable"
-            v-loading="newWorkerLoading"
-            class="my-print-table"
-            :data="printData.workTable"
-            border
-            style="width: 100%">
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50">
-            </el-table-column>
-            <el-table-column
-              prop="materialCode"
-              label="料号"
-              width="170">
-            </el-table-column>
-            <el-table-column
-              prop="materialName"
-              label="物料描述"
-              width="240">
-            </el-table-column>
-            <el-table-column
-              prop="unit"
-			  width="50"
-              label="单位">
-            </el-table-column>
-            <el-table-column
-              prop="workorderCode"
-			  width="120"
-              label="生产订单">
-            </el-table-column>
-            <el-table-column
-              prop="quantity"
-              label="请领数量">
-            </el-table-column>
-            <el-table-column
-              prop="fundQuanlity"
-              label="欠领数量">
 				</el-table-column>
-            <el-table-column
+				<el-table-column label="下午" align="center" >
-              prop="routeCode"
+					<el-table-column prop="column123133" label="13:30-14:30" width="100" align="center"/>
-			  width="80"
+					<el-table-column prop="column133143" label="14:30-15:30" width="100" align="center"/>
-              label="实发数量">
+					<el-table-column prop="column143153" label="15:30-16:30" width="100" align="center"/>
+					<el-table-column prop="column153163" label="16:30-17:30" width="100" align="center"/>
 				</el-table-column>
-			<el-table-column
+				<el-table-column label="加班" align="center" >
-              prop="recoil"
+					<el-table-column prop="column163173" label="12:30-13:30" width="100" align="center"/>
-              label="反冲物料">
+					<el-table-column prop="column180190" label="18:00-19:00" width="100" align="center"/>
+					<el-table-column prop="column190200" label="19:00-20:00" width="100" align="center"/>
+					<el-table-column prop="column200210" label="20:00-21:00" width="100" align="center"/>
 				</el-table-column>
 			</el-table>
-
+			<div slot="footer" class="dialog-footer">
-          <br/>
+        		<el-button @click="cancel">关闭</el-button>
-          <!-- 底部 -->
-          <el-row class="my-print-foot">
-            <el-col :offset="1" :span="3">发料人:</el-col>
-            <el-col :offset="2" :span="3">收料人:</el-col>
-            <el-col :offset="2" :span="3">白色:车间联</el-col>
-            <el-col :offset="1" :span="3">蓝色:仓库联</el-col>
-            <el-col :offset="1" :span="3">红色:财务联</el-col>
-          </el-row>
-          <el-row class="my-print-foot">
-            <el-col :offset="1" :span="3">SAP-No:{{printData.SAPNo}}</el-col>
-            <el-col :offset="1" :span="3">Z-PM-F-030-A.2</el-col>
-          </el-row>
-
-        </el-form>
-
-
 			</div>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handlePrint(printData)">打 印</el-button>
-      </span>
 		</el-dialog>
-
 	</div>
 </template>
 
 <script>
-import { listPrepare, getPrepare, delPrepare, addPrepare, updatePrepare } from "@/api/mes/prepare";
+import { getXJCheckTableList,getXJCheckTableDetail } from "@/api/quality/qcTable";
-import {printPrepareByCode} from "@/api/mes/prepareDetail";
 import moment from "moment/moment";
 export default {
 	name: "Prepare",
@@ -330,7 +151,7 @@ export default {
 				auditor: null,
 				printDate: null,
 				factory: null,
-        productDate: null,
+				incomeTime: null,
 				workTable: [],
 			},
 			printDialogVisible: false,
@@ -356,7 +177,7 @@ export default {
 				queryParams: {
 					pageNum: 1,
 					pageSize: 10,
-				workorderCode: null,
+					checkNo: null,
 					workorderName: null,
 					parentOrder: null,
 					orderId: null,
@@ -367,14 +188,9 @@ export default {
 					productName: null,
 					productSpc: null,
 					wetDetailPlanId: null,
-				productDate: null,
+					incomeTime: null,
-				shiftId: null,
+					incomeBatchNo:null,
-				ancestors: null,
 					status: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				attr4: null,
 					factoryCode: null
 				},
 				options: [{
@@ -388,7 +204,7 @@ export default {
 				form: {},
 				// 表单校验
 				rules: {
-				workorderCode: [
+					checkNo: [
 						{ required: true, message: "工单编码不能为空", trigger: "blur" }
 					],
 					parentOrder: [
@@ -403,61 +219,37 @@ export default {
 					productName: [
 						{ required: true, message: "产品名称不能为空", trigger: "blur" }
 					],
-			}
+				},
+                openReport : false,
+				titleReport : "工单报工详情"
 		};
 	},
 	created() {
+		this.getDate();
 		this.getList();
 	},
 	methods: {
-    // 打印
+       	/**获取默认查询时间段**/
-    handlePrint(params) {
+		getDate() {
-      printJS({
+			let start = this.Fungetdate (0)
-        printable: params.printable, // 'printFrom', // 标签元素id
+			this.queryParams.incomeTime =start
-        type: params.type || 'html',
-        maxWidth: 1500, // 最大宽度
-        font_size: "",// 设置字体大小
-        header: params.header, // '表单',
-        targetStyles: ['*'],
-        style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
-        ignoreElements: params.ignore || [], // ['no-print']
-        properties: params.properties || null
-      })
 		},
-    // 打印预览
+		Fungetdate (num) {
-    showPrint() {
+			var dd = new Date();
-      // 清楚缓存
+			dd.setDate(dd.getDate() + num);
-      this.printData.workCenter = "暂无数据";
+			var y = dd.getFullYear();
-      this.printData.printDate = null;
+			var m = dd.getMonth() + 1;//获取当前月份的日期
-      this.printData.workTable = [];
+			var d = dd.getDate();
-      this.printData.factory = null;
+			return y + "-" + m +"-"+d;
-      this.printData.productDate = null;
-      // 打开工单信息对话框
-      this.printDialogVisible = true;
-      this.newWorkerLoading = true // 设置加载状态为true，表示正在加载
-      this.refreshNewWorkerTable = false // 先将refreshProTable设置为false，隐藏表格
-      printPrepareByCode(this.selectPrepare[0].workorderCode).then(response => {
-        console.log(response.data)
-        this.printData.factory = response.data.mesPrepareDetailList[0].factoryCode
-        this.printData.productDate = response.data.mesPrepareDetailList[0].productDate
-        this.printData.printDate = moment(new Date()).format('YYYY-MM-DD')
-        this.printData.workTable = response.data.mesPrepareDetailList
-        this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
-        this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
-      })
 		},	
-	//新增 设备选择弹出框
+
-    // handlePrepareDetail(){
-    //   this.$refs.detail.showFlag = true;
-    // },
-	// 生成表头序号
 		indexMethod(index){
 			return index+1 ;
 		},
 		/** 查询备料单列表 */
 		getList() {
 			this.loading = true;
-			listPrepare(this.queryParams).then(response => {
+			getXJCheckTableList(this.queryParams).then(response => {
 				this.prepareList = response.rows;
 				this.total = response.total;
 				this.loading = false;
@@ -466,13 +258,14 @@ export default {
 		// 取消按钮
 		cancel() {
 			this.open = false;
+			this.openReport = false;
 			this.reset();
 		},
 		// 表单重置
 		reset() {
 			this.form = {
 				prepareId: null,
-				workorderCode: null,
+				checkNo: null,
 				workorderName: null,
 				parentOrder: null,
 				orderId: null,
@@ -483,15 +276,8 @@ export default {
 				productName: null,
 				productSpc: null,
 				wetDetailPlanId: null,
-				productDate: null,
+				incomeTime: null,
-				shiftId: null,
+				incomeBatchNo:null,
-				ancestors: null,
-				status: null,
-				remark: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				attr4: null,
 				createBy: null,
 				createTime: null,
 				updateBy: null,
@@ -553,15 +339,22 @@ export default {
 				}
 			});
 		},
-		/** 删除按钮操作 */
+		//产品编码格式化
-		handleDelete(row) {
+		productCodeFormate(row, column, cellValue){
-			const prepareIds = row.prepareId || this.ids;
+			return cellValue.slice(7,18);  //返回值
-			this.$modal.confirm('是否确认删除备料单编号为"' + prepareIds + '"的数据项？').then(function() {
+		},
-				return delPrepare(prepareIds);
+		/** 报工详情按钮操作 */
-			}).then(() => {
+		handleDetail(row) {
-				this.getList();
+			this.reset();
-				this.$modal.msgSuccess("删除成功");
+			let sr = row;
-			}).catch(() => {});
+     
+			this.queryParams.incomeBatchNo = sr.incomeBatchNo;
+			getXJCheckTableDetail(this.queryParams).then(response => {
+				this.pOrderTableList = response;
+				this.openReport = true;
+				this.titleReport = "过程巡检详情";
+			});
+
 		},
 		/** 导出按钮操作 */
 		handleExport() {