opt: 代码规范修改

lms/nladmin-ui/src/views/wms/basedata/material/index.vue

@@ -47,18 +47,7 @@
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" >
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          @click="synchronize()"
-        >
-          同步
-        </el-button>
-      </crudOperation>
+      <crudOperation :permission="permission" />
       <!--表单组件-->
       <el-dialog
         :close-on-click-modal="false"
@@ -75,17 +64,17 @@
           size="mini"
           label-width="125px"
           label-suffix=":">
-          <el-form-item label="物料编码">
-            <el-input disabled v-model="form.material_code" style="width: 240px;" />
+          <el-form-item label="原料编码" prop="raw_material_code">
+            <el-input v-model="form.raw_material_code" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="物料名称 ">
-            <el-input disabled v-model="form.material_name" style="width: 240px;" />
+          <el-form-item label="物料名称 " prop="material_name">
+            <el-input v-model="form.material_name" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="物料规格">
-            <el-input disabled v-model="form.material_spec" style="width: 240px;" />
+          <el-form-item label="物料规格" prop="material_spec">
+            <el-input v-model="form.material_spec" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="物料型号">
-            <el-input disabled v-model="form.material_model" style="width: 240px;" />
+          <el-form-item label="物料型号" prop="material_model">
+            <el-input v-model="form.material_model" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="A长边">
             <el-input-number
@@ -115,6 +104,31 @@
               style="width: 240px;"
             />
           </el-form-item>
+          <el-form-item label="单重">
+            <el-input-number
+              v-model.number="form.single_weight"
+              :min="0"
+              style="width: 240px;"
+            />
+          </el-form-item>
+          <el-form-item label="木托盘规格">
+            <el-tooltip class="item" effect="dark" content="例如：950*1000" placement="top">
+              <el-select
+                v-model="form.pack_palletspec"
+                clearable
+                size="mini"
+                placeholder="请选择"
+                style="width: 240px;"
+              >
+                <el-option
+                  v-for="item in dict.vehicle_type"
+                  :label="item.label"
+                  :value="item.label"
+                  :disabled="item.value === 'LZ' || item.value === 'GTP'"
+                />
+              </el-select>
+            </el-tooltip>
+          </el-form-item>
           <el-form-item label="静置时间(分钟)">
             <el-input-number
               v-model.number="form.standing_time"
@@ -129,45 +143,46 @@
               style="width: 240px;"
             />
           </el-form-item>
-          <el-form-item label="木托盘规格">
-            <el-tooltip class="item" effect="dark" content="例如：950*1000" placement="top">
-              <el-select
-                v-model="form.pack_palletspec"
-                clearable
-                size="mini"
-                placeholder="请选择"
-                class="filter-item"
-                style="width: 240px;"
-              >
-                <el-option
-                  v-for="item in dict.vehicle_type"
-                  :label="item.label"
-                  :value="item.label"
-                  :disabled="item.value === 'LZ' || item.value === 'GTP'"
-                />
-              </el-select>
-            </el-tooltip>
+          <el-form-item label="静置时间(下限)">
+            <el-input-number
+              v-model.number="form.standing_time_lower"
+              :min="0"
+              style="width: 240px;"
+            />
+          </el-form-item>
+          <el-form-item label="静置时间(上限)">
+            <el-input-number
+              v-model.number="form.standing_time_upper"
+              :min="0"
+              style="width: 240px;"
+            />
           </el-form-item>
           <el-form-item label="包装方式">
             <el-tooltip class="item" effect="dark" content="例如：3*6*6" placement="top">
               <el-input v-model="form.pack_method" style="width: 240px;" />
             </el-tooltip>
           </el-form-item>
+          <el-form-item label="是否特殊" prop="is_needmove">
+            <el-radio-group v-model="form.is_special" style="width: 240px">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item label="备注">
             <el-input v-model="form.remark" type="textarea" style="width: 240px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button type="info" @click="crud.cancelCU">取消</el-button>
           <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
+        <el-table-column prop="raw_material_code" label="泥料编码" :min-width="flexWidth('raw_material_code',crud.data,'物料编码')" />
+        <el-table-column prop="half_material_code" label="半成品编码" :min-width="flexWidth('half_material_code',crud.data,'半成品编码')" />
         <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-        <el-table-column prop="half_material_code" label="半成品编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-        <el-table-column prop="raw_material_code" label="泥料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
         <el-table-column prop="material_name" label="物料名称 " :min-width="flexWidth('material_name',crud.data,'物料名称 ')" />
         <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
         <el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'物料分类标识')" />
@@ -189,7 +204,7 @@
         <el-table-column prop="create_time" label="同步时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
         <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
         <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
-        <el-table-column prop="ext_time" label="MES时间" :min-width="flexWidth('ext_time',crud.data,'修改时间')" />
+<!--        <el-table-column prop="ext_time" label="MES时间" :min-width="flexWidth('ext_time',crud.data,'修改时间')" />-->
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -230,11 +245,15 @@ const defaultForm = {
   class_id: null,
   standing_time: 0,
   cooling_time: 0,
+  single_weight: 0,
+  standing_time_lower: 0,
+  standing_time_upper: 0,
   workshop_code: null,
   pack_palletspec: null,
   pack_method: null,
   remark: null,
   is_used: true,
+  is_special: false,
   is_delete: false
 }
 export default {
@@ -257,6 +276,18 @@ export default {
       permission: {
       },
       rules: {
+        raw_material_code: [
+          { required: true, message: '原料不能为空', trigger: 'blur' }
+        ],
+        material_name: [
+          { required: true, message: '物料名称不能为空', trigger: 'blur' }
+        ],
+        material_spec: [
+          { required: true, message: '物料规格不能为空', trigger: 'blur' }
+        ],
+        material_model: [
+          { required: true, message: '砖型不能为空', trigger: 'blur' }
+        ]
       },
       fullscreenLoading: false,
       workShopList: []