刻字上料

src/pages/modules/lettering/index.vue

@@ -26,7 +26,7 @@ export default {
   },
   computed: {
     title () {
-      let res = ['人工倒料', '刻字工序'][Number(this.$route.meta.guidePath) - 1]
+      let res = ['人工倒料', '刻字工序', '刻字上料', '临时人工刻字上料'][Number(this.$route.meta.guidePath) - 1]
       return res
     },
     ...mapGetters(['keepAlive'])

src/pages/modules/lettering/lettering-load.vue

@@ -0,0 +1,116 @@
+<template>
+    <div class="order-wraper">
+        <div class="search-confirm-wrap">
+            <div class="search-wrap">
+                <div class="search-item">
+                    <div class="search-label">车间</div>
+                    <div class="filter_input_wraper">
+                        <el-select v-model="value1" filterable clearable placeholder="请选择">
+                          <el-option
+                              v-for="item in options1"
+                              :key="item.value"
+                              :label="item.label"
+                              :value="item.value">
+                          </el-option>
+                        </el-select>
+                    </div>
+                </div>
+                <div class="search-item">
+                    <div class="search-label">设备</div>
+                    <div class="filter_input_wraper">
+                        <el-select v-model="value2" filterable clearable placeholder="请选择">
+                            <el-option
+                              v-for="item in options2"
+                              :key="item.device_code"
+                              :label="item.device_name"
+                              :value="item.device_code">
+                          </el-option>
+                        </el-select>
+                    </div>
+                </div>
+                <div class="search-item">
+                    <div class="search-label">数量</div>
+                    <div class="filter_input_wraper">
+                        <input type="number" class="filter-input" v-model="qty">
+                    </div>
+                </div>
+                <div class="search-item_3">
+                    <button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': value2 === ''}" @click="_kzunload">卸料</button>
+                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': qty === '' || value2 === ''}" @click="toSure">余料上料</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import {dictDetailByCode, devicelist, kzresidue, kzunload} from '@config/getData1.js'
+export default {
+  data () {
+    return {
+      options1: [],
+      value1: '',
+      options2: [],
+      value2: '',
+      qty: '',
+      disabled1: false,
+      disabled2: false
+    }
+  },
+  created () {
+    this._devicelist()
+    this._dictDetailByCode()
+  },
+  methods: {
+    // 设备下拉框
+    async _devicelist () {
+      let res = await devicelist('1535144682756116480')
+      this.options2 = [...res.data]
+    },
+    // 车间下拉框
+    async _dictDetailByCode () {
+      let res = await dictDetailByCode('product_area')
+      this.options1 = [...res.data]
+    },
+    // 余料上料
+    async toSure () {
+      this.disabled1 = true
+      if (this.qty === '' || this.value2 === '') {
+        this.disabled1 = false
+        return
+      }
+      try {
+        let res = await kzresidue(this.qty, this.value2)
+        this.toast(res.message)
+        this.value1 = ''
+        this.qty = ''
+        this.value2 = ''
+        this.disabled1 = false
+      } catch (e) {
+        this.disabled1 = false
+      }
+    },
+    // 补空框
+    async _kzunload () {
+      this.disabled2 = true
+      if (this.value2 === '') {
+        this.disabled2 = false
+        return
+      }
+      try {
+        let res = await kzunload(this.value2)
+        this.toast(res.message)
+        this.value1 = ''
+        this.qty = ''
+        this.value2 = ''
+        this.disabled2 = false
+      } catch (e) {
+        this.disabled2 = false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+</style>

src/pages/modules/lettering/temporary-lettering-load.vue

@@ -0,0 +1,116 @@
+<template>
+    <div class="order-wraper">
+        <div class="search-confirm-wrap">
+            <div class="search-wrap">
+                <div class="search-item">
+                    <div class="search-label">车间</div>
+                    <div class="filter_input_wraper">
+                        <el-select v-model="value1" filterable clearable placeholder="请选择">
+                          <el-option
+                              v-for="item in options1"
+                              :key="item.value"
+                              :label="item.label"
+                              :value="item.value">
+                          </el-option>
+                        </el-select>
+                    </div>
+                </div>
+                <div class="search-item">
+                    <div class="search-label">设备</div>
+                    <div class="filter_input_wraper">
+                        <el-select v-model="value2" filterable clearable placeholder="请选择">
+                            <el-option
+                              v-for="item in options2"
+                              :key="item.device_code"
+                              :label="item.device_name"
+                              :value="item.device_code">
+                          </el-option>
+                        </el-select>
+                    </div>
+                </div>
+                <div class="search-item">
+                    <div class="search-label">数量</div>
+                    <div class="filter_input_wraper">
+                        <input type="number" class="filter-input" v-model="qty">
+                    </div>
+                </div>
+                <div class="search-item_3">
+                    <button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': value2 === ''}" @click="_tmpsendVechile">刻字上料</button>
+                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': qty === '' || value2 === ''}" @click="toSure">空框搬回</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import {dictDetailByCode, devicelist, tmpcallVechile, tmpsendVechile} from '@config/getData1.js'
+export default {
+  data () {
+    return {
+      options1: [],
+      value1: '',
+      options2: [],
+      value2: '',
+      qty: '',
+      disabled1: false,
+      disabled2: false
+    }
+  },
+  created () {
+    this._letterDeviceList()
+    this._pourDictList()
+  },
+  methods: {
+    // 设备下拉框
+    async _devicelist () {
+      let res = await devicelist('1535144682756116480')
+      this.options2 = [...res.data]
+    },
+    // 车间下拉框
+    async _dictDetailByCode () {
+      let res = await dictDetailByCode('product_area')
+      this.options1 = [...res.data]
+    },
+    // 空框搬回
+    async toSure () {
+      this.disabled1 = true
+      if (this.qty === '' || this.value2 === '') {
+        this.disabled1 = false
+        return
+      }
+      try {
+        let res = await tmpcallVechile(this.qty, this.value2)
+        this.toast(res.message)
+        this.value1 = ''
+        this.qty = ''
+        this.value2 = ''
+        this.disabled1 = false
+      } catch (e) {
+        this.disabled1 = false
+      }
+    },
+    // 刻字上料
+    async _tmpsendVechile () {
+      this.disabled2 = true
+      if (this.value2 === '') {
+        this.disabled2 = false
+        return
+      }
+      try {
+        let res = await tmpsendVechile(this.value2)
+        this.toast(res.message)
+        this.value1 = ''
+        this.qty = ''
+        this.value2 = ''
+        this.disabled2 = false
+      } catch (e) {
+        this.disabled2 = false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+</style>

src/router/index.js

@@ -25,6 +25,8 @@ const structMaterSearch = r => require.ensure([], () => r(require('@page/modules
 const letteringIndex = r => require.ensure([], () => r(require('@page/modules/lettering/index')), 'lettering')
 const manPouring = r => require.ensure([], () => r(require('@page/modules/lettering/man-pouring')), 'lettering')
 const letteringProcess = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-process')), 'lettering')
+const letteringLoad = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-load')), 'lettering')
+const TemporaryLetteringLoad = r => require.ensure([], () => r(require('@page/modules/lettering/temporary-lettering-load')), 'lettering')
 
 const Homeset = r => require.ensure([], () => r(require('@page/homeset/index')), 'Homeset')
 const Home = r => require.ensure([], () => r(require('@page/homeset/HomePage')), 'HomePage')
@@ -138,6 +140,14 @@ export default new Router({
           path: '/letteringprocess',
           component: letteringProcess,
           meta: {guidePath: '2'}
+        }, {
+          path: '/letteringload',
+          component: letteringLoad,
+          meta: {guidePath: '3'}
+        }, {
+          path: '/temporaryletteringload',
+          component: TemporaryLetteringLoad,
+          meta: {guidePath: '4'}
         }
       ]
     },