diff --git a/src/config/getData1.js b/src/config/getData1.js
index 46541f5..499dda2 100644
--- a/src/config/getData1.js
+++ b/src/config/getData1.js
@@ -32,10 +32,8 @@ export const authority = () => {
         path: 'RF04',
         name: '刻字管理',
         sonTree: [
-          {menu_id: '1', name: '人工倒料', path: '/manpouring'},
-          {menu_id: '2', name: '刻字工序', path: '/letteringprocess'},
-          {menu_id: '3', name: '刻字上料', path: '/letteringload'},
-          {menu_id: '4', name: '临时人工刻字上料', path: '/temporaryletteringload'}
+          {menu_id: '1', name: '刻字工序', path: '/letteringprocess'},
+          {menu_id: '2', name: '人工刻字上料', path: '/letteringload'}
         ]
       },
       {menu_id: '5',
@@ -50,7 +48,7 @@ export const authority = () => {
         path: 'RF06',
         name: '专机管理',
         sonTree: [
-          // {menu_id: '1', name: '专机管理', path: '/operation'}
+          {menu_id: '1', name: '人工倒料', path: '/manpouring'}
         ]
       },
       {menu_id: '7',
diff --git a/src/config/http.js b/src/config/http.js
index 7ac5793..2f069ef 100644
--- a/src/config/http.js
+++ b/src/config/http.js
@@ -3,7 +3,7 @@ import { Dialog } from './utils.js'
 import store from '../vuex/store'
 import router from '@/router'
 
-axios.defaults.timeout = 5000
+axios.defaults.timeout = 50000
 axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'
 
 axios.interceptors.request.use(
diff --git a/src/pages/404.vue b/src/pages/404.vue
index 72e35c8..55cc1e1 100644
--- a/src/pages/404.vue
+++ b/src/pages/404.vue
@@ -31,8 +31,10 @@ export default {
   text-align center
 .error-icon
   font-size 1rem
+  color #fff
 .error
   line-height .3rem
+  color #fff
 .error-button
   padding 0 .2rem
   line-height .3rem
@@ -41,4 +43,5 @@ export default {
   background none
   margin-top .2rem
   border-radius 5px
+  color #fff
 </style>
diff --git a/src/pages/modules/lettering/index.vue b/src/pages/modules/lettering/index.vue
index 3bd65a1..9322270 100644
--- a/src/pages/modules/lettering/index.vue
+++ b/src/pages/modules/lettering/index.vue
@@ -5,11 +5,21 @@
         @switchColor="switchColor"
         />
         <div class="body-container">
-            <div class="main-container">
-                <keep-alive :include="keepAlive" >
-                  <router-view/>
-                </keep-alive>
-            </div>
+          <div class="tabs_wrap">
+              <ul class="tabs">
+                  <li v-show="Number($route.meta.guidePath) < 4" v-for="i in menus1" :key="i.index">
+                      <router-link :to="i.router" :class="{'router-link-active': i.router === $route.path}">{{i.label}}</router-link>
+                  </li>
+                  <li v-show="Number($route.meta.guidePath) >= 4" v-for="i in menus2" :key="i.index">
+                      <router-link :to="i.router" :class="{'router-link-active': i.router === $route.path}">{{i.label}}</router-link>
+                  </li>
+              </ul>
+          </div>
+          <div class="main-container">
+              <keep-alive :include="keepAlive" >
+                <router-view/>
+              </keep-alive>
+          </div>
         </div>
     </div>
     </template>
@@ -22,11 +32,40 @@ export default {
     jxHeader
   },
   data () {
-    return {}
+    return {
+      menus1: [
+        {
+          label: '刻字上料',
+          router: '/letteringload'
+        },
+        {
+          label: '刻字爬坡',
+          router: '/letteringclimb'
+        },
+        {
+          label: '临时人工上料',
+          router: '/temporaryletteringload'
+        }
+      ],
+      menus2: [
+        {
+          label: '刻字工序',
+          router: '/letteringprocess'
+        },
+        {
+          label: '刻字机选择',
+          router: '/letteringmachineselect'
+        },
+        {
+          label: '任务列表',
+          router: '/letteringtasklist'
+        }
+      ]
+    }
   },
   computed: {
     title () {
-      let res = ['人工倒料', '刻字工序', '刻字上料', '临时人工刻字上料'][Number(this.$route.meta.guidePath) - 1]
+      let res = ['刻字上料', '刻字爬坡', '临时人工上料', '刻字工序', '刻字机选择', '任务列表'][Number(this.$route.meta.guidePath) - 1]
       return res
     },
     ...mapGetters(['keepAlive'])
@@ -58,6 +97,26 @@ export default {
     margin 0 auto 10px
     padding 5px
     border 1px solid #484cce
+.tabs_wrap
+  height 34px
+.tabs
+  height 34px
+  li
+    float left
+    line-height 32px
+    text-align center
+    padding-right 10px
+    a
+      display inline-block
+      color #fff
+      width 100%
+      padding 0 10px
+      font-size 14px
+      border-bottom 1px solid #2aa6f9
+    .router-link-active
+        background linear-gradient(#0de0ff 0%,#2aa6f9 100%)
+        border-top-left-radius 12px
+        border-top-right-radius 12px
 .main-container
-    _wh(100%, 100%)
+    _wh(100%, calc(100% - 34px))
 </style>
diff --git a/src/pages/modules/lettering/lettering-climb.vue b/src/pages/modules/lettering/lettering-climb.vue
new file mode 100644
index 0000000..2e60892
--- /dev/null
+++ b/src/pages/modules/lettering/lettering-climb.vue
@@ -0,0 +1,124 @@
+<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': qty === '' || value2 === ''}" @click="_kzunload">卸料</button>
+                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': 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')
+      if (res.code === 200) {
+        this.options2 = [...res.content]
+      } else {
+        this.toast(res.msg)
+      }
+    },
+    // 车间下拉框
+    async _dictDetailByCode () {
+      let res = await dictDetailByCode('product_area')
+      if (res.code === 200) {
+        this.options1 = [...res.content]
+      } else {
+        this.toast(res.msg)
+      }
+    },
+    // 余料上料
+    async toSure () {
+      this.disabled1 = true
+      if (this.value2 === '') {
+        this.disabled1 = false
+        return
+      }
+      try {
+        let res = await kzresidue(this.value2)
+        this.toast(res.msg)
+        this.value1 = ''
+        this.qty = ''
+        this.value2 = ''
+        this.disabled1 = false
+      } catch (e) {
+        this.disabled1 = false
+      }
+    },
+    // 卸料
+    async _kzunload () {
+      this.disabled2 = true
+      if (this.qty === '' || this.value2 === '') {
+        this.disabled2 = false
+        return
+      }
+      try {
+        let res = await kzunload(this.qty, this.value2)
+        this.toast(res.msg)
+        this.value1 = ''
+        this.qty = ''
+        this.value2 = ''
+        this.disabled2 = false
+      } catch (e) {
+        this.disabled2 = false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+</style>
diff --git a/src/pages/modules/lettering/lettering-load.vue b/src/pages/modules/lettering/lettering-load.vue
index 2e60892..b519a70 100644
--- a/src/pages/modules/lettering/lettering-load.vue
+++ b/src/pages/modules/lettering/lettering-load.vue
@@ -35,8 +35,8 @@
                     </div>
                 </div>
                 <div class="search-item_3">
-                    <button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': qty === '' || value2 === ''}" @click="_kzunload">卸料</button>
-                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': value2 === ''}" @click="toSure">余料上料</button>
+                    <button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': value2 === ''}" @click="_letterCallVechile">补空框</button>
+                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': qty === '' || value2 === ''}" @click="toSure">人工倒料</button>
                 </div>
             </div>
         </div>
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-import {dictDetailByCode, devicelist, kzresidue, kzunload} from '@config/getData1.js'
+import {pourDictList, letterDeviceList, pourdeviceinstorQty, letterCallVechile} from '@config/getData2.js'
 export default {
   data () {
     return {
@@ -53,18 +53,17 @@ export default {
       options2: [],
       value2: '',
       qty: '',
-      disabled1: false,
-      disabled2: false
+      disabled1: false
     }
   },
   created () {
-    this._devicelist()
-    this._dictDetailByCode()
+    this._letterDeviceList()
+    this._pourDictList()
   },
   methods: {
     // 设备下拉框
-    async _devicelist () {
-      let res = await devicelist('1535144682756116480')
+    async _letterDeviceList () {
+      let res = await letterDeviceList('1535144682756116480')
       if (res.code === 200) {
         this.options2 = [...res.content]
       } else {
@@ -72,23 +71,23 @@ export default {
       }
     },
     // 车间下拉框
-    async _dictDetailByCode () {
-      let res = await dictDetailByCode('product_area')
+    async _pourDictList () {
+      let res = await pourDictList('product_area')
       if (res.code === 200) {
         this.options1 = [...res.content]
       } else {
         this.toast(res.msg)
       }
     },
-    // 余料上料
+    // 确认入库
     async toSure () {
       this.disabled1 = true
-      if (this.value2 === '') {
+      if (this.qty === '' || this.value2 === '') {
         this.disabled1 = false
         return
       }
       try {
-        let res = await kzresidue(this.value2)
+        let res = await pourdeviceinstorQty(this.qty, this.value2)
         this.toast(res.msg)
         this.value1 = ''
         this.qty = ''
@@ -98,15 +97,15 @@ export default {
         this.disabled1 = false
       }
     },
-    // 卸料
-    async _kzunload () {
+    // 补空框
+    async _letterCallVechile () {
       this.disabled2 = true
-      if (this.qty === '' || this.value2 === '') {
+      if (this.value2 === '') {
         this.disabled2 = false
         return
       }
       try {
-        let res = await kzunload(this.qty, this.value2)
+        let res = await letterCallVechile(this.value2)
         this.toast(res.msg)
         this.value1 = ''
         this.qty = ''
diff --git a/src/pages/modules/lettering/lettering-machine-select.vue b/src/pages/modules/lettering/lettering-machine-select.vue
new file mode 100644
index 0000000..17758d6
--- /dev/null
+++ b/src/pages/modules/lettering/lettering-machine-select.vue
@@ -0,0 +1,149 @@
+<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">
+                        <input type="text" class="filter-input">
+                    </div>
+                </div>
+                <div class="search-item">
+                    <div class="search-label">载具</div>
+                    <div class="filter_input_wraper">
+                        <input type="text" class="filter-input">
+                    </div>
+                </div>
+                <div class="search-item">
+                    <div class="search-label">重量</div>
+                    <div class="filter_input_wraper">
+                        <input type="number" class="filter-input">
+                    </div>
+                </div>
+                <div class="search-item_3">
+                    <button class="button button--primary" @click="_washQuery">平均分配</button>
+                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': checkArr.length === 0}" @click="_washSubmitWash">取消分配</button>
+                    <button class="button button--primary" @click="toJump">确认上料</button>
+                </div>
+            </div>
+        </div>
+        <div class="grid_wraper">
+            <table class="filter-table">
+                <thead>
+                    <tr>
+                        <th>选择</th>
+                        <th>序号</th>
+                        <th>设备号</th>
+                        <th>工单号</th>
+                        <th>计划数量</th>
+                        <th>生产数量</th>
+                        <th>物料规格</th>
+                        <th>重量(kg)</th>
+                        <th>数量</th>
+                        <th>物料编号</th>
+                        <th>物料名称</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr v-for="(e, i) in dataList" :key="i" @click="toRadio(e)">
+                        <td>
+                          <button class="iconfont select_icon select_square_icon" :class="e.checked ? 'selected_icon' : 'unselect_icon'"></button>
+                        </td>
+                        <td>{{ e.device_code }}</td>
+                        <td>{{e.material_code}}</td>
+                        <td>{{e.material_spec}}</td>
+                        <td>{{e.deviceinstor_weight | unitskg}}</td>
+                        <td>{{ e.deviceinstor_qty | numeric(3)  }}</td>
+                        <td>{{ e.task_code }}</td>
+                        <td>{{ e.update_time }}</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</template>
+
+<script>
+import {dictAll, washSpecList, washQuery, washSubmitWash} from '@config/getData2.js'
+export default {
+  name: 'cleaningloading',
+  data () {
+    return {
+      options1: [],
+      value1: '',
+      options2: [],
+      value2: '',
+      dataList: [],
+      checkArr: [],
+      disabled1: false
+    }
+  },
+  created () {
+    this._dictAll()
+    this._washSpecList()
+  },
+  methods: {
+    // 车间下拉框
+    async _dictAll () {
+      let res = await dictAll()
+      if (res.code === 200) {
+        this.options1 = [...res.content]
+        this.value1 = this.options1[0].value
+        this._washQuery()
+      }
+    },
+    // 规格下拉框
+    async _washSpecList () {
+      let res = await washSpecList()
+      if (res.code === 200) {
+        this.options2 = [...res.content]
+      }
+    },
+    // grid
+    async _washQuery () {
+      let res = await washQuery(this.value1, this.value2)
+      if (res.code === 200) {
+        this.checkArr = []
+        res.content.map(el => {
+          this.$set(el, 'checked', false)
+        })
+        this.dataList = [...res.content]
+      }
+    },
+    // 确认上料
+    async _washSubmitWash () {
+      this.disabled1 = true
+      if (this.checkArr.length === 0) {
+        this.disabled1 = false
+        return
+      }
+      try {
+        let arr = []
+        this.checkArr.map(el => {
+          arr.push(el.device_code)
+        })
+        let res = await washSubmitWash(arr)
+        if (res.code === 200) {
+          this.toast(res.msg)
+          this._washQuery()
+        }
+        this.disabled1 = false
+      } catch (e) {
+        this.disabled1 = false
+      }
+    },
+    toJump () {
+      this.$router.push('/manpour')
+    },
+    toRadio (e) {
+      e.checked = !e.checked
+      this.checkArr = this.dataList.filter(i => { return i.checked === true })
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.grid_wraper
+    height calc(100% - 1.1rem)
+</style>
diff --git a/src/pages/modules/lettering/lettering-process.vue b/src/pages/modules/lettering/lettering-process.vue
index b519a70..037b87e 100644
--- a/src/pages/modules/lettering/lettering-process.vue
+++ b/src/pages/modules/lettering/lettering-process.vue
@@ -3,121 +3,236 @@
         <div class="search-confirm-wrap">
             <div class="search-wrap">
                 <div class="search-item">
-                    <div class="search-label">车间</div>
+                    <div class="search-label">仓库</div>
                     <div class="filter_input_wraper">
                         <el-select v-model="value1" filterable clearable placeholder="请选择">
-                          <el-option
+                            <el-option
                               v-for="item in options1"
-                              :key="item.value"
-                              :label="item.label"
-                              :value="item.value">
+                              :key="item.stor_id"
+                              :label="item.stor_name"
+                              :value="item.stor_id">
                           </el-option>
                         </el-select>
                     </div>
                 </div>
                 <div class="search-item">
-                    <div class="search-label">设备</div>
+                    <div class="search-label search-label_1">日期</div>
+                    <div class="filter_input_wraper filter_input_wraper_1">
+                        <el-date-picker
+                        v-model="date"
+                        type="daterange"
+                        range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期">
+                      </el-date-picker>
+                    </div>
+                </div>
+                <div class="search-item">
+                    <div class="search-label">物料</div>
+                    <div class="filter_input_wraper">
+                        <input type="text" class="filter-input" v-model="material_code">
+                    </div>
+                </div>
+                <div class="search-item">
+                    <div class="search-label">载具号</div>
+                    <div class="filter_input_wraper">
+                        <input type="text" class="filter-input" v-model="storagevehicle_code">
+                    </div>
+                </div>
+                <div class="search-item">
+                    <div class="search-label">货位号</div>
+                    <div class="filter_input_wraper">
+                        <input type="text" class="filter-input" v-model="struct_code">
+                    </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
+                          <el-option
                               v-for="item in options2"
-                              :key="item.device_code"
-                              :label="item.device_name"
-                              :value="item.device_code">
+                              :key="item.point_code"
+                              :label="item.point_name"
+                              :value="item.point_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="_letterCallVechile">补空框</button>
-                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': qty === '' || value2 === ''}" @click="toSure">人工倒料</button>
+                    <button class="button button--primary" @click="_checkGetDtlAll">查询</button>
+                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': pkId === '' || value2 === ''}" @click="_checkSendTask">确认上料</button>
                 </div>
             </div>
         </div>
+        <div class="grid_wraper">
+            <table class="filter-table">
+                <thead>
+                    <tr>
+                        <th>序号</th>
+                        <th>货位</th>
+                        <th>载具号</th>
+                        <th>物料规格</th>
+                        <th>重量(kg)</th>
+                        <th>数量</th>
+                        <th>物料编号</th>
+                        <th>入库时间</th>
+                        <th>是否已挑料</th>
+                        <th>入库类型</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr v-for="(e, i) in dataList" :key="i" :class="{'selected_icon': pkId === e.checkdtl_id}" @click="toRadio(e)">
+                        <td>{{ i + 1 }}</td>
+                        <td>{{e.struct_name}}</td>
+                        <td>{{e.storagevehicle_code}}</td>
+                        <td>{{e.material_code}}</td>
+                        <td>{{e.material_spec}}</td>
+                        <td>{{e.qty | numeric(3)}}</td>
+                        <td>{{e.base_qty | numeric(3)}}</td>
+                        <td><input type="number" class="input" v-model="e.fac_qty"></td>
+                        <td>{{ ['正常', '盘亏', '盘盈'][Number(e.check_result)] }}</td>
+                        <td>生成</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
 </template>
 
 <script>
-import {pourDictList, letterDeviceList, pourdeviceinstorQty, letterCallVechile} from '@config/getData2.js'
+import { checkGetBcpStor, checkGetDtlAll, checkGetPoint, checkSendTask, checkConfirm, checkConfirmOffer, checkConfirmFinance } from '@config/getData2.js'
+import {dateTimeFtt} from '@config/utils.js'
 export default {
   data () {
     return {
       options1: [],
       value1: '',
+      date: [new Date((new Date().getTime() - 6 * 24 * 60 * 60 * 1000)), new Date((new Date().getTime()))],
       options2: [],
       value2: '',
-      qty: '',
-      disabled1: false
+      material_code: '',
+      storagevehicle_code: '',
+      struct_code: '',
+      dataList: [],
+      pkId: '',
+      pkObj: {},
+      disabled1: false,
+      disabled2: false,
+      disabled3: false,
+      disabled4: false
+    }
+  },
+  computed: {
+    flag () {
+      let flag = false
+      if (this.dataList.length) {
+        this.dataList.map(el => {
+          if (el.fac_qty === '' || Number(el.fac_qty) < 0) {
+            flag = true
+          }
+        })
+      }
+      return flag
     }
   },
   created () {
-    this._letterDeviceList()
-    this._pourDictList()
+    this._checkGetBcpStor()
+    this._checkGetDtlAll()
+    this._checkGetPoint()
   },
   methods: {
-    // 设备下拉框
-    async _letterDeviceList () {
-      let res = await letterDeviceList('1535144682756116480')
-      if (res.code === 200) {
-        this.options2 = [...res.content]
-      } else {
-        this.toast(res.msg)
-      }
+    // 仓库下拉框
+    async _checkGetBcpStor () {
+      let res = await checkGetBcpStor()
+      this.options1 = [...res.data]
     },
-    // 车间下拉框
-    async _pourDictList () {
-      let res = await pourDictList('product_area')
-      if (res.code === 200) {
-        this.options1 = [...res.content]
-      } else {
-        this.toast(res.msg)
-      }
+    // grid
+    async _checkGetDtlAll () {
+      let res = await checkGetDtlAll(this.value1, this.date !== null ? dateTimeFtt(this.date[0]) : '', this.date !== null ? dateTimeFtt(this.date[1]) : '', this.material_code, this.storagevehicle_code, this.struct_code)
+      this.dataList = [...res.data]
     },
-    // 确认入库
-    async toSure () {
+    // 盘点位下拉框
+    async _checkGetPoint () {
+      let res = await checkGetPoint()
+      this.options2 = [...res.data]
+    },
+    toRadio (e) {
+      this.pkId = this.pkId === e.checkdtl_id ? '' : e.checkdtl_id
+      this.pkObj = this.pkId === e.checkdtl_id ? e : {}
+    },
+    // 下发（按钮）
+    async _checkSendTask () {
       this.disabled1 = true
-      if (this.qty === '' || this.value2 === '') {
+      if (!this.pkId || !this.value2) {
         this.disabled1 = false
         return
       }
       try {
-        let res = await pourdeviceinstorQty(this.qty, this.value2)
-        this.toast(res.msg)
-        this.value1 = ''
-        this.qty = ''
-        this.value2 = ''
+        let res = await checkSendTask(this.pkObj, this.value2)
+        this.toast(res.message)
+        this._checkGetDtlAll()
         this.disabled1 = false
       } catch (e) {
         this.disabled1 = false
       }
     },
-    // 补空框
-    async _letterCallVechile () {
+    // 盘点确认
+    async _checkConfirm () {
       this.disabled2 = true
-      if (this.value2 === '') {
+      if (this.flag || this.dataList.length === 0) {
         this.disabled2 = false
         return
       }
       try {
-        let res = await letterCallVechile(this.value2)
-        this.toast(res.msg)
-        this.value1 = ''
-        this.qty = ''
-        this.value2 = ''
+        let res = await checkConfirm(this.dataList)
+        this.toast(res.message)
+        this._checkGetDtlAll()
         this.disabled2 = false
       } catch (e) {
         this.disabled2 = false
       }
+    },
+    // 实盘为准
+    async _checkConfirmOffer () {
+      this.disabled3 = true
+      if (!this.pkId) {
+        this.disabled3 = false
+        return
+      }
+      try {
+        let res = await checkConfirmOffer(this.pkObj)
+        this.toast(res.message)
+        this._checkGetDtlAll()
+        this.disabled3 = false
+      } catch (e) {
+        this.disabled3 = false
+      }
+    },
+    // 财务为准
+    async _checkConfirmFinance () {
+      this.disabled4 = true
+      if (!this.pkId) {
+        this.disabled4 = false
+        return
+      }
+      try {
+        let res = await checkConfirmFinance(this.pkObj)
+        this.toast(res.message)
+        this._checkGetDtlAll()
+        this.disabled4 = false
+      } catch (e) {
+        this.disabled4 = false
+      }
     }
   }
 }
 </script>
 
 <style lang="stylus" scoped>
+.zd_wrapper
+    height calc(100% - 1.6rem)
+.filter_input_wraper_1
+    width calc(100% - 45px)
+.search-label_1
+    width 45px
 </style>
diff --git a/src/pages/modules/lettering/lettering-task-list.vue b/src/pages/modules/lettering/lettering-task-list.vue
new file mode 100644
index 0000000..9486d95
--- /dev/null
+++ b/src/pages/modules/lettering/lettering-task-list.vue
@@ -0,0 +1,255 @@
+<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_2">
+                    <button class="button button--primary" @click="_washWashTasks">快速查询</button>
+                    <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': value1 === ''}" @click="_washWashVechileInfo">强制完成</button>
+                    <button class="button button--primary" :disabled="disabled2" :class="{'button--defalut': pkId === ''}" @click="_washWashFinish('1')">强制取消</button>
+                </div>
+            </div>
+        </div>
+        <div class="grid_wraper">
+            <table class="filter-table">
+                <thead>
+                    <tr>
+                        <th>序号</th>
+                        <th>日期</th>
+                        <th>任务号</th>
+                        <th>起点</th>
+                        <th>终点</th>
+                        <th>物料规格</th>
+                        <th>上料重量(kg)</th>
+                        <th>分配重量</th>
+                        <th>任务状态</th>
+                        <th>执行步骤</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr v-for="e in dataList" :key="e.task_id" :class="{'selected_icon': pkId === e.task_id}" @click="toRadio(e)">
+                        <td>{{ e.sep_on }}</td>
+                        <td>{{ e.create_time }}</td>
+                        <td>{{e.task_code}}</td>
+                        <td>{{e.material_code}}</td>
+                        <td>{{e.material_spec}}</td>
+                        <td>{{e.material_qty | unitskg}}</td>
+                        <td>{{ e.material_name }}</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <jxDialog
+          ref="child"
+          title="提示"
+          :type="type"
+          @toSure="toSureDialog"
+          @toCancle="toCancle"
+          >
+          <div class="form_wraper">当前任务号不是第一个任务是否确认下料？</div>
+        </jxDialog>
+    </div>
+</template>
+
+<script>
+import jxDialog from '@components/dialog.vue'
+import {dictAll, washWashTasks, washWashVechileInfo, washWashFinish, washWashTaskFinish, washWashQzFinish, bcpInCallVehicle} from '@config/getData2.js'
+export default {
+  components: {
+    jxDialog
+  },
+  data () {
+    return {
+      options1: [],
+      value1: '',
+      weight: '',
+      vechile_code: '',
+      dataList: [],
+      sep_on: '',
+      pkId: '',
+      pkObj: {},
+      type: '',
+      disabled1: false,
+      disabled2: false,
+      disabled3: false,
+      disabled4: false,
+      disabled5: false
+    }
+  },
+  created () {
+    this._dictAll()
+  },
+  methods: {
+    // 车间下拉框
+    async _dictAll () {
+      let res = await dictAll()
+      if (res.code === 200) {
+        this.options1 = [...res.content]
+        this.value1 = this.options1[0].value
+        this._washWashTasks()
+      }
+    },
+    // grid
+    async _washWashTasks () {
+      let res = await washWashTasks(this.value1)
+      if (res.code === 200) {
+        this.pkId = ''
+        this.pkObj = {}
+        this.dataList = [...res.content]
+        if (this.dataList.length > 0) {
+          this.sep_on = this.dataList[0].sep_on
+        }
+      }
+    },
+    toRadio (e) {
+      this.pkId = this.pkId === e.task_id ? '' : e.task_id
+      this.pkObj = this.pkId === e.task_id ? e : {}
+    },
+    // 获取信息
+    async _washWashVechileInfo () {
+      this.disabled1 = true
+      if (this.value1 === '') {
+        this.disabled1 = false
+        return
+      }
+      try {
+        let res = await washWashVechileInfo(this.value1)
+        if (res.code === 200) {
+          if (res.content.length > 0) {
+            this.weight = res.content[0].weight
+            this.vechile_code = res.content[0].vechile_code
+          }
+        }
+        this.disabled1 = false
+      } catch (e) {
+        this.disabled1 = false
+      }
+    },
+    // 确认下料
+    async _washWashFinish (type) {
+      this.disabled2 = true
+      if (this.pkId === '') {
+        this.disabled2 = false
+        return
+      }
+      if (this.pkObj.sep_on !== this.sep_on) {
+        this.type = type
+        this.$refs.child.active = true
+        return
+      }
+      this.__washWashFinish()
+    },
+    async __washWashFinish () {
+      try {
+        let res = await washWashFinish(this.pkId, this.weight, this.vechile_code)
+        if (res.code === 200) {
+          this.toast(res.msg)
+          this._washWashTasks()
+        }
+        this.disabled2 = false
+      } catch (e) {
+        this.disabled2 = false
+        this.$refs.child.active = false
+      }
+    },
+    // 强制完成
+    async _washWashTaskFinish (type) {
+      this.disabled3 = true
+      if (this.pkId === '') {
+        this.disabled3 = false
+        return
+      }
+      if (this.pkObj.sep_on !== this.sep_on) {
+        this.type = type
+        this.$refs.child.active = true
+        return
+      }
+      this.__washWashTaskFinish()
+    },
+    async __washWashTaskFinish () {
+      try {
+        let res = await washWashTaskFinish(this.pkId)
+        if (res.code === 200) {
+          this.toast(res.msg)
+          this._washWashTasks()
+        }
+        this.disabled3 = false
+      } catch (e) {
+        this.disabled3 = false
+        this.$refs.child.active = false
+      }
+    },
+    // 强制下料
+    async _washWashQzFinish (type) {
+      this.disabled4 = true
+      if (this.pkId === '') {
+        this.disabled4 = false
+        return
+      }
+      if (this.pkObj.sep_on !== this.sep_on) {
+        this.type = type
+        this.$refs.child.active = true
+        return
+      }
+      this.__washWashQzFinish()
+    },
+    async __washWashQzFinish () {
+      try {
+        let res = await washWashQzFinish(this.pkId, this.weight, this.vechile_code)
+        if (res.code === 200) {
+          this.toast(res.msg)
+          this._washWashTasks()
+        }
+        this.disabled4 = false
+      } catch (e) {
+        this.disabled4 = false
+        this.$refs.child.active = false
+      }
+    },
+    toSureDialog (type) {
+      switch (type) {
+        case '1':
+          this.__washWashFinish()
+          break
+        case '2':
+          this.__washWashTaskFinish()
+          break
+        case '3':
+          this.__washWashQzFinish()
+      }
+    },
+    toCancle () {
+      this.disabled2 = false
+      this.disabled3 = false
+      this.disabled4 = false
+    },
+    async _bcpInCallVehicle () {
+      this.disabled5 = true
+      try {
+        let res = await bcpInCallVehicle()
+        if (res.code === 200) {
+          this.toast(res.msg)
+        }
+        this.disabled5 = false
+      } catch (e) {
+        this.disabled5 = false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+</style>
diff --git a/src/pages/modules/special/index.vue b/src/pages/modules/special/index.vue
new file mode 100644
index 0000000..2a0974d
--- /dev/null
+++ b/src/pages/modules/special/index.vue
@@ -0,0 +1,64 @@
+<template>
+    <div class="content blue" ref="content">
+        <jxHeader
+        :title="title"
+        @switchColor="switchColor"
+        />
+        <div class="body-container">
+          <div class="main-container">
+              <keep-alive :include="keepAlive" >
+                <router-view/>
+              </keep-alive>
+          </div>
+        </div>
+    </div>
+    </template>
+
+<script>
+import { mapGetters } from 'vuex'
+import jxHeader from '@components/header.vue'
+export default {
+  components: {
+    jxHeader
+  },
+  data () {
+    return {
+    }
+  },
+  computed: {
+    title () {
+      let res = ['人工倒料'][Number(this.$route.meta.guidePath) - 1]
+      return res
+    },
+    ...mapGetters(['keepAlive'])
+  },
+  methods: {
+    switchColor (type) {
+      switch (type) {
+        case 1:
+          this.$refs.content.classList.value = 'content overall_orange'
+          break
+        case 2:
+          this.$refs.content.classList.value = 'content overall_lightgreen'
+          break
+        case 3:
+          this.$refs.content.classList.value = 'content overall_blue'
+          break
+      }
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+@import '~@style/mixin.styl'
+.content
+    _wh(100%, 100vh)
+.body-container
+    _wh(calc(100% - 30px), calc(100% - 55px))
+    margin 0 auto 10px
+    padding 5px
+    border 1px solid #484cce
+.main-container
+    _wh(100%, 100%)
+</style>
diff --git a/src/pages/modules/lettering/man-pouring.vue b/src/pages/modules/special/man-pouring.vue
similarity index 100%
rename from src/pages/modules/lettering/man-pouring.vue
rename to src/pages/modules/special/man-pouring.vue
diff --git a/src/router/index.js b/src/router/index.js
index 43fc958..8dac9d9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,6 +6,7 @@ const workorderIndex = r => require.ensure([], () => r(require('@page/modules/wo
 const workOrderAssignment = r => require.ensure([], () => r(require('@page/modules/workorder/work-order-assignment')), 'workorder')
 const workReportQuery = r => require.ensure([], () => r(require('@page/modules/workorder/work-report-query')), 'workorder')
 const workOrderQuery = r => require.ensure([], () => r(require('@page/modules/workorder/work-order-query')), 'workorder')
+
 const finishedIndex = r => require.ensure([], () => r(require('@page/modules/finished/index')), 'finished')
 const finishedInstore = r => require.ensure([], () => r(require('@page/modules/finished/finished-instore')), 'finished')
 const selectFinishedMater = r => require.ensure([], () => r(require('@page/modules/finished/select-finished-mater')), 'finished')
@@ -22,17 +23,24 @@ const semiFinishedComposeSearch = r => require.ensure([], () => r(require('@page
 const semiFinishedInmaterSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-in-mater-search')), 'semifinished')
 const semiFinishedOutMaterSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-out-mater-search')), 'semifinished')
 const structMaterSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/struct-mater-search')), 'semifinished')
+
 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 letteringClimb = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-climb')), 'lettering')
 const TemporaryLetteringLoad = r => require.ensure([], () => r(require('@page/modules/lettering/temporary-lettering-load')), 'lettering')
+const letteringProcess = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-process')), 'lettering')
+const letteringMachineSelect = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-machine-select')), 'lettering')
+const letteringTaskList = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-task-list')), 'lettering')
+
 const cleanIndex = r => require.ensure([], () => r(require('@page/modules/clean/index')), 'clean')
 const cleaningLoading = r => require.ensure([], () => r(require('@page/modules/clean/cleaning-loading')), 'clean')
 const cleaningCutting = r => require.ensure([], () => r(require('@page/modules/clean/cleaning-cutting')), 'clean')
 const manPour = r => require.ensure([], () => r(require('@page/modules/clean/man-pour')), 'clean')
 const selectMater = r => require.ensure([], () => r(require('@page/modules/clean/select-mater')), 'clean')
 
+const specialIndex = r => require.ensure([], () => r(require('@page/modules/special/index')), 'special')
+const manPouring = r => require.ensure([], () => r(require('@page/modules/special/man-pouring')), 'special')
+
 const Homeset = r => require.ensure([], () => r(require('@page/homeset/index')), 'Homeset')
 const Home = r => require.ensure([], () => r(require('@page/homeset/HomePage')), 'HomePage')
 const IfWork = r => require.ensure([], () => r(require('@page/homeset/IfWork')), 'IfWork')
@@ -138,21 +146,29 @@ export default new Router({
       component: letteringIndex,
       children: [
         {
-          path: '/manpouring',
-          component: manPouring,
-          meta: {guidePath: '1'}
-        }, {
-          path: '/letteringprocess',
-          component: letteringProcess,
-          meta: {guidePath: '2'}
-        }, {
           path: '/letteringload',
           component: letteringLoad,
-          meta: {guidePath: '3'}
+          meta: {guidePath: '1'}
+        }, {
+          path: '/letteringclimb',
+          component: letteringClimb,
+          meta: {guidePath: '2'}
         }, {
           path: '/temporaryletteringload',
           component: TemporaryLetteringLoad,
+          meta: {guidePath: '3'}
+        }, {
+          path: '/letteringprocess',
+          component: letteringProcess,
           meta: {guidePath: '4'}
+        }, {
+          path: '/letteringmachineselect',
+          component: letteringMachineSelect,
+          meta: {guidePath: '5'}
+        }, {
+          path: '/letteringtasklist',
+          component: letteringTaskList,
+          meta: {guidePath: '6'}
         }
       ]
     },
@@ -177,6 +193,15 @@ export default new Router({
         meta: {guidePath: '4'}
       }]
     },
+    {
+      path: '/specialindex',
+      component: specialIndex,
+      children: [{
+        path: '/manpouring',
+        component: manPouring,
+        meta: {guidePath: '1'}
+      }]
+    },
     {
       path: '/workordermanage',
       component: workordermanage