Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_client/src/views/mtm/material.vue

@@ -4,7 +4,7 @@
         <div>
       <el-input
               v-model="listQuery.search"
-              placeholder="物料名称/物料编号"
+              placeholder="物料名称/物料编号/物料类型"
               style="width: 300px"
               class="filter-item"
               @keyup.enter.native="handleFilter"
@@ -50,27 +50,7 @@
             </template>
         </el-table-column>
 
-       <el-table-column label="物料类别"  :filters="[{
-          value: 1,
-          text: '成品'
-        }, {
-          value: 2,
-          text: '半成品'
-        }, {
-          value: 3,
-          text: '主要原料'
-        }, {
-          value: 4,
-          text: '辅助原料'
-        }, {
-          value: 5,
-          text: '加工工具'
-        }, {
-          value: 6,
-          text: '辅助工具'
-        }]"
-      :filter-method="filterTag"
-      filter-placement="bottom-end">
+       <el-table-column label="物料类别"  >
           <template slot-scope="scope">    {{options_[scope.row.type]}}</template>
         </el-table-column>
       
@@ -204,9 +184,9 @@ export default {
         "1":'成品',
         "2":'半成品',
         "3":'主要原料',
-        "4":'辅助原料',
+        "4":'辅助材料',
          "5":'加工工具',
-        "6":'辅助工具',
+        "6":'辅助工装',
        
       },
       options: [{
@@ -220,13 +200,13 @@ export default {
           label: '主要原料'
         }, {
           value: 4,
-          label: '辅助原料'
+          label: '辅助材料'
         }, {
           value: 5,
           label: '加工工具'
         }, {
           value: 6,
-          label: '辅助工具'
+          label: '辅助工装'
         }],
         unitoptions:[
           {

hb_client/src/views/mtm/productprocess.vue

@@ -156,7 +156,7 @@
         
       </el-form>
       <div style="text-align: right">
-        <el-button type="danger" @click="dialogVisible1 = false">取消</el-button>
+        <el-button type="danger" @click="dialogVisiblesp = false">取消</el-button>
         <el-button type="primary" @click="subproducationfirm('Formsp')">确认</el-button>
       </div>
     </el-dialog>

hb_client/src/views/mtm/step.vue

@@ -32,6 +32,9 @@
                     :label="item.name"
                     :value="item.number">{{item.name}}</el-tag>
           </template>
+        </el-table-column>
+           <el-table-column label="排序">
+          <template slot-scope="scope">{{ scope.row.sort }}</template>
         </el-table-column>
         <el-table-column
           align="center"