From 49c337941d608a74545ea14e1fe0fa0d41bea50f Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Tue, 21 Feb 2023 14:30:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E5=AE=9E?=
 =?UTF-8?q?=E5=8F=91=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jeecg/CEditableTable.vue       |  6 +-
 .../form/ProcessMaterialsDelivery.vue         |  8 +-
 .../form/ProcessMaterialsDeliveryForm.vue     | 96 ++++++++++++++++---
 .../activiti/form/ProcessUdgetPlanForm.vue    | 25 +++--
 src/views/activiti/todoManage.vue             |  9 ++
 src/views/system/UserList.vue                 | 14 +--
 6 files changed, 127 insertions(+), 31 deletions(-)

diff --git a/src/components/jeecg/CEditableTable.vue b/src/components/jeecg/CEditableTable.vue
index fcd3f3d..2e81702 100644
--- a/src/components/jeecg/CEditableTable.vue
+++ b/src/components/jeecg/CEditableTable.vue
@@ -11,8 +11,8 @@
       <a-col>
         <!-- 操作按钮 -->
         <div v-if="actionButton" class="action-button">
-          <a-button type="primary" icon="plus" @click="handleClickAdd"  :disabled="disabled">新增</a-button>
-<!--          <a-button type="primary" icon="plus" @click="handleClickAdd" v-else :disabled="!isabled">新增</a-button>-->
+          <a-button type="primary" icon="plus" @click="handleClickAdd" v-if="isabled" :disabled="isabled">新增</a-button>
+          <a-button type="primary" icon="plus" @click="handleClickAdd" v-else :disabled="isabled">新增</a-button>
           <span class="gap"></span>
           <template v-if="selectedRowIds.length>0">
             <a-popconfirm
@@ -639,7 +639,7 @@
   let rowHeight = 61
 
   export default {
-    name: 'PEditableTable',
+    name: 'CEditableTable',
     components: { JDate, Draggable, JInputPop, JFilePop },
     provide() {
       return {
diff --git a/src/views/activiti/form/ProcessMaterialsDelivery.vue b/src/views/activiti/form/ProcessMaterialsDelivery.vue
index 6e4eff9..7491414 100644
--- a/src/views/activiti/form/ProcessMaterialsDelivery.vue
+++ b/src/views/activiti/form/ProcessMaterialsDelivery.vue
@@ -3,7 +3,7 @@
         <a-tabs style="text-align: center;">
           <a-tab-pane tab="流程正文" key="1" forceRender>
             <process-materials-delivery-form :dianshang="delivery" :isNew="isNew" :hieg="hieg" @delivery="showType" :processData="processData" :disabled="disabled"
-                                             @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask"
+                                             @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" :actualNumber = "actualNumber"
                                              @backTask="backTask" @loadData="loadData" :itemId="itemId"/>
           </a-tab-pane>
           <a-tab-pane tab="流程节点图" key="2" forceRender>
@@ -59,6 +59,12 @@
         default: '',
         required: true
       },
+      //表单禁用
+      actualNumber: {
+        type: Boolean,
+        default: true, //默认值
+        required: false //必传值
+      },
       disabled: {
         type: Boolean,
         default: false,
diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index 826fab1..3069051 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -77,8 +77,8 @@
           :columns="processMaterialsDeliveryListTable.columns"
           :dataSource="processMaterialsDeliveryListTable.dataSource"
           :maxHeight="300"
-          :disabled="this.hiegs"
           :verify="this.deliveryType"
+          :isabled="isabled"
           :verify-type="this.accountingAttributesVal"
           @valueChange="onSelect"
           :rowNumber="true"
@@ -160,6 +160,7 @@
       return {
         libraryAssociationIdInvisible: '',
         rolePlay: false,
+        // actualNumbers: true, //实发数
         jiy: [],
         // heid: true,
         addId: '',
@@ -225,7 +226,8 @@
               width: '200px',
               placeholder: '请输入${title}',
               // defaultValue:'',
-              options: []
+              options: [],
+              disabled: this.disabled,
             },
             {
               title: 'WBS',
@@ -234,7 +236,8 @@
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
-              defaultValue: ''
+              defaultValue: '',
+              disabled: this.disabled,
             },
             {
               title: '物料名称及规格型号',
@@ -243,7 +246,8 @@
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
-              defaultValue: ''
+              defaultValue: '',
+              disabled: this.disabled,
             },
             // {
             //   title: '规格',
@@ -269,7 +273,8 @@
               dictCode: '',
               width: '130px',
               placeholder: '请输入${title}',
-              defaultValue: ''
+              defaultValue: '',
+              disabled: this.disabled,
             },
             // {
             //   title: '批次',
@@ -285,7 +290,8 @@
               type: FormTypes.inputNumber,
               width: '130px',
               placeholder: '请输入${title}',
-              defaultValue: ''
+              defaultValue: '',
+              disabled: this.disabled,
               // slotName: 'qing'
             },
             {
@@ -294,7 +300,8 @@
               type: FormTypes.inputNumber,
               width: '130px',
               placeholder: '请输入${title}',
-              defaultValue: ''
+              defaultValue: '',
+              disabled: this.actualNumber,
             },
             {
               title: '库存',
@@ -303,7 +310,8 @@
               width: '80px',
               // placeholder: '请输入${title}',
               // defaultValue: '',
-              slotName: 'repertory'
+              slotName: 'repertory',
+              disabled: this.disabled,
               // scopedSlots: {customRender: 'fileSlot'}
             },
             {
@@ -313,7 +321,8 @@
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
-              defaultValue: ''
+              defaultValue: '',
+              disabled: this.disabled,
             },
             {
               title: '单价（元）',
@@ -357,6 +366,7 @@
               type: FormTypes.input,
               width: '200px',
               placeholder: '请输入${title}',
+              disabled: this.disabled,
               defaultValue: ''
             }
             // {
@@ -392,6 +402,7 @@
           }
         },
         btndisabled: false,
+        isabled: true,
         describes: '',
         assignees: '',
         deliveryType: '',
@@ -439,6 +450,12 @@
         required: false
       },
       //表单禁用
+      actualNumber: {
+        type: Boolean,
+        // default: false, //默认值
+        required: true //必传值
+      },
+      //表单禁用
       hieg: {
         type: Boolean,
         default: false,
@@ -460,6 +477,10 @@
           return true
         }
         // console.log("============================",this.hiegs=this.hieg);
+        console.log("2222222222222222",this.actualNumber)
+        // if(this.disabled){
+        //   this.isabled = false;
+        // }
         this.hiegs = this.hieg
         return this.disabled
       },
@@ -532,6 +553,7 @@
         if (val !== undefined) {
           this.accountingAttributesVal = val
           this.hiegs = false
+          this.isabled = false
           if (this.deliveryType !== 1 ) {
             // console.log("执行账外")
             //账外
@@ -1357,8 +1379,42 @@
         this.$emit('close')
       },
       /*通过审批*/
-      passTask() {
-        this.$emit('passTask')
+     async passTask() {
+        let qing = false;
+        if(!this.actualNumber){
+         await this.getAllTable().then(tables => {
+            return validateFormAndTables(this.form, tables)
+          }).then(allValues => {
+            let formData = this.classifyIntoFormData(allValues);
+            if(formData.processMaterialsDeliveryListList.length > 0){
+
+              formData.processMaterialsDeliveryListList.forEach(item => {
+                  if(!item.actualSendNumber){
+                    qing = true;
+                  }
+              })
+              if(qing){
+                console.log("============",qing);
+                this.$message.warning("请填写实发数！！！")
+              }else{
+                let method = 'put'
+                httpAction(this.url.edit, formData, method).then((res) => {
+                  if (res.success) {
+
+                  }
+                }).finally(() => {
+
+                })
+              }
+            }
+            console.log('所有数据========', formData)
+          })
+        }
+        if(!qing){
+          console.log("============",qing);
+          this.$emit('passTask')
+        }
+
       },
       /*驳回审批*/
       backTask() {
@@ -1417,6 +1473,24 @@
                 formData.title = this.processData.title
                 formData.processInstanceId = this.processData.id
               }
+              if(formData.processMaterialsDeliveryListList.length > 0){
+                let qing = false;
+                formData.processMaterialsDeliveryListList.forEach(item => {
+                  if(!!item.equipment){
+                    if(!item.pleaseSendNumber){
+                      qing = true;
+                    }
+                  }else {
+                    this.$message.warning("请填写数据！！！")
+                  }
+
+                })
+                if(qing){
+                  this.$message.warning("请填写请发数！！！")
+                  return
+                }
+              }
+
               console.log('提交方法', method)
               if(this.btndisabled === false){
                 this.btndisabled = true
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 5bb3403..3aa68f9 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -64,26 +64,26 @@
           </a-col>
           <a-col :span="8" v-show="isPlanType">
             <a-form-item label="采购类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['planType']"
+              <j-dict-select-tag type="list" v-decorator="['planType',validatorRules.planType]"
                                  :trigger-change="true" dictCode="plan_type"
                                  placeholder="请选择采购类型电商或非电商" @change="selectChangPlanType"/>
             </a-form-item>
           </a-col>
           <a-col :span="8" v-show="isSourceCapital">
             <a-form-item label="资金来源" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" v-decorator="['sourceCapital']"
+              <j-dict-select-tag type="list" v-decorator="['sourceCapital',validatorRules.sourceCapital]"
                                  :trigger-change="true" dictCode="source_capital"
                                  placeholder="请选择资金来源"/>
             </a-form-item>
           </a-col>
-          <a-col :span="8" v-show="isIfDirect">
+          <a-col :span="8" v-if="isIfDirect">
             <a-form-item label="是否属于直达物资" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-decorator="['ifDirect',validatorRules.ifDirect]"
                                  :trigger-change="true" dictCode="if_status"
                                  placeholder="请选择是否属于直达物资" @change="selectChang"/>
             </a-form-item>
           </a-col>
-          <a-col :span="8" v-show="isIfInspection">
+          <a-col :span="8" v-if="isIfInspection">
             <a-form-item label="是否需要送检" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-decorator="['ifInspection',validatorRules.ifInspection]"
                                  :trigger-change="true" dictCode="if_status"
@@ -593,6 +593,10 @@
           // 'blur'是鼠标失去焦点的时候会触发验证
           materialType: { rules: [{ required: true, message: '请选择物资类型!' }] },
           needTime: { rules: [{ required: true, message: '请选择需求时间!' }] },
+          ifDirect: { rules: [{ required: true, message: '请选择物资到达类型!' }] },
+          sourceCapital: { rules: [{ required: true, message: '请选择资金来源!' }] },
+          planType: { rules: [{ required: true, message: '请选择采购类型!' }] },
+          ifInspection: { rules: [{ required: true, message: '请选择是否送检!' }] },
           processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] },
           sort: {
             rules: [{ required: true, type: 'number', max: 999999999999, message: '请输入序号!(0 ~ 12个数字)' }
@@ -1686,7 +1690,7 @@
       // },
       //渲染流程表单数据
       showFlowData() {
-        console.log(this.formBpm, '----------****')
+        // console.log(this.formBpm, '----------****')
         if (this.formBpm === true) {
           let params = { id: this.formData.dataId }
           getAction(this.url.queryById, params).then((res) => {
@@ -1721,7 +1725,7 @@
         this.handleSubmit(true)
       },
       // handler
-      handleSubmit(e) {
+        handleSubmit(e) {
         this.getAllTable().then(tables => {
           return validateFormAndTables(this.form, tables)
         }).then(allValues => {
@@ -1762,8 +1766,8 @@
             this.$message.error('需求时间不能小于当前流程发起时间')
             return
           }
-          console.log(formData, '表单数据')
-          console.log(this.opinion, '流程说明')
+          // console.log(formData, '表单数据')
+          // console.log(this.opinion, '流程说明')
           this.form.validateFields((err, values) => {
             if (!err) {
               formData.procDefId = this.processData.id
@@ -1778,7 +1782,7 @@
                 method = 'put'
               }
               if (formData.planType == 1 && formData.materialType != 6) {
-                console.log('格式化后的数据', formData)
+                // console.log('格式化后的数据', formData)
                 if (formData.ifDirect == null && this.routePlanName == '采购员') {
                   this.$message.error('请选择是否属于直达物资!')
                   return
@@ -1794,6 +1798,9 @@
               if (e==true){
                 this.passTask()
               }
+              formData.ifDirect = parseInt(formData.ifDirect);
+              formData.sourceCapital = parseInt(formData.sourceCapital);
+              formData.planType = parseInt(formData.planType);
               console.log(formData, '格式化的数据')
               if (this.btndisabled === false) {
                 this.btndisabled = true
diff --git a/src/views/activiti/todoManage.vue b/src/views/activiti/todoManage.vue
index 1f96139..acb7f98 100644
--- a/src/views/activiti/todoManage.vue
+++ b/src/views/activiti/todoManage.vue
@@ -156,6 +156,7 @@
                  :routePlanName="lcModa.routePlanName"
                  :isTable="lcModa.isTable"
                  :itemId="lcModa.itemId"
+                 :actualNumber = "lcModa.actualNumber"
                  @afterSubmit="afterSub"
                  @passTask="()=>passTask(lcModa.processData)"
                  @backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId"
@@ -290,6 +291,7 @@
         lcModa: {
           title: '',
           disabled: false,
+          actualNumber: true,
           visible: false,
           formComponent: null,
           isNew: false,
@@ -484,6 +486,13 @@
         this.form.userId=null;
       },
       async detail(r) {
+        // console.log("rrrr==================rrrrrrr",r)
+        if(r.name === '项目部经理' && r.processName === '物资出库流程'){
+          // console.log("项目部经理 出库流程 ===")
+          this.lcModa.actualNumber = false;
+        }else{
+          this.lcModa.actualNumber = true;
+        }
         if (!r.routeName) {
           this.$message.warning(
             '该流程信息未配置表单，请联系开发人员！'
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 30c3e76..49ee1e2 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -92,23 +92,23 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="border-top: 5px">
       <a-button @click="handleAdd" type="primary" icon="plus" v-has="'user:add'">添加用户</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
-      <a-button type="primary" icon="download" @click="downloadText('/static/excle/用户信息导入模板.xlsx','用户信息导入模板.xlsx')">用户信息导入模板</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('用户信息')" v-has="'user:export'">导出</a-button>
+      <a-button type="primary" icon="download" @click="downloadText('/static/excle/用户信息导入模板.xlsx','用户信息导入模板.xlsx')" v-has="'user:download'">用户信息导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="primary" icon="import" v-has="'user:import'">导入</a-button>
       </a-upload>
-      <a-button type="primary" icon="hdd" @click="recycleBinVisible=true">回收站</a-button>
+      <a-button type="primary" icon="hdd" @click="recycleBinVisible=true" v-has="'user:recycle'">回收站</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay" @click="handleMenuClick">
-          <a-menu-item key="1">
+          <a-menu-item key="1" v-has="'user:delete'">
             <a-icon type="delete" @click="batchDel"/>
             删除
           </a-menu-item>
-          <a-menu-item key="2">
+          <a-menu-item key="2" v-has="'user:frost'">
             <a-icon type="lock" @click="batchFrozen('2')"/>
             冻结
           </a-menu-item>
-          <a-menu-item key="3">
+          <a-menu-item key="3" v-has="'user:defrost'">
             <a-icon type="unlock" @click="batchFrozen('1')"/>
             解冻
           </a-menu-item>