工序bug修复

src/api/mes/md/workunit.js

@@ -8,6 +8,15 @@ export function listWorkunit(query) {
     params: query
   })
 }
+// 查询工作单元列表
+export function listWorkunits(query) {
+  return request({
+    url: '/md/workunit/lists',
+    method: 'get',
+    params: query
+  })
+}
+
 // 根据工作单元查询上机明细
 export function listWorkTmToolRequestList(query) {
   return request({

src/views/mes/pro/process/index.vue

@@ -179,9 +179,23 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="是否包装工序" prop="isPackage">
-               <el-radio-group v-model="form.isPackage">
+               <!-- <el-radio-group v-model="form.isPackage">
                 <el-radio label="1">是</el-radio>
                 <el-radio label="0">否</el-radio>
+              </el-radio-group> -->
+              <el-radio-group v-model="form.isPackage" disabled v-if="optType=='view'">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_non"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+              <el-radio-group v-model="form.isPackage" v-else>
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_non"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -218,7 +232,7 @@ import Processcontent from "./content.vue";
 import {genCode} from "@/api/system/autocode/rule"
 export default {
   name: "Process",
-  dicts: ['sys_yes_no'],
+  dicts: ['sys_yes_no','sys_yes_non'],
   components: {Processcontent},
   props: {
     type: {
@@ -251,6 +265,9 @@ export default {
       processList: [],
       // 弹出层标题
       title: "",
+      form: {
+        isPackage: '0'
+      },
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -309,11 +326,11 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null,
-        isPackage: ''
+        updateTime: null
       };
+      this.$set(this.form, 'isPackage', '0')
       this.autoGenFlag = false;
-      this.resetForm("form");
+      // this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {

src/views/mes/pro/request/components/arangeSelect.vue

@@ -7,14 +7,6 @@
       center
       >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-            <el-form-item label="所属工作中心" prop="workstationCode">
-              <el-input
-                v-model="queryParams.workstationCode"
-                placeholder="请输入工作中心编号"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
             <el-form-item label="编排单号" prop="arrangeCode">
               <el-input
                 v-model="queryParams.arrangeCode"
@@ -32,7 +24,7 @@
         <el-table v-loading="loading" :data="protaskList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
           <el-table-column  width="55" align="center" >
             <template v-slot="scope">
-              <el-radio v-model="selectedTaskId" :label="scope.row.taskCode + scope.row.arrangeCode" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+              <el-radio v-model="selectedTaskId" :label="scope.row.arrangeId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
             </template>
           </el-table-column>
           <el-table-column label="编排单号" align="center"  prop="arrangeCode" :show-overflow-tooltip="true"/>

src/views/mes/pro/request/components/codeSelect.vue

 <template>
-    <el-dialog title="工作中心选择" v-if="showFlag" :visible.sync="showFlag" :modal="false" width="80%" center>
+    <el-dialog title="工作单元选择" v-if="showFlag" :visible.sync="showFlag" :modal="false" width="80%" center>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
         <el-row>
           
@@ -46,13 +46,11 @@
               @change="handleRowChange(scope.row)">{{ "" }}</el-radio>
           </template>
         </el-table-column>
+        <el-table-column label="工作单元编码" align="center" prop="workunitCode" />
+        <el-table-column label="工作单元名称" align="center" prop="workstationName" />
         <el-table-column label="工作中心编号" align="center" prop="workstationCode">
         </el-table-column>
-        <el-table-column label="工作中心名称" align="center" prop="workstationName" />
-        <el-table-column label="工作中心地点" align="center" prop="workstationAddress" />
         <el-table-column label="所在车间名称" align="center" prop="workshopName" />
-        <el-table-column label="所属工序" align="center" prop="processName" />
-        <el-table-column label="备注" align="center" prop="remark" />
       </el-table>
       <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
         @pagination="getList" />
@@ -64,7 +62,7 @@
   </template>
   
   <script>
-import { listWorkunit} from "@/api/mes/md/workunit";
+import { listWorkunits} from "@/api/mes/md/workunit";
   // import { listAllProcess } from "@/api/mes/pro/process";
   import { listAllWorkshop } from "@/api/mes/md/workshop";
   export default {
@@ -142,7 +140,7 @@ import { listWorkunit} from "@/api/mes/md/workunit";
       /** 查询工作中心列表 */
       getList() {
         this.loading = true;
-        listWorkunit(this.queryParams).then((response) => {
+        listWorkunits(this.queryParams).then((response) => {
           console.log(this.queryParams);
           this.workstationList = response.rows;
           this.total = response.total;

src/views/mes/pro/request/index.vue

@@ -34,10 +34,10 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['pro:materialRequest:add']">新增</el-button>
-      </el-col>
+      </el-col> -->
       <!--   <el-col :span="1.5">
         <el-button
           type="success"
@@ -336,12 +336,11 @@ export default {
       this.$refs.workstationSelect.showFlag = true;
     },
     onWorkstationSelect(row, type) {
+      console.log('row', type, row)
       if (row != undefined && row != null) {
         if(type === 'unit') {
           // this.form.workunitName = row.workunitName
           this.$set(this.form, 'workunitName', row.workunitName)
-          this.$set(this.form, 'workunitCode', row.workunitCode)
-          this.$set(this.form, 'workunitId', row.workunitId)
           this.form.workstationId = row.workstationId;
           this.form.workstationCode = row.workstationCode;
           this.form.workstationName = row.workstationName;