物料管理调整

src/views/base-data/item/index.vue

@@ -12,10 +12,6 @@
         <el-input v-model="query.name" clearable placeholder="请输入名称" style="width: 185px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
 
-        <label class="el-form-item-label">规格</label>
-        <el-input v-model="query.specs" clearable placeholder="请输入规格" style="width: 185px;" class="filter-item"
-                  @keyup.enter.native="crud.toQuery"/>
-
         <label class="el-form-item-label">是否启用</label>
         <el-select v-model="query.enabled" clearable placeholder="请选择" style="width: 185px;" class="filter-item"
                    @keyup.enter.native="crud.toQuery">
@@ -53,17 +49,28 @@
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
                  :title="crud.status.title" width="600px">
-        <el-form ref="form" :model="form" :inline="true" :rules="rules" size="small" label-width="66px">
+        <el-form ref="form" :model="form" :inline="true" :rules="rules" size="small" label-width="80px">
           <el-form-item label="编码" prop="code">
             <el-input v-model="form.code" style="width: 180px;"/>
           </el-form-item>
           <el-form-item label="名称" prop="name">
             <el-input v-model="form.name" style="width: 180px;"/>
           </el-form-item>
-          <el-form-item label="装载数">
-            <el-input v-model="form.extendD1" style="width: 180px;"/>
+
+          <el-form-item label="整托高度" prop="extendD2">
+            <el-select v-model="form.extendD2" filterable placeholder="请选择" style="width: 180px;"
+                       :default-first-option="true">
+              <el-option
+                v-for="item in dict.item_height"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
-          <el-form-item label="类型" prop="goodType">
+
+
+          <el-form-item label="物料类型" prop="goodType">
             <el-select v-model="form.goodType" filterable placeholder="请选择" style="width: 180px;"
                        :default-first-option="true">
               <el-option
@@ -74,38 +81,34 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="单位" prop="unit">
-            <el-select v-model="form.unit" filterable placeholder="请选择" style="width: 180px;"
+
+          <el-form-item label="翻包类型" prop="extendStr1">
+            <el-select v-model="form.extendStr1" filterable placeholder="请选择" style="width: 180px;"
                        :default-first-option="true">
               <el-option
-                v-for="item in dict.item_unit"
+                v-for="item in dict.item_fb"
                 :key="item.id"
                 :label="item.label"
                 :value="item.value"
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="时长" >
-            <el-input v-model="form.extendD2" type="number" style="width: 180px;"/>
-          </el-form-item>
-          <el-form-item label="长">
-            <el-input v-model="form.length" type="number" style="width: 180px;"/>
-          </el-form-item>
-          <el-form-item label="宽">
-            <el-input v-model="form.width" style="width: 180px;"/>
-          </el-form-item>
-          <el-form-item label="高">
-            <el-input v-model="form.height" style="width: 180px;"/>
-          </el-form-item>
-          <el-form-item label="重量" >
-            <el-input v-model="form.weight" style="width: 180px;"/>
-          </el-form-item>
-          <el-form-item label="描述">
-            <el-input v-model="form.description" :rows="3" type="textarea" style="width: 370px;"/>
-          </el-form-item>
+          <!--          <el-form-item label="单位" prop="unit">
+                      <el-select v-model="form.unit" filterable placeholder="请选择" style="width: 180px;"
+                                 :default-first-option="true">
+                        <el-option
+                          v-for="item in dict.item_unit"
+                          :key="item.id"
+                          :label="item.label"
+                          :value="item.value"
+                        />
+                      </el-select>
+                    </el-form-item>-->
+
+
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button  @click="crud.cancelCU">取消</el-button>
           <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
         </div>
       </el-dialog>
@@ -122,22 +125,21 @@
         <el-table-column prop="xh" label="序号" type="index" width="50"/>
         <el-table-column prop="code" label="编码" width="150"/>
         <el-table-column prop="name" label="名称" width="150"/>
-        <el-table-column prop="goodType" label="类型" width="150">
+        <el-table-column prop="extendD2" label="整托高度" width="150">
+          <template slot-scope="scope">
+            {{ dict.label.item_height[scope.row.extendD2] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="goodType" label="物料类型" width="150">
           <template slot-scope="scope">
             {{ dict.label.item_type[scope.row.goodType] }}
           </template>
         </el-table-column>
-        <el-table-column prop="extendD1" label="容器装载数"/>
-        <el-table-column prop="unit" label="单位">
+        <el-table-column prop="extendStr1" label="翻包类型" width="150">
           <template slot-scope="scope">
-            {{ dict.label.item_unit[scope.row.unit] }}
+            {{ dict.label.item_fb[scope.row.extendStr1] }}
           </template>
         </el-table-column>
-        <el-table-column prop="length" label="长"/>
-        <el-table-column prop="width" label="宽"/>
-        <el-table-column prop="height" label="高"/>
-        <el-table-column prop="weight" label="重量"/>
-        <el-table-column prop="description" label="描述"/>
         <el-table-column prop="enabled" label="启用" width="50">
           <template slot-scope="scope">
             <el-switch
@@ -148,7 +150,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="agvScene.name" label="AGV场景"  v-if="false">
+        <el-table-column prop="agvScene.name" label="AGV场景" v-if="false">
         </el-table-column>
         <el-table-column v-if="checkPer(['admin','item:edit'])" label="操作" align="center">
           <template slot-scope="scope">
@@ -184,7 +186,7 @@ export default {
   name: 'Item',
   components: {pagination, crudOperation, rrOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['base_staus', 'item_unit', 'item_type'],
+  dicts: ['base_staus', 'item_unit', 'item_type', 'item_height', 'item_fb'],
   cruds() {
     return CRUD({
       title: '物料', url: 'api/item', idField: 'id', sort: 'id,desc', crudMethod: {...crudItem}, optShow: {
@@ -198,7 +200,7 @@ export default {
   },
   data() {
     return {
-      headers: { 'Authorization': getToken() },
+      headers: {'Authorization': getToken()},
       fileList: [],
       permission: {
         add: ['admin', 'item:add'],
@@ -224,14 +226,14 @@ export default {
         {key: 'name', display_name: '名称'},
         {key: 'specs', display_name: '规格'}
       ],
-      avgSceneOptions:[]
+      avgSceneOptions: []
     }
   }, mounted() {
     //初始化数据
     this.getAgvSceneAllDate();
   },
   methods: {
-    handleSuccess(response, file, fileList,crud) {
+    handleSuccess(response, file, fileList, crud) {
 
       let myError = response.toString();//转字符串
       DonMessage.success("" + response['message'])
@@ -265,9 +267,9 @@ export default {
         data.enabled = !data.enabled
       })
     },
-    getAgvSceneAllDate(){
+    getAgvSceneAllDate() {
       selectEgvSceneAll().then(res => {
-        this.avgSceneOptions=res;
+        this.avgSceneOptions = res;
       })
     }
   }