jingshuyong 11 сар өмнө
parent
commit
64328c1730

+ 43 - 6
src/views/documentManagement/certificateManagement/components/detail-dialog.vue

@@ -1,13 +1,39 @@
 <template>
-  <el-dialog title="证照详情" :visible.sync="dialogVisible" width="60%">
-    <el-descriptions title="" :column="3" size="medium" border>
+  <ele-modal
+    title="证照详情"
+    :visible.sync="dialogVisible"
+    width="60%"
+    :maxable="true"
+  >
+    <div class="switch">
+      <div class="switch_left">
+        <ul>
+          <li
+            v-for="item in tabOptions"
+            :key="item.key"
+            :class="{ active: activeComp == item.key }"
+            @click="activeComp = item.key"
+          >
+            {{ item.name }}
+          </li>
+        </ul>
+      </div>
+    </div>
+    <el-descriptions title="" :column="3" size="medium" border
+    v-if="activeComp == 'main'"
+    >
       <el-descriptions-item>
         <template slot="label"> 证照编号 </template>
         {{ form.code }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label"> 类型 </template>
-        {{ getDictValue(form.holderType==1?'证件类型':'客户/供应商资质类型', form.type) }}
+        {{
+          getDictValue(
+            form.holderType == 1 ? '证件类型' : '客户/供应商资质类型',
+            form.type
+          )
+        }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label"> 持证对象</template>
@@ -46,25 +72,35 @@
         {{ form.remark }}
       </el-descriptions-item>
     </el-descriptions>
+    <bpmDetail
+      v-if="activeComp == 'bpm' && form.processInstanceId"
+      :id="form.processInstanceId"
+    ></bpmDetail>
     <div slot="footer" class="dialog-footer">
       <el-button size="small" @click="dialogVisible = false">关 闭</el-button>
     </div>
-  </el-dialog>
+  </ele-modal>
 </template>
 
 <script>
   import { getPhotoInfo } from '@/api/documentManagement';
   import dictMixins from '@/mixins/dictMixins';
   import fileMain from '@/components/addDoc/index.vue';
+  import bpmDetail from '@/views/bpm/processInstance/businessDetail.vue';
 
   export default {
     mixins: [dictMixins],
-    components: {fileMain},
+    components: { fileMain,bpmDetail },
     //注册组件
     data() {
       return {
         dialogVisible: false,
-        form: {}
+        form: {},
+        activeComp: 'main',
+        tabOptions: [
+          { key: 'main', name: '详情' },
+          { key: 'bpm', name: '审批流程' }
+        ],
       };
     },
     computed: {},
@@ -75,6 +111,7 @@
     },
     methods: {
       open(row) {
+        this.activeComp='main'
         this.dialogVisible = true;
         this.getInfo(row.id);
       },

+ 67 - 9
src/views/documentManagement/certificateManagement/index.vue

@@ -15,9 +15,11 @@
       >
         <!-- 工具栏 -->
         <template v-slot:toolbar>
-          <el-button type="primary" icon="el-icon-plus" @click="handleUpload()"
-          v-if="$hasPermission('main:identityphoto:save')"
-
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            @click="handleUpload()"
+            v-if="$hasPermission('main:identityphoto:save')"
             >新建</el-button
           >
           <!-- <el-button type="primary" @click="handleUpload">导入</el-button> -->
@@ -54,17 +56,33 @@
             :underline="false"
             icon="el-icon-edit"
             @click="handleUpload(row)"
-          v-if="$hasPermission('main:identityphoto:save')"
-
+            v-if="
+              [0, 3].includes(row.approvalStatus) &&
+              $hasPermission('main:identityphoto:save')
+            "
           >
             修改
           </el-link>
+          <el-link
+            type="primary"
+            :underline="false"
+            icon="el-icon-edit"
+            @click="submit(row)"
+            v-if="
+              [0, 3].includes(row.approvalStatus) &&
+              $hasPermission('main:identityphoto:save')
+            "
+          >
+            提交
+          </el-link>
           <el-popconfirm
             class="ele-action"
             title="确定要删除此信息吗?"
             @confirm="remove([row.id])"
-          v-if="$hasPermission('main:identityphoto:delete')"
-
+            v-if="
+              [0, 3].includes(row.approvalStatus) &&
+              $hasPermission('main:identityphoto:delete')
+            "
           >
             <template v-slot:reference>
               <el-link type="danger" :underline="false" icon="el-icon-delete">
@@ -77,12 +95,20 @@
     </el-card>
     <addDialog ref="addDialogRef" @success="reload" />
     <detailDialog ref="detailDialogRef" />
+    <process-submit-dialog
+      api-fun-name="purchaseinquiryStatusAPI"
+      :processSubmitDialogFlag.sync="processSubmitDialogFlag"
+      v-if="processSubmitDialogFlag"
+      ref="processSubmitDialogRef"
+      @reload="reload"
+
+    ></process-submit-dialog>
   </div>
 </template>
 
 <script>
   import tabMixins from '@/mixins/tableColumnsMixin';
-
+  import processSubmitDialog from '@/components/processSubmitDialog/processSubmitDialog.vue';
   import certificateSearch from './components/certificate-search';
   import addDialog from './components/add-dialog.vue';
   import detailDialog from './components/detail-dialog.vue';
@@ -92,12 +118,14 @@
   import { deepClone } from '@/utils';
   import { holderTypeOptions } from '@/enum/dict.js';
   import fileMain from '@/components/addDoc/index.vue';
+  import { reviewStatus } from '@/enum/dict';
 
   export default {
     mixins: [dictMixins, tabMixins],
-    components: { certificateSearch, addDialog, detailDialog, fileMain },
+    components: { certificateSearch, addDialog, detailDialog, fileMain,processSubmitDialog },
     data() {
       return {
+        processSubmitDialogFlag:false,
         columns: [
           {
             label: '序号',
@@ -166,6 +194,16 @@
             minWidth: '100',
             showOverflowTooltip: true
           },
+
+          {
+            label: '审核状态',
+            prop: 'approvalStatus',
+            align: 'center',
+            width: 120,
+            formatter: (_row, _column, cellValue) => {
+              return reviewStatus[_row.approvalStatus];
+            }
+          },
           {
             columnKey: 'action',
             label: '操作',
@@ -199,6 +237,26 @@
         });
         return res;
       },
+      async submit(row) {
+        this.processSubmitDialogFlag = true;
+
+        this.$nextTick(() => {
+          let params = {
+            businessId: row.id,
+            businessKey: row.holderType==1?'profession_person_approve':row.holderType==4?'contact_qc_approve':'supplier_qc_approve',
+            formCreateUserId: row.createUserId,
+            variables: {
+              businessCode: row.code,
+              businessName: row.holder,
+              businessType:
+                row.holderType == 1
+                  ? this.getDictValue('证件类型', row.type)
+                  : this.getDictValue('客户/供应商资质类型', row.type)
+            }
+          };
+          this.$refs.processSubmitDialogRef.init(params);
+        });
+      },
       reload(where = {}) {
         this.$refs.table.reload({ where });
       },

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 627 - 208
src/views/system/organization/components/org-user-edit.vue


+ 6 - 6
src/views/workforceManagement/team/components/edit.vue

@@ -177,7 +177,7 @@
         header="员工配置"
         body-style="padding: 22px 22px 0 22px;"
       >
-        <userTable ref="userTable" @deleteIds="deleteIds"></userTable>
+        <userTable ref="userTable" @deleteIds="deleteIds" :factoryId="form.factoryId"></userTable>
       </el-card>
     </el-form>
     <template v-slot:footer>
@@ -336,11 +336,11 @@
           this.loading = true;
           let userIds = this.$refs.userTable.datasource.map((n) => n.id);
 
-          if (userIds.length <= 0) {
-            this.$message.error('请选择员工');
-            this.loading = false;
-            return false;
-          }
+          // if (userIds.length <= 0) {
+          //   this.$message.error('请选择员工');
+          //   this.loading = false;
+          //   return false;
+          // }
 
           let par = this.form;
           par.userIds = userIds;

+ 8 - 1
src/views/workforceManagement/team/components/staffSelection.vue

@@ -193,7 +193,9 @@
       type: {},
       hasAccount:{
         default:0
-      }
+      },
+      factoryId:String,
+   
     },
     created() {},
     methods: {
@@ -241,10 +243,15 @@
           groupId: this.form.groupId,
           name: this.userName
         };
+   
         this.getStaffList(params);
       },
     //获取员工列表
     async getStaffList(params) {
+      console.log(this.factoryId,'factoryId')
+      if(this.factoryId){
+          params['factoryId']=this.factoryId
+        }
       let res = await getUserPage(params);
       let list = res.list;
       if (list.length < res.count) {

+ 8 - 0
src/views/workforceManagement/team/components/userTable.vue

@@ -58,6 +58,7 @@
     <staffSelection
       ref="staffSelection"
       @confirm="confirmStaffSelection"
+      :factoryId="factoryId"
     ></staffSelection>
   </div>
 </template>
@@ -67,6 +68,9 @@
     components: {
       staffSelection
     },
+    props:{
+      factoryId:String
+    },
     data () {
       return {
         columns: [
@@ -143,6 +147,10 @@
       },
 
       handlAdd () {
+        if(!this.factoryId){
+          this.$message.warning('请先选择所属工厂!');  
+          return
+        }
         this.$refs.staffSelection.open(
           JSON.parse(JSON.stringify(this.datasource))
         );

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно