plm BMM

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

@@ -142,12 +142,12 @@
 <!--          </el-form-item>-->
 <!--        </div></el-col>-->
 
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item >
-            <span slot="label" style="" @click="getBaseList(3)"><a herf="#">PE人员</a></span>
-            <el-input v-model="dataForm.peOperaterName" ref="peOperaterName"  placeholder="请选择人员" readonly style="" ></el-input>
-          </el-form-item>
-        </div></el-col>
+<!--        <el-col :span="6"><div class="grid-content bg-purple">-->
+<!--          <el-form-item >-->
+<!--            <span slot="label" style="" @click="getBaseList(3)"><a herf="#">PE人员</a></span>-->
+<!--            <el-input v-model="dataForm.peOperaterName" ref="peOperaterName"  placeholder="请选择人员" readonly style="" ></el-input>-->
+<!--          </el-form-item>-->
+<!--        </div></el-col>-->
         <el-col :span="6"><div class="grid-content bg-purple">
           <el-form-item >
             <span slot="label" style="" @click="getBaseList(4)"><a herf="#">CS人员</a></span>

src/views/modules/sys/user.vue

@@ -502,10 +502,50 @@
     </el-dialog>
 
     <el-dialog
-      width="600px"
+      width="800px"
       title="项目权限"
       :close-on-click-modal="false"
       :visible.sync="projectRoleFlag">
+      <el-form :inline="true" label-position="top" label-width="100px" >
+
+        <el-form-item :label="'项目号'">
+          <el-input v-model="projectRoleSearchData.projectId" style="width: 120px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'项目名称'">
+          <el-input v-model="projectRoleSearchData.projectName" style="width: 120px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'查询'" >
+          <el-select v-model="projectRoleSearchData.searchFlag" clearable style="width: 100px">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="允许" value="Y"></el-option>
+            <el-option label="不允许" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'修改'" >
+          <el-select v-model="projectRoleSearchData.updateFlag" clearable style="width: 100px">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="允许" value="Y"></el-option>
+            <el-option label="不允许" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'下载'" >
+          <el-select v-model="projectRoleSearchData.downFlag" clearable style="width: 100px">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="允许" value="Y"></el-option>
+            <el-option label="不允许" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'删除'" >
+          <el-select v-model="projectRoleSearchData.deleteFlag" clearable style="width: 100px">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="允许" value="Y"></el-option>
+            <el-option label="不允许" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="' '" >
+          <el-button type="primary" @click="searchProjectModel()">{{'查询'}}</el-button>
+        </el-form-item>
+      </el-form>
       <el-table
         :data="projectRoleList"
         border
@@ -685,6 +725,16 @@ export default {
         siteName:'',
         userDisplay: ''
       },
+      projectRoleSearchData:{
+        projectId:'',
+        projectName:'',
+        searchFlag:'',
+        updateFlag:'',
+        downFlag:'',
+        deleteFlag:'',
+        site:this.$store.state.user.site,
+        username:'',
+      },
       // 初始页签
       activeTable: 'factory_information',
       columnList: [
@@ -895,14 +945,23 @@ export default {
     },
     //授权项目start
     projectModel(){
-      let inData={
+      this.projectRoleSearchData={
+        projectId:'',
+          projectName:'',
+        searchFlag:'',
+        updateFlag:'',
+        downFlag:'',
+        deleteFlag:'',
         site:this.$store.state.user.site,
         username:this.selectUser.username,
       }
-      searchAccessProjectForUser(inData).then(({data}) => {
+      this.searchProjectModel();
+      this.projectRoleFlag=true
+    },
+    searchProjectModel(){
+      searchAccessProjectForUser(this.projectRoleSearchData).then(({data}) => {
         this.projectRoleList=data.rows
       })
-      this.projectRoleFlag=true
     },
     changeAll(row){
       if(row.checkAll){

src/views/modules/tooling/searchToolApply.vue

@@ -1062,6 +1062,60 @@
             fixed: '',
             columnWidth: 70
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 106002,
+            serialNumber: '106002Table2PartDesc',
+            tableId: '106002Table2',
+            tableName: '工具申请明细',
+            columnProp: 'partDesc',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '物料描述',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 106002,
+            serialNumber: '106002Table2IfsPartNo',
+            tableId: '106002Table2',
+            tableName: '工具申请明细',
+            columnProp: 'ifsPartNo',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: 'IFS料号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 106002,
+            serialNumber: '106002Table2CustomerPartNo',
+            tableId: '106002Table2',
+            tableName: '工具申请明细',
+            columnProp: 'customerPartNo',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '客户料号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 106002,
@@ -1846,7 +1900,7 @@
         })
       }
 
-      if (localStorage.getItem('ToolApplyData') != null) {
+      if (localStorage.getItem('ToolApplyData') != null&&localStorage.getItem('ToolApplyData') != undefined) {
         let data = JSON.parse(localStorage.getItem('ToolApplyData'));
         if (data){
           this.searchData.applyNo = data.applyNo
@@ -1872,6 +1926,7 @@
           }
           this.dataListLoading = false
         })
+        localStorage.removeItem('ToolApplyData');
       }
     },
   }