ysy 2 anos atrás
pai
commit
1ae676266a

+ 0 - 12
src/api/produceWord/index.js

@@ -25,15 +25,3 @@ export async function releaseWorkOrder({ id, teamId }) {
 }
 
 
-
-// 列表
-export async function getteampage(data) {
-  const res = await request.get(`/main/team/page`, {
-      params: data
-  });
-  console.log(res.data.code == 0)
-  if (res.data.code == 0) {
-      return res.data.data;
-  }
-  return Promise.reject(new Error(res.data.message));
-}

+ 1 - 1
src/views/produceOrder/components/produceOrder-search.vue

@@ -39,7 +39,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="生产版本:">
+        <el-form-item label="工艺路线:">
           <el-input
             clearable
             v-model="where.produceVersionName"

+ 22 - 31
src/views/produceOrder/components/unpackDialog.vue

@@ -68,16 +68,13 @@
           </template>
 
 
-          <template v-slot:teamId="scope">
-            <el-form-item v-if="formingNum != 0" :prop="'surplusUnpack.' + scope.$index + '.teamId'" :rules="{
+          <template v-slot:classeId="scope">
+            <el-form-item v-if="formingNum != 0" :prop="'surplusUnpack.' + scope.$index + '.classeId'" :rules="{
               required: true,
-              message: '请选择班',
+              message: '请选择班',
               trigger: 'change'
             }">
-              <el-select v-model="scope.row.teamId" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in teamList" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
+           
 
             </el-form-item>
           </template>
@@ -119,16 +116,14 @@
           </template>
 
 
-          <template v-slot:teamId="scope">
-            <el-form-item :prop="'unpackList.' + scope.$index + '.teamId'" :rules="[{
+          <template v-slot:classeId="scope">
+            <el-form-item :prop="'unpackList.' + scope.$index + '.classeId'" :rules="[{
               required: true,
-              message: '请选择班',
+              message: '请选择班',
               trigger: 'change'
             }]">
-              <el-select v-model="scope.row.teamId" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in teamList" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
+           
+           <el-input readonly v-model="scope.row.classeName" @click=""></el-input>
 
             </el-form-item>
           </template>
@@ -165,7 +160,7 @@
 <script>
 import { splitWork } from '@/api/produceOrder/index.js';
 
-import { getteampage } from '@/api/produceWord/index.js';
+
 import { deepClone } from '@/utils';
 export default {
   components: {},
@@ -191,7 +186,7 @@ export default {
       rules: {
 
       },
-      teamList: [],
+
 
 
       columns: [
@@ -216,10 +211,10 @@ export default {
           minWidth: 200
         },
         {
-          prop: 'teamId',
-          label: '班',
+          prop: 'classeId',
+          label: '班',
           align: 'center',
-          slot: 'teamId',
+          slot: 'classeId',
           minWidth: 200
         },
       ],
@@ -247,10 +242,10 @@ export default {
           minWidth: 200
         },
         {
-          prop: 'teamId',
-          label: '班',
+          prop: 'classeId',
+          label: '班',
           align: 'center',
-          slot: 'teamId',
+          slot: 'classeId',
           minWidth: 200
         }, {
           columnKey: 'action',
@@ -279,16 +274,16 @@ export default {
       this.form.unpackList = []
       this.setSurplus()
 
-      this.getteampage()
+
 
     },
 
     setSurplus() {
-      this.form.surplusUnpack.push({ originalCode: this.formData.code, formingNum: this.formData.formingNum, planStartTime: '', teamId: '' })
+      this.form.surplusUnpack.push({ originalCode: this.formData.code, formingNum: this.formData.formingNum, planStartTime: '', classeId: '' })
     },
 
     openUnpack() {
-      this.form.unpackList.push({ originalCode: this.formData.code, formingNum: '', planStartTime: '', teamId: '' })
+      this.form.unpackList.push({ originalCode: this.formData.code, formingNum: '', planStartTime: '', classeId: '' })
     },
 
     changeNum(index) {
@@ -323,12 +318,6 @@ export default {
     },
 
 
-    getteampage() {
-      getteampage().then((res) => {
-        this.teamList = res.list;
-      });
-    },
-
 
 
     cancel() {
@@ -361,6 +350,8 @@ export default {
           }
 
 
+          console.log(params)
+          return false
 
           const res = await splitWork(params);
           if (res) {

+ 4 - 15
src/views/produceOrder/index.vue

@@ -26,9 +26,7 @@
         </template>
         
 
-        <template v-slot:index="{ row }">
-           <el-tag>{{ row.isSplit == ''  }}</el-tag>
-        </template>
+
 
         <template v-slot:code="{ row }">
           <el-link type="primary" :underline="false" @click="goDetail(row)">
@@ -147,19 +145,10 @@ export default {
           align: 'center',
           fixed: 'left'
         },
-        {
-          columnKey: 'index',
-          label: '类型',
-          type: 'index',
-          slot: 'index',
-          width: 65,
-          align: 'center',
-          showOverflowTooltip: true,
-          fixed: 'left'
-        },
+ 
         {
           slot: 'code',
-          label: '生产单号',
+          label: '生产工单号',
           align: 'center',
           minWidth: 110
         },
@@ -185,7 +174,7 @@ export default {
         },
         {
           prop: 'produceVersionName',
-          label: '生产版本',
+          label: '工艺路线',
           align: 'center'
         },
         {

+ 1 - 1
src/views/produceWord/components/order-search.vue

@@ -22,7 +22,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="生产版本:">
+        <el-form-item label="工艺路线:">
           <el-input
             clearable
             v-model="where.produceVersionName"

+ 1 - 1
src/views/produceWord/index.vue

@@ -96,7 +96,7 @@
           },
           {
             prop: 'produceVersionName',
-            label: '生产版本',
+            label: '工艺路线',
             align: 'center'
           },
           {