修改bug

src/components/fee-info/main.vue

@@ -199,7 +199,6 @@ export default {
       data_one: [],
       data_two: [],
       selectTab: 1,
-      activeName: "first",
       enableName: "first",
       tab1: true,
       tab2: false,
@@ -247,7 +246,11 @@ export default {
     tabShow: {
       type: Number,
       default: 1
-    }
+    },
+    activeName: {
+      type: String,
+      default: 'first'
+    },
   },
   filters: {
     isPercentage(val) {

src/components/warehousKH/main.vue

@@ -1,7 +1,7 @@
 <template>
     <div style="display: flex;">
-        <el-select v-model="value" placeholder="请选择" filterable clearable @input="$emit('balabala', value)"
-            @change="getKeyId(value)" :disabled="disabled">
+        <el-select v-model="value" placeholder="请选择" filterable clearable allow-create default-first-option
+            @input="$emit('balabala', value)" @change="getKeyId(value)" :disabled="disabled">
             <template v-if="zhKey">
                 <el-option v-for="item in corpList" :key="item.id" :label="item.cname" :value="item.cname">
                 </el-option>
@@ -54,11 +54,12 @@ export default {
         getKeyId(row) {
             if (this.zhKey) {
                 if (row) {
-                    this.corpList.forEach(e => {
-                        if (row == e.cname) {
-                            this.$emit('getCropId', e.id)
-                        }
-                    })
+                    let res = this.corpList.find(e => { return e.cname == row })
+                    if (res) {
+                        this.$emit('getCropId', res.id)
+                    } else {
+                        this.$emit('getCropId', null)
+                    }
                 } else {
                     this.$emit('getCropId', null)
                 }

src/views/importTrade/invoice/config/customerContact.json

@@ -26,11 +26,12 @@
     {
       "name": "actualQuantity",
       "type": "sum",
-      "decimals": 0
+      "decimals": 6
     },
     {
       "name": "contractAmount",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "billWeight",
@@ -44,7 +45,8 @@
     },
     {
       "name": "inventoryNumber",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "inWeight",

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -185,7 +185,7 @@
                 v-model="row.price"
                 placeholder="请输入"
                 size="small"
-                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
+                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
                 @input="priceChange(row)"
               ></el-input>
               <span v-else>{{ row.price }}</span>
@@ -198,7 +198,7 @@
                 style="width: 90%"
                 placeholder="请输入"
                 size="small"
-                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
+                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
               ></el-input>
               <span v-else>{{ row.actualQuantity | roundNumbers}}</span>
             </template>
@@ -208,7 +208,7 @@
                 v-model="row.contractAmount"
                 placeholder="请输入"
                 size="small"
-                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
+                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
               ></el-input>
               <span v-else>{{ row.contractAmount }}</span>
             </template>

src/views/importTrade/receipt/config/customerContact.json

@@ -30,7 +30,8 @@
     },
     {
       "name": "contractAmount",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "billWeight",

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -197,7 +197,7 @@
                 v-model="row.price"
                 placeholder="请输入"
                 size="small"
-                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
+                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
                 @input="priceChange(row)"
               ></el-input>
               <span v-else>{{ row.price }}</span>
@@ -210,7 +210,7 @@
                 v-model="row.actualQuantity"
                 placeholder="请输入"
                 size="small"
-                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
+                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
               ></el-input>
               <span v-else>{{ row.actualQuantity | roundNumbers}}</span>
             </template>
@@ -220,7 +220,7 @@
                 v-model="row.contractAmount"
                 placeholder="请输入"
                 size="small"
-                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
+                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
               ></el-input>
               <span v-else>{{ row.contractAmount }}</span>
             </template>
@@ -530,6 +530,7 @@ export default {
       this.skip = true
       this.buttonLoading = true;
       detailListData(this.detailData.params.id).then(res =>{
+        console.log(this.detailData.params,res)
         const orderNoList = [];  //合同号数据
         this.detailData.params.orderItemIds.forEach((e,i) =>{
           const item =   res.data.data.itemsVOList[e];
@@ -551,7 +552,7 @@ export default {
           //   IQ : _.divide(item.invoiceWeight, item.orderQuantity)
           // }
           delete item.id
-          item.cntrLiang = 2
+          item.cntrLiang = item.cntrNum
           //如果箱量大于1  则根据箱量生成几条收货单明细  并均分发票重量
           if(item.cntrLiang > 1){
             let receiptInvoiceWeight =  item.invoiceWeight/item.cntrLiang;
@@ -560,8 +561,10 @@ export default {
               this.$refs.crudContact.rowCellAdd(item);
             }
           }else{
+            console.log(item)
             this.$refs.crudContact.rowCellAdd(item);
           }
+          
           this.$refs.crudContact.rowCell(item,this.contactsData.length - 1)
         })
         this.$set(this.form,'orderNo', Array.from(new Set(orderNoList)).join(","))  // 数组去重逗号隔开 那合同总

src/views/purchase/contract/config/customerContact.json

@@ -3,15 +3,15 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "addBtn":false,
-  "editBtn":false,
-  "addRowBtn":false,
-  "cellBtn":false,
-  "cancelBtn":false,
+  "addBtn": false,
+  "editBtn": false,
+  "addRowBtn": false,
+  "cellBtn": false,
+  "cancelBtn": false,
   "refreshBtn": false,
   "searchMenuSpan": 6,
   "align": "center",
-  "delBtn":false,
+  "delBtn": false,
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
@@ -25,11 +25,13 @@
   "sumColumnList": [
     {
       "name": "orderQuantity",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "amount",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "billWeight",
@@ -43,20 +45,26 @@
     },
     {
       "name": "actualQuantity",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "actualWeight",
       "type": "sum",
       "decimals": 6
+    },
+    {
+      "name": "grossWeight",
+      "type": "sum",
+      "decimals": 6
     }
   ],
-  "column":[
+  "column": [
     {
       "label": "提单号",
       "prop": "billNo",
       "index": 1,
-      "width":180,
+      "width": 180,
       "overHidden": true,
       "cell": true,
       "rules": [
@@ -66,12 +74,13 @@
           "trigger": "blur"
         }
       ]
-    },{
+    },
+    {
       "label": "货物品种",
       "prop": "priceCategory",
       "overHidden": true,
       "index": 2,
-      "width":200,
+      "width": 200,
       "rules": [
         {
           "required": true,
@@ -79,12 +88,13 @@
           "trigger": "blur"
         }
       ]
-    },{
+    },
+    {
       "label": "规格型号",
       "prop": "itemType",
       "overHidden": true,
       "index": 3,
-      "width":150
+      "width": 150
     },
     {
       "label": "箱号",
@@ -92,7 +102,7 @@
       "overHidden": true,
       "cell": true,
       "index": 4,
-      "width":130,
+      "width": 130,
       "rules": [
         {
           "required": false,
@@ -109,7 +119,7 @@
       "value": 1,
       "cell": true,
       "index": 5,
-      "width":120,
+      "width": 120,
       "rules": [
         {
           "required": true,
@@ -125,21 +135,21 @@
       "overHidden": true,
       "cell": true,
       "index": 6,
-      "width":120
+      "width": 120
     },
     {
       "label": "件数",
       "prop": "orderQuantity",
       "overHidden": true,
       "index": 7,
-      "width":120
+      "width": 120
     },
     {
       "label": "发票重量(吨)",
       "prop": "invoiceWeight",
       "overHidden": true,
       "index": 8,
-      "width":120,
+      "width": 120,
       "rules": [
         {
           "required": false,
@@ -153,21 +163,28 @@
       "prop": "billWeight",
       "overHidden": true,
       "index": 9,
-      "width":120
+      "width": 120
+    },
+    {
+      "label": "毛重(吨)",
+      "prop": "grossWeight",
+      "overHidden": true,
+      "index": 10,
+      "width": 120
     },
     {
       "label": "单价",
       "prop": "price",
       "overHidden": true,
-      "index": 10,
-      "width":120
+      "index": 11,
+      "width": 120
     },
     {
       "label": "发票金额",
       "prop": "amount",
       "overHidden": true,
-      "index": 11,
-      "width":120,
+      "index": 12,
+      "width": 120,
       "rules": [
         {
           "required": false,
@@ -180,8 +197,8 @@
       "label": "已收件数",
       "prop": "actualQuantity",
       "overHidden": true,
-      "index": 12,
-      "width":100,
+      "index": 13,
+      "width": 100,
       "rules": [
         {
           "required": false,
@@ -194,8 +211,8 @@
       "label": "已收发票重量(吨)",
       "prop": "actualWeight",
       "overHidden": true,
-      "index": 13,
-      "width":120,
+      "index": 14,
+      "width": 120,
       "rules": [
         {
           "required": false,
@@ -208,8 +225,8 @@
       "label": "税率",
       "prop": "taxRate",
       "overHidden": true,
-      "index": 14,
-      "width":120,
+      "index": 15,
+      "width": 120,
       "rules": [
         {
           "required": false,
@@ -222,8 +239,8 @@
       "label": "备注",
       "prop": "remarks",
       "overHidden": true,
-      "index": 15,
-      "width":200,
+      "index": 16,
+      "width": 200,
       "cell": true,
       "rules": [
         {
@@ -237,8 +254,8 @@
       "label": "创建人",
       "prop": "createUserName",
       "overHidden": true,
-      "index": 16,
-      "width":100
+      "index": 17,
+      "width": 100
     },
     {
       "label": "创建日期",
@@ -246,15 +263,15 @@
       "type": "date",
       "format": "yyyy-MM-dd HH:mm:ss",
       "overHidden": true,
-      "index": 17,
-      "width":160
+      "index": 18,
+      "width": 160
     },
     {
       "label": "修改人",
       "prop": "updateUserName",
       "overHidden": true,
-      "index": 18,
-      "width":100
+      "index": 19,
+      "width": 100
     },
     {
       "label": "修改日期",
@@ -262,8 +279,8 @@
       "type": "date",
       "format": "yyyy-MM-dd HH:mm:ss",
       "overHidden": true,
-      "index": 19,
-      "width":160
+      "index": 20,
+      "width": 160
     }
   ]
-}
+}

src/views/purchase/stockBill/config/mainList.json

@@ -28,11 +28,13 @@
   "sumColumnList": [
     {
       "name": "surplusRouteQuantity",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "inQuantity",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "inWeight",
@@ -41,7 +43,8 @@
     },
     {
       "name": "outQuantity",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "outWeight",
@@ -50,7 +53,8 @@
     },
     {
       "name": "balanceQuantity",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "balanceWeight",

src/views/saleLeads/detail.vue

@@ -32,16 +32,15 @@
       </div>
     </div>
     <div class="customer-main">
-      <containerTitle title="基础信息" />
-      <basic-container :showBtn="true">
+      <trade-card title="基础信息">
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
           <template slot-scope="{}" slot="corpNameLabel">
             <span style="color: #409EFF;cursor: pointer" @click.stop="khEdit">客户名称:</span>
           </template>
-          <!-- <template slot-scope="{row,index}" slot="corpName">
+          <template slot-scope="{row,index}" slot="corpName">
             <warehous-Kh v-model="form.corpName" :zhKey="true" :disabled="disabled || approvalStatus"
               @getCropId="getCropId"></warehous-Kh>
-          </template> -->
+          </template>
           <template slot="fromUser">
             <el-select v-model="form.fromUser" filterable clearable size="small" :disabled="disabled || approvalStatus">
               <el-option v-for="(item, index) in userList" :key="index" :label="item.realName" :value="item.id">
@@ -55,9 +54,8 @@
             </el-select>
           </template>
         </avue-form>
-      </basic-container>
-      <containerTitle title="沟通记录" />
-      <basic-container>
+      </trade-card>
+      <trade-card title="沟通记录">
         <avue-crud ref="crud" :data="dataList" :option="tableOption" :cell-style="cellStyle" @saveColumn="saveColumn"
           @resetColumn="resetColumn">
           <template slot="menuLeft">
@@ -105,7 +103,7 @@
             </el-switch>
           </template>
         </avue-crud>
-      </basic-container>
+      </trade-card>
       <el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"
         :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
         <check :checkData="checkData" :checkDetail="false" :idList="[]" @choceCheckFun="choceCheckFun">

src/views/saleLeads/index.vue

@@ -13,15 +13,12 @@
         </template>
         <template slot-scope="scope" slot="menu">
           <el-button type="text" icon="el-icon-delete" size="small" @click.stop="rowDel(scope.row, scope.index)"
-            :disabled="scope.row.status == 3">删除
+            :disabled="scope.row.status == 1">删除
           </el-button>
         </template>
-        <!--        <template slot="corpNameSearch">-->
-        <!--          <crop-select-->
-        <!--            v-model="search.corpId"-->
-        <!--            corpType="KH"-->
-        <!--          ></crop-select>-->
-        <!--        </template>-->
+        <template slot="corpNameSearch">
+          <crop-select v-model="search.corpId" corpType="KH"></crop-select>
+        </template>
         <template slot="fromUserNameSearch">
           <el-select v-model="search.fromUser" filterable clearable placeholder="请选择 承揽人">
             <el-option v-for="(item, index) in contractorOption" :key="index" :value="item.id" :label="item.realName">

src/views/salesManagement/salesContract/config/importInventory.json

@@ -25,7 +25,8 @@
   "sumColumnList": [
     {
       "name": "orderQuantity",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "amount",
@@ -44,12 +45,18 @@
     },
     {
       "name": "actualQuantity",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "actualWeight",
       "type": "sum",
       "decimals": 6
+    },
+    {
+      "name": "grossWeight",
+      "type": "sum",
+      "decimals": 6
     }
   ],
   "column":[
@@ -144,10 +151,17 @@
       ]
     },
     {
+      "label": "毛重(吨)",
+      "prop": "grossWeight",
+      "overHidden": true,
+      "index": 8,
+      "width":120
+    },
+    {
       "label": "单价",
       "prop": "price",
       "overHidden": true,
-      "index": 8,
+      "index": 9,
       "width":120,
       "rules": [
         {
@@ -160,7 +174,7 @@
       "label": "销售金额",
       "prop": "amount",
       "overHidden": true,
-      "index": 9,
+      "index": 10,
       "width":120,
       "rules": [
         {
@@ -174,21 +188,21 @@
       "label": "已发件数",
       "prop": "actualQuantity",
       "overHidden": true,
-      "index": 10,
+      "index": 11,
       "width":120
     },
     {
       "label": "已发发票重量(吨)",
       "prop": "actualWeight",
       "overHidden": true,
-      "index": 11,
+      "index": 12,
       "width":120
     },
     {
       "label": "税率",
       "prop": "taxRate",
       "overHidden": true,
-      "index": 12,
+      "index": 13,
       "width":120,
       "cell": true,
       "rules": [
@@ -203,7 +217,7 @@
       "label": "备注",
       "prop": "remarks",
       "overHidden": true,
-      "index": 13,
+      "index": 14,
       "width":200,
       "cell": true,
       "rules": [
@@ -218,7 +232,7 @@
       "label": "创建人",
       "prop": "createUserName",
       "overHidden": true,
-      "index": 14,
+      "index": 15,
       "width":100
     },
     {
@@ -227,14 +241,14 @@
       "type": "date",
       "format": "yyyy-MM-dd HH:mm:ss",
       "overHidden": true,
-      "index": 15,
+      "index": 16,
       "width":160
     },
     {
       "label": "修改人",
       "prop": "updateUserName",
       "overHidden": true,
-      "index": 16,
+      "index": 17,
       "width":100
     },
     {
@@ -243,7 +257,7 @@
       "type": "date",
       "format": "yyyy-MM-dd HH:mm:ss",
       "overHidden": true,
-      "index": 17,
+      "index": 18,
       "width":160
     }
   ]