zxz 2 jaren geleden
bovenliggende
commit
1a19e8b28c

+ 7 - 4
src/views/contractManagement/acquisitionContract.vue

@@ -201,11 +201,9 @@
             v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
-            <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+            <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
               <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
-                @click="withdraw(scope.row)" v-hasPermission="
-                            `contractManagement.buyContract.buyContractInfo.edit`
-                          " alt="" />
+                @click="withdraw(scope.row)" v-hasPermission="`contractManagement.buyContract.buyContractInfo.edit`" alt="" />
             </div>
             <!-- <ws-button v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" type="primary" @click="withdraw(scope.row)" >撤回</ws-button> -->
         </template>
@@ -282,6 +280,7 @@
         showType: true,
         // 年
         year: '',
+        showFlag:false,
         deliver_type: 1,
         deptBudgetTotal: 0,
         currentPage: 1,
@@ -531,6 +530,7 @@
             goodsType: this.goodsType,
             currentPage: this.currentPage,
             pageSize: this.pageSize,
+            agreementType: '收购合同',
             searchType: this.searchType,
             searchKeyWord: this.searchKeyWord,
             startDate: this.startDate,
@@ -541,6 +541,9 @@
           .toPromise()
           .then((response) => {
             for (var i = 0; i < response.records.length; i++) {
+              if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
               if(response.records[i].status){
                 response.records[i].currectstatus=response.records[i].status
               }

+ 6 - 3
src/views/contractManagement/collectionContract.vue

@@ -144,7 +144,7 @@
             v-hasPermission="
                 `contractManagement.dsContract.dsContractInfo.list`
               " @click="handleRecord(scope.row)" alt="" />
-              <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+              <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
                 <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
                   @click="withdraw(scope.row)" v-hasPermission="`contractManagement.dsContract.dsContractInfo.edit`" alt="" />
               </div>
@@ -211,6 +211,7 @@
         // showType: true,
         // 年
         year: '',
+        showFlag:false,
         deliver_type: 1,
         deptBudgetTotal: 0,
         currentPage: 1,
@@ -219,7 +220,7 @@
         searchType: 1,
         searchTypeText: '未完成',
         searchKeyWord: '',
-        contractType: 1,
+        contractType: 3,
         goodsType: 1,
         startDate: null,
         endDate: null,
@@ -421,7 +422,9 @@
               if (response.records[i].completedQuantity) {
                 response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
               }
-
+              if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
               if (response.records[i].addressUrl != null) {
                 if (response.records[i].addressUrl) {
                   response.records[i].addressUrlArray =

+ 5 - 1
src/views/contractManagement/purchaseContract.vue

@@ -215,7 +215,7 @@
             src="../../../public/img/shanchu.png" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
-                         <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+                         <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
               <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
                 @click="withdraw(scope.row)" v-hasPermission="
                             `contractManagement.buyContract.buyContractInfo.edit`
@@ -334,6 +334,7 @@ export default {
       goodsType: 1,
       startDate: null,
       endDate: null,
+      showFlag:false,
       addressUrls: [],
       accesscard: false,
       // 提交类型
@@ -692,6 +693,9 @@ export default {
             } else {
               response.records[i].addressUrlArray = []
             }
+            if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+              response.records[i].showFlag = true
+              }
           }
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size

+ 7 - 11
src/views/contractManagement/salesContract.vue

@@ -219,14 +219,10 @@
             src="../../../public/img/shanchu.png" v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
-                        <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
-              <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
-                @click="withdraw(scope.row)" v-hasPermission="
-                            `contractManagement.buyContract.buyContractInfo.edit`
-                          " alt="" />
+            <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+                <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
+                   @click="withdraw(scope.row)" v-hasPermission="`contractManagement.buyContract.buyContractInfo.edit`" alt="" />
             </div>
-            <!-- <ws-button v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" type="primary" @click="withdraw(scope.row)" >撤回</ws-button> -->
-            <!-- v-hasPermission="`contractManagement.salesContract.salesContractInfo.add`" -->
         </template>
       </el-table-column>
     </el-table>
@@ -353,7 +349,7 @@ export default {
       contractForm: {},
       categoryIndex: 0,
       rulesVendor: {},
-      size: 10,
+      showFlag:false,
       appendixIdss: [],
       compId: localStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -710,9 +706,9 @@ export default {
             } else {
               response.records[i].datestatus = false
             }
-
-
-
+            if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
             if (response.records[i].completedQuantity) {
               response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
             }

+ 5 - 1
src/views/contractManagement/storageContract.vue

@@ -145,7 +145,7 @@
             v-hasPermission="
                 `contractManagement.dcContract.dcContractInfo.list`
               " @click="handleRecord(scope.row)" alt="" />
-              <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+              <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
               <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
                 @click="withdraw(scope.row)" v-hasPermission="
                             `contractManagement.dcContract.dcContractInfo.edit`
@@ -221,6 +221,7 @@
         endDate: null,
         addressUrls: [],
         deptCircularPage: {},
+        showFlag:false,
         date: {
           year: dayjs().format('YYYY'),
           month: dayjs().format('MM'),
@@ -404,6 +405,9 @@
           .toPromise()
           .then((response) => {
             for (var i = 0; i < response.records.length; i++) {
+              if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
               if (response.records[i].completedQuantity) {
                 response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
               }

+ 5 - 3
src/views/profitable/expensemanagementdetails.vue

@@ -185,7 +185,7 @@
                   scope.row.status == '已付款' &&
                   !scope.row.approveStatus)
               " @click="accomplish(scope.row)" type="primary">完成</el-button>
-              <el-button v-if="scope.row.approveStatus && scope.row.approveStatus !='发起人撤回' " @click="withdraw(scope.row)" type="primary">撤回</el-button>
+              <el-button v-if="scope.row.approveStatus && scope.row.approveStatus !='发起人撤回' " v-show="scope.row.showFlag"  @click="withdraw(scope.row)" type="primary">撤回</el-button>
               <el-button v-if="scope.row.status == '已驳回' || scope.row.approveStatus == '发起人撤回'" @click="edit(scope.row)" type="primary">编辑</el-button>
               <el-button v-if="
                 (!scope.row.distributionStatus &&
@@ -331,7 +331,7 @@ export default {
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
-      
+      showFlag:false,
       size: 100,
       expensesPurpose: '',
       recordList: [],
@@ -888,6 +888,9 @@ export default {
                 response.records[i].addressUrlArray =
                   response.records[i].addressUrl.split(',')
               }
+              if (response.records[i].agent == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
             }
           }
           this.tableData = response.records
@@ -902,7 +905,6 @@ export default {
               Number(this.tableData[0].outWarehouseMoney) +
               Number(this.tableData[0].outManageMoney)
           }
-
           this.deptBudgetTotal = response.total
         })
     },

+ 5 - 1
src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -107,7 +107,7 @@
               <el-divider direction="vertical" v-if="scope.row.taskStatus == '待审核'"></el-divider>
             </span>
 
-            <span class="corles" @click="withdraw(scope.row)"  v-if="scope.row.approveStatus"
+            <span class="corles" @click="withdraw(scope.row)"  v-if="scope.row.approveStatus" v-show="scope.row.showFlag"
             >撤回</span>
             <!-- v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.View`" -->
               <!-- v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.audit`" -->
@@ -211,6 +211,7 @@
         primary: '1',
         pageSize: 10,
         searchType: '',
+        showFlag: false,
         publishertext:'全部发布者',
         publisher:'',
         searchTypeText: '全部状态',
@@ -423,6 +424,9 @@
               }else{
                 response.records[i].show=false
               }
+              if (response.records[i].publisher == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
               
             }
             this.gainList = response