保留小数、整数

src/components/fee-info/main.vue

@@ -126,7 +126,7 @@
             oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
             @input="countChange(row)"
           ></el-input>
-          <span v-else>{{ row.quantity }}</span>
+          <span v-else>{{ row.quantity | IntegerFormat }}</span>
         </template>
         <template slot="amount" slot-scope="{ row }">
           <span>{{ row.amount | micrometerFormat }}</span>
@@ -245,7 +245,7 @@ import feeOption from "./config/feeInfo.json";
 import option from "./config/feeList.json";
 import { getDeptLazyTree, customerList } from "@/api/basicData/basicFeesDesc";
 import { delItem } from "@/api/feeInfo/fee-info";
-import { isPercentage, micrometerFormat } from "@/util/validate";
+import { isPercentage, micrometerFormat, IntegerFormat } from "@/util/validate";
 import cropDialog from "@/components/crop-dialog/main";
 import _ from "lodash";
 import ApplyPayment from "../finance/applyPayment";
@@ -364,7 +364,13 @@ export default {
     },
     micrometerFormat(val) {
       return micrometerFormat(val);
-    }
+    },
+    decimalFormat(num) {
+      return num ? Number(num).toFixed(2) : "0.00";
+    },
+    IntegerFormat(num) {
+      return IntegerFormat(num);
+    },
   },
   async created() {
     this.feeOption = await this.getColumnData(

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -792,7 +792,10 @@ export default {
   filters: {
     IntegerFormat(num) {
       return IntegerFormat(num);
-    }
+    },
+    decimalFormat(num) {
+      return num ? Number(num).toFixed(2) : "0.00";
+    },
   },
   //初始化查询
   async created() {
@@ -1049,6 +1052,17 @@ export default {
           this.contactsData.forEach(item => {
             delete item.id
             delete item.pid
+            delete item.itemId
+          })
+          this.goodsShowData.forEach(item => {
+            delete item.id
+            delete item.pid
+            delete item.itemId
+          })
+          this.giftData.forEach(item => {
+            delete item.id
+            delete item.pid
+            delete item.itemId
           })
           this.advantageProjectData.forEach(item => {
             delete item.id

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -176,6 +176,15 @@
               ></el-input>
               <span v-else>{{ row.price }}</span>
             </template>
+            <template slot="amount" slot-scope="{ row }">
+              <span>{{ row.amount | decimalFormat }}</span>
+            </template>
+            <template slot="actualQuantity" slot-scope="{ row }">
+              <span>{{ row.actualQuantity | IntegerFormat }}</span>
+            </template>
+            <template slot="storageQuantity" slot-scope="{ row }">
+              <span>{{ row.storageQuantity | IntegerFormat }}</span>
+            </template>
 <!--            <template slot="storageQuantity" slot-scope="{ row }">-->
 <!--              <el-input-->
 <!--                v-if="row.$cellEdit"-->
@@ -826,7 +835,10 @@ export default {
   filters: {
     IntegerFormat(num) {
       return IntegerFormat(num);
-    }
+    },
+    decimalFormat(num) {
+      return num ? Number(num).toFixed(2) : "0.00";
+    },
   },
   //初始化查询
   async created() {
@@ -948,6 +960,7 @@ export default {
           this.contactsData.forEach(item => {
             delete item.id
             delete item.pid
+            delete item.itemId
           })
           this.advantageProjectData.forEach(item => {
             delete item.id

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -151,6 +151,9 @@
               ></el-input>
               <span v-else>{{ row.actualQuantity | IntegerFormat }}</span>
             </template>
+            <template slot="purchaseQuantity" slot-scope="{ row }">
+              <span>{{ row.purchaseQuantity | IntegerFormat }}</span>
+            </template>
             <template slot="menuLeft" slot-scope="{size}">
               <el-button type="primary"
                          icon="el-icon-plus"
@@ -634,6 +637,9 @@ export default {
   filters: {
     IntegerFormat(num) {
       return IntegerFormat(num);
+    },
+    decimalFormat(num) {
+      return num ? Number(num).toFixed(2) : "0.00";
     }
   },
   //初始化查询
@@ -794,6 +800,7 @@ export default {
           this.contactsData.forEach(item => {
             delete item.id
             delete item.pid
+            delete item.itemId
           })
           this.advantageProjectData.forEach(item => {
             delete item.id

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -312,6 +312,12 @@
               </el-select>
               <span v-else>{{ row.price }}</span>
             </template>
+            <template slot="amount" slot-scope="{ row }">
+              <span>{{ row.amount | decimalFormat }}</span>
+            </template>
+            <template slot="actualQuantity" slot-scope="{ row }">
+              <span>{{ row.actualQuantity | IntegerFormat }}</span>
+            </template>
             <template slot="orderQuantity" slot-scope="{ row }">
               <el-input
                 v-if="row.$cellEdit"
@@ -1548,6 +1554,9 @@ export default {
   filters: {
     IntegerFormat(num) {
       return IntegerFormat(num);
+    },
+    decimalFormat(num) {
+      return num ? Number(num).toFixed(2) : "0.00";
     }
   },
   //初始化查询
@@ -1710,11 +1719,20 @@ export default {
           this.contactsData.forEach(item => {
             delete item.id
             delete item.pid
+            delete item.itemId
           })
-          this.advantageProjectData.forEach(item => {
+          this.goodsShowData.forEach(item => {
             delete item.id
             delete item.pid
+            delete item.itemId
           })
+          this.giftData.forEach(item => {
+            delete item.id
+            delete item.pid
+            delete item.itemId
+          })
+          this.advantageProjectData = []
+          this.bankOfDepositData = []
           this.bankOfDepositData.forEach(item => {
             delete item.id
             delete item.pid
@@ -3008,13 +3026,20 @@ export default {
       }
     },
     returnBack(row) {
-      const queryParams = {
-        corpType: 'KH',
-        belongtocompany: row.id
-      }
-      getKHList(queryParams).then(res => {
+      getKHList({corpType: 'KH', belongtocompany: row.id}).then(res => {
         this.form.corpId = res.data.data.records.length > 0? res.data.data.records[0].id: null
-        this.getCorpRow({adminProfiles: res.data.data.records[0].adminProfiles, id: res.data.data.records[0].id})
+        if (this.form.corpId) {
+          this.getCorpRow({adminProfiles: res.data.data.records[0].adminProfiles,
+            id: res.data.data.records[0].id,
+            packageRemarks: res.data.data.records[0].packageRemarks,
+            paymentType: res.data.data.records[0].paymentType})
+        }
+      })
+      getKHList({corpType: 'GYS', belongtocompany: row.id}).then(res => {
+        this.form.productionPlant = res.data.data.records.length > 0? res.data.data.records[0].id: null;
+        if (this.form.productionPlant) {
+          this.getPlantRow({id: this.form.productionPlant})
+        }
       })
       this.form.belongCompany = row.cname
       getlistBankBy(row.id).then(res =>{

src/views/wel/components/quick-launch.vue

@@ -73,11 +73,13 @@
         </div>
         <div class="content-icon" @click="inPage('fh')">
           <i class="tradingIcon icon-ship" style="color:#143056"></i>
-          <span>发货</span>
+          <span v-if="sysType == 4">发货</span>
+          <span v-if="sysType == 2">客户确认</span>
         </div>
         <div class="content-icon" @click="inPage('sh')">
           <i class="tradingIcon icon-receipt" style="color:#921939"></i>
-          <span>收货</span>
+          <span v-if="sysType == 4">收货</span>
+          <span v-if="sysType == 2">采购确认</span>
         </div>
         <div class="content-icon" @click="inPage('sqfk')">
           <i class="tradingIcon icon-apply" style="color:#BE3216"></i>