changjiaming 7 miesięcy temu
rodzic
commit
ac83abb547

+ 3 - 3
.env.development

@@ -4,12 +4,12 @@ ENV = 'development'
 # base api
 # VUE_APP_BASE_API = 'http://192.168.2.34:8888'
 # VUE_APP_BASE_API = 'http://192.168.2.52:8888'
-# VUE_APP_BASE_API = 'http://192.168.2.12:8888'
+VUE_APP_BASE_API = 'http://192.168.2.12:8888'
 # VUE_APP_BASE_API = 'http://192.168.2.46:8888'
 # VUE_APP_BASE_API = 'http://192.168.2.13:8888'
-VUE_APP_BASE_API = 'http://192.168.3.6:8888'
+# VUE_APP_BASE_API = 'http://192.168.3.6:8888'
 # VUE_APP_BASE_API = 'http://192.168.2.13:8888'
 # VUE_APP_BASE_API = 'http://192.168.3.6:8888'
-# VUE_APP_BASE_API = 'http://192.168.2.12:8888'
+# VUE_APP_BASE_API = 'http://192.168.2.77:8888'
 # VUE_APP_BASE_API = 'http://192.168.2.13:8888'
 # VUE_APP_BASE_API = 'http://citp.changan-inkasso.com/tradeV4-backend'

+ 2 - 1
src/views/enterpriseManagement/index.vue

@@ -8,7 +8,8 @@
         <div class="tempalte-content">
           <div class="search">
             <div class="left">
-              <el-button v-if="activeName === 'pending' && btnPermission.includes('addSupplier')" type="primary" style="margin-bottom: 15px" @click="() => { this.$refs.tradePlatform.show = true }">新增贸易平台</el-button>
+              <!-- <el-button v-if="activeName === 'pending' && btnPermission.includes('addSupplier')" type="primary" style="margin-bottom: 15px" @click="() => { this.$refs.tradePlatform.show = true }">新增贸易平台</el-button> -->
+              <el-button v-if="activeName === 'pending'" type="primary" style="margin-bottom: 15px" @click="() => { this.$refs.tradePlatform.show = true }">新增贸易平台</el-button>
               <div v-if="activeName == 'all'" class="left" style="margin-bottom: 15px;">
                 <el-radio-group v-model="tableType" @change="changeSignType" class="other-radio">
                   <el-radio-button label="com">公司</el-radio-button>

+ 3 - 3
src/views/enterpriseManagement/indexTable.js

@@ -102,9 +102,9 @@ export default {
     tablePower() {
       return ({ item, row }) => {
         const { rowPower, power } = item
-        if(power && !this.btnPermission.includes(power)) {
-          return false
-        }
+        // if(power && !this.btnPermission.includes(power)) {
+        //   return false
+        // }
         if(rowPower && (!row.authStatus || !rowPower.includes(row.authStatus))) {
           return false
         }

+ 3 - 3
src/views/enterpriseManagement/signComTable.js

@@ -94,9 +94,9 @@ export default {
     comTablePower() {
       return ({ item }) => {
         const { power } = item
-        if(power && !this.btnPermission.includes(power)) {
-          return false
-        }
+        // if(power && !this.btnPermission.includes(power)) {
+        //   return false
+        // }
         return true
       }
     }

+ 3 - 3
src/views/enterpriseManagement/signPersonTable.js

@@ -107,9 +107,9 @@ export default {
     personTablePower() {
       return ({ item }) => {
         const { power } = item
-        if(power && !this.btnPermission.includes(power)) {
-          return false
-        }
+        // if(power && !this.btnPermission.includes(power)) {
+        //   return false
+        // }
         return true
       }
     }

+ 1 - 1
src/views/purchaseContractManagement/components/PurchaseContractReviewContent.vue

@@ -175,7 +175,7 @@
           <el-table-column prop="name" label="操作" width="200" v-if="!isView">
             <template slot-scope="scope">
               <el-button type="text" @click="ruleForm.purchContractOtherClause.push({paymentCondition: ''})">增加</el-button>
-              <el-button v-if="scope.$index !== 0" type="text" @click="deleteCondition(scope.$index)">删除</el-button>
+              <el-button type="text" @click="deleteCondition(scope.$index)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>

+ 19 - 7
src/views/settlementManagement/components/sign.vue

@@ -75,6 +75,8 @@
 
 <script>
 import request from '@/utils/request'
+import { exportFile } from '@/utils/index'
+
 export default {
   name: 'PurchaseContractSign',
   components: {
@@ -163,13 +165,23 @@ export default {
     downloadFile() {
       if(!this.detailInfo.files || this.detailInfo.files.length === 0) return
       request({
-        url: '/bill/downloadPdfSign',
-        method: 'get',
-        responseType: 'arraybuffer',
-        params: { settlementBasicInfoId: this.detailInfo.settlementBasicInfoId }
-      }).then(data => {
-        exportFile(data)
-      })
+          url: '/bill/downloadPdfSign',
+          responseType: 'arraybuffer',
+          params: {
+            settlementBasicInfoId: this.detailInfo.settlementBasicInfoId
+          },
+          method: 'get'
+        }).then(res => {
+          exportFile(res)
+        })
+      // request({
+      //   url: '/bill/downloadPdfSign',
+      //   method: 'get',
+      //   responseType: 'arraybuffer',
+      //   params: { settlementBasicInfoId: this.detailInfo.settlementBasicInfoId }
+      // }).then(data => {
+      //   exportFile(data)
+      // })
     }
   },
   watch: {

Plik diff jest za duży
+ 8317 - 11344
yarn.lock