bug 优化

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

@@ -34,13 +34,6 @@
       "overHidden": true
     },
     {
-      "label": "英文名称",
-      "prop": "ename",
-      "index": 3,
-      "width": 220,
-      "overHidden": true
-    },
-    {
       "label": "单价",
       "prop": "price",
       "index": 4,

src/components/fee-info/main.vue

@@ -76,8 +76,7 @@
           <span v-else>{{ row.corpName }}</span>
         </template>
         <template slot="feeName" slot-scope="{ row, index }">
-          <span style="display:flex" v-if="row.$cellEdit">
-          <span  style="display: flex;align-items: center;width:12px">*</span>
+          <span v-if="row.$cellEdit" class="required_fields">*</span>
           <breakdown-select
             v-if="row.$cellEdit"
             v-model="row.itemId"
@@ -85,18 +84,16 @@
             :configuration="breakConfiguration"
           >
           </breakdown-select>
-          </span>
           <span v-else>{{ row.feeName }}</span>
         </template>
         <template slot="price" slot-scope="{ row }">
-          <el-input-number
+          <el-input
             v-if="row.$cellEdit"
-            :controls="false"
             v-model="row.price"
             placeholder="请输入"
             size="small"
             @input="countChange(row)"
-          ></el-input-number>
+          ></el-input>
           <span v-else>{{ row.price | micrometerFormat }}</span>
         </template>
         <template slot="quantity" slot-scope="{ row }">

src/components/finance/config/option.json

@@ -48,20 +48,6 @@
       ]
     },
     {
-      "label": "所属公司",
-      "prop": "belongToCorpId",
-      "overHidden": true,
-      "index": 4,
-      "width": 180,
-      "rules": [
-        {
-          "required": true,
-          "message": " ",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
       "label": "费用名称",
       "prop": "costType",
       "overHidden": true,

src/components/finance/financialAccount.vue

@@ -45,14 +45,6 @@
             style="width: 100%"
           ></crop-select>
         </template>
-        <template slot-scope="{row,index}" slot="belongToCorpId">
-          <crop-select
-            v-if="row.$cellEdit"
-            v-model="row.belongToCorpId"
-            corpType="GS"
-            style="width: 100%"
-          ></crop-select>
-        </template>
         <template slot-scope="{row,index}" slot="costType">
           <span v-if="row.$cellEdit" class="required_fields">*</span>
           <breakdown-select

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -243,19 +243,6 @@
               ]
             },
             {
-              label: '所属公司',
-              prop: 'salesCompany',
-              sort:true,
-              span: 8,
-              rules: [
-                {
-                  required: true,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
-            },
-            {
               label: '银行账号',
               prop: 'accountNo',
               span: 8,
@@ -347,6 +334,19 @@
               ]
             },
             {
+              label: '所属公司',
+              prop: 'salesCompany',
+              sort:true,
+              span: 8,
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
               label: '付款日期',
               prop: 'settlementDate',
               format:"yyyy-MM-dd",

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -247,19 +247,6 @@
               ]
             },
             {
-              label: '所属公司',
-              prop: 'salesCompany',
-              sort:true,
-              span: 8,
-              rules: [
-                {
-                  required: true,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
-            },
-            {
               label: '银行账号',
               prop: 'accountNo',
               span: 8,
@@ -352,6 +339,19 @@
               ]
             },
             {
+              label: '所属公司',
+              prop: 'salesCompany',
+              sort:true,
+              span: 8,
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
               label: '收款日期',
               prop: 'time',
               span: 8,

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

@@ -40,6 +40,15 @@
       "name": "invoiceWeight",
       "type": "sum",
       "decimals": 6
+    },
+    {
+      "name": "inventoryNumber",
+      "type": "sum"
+    },
+    {
+      "name": "inWeight",
+      "type": "sum",
+      "decimals": 6
     }
   ],
   "column":[

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

@@ -24,13 +24,11 @@
   "sumColumnList": [
     {
       "name": "orderQuantity",
-      "type": "sum",
-      "decimals": 0
+      "type": "sum"
     },
     {
       "name": "amount",
-      "type": "sum",
-      "decimals": 6
+      "type": "sum"
     },
     {
       "name": "billWeight",
@@ -41,6 +39,15 @@
       "name": "invoiceWeight",
       "type": "sum",
       "decimals": 6
+    },
+    {
+      "name": "actualQuantity",
+      "type": "sum"
+    },
+    {
+      "name": "actualWeight",
+      "type": "sum",
+      "decimals": 6
     }
   ],
   "column":[

src/views/purchase/contract/detailsPage.vue

@@ -387,6 +387,7 @@
         :billType="billType"
         :billData="billData"
         :checkData="checkData"
+        :belongCompany="form.belongToCorpId"
         @choceFun="choceFun"
       >
       </financial-account>

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

@@ -40,6 +40,15 @@
       "name": "invoiceWeight",
       "type": "sum",
       "decimals": 6
+    },
+    {
+      "name": "actualQuantity",
+      "type": "sum"
+    },
+    {
+      "name": "actualWeight",
+      "type": "sum",
+      "decimals": 6
     }
   ],
   "column":[

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

@@ -39,11 +39,13 @@
     },
     {
       "name": "billWeight",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "invoiceWeight",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "actualQuantity",
@@ -51,7 +53,8 @@
     },
     {
       "name": "actualWeight",
-      "type": "sum"
+      "type": "sum",
+      "decimals": 6
     },
     {
       "name": "invoiceAmount",

src/views/salesManagement/salesContract/detailsPage.vue

@@ -394,6 +394,7 @@
         :billId="form.id"
         :billType="billType"
         :billData="billData"
+        :belongCompany="form.belongToCorpId"
         @choceFun="choceFun"
       >
       </financial-account>

src/views/workManagement/main-items/detailsPage.vue

@@ -430,6 +430,7 @@
   import optionReturn from "../receipt/configuration/settleAccountsDetailsReturn.json";
   import { getDeptTree } from "@/api/system/dept";
   import messagePost from "@/components/messageSend/main"
+  import clientOption from "../performanceAnalysis/config/clientList.json";
 
 
   export default {
@@ -843,7 +844,7 @@
     },
     methods: {
       //明细切换tab
-      handleClick(tab) {
+      async handleClick(tab) {
         if(tab.name == "first") {
           this.tab1 = true;
           this.tab2 = false;
@@ -856,7 +857,7 @@
           }
 
           this.secondDisable = 0
-          this.optionTable = option  //换option
+          await  this.switchTab("first")
           this.data = this.data_one  //切换数据
         } else if(tab.name == "second") {
 
@@ -870,9 +871,8 @@
           if(this.secondDisable === 2){
             this.data_three = this.data
           }
-
           this.secondDisable = 1
-          this.optionTable = optionAdd
+          await  this.switchTab("second")
           this.data = this.data_two
         }else if(tab.name == "three") {
           this.tab1 = false;
@@ -886,10 +886,19 @@
           }
 
           this.secondDisable = 2
-          this.optionTable = optionReturn
+          await  this.switchTab("three")
           this.data = this.data_three
         }
       },
+      switchTab(val){  //换option
+        if(val === 'first'){
+          this.optionTable = option
+        }else if(val === 'second'){
+          this.optionTable = optionAdd
+        }else if(val === 'three'){
+          this.optionTable = optionReturn
+        }
+      },
       //责任人 远程
       corpAttnRemoteMethod(val){
         getUserList({realName : val}).then(res=>{

src/views/workManagement/performanceAnalysis/index.vue

@@ -202,9 +202,7 @@
         if(!params.flag){
           params.flag = "1"
         }
-        if(!params.year){
-          params.year = "2022"
-        }else{
+        if(params.year && params.year !== '2022'){
           params.year = params.year.getFullYear()
         }
         return params