需求修改

2024-09-05 16:33:48 +08:00
parent 497e47beab
commit 4290d8cc1a
5 changed files with 58 additions and 81 deletions
--- a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
@@ -9,9 +9,9 @@
        <p v-if="e.type === '1'" class="point_name">{{ e.name }}</p>
        <p v-if="e.type === '0'" class="point_name point_name_btn" @click="showPop('IN', e)">{{ e.name }}</p>
        <p class="point_value">{{ e.device_code }}</p>
-        <div v-if="e.type === '1'" class="button" @click="showPop('CONTAINER', e)">CONTAINER</div>
-        <div v-if="e.type === '1'" class="button" @click="showPop('SCANER', e)">SCANER</div>
-        <div v-if="e.type === '0'" class="button" @click="showPop('BACK', e)">BACK</div>
+        <div v-if="e.type === '1'" class="button" @click="showPop('CONTAINER', e)">呼叫空框</div>
+        <div v-if="e.type === '1'" class="button" @click="showPop('SCANER', e)">完成入库</div>
+        <div v-if="e.type === '0'" class="button" @click="showPop('BACK', e)">回库</div>
      </div>
    </div>
    <div v-show="type === 'IN'" class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
@@ -107,10 +107,10 @@
      </el-row>
    </div>
    <div v-show="type === 'SCANER'" class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
-      <el-row class="filter-wraper" style="width: 50%" type="flex" justify="space-between">
-        <el-col :span="5" class="p-label">目的地</el-col>
-        <el-col :span="18" class="select-wraper">
-          <el-select v-model="value1" placeholder="请选择">
+      <el-row class="filter-wraper" type="flex" justify="space-between">
+        <el-col :span="2" class="p-label">目的地</el-col>
+        <el-col :span="8" class="select-wraper">
+          <el-select v-model="value1" placeholder="请选择" @change="selectChange">
            <el-option
              v-for="item in options1"
              :key="item.value"
@@ -120,6 +120,11 @@
            />
          </el-select>
        </el-col>
+        <el-col :span="2" class="p-label" />
+        <el-col :span="2" class="p-label">载具号</el-col>
+        <el-col :span="8" class="select-wraper">
+          <input v-model="vcode" type="text" class="set-input">
+        </el-col>
      </el-row>
      <div class="pop-grid pop-grid_1">
        <el-table
@@ -130,21 +135,31 @@
            label="订单号"
          >
            <template slot-scope="scope">
-              <input v-model="scope.row.order_code" type="text" class="set-input">
+              <div class="select-wraper">
+                <el-select v-model="scope.row.order_code" placeholder="请选择" :disabled="value1 !== '1'">
+                  <el-option
+                    v-for="item in options2"
+                    :key="item.order_code"
+                    :label="item.order_code"
+                    :value="item.order_code"
+                    class="option-wraper"
+                  />
+                </el-select>
+              </div>
            </template>
          </el-table-column>
          <el-table-column
            label="数量"
          >
            <template slot-scope="scope">
-              <input v-model="scope.row.material_qty" type="text" class="set-input">
+              <input v-model="scope.row.material_qty" :disabled="value1 !== '1'" type="text" class="set-input" :class="{'set-input_dis': value1 !== '1'}">
            </template>
          </el-table-column>
          <el-table-column
            label="操作"
          >
            <template>
-              <el-button circle type="primary" icon="el-icon-plus" @click="addRow" />
+              <el-button circle :type="value1 === '1' ? 'primary' : 'info'" icon="el-icon-plus" @click="addRow" />
            </template>
          </el-table-column>
        </el-table>
@@ -192,6 +207,7 @@

 <script>
 import crudProduceScreen from './produceScreen'
+// import crudProduceScreen from './mork'
 export default {
  data() {
    return {
@@ -204,7 +220,10 @@ export default {
      value: '',
      options: [{ value: 'G01', label: '钢托盘' }, { value: 'R01', label: '990mm笼框' }, { value: 'R02', label: '450mm 笼框' }, { value: 'S04', label: '1670mm料架' }, { value: 'S06', label: '1700mm料架' }],
      value1: '',
-      options1: [{ value: 'G01', label: '钢托盘' }, { value: 'R01', label: '990mm笼框' }, { value: 'R02', label: '450mm 笼框' }, { value: 'S04', label: '1670mm料架' }, { value: 'S06', label: '1700mm料架' }],
+      options1: [{ value: '1', label: '货架' }, { value: '2', label: '内部' }, { value: '3', label: '外协' }],
+      value2: '',
+      options2: [],
+      vcode: '',
      disabled: false
    }
  },
@@ -235,6 +254,7 @@ export default {
      this.currentRow = null
      this.value = ''
      this.value1 = ''
+      this.vcode = ''
      this.type = type
      this.popData = e
      if (type === 'IN') {
@@ -249,7 +269,9 @@ export default {
        this.show = true
        this.emptyObj.device_code = e.name
      } else if (type === 'SCANER') {
-        this.popList.push({ order_code: '', material_qty: '' })
+        crudProduceScreen.fabOrders({ device_code: this.popData.device_code }).then(res => {
+          this.options2 = [...res]
+        })
        this.show = true
      } else if (type === 'BACK') {
        crudProduceScreen.fabOrders({ device_code: this.popData.device_code }).then(res => {
@@ -306,6 +328,12 @@ export default {
      this.show = false
    },
    addRow() {
+      if (this.value1 === '1') {
+        this.popList.push({ order_code: '', material_qty: '' })
+      }
+    },
+    selectChange(e) {
+      this.popList = []
      this.popList.push({ order_code: '', material_qty: '' })
    }
  }
--- a/lms/nladmin-ui/src/views/wms/produceScreen/mork.js
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/mork.js
@@ -10,12 +10,10 @@ export function authLogin() {

 // 2.选择登录设备
 export function getUserOrDevice() {
-  const res = {
-    content: [
-      { point_code: '111-02', point_name: 'TP5000冲床加工' },
-      { point_code: '111 03', point_name: '警平' }
-    ]
-  }
+  const res = [
+    { device_code: '111-02', device_name: 'TP5000冲床加工' },
+    { device_code: '111 03', device_name: '警平' }
+  ]
  return new Promise((resolve, reject) => {
    resolve(res)
  })
@@ -23,7 +21,7 @@ export function getUserOrDevice() {

 // 3.登录跳转
 export function deviceInLogin() {
-  const res = { device_name: 'TP5000冲床加工', device_code: '111-02', region_points: [{ name: 'OUT1', type: '1', device_code: '1234' }, { name: 'OUT2', type: '1', device_code: '1234' }, { name: 'OUT3', type: '1', device_code: '1234' }, { name: 'OUT4', type: '1', device_code: '1234' }, { name: 'N1', type: '0', device_code: '1234' }, { name: 'N2', type: '0', device_code: '1234' }] }
+  const res = { device_name: 'TP5000冲床加工', device_code: '111-02', region_points: [{ name: 'OUT1', type: '1', device_code: '1234' }, { name: 'OUT2', type: '1', device_code: '1234' }, { name: 'OUT3', type: '1', device_code: '1234' }, { name: 'OUT4', type: '1', device_code: '1234' }, { name: '叫料', type: '0', device_code: '1234' }, { name: '叫料', type: '0', device_code: '1234' }] }
  return new Promise((resolve, reject) => {
    resolve(res)
  })
@@ -71,11 +69,9 @@ export function callEmp(data) {

 // 8.查询订单号
 export function fabOrders() {
-  const res = {
-    content: [
-      { order_code: '111-02', material_qty: '' }
-    ]
-  }
+  const res = [
+    { order_code: '111-02', material_qty: '' }
+  ]
  return new Promise((resolve, reject) => {
    resolve(res)
  })
--- a/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
@@ -8,12 +8,6 @@ export function authLogin(data) {
    data
  })
 }
-// export function authLogin() {
-//   const res = { username: 'aaa' }
-//   return new Promise((resolve, reject) => {
-//     resolve(res)
-//   })
-// }

 // 2.选择登录设备
 export function getUserOrDevice(data) {
@@ -23,17 +17,6 @@ export function getUserOrDevice(data) {
    data
  })
 }
-// export function getUserOrDevice() {
-//   const res = {
-//     content: [
-//       { point_code: '111-02', point_name: 'TP5000冲床加工' },
-//       { point_code: '111 03', point_name: '警平' }
-//     ]
-//   }
-//   return new Promise((resolve, reject) => {
-//     resolve(res)
-//   })
-// }

 // 3.登录跳转
 export function deviceInLogin(data) {
@@ -43,12 +26,6 @@ export function deviceInLogin(data) {
    data
  })
 }
-// export function deviceInLogin() {
-//   const res = { device_name: 'TP5000冲床加工', device_code: '111-02', region_points: [{ name: 'OUT1', type: '1', device_code: '1234' }, { name: 'OUT2', type: '1', device_code: '1234' }, { name: 'OUT3', type: '1', device_code: '1234' }, { name: 'OUT4', type: '1', device_code: '1234' }, { name: 'N1', type: '0', device_code: '1234' }, { name: 'N2', type: '0', device_code: '1234' }] }
-//   return new Promise((resolve, reject) => {
-//     resolve(res)
-//   })
-// }

 // 4.根据工序查询订单
 export function regionOrder(code, code1) {
@@ -57,14 +34,6 @@ export function regionOrder(code, code1) {
    method: 'get'
  })
 }
-// export function regionOrder(code) {
-//   const res = {
-//     content: [{ vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }]
-//   }
-//   return new Promise((resolve, reject) => {
-//     resolve(res)
-//   })
-// }

 // 5.查询载具物料信息
 export function fabMaterial(data) {
@@ -74,16 +43,6 @@ export function fabMaterial(data) {
    data
  })
 }
-// export function fabMaterial() {
-//   const res = {
-//     content: [
-//       { order_code: '111-02', material_qty: '' }
-//     ]
-//   }
-//   return new Promise((resolve, reject) => {
-//     resolve(res)
-//   })
-// }

 // 6.呼叫库存物料
 export function callMater(data) {
@@ -111,16 +70,6 @@ export function fabOrders(data) {
    data
  })
 }
-// export function fabOrders() {
-//   const res = {
-//     content: [
-//       { order_code: '111-02', material_qty: '' }
-//     ]
-//   }
-//   return new Promise((resolve, reject) => {
-//     resolve(res)
-//   })
-// }

 // 9.工序下料
 export function sendMater(data) {
@@ -148,12 +97,6 @@ export function loginOut(data) {
    data
  })
 }
-// export function loginOut() {
-//   const res = {}
-//   return new Promise((resolve, reject) => {
-//     resolve(res)
-//   })
-// }

 export default {
  authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, loginOut
--- a/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue
@@ -48,6 +48,7 @@
 <script>
 import { encrypt } from '@/utils/rsaEncrypt'
 import crudProduceScreen from './produceScreen'
+// import crudProduceScreen from './mork'
 export default {
  data() {
    return {
--- a/lms/nladmin-ui/src/views/wms/produceScreen/style.scss
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/style.scss
@@ -42,6 +42,10 @@
    padding: 0 15px;
    box-sizing: border-box;
 }
+.set-input_dis {
+  background: #909399;
+  border-color: #909399;
+}
 .mgb5 {
    margin-bottom: 5%;
 }
@@ -67,6 +71,10 @@
    height: 40px;
    color: #fff;
  }
+  >>>.el-select .el-input.is-disabled .el-input__inner {
+    background-color: #909399;
+    border-color: #909399;
+  }
 }
 .m-content {
  display: flex;
@@ -206,6 +214,7 @@
  margin: 0 auto;
 }
 .point_name_btn {
+  font-size: 30px;
  border-radius: 100%;
  background-color: #1d82b1;
  box-shadow: 0px 4px 4px rgba(18, 15, 15, 60%);