物资异常原因修改为异常类型

src/views/mes/material/materialinformation/index.vue

@@ -43,6 +43,36 @@
           placeholder="请选择物资类型"
         />
       </el-form-item>
+      <el-form-item label="物资规格种类" prop="propertyId">
+        <el-select
+          style="width: 215px"
+          v-model="queryParams.propertyId"
+          placeholder="请选择物资规格种类"
+          @change="handlePropertyChange"
+        >
+          <el-option
+            v-for="property in PropertyList"
+            :key="property.propertyId"
+            :label="property.propertyName"
+            :value="property.propertyId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="物资规格" prop="recordId">
+        <el-select
+          style="width: 215px"
+          v-model="queryParams.recordId"
+          placeholder="请选择物资规格"
+          :disabled="!queryParams.propertyId"
+        >
+          <el-option
+            v-for="value in filteredPropertyValues"
+            :key="value.recordId"
+            :label="value.valueName"
+            :value="value.recordId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="RFID" prop="materialsRfid">
         <el-input
           v-model="queryParams.materialsRfid"
@@ -102,36 +132,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="物资规格种类" prop="propertyId">
-        <el-select
-          style="width: 215px"
-          v-model="queryParams.propertyId"
-          placeholder="请选择物资规格种类"
-          @change="handlePropertyChange"
-        >
-          <el-option
-            v-for="property in PropertyList"
-            :key="property.propertyId"
-            :label="property.propertyName"
-            :value="property.propertyId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="物资规格" prop="recordId">
-        <el-select
-          style="width: 215px"
-          v-model="queryParams.recordId"
-          placeholder="请选择物资规格"
-          :disabled="!queryParams.propertyId"
-        >
-          <el-option
-            v-for="value in filteredPropertyValues"
-            :key="value.recordId"
-            :label="value.valueName"
-            :value="value.recordId"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item>
         <el-button
           v-no-more-click
@@ -222,7 +223,7 @@
         prop="cabinetName"
       >
         <template slot-scope="scope">
-          <span v-if="scope.row.cabinetName">{{scope.row.cabinetName}}</span>
+          <span v-if="scope.row.cabinetName">{{ scope.row.cabinetName }}</span>
           <span v-else>-</span>
         </template>
       </el-table-column>
@@ -260,9 +261,11 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="RFID" align="center" prop="materialsRfid" >
+      <el-table-column label="RFID" align="center" prop="materialsRfid">
         <template slot-scope="scope">
-          <span v-if="scope.row.materialsRfid">{{scope.row.materialsRfid}}</span>
+          <span v-if="scope.row.materialsRfid">{{
+            scope.row.materialsRfid
+          }}</span>
           <span v-else>-</span>
         </template>
       </el-table-column>
@@ -317,7 +320,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['iscs:materials:edit']"
-            >编辑
+            >修改
           </el-button>
           <el-button
             v-no-more-click
@@ -346,6 +349,23 @@
       </div>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="绑定物资柜" prop="materialsCabinetId">
+              <el-select
+                :disabled="visibleSelect"
+                style="width: 348px"
+                v-model="form.materialsCabinetId"
+                placeholder="请选择绑定物资柜"
+              >
+                <el-option
+                  v-for="dict in cabinets"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="物资名称" prop="materialsName">
               <el-input
@@ -354,6 +374,8 @@
               />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="物资类型" prop="materialsTypeId">
               <treeselect
@@ -365,6 +387,37 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="物资规格" prop="properties">
+              <div
+                v-for="(property, index) in PropertyList"
+                :key="property.propertyId"
+                class="property-container"
+              >
+                <h3>{{ property.propertyName }}</h3>
+                <div class="property-values">
+                  <!-- 循环渲染属性值 -->
+                  <div
+                    v-for="(value, valueIndex) in PropertyValueList.filter(
+                      (v) => v.propertyId === property.propertyId
+                    )"
+                    :key="value.recordId"
+                    :class="[
+                      'property-value',
+                      {
+                        selected:
+                          selectedValues[property.propertyId] ===
+                          value.recordId,
+                      },
+                    ]"
+                    @click="selectValue(property.propertyId, value.recordId)"
+                  >
+                    {{ value.valueName }}
+                  </div>
+                </div>
+              </div>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -377,21 +430,24 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="物资柜" prop="materialsCabinetId">
-              <el-select
-                :disabled="visibleSelect"
-                style="width: 348px"
-                v-model="form.materialsCabinetId"
-                placeholder="请选择所属物资柜"
-              >
-                <el-option
-                  v-for="dict in cabinets"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
+          <el-col :span="12" style="height: 110px">
+            <el-form-item label="物资图片" prop="materialsTypePicture">
+              <div class="img-box2" v-if="form.materialsTypePicture">
+                <el-image
+                  style="width: 90px; height: 90px"
+                  :preview-teleported="true"
+                  class="images"
+                  :hide-on-click-modal="true"
+                  :src="form.materialsTypePicture"
+                  :zoom-rate="1.2"
+                  :preview-src-list="[form.materialsTypePicture]"
+                  :initial-index="1"
+                  fit="cover"
+                >
+                </el-image>
+                <i class="el-icon-zoom-in" id="eyeicon"></i>
+              </div>
+              <span v-else>-</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -414,56 +470,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-form-item label="物资规格" prop="properties">
-            <div
-              v-for="(property, index) in PropertyList"
-              :key="property.propertyId"
-              class="property-container"
-            >
-              <h3>{{ property.propertyName }}</h3>
-              <div class="property-values">
-                <!-- 循环渲染属性值 -->
-                <div
-                  v-for="(value, valueIndex) in PropertyValueList.filter(
-                    (v) => v.propertyId === property.propertyId
-                  )"
-                  :key="value.recordId"
-                  :class="[
-                    'property-value',
-                    {
-                      selected:
-                        selectedValues[property.propertyId] === value.recordId,
-                    },
-                  ]"
-                  @click="selectValue(property.propertyId, value.recordId)"
-                >
-                  {{ value.valueName }}
-                </div>
-              </div>
-            </div>
-          </el-form-item>
-        </el-row>
-        <el-row style="height: 110px">
-          <el-form-item label="物资图片" prop="materialsTypePicture">
-            <div class="img-box2" v-if="form.materialsTypePicture">
-              <el-image
-                style="width: 90px; height: 90px"
-                :preview-teleported="true"
-                class="images"
-                :hide-on-click-modal="true"
-                :src="form.materialsTypePicture"
-                :zoom-rate="1.2"
-                :preview-src-list="[form.materialsTypePicture]"
-                :initial-index="1"
-                fit="cover"
-              >
-              </el-image>
-              <i class="el-icon-zoom-in" id="eyeicon"></i>
-            </div>
-            <span v-else>-</span>
-          </el-form-item>
-        </el-row>
       </el-form>
 
       <div slot="footer" class="dialog-footer">
@@ -1055,7 +1061,7 @@ export default {
           });
         }
         this.open = true;
-        this.title = "编辑物资信息";
+        this.title = "修改物资信息";
         this.optType = "edit";
         // 设置 selectedValues
         if (response.data.properties) {
@@ -1144,11 +1150,12 @@ export default {
     },
 
     /** 删除按钮操作 */
+    // confirm('是否确认删除编号为"' + materialsCodes + '"的数据项？')
     handleDelete(row) {
       const materialsIds = row.materialsId || this.ids;
       const materialsCodes = row.materialsId || this.ids;
       this.$modal
-        .confirm('是否确认删除编号为"' + materialsCodes + '"的数据项？')
+        .confirm("是否确认删除所选数据项？")
         .then(function () {
           return deleteMaterials(materialsIds);
         })

src/views/mes/material/standard/index.vue

@@ -24,17 +24,15 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
-        >搜索
-        </el-button
-        >
+          >搜索
+        </el-button>
         <el-button
           v-no-more-click
           icon="el-icon-refresh"
           size="mini"
           @click="resetQuery"
-        >重置
-        </el-button
-        >
+          >重置
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -48,11 +46,10 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['iscs:property:add']"
-        >新增
+          >新增
         </el-button>
       </el-col>
 
-
       <el-col :span="1.5">
         <el-button
           v-no-more-click
@@ -63,7 +60,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['iscs:property:remove']"
-        >批量删除
+          >批量删除
         </el-button>
       </el-col>
       <right-toolbar
@@ -77,20 +74,16 @@
       :data="PropertyList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="propertyId">
       </el-table-column>
-      <el-table-column label="物资规格种类" align="center" prop="propertyName"/>
-      <el-table-column
-        label="备注"
-        align="center"
-        prop="remark"
-      />
       <el-table-column
-        label="创建时间"
+        label="物资规格种类"
         align="center"
-        prop="createTime"
+        prop="propertyName"
       />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column
         label="操作"
         align="center"
@@ -104,7 +97,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['iscs:property:edit']"
-          >编辑
+            >修改
           </el-button>
           <el-button
             v-no-more-click
@@ -113,7 +106,7 @@
             icon="el-icon-view"
             @click="handleValue(scope.row)"
             v-hasPermi="['iscs:property:edit']"
-          >规格设置
+            >规格设置
           </el-button>
           <el-button
             v-no-more-click
@@ -122,7 +115,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['iscs:property:remove']"
-          >删除
+            >删除
           </el-button>
         </template>
       </el-table-column>
@@ -160,13 +153,11 @@
 
       <div slot="footer" class="dialog-footer">
         <el-button v-no-more-click type="primary" @click="submitForm"
-        >确 定
-        </el-button
-        >
+          >确 定
+        </el-button>
         <el-button v-no-more-click @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
   </div>
 </template>
 
@@ -176,22 +167,21 @@ import {
   addProperty,
   updateProperty,
   deleteProperty,
-  selectPropertyById
-} from '@/api/mes/standard/index'
-
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+  selectPropertyById,
+} from "@/api/mes/standard/index";
 
-import Template from '@/views/print/printtemplate/list.vue'
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
+import Template from "@/views/print/printtemplate/list.vue";
 
 export default {
-  name: 'Team',
+  name: "Team",
   components: {
     Template,
-    Treeselect
+    Treeselect,
   },
-  dicts: ['material_status','file_type'],
+  dicts: ["material_status", "file_type"],
   data() {
     return {
       //自动生成编码
@@ -213,145 +203,141 @@ export default {
       // 班组表格数据
       PropertyList: [],
       // 弹出层标题
-      title: '',
+      title: "",
       // 是否显示弹出层
       open: false,
       // 查询参数
-      createTime: '',
+      createTime: "",
       queryParams: {
         current: 1,
         size: 10,
-        propertyName: '',
+        propertyName: "",
       },
       // 表单参数
-      form: {
-
-      },
+      form: {},
       // 表单校验
       rules: {
         propertyName: [
-          { required: true, message: '名称不能为空', trigger: 'blur' }
+          { required: true, message: "名称不能为空", trigger: "blur" },
         ],
         materialsTypeId: [
-          { required: true, message: '物资类型不能为空', trigger: 'blur' }
-        ]
+          { required: true, message: "物资类型不能为空", trigger: "blur" },
+        ],
       },
-
-
-    }
+    };
   },
   created() {
-    this.getList()
-
+    this.getList();
   },
 
   methods: {
-
     /** 查询物资信息列表 */
     getList() {
-      this.loading = true
+      this.loading = true;
       PropertyPage(this.queryParams).then((response) => {
-        console.log(response, '获取物资说明 ')
-        this.PropertyList = response.data.records
-        this.total = response.data.total
+        console.log(response, "获取物资说明 ");
+        this.PropertyList = response.data.records;
+        this.total = response.data.total;
 
-        this.loading = false
-      })
+        this.loading = false;
+      });
     },
     // 跳转属性值页面
-    handleValue(row){
-      this.$router.push({name: 'propertyForm',query:{propertyId:row.propertyId,propertyName:row.propertyName}})
+    handleValue(row) {
+      this.$router.push({
+        name: "propertyForm",
+        query: { propertyId: row.propertyId, propertyName: row.propertyName },
+      });
     },
     // 取消按钮
     cancel() {
-      this.open = false
-      this.reset()
+      this.open = false;
+      this.reset();
     },
     // 表单重置
     reset() {
       this.form = {
-        propertyName:''
-      }
-      this.resetForm('form')
-      this.autoGenFlag = false
+        propertyName: "",
+      };
+      this.resetForm("form");
+      this.autoGenFlag = false;
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.getList()
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
+      this.resetForm("queryForm");
+      this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.propertyId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.propertyId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
 
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '新增物资规格种类'
-      this.optType = 'add'
+      this.reset();
+      this.open = true;
+      this.title = "新增物资规格种类";
+      this.optType = "add";
     },
 
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
+      this.reset();
       selectPropertyById(row.propertyId).then((response) => {
-        this.form = response.data
-        this.open = true
-        this.title = '编辑物资规格种类'
-        this.optType = 'edit'
-      })
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改物资规格种类";
+        this.optType = "edit";
+      });
     },
 
     /** 提交按钮 */
     submitForm() {
-      this.$refs['form'].validate((valid) => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.propertyId != null) {
             updateProperty(this.form).then((response) => {
-              console.log(response, '修改返回')
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getList()
-            })
+              console.log(response, "修改返回");
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
           } else {
-            console.log(this.form, '新增参数')
+            console.log(this.form, "新增参数");
             addProperty(this.form).then((response) => {
-              console.log(response, '新增返回')
-              this.$modal.msgSuccess('新增成功')
-              this.open = false
-              this.getList()
-            })
+              console.log(response, "新增返回");
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
           }
         }
-      })
+      });
     },
 
     /** 删除按钮操作 */
+    // confirm('是否确认删除编号为"' + propertyId + '"的数据项？')
     handleDelete(row) {
-      const propertyId = row.propertyId || this.ids
+      const propertyId = row.propertyId || this.ids;
       this.$modal
-        .confirm('是否确认删除编号为"' + propertyId + '"的数据项？')
-        .then(function() {
-          return deleteProperty(propertyId)
+        .confirm("是否确认删除所选数据项？")
+        .then(function () {
+          return deleteProperty(propertyId);
         })
         .then(() => {
-          this.getList()
-          this.$modal.msgSuccess('删除成功')
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {
-        })
-    }
-
-  }
-}
+        .catch(() => {});
+    },
+  },
+};
 </script>
 <style lang="scss" src="@/assets/styles/dialog-title.scss" scoped>
 .el-input-width {

src/views/mes/material/typeofmaterial/index.vue

@@ -165,7 +165,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:mat:type:edit']"
-            >编辑
+            >修改
           </el-button>
           <el-button
             v-no-more-click
@@ -622,7 +622,7 @@ export default {
         this.timeValues.loanDuration = convertTime(response.data.loanDuration);
         this.timeValues.timeoutAlarm = convertTime(response.data.timeoutAlarm);
         this.open = true;
-        this.title = "编辑物资类型";
+        this.title = "修改物资类型";
       });
     },
     // 时间转换
@@ -687,11 +687,12 @@ export default {
       }
     },
     /** 删除按钮操作 */
+    // confirm('是否删除编码为"' + materialsTypeCodes + '"的数据项？')
     handleDelete(row) {
       const materialsTypeIds = row.materialsTypeId;
       const materialsTypeCodes = row.materialsTypeCode;
       this.$modal
-        .confirm('是否删除编码为"' + materialsTypeCodes + '"的数据项？')
+        .confirm("是否删除所选数据项？")
         .then(function () {
           return deleteMaterialsType(materialsTypeIds);
         })