2025/7/11

src/api/base/site.js

@@ -86,3 +86,6 @@ export const searchUserListForRole= data => createAPI(`/base/searchUserListForRo
 
 
 export const getRoleList= data => createAPI(`/base/getRoleList`,'post',data)
+export const roleInformationSave= data => createAPI(`/base/saveRole`,'post',data)
+export const roleInformationEdit= data => createAPI(`/base/editRole`,'post',data)
+export const roleInformationDelete= data => createAPI(`/base/deleteRole`,'post',data)

src/views/modules/base/roleInfo.vue

@@ -3,7 +3,7 @@
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
       <el-form :inline="true" label-position="top" style="margin-top: 0px">
         <el-button type="primary" @click="searchTable()">查询</el-button>
-<!--        <el-button type="primary" @click="addModal()">新增</el-button>-->
+        <el-button type="primary" @click="addModal()">新增</el-button>
         <download-excel
           :fields="fields()"
           :data="exportData"
@@ -50,8 +50,8 @@
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" @click="accessModel(scope.row)">岗位授权</a>
-<!--          <a type="text" size="small" @click="updateModel(scope.row)">修改</a>-->
-<!--          <a type="text" size="small" @click="deleteData(scope.row)">删除</a>-->
+          <a type="text" size="small" @click="updateModel(scope.row)">修改</a>
+          <a type="text" size="small" @click="deleteData(scope.row)">删除</a>
         </template>
       </el-table-column>
     </el-table>
@@ -113,6 +113,32 @@
         </div>
     </span>
     </el-dialog>
+
+    <el-dialog :title="modalData.title" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="岗位编码" prop="roleNo" :rules="rules.roleNo">
+          <el-input v-model="modalData.roleNo" :disabled="modalDisableFlag" style="width: 221px"></el-input>
+        </el-form-item>
+        <el-form-item label="岗位名称" prop="roleDesc" :rules="rules.roleDesc">
+          <el-input v-model="modalData.roleDesc" style="width: 221px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="是否在用" prop="active" :rules="rules.active">
+          <el-select v-model="modalData.active" style="width: 221px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类别" prop="type" :rules="rules.type">
+          <el-input v-model="modalData.type" style="width: 221px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:30px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
@@ -126,6 +152,7 @@
     saveAccessBuListForBu,
   } from "@/api/base/site.js"
   import Chooselist from '@/views/modules/common/Chooselist'
+  import {roleInformationDelete, roleInformationEdit, roleInformationSave} from "../../../api/base/site";
   export default {
     components: {
       Chooselist
@@ -142,7 +169,48 @@
           site:this.$store.state.user.site,
           username: this.$store.state.user.name,
         },
+        modalData: {
+          flag: '',
+          title: '',
+          site: '',
+          roleNo: '',
+          roleDesc: '',
+          active: '',
+          type: ''
+        },
+        rules:{
+          roleNo:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          roleDesc:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          active:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          type:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ]
+        },
         visible:false,
+        modalFlag:false,
+        modalDisableFlag: false,
         dataListLoading: false,
         currentRow:'',
         columnList1:[
@@ -463,6 +531,107 @@
 
         return s
       },
+      addModal(){
+        this.modalData = {
+          flag: '1',
+          title: '岗位新增',
+          site: this.$store.state.user.site,
+          roleNo: '',
+          roleDesc:  '',
+          active: 'Y',
+          type: ''
+        }
+        this.modalDisableFlag = false
+        this.modalFlag = true
+      },
+      updateModel (row) {
+        this.modalData = {
+          flag: '2',
+          title: '岗位编辑',
+          site: row.site,
+          id: row.id,
+          roleNo: row.roleNo,
+          roleDesc: row.roleDesc,
+          active: row.active,
+          type: ''
+        }
+        this.modalDisableFlag = true
+        this.modalFlag = true
+      },
+      deleteData (row) {
+        this.$confirm(`是否删除这条岗位信息?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          roleInformationDelete(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.searchTable()
+              this.partSelections = []
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+      saveData () {
+        if (this.modalData.roleNo === '' || this.modalData.roleNo == null) {
+          this.$message.warning('请填写岗位编码！')
+          return
+        }
+        if (this.modalData.roleDesc === '' || this.modalData.roleDesc == null) {
+          this.$message.warning('请填写岗位名称！')
+          return
+        }
+        if (this.modalData.active === '' || this.modalData.active == null) {
+          this.$message.warning('请选择是否可用！')
+          return
+        }
+        if (this.modalData.flag === '1') {
+          roleInformationSave(this.modalData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.searchTable()
+              this.modalFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        } else {
+          roleInformationEdit(this.modalData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.searchTable()
+              this.modalFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }
+      },
     },
   }
 </script>

src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue

@@ -14,7 +14,7 @@
                 :disabled="plmTechnicalSpecificationSheetFlag('process') === 'N'">
               </dict-data-select>
             </el-form-item>
-            <el-form-item>
+<!--            <el-form-item>
               <span slot="label" v-if="plmTechnicalSpecificationSheetFlag('overPrintOperator') === 'N'">热转移打印人员/Technician</span>
               <span slot="label" v-else @click="getBaseList(1)"><a herf="#">热转移打印人员/Technician</a></span>
               <el-input v-model="sheetData.overPrintOperatorName" ref="overPrintOperatorName" placeholder="请选择人员" readonly style="width: 160px"></el-input>
@@ -23,7 +23,7 @@
               <span slot="label" v-if="plmTechnicalSpecificationSheetFlag('printOperator') === 'N'">印刷人员/Technician</span>
               <span slot="label" v-else @click="getBaseList(2)"><a herf="#">印刷人员/Technician</a></span>
               <el-input v-model="sheetData.printOperatorName" ref="printOperatorName" placeholder="请选择人员" readonly style="width: 160px"></el-input>
-            </el-form-item>
+            </el-form-item>-->
             <el-form-item label=" ">
               <el-button type="primary" @click="searchTable(true)">刷新</el-button>
               <el-button type="primary" @click="changeRouteRev()" v-if="((!ifDisableFlag && spForm.sp.includes(searchData.username) && baseForm.status === 'spz') || baseForm.status === 'cg' || superAdmin)">变更</el-button>

src/views/modules/test/requestForTest.vue

@@ -23,24 +23,24 @@
       <el-form-item :label="'物料名称'">
         <el-input v-model="searchData.partName" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'要求交付日期'">
-        <el-date-picker
-          style="width: 120px"
-          v-model="searchData.startDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="开始日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item :label="' '">
-        <el-date-picker
-          style="width: 120px"
-          v-model="searchData.endDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item>
+<!--      <el-form-item :label="'要求交付日期'">-->
+<!--        <el-date-picker-->
+<!--          style="width: 120px"-->
+<!--          v-model="searchData.startDate"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="开始日期">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="' '">-->
+<!--        <el-date-picker-->
+<!--          style="width: 120px"-->
+<!--          v-model="searchData.endDate"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="结束日期">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
       <el-form-item label="节点审批人">
         <el-input v-model="searchData.approvalUsername" clearable style="width: 120px"></el-input>
       </el-form-item>
@@ -74,6 +74,9 @@
       <el-form-item :label="'客户物料编码'">
         <el-input v-model="searchData.customerPartNo" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'So Number'">
+        <el-input v-model="searchData.soNumber" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'状态'" v-if="false">
         <el-select v-model="searchData.testResultStatus" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -1185,7 +1188,8 @@ export default {
         testNo: '',
         buNo: '',
         nodeId: '',
-        approvalUsername: ''
+        approvalUsername: '',
+        soNumber: ''
       },
       fileContentLoaded: false,
       // 其它
@@ -3552,6 +3556,12 @@ export default {
       searchProjectInfoList(this.searchProjectData).then(({data}) => {
         if (data && data.code === 0) {
           this.projectList = data.rows
+          if (!this.modalData.customerNo||this.modalData.customerNo===''){
+            this.modalData.projectId = data.rows[0].projectId
+            this.modalData.projectName = data.rows[0].projectName
+            this.modalData.customerNo = data.rows[0].customerId
+            this.modalData.customerDesc = data.rows[0].customerName
+          }
         } else {
           this.projectList = []
         }
@@ -3676,8 +3686,9 @@ export default {
           this.dialogProperties = data.rows
           if (this.modalData.projectIdFlag&&!this.modalData.customerNoFlag){
             // 料号、客户、项目都没选时选料号
-            this.modalData.customerNoFlag = true
+            this.modalData.customerNoFlag = false
             this.modalData.projectIdFlag =  false
+            this.searchProjectInfoList()
           } else if (!this.modalData.projectIdFlag&&this.modalData.customerNoFlag){
             // 选了料号没选项目和客户时选料号
           } else if (!this.modalData.projectIdFlag&&!this.modalData.customerNoFlag){