界面顺序调整

src/views/mes/dv/segregationpoint/index.vue

@@ -413,19 +413,12 @@
 
           </el-col>
           <el-col :span="11">
-            <el-form-item label="能量源" prop="powerType">
-              <el-select
+            <el-form-item label="作用" prop="remark">
+              <el-input
                 style="width: 300px"
-                v-model="form.powerType"
-                placeholder="请选择能量源"
-              >
-                <el-option
-                  v-for="dict in dict.type.power_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
+                v-model="form.remark"
+                placeholder="请输入作用"
+              />
             </el-form-item>
 
           </el-col>
@@ -453,13 +446,21 @@
 <!--            </el-form-item>-->
 <!--          </el-col>-->
           <el-col :span="12">
-            <el-form-item label="作用" prop="remark">
-              <el-input
+            <el-form-item label="能量源" prop="powerType">
+              <el-select
                 style="width: 300px"
-                v-model="form.remark"
-                placeholder="请输入作用"
-              />
+                v-model="form.powerType"
+                placeholder="请选择能量源"
+              >
+                <el-option
+                  v-for="dict in dict.type.power_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
             </el-form-item>
+
 <!--            <el-form-item label="锁具机构类型" prop="locksetTypeId">-->
 <!--              <treeselect-->
 <!--                style="width: 300px"-->
@@ -884,7 +885,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = '添加隔离点'
+      this.title = '新增隔离点'
       this.optType = 'add'
       this.pointId = null
       this.form.workshopId = 0
@@ -932,7 +933,7 @@ export default {
       // const pointcodes = row.pointCode || this.codes
       // '是否确认删除隔离点编号为"' + pointcodes + '"的数据项？'
       this.$modal
-        .confirm('是否确认删除数据项？')
+        .confirm('是否确认删除所选数据项？')
         .then(function() {
           return deleteIsIsolationPointByPointIds(teamIds)
         })

src/views/mes/dv/technology/technologyList/index.vue

@@ -817,7 +817,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const machineryIds = row.machineryId || this.ids;
-      this.$modal.confirm('确认删除数据项？').then(function() {
+      this.$modal.confirm('确认是否删除所选数据项？').then(function() {
         return delTechnology(machineryIds);
       }).then(() => {
         this.getList();

src/views/mes/email/emailNotify/index.vue

@@ -432,7 +432,7 @@ export default {
     handleDelete(row) {
       const templateCodes = row.configId || this.codes;
       this.$modal
-        .confirm('是否确认删除所选的数据项？')
+        .confirm('是否确认删除所选数据项？')
         .then(function () {
           return deleteIsMailNotifyConfig(templateCodes);
         })

src/views/mes/job/joblist/index.vue

@@ -511,7 +511,7 @@ export default {
       const ticketNames = row.ticketName || this.codes;
       // '是否确认删除作业票编号为"' + ticketNames + '"的数据项？'
       this.$modal
-        .confirm("是否确认删除数据项？")
+        .confirm("是否确认删除所选数据项？")
         .then(function () {
           return deleteIsJobTicket(teamIds);
         })

src/views/mes/material/Lending/demo5.vue

@@ -133,7 +133,7 @@ export default {
       }
       return listMaterials(data).then((res) => {
         this.listOutOfCabinet = res.data.records.filter((item) => {
-          return item.materialsCabinetId == null || item.materialsCabinetId == '0'
+          return (item.materialsCabinetId == null || item.materialsCabinetId == '0')&&item.status=='0'
         })
         console.log(this.listOutOfCabinet, '柜子外的数据demo3')
       })

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

@@ -32,29 +32,7 @@
           placeholder="请选择物资类型"
         />
       </el-form-item>
-      <el-form-item label="更换人" prop="changeUserName">
-        <el-input
-          v-model="queryParams.changeUserName"
-          placeholder="请输入更换人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更换时间">
-        <el-date-picker
-          style="width: 215px"
-          :default-time="['00:00:00', '23:59:59']"
-          v-model="createTime"
-          type="datetimerange"
-          :picker-options="pickerOptions"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          align="right"
-          @change="handleClearTime"
-        >
-        </el-date-picker>
-      </el-form-item>
+
       <el-form-item label="原物资编号" prop="oldMaterialsId">
         <el-input
           v-model="queryParams.oldMaterialsId"
@@ -88,7 +66,29 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item label="更换人" prop="changeUserName">
+        <el-input
+          v-model="queryParams.changeUserName"
+          placeholder="请输入更换人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="更换时间">
+        <el-date-picker
+          style="width: 215px"
+          :default-time="['00:00:00', '23:59:59']"
+          v-model="createTime"
+          type="datetimerange"
+          :picker-options="pickerOptions"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="right"
+          @change="handleClearTime"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button
           v-no-more-click