Merge branch 'master' of http://git.echepei.com/tire-platform/tire-platform-ui

src/views/allocationContract/detailsPageEdit.vue

@@ -241,7 +241,7 @@
               <span>{{ row.actualQuantity | IntegerFormat }}</span>
             </template>
             <template slot="orderQuantity" slot-scope="{ row }">
-              <span{{ row.orderQuantity | IntegerFormat }}</span>
+              <span>{{ row.orderQuantity | IntegerFormat }}</span>
             </template>
             <template slot="shopQuality" slot-scope="{ row }">
               <el-switch v-model="row.shopQuality" :disabled="!row.$cellEdit || shopQualityDisable" :active-value="1"
@@ -282,7 +282,6 @@ import {
   detail,
   getlistBankBy,
   getProfit,
-  repealCancel,
     calculateInterestAmount
 } from "@/api/basicData/configuration"
 import { getCorpDetail } from "@/api/maintenance/overpayment"
@@ -1346,6 +1345,7 @@ export default {
           item.storageId = item.storageId + '-' + item.corpId
         }
         this.goodsShowData = this.giftData;
+          this.saveActives = 'gift'
         this.goodsActives = 'goods';
         this.handleClick({ name: this.goodsActives })
         this.advantageProjectData = this.form.orderFeesList
@@ -1374,32 +1374,9 @@ export default {
         delete this.form.orderItemsList
         delete this.form.orderFeesList
         delete this.form.orderFilesList
-        delete this.form.createFreightUser
-        delete this.form.createPurchaseUser
-        delete this.form.createPurchaseTime
-        delete this.form.createFreightTime
-        delete this.form.createFreight
-        delete this.form.createPurchase
-        delete this.form.specialCheckTime
-        delete this.form.specialCheckUser
-        if (this.detailData.copyId) {
-          delete this.form.specialCheckStatus
-        }
-        delete this.form.specialCheck
-        // delete this.form.corpName
-        delete this.form.belongToCorpList
         // 获取最大值
-        let num = []
-        this.advantageProjectData.forEach(item => {
-          num.push(item.sort)
-        })
-        if (num.length == 0) {
-          this.maxFeeNum = 0;
-        } else {
-          this.maxFeeNum = num.reduce((a, b) => {
-            return b > a ? b : a;
-          })
-        }
+        let numList = this.advantageProjectData.map(item => item.sort)
+          this.maxFeeNum = numList.length === 0 ? 0 : Math.max.apply(null, numList);
         let goodsNum = []
         let purchaseAmount = 0
         this.contactsData.forEach(item => {
@@ -1711,6 +1688,8 @@ export default {
 
     // 商品信息标签页切换
     handleClick(data) {
+        console.info('datata---', data);
+        console.info('this.saveActives---', this.saveActives);
       if (this.saveActives == data.name) return
       this.saveActives = data.name
       this.goodsDisabled = true
@@ -1779,31 +1758,6 @@ export default {
       params.parentId = this.form.id
       params.srcOrderno = this.form.orderNo
       callback(params)
-    },
-
-    repealCancel() {
-      this.$confirm("您确定撤回此次申请吗？", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        const data = {
-          id: this.form.id,
-          checkType: 'xsqh',
-          pageLabel: "销售订单(N)",
-          checkFlag: 2,
-        }
-        this.pageLoading = true
-        this.saveLoading = true
-        repealCancel(data).then(res => {
-          this.$message.success('撤回成功')
-          this.saveActives = ''
-          this.queryData(this.form.id)
-        }).finally(() => {
-          this.pageLoading = false
-          this.saveLoading = false
-        })
-      })
     }
   },
   computed: {