修复yn说的界面排序与显示问题

src/router/index.js

@@ -240,7 +240,7 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'MapData',
-        component: () => import('@/views/mes/hw/lotoStation/MapData'),
+        component: () => import('@/views/mes/dv/lotoStation/MapData'),
         name: 'MapData',
         meta: { title: '预览', activeMenu: '/mes/hw/lotoStation/MapData' }
       }

src/views/mes/hw/lotoStation/index.vue → src/views/mes/dv/lotoStation/index.vue

@@ -145,7 +145,7 @@
                      icon="el-icon-edit"
                      @click="handleUpdate(scope.row)"
                      v-hasPermi="['iscs:station:edit','iscs:station:query']"
-          >编辑
+          >修改
           </el-button>
           <el-button v-no-more-click
                      size="mini"
@@ -196,13 +196,13 @@
 <!--            </el-form-item>-->
 <!--          </el-col>-->
 <!--        </el-row>-->
-
-        <el-form-item label="岗位" prop="workstationId" >
-          <treeselect v-model="form.workstationId" :options="marsOptions" :normalizer="Marsnormalizer" placeholder="选择岗位"/>
-        </el-form-item>
         <el-form-item label="排序" prop="orderNum">
           <el-input-number type="number" v-model="form.orderNum" />
         </el-form-item>
+        <el-form-item label="岗位" prop="workstationId" >
+          <treeselect v-model="form.workstationId" :options="marsOptions" :normalizer="Marsnormalizer" placeholder="选择岗位"/>
+        </el-form-item>
+
         <el-form-item label="锁定站信息" prop="map">
           <el-input
             v-model="form.map"
@@ -441,7 +441,7 @@ export default {
       getLotoInfo(this.EditId).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "编辑锁定站信息";
+        this.title = "修改锁定站信息";
       });
     },
     /** 提交按钮 */

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

@@ -287,7 +287,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['iscs:point:edit']"
-          >编辑
+          >修改
           </el-button>
           <el-button
             v-no-more-click
@@ -367,19 +367,8 @@
 <!--            </el-form-item>-->
 <!--          </el-col>-->
           <el-col :span="11">
-            <el-form-item label="锁定站" prop="lotoId">
-              <el-select
-                style="width: 300px"
-                v-model="form.lotoId"
-                placeholder="请选择锁定站"
-              >
-                <el-option
-                  v-for="dict in lotoOptions"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
+            <el-form-item label="岗位" prop="workstationId" >
+              <treeselect style="width: 300px" v-model="form.workstationId" :options="deptOptions" :normalizer="normalizer" placeholder="选择岗位"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -406,10 +395,21 @@
 <!--            </el-form-item>-->
 
           <el-col :span="11">
-            <el-form-item label="岗位" prop="workstationId" >
-              <treeselect style="width: 300px" v-model="form.workstationId" :options="deptOptions" :normalizer="normalizer" placeholder="选择岗位"/>
-            </el-form-item>
 
+            <el-form-item label="锁定站" prop="lotoId">
+              <el-select
+                style="width: 300px"
+                v-model="form.lotoId"
+                placeholder="请选择锁定站"
+              >
+                <el-option
+                  v-for="dict in lotoOptions"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
 
           </el-col>
           <el-col :span="11">
@@ -908,7 +908,7 @@ export default {
         if (valid) {
           console.log(this.pointId, 'this.pointId')
           if (this.pointId != null) {
-            console.log(this.form, '隔离点编辑form')
+            console.log(this.form, '隔离点修改form')
             updateIsIsolationPoint(this.form).then((response) => {
               this.$modal.msgSuccess('修改成功')
               this.open = false

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

@@ -175,7 +175,7 @@
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['iscs:machinery:edit']"
-              >编辑
+              >修改
               </el-button>
               <el-button
                 v-no-more-click
@@ -747,10 +747,10 @@ export default {
       // 在工艺新增就是工艺 设备新增就是设备
       if(this.tabPosition=='craft'){
         this.form.machineryType='工艺'
-        this.title = '添加工艺'
+        this.title = '新增工艺'
       }else if(this.tabPosition=='device'){
         this.form.machineryType='设备'
-        this.title = '添加设备'
+        this.title = '新增设备'
       }
       this.open = true
 

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

@@ -111,7 +111,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['iscs:notify:edit']"
-            >编辑
+            >修改
           </el-button>
           <el-button
             v-no-more-click
@@ -132,7 +132,7 @@
       :limit.sync="queryParams.size"
       @pagination="getList"
     />
-    <!-- 添加或修改对话框 -->
+    <!-- 新增或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="提醒事项" prop="name">
@@ -367,7 +367,7 @@ export default {
       this.reset();
       this.open = true;
       this.isEdit = false;
-      this.title = "添加邮件提醒";
+      this.title = "新增邮件提醒";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

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

@@ -98,7 +98,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="添加时间"
+        label="新增时间"
         align="center"
         prop="createTime"
         width="150"
@@ -120,7 +120,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['iscs:template:edit']"
-            >编辑
+            >修改
           </el-button>
           <el-button
             v-no-more-click
@@ -141,7 +141,7 @@
       :limit.sync="queryParams.size"
       @pagination="getList"
     />
-    <!-- 添加或修改邮件模板对话框 -->
+    <!-- 新增或修改邮件模板对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="邮件模板编号" prop="templateCode">
@@ -322,7 +322,7 @@ export default {
       this.reset();
       this.open = true;
       this.isEdit = false;
-      this.title = "添加邮件模板";
+      this.title = "新增邮件模板";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

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

@@ -16,15 +16,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="设备/工艺" prop="machineryId">
-        <treeselect
-          style="width: 218px"
-          v-model="queryParams.machineryId"
-          :options="TechnologyOptions"
-          :normalizer="Technologynormalizer"
-          placeholder="选择设备工艺"
-        />
-      </el-form-item>
+
       <el-form-item label="岗位" prop="workstationId">
         <treeselect
           style="width: 218px"
@@ -34,6 +26,15 @@
           placeholder="选择岗位"
         />
       </el-form-item>
+      <el-form-item label="设备/工艺" prop="machineryId">
+        <treeselect
+          style="width: 218px"
+          v-model="queryParams.machineryId"
+          :options="TechnologyOptions"
+          :normalizer="Technologynormalizer"
+          placeholder="选择设备工艺"
+        />
+      </el-form-item>
       <el-form-item label="状态" prop="ticketStatus">
         <el-select v-model="queryParams.ticketStatus" placeholder="状态">
           <el-option
@@ -44,6 +45,19 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="作业类型" prop="ticketType">
+        <el-select
+          v-model="queryParams.ticketType"
+          placeholder="请选择作业类型"
+        >
+          <el-option
+            v-for="dict in dict.type.ticket_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="创建时间">
         <el-date-picker
           style="width: 218px"
@@ -58,19 +72,7 @@
         >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="作业类型" prop="ticketType">
-        <el-select
-          v-model="queryParams.ticketType"
-          placeholder="请选择作业类型"
-        >
-          <el-option
-            v-for="dict in dict.type.ticket_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item>
         <el-button
           v-no-more-click
@@ -145,7 +147,7 @@
         prop="ticketName"
         width="350"
       />
-      <el-table-column label="所属岗位" align="center" prop="workstationName">
+      <el-table-column label="岗位" align="center" prop="workstationName">
       </el-table-column>
       <el-table-column
         label="设备工艺"

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

@@ -10,6 +10,7 @@
     >
       <el-form-item label="计划名称" prop="planName" v-if="!visibleSelect">
         <el-input
+
           v-model="queryParams.planName"
           placeholder="请输入计划名称"
           clearable
@@ -178,7 +179,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['iscs:plan:query']"
-          >编辑
+          >修改
           </el-button>
 
           <el-button
@@ -744,7 +745,7 @@ export default {
       selectPlanById(row.planId).then((response) => {
         this.form = response.data
         this.open = true
-        this.title = '编辑检查计划'
+        this.title = '修改检查计划'
         this.optType = 'edit'
       })
     },

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

@@ -145,7 +145,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['iscs:instructions:edit']"
-            >编辑
+            >修改
           </el-button>
           <el-button
             v-no-more-click
@@ -173,6 +173,14 @@
         <span class="title">{{ title }}</span>
       </div>
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+        <el-form-item label="显示排序" prop="orderNum">
+          <el-input-number
+            style="width: 350px"
+            v-model="form.orderNum"
+            controls-position="right"
+            :min="0"
+          />
+        </el-form-item>
         <el-form-item label="标题" prop="instructionsTitle">
           <el-input
             style="width: 350px"
@@ -203,14 +211,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="显示排序" prop="orderNum">
-          <el-input-number
-            style="width: 350px"
-            v-model="form.orderNum"
-            controls-position="right"
-            :min="0"
-          />
-        </el-form-item>
+
         <el-form-item label="文件" prop="fileUrl">
           <div v-if="form.fileUrl">
             <div v-if="isVideo(form.fileUrl)">
@@ -513,7 +514,7 @@ export default {
       getInstructionsInfo(row.instructionsId).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "编辑物资说明";
+        this.title = "修改物资说明";
         this.optType = "edit";
       });
     },

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

@@ -254,7 +254,7 @@
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['iscs:cabinet:edit']"
-                >编辑
+                >修改
               </el-button>
               <el-button
                 v-no-more-click
@@ -719,7 +719,7 @@ export default {
       selectMaterialsCabinetById(row.cabinetId).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "编辑物资柜信息";
+        this.title = "修改物资柜信息";
         this.optType = "edit";
       });
     },

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

@@ -28,6 +28,7 @@
       </el-form-item>
       <el-form-item label="物资名称" prop="materialsName">
         <el-input
+          style="width: 215px"
           v-model="queryParams.materialsName"
           placeholder="请输入物资名称"
           clearable
@@ -36,7 +37,7 @@
       </el-form-item>
       <el-form-item label="物资类型" prop="materialsTypeId">
         <treeselect
-          style="width: 200px"
+          style="width: 215px"
           v-model="queryParams.materialsTypeId"
           :options="machinerytypeOptions"
           :normalizer="normalizer"
@@ -75,6 +76,7 @@
       </el-form-item>
       <el-form-item label="RFID" prop="materialsRfid">
         <el-input
+          style="width: 215px"
           v-model="queryParams.materialsRfid"
           placeholder="请输入RFID"
           clearable
@@ -83,6 +85,7 @@
       </el-form-item>
       <el-form-item label="供应商" prop="supplier">
         <el-input
+          style="width: 215px"
           v-model="queryParams.supplier"
           placeholder="请输入供应商"
           clearable
@@ -120,7 +123,7 @@
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select
-          style="width: 200px"
+          style="width: 215px"
           v-model="queryParams.status"
           placeholder="物资状态"
         >
@@ -387,6 +390,37 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="RFID" prop="materialsRfid">
+              <el-input
+                v-model="form.materialsRfid"
+                placeholder="请输入物资RFID(纯数字)"
+                maxlength="128"
+                oninput="value=value.replace(/[^\d.]/g,'')"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="供应商" prop="supplier">
+              <el-input v-model="form.supplier" placeholder="请输入供应商" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="有效期" prop="expirationDate">
+              <el-date-picker
+                v-model="form.expirationDate"
+                type="date"
+                placeholder="选择日期"
+                :picker-options="FormpickerOptions"
+                @change="handleClearTime"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="物资规格" prop="properties">
               <div
@@ -418,18 +452,6 @@
               </div>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="RFID" prop="materialsRfid">
-              <el-input
-                v-model="form.materialsRfid"
-                placeholder="请输入物资RFID(纯数字)"
-                maxlength="128"
-                oninput="value=value.replace(/[^\d.]/g,'')"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="12" style="height: 110px">
             <el-form-item label="物资图片" prop="materialsTypePicture">
               <div class="img-box2" v-if="form.materialsTypePicture">
@@ -451,25 +473,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="供应商" prop="supplier">
-              <el-input v-model="form.supplier" placeholder="请输入供应商" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="有效期" prop="expirationDate">
-              <el-date-picker
-                v-model="form.expirationDate"
-                type="date"
-                placeholder="选择日期"
-                :picker-options="FormpickerOptions"
-                @change="handleClearTime"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
+
       </el-form>
 
       <div slot="footer" class="dialog-footer">

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

@@ -122,7 +122,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['iscs:propvalue:edit']"
-          >编辑
+          >修改
           </el-button>
 
           <el-button
@@ -202,14 +202,13 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 import Template from '@/views/print/printtemplate/list.vue'
 
-
 export default {
   name: 'Team',
   components: {
     Template,
     Treeselect
   },
-  dicts: ['material_status','file_type'],
+  dicts: ['material_status', 'file_type'],
   data() {
     return {
       //自动生成编码
@@ -239,13 +238,13 @@ export default {
       queryParams: {
         current: 1,
         size: 10,
-        propertyName:'',
-        valueName:'',
-        propertyId:null
+        propertyName: '',
+        valueName: '',
+        propertyId: null
       },
       // 表单参数
       form: {
-        propertyId:''
+        propertyId: ''
       },
       // 表单校验
       rules: {
@@ -255,8 +254,7 @@ export default {
         materialsTypeId: [
           { required: true, message: '物资类型不能为空', trigger: 'blur' }
         ]
-      },
-
+      }
 
     }
   },
@@ -266,14 +264,14 @@ export default {
   },
 
   methods: {
-    goBack(){
+    goBack() {
       this.$router.push('/material/standard')
     },
     /** 查询物资信息列表 */
     getList() {
       this.loading = true
-      this.queryParams.propertyId=this.$route.query.propertyId
-      this.queryParams.propertyName=this.$route.query.propertyName
+      this.queryParams.propertyId = this.$route.query.propertyId
+      this.queryParams.propertyName = this.$route.query.propertyName
       PropertyValuePage(this.queryParams).then((response) => {
         console.log(response, '获取物资说明 ')
         this.PropertyValueList = response.data.records
@@ -290,7 +288,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        propertyName:''
+        propertyName: ''
       }
       this.resetForm('form')
       this.autoGenFlag = false
@@ -307,7 +305,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.recordId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
 
@@ -315,7 +313,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.form.propertyId=this.$route.query.propertyId
+      this.form.propertyId = this.$route.query.propertyId
       this.title = '新增物资规格'
       this.optType = 'add'
     },
@@ -324,10 +322,10 @@ export default {
     handleUpdate(row) {
       this.reset()
       selectPropertyValueById(row.recordId).then((response) => {
-        console.log(response,'编辑')
+        console.log(response, '修改')
         this.form = response.data
         this.open = true
-        this.title = '编辑物资规格'
+        this.title = '修改物资规格'
         this.optType = 'edit'
       })
     },