fix(env.development):配置文件

.env.development

@@ -4,7 +4,7 @@ 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'

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>

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
         }

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
       }
     }

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
       }
     }

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>

src/views/purchaseContractManagement/stepComponents/PriceRules.vue

@@ -18,7 +18,7 @@
           <el-radio :label="1">固定差额</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="贸易平台报价/年" prop="tradePlatformOffer" v-if="ruleForm.accrualMarginCalcMethod != 1">
+      <!-- <el-form-item label="贸易平台报价/年" prop="tradePlatformOffer" v-if="ruleForm.accrualMarginCalcMethod != 1">
         <el-input v-model="ruleForm.tradePlatformOffer" placeholder="请输入贸易平台报价" disabled>
           <template slot="append">%</template>
         </el-input>
@@ -27,7 +27,7 @@
         <el-input v-model="ruleForm.factoringOffer" placeholder="请输入保理报价" disabled>
           <template slot="append">%</template>
         </el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="预估保理融资期限" prop="factoringFinanceDeadline">
         <el-input v-model="ruleForm.factoringFinanceDeadline" placeholder="请输入预估保理融资期限" disabled>
           <template slot="append">天</template>
@@ -63,8 +63,8 @@ export default {
     return {
       ruleForm: {
         accrualMarginCalcMethod: '',
-        tradePlatformOffer: '',
-        factoringOffer: '',
+        // tradePlatformOffer: '',
+        // factoringOffer: '',
         factoringFinanceDeadline: '',
         differAmount: '',
         monthlyInterestRate: '',
@@ -72,8 +72,8 @@ export default {
       },
       rules: {
         accrualMarginCalcMethod: [{ required: true, message: '请选择利差计算方式', trigger: 'change' }],
-        tradePlatformOffer: [{ required: true, message: '请输入贸易平台报价', trigger: 'blur' }],
-        factoringOffer: [{ required: true, message: '请输入保理报价', trigger: 'blur' }],
+        // tradePlatformOffer: [{ required: true, message: '请输入贸易平台报价', trigger: 'blur' }],
+        // factoringOffer: [{ required: true, message: '请输入保理报价', trigger: 'blur' }],
         factoringFinanceDeadline: [{ required: true, message: '请输入预估保理融资期限', trigger: 'blur' }],
         differAmount: [{ required: true, message: '请输入差额', trigger: 'blur' }],
         monthlyInterestRate: [{ required: true, message: '请输入月利率', trigger: 'blur' }]

src/views/settlementManagement/components/add.vue

@@ -296,9 +296,9 @@ export default {
     calculateTotal() {
       let num = 0, price = 0, buyPrice = 0;
       this.goodsList.forEach(item => {
-        num = parseFloat(Number(num) + item.goodsQuantity).toFixed(4)
-        price = parseFloat(Number(price) + item.salesTotalPrice).toFixed(2)
-        buyPrice = parseFloat(Number(buyPrice) + item.purchaseTotalPrice).toFixed(2)
+        num = parseFloat(Number(num) + Number(item.goodsQuantity || 0)).toFixed(4)
+        price = parseFloat(Number(price) + Number(item.salesTotalPrice || 0)).toFixed(2)
+        buyPrice = parseFloat(Number(buyPrice) + Number(item.purchaseTotalPrice || 0)).toFixed(2)
       })
       this.ruleForm.countTheGoods = num
       this.ruleForm.settleTotalSalesPrice = price

src/views/settlementManagement/components/edit.vue

@@ -127,9 +127,9 @@ export default {
     calculateTotal() {
       let num = 0, price = 0, buyPrice = 0;
       this.goodsList.forEach(item => {
-        num = parseFloat(Number(num) + item.goodsQuantity).toFixed(4)
-        price = parseFloat(Number(price) + item.salesTotalPrice).toFixed(2)
-        buyPrice = parseFloat(Number(buyPrice) + item.purchaseTotalPrice).toFixed(2)
+        num = parseFloat(Number(num) + Number(item.goodsQuantity || 0)).toFixed(4)
+        price = parseFloat(Number(price) + Number(item.salesTotalPrice || 0)).toFixed(2)
+        buyPrice = parseFloat(Number(buyPrice) + Number(item.purchaseTotalPrice || 0)).toFixed(2)
       })
       this.ruleForm.countTheGoods = num
       this.ruleForm.settleTotalSalesPrice = price

src/views/settlementManagement/components/sign.vue

@@ -42,6 +42,21 @@
             签署状态：{{ detailInfo.signStatus ? '已签署' : '未签署' }}
           </td>
         </tr>
+        <tr>
+          <td>结算单附件</td>
+          <td style="padding-left: 0; width: 150px">
+            <cy-upload
+              :upload-params="{}"
+              :file-data="detailInfo.files"
+              :upload-from-orange-status="true"
+              placeholder="请上传附件"
+              :disabled="true"
+            />
+          </td>
+          <td>
+            <el-button type="primary" @click="downloadFile">下载</el-button>
+          </td>
+        </tr>
       </table>
 
       <!-- 签署结论 -->
@@ -60,6 +75,8 @@
 
 <script>
 import request from '@/utils/request'
+import { exportFile } from '@/utils/index'
+
 export default {
   name: 'PurchaseContractSign',
   components: {
@@ -144,6 +161,27 @@ export default {
           }
         }
       })
+    },
+    downloadFile() {
+      if(!this.detailInfo.files || this.detailInfo.files.length === 0) return
+      request({
+          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: {
@@ -151,6 +189,7 @@ export default {
       handler(newV) {
         if(newV) {
           this.detailInfo = { ...this.info }
+          this.detailInfo.files = [this.detailInfo.settlementSignedFile]
           this.ruleForm.signConclusion = this.info.signConclusion
           this.ruleForm.signComment = this.info.signComment
         }