修改bug

src/api/feeInfo/fee-info.js

@@ -18,4 +18,12 @@ export function delItem2(data, url) {
     method: 'post',
     data:data
   })
+}
+
+export function getfeesDetails(data) {
+  return request({
+      url: '/api/trade-finance/settlement/feesDetails',
+      method: 'get',
+      params: data
+  })
 }

src/api/importTrade/salesContract.js

@@ -11,7 +11,7 @@ export function selectSaleList(data) {
 // 详情页查询
 export function detailSaleList(data) {
   return request({
-    url: '/api/blade-purchase-sales/entranceOrder/detail?id='+data,
+    url: '/api/blade-purchase-sales/entranceOrder/detail?id=' + data,
     method: 'get',
   })
 }
@@ -29,7 +29,7 @@ export function removeList(data) {
     url: '/api/blade-purchase-sales/entranceOrder/update',
     method: 'post',
     data: {
-      id:data
+      id: data
     }
   })
 }
@@ -39,7 +39,7 @@ export function goodsListRemove(data) {
     url: '/api/blade-purchase-sales/orderitems/update',
     method: 'post',
     data: {
-      id:data
+      id: data
     }
   })
 }
@@ -49,7 +49,7 @@ export function feesListRemove(data) {
     url: '/api/blade-purchase-sales/orderfees/update',
     method: 'post',
     data: {
-      id:data
+      id: data
     }
   })
 }
@@ -59,7 +59,7 @@ export function updateListRemove(data) {
     url: '/api/blade-client/corpsbank/update',
     method: 'post',
     data: {
-      id:data
+      id: data
     }
   })
 }
@@ -68,30 +68,30 @@ export function generateShipment(data) {
   return request({
     url: '/api/blade-purchase-sales/entranceOrder/deliverGoods',
     method: 'post',
-    data:data
+    data: data
   })
 }
 //提单号带出合同号
-export function getOrgOrderNo(billNo,billType) {
+export function getOrgOrderNo(billNo, billType) {
   return request({
     url: '/api/blade-purchase-sales/entranceOrder/findContractNoByBillNo',
     method: 'get',
-    params:{
-      billNo:billNo,
-      billType:"CG"
+    params: {
+      billNo: billNo,
+      billType: "CG"
     }
   })
 }
 
 //提单号带出合同号   发货单专属
-export function getListOrgOrderNo(billNo,contractNumber,priceCategory) {
+export function getListOrgOrderNo(billNo, contractNumber, priceCategory) {
   return request({
     url: '/api/blade-stock/client/listStockByCondition',
     method: 'get',
-    params:{
-      billNo:billNo,
-      contractNumber:contractNumber,
-      goodsId:priceCategory
+    params: {
+      billNo: billNo,
+      contractNumber: contractNumber,
+      goodsId: priceCategory
     }
   })
 }
@@ -101,7 +101,16 @@ export function generatePurchase(data) {
   return request({
     url: '/api/blade-purchase-sales/entranceOrder/createMarket',
     method: 'post',
-    data:data
+    data: data
+  })
+}
+
+//生成采购单
+export function getlistByBillNo(query) {
+  return request({
+    url: '/api/blade-stock/stockgoods/listByBillNo',
+    method: 'get',
+    params: query
   })
 }
 

src/components/fee-info/config/feeInfo.json

@@ -73,23 +73,30 @@
       "width": 150
     },
     {
+      "label": "开票金额",
+      "prop": "invoiceAmount",
+      "index": 8,
+      "overHidden": true,
+      "width": 150
+    },
+    {
       "label": "币别",
       "prop": "currency",
-      "index": 8,
+      "index": 9,
       "overHidden": true,
       "width": 150
     },
     {
       "label": "汇率",
       "prop": "exchangeRate",
-      "index": 9,
+      "index": 10,
       "overHidden": true,
       "width": 150
     },
     {
       "label": "计价单位",
       "prop": "unit",
-      "index": 10,
+      "index": 11,
       "slot": true,
       "overHidden": true,
       "width": 150
@@ -97,7 +104,7 @@
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 11,
+      "index": 12,
       "cell": true,
       "overHidden": true,
       "width": 150

src/components/fee-info/main.vue

@@ -21,8 +21,8 @@
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)" :disabled="disabled">{{
-             row.$cellEdit ? "保存" : "修改" 
-            }}</el-button>
+              row.$cellEdit ? "保存" : "修改"
+          }}</el-button>
           <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)" :disabled="disabled">删 除
           </el-button>
         </template>
@@ -34,14 +34,14 @@
           <span v-if="row.$cellEdit && !inCropId" class="required_fields">*</span>
           <crop-select ref="corp" style="width: 90% !important;display: inline-block" v-if="row.$cellEdit"
             v-model="row.corpId" :cropIndex="index" @getCorpData="getCorpData" corpType="KG"></crop-select>
-          <span v-else>{{  row.corpName  }}</span>
+          <span v-else>{{ row.corpName }}</span>
         </template>
         <template slot="feeName" slot-scope="{ row }">
           <span v-if="row.$cellEdit" class="required_fields">*</span>
           <breakdown-select v-if="row.$cellEdit" v-model="row.itemId" @selectValue="value => selectValue(value, row)"
             :configuration="breakConfiguration">
           </breakdown-select>
-          <span v-else>{{  row.feeName  }}</span>
+          <span v-else>{{ row.feeName }}</span>
         </template>
         <template slot="billNo" slot-scope="{ row }">
           <el-select v-if="row.$cellEdit" v-model="row.billNo" size="small" filterable allow-create default-first-option
@@ -49,27 +49,27 @@
             <el-option v-for="(item, index) in billNoList" :key="index" :label="item" :value="item">
             </el-option>
           </el-select>
-          <span v-else>{{  row.billNo  }}</span>
+          <span v-else>{{ row.billNo }}</span>
         </template>
         <template slot="price" slot-scope="{ row }">
           <el-input-number v-if="row.$cellEdit" v-model="row.price" placeholder="请输入" size="small" :controls="false"
             :precision="2" @input="countChange(row)" style="width: 100%"></el-input-number>
-          <span v-else>{{  row.price | micrometerFormat  }}</span>
+          <span v-else>{{ row.price | micrometerFormat }}</span>
         </template>
         <template slot="quantity" slot-scope="{ row }">
           <el-input-number v-if="row.$cellEdit && !isDecimal" v-model="row.quantity" size="small" placeholder="请输入"
             :controls="false" :precision="0" @input="countChange(row)" style="width: 100%"></el-input-number>
           <el-input-number v-if="row.$cellEdit && isDecimal" v-model="row.quantity" size="small" placeholder="请输入"
             :controls="false" :precision="6" @input="countChange(row)" style="width: 100%"></el-input-number>
-          <span v-else>{{  row.quantity | decimalFormat  }}</span>
+          <span v-else>{{ row.quantity | decimalFormat }}</span>
         </template>
         <template slot="amount" slot-scope="{ row }">
-          <span>{{  row.amount | micrometerFormat  }}</span>
+          <span>{{ row.amount | micrometerFormat }}</span>
         </template>
         <template slot="exchangeRate" slot-scope="{ row }">
           <el-input-number v-if="row.$cellEdit" v-model="row.exchangeRate" size="small" :controls="false" :precision="6"
             @change="rateChange(row)" style="width: 100%" placeholder="请输入"></el-input-number>
-          <span v-else>{{  row.exchangeRate  }}</span>
+          <span v-else>{{ row.exchangeRate }}</span>
         </template>
         <template slot="currency" slot-scope="{ row }">
           <el-select v-if="row.$cellEdit" v-model="row.currency" filterable allow-create default-first-option
@@ -78,14 +78,21 @@
               :value="item.dictValue">
             </el-option>
           </el-select>
-          <span v-else>{{  row.currency  }}</span>
+          <span v-else>{{ row.currency }}</span>
+        </template>
+        <template slot="invoiceAmount" slot-scope="{ row }">
+          <el-popover placement="right" width="400" trigger="click" @show="invoiceShow(row)" @hide="invoiceHide">
+            <avue-crud :data="invoiceData" :option="invoiceOption"></avue-crud>
+            <!-- <el-button slot="reference">click 激活</el-button> -->
+            <span style="color: #409EFF;cursor: pointer" slot="reference">{{ row.invoiceAmount }}</span>
+          </el-popover>
         </template>
         <template slot="unit" slot-scope="{ row }">
           <el-select v-if="row.$cellEdit" v-model="row.unit" filterable placeholder="请选择" size="small">
             <el-option v-for="(item, index) in unitList" :key="index" :label="item.dictValue" :value="item.dictValue">
             </el-option>
           </el-select>
-          <span v-else>{{  row.unit  }}</span>
+          <span v-else>{{ row.unit }}</span>
         </template>
       </avue-crud>
     </trade-card>
@@ -124,7 +131,7 @@
 import feeOption from "./config/feeInfo.json";
 import option from "./config/feeList.json";
 import { getDeptLazyTree, customerList } from "@/api/basicData/basicFeesDesc";
-import { delItem, delItem2 } from "@/api/feeInfo/fee-info";
+import { delItem, delItem2, getfeesDetails } from "@/api/feeInfo/fee-info";
 import { isPercentage, micrometerFormat, IntegerFormat } from "@/util/validate";
 import cropDialog from "@/components/crop-dialog/main";
 import _ from "lodash";
@@ -142,6 +149,22 @@ export default {
   name: "feeInfo",
   data() {
     return {
+      invoiceOption: {
+        border: true,
+        align: 'center',
+        header: false,
+        menu: false,
+        column: [
+          {
+            label: '日期',
+            prop: 'invoice_time'
+          },
+          {
+            label: '金额',
+            prop: 'amount'
+          },
+        ]
+      },
       option: option,
       feeOption: {},
       feeDialog: false,
@@ -204,7 +227,8 @@ export default {
       enableName: "first",
       tab1: true,
       tab2: false,
-      corpList: []
+      corpList: [],
+      invoiceData: [],
     };
   },
   props: {
@@ -350,6 +374,14 @@ export default {
     }
   },
   methods: {
+    invoiceShow(row) {
+      getfeesDetails({ id: row.id }).then(res => {
+        this.invoiceData = res.data.data
+      })
+    },
+    invoiceHide() {
+      this.invoiceData = []
+    },
     //选择费用
     selectValue(value, row) {
       this.$set(row, "feeName", value.cname);

src/views/purchase/contract/detailsPage.vue

@@ -69,7 +69,7 @@
         <trade-card title="基础信息">
           <el-row>
             <el-col v-for="(item, index) in basicData.column" :span="item.span ? item.span : 8" :key="index">
-              <el-form-item :label="item.label+':'" :prop="item.prop" :rules="item.rules">
+              <el-form-item :label="item.label + ':'" :prop="item.prop" :rules="item.rules">
                 <el-date-picker v-if="item.type === 'date'" style="width: 100%;" v-model="form[item.prop]"
                   :disabled="item.disabled ? true : false || viewDisabled" size="small" type="date" @change="dateChange"
                   placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" />
@@ -149,7 +149,7 @@
               <goods-select style="width:90% !important;" v-if="row.$cellEdit" v-model="row.priceCategoryNames"
                 @valueName="(value) => valueName(value, row)" :configuration="itemConfiguration">
               </goods-select>
-              <span v-else>{{ row.priceCategoryNames }}</span>
+              <span v-else>{{  row.priceCategoryNames  }}</span>
             </template>
             <template slot="itemType" slot-scope="{ row, index }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
@@ -158,7 +158,7 @@
                 <el-option v-for="(item, index) in itemTypeList" :key="index" :label="item" :value="item">
                 </el-option>
               </el-select>
-              <span v-else>{{ row.itemType }}</span>
+              <span v-else>{{  row.itemType  }}</span>
             </template>
             <template slot="orderQuantity" slot-scope="{ row }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
@@ -166,14 +166,14 @@
                 size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
-              <span v-else>{{ row.orderQuantity | roundNumbers }}</span>
+              <span v-else>{{  row.orderQuantity | roundNumbers  }}</span>
             </template>
             <template slot="price" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.price" placeholder="请输入" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
               <!--              @input="priceChange(row)"-->
-              <span v-else>{{ row.price }}</span>
+              <span v-else>{{  row.price  }}</span>
             </template>
             <template slot="invoiceWeight" slot-scope="{ row }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
@@ -181,7 +181,7 @@
                 size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
                 @change="totalChange(row.invoiceWeight)"></el-input>
-              <span v-else>{{ row.invoiceWeight }}</span>
+              <span v-else>{{  row.invoiceWeight  }}</span>
             </template>
             <template slot="billWeight" slot-scope="{ row }">
               <el-input style="width:90% !important;" v-if="row.$cellEdit" v-model="row.billWeight" placeholder="请输入"
@@ -189,19 +189,19 @@
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
                 @change="totalChange(row.billWeight)"></el-input>
               <!--              @input="billWeightChange(row)"-->
-              <span v-else>{{ row.billWeight }}</span>
+              <span v-else>{{  row.billWeight  }}</span>
             </template>
             <template slot="grossWeight" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.grossWeight" style="width: 90%" placeholder="请输入" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
-              <span v-else>{{ row.grossWeight }}</span>
+              <span v-else>{{  row.grossWeight  }}</span>
             </template>
             <template slot="amount" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.amount" placeholder="请输入" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
-              <span v-else>{{ row.amount }}</span>
+              <span v-else>{{  row.amount  }}</span>
             </template>
             <template slot="taxRate" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.taxRate" size="small"
@@ -209,15 +209,16 @@
                 autocomplete="off">
                 <i slot="suffix" style="margin-top:3px;margin-right: 10px;display:inline-block">%</i>
               </el-input>
-              <span v-else>{{ row.taxRate | isPercentage }}</span>
+              <span v-else>{{  row.taxRate | isPercentage  }}</span>
             </template>
             <template slot="actualQuantity" slot-scope="{ row }">
-              <span>{{ row.actualQuantity | roundNumbers }}</span>
+              <span>{{  row.actualQuantity | roundNumbers  }}</span>
             </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button type="text" size="small" icon="el-icon-edit"
-                :disabled="row.actualQuantity != 0 || viewDisabled" @click="rowCell(row, index)">{{ row.$cellEdit ?
-                    '修改完成' : '修改'
+                :disabled="row.actualQuantity != 0 || viewDisabled" @click="rowCell(row, index)">{{  row.$cellEdit ?
+                '修改完成' : '修改'
+
                 }}
               </el-button>
               <el-button type="text" icon="el-icon-delete" size="small"
@@ -228,8 +229,8 @@
               <el-button type="primary" icon="el-icon-plus" size="small" :disabled="viewDisabled"
                 :loading="buttonLoading" @click="commoditySelection">录入明细
               </el-button>
-              <el-button type="warning" size="small" :loading="buttonLoading"
-                :disabled="selectContact.length == 0" @click="beforePage()">生成收货单
+              <el-button type="warning" size="small" :loading="buttonLoading" :disabled="selectContact.length == 0"
+                @click="beforePage()">生成收货单
               </el-button>
               <el-button type="warning" size="small" :loading="buttonLoading" :disabled="viewDisabled"
                 @click="download">下载模板
@@ -243,9 +244,10 @@
           </avue-crud>
         </trade-card>
         <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="viewDisabled" :itemType="'申请'"
-           :optionType="'JK'" @beforeFinance="beforeFinance" @afterFinance="afterFinance"
-          @getBillNo="getBillNo" feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId"
-          :billNoList="billNoList" :delType="2" :financeDisabled="false"/>
+          :optionType="'JK'" @beforeFinance="beforeFinance" @afterFinance="afterFinance" @getBillNo="getBillNo"
+          feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId" :billNoList="billNoList"
+          :delType="2" :financeDisabled="false"
+          :isDecimal="$store.getters.userInfo.tenant_id == '269129' || $store.getters.userInfo.tenant_id == '888390'" />
         <upload-file ref="uploadFile" title="合同附件" :disabled="viewDisabled" :orderFilesList="orderFilesList"
           delUrl="" />
       </el-form>

src/views/salesManagement/salesContract/detailsPage.vue

@@ -69,7 +69,7 @@
         <trade-card title="基础信息">
           <el-row>
             <el-col v-for="(item, index) in basicData.column" :span="item.span ? item.span : 8" :key="index">
-              <el-form-item :label="item.label+':'" :prop="item.prop" :rules="item.rules">
+              <el-form-item :label="item.label + ':'" :prop="item.prop" :rules="item.rules">
                 <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]"
                   :disabled="viewDisabled || takeDisabled" size="small" type="date" placeholder="选择日期"
                   value-format="yyyy-MM-dd HH:mm:ss" />
@@ -118,9 +118,14 @@
             @resetColumn="resetColumn">
             <template slot-scope="{row}" slot="billNo">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
-              <el-input v-if="row.$cellEdit" v-model="row.billNo" style="width: 90%" placeholder=" " size="small"
-                @change="bingOut(row)"></el-input>
-              <span v-else>{{ row.billNo }}</span>
+              <!-- <el-input v-if="row.$cellEdit" v-model="row.billNo" style="width: 90%" placeholder=" " size="small"
+                @change="bingOut(row)"></el-input> -->
+              <el-select v-if="row.$cellEdit" v-model="row.billNo" placeholder=" " size="small" clearable filterable
+                @change="bingOut(row)">
+                <el-option v-for="(item, index) in listByBillNo" :key="index" :label="item.billNo" :value="item.billNo">
+                </el-option>
+              </el-select>
+              <span v-else>{{  row.billNo  }}</span>
             </template>
             <template slot-scope="{row}" slot="orgOrderNo">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
@@ -130,14 +135,14 @@
                   :value="item.orderNo">
                 </el-option>
               </el-select>
-              <span v-else>{{ row.orgOrderNo }}</span>
+              <span v-else>{{  row.orgOrderNo  }}</span>
             </template>
             <template slot="price" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.price" placeholder="请输入" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
               <!--              @input="priceChange(row)"-->
-              <span v-else>{{ row.price }}</span>
+              <span v-else>{{  row.price  }}</span>
             </template>
             <template slot="orderQuantity" slot-scope="{ row }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
@@ -145,14 +150,14 @@
                 size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
-              <span v-else>{{ row.orderQuantity | roundNumbers }}</span>
+              <span v-else>{{  row.orderQuantity | roundNumbers  }}</span>
             </template>
             <template slot="priceCategory" slot-scope="{row,index}">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
               <goods-select style="width:90% !important;" v-if="row.$cellEdit" v-model="row.priceCategoryNames"
                 @valueName="(value) => valueName(value, row)" :configuration="itemConfiguration">
               </goods-select>
-              <span v-else>{{ row.priceCategoryNames }}</span>
+              <span v-else>{{  row.priceCategoryNames  }}</span>
             </template>
             <template slot="invoiceWeight" slot-scope="{ row }">
               <span v-if="row.$cellEdit" class="required_fields">*</span>
@@ -160,26 +165,26 @@
                 size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
                 @change="totalChange(row.invoiceWeight)"></el-input>
-              <span v-else>{{ row.invoiceWeight }}</span>
+              <span v-else>{{  row.invoiceWeight  }}</span>
             </template>
             <template slot="billWeight" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.billWeight" placeholder="请输入" style="width: 90%" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
                 @change="totalChange(row.billWeight)"></el-input>
               <!--              @input="billWeightChange(row)"-->
-              <span v-else>{{ row.billWeight }}</span>
+              <span v-else>{{  row.billWeight  }}</span>
             </template>
             <template slot="grossWeight" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.grossWeight" style="width: 90%" placeholder="请输入" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
-              <span v-else>{{ row.grossWeight }}</span>
+              <span v-else>{{  row.grossWeight  }}</span>
             </template>
             <template slot="amount" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.amount" placeholder="请输入" size="small"
                 oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'>
               </el-input>
-              <span v-else>{{ row.amount }}</span>
+              <span v-else>{{  row.amount  }}</span>
             </template>
             <template slot="taxRate" slot-scope="{ row }">
               <el-input v-if="row.$cellEdit" v-model="row.taxRate" size="small"
@@ -187,10 +192,10 @@
                 autocomplete="off">
                 <i slot="suffix" style="margin-top:3px;margin-right: 10px;display:inline-block">%</i>
               </el-input>
-              <span v-else>{{ row.taxRate | isPercentage }}</span>
+              <span v-else>{{  row.taxRate | isPercentage  }}</span>
             </template>
             <template slot="actualQuantity" slot-scope="{ row }">
-              <span>{{ row.actualQuantity | roundNumbers }}</span>
+              <span>{{  row.actualQuantity | roundNumbers  }}</span>
             </template>
             <template slot="menuLeft" slot-scope="{ row }">
               <el-button type="primary" icon="el-icon-plus" size="small" :disabled="viewDisabled"
@@ -210,7 +215,7 @@
             </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button type="text" size="small" icon="el-icon-edit" :disabled="viewDisabled"
-                @click="rowCell(row, index)">{{ row.$cellEdit ? '修改完成' : '修改' }}
+                @click="rowCell(row, index)">{{  row.$cellEdit ? '修改完成' : '修改'  }}
               </el-button>
               <el-button type="text" size="small" icon="el-icon-delete" :disabled="viewDisabled"
                 @click="rowDelList(row, index)">删除
@@ -220,7 +225,8 @@
         </trade-card>
         <fee-info ref="feeInfo" @beforeFinance="beforeFinance" @afterFinance="afterFinance" :disabled="viewDisabled"
           :orderFeesList="orderFeesList" :itemType="'收费'" :optionType="'JK'" :financeDisabled="false"
-          feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId" :delType="2" />
+          feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId" :delType="2"
+          :isDecimal="$store.getters.userInfo.tenant_id == '269129' || $store.getters.userInfo.tenant_id == '888390'" />
         <upload-file ref="uploadFile" title="合同附件" :disabled="viewDisabled"
           :orderFilesList="orderFilesList || viewDisabled" delUrl="" />
       </el-form>
@@ -271,7 +277,8 @@ import {
   detailSaleList,
   submitData,
   goodsListRemove,
-  getOrgOrderNo
+  getOrgOrderNo,
+  getlistByBillNo
 } from "@/api/importTrade/salesContract"
 import feeInfo from "@/components/fee-info/main";
 import uploadFile from "@/components/upload-file/main";
@@ -577,6 +584,7 @@ export default {
       oldInventoryData: [],
       oldFeesList: [],
       oldFilesList: [],
+      listByBillNo: [],
     }
   },
   async created() {
@@ -623,6 +631,9 @@ export default {
       this.form.currency = "USD"
       this.currencyChange("USD")
     }
+    getlistByBillNo().then(res => {
+      this.listByBillNo = res.data.data
+    })
   },
   methods: {
     valueName(value, row) {