Merge remote-tracking branch 'origin/master'

src/api/device/equTeam.js

@@ -42,3 +42,11 @@ export function delEquTeam(id) {
 		method: 'delete'
 	});
 }
+
+// 查询设备班组分类
+export function getMaintenanceTeamList() {
+  return request({
+    url: '/device/equTeam/getMaintenanceTeamList',
+    method: 'get'
+  });
+}

src/api/plan/order.js

@@ -33,6 +33,19 @@ export function getProRoutes(prodCode) {
   })
 }
 
+// 获取当天的递增工单执行顺序
+export function getProSortNo(productDate) {
+	const data = {
+		productDate
+	}
+	return request({
+		url: '/plan/order/getProSortNo',
+		method: 'put',
+		data: data
+	})
+}
+
+
 // 通过工艺code获取设备信息
 export function getProEquipment(routeCode) {
   return request({

src/api/quality/income.js

@@ -119,10 +119,11 @@ export function commitActualValue(recordId, actualValues) {
 } 
 
 //审核结果提交
-export function commitCheckResult(recordId,typeCode) {
+export function commitCheckResult(recordId,typeCode,checkType) {
 	const data = {
 		recordId,
-		typeCode
+		typeCode,
+		checkType
 	}
 	return request({
 		url: '/quality/qcIncome/commitCheckResult',

src/views/device/equTeam/index.vue

@@ -237,6 +237,7 @@ import {
   delEquTeam,
   addEquTeam,
   updateEquTeam,
+  getMaintenanceTeamList,
 } from "@/api/device/equTeam";
 import ItemSelectPerson from "./selectSinglePerson.vue";
 

src/views/device/faultReport/index.vue

@@ -160,6 +160,7 @@
         align="center"
         prop="orderCode"
         width="200"
+        fixed
       />
       <el-table-column
         label="设备编码"

src/views/device/outsourceWorkOrder/index.vue

@@ -104,14 +104,30 @@
 		<el-table v-loading="loading" :data="outsourceWorkOrderList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="委外工单编码" align="center" prop="workCode" width="180"/>
-			<el-table-column label="维修人员" align="center" prop="workPerson" width="150"/>
+			<el-table-column label="报修单号" align="center" prop="orderCode" width="180"/>
+			<el-table-column label="维修单号" align="center" prop="repairCode" width="180"/>
+			<el-table-column label="设备编码" align="center" prop="equipmentCode" />
+			<el-table-column label="设备名称" align="center" prop="equipmentName" />
+			<el-table-column label="设备类型" align="center" prop="equipmentTypeName" />
+			<el-table-column label="委外维修人员" align="center" prop="workPerson" width="150"/>
 			<el-table-column label="委外单位" align="center" prop="workOutsourcingUnit" width="200"/>
 			<el-table-column label="联系方式" align="center" prop="workConnection" width="150"/>
-			<el-table-column label="原因" align="center" prop="workReason" width="150"/>
+			<el-table-column label="委外原因" align="center" prop="workReason" width="150"/>
 			<el-table-column label="委外类型" align="center" prop="workType" />
-			<el-table-column label="管理单号" align="center" prop="managementCode" />
 			<el-table-column label="委外费用" align="center" prop="workCost" />
 			<el-table-column label="委外用时" align="center" prop="workCostTime" />
+			      <el-table-column width="180" label="创建时间" align="center" prop="createTime">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="120" label="创建人" align="center" prop="createBy"/>
+            <el-table-column width="180" label="更新时间" align="center" prop="updateTime">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.updateTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="120" label="更新人" align="center" prop="updateBy"/>
 			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
 				<template slot-scope="scope">
@@ -143,36 +159,45 @@
 
 		<!-- 添加或修改委外工单对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+			<el-form ref="form" :model="form" :rules="rules" label-width="130px">
-				<el-form-item label="委外工单编码" prop="workCode">
+				<el-form-item label="设备编码" prop="equipmentCode">
-					<el-input v-model="form.workCode" placeholder="请输入委外工单编码" />
+          <el-input
+            v-model="form.equipmentCode"
+            placeholder="请输入设备编码"
+            style="width: 270px"
+          >
+            <el-button
+              slot="append"
+              @click="handleSelectEquipment"
+              icon="el-icon-search"
+            ></el-button>
+          </el-input>
+          <ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment">
+          </ItemSelect>
       	</el-form-item>
-				<el-form-item label="维修人员" prop="workPerson">
+				<el-form-item label="委外维修人员" prop="workPerson">
-					<el-input v-model="form.workPerson" placeholder="请输入维修人员" />
+					<el-input v-model="form.workPerson" placeholder="请输入委外维修人员" style="width: 270px"/>
 				</el-form-item>
 				<el-form-item label="委外单位" prop="workOutsourcingUnit">
-					<el-input v-model="form.workOutsourcingUnit" placeholder="请输入委外单位" />
+					<el-input v-model="form.workOutsourcingUnit" placeholder="请输入委外单位" style="width: 270px"/>
-				</el-form-item>
-				<el-form-item label="联系方式" prop="workConnection">
-					<el-input v-model="form.workConnection" placeholder="请输入联系方式" />
 				</el-form-item>
-				<el-form-item label="原因" prop="workReason">
+				<el-form-item label="委外单位联系方式" prop="workConnection">
-					<el-input v-model="form.workReason" placeholder="请输入原因" />
+					<el-input v-model="form.workConnection" placeholder="请输入委外单位联系方式" style="width: 270px"/>
 				</el-form-item>
-				<el-form-item label="管理单号" prop="managementCode">
+        <el-form-item label="委外原因" prop="workReason">
-					<el-input v-model="form.managementCode" placeholder="请输入管理单号" />
+          <el-input
+            v-model="form.workReason"
+            placeholder="请输入委外原因"
+            style="width: 270px"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4 }"
+          />
         </el-form-item>
 				<el-form-item label="委外费用" prop="workCost">
-					<el-input v-model="form.workCost" placeholder="请输入委外费用" />
+					<el-input v-model="form.workCost" placeholder="请输入委外费用" style="width: 270px"/>
 				</el-form-item>
 				<el-form-item label="委外用时" prop="workCostTime">
-					<el-input v-model="form.workCostTime" placeholder="请输入委外用时" />
+					<el-input v-model="form.workCostTime" placeholder="请输入委外用时" style="width: 270px"/>
-				</el-form-item>
-				<el-form-item label="删除标识" prop="delFlag">
-					<el-input v-model="form.delFlag" 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">
@@ -185,9 +210,11 @@
 
 <script>
 import { listOutsourceWorkOrder, getOutsourceWorkOrder, delOutsourceWorkOrder, addOutsourceWorkOrder, updateOutsourceWorkOrder } from "@/api/device/outsourceWorkOrder";
+import ItemSelect from "./selectSingleEquipment.vue";
 
 export default {
 	name: "OutsourceWorkOrder",
+	components: { ItemSelect },
 	data() {
 		return {
 			// 遮罩层
@@ -213,12 +240,13 @@ export default {
 				pageNum: 1,
 				pageSize: 10,
 				workCode: null,
+				repairCode: null,
 				workPerson: null,
 				workOutsourcingUnit: null,
 				workConnection: null,
 				workReason: null,
 				workType: null,
-				managementCode: null,
+				equipmentCode: null,
 				workCost: null,
 				workCostTime: null,
 				attr1: null,
@@ -256,12 +284,13 @@ export default {
 			this.form = {
 				workId: null,
 				workCode: null,
+				repairCode: null,
 				workPerson: null,
 				workOutsourcingUnit: null,
 				workConnection: null,
 				workReason: null,
 				workType: null,
-				managementCode: null,
+				equipmentCode: null,
 				workCost: null,
 				workCostTime: null,
 				attr1: null,
@@ -275,6 +304,14 @@ export default {
 				factoryCode: null
 			};
 			this.resetForm("form");
+		},
+		//设备选择
+    handleSelectEquipment() {
+      this.$refs.itemSelect.showFlag = true;
+    },
+    //设备选择
+    onItemSelectedEquipment(obj) {
+      this.form.equipmentCode = obj;
     },
 		/** 搜索按钮操作 */
 		handleQuery() {

src/views/device/outsourceWorkOrder/selectSingleEquipment.vue

@@ -0,0 +1,246 @@
+<template>
+  <el-dialog title="设备选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="1100px"
+    center
+    :before-close="cancelEquipmentForm"
+  >
+    <el-row :gutter="20">
+      <!--分类数据-->
+      <el-col :span="5" :xs="24">
+        <el-card >
+          <span>请选择设备类型：</span>
+          <div class="head-container" style="text-align: center">
+              <el-tree
+                :data="treeData1"
+                :props = "{id:'equipmentTypeCode',label:'equipmentTypeName'}"
+                node-key="id"
+                :expand-on-click-node="false"
+                :filter-node-method="filterNode"
+                ref="tree"
+                default-expand-all
+                @node-click="handleNodeClick"
+              />
+            </div>
+        </el-card>
+      </el-col>
+
+      <!--设备数据-->
+      <el-col :span="19" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="设备编码" prop="itemCode">
+            <el-input
+              v-model="queryParams.itemCode"
+              placeholder="请输入设备编码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="设备名称" prop="itemName">
+            <el-input
+              v-model="queryParams.itemName"
+              placeholder="请输入设备名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </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>
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="itemList" @selection-change="handleEquipmentSelectionChange" ref="myTable">
+          <el-table-column width="50" align="center" type="selection">
+              <!-- <template v-slot="scope">
+                  <el-radio v-model="selectedItemId" :label="scope.row.itemId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+              </template> -->
+          </el-table-column>
+          <!-- 序号 -->
+          <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
+          <el-table-column label="设备编码" align="center" key="itemCode" prop="equipmentCode" v-if="columns[0].visible" >
+          </el-table-column>
+          <el-table-column label="设备类型编码" align="center" key="itemTypeCode" prop="equipmentTypeCode" v-if="columns[2].visible" >
+          </el-table-column>
+          <el-table-column label="设备名称"  align="left" key="itemName" prop="equipmentName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+        </el-table>
+
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentForm">确 定</el-button>
+        <el-button @click="cancelEquipmentForm">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getEquipmentList,getEquipmentTypeList} from "@/api/device/faultReport";
+import { treeselect } from "@/api/wms/equipment";
+import { Message } from 'element-ui'
+
+export default {
+  name: "MdItemSingle",
+  // components: { Treeselect },
+  data() {
+    return {
+      treeData1:[],
+      showFlag:false,
+      // 选中数组
+      selectedItemId: undefined,
+      selectedRows: undefined,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total:0,
+      // 设备产品表格数据
+      itemList: null,
+      // 树选项
+      itemTypeOptions: undefined,
+      //树名称
+      equipmentTypeCode: undefined,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        itemName: undefined,
+        equipmentTypeCode: undefined,
+        itemTypeId: 0,
+        itemCodeGet: '',
+        itemCode : undefined,
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `设备编码`, visible: true },
+        { key: 1, label: `设备名称`, visible: true },
+        { key: 2, label: `设备类型`, visible: true },
+      ]
+    };
+  },
+  created() {
+    this.getList();
+    this.getEquipmentType();
+  },
+
+  methods: {
+    // 表单重置
+    reset() {
+      this.form = {
+        itemId: null,
+        itemCode: this.processId,
+        itemType: null,
+      };
+      this.resetForm("form");
+    },
+
+    handleEquipmentSelectionChange (val) {
+      this.itemList = val
+    },
+
+  	// 生成表头序号
+      indexMethod(index){
+        return index+1 ;
+      },
+
+    /** 查询设备编码列表*/
+    getList() {
+      this.loading = true;
+      getEquipmentList(this.queryParams).then(response => {
+          this.itemList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+
+    /** 查询分类下拉树结构 */
+    getEquipmentType() {
+      getEquipmentTypeList().then(response => {
+        console.log(response.rows);
+        this.treeData1 = response.rows;
+        console.log(this.treeData1);
+      });
+    },
+
+    // 筛选节点
+    filterNode(value, data) {
+      console.log(value, data);
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+
+    // 节点单击事件
+    handleNodeClick(data) {
+      console.log('id',data.id);
+      this.queryParams.equipmentTypeCode = data.equipmentTypeCode;
+      console.log(this.equipmentTypeCode);
+      this.handleQuery();
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.equipmentTypeCode = null;
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+
+    // 多选框选中数据
+		handleEquipmentSelectionChange(selection) {
+			this.ids = selection.map(item => item.equipmentCode);
+			this.single = selection.length!==1;
+			this.multiple = !selection.length;
+			console.log("多选框",this.ids);
+		},
+
+    submitEquipmentForm() {
+      const data = this.ids;
+      if(data.length >1){
+        Message.warning("只能选择一个报修机器,请勿选择多个！");
+      }else{
+        const equipmentCode = data.toString();
+        if(this.queryParams.itemCodeGet == ""){
+          this.queryParams.itemCodeGet = equipmentCode;
+        }else{
+          this.queryParams.itemCodeGet = this.queryParams.itemCodeGet + ','+ equipmentCode;
+        }
+      this.selectedRows = this.queryParams.itemCodeGet;
+      this.$emit('onSelected', this.selectedRows);
+      this.queryParams.equipmentTypeCode = null;
+      this.getList();
+      console.log('111111',this.queryParams.equipmentTypeCode);
+      this.showFlag = false;
+      this.queryParams.itemCodeGet = "";
+      }
+      },
+
+    cancelEquipmentForm(){
+      this.queryParams.equipmentTypeCode = null;
+        this.getList();
+        console.log('111111',this.queryParams.equipmentTypeCode);
+        this.showFlag = false;
+    }
+
+  }
+};
+</script>

src/views/device/repairOrder/index.vue

@@ -52,41 +52,49 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="计划维修时间" prop="workPlanTime">
-        <el-date-picker
-          clearable
-          v-model="queryParams.workPlanTime"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="请选择计划维修时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="计划停机时间" prop="workPlanDownTime">
-        <el-date-picker
-          clearable
-          v-model="queryParams.workPlanDownTime"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="请选择计划停机时间"
-        >
-        </el-date-picker>
-      </el-form-item>
       <el-form-item label="维修人员" prop="workPerson">
         <el-input
           v-model="queryParams.workPerson"
           placeholder="请输入维修人员"
           clearable
+          style="width: 200px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="维修组" prop="workTeam">
-        <el-input
+        <el-select
           v-model="queryParams.workTeam"
-          placeholder="请输入维修组"
+          placeholder="请选择维修组"
+          @change="$forceUpdate()"
           clearable
+          filterable
+          style="width: 200px"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <el-option
+            v-for="item in teamOption"
+            :key="item.teamCode"
+            :label="item.teamName"
+            :value="item.teamCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="维修状态" prop="workStatus">
+        <el-select
+          v-model="queryParams.workStatus"
+          placeholder="请选择维修状态"
+          @change="$forceUpdate()"
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+        >
+          <el-option
+            v-for="item in workStatusOption"
+            :key="item.workStatus"
+            :label="item.label"
+            :value="item.workStatus"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="是否委外" prop="workOutsource">
         <el-select
@@ -94,7 +102,7 @@
           placeholder="请选择是否委外"
           @change="$forceUpdate()"
           clearable
-          style="width: 220px"
+          style="width: 200px"
           @keyup.enter.native="handleQuery"
         >
           <el-option
@@ -105,7 +113,6 @@
           ></el-option>
         </el-select>
       </el-form-item>
-
       <el-form-item label="委外工单编码" prop="outWorkCode">
         <el-input
           v-model="queryParams.outWorkCode"
@@ -114,6 +121,34 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="计划维修时间" prop="workPlanTime">
+        <el-date-picker
+          clearable
+          v-model="queryParams.workPlanTimeArray"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          :picker-options="pickerOptions">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="计划停机时间" prop="workPlanDownTime">
+                <el-date-picker
+                  clearable
+                  v-model="queryParams.workPlanDownTimeArray"
+                  type="daterange"
+                  align="right"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  :picker-options="pickerOptions">
+                </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -261,7 +296,9 @@
         </template>
       </el-table-column>
       <el-table-column label="维修人员" align="center" prop="workPerson" />
-      <el-table-column label="维修组" align="center" prop="workTeam" />
+      <el-table-column label="维修组编码" align="center" prop="workTeam" width="100"/>
+      <el-table-column label="维修组名称" align="center" prop="teamName" width="100"/>
+      <el-table-column label="维修组人员" align="center" prop="teamPerson" width="300"/>
       <el-table-column label="是否委外" align="center" prop="workOutsource">
         <template slot-scope="scope">
           {{ scope.row.workOutsource == "1" ? "转委外" : "不委外" }}
@@ -280,36 +317,41 @@
         width="300"
       />
       <el-table-column
-        label="维修用时"
+        label="维修开始时间"
         align="center"
-        prop="workCostTime"
+        prop="workStartTime"
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.workCostTime) }}</span>
+          <span>{{ parseTime(scope.row.workStartTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column
-        label="维修开始时间"
+        label="维修结束时间"
         align="center"
-        prop="workStartTime"
+        prop="workEndTime"
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.workStartTime) }}</span>
+          <span>{{ parseTime(scope.row.workEndTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column
-        label="维修结束时间"
+        label="维修用时"
         align="center"
-        prop="workEndTime"
+        prop="workCostTime"
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.workEndTime) }}</span>
+          <span>{{ parseTime(scope.row.workCostTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="维修费用" align="center" prop="workCost" />
+      <el-table-column label="维修状态" align="center" prop="workStatus" >
+        <template slot-scope="scope">
+          {{ scope.row.workStatus == "1"?'维修结束': scope.row.workStatus == "2"?'维修中' : scope.row.workStatus == "0" ? '待维修' : '无'}}
+        </template>
+      </el-table-column>
       <el-table-column label="工厂编码" align="center" prop="factoryCode" />
       <el-table-column
         label="操作"
@@ -354,18 +396,11 @@
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="报修单号" prop="orderCode">
-          <el-input
-            v-model="form.orderCode"
-            placeholder="请输入报修单号"
-            style="width: 250px"
-          />
-        </el-form-item>
         <el-form-item label="设备编码" prop="equipmentCode">
           <el-input
             v-model="form.equipmentCode"
             placeholder="请输入设备编码"
-            style="width: 250px"
+            style="width: 280px"
           >
             <el-button
               slot="append"
@@ -382,17 +417,23 @@
             v-model="form.workPlanTime"
             type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 250px"
+            style="width: 280px"
             placeholder="请选择计划维修时间"
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="计划停机时间" prop="workPlanDownTime">
+        <el-form-item label="是否停机维修" prop="workDownMachine">
+          <el-radio-group v-model="form.workDownMachine">
+            <el-radio label="1">是</el-radio>
+            <el-radio label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="计划停机时间" prop="workPlanDownTime" v-if="form.workDownMachine == '1' ">
           <el-date-picker
             clearable
             v-model="form.workPlanDownTime"
             type="datetime"
-            style="width: 250px"
+            style="width: 280px"
             value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择计划停机时间"
           >
@@ -402,7 +443,7 @@
           <el-input
             v-model="form.workPerson"
             placeholder="请选择维修人"
-            style="width: 250px"
+            style="width: 280px"
           >
             <el-button
               slot="append"
@@ -416,11 +457,31 @@
           >
           </ItemSelectPerson>
         </el-form-item>
-        <el-form-item label="维修组" prop="workTeam" style="width: 250px">
+        <el-form-item label="维修组" prop="workTeam">
-          <el-input
+          <el-select
             v-model="form.workTeam"
-            placeholder="请输入维修组"
+            placeholder="请选择维修组"
-            style="width: 250px"
+            @change="$forceUpdate()"
+            clearable
+            filterable
+            style="width: 280px"
+            @keyup.enter.native="handleQuery"
+          >
+            <el-option
+              v-for="item in teamOption"
+              :key="item.teamCode"
+              :label="item.teamName"
+              :value="item.teamCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="故障描述" prop="workFaultDesc">
+          <el-input
+            v-model="form.workFaultDesc"
+            placeholder="请输入故障描述"
+            style="width: 280px"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
       </el-form>
@@ -465,7 +526,13 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="计划停机时间" prop="workPlanDownTime">
+        <el-form-item label="是否停机维修" prop="workDownMachine">
+          <el-radio-group v-model="form.workDownMachine">
+            <el-radio label="1">是</el-radio>
+            <el-radio label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="计划停机时间" prop="workPlanDownTime" v-if="form.workDownMachine == '1' ">
           <el-date-picker
             clearable
             v-model="form.workPlanDownTime"
@@ -494,12 +561,23 @@
           >
           </ItemSelectPerson>
         </el-form-item>
-        <el-form-item label="维修组" prop="workTeam" style="width: 250px">
+        <el-form-item label="维修组" prop="workTeam">
-          <el-input
+          <el-select
             v-model="form.workTeam"
-            placeholder="请输入维修组"
+            placeholder="请选择维修组"
+            @change="$forceUpdate()"
+            clearable
+            filterable
             style="width: 250px"
-          />
+            @keyup.enter.native="handleQuery"
+          >
+            <el-option
+              v-for="item in teamOption"
+              :key="item.teamCode"
+              :label="item.teamName"
+              :value="item.teamCode"
+            ></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -578,7 +656,7 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item prop="workOutsourcingUnit" label="委外单位">
+            <el-form-item prop="workOutsourcingUnit" label="委外单位" v-if="form.outWorkCode == null">
               <el-input
                 v-model="form.workOutsourcingUnit"
                 placeholder="请填写委外单位"
@@ -587,7 +665,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item prop="outSourcePerson" label="委外维修人员">
+            <el-form-item prop="outSourcePerson" label="委外维修人员" v-if="form.outWorkCode == null">
               <el-input
                 v-model="form.outSourcePerson"
                 placeholder="请填写委外维修人员"
@@ -596,7 +674,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item prop="workConnection" label="联系方式">
+            <el-form-item prop="workConnection" label="联系方式" v-if="form.outWorkCode == null">
               <el-input
                 v-model="form.workConnection"
                 placeholder="请填写委外联系方式"
@@ -607,11 +685,58 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item prop="outSourceReason" label="委外原因">
+            <el-form-item prop="outSourceReason" label="委外原因" v-if="form.outWorkCode == null">
               <el-input
                 v-model="form.outSourceReason"
                 placeholder="请输入委外原因"
                 type="textarea"
+                style="width: 840px"
+                :autosize="{ minRows: 2, maxRows: 4 }"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item prop="workOutsourcingUnit" label="委外单位" v-if="form.outWorkCode != null">
+              <el-input
+                v-model="form.workOutsourcingUnit"
+                placeholder="请填写委外单位"
+                style="width: 195px"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="outSourcePerson" label="委外维修人员" v-if="form.outWorkCode != null">
+              <el-input
+                v-model="form.outSourcePerson"
+                placeholder="请填写委外维修人员"
+                style="width: 195px"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="workConnection" label="联系方式" v-if="form.outWorkCode != null">
+              <el-input
+                v-model="form.workConnection"
+                placeholder="请填写委外联系方式"
+                style="width: 195px"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item prop="outSourceReason" label="委外原因" v-if="form.outWorkCode != null">
+              <el-input
+                v-model="form.outSourceReason"
+                placeholder="请输入委外原因"
+                type="textarea"
+                disabled
+                style="width: 840px"
                 :autosize="{ minRows: 2, maxRows: 4 }"
               />
             </el-form-item>
@@ -820,8 +945,22 @@
             </el-col>
             <el-col :span="8">
       <el-form-item label="维修状态" prop="workStatus">
-                <el-input v-model="form.workStatus" style="width: 195px">
+        <el-select
-                </el-input>
+          v-model="queryParams.workStatus"
+          placeholder="请选择维修状态"
+          @change="$forceUpdate()"
+          clearable
+          style="width: 220px"
+          @keyup.enter.native="handleQuery"
+        >
+          <el-option
+            v-for="item in workStatusOption"
+            :key="item.workStatus"
+            :label="item.label"
+            :value="item.workStatus"
+          ></el-option>
+        </el-select>
+      </el-form-item>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -921,6 +1060,7 @@ import {
   applyOutsource,
   writeRepairOrder,
 } from "@/api/device/repairOrder";
+import { getMaintenanceTeamList } from "@/api/device/equTeam";
 import ItemSelect from "./selectSingleEquipment.vue";
 import ItemSelectPerson from "./selectSinglePerson.vue";
 import { Message } from "element-ui";
@@ -931,6 +1071,8 @@ export default {
   components: { ItemSelect, ItemSelectPerson, SelectSpareParts },
   data() {
     return {
+      //选择设备维修班组
+      teamOption: [],
       optType: undefined,
       // 步骤
       repairRecordSteps: 0,
@@ -984,7 +1126,11 @@ export default {
         attr2: null,
         attr3: null,
         factoryCode: null,
+        //计划维修时间组、计划停机时间组
+        workPlanTimeArray: [],
+        workPlanDownTimeArray: [],
       },
+      //选择是否委外
       workOutsourceOption: [
         {
           workOutsource: "1",
@@ -995,6 +1141,7 @@ export default {
           label: "不委外",
         },
       ],
+      //选择是否停机
       workDownMachineOption: [
         {
           workDownMachine: "1",
@@ -1005,6 +1152,49 @@ export default {
           label: "不停机",
         },
       ],
+      //选择维修状态
+      workStatusOption: [
+        {
+          workStatus: "0",
+          label: "待维修",
+        },
+        {
+          workStatus: "2",
+          label: "维修中",
+        },
+        {
+          workStatus: "1",
+          label: "维修结束",
+        },
+      ],
+      // 日期范围选择快捷
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -1013,6 +1203,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getTeamList();
   },
   methods: {
     // 填写维修记录步骤上一步
@@ -1032,6 +1223,16 @@ export default {
         this.loading = false;
       });
     },
+
+    /** 查询维修工单列表 */
+    getTeamList() {
+      this.loading = true;
+      getMaintenanceTeamList(this.queryParams).then((response) => {
+        console.log(response.rows);
+        this.teamOption = response.rows;
+      });
+    },
+
     // 新增-取消按钮
     cancelAddForm() {
       this.openAdd = false;
@@ -1093,6 +1294,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      //计划维修时间组、计划停机时间组
+      this.queryParams.workPlanTimeArray = [],
+      this.queryParams.workPlanDownTimeArray = [],
       this.handleQuery();
     },
     // 多选框备品备件选中数据

src/views/mes/reportWork/index.vue

@@ -361,7 +361,7 @@
       			:total="consumeTotal"
       			:page.sync="consumeQueryParams.consumePageNum"
       			:limit.sync="consumeQueryParams.consumePageSize"
-      			@pagination="getReportWorkConsumeList"
+      			@pagination="getList"
       		/>
 		</el-dialog>
 
@@ -370,7 +370,6 @@
 
 <script>
 import { listReportWork, getReportWork, delReportWork, addReportWork, updateReportWork } from "@/api/mes/reportWork";
-import { listReportWorkConsume, getReportWorkConsume, delReportWorkConsume, addReportWorkConsume, updateReportWorkConsume} from "@/api/mes/reportWorkConsume";
 import ReportWorkConsume from "./reportWorkConsume.vue";
 
 export default {
@@ -543,7 +542,7 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = "添加报工报表";
+			this.title = "添加报工记录";
 			this.optType = "add";
 		},
 		/** 修改按钮操作 */

src/views/mes/rfidProcess/index.vue

@@ -86,6 +86,16 @@
 			<!-- <el-table-column label="工单名称" align="center" prop="workorderName"/> -->
 			<!-- <el-table-column label="订单ID" align="center" prop="orderId" width="180"/> -->
       <el-table-column label="订单编号" align="center" prop="orderCode" width="200"/>
+      <el-table-column label="产品编码" align="center" prop="productCode" width="200"/>
+      <el-table-column label="产品名称" align="center" prop="productName" width="200"/>
+      <el-table-column label="生产时间" align="center" prop="productDate" width="200"/>
+<!--      <el-table-column label="班次" align="center" prop="shiftId" width="200"/>-->
+      <el-table-column label="班次" align="center" prop="shiftId" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.shiftId == 5">白班</span>
+          <span v-else>夜班</span>
+        </template>
+      </el-table-column>
 			<el-table-column label="rfid号" align="center" prop="rfid" width="180"/>
 			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
 			<el-table-column label="机台编码" align="center" prop="machineCode" />
@@ -103,7 +113,7 @@
 			<el-table-column label="出时间" align="center" prop="outTime" width="180">
 				<template slot-scope="scope">
           <span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
-          {{ parseTime(scope.row.outTime, '{h}:{m}:{s}') }}
+          <span>{{ parseTime(scope.row.outTime, '{h}:{m}:{s}') }}</span>
 				</template>
 			</el-table-column>
 			<el-table-column label="状态" align="center" prop="status">
@@ -235,6 +245,10 @@ export default {
 				attr2: null,
 				attr3: null,
 				attr4: null,
+        shiftId: null,
+        productCode: null,
+        productName: null,
+        productDate: null
 			},
 			// 表单参数
 			form: {},
@@ -293,7 +307,8 @@ export default {
 				createBy: null,
 				createTime: null,
 				updateBy: null,
-				updateTime: null
+				updateTime: null,
+        shiftId: null
 			};
 			this.resetForm("form");
 		},

src/views/plan/order/index.vue

@@ -388,13 +388,15 @@
             </el-form-item>
           </el-col>
           <el-col :offset="1" :span="7">
-            <el-form-item label="选择设备:">
+            <!-- 工单日期 -->
-              <el-cascader
+            <el-form-item size="small" label="工单日期: ">
-                @focus="changeEquipment"
+              <el-date-picker @change="checkDate" v-model="splitForm.productDate" type="date" placeholder="选择日期"
-                :options="eRouteOptions"
+              ></el-date-picker>
-                :props="eRouteProps"
+            </el-form-item>
-                v-model="splitForm.prodLineCodeArray"
+          </el-col>
-                clearable></el-cascader>
+          <el-col :offset="1" :span="7">
+            <el-form-item label="工单排序(插单<=0)" label-width="130px">
+              <el-input type="number" v-model="splitForm.sortNo"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -416,11 +418,17 @@
               <el-input required type="number" @input="splitNumChange" v-model="splitForm.splitNum"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :offset="1" :span="5">
+        </el-row>
-            <!-- 工单日期 -->
+        <el-row>
-            <el-form-item size="small" label="工单日期: ">
+          <el-col :span="7">
-              <el-date-picker @change="checkDate" v-model="splitForm.productDate" type="date" placeholder="选择日期"
+            <el-form-item label="选择设备:">
-              ></el-date-picker>
+             <div style="height: 130px;overflow-y: auto;">
+              <el-cascader
+                :options="eRouteOptions"
+                :props="eRouteProps"
+                v-model="splitForm.prodLineCodeArray"
+                clearable></el-cascader>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
@@ -483,7 +491,7 @@
 import {
   getCascadeProOrder,
   getProEquipment,
-  getProRoutes,
+  getProRoutes,getProSortNo,
   getProShifts,
   getWorkOrderList,
   subSplitOrder,
@@ -801,6 +809,7 @@ export default {
     splitBtn(e) {
       // 获取级联订单信息
       var row;
+      let _this = this;
       getCascadeProOrder(e.orderCode).then(response => {
         row = response.data
 
@@ -843,6 +852,12 @@ export default {
           this.routes = response.data
         })
 
+        var ymd = moment(this.splitForm.productDate).format('YYYY-MM-DD')
+        // 获取工单生产顺序
+        getProSortNo(ymd).then(response => {
+          _this.splitForm.sortNo = response
+        })
+
         this.workerLoading = true // 设置加载状态为true，表示正在加载
         // 获取历史拆分工单信息
         getWorkOrderList(row.id).then(response => {
@@ -946,7 +961,8 @@ export default {
     },
     // 拆分-校验工单日期
     checkDate(e) {
-      var now = new Date()
+      var now = new Date();
+      let _this = this;
       if (e < now) {
         e = now
         this.splitForm.productDate = now
@@ -954,6 +970,12 @@ export default {
           message: "工单日期不能早于今天",
           type: "warning"
         })
+      }else{
+        var ymd = moment(this.splitForm.productDate).format('YYYY-MM-DD')
+        // 获取工单生产顺序
+        getProSortNo(ymd).then(response => {
+          _this.splitForm.sortNo = response
+        })
       }
     },
     // 拆分-校验拆分批次号是否重复
@@ -1068,6 +1090,13 @@ export default {
         })
         return
       }
+      if (this.splitForm.sortNo == null) {
+        this.$message({
+          message: '工单生产顺序不能为空！',
+          type: 'warning'
+        })
+        return
+      }
       if (this.splitForm.prodLineCodeArray.length == 0) {
         this.$message({
           message: '请选择各流程节点的设备！',
@@ -1139,7 +1168,8 @@ export default {
         shiftId: this.splitForm.shiftId,
         splitNum: this.splitForm.splitNum,
         product: this.productData[0],
-        routeCode: this.splitForm.routeCode
+        routeCode: this.splitForm.routeCode,
+        sortNo: this.splitForm.sortNo
       }
 
       subSplitOrder(data).then(response => {
@@ -1160,7 +1190,7 @@ export default {
         splitNum: null,
         productDate: null,
         shiftId: null,
-        formFields: []
+        formFields: [],
       }
       this.formFields = [{
         batchCode: '',
@@ -1256,11 +1286,13 @@ export default {
     handleSyncSAP() {
       this.loading = true;
       let _this = this;
-      this.$modal.confirm('是否确认SAP同步操作步骤？').then(function () {
+      this.$modal.confirm('是否确认SAP同步操作步骤？执行后，需要一分钟后查看同步结果').then(function () {
-        return syncSAP()
+        _this.loading = false;
+        syncSAP()
+        
       }).then(() => {
-        this.getList()
+        //this.getList()
-        this.loading = false;
+        _this.loading = false;
         this.$modal.msgSuccess('同步成功')
       }).catch(
         function (e) {

src/views/plan/workorder/index.vue

@@ -395,6 +395,10 @@
             <el-form-item v-if="checkType" size="small" label="分配车数:">
               <el-input disabled type="number" @input="changeCarNum" v-model="splitForm.carNum"></el-input>
             </el-form-item>
+
+            <el-form-item v-else label="工单排序(插单<=0)" label-width="130px">
+              <el-input type="number" v-model="splitForm.sortNo" disabled></el-input>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -526,7 +530,7 @@ import {
   listWorkorder,
   delWorkorder,
   downWorkorder,
-  getOrderAndWork,
+  getOrderAndWork,getProSortNo,
   getWorkBatchList,
   subChangeWorkOrder,
   checkWorkOrder
@@ -890,6 +894,11 @@ export default {
             }
             // 订单为成品
             if (this.productData[0],prototype != 'white'){
+
+              if(this.splitData[0].sortNo != null){
+                this.splitForm.sortNo = this.splitData[0].sortNo
+              }
+
               // 递归将拆分数量还原
               function setAtrr1(order, work) {
                 order.quantitySplit = Number(order.quantitySplit) - Number(work.quantitySplit);
@@ -901,6 +910,7 @@ export default {
               }
 
               setAtrr1(this.productData[0], this.splitData[0]);
+              
             }
 
           })

src/views/quality/qcIncome/checkProjectType.vue

@@ -172,7 +172,7 @@ export default {
 
     //提交整体检测结果
     submitBomForm() {
-      commitCheckResult(this.queryParams.belongTo,this.typeCode).then(response => {
+      commitCheckResult(this.queryParams.belongTo,this.typeCode,this.checkType).then(response => {
           this.$modal.msgSuccess("检测完成");
           this.$emit('saveCheck');
           this.showFlag = false;

src/views/quality/qcIncome/index.vue

@@ -569,7 +569,6 @@ export default {
 						});
 					} else {
 						addIncome(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
 							this.open = false;
 							this.getList();
 						});

src/views/quality/qcProduce/index.vue

@@ -599,7 +599,6 @@ export default {
 						});
 					} else {
 						addQcProduce(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
 							this.open = false;
 							this.getList();
 						});

src/views/quality/qcWarehousing/index.vue

@@ -592,7 +592,6 @@ export default {
 						});
 					} else {
 						addWarehousing(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
 							this.open = false;
 							this.getList();
 						});

src/views/quality/unqualified/index.vue

@@ -1,14 +1,22 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-			<el-form-item label="任务编码" prop="taskId">
+			<el-form-item label="任务编码" prop="checkNo">
 				<el-input
-					v-model="queryParams.taskId"
+					v-model="queryParams.checkNo"
 					placeholder="请输入所属任务编码"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
+			<el-form-item label="订单编码" prop="orderNo">
+				<el-input
+					v-model="queryParams.orderNo"
+					placeholder="请输入订单编码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
 			<el-form-item label="物料号" prop="materialCode">
 				<el-input
 					v-model="queryParams.materialCode"
@@ -99,16 +107,27 @@
 		<el-table v-loading="loading" :data="unqualifiedList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="id" align="center" prop="id" v-if="false"/>
-			<el-table-column label="所属任务编码" align="center" prop="taskId" />
+			<el-table-column label="检查任务编码" align="center" prop="checkNo" width="150"/>
-			<el-table-column label="0未处理" align="center" prop="status" />
+			<el-table-column label="订单编码" align="center" prop="orderNo" width="150"/>
-			<el-table-column label="下一节点编码" align="center" prop="nextNodeCode" />
+			<el-table-column label="批次号" align="center" prop="incomeBatchNo" width="100"/>
-			<el-table-column label="下一节点名称" align="center" prop="nextNodeName" />
+			<el-table-column label="质检项目" align="center" prop="checkName" width="80"/>
-			<el-table-column label="不合格描述" align="center" prop="remark" />
+			<el-table-column label="物料编码" align="center" prop="materialCode" width="150"/>
-			<el-table-column label="预留字段1" align="center" prop="attr1" />
+            <el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
-			<el-table-column label="预留字段2" align="center" prop="attr2" />
+            <el-table-column label="订单数量" align="center" prop="quality" />
-			<el-table-column label="预留字段3" align="center" prop="attr3" />
+			<el-table-column label="单位" align="center" prop="unit" />
-			<el-table-column label="预留字段4" align="center" prop="attr4" />
+            <el-table-column label="异常时间" align="center" prop="checkTime" width="120"/>
-			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
+			<el-table-column label="状态" align="center" prop="status" >
+                <template slot-scope="scope">
+					<dict-tag
+						:options="dict.type.do_result"
+						:value="scope.row.status"
+					/>
+				</template>
+			</el-table-column>
+			<el-table-column label="下一节点编码" align="center" prop="nextNodeCode" width="120"/>
+			<el-table-column label="下一节点名称" align="center" prop="nextNodeName" width="120"/>
+			<el-table-column label="提报时间" align="center" prop="createTime" width="120"/>
+			<el-table-column label="不合格描述" align="center" prop="remark" width="120"/>
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button
@@ -131,38 +150,121 @@
 		/>
 
 		<!-- 添加或修改不合格处理对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
-				<el-form-item label="归属任务编码" prop="taskId">
+				<el-row>
-					<el-input v-model="form.taskId" placeholder="请输入归属任务编码" />
+				   <el-col :span="8">
+						<el-form-item label="检验任务编号" prop="checkNo">
+							<el-input v-model="form.checkNo" placeholder="请输入检验任务编号" disabled/>
 						</el-form-item>
-				<el-form-item label="下一节点编码" prop="nextNodeCode">
+					</el-col>
-					<el-input v-model="form.nextNodeCode" placeholder="请输入下一节点编码" />
+					<el-col :span="8">	
+						<el-form-item label="来料批次号" prop="incomeBatchNo">
+							<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批次号" />
 						</el-form-item>
-				<el-form-item label="下一节点名称" prop="nextNodeName">
+					</el-col>
-					<el-input v-model="form.nextNodeName" placeholder="请输入下一节点名称" />
+                    <el-col :span="8">
+						<el-form-item label="订单号" prop="orderNo">
+							<el-input v-model="form.orderNo" placeholder="请输入订单号" />
 						</el-form-item>
-				<el-form-item label="不合格描述" prop="remark">
+					</el-col>
-					<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+				</el-row>
+				<el-row>
+			        <el-col :span="12">
+				   		<el-form-item label="物料名称" prop="materialName">
+							<el-input v-model="form.materialName" placeholder="请选择物料名称">
+							<el-button slot="append" @click="handleSelectMaterial" icon="el-icon-search"></el-button>
+							</el-input>
 						</el-form-item>
-				<el-form-item label="预留字段1" prop="attr1">
+					</el-col>
-					<el-input v-model="form.attr1" placeholder="请输入预留字段1" />
+
+					<el-col :span="12">
+						<el-form-item label="物料号" prop="materialCode">
+							<el-input v-model="form.materialCode" placeholder="请输入物料号" disabled/>
 						</el-form-item>
-				<el-form-item label="预留字段2" prop="attr2">
+					</el-col>
-					<el-input v-model="form.attr2" placeholder="请输入预留字段2" />
+				</el-row>	
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="检验类型" prop="checkType" >
+							<el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;">
+								<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="预留字段3" prop="attr3">
+					</el-col>
-					<el-input v-model="form.attr3" placeholder="请输入预留字段3" />
+					<el-col :span="8">	
+						<el-form-item label="收货数量" prop="quality">
+							<el-input type="number" v-model="form.quality" placeholder="请输入收货数量" />
 						</el-form-item>
-				<el-form-item label="预留字段4" prop="attr4">
+					</el-col>
-					<el-input v-model="form.attr4" placeholder="请输入预留字段4" />
+					<el-col :span="8">
+						<el-form-item label="单位" prop="unit" >
+							<el-select v-model="form.unit" placeholder="请选择单位" style="width: 100%;">
+								<el-option
+									v-for="dict in dict.type.unit"
+									:key="dict.value"
+									:label="dict.label"
+									:value="dict.value"
+								></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="供应商名称" prop="supplierName">
+							<el-input v-model="form.supplierName" placeholder="请选择供应商名称">
+							<el-button slot="append" @click="handleSelectSupplier" 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-col :span="8">
+						<el-form-item label="来料时间" prop="incomeTime">
+							<el-date-picker clearable
+								v-model="form.incomeTime"
+								type="datetime"
+								value-format="yyyy-MM-dd HH:mm:ss"
+								placeholder="请选择来料时间">
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+				</el-row>	
+				<el-row>
+					<el-col :span="8">
+						<el-form-item label="检测人姓名" prop="checkManName">
+							<el-input v-model="form.checkManName" placeholder="请选择检测人姓名">
+							<el-button slot="append" @click="handleSelectUser" icon="el-icon-search"></el-button>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="检测人工号" prop="checkManCode" >
+							<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
 						</el-form-item>
-				<el-form-item label="工厂编码" prop="factoryCode">
+					</el-col>
-					<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
+					<el-col :span="8">	
+						<el-form-item label="检测地点" prop="checkLoc">
+							<el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
 						</el-form-item>
-				<el-form-item label="删除标识1删除0正常" prop="delFlag">
+					</el-col>
-					<el-input v-model="form.delFlag" placeholder="请输入删除标识1删除0正常" />
+				</el-row>
+				<el-row>
+					<el-col :span="24">
+						<el-form-item label="不合格描述" prop="checkLoc">
+							<el-input type="textarea" autosize placeholder="请输入内容" v-model="form.remark"></el-input>
 						</el-form-item>
+					</el-col>
+				</el-row>		
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -203,7 +305,7 @@ export default {
 				checkTimeArray: [],
 				pageNum: 1,
 				pageSize: 10,
-				taskId: null,
+				checkNo: null,
 				status: null,
 				nextNodeCode: null,
 				nextNodeName: null,
@@ -223,8 +325,15 @@ export default {
 	created() {
 		this.getDate();
 		this.getList();
+		this.getCheckTypes();
 	},
 	methods: {
+		/****/
+		getCheckTypes() {
+           	getCheckTypes('material').then(response => {
+				this.checkTypes = response;
+			});
+		},
         /**获取默认查询时间段**/
 		getDate() {
 			let start = this.Fungetdate (0)
@@ -264,7 +373,7 @@ export default {
 		reset() {
 			this.form = {
 				id: null,
-				taskId: null,
+				checkNo: null,
 				status: null,
 				nextNodeCode: null,
 				nextNodeName: null,
@@ -311,7 +420,7 @@ export default {
 			getUnqualified(id).then(response => {
 				this.form = response.data;
 				this.open = true;
-				this.title = "修改不合格处理";
+				this.title = "不合格处理流程";
 			});
 		},
 		/** 提交按钮 */

src/views/technology/proroute/routeprodproduct.vue

@@ -162,7 +162,7 @@ export default {
       //--------------------->
       leftList: [],
       rightList: [],
-      titles: ["未factoryCode", "已关联产品"],
+      titles: ["未关联产品", "已关联产品"],
       // 左侧分页数据
       Ltotal: "",
       LPageNum: "1",