Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/utils/dict.js

@@ -180,6 +180,7 @@ export const DICT_TYPE = {
   NEED_KNOW_STATUS:'need_know_status',//需知状态
   MANUAL_EXCEPTION_TYPE:'manual_exception_type',
   APPLY_STATUS:'apply_status',//特价申请审核状态
+  WAREHOUSING_SPECIFICATION_TYPE: 'warehousing_specification_type',
 
   ECASH_INIT:'ecash_init', //e-cash
   FEE_TYPE:'receivable_fee_type',

src/views/ecw/financial/creatPayment.vue

@@ -197,8 +197,8 @@
         </el-table-column>
         <el-table-column :label="$t('价税合计(RMB)')" align="center" prop="total" >
           <template slot-scope="scope">
-           <!-- <span>{{ scope.row.total = ((scope.row.totalAmount * scope.row.exchangeRate) + (scope.row.totalAmount * scope.row.exchangeRate) * (scope.row.taxRate/100)).toFixed(6) }}</span> -->
-           <span>{{scope.row.total}}</span>
+           <span>{{ scope.row.total = ((scope.row.totalAmount * scope.row.exchangeRate) + (scope.row.totalAmount * scope.row.exchangeRate) * (scope.row.taxRate/100)).toFixed(6) }}</span>
+           <!-- <span>{{scope.row.total}}</span> -->
           </template>
         </el-table-column>
       </el-table>
@@ -216,7 +216,6 @@
               label=""
               label-width="0"
               style="margin-bottom: 0"
-              :error="$t('账单号不能为空')"
               prop="accountNumber"
               :rules="[
                 { required: true, message: '账单号不能为空', trigger: 'blur' },

src/views/ecw/financial/receiptDetail.vue

@@ -514,14 +514,15 @@ export default {
     },
     WriteOffProportion(){
         let total = 0
-        let amountTotal = 0
+        let amountTotal = this.form.receiptAccountList.find(item=>item.type=='total').writeOffAmount
+
         this.detailed.forEach(item => {
-          if(item.status){
-            amountTotal = NP.plus(amountTotal, item.writeOffAmount)
-          }
+          // if(item.status){
+          //   amountTotal = NP.plus(amountTotal, item.writeOffAmount)
+          // }
            total = NP.plus(total, item.writeOffAmount)
         })
-      let portion = NP.divide(amountTotal,total)
+      let portion = NP.divide(total,amountTotal)
       return (portion*100).toFixed(2)
     }
   },
@@ -896,7 +897,7 @@ export default {
           }
       })
           console.log('collom',collom)
-      if(recepted.length>collom.length){
+      // if(recepted.length>collom.length){
         recepted.forEach((amount,currency)=>{
           if(amount){
             if(collom[currency]){
@@ -907,17 +908,20 @@ export default {
           }
 
         })
-      }else{
+      // }else{
         collom.forEach((amount,currency)=>{
           if(amount){
+            if(!this.surplusData[currency]){
               if(recepted[currency]){
                if((amount-recepted[currency])!=0)  this.surplusData[currency] = +parseFloat((amount-recepted[currency]).toPrecision(12))
               }else{
               this.surplusData[currency] = amount
             }
+
             }
-        })
           }
+        })
+      // }
       console.log(this.surplusData)
       this.addForm = {}
       this.openAddDialog = true

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -82,11 +82,14 @@
                     <el-form-item :rules="tableFormRules.cartonsNum" :prop="$index + '.cartonsNum'">
                       <span v-if="tableData[$index].id && !edit">
                         {{ tableData[$index].cartonsNum }}
-                        {{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData[$index].unit) }}
+                        {{ getDictDataLabel(DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE, tableData[$index].specificationType) }}
                       </span>
-                      <el-input v-else v-model="tableData[$index].cartonsNum" placeholder="">
-                        <span slot="append">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData[$index].unit) }}</span>
+                      <template v-else>
+                        <el-input v-model="tableData[$index].cartonsNum" placeholder="" @blur="handleVolume($index)">
+                          <span slot="append">{{ getDictDataLabel(DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE, tableData[$index].specificationType) }}</span>
                         </el-input>
+                        <dict-selector :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" v-model="tableData[$index].specificationType" @change="handleVolume($index)"></dict-selector>
+                      </template>
                     </el-form-item>
                   </template>
                 </el-table-column>
@@ -362,7 +365,7 @@
 
 <script>
 import dictSelector from "@/components/DictSelector"
-import {DICT_TYPE, getDictDataLabel} from "@/utils/dict"
+import {DICT_TYPE, getDictDataLabel, getDictDatas} from "@/utils/dict"
 import {getWarehouseLastUpdateApprovalInfo, orderWarehouseIn, orderWarehouseInUpdateApply} from '@/api/ecw/order'
 import { getFeeTypeByOrderProduct, getProductBrankPage } from '@/api/ecw/productBrank'
 import WorkFlow from "@/components/WorkFlow"
@@ -419,6 +422,7 @@ export default {
     return {
       DICT_TYPE,
       getDictDataLabel,
+      getDictDatas,
       opened: false,
       brandList: [],
       formRules: {
@@ -560,15 +564,17 @@ export default {
       })
     },
     handleVolume(index, val){
-      const {boxGauge1, boxGauge2, boxGauge3} = (val === 1 ? this.tableData1 : this.tableData)[index]
+      setTimeout(() => {
+        const {boxGauge1, boxGauge2, boxGauge3, specificationType, cartonsNum} = (val === 1 ? this.tableData1 : this.tableData)[index]
         let result = ''
-      if (boxGauge1 && boxGauge2 && boxGauge3) {
-        result = ((boxGauge1 * boxGauge2 * boxGauge3) / 1000000)?.toFixed(2) || ''
+        if (boxGauge1 && boxGauge2 && boxGauge3 && specificationType && cartonsNum) {
+          result = (((specificationType === 1 || specificationType === '1') ? cartonsNum : 1) * (boxGauge1 * boxGauge2 * boxGauge3) / 1000000)?.toFixed(2) || ''
         } else {
           result = ''
         }
         if (result === '0.00') result = '0.01';
         (val === 1 ? this.tableData1 : this.tableData)[index].volume = result
+      }, 0)
     },
     handleSubmit() {
       const orderWarehouseInItemDoList = [
@@ -691,7 +697,8 @@ export default {
         "quantityAll": "",
         "unit": "1",
         "volume": '',
-        "weight": ''
+        "weight": '',
+        specificationType: '1'
       })
     }
   },