修改生产界面

hw-ui/src/views/board/fifthFloor/index.vue

@@ -25,8 +25,10 @@
             </el-form-item>
           </el-form>
           <div style="text-align: center">
-            <el-button type="primary" @click="getMaterials" :disabled="!form.planCode">领料</el-button>
-            <el-button :disabled="form.planDetailStatus === '已完成' || !form.planDetailStatus" type="primary" @click="finish">完成</el-button>
+            <el-button :disabled="!form.planCode" type="primary" @click="getMaterials">领料</el-button>
+            <el-button :disabled="form.planDetailStatus === '已完成' || !form.planDetailStatus" type="primary"
+                       @click="finish">完成
+            </el-button>
             <el-popover
               v-if="($route.query && $route.query.id) === '2'"
               v-model="assignModel"
@@ -34,11 +36,16 @@
               style="margin-left: 10px"
               trigger="click"
               width="400">
-              <el-table :data="stationData" highlight-current-row
-                        @current-change="stationChange"
-              >
-                <el-table-column align="center" label="工位名称" prop="stationName"/>
-              </el-table>
+              <el-form ref="form" :model="form2" label-width="80px">
+                <el-form-item label="名称">
+                  <el-input v-model="form2.name"></el-input>
+                </el-form-item>
+                <el-form-item label="特殊资源">
+                  <el-radio-group v-model="form2.nowStation">
+                    <el-radio v-for="i in stationData" :label="i.stationName" :value="i.stationId"></el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-form>
               <div style="float:right;margin-top: 8px">
                 <el-button type="primary" @click="completeStation">确 定</el-button>
               </div>
@@ -375,8 +382,9 @@ export default {
       dialogVisible: false,
       form: {},
       form1: {},
+      form2: {},
       tableData: [],
-      nowStation: {},
+      nowStation: null,
       stationData: [
         {
           stationName: '五楼装配工位1',
@@ -588,7 +596,8 @@ export default {
         this.$store.dispatch('LogOut').then(() => {
           location.href = '/login?isStationId=true';
         })
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     next1() {
       this.nowNum1 += 1
@@ -631,7 +640,7 @@ export default {
       this.nowStation = val
     },
     completeStation() {
-      console.log(this.nowStation)
+      console.log(this.form2)
       this.assignModel = false
     },
     getInfo(e) {
@@ -1018,7 +1027,7 @@ export default {
         warehouseId: this.form1.warehouseId,
         materialName: val
       }).then(e => {
-        this.$set(this.form1,'wmsRawOutstockDetailList',e.data.map(r => {
+        this.$set(this.form1, 'wmsRawOutstockDetailList', e.data.map(r => {
           return {
             materialId: r.materialId,
             materialCode: r.materialCode,

hw-ui/src/views/board/fourthFloor/weld.vue

@@ -382,7 +382,8 @@ export default {
         this.$store.dispatch('LogOut').then(() => {
           location.href = '/login?isStationId=true';
         })
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     next1() {
       this.nowNum1 += 1