Alpha

src/views/modules/eam/eamDocumentTypeDefinition.vue

@@ -12,6 +12,16 @@
       <el-form-item :label="'文档类型'">
         <el-input v-model="searchData.documentType" style="width: 120px" clearable></el-input>
       </el-form-item>
+      <el-form-item :label="'责任部门'">
+        <el-select v-model="searchData.responsibleDepartment" placeholder="请选择" clearable style="width: 140px">
+          <el-option
+            v-for = "i in responsibleDepartmentList"
+            :key = "i.roleNo"
+            :label = "i.roleDesc"
+            :value = "i.roleNo">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'在用'">
         <el-select filterable v-model="searchData.active" style="width: 130px">
           <el-option label="全部" value=""></el-option>
@@ -436,6 +446,7 @@
       this.favoriteIsOk()
       // 动态列
       this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
+      this.getResponsibleDepartment()
       // 获取数据列表
       this.getDataList()
     },
@@ -714,6 +725,7 @@
         }
       },
       getResponsibleDepartment() {
+        this.responsibleDepartmentList = []
         this.modalData.site = this.$store.state.user.site
         getResponsibleDepartment(this.modalData).then(({data}) => {
           if (data.code === 0) {

src/views/modules/eam/eamProjectPartInfo.vue

@@ -2022,6 +2022,12 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
           ipqcHardTagName:'',
           cQualityEngineer7:'',
           cQualityEngineer7Name:'',
+          qcEngineer:'',
+          qcEngineerName:'',
+          peEngineer:'',
+          peEngineerName:'',
+          eeEngineer:'',
+          eeEngineerName:'',
           //projectCreationDate为当前服务器的时间
           projectCreationDate: new Date(),
           finalPartNo:'',
@@ -4481,6 +4487,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
           docEngineer2: row.docEngineer2,
           ipqcHardTag: row.ipqcHardTag,
           cQualityEngineer7: row.cQualityEngineer7,
+          qcEngineer: row.qcEngineer,
+          peEngineer: row.peEngineer,
+          eeEngineer: row.eeEngineer,
           finalPartNo: row.finalPartNo,
           finalPartDesc: row.finalPartDesc,
           // active: row.active,
@@ -4508,6 +4517,15 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
         if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== ''){
           this.modalData.cQualityEngineer7Name= row.cQualityEngineer7.split('-')[1] // 截取用户名
         }
+        if (row.qcEngineer != null && row.qcEngineer !== ''){
+          this.modalData.qcEngineerName= row.qcEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.peEngineer != null && row.peEngineer !== ''){
+          this.modalData.peEngineerName= row.peEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.eeEngineer != null && row.eeEngineer !== ''){
+          this.modalData.eeEngineerName= row.eeEngineer.split('-')[1] // 截取用户名
+        }
         this.getFinalPartDesc()
         this.formalPartNoFlag = true
       },
@@ -4540,6 +4558,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
           docEngineer2: row.docEngineer2,
           ipqcHardTag: row.ipqcHardTag,
           cQualityEngineer7: row.cQualityEngineer7,
+          qcEngineer: row.qcEngineer,
+          peEngineer: row.peEngineer,
+          eeEngineer: row.eeEngineer,
           remark: '',
           planStartDate : new Date(),
           proofingNo: '',
@@ -4672,6 +4693,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
           docEngineer2: row.docEngineer2,
           ipqcHardTag: row.ipqcHardTag,
           cQualityEngineer7: row.cQualityEngineer7,
+          qcEngineer: row.qcEngineer,
+          peEngineer: row.peEngineer,
+          eeEngineer: row.eeEngineer,
           buildDate: row.buildDate,
           status: row.status,
           partType: row.partType,
@@ -4700,6 +4724,15 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
         if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== '') {
           this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名
         }
+        if (row.qcEngineer != null && row.qcEngineer !== '') {
+          this.modalData.qcEngineerName = row.qcEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.peEngineer != null && row.peEngineer !== '') {
+          this.modalData.peEngineerName = row.peEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.eeEngineer != null && row.eeEngineer !== '') {
+          this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名
+        }
         if (row.status === '草稿') {
           if (row.projectOwner.split('-')[0] === this.$store.state.user.name) {
             this.modalData.status = '进行中'
@@ -4866,6 +4899,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
           docEngineer2: row.docEngineer2,
           ipqcHardTag: row.ipqcHardTag,
           cQualityEngineer7: row.cQualityEngineer7,
+          qcEngineer: row.qcEngineer,
+          peEngineer: row.peEngineer,
+          eeEngineer: row.eeEngineer,
           buildDate: row.buildDate,
           status: row.status,
           partType: row.partType,
@@ -4894,6 +4930,15 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
         if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== '') {
           this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名
         }
+        if (row.qcEngineer != null && row.qcEngineer !== '') {
+          this.modalData.qcEngineerName = row.qcEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.peEngineer != null && row.peEngineer !== '') {
+          this.modalData.peEngineerName = row.peEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.eeEngineer != null && row.eeEngineer !== '') {
+          this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名
+        }
         if (row.status === '已量产') {
           this.modalData.status = '进行中'
           this.modalData.closeDate = ''
@@ -4947,6 +4992,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
             docEngineer2: this.proofingCurrentRow.docEngineer2,
             ipqcHardTag: this.proofingCurrentRow.ipqcHardTag,
             cQualityEngineer7: this.proofingCurrentRow.cQualityEngineer7,
+            qcEngineer: this.proofingCurrentRow.qcEngineer,
+            peEngineer: this.proofingCurrentRow.peEngineer,
+            eeEngineer: this.proofingCurrentRow.eeEngineer,
             // username:this.$store.state.user.name,
             page: 1,
             limit: 1000
@@ -4985,6 +5033,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
             docEngineer2: this.proofingCurrentRow.docEngineer2,
             ipqcHardTag: this.proofingCurrentRow.ipqcHardTag,
             cQualityEngineer7: this.proofingCurrentRow.cQualityEngineer7,
+            qcEngineer: this.proofingCurrentRow.qcEngineer,
+            peEngineer: this.proofingCurrentRow.peEngineer,
+            eeEngineer: this.proofingCurrentRow.eeEngineer,
             // username:this.$store.state.user.name,
             page: 1,
             limit: 1000

src/views/modules/sys/user.vue

@@ -551,11 +551,14 @@
     <el-dialog title="角色" :close-on-click-modal="false" v-drag :visible.sync="businessRoleAddModal" width="900px">
       <div style="font-size: 12px">
         <el-form :inline="true" label-position="top" :model="businessRoleData">
+          <el-form-item :label="'工厂编码'">
+            <el-input v-model="businessRoleData.site" clearable style="width: 80px"></el-input>
+          </el-form-item>
           <el-form-item :label="'角色编码'">
-            <el-input v-model="businessRoleData.roleNo" clearable style="width: 120px"></el-input>
+            <el-input v-model="businessRoleData.roleNo" clearable style="width: 80px"></el-input>
           </el-form-item>
           <el-form-item :label="'角色名称'">
-            <el-input v-model="businessRoleData.roleDesc" clearable style="width: 200px"></el-input>
+            <el-input v-model="businessRoleData.roleDesc" clearable style="width: 160px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
             <el-button type="primary" @click="getBusinessRole()">查询</el-button>
@@ -581,18 +584,25 @@
               :selectable="selectFlag"
               width="50">
             </el-table-column>
+            <el-table-column
+              prop="site"
+              header-align="center"
+              align="center"
+              min-width="50"
+              label="工厂编码">
+            </el-table-column>
             <el-table-column
               prop="roleNo"
               header-align="center"
               align="center"
-              min-width="80"
+              min-width="50"
               label="角色编码">
             </el-table-column>
             <el-table-column
               prop="roleDesc"
               header-align="center"
               align="center"
-              min-width="120"
+              min-width="100"
               label="角色名称">
             </el-table-column>
           </el-table>
@@ -1253,11 +1263,11 @@ export default {
         roleNo: '',
         roleDesc: '',
         active: '',
-        username: ''
+        username: this.selectUser.username
       }
       this.businessRoleSelections1 = null
       this.businessRoleSelections2 = null
-      getBusinessRoleList(this.selectUser).then(({data}) => {
+      getBusinessRoleList(this.businessRoleData).then(({data}) => {
         this.businessRoleList1 = data.row1
         this.businessRoleList2 = data.row2
       })