Merge remote-tracking branch 'origin/master'

src/api/technology/process.js

@@ -51,3 +51,29 @@ export function delProcess(processId) {
     method: 'delete'
   })
 }
+
+// 查询设备管理列表
+export function listEquipment(query) {
+  return request({
+    url: '/technology/pro/process/selectEquipmentList',
+    method: 'get',
+    params: query
+  });
+}
+
+// 查询设备管理详细
+export function getEquipment(equipmentId) {
+  return request({
+    url: '/technology/pro/process/e/' + equipmentId,
+    method: 'get'
+  });
+}
+
+// 查询BOM物料管理列表
+export function listBom(query) {
+  return request({
+    url: '/technology/pro/process/bomList',
+    method: 'get',
+    params: query
+  });
+}

src/views/plan/workorder/index.vue

@@ -427,7 +427,7 @@ export default {
 				attr4: null,
 				prodType: null,
 				factoryCode: null,
-				isEnd: null
+				endFlag: null
 			},
 			// 表单参数
 			form: {},
@@ -589,7 +589,7 @@ export default {
 		/** 查询生产工单列表 */
 		getList() {
 			this.loading = true;
-			this.queryParams.isEnd = '1';//只查子单
+			this.queryParams.endFlag = '1';//只查子单
 			if(this.queryParams.productDateArray!=null){
 				this.queryParams.productDateStart = moment(this.queryParams.productDateArray[0]).format('YYYY-MM-DD');
 				this.queryParams.productDateEnd = moment(this.queryParams.productDateArray[1]).format('YYYY-MM-DD');
@@ -639,7 +639,7 @@ export default {
 				updateTime: null,
 				prodType: null,
 				factoryCode: null,
-				isEnd: null
+				endFlag: null
 			};
 			this.resetForm("form");
 		},
@@ -673,6 +673,14 @@ export default {
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
+      // 除了未派发都不允许修改
+      if (this.selectWork.status == "w1"){
+        this.$message({
+          message:'工单已派发！不可修改！',
+          type:'warning'
+        })
+        return;
+      }
       // 校验是否可以修改
       checkWorkOrder(this.selectWork.workorderId).then(response => {
         if (response.code == 500){

src/views/technology/process/index.vue

@@ -224,6 +224,23 @@
               </el-form-item>
             </el-col>
           </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="参数1温度" prop="param1">
+              <el-input v-model="form.param1" type="input" placeholder="请输入温度" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="参数2湿度" prop="param2">
+              <el-input v-model="form.param2" type="input" placeholder="请输入湿度" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="参数3" prop="param3">
+              <el-input v-model="form.param3" type="input" placeholder="请输入参数3" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="工序SOP" prop="fileList">
@@ -334,8 +351,7 @@
 </template>
 
 <script>
-import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/technology/process";
-import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment";
+import { listProcess, getProcess, delProcess, addProcess, updateProcess ,listEquipment,getEquipment} from "@/api/technology/process";
 import Processcontent from "./content.vue";
 import ItemSelect  from "./single.vue";
 
@@ -382,7 +398,7 @@ export default {
       // 显示搜索条件
       showSearch: true,
       // 总条数
-      total: 0,
+      total:0,
       // 生产工序表格数据
       processList:[],
       equipmentList:[],

src/views/technology/process/single.vue

@@ -64,7 +64,7 @@
         </el-table>
 
         <pagination
-          v-show="total>0"
+          v-show="total > 0"
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
@@ -80,7 +80,7 @@
 </template>
 
 <script>
-import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment";
+import { listProcess, getProcess, delProcess, addProcess, updateProcess ,listEquipment,getEquipment} from "@/api/technology/process";
 import { treeselect } from "@/api/wms/equipment";
 // import Treeselect from "@riophae/vue-treeselect";
 // import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -122,7 +122,7 @@ export default {
       // 显示搜索条件
       showSearch: true,
       // 总条数
-      total: 0,
+      total:0,
       // 设备产品表格数据
       itemList: null,
       // 树选项

src/views/technology/process/singleBom.vue

@@ -78,10 +78,7 @@
 </template>
 
 <script>
-import { listBom, getBom, delBom, addBom, updateBom } from "@/api/wms/bom";
-// import Treeselect from "@riophae/vue-treeselect";
-// import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
+import {listBom} from "@/api/technology/process";
 export default {
   name: "ItemSingleBom",
   // components: { Treeselect },