1

src/views/template/enterboundTwo.vue

@@ -494,6 +494,14 @@ export default {
         {
           dictLabel: '出',
           dictValue: '2'
+        },
+        {
+          dictLabel: '手动入',
+          dictValue: '3'
+        },
+        {
+          dictLabel: '手动出',
+          dictValue: '4'
         }
       ],
       dateRange: [],

src/views/template/incomeWmsBox.vue

@@ -187,6 +187,12 @@
               :size="commonField.size"
               @click="handleDelete(scope.row)"
             >删除</el-button>
+            <el-button
+              :class="commonField.delClass"
+              :type="commonField.typeParent"
+              :size="commonField.size"
+              @click="handleMove(scope.row)"
+            >移动</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -198,32 +204,24 @@
       :limit.sync="queryParams.rows"
       @pagination="getList"
     />
-    <!-- 添加或修改库存管理配置对话框 -->
+    <!-- 移动库存管理配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px">
-        <el-form-item label="code" prop="orderCode">
-          <el-input v-model.trim="form.orderCode" show-word-limit :maxlength="100" placeholder="请输入code" />
-        </el-form-item>
-        <el-form-item label="lot" prop="lot">
-          <el-input v-model.trim="form.lot" show-word-limit :maxlength="100" placeholder="请输入lot" />
-        </el-form-item>
-        <el-form-item label="pn" prop="pn">
-          <el-input v-model.trim="form.pn" show-word-limit :maxlength="100" placeholder="请输入pn" />
-        </el-form-item>
-        <el-form-item label="rank" prop="rank">
-          <el-input v-model.trim="form.rank" show-word-limit :maxlength="100" placeholder="请输入rank" />
-        </el-form-item>
-        <el-form-item label="qty" prop="qty">
-          <el-input-number v-model.trim="form.qty" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="label_id" prop="labelId">
-          <el-input v-model.trim="form.labelId" show-word-limit :maxlength="50" placeholder="请输入label_id" />
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.flag">
-            <el-radio label="1">启用</el-radio>
-            <el-radio label="0">停用</el-radio>
-          </el-radio-group>
+        <el-form-item label="移动位置">
+          <el-select
+            v-model="form.type"
+            placeholder="请选择位置"
+            :maxlength="2"
+            size="small"
+            style="width: 300px"
+          >
+            <el-option
+              v-for="(type,index) in typeList"
+              :key="index"
+              :label="type"
+              :value="type"
+            />
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -244,6 +242,7 @@ import {
   exportIncomeWmsBox } from '@/api/incomeWmsBox'
 import commonField from '@/utils/commonField'
 import manufacturer from '@/data/cjlist'
+import { listIncomeWmsLabel } from '@/api/incomeWmsLabel'
 export default {
   name: 'IncomeWmsBox',
   data() {
@@ -308,13 +307,16 @@ export default {
         orderCode: undefined,
         labelId: undefined,
         location: undefined,
+        mac: undefined,
         flag: ''
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      typeList: [],
+      typelistTemp: []
     }
   },
   computed: {
@@ -470,6 +472,20 @@ export default {
       }).catch(function() {
       })
     },
+    handleMove(row) {
+      this.reset()
+      listIncomeWmsLabel().then(response => {
+        this.typelistTemp = response.rows
+        this.typeList = []
+        this.typelistTemp.forEach(item => {
+          const type = item.mac + ' ' + item.location
+          this.typeList.push(type)
+        })
+        console.log('typeList' + this.typeList)
+        this.open = true
+        this.title = '修改库存管理'
+      })
+    },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams

src/views/template/outcomeWmsJbapplyTemp.vue

@@ -207,7 +207,7 @@
             <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" min-width="160px">
+        <el-table-column label="操作" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
               v-show="scope.row.dealStatus !=='1'"
@@ -1017,7 +1017,7 @@ export default {
       const id = row.businessId
       this.warehousedata.qty = ''
       getOutcomeWmsJbapplyTemp(id).then(response => {
-        response.data.ptype = response.data.ptype
+        this.ptype = response.data.ptype
         this.form = response.data
         this.open = true
         this.title = '修改检查申请'