dedsudiyu 2 years ago
parent
commit
38d8957e75

+ 2 - 2
src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/addPage.vue

@@ -92,8 +92,8 @@
           </div>
           </div>
         </div>
         </div>
         <div class="bottom-button-box">
         <div class="bottom-button-box">
-          <p class="add-button-one-90 right-button" @click="upData(2)">保存草稿</p>
-          <p class="inquire-button-one right-button" @click="upData(1)">提交</p>
+          <p class="add-button-one-90 right-button" @click="upData(2)" v-hasPermi="['chemical:hxpapply:add']">保存草稿</p>
+          <p class="inquire-button-one right-button" @click="upData(1)" v-hasPermi="['chemical:hxpapply:add']">提交</p>
         </div>
         </div>
       </el-form>
       </el-form>
     </div>
     </div>

+ 2 - 2
src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/approvalPage.vue

@@ -176,8 +176,8 @@
           <p class="approval-for-min-p">{{refuseContentText}}</p>
           <p class="approval-for-min-p">{{refuseContentText}}</p>
         </div>
         </div>
         <div class="bottom-button-box" v-if="approvalPagePropsData.type == 1">
         <div class="bottom-button-box" v-if="approvalPagePropsData.type == 1">
-          <p class="add-button-two-90" @click="rejectButton">拒绝</p>
-          <p class="inquire-button-one" @click="agreeButton">同意</p>
+          <p class="add-button-two-90" @click="rejectButton" v-hasPermi="['chemical:refuseApplytask:edit']">拒绝</p>
+          <p class="inquire-button-one" @click="agreeButton" v-hasPermi="['chemical:applytask:edit']">同意</p>
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>

+ 2 - 2
src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/editPage.vue

@@ -93,8 +93,8 @@
             </div>
             </div>
           </div>
           </div>
           <div class="bottom-button-box">
           <div class="bottom-button-box">
-            <p class="add-button-one-90 right-button" @click="upData(2)">保存草稿</p>
-            <p class="inquire-button-one right-button" @click="upData(1)">提交</p>
+            <p class="add-button-one-90 right-button" @click="upData(2)" v-hasPermi="['chemical:hxpapply:add']">保存草稿</p>
+            <p class="inquire-button-one right-button" @click="upData(1)" v-hasPermi="['chemical:hxpapply:add']">提交</p>
           </div>
           </div>
         </el-form>
         </el-form>
       </div>
       </div>

+ 14 - 9
src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/index.vue

@@ -69,7 +69,7 @@
           </el-col>
           </el-col>
         </el-form-item>
         </el-form-item>
         <el-form-item style="float: right;">
         <el-form-item style="float: right;">
-          <el-dropdown @command="exportButton">
+          <el-dropdown @command="exportButton" v-hasPermi="['chemical:hxpapply:export']">
             <div class="form-dropdown-box">
             <div class="form-dropdown-box">
               <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
               <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
               <p>导出</p>
               <p>导出</p>
@@ -112,11 +112,11 @@
         <el-table-column label="操作" align="center" width="220" class-name="small-padding fixed-width" v-if="tableButtonType">
         <el-table-column label="操作" align="center" width="220" class-name="small-padding fixed-width" v-if="tableButtonType">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <div class="button-box">
             <div class="button-box">
-              <p class="table-min-button"
+              <p class="table-min-button" v-hasPermi="['chemical:hxpapply:query']"
                  v-show="scope.row.approvalStatus == 2 || scope.row.approvalStatus == 3" style="margin-right:10px;" @click="pageToggle(5,scope.row)">编辑</p>
                  v-show="scope.row.approvalStatus == 2 || scope.row.approvalStatus == 3" style="margin-right:10px;" @click="pageToggle(5,scope.row)">编辑</p>
-              <p class="table-min-button"
+              <p class="table-min-button" v-hasPermi="['chemical:revokeApplytask:edit']"
                  v-show="scope.row.approvalStatus == 1 && !scope.row.lsName" style="margin-right:10px;" @click="approvalRevoke(scope.row)">撤销</p>
                  v-show="scope.row.approvalStatus == 1 && !scope.row.lsName" style="margin-right:10px;" @click="approvalRevoke(scope.row)">撤销</p>
-              <p class="table-min-button" v-hasPermi="['chemical:hxpapply:edit']"
+              <p class="table-min-button" v-hasPermi="['chemical:hxpapplyaudit:query']"
                  v-show="scope.row.approvalType == 1" style="margin-right:10px;" @click="pageToggle(6,scope.row)">审批</p>
                  v-show="scope.row.approvalType == 1" style="margin-right:10px;" @click="pageToggle(6,scope.row)">审批</p>
               <p class="table-min-button" v-hasPermi="['chemical:hxpapply:query']"
               <p class="table-min-button" v-hasPermi="['chemical:hxpapply:query']"
                  style="margin-right:10px;" @click="pageToggle(7,scope.row)">审批单</p>
                  style="margin-right:10px;" @click="pageToggle(7,scope.row)">审批单</p>
@@ -167,7 +167,12 @@
     },
     },
     data(){
     data(){
       return{
       return{
-        tableButtonType:this.hasPermiDom(['chemical:hxpapply:remove','chemical:hxpapply:query','chemical:hxpapply:edit']),
+        tableButtonType:this.hasPermiDom([
+          'chemical:hxpapply:query',
+          'chemical:revokeApplytask:edit',
+          'chemical:hxpapplyaudit:query',
+          'chemical:hxpapply:query',
+          'chemical:hxpapply:remove',]),
         // 传参数据
         // 传参数据
         listPagePropsData:{},
         listPagePropsData:{},
         approvalPagePropsData:{},
         approvalPagePropsData:{},
@@ -193,7 +198,7 @@
         //数据数组
         //数据数组
         tableList:[],
         tableList:[],
         // 选中用户组
         // 选中用户组
-        userIds: [],
+        ids: [],
         // 非多个禁用
         // 非多个禁用
         multiple: true,
         multiple: true,
         //表格扩展选择器---需要在@selection-change绑定的方法内监控selection数组长度
         //表格扩展选择器---需要在@selection-change绑定的方法内监控selection数组长度
@@ -407,7 +412,7 @@
             cancelButtonText: "取消",
             cancelButtonText: "取消",
             type: "warning"
             type: "warning"
           }).then(async () => {
           }).then(async () => {
-            self.download('/chemical/hxpChemical/export/', {...self.queryParamsData}, '化学品信息-'+currentDate+'.xlsx')
+            self.download('/chemical/hxpapply/export/', {...self.queryParamsData}, '采购申请-'+currentDate+'.xlsx')
           }).catch(() => {})
           }).catch(() => {})
         }else if(item.command == 2){
         }else if(item.command == 2){
           if(self.ids.length>0) {
           if(self.ids.length>0) {
@@ -421,7 +426,7 @@
                 ids :ids
                 ids :ids
               }
               }
               console.log("obj",obj)
               console.log("obj",obj)
-              self.download(`/chemical/hxpChemical/export/`,obj, '化学品信息-'+currentDate+'.xlsx')
+              self.download(`/chemical/hxpapply/export/`,obj, '采购申请-'+currentDate+'.xlsx')
             }).catch(() => {})
             }).catch(() => {})
           }else {
           }else {
             this.msgError('请选择要导出的数据')
             this.msgError('请选择要导出的数据')
@@ -435,7 +440,7 @@
       // 多选框选中数据
       // 多选框选中数据
       handleSelectionChange(selection) {
       handleSelectionChange(selection) {
         this.selectedNum = selection.length;
         this.selectedNum = selection.length;
-        this.userIds = selection.map(item => item.userId)
+        this.ids = selection.map(item => item.id)
         this.multiple = !selection.length
         this.multiple = !selection.length
       },
       },
       /*===记录勾选数据===
       /*===记录勾选数据===