Merge branch 'cjerp-2.0-plan' into test_cjerp

gesilong
2 parents 4a089258 c4f3d3a1
Showing 5 changed files with 214 additions and 50 deletions
pages/domestic-plan/detail.vue
pages/domestic-plan/productRel.vue
pages/domestic-plan/viewBuyoutApply.vue
pages/schedule-plan/productRel.vue
pages/supple-plan/productRel.vue
--- a/pages/domestic-plan/detail.vue
View file @4f32786
+++ b/pages/domestic-plan/detail.vue
View file @4f32786
@@ -184,6 +184,7 @@ export default {
       var aStatus = String(f.approvalStatus != null ? f.approvalStatus : '')
       var SC = this.PROCESS_STATUS_CODE
       var inStatus = function (codes) { return codes.indexOf(ps) >= 0 }
+      console.log(SC,inStatus([SC.TO_SUBMIT_REVIEW, SC.AUDIT, SC.COMPLETED, SC.REFUSE]),'SC')
       var perms = {
         supplement: this.hasPerm('plan-manage:domestic-plan:supple'),
         generateContract: this.hasPerm('plan-manage:domestic-plan:do'),
@@ -211,7 +212,7 @@ export default {
         print: inStatus([SC.TO_SUBMIT_REVIEW, SC.AUDIT, SC.COMPLETED, SC.ABORTED, SC.REFUSE]) && perms.print,
         generate: !!f.showGenerateBuyoutApply && inStatus([SC.TO_SUBMIT_REVIEW, SC.AUDIT, SC.COMPLETED]) && perms.generate,
         cancel: !!f.showAbolishBuyoutApply && inStatus([SC.TO_SUBMIT_REVIEW, SC.AUDIT, SC.COMPLETED]) && perms.cancel,
-        look: inStatus([SC.TO_SUBMIT_REVIEW, SC.AUDIT, SC.COMPLETED, SC.REFUSE]) && perms.look,
+        look: inStatus([SC.TO_SUBMIT_REVIEW, SC.AUDIT, SC.COMPLETED, SC.REFUSE, SC.ABORTED]) && perms.look,
         // uploadAttachment: inStatus([SC.COMPLETED]) && !!this.planRoleFlags.isPlanner && perms.uploadAttachment
       }
       var out = []
--- a/pages/domestic-plan/productRel.vue
View file @4f32786
+++ b/pages/domestic-plan/productRel.vue
View file @4f32786
@@ -60,6 +60,7 @@
                   placeholder="请输入实际采购价"
                   @input="onNonNegativeInput(idx, 'actualPurchasePrice')"
                   @blur="onNonNegativeBlur(idx, 'actualPurchasePrice', 2)"
+                  @change="recalcAll(idx)"
                 />
               </template>
               <text v-else class="lock-value">{{ formatTextNumber(item.actualPurchasePrice) }}</text>
@@ -91,17 +92,7 @@
           </uni-list-item>
           <uni-list-item title="买断料预计损耗">
             <template v-slot:footer>
-              <template v-if="!isSelectWorkshop && !isSupplement">
-                <uni-easyinput
-                  v-model="item.estimatedLoss"
-                  type="digit"
-                  :inputBorder="false"
-                  placeholder="请输入预计损耗"
-                  @input="onNonNegativeInput(idx, 'estimatedLoss')"
-                  @blur="onNonNegativeBlur(idx, 'estimatedLoss', 2)"
-                />
-              </template>
-              <text v-else class="lock-value">{{ formatTextNumber(item.estimatedLoss) }}</text>
+              <text class="lock-value">{{ formatTextNumber(item.estimatedLoss) }}</text>
             </template>
           </uni-list-item>
           <uni-list-item title="申请损耗（%）">
@@ -114,6 +105,7 @@
                   placeholder="请输入申请损耗"
                   @input="onNonNegativeInput(idx, 'applicationAttrition')"
                   @blur="onNonNegativeBlur(idx, 'applicationAttrition', 2)"
+                  @change="recalcAll(idx)"
                 />
               </template>
               <text v-else class="lock-value">{{ formatTextNumber(item.applicationAttrition) }}</text>
@@ -208,7 +200,8 @@ export default {
       items: [],
       collapsedView: false,
       sheet: { visible: false, title: '请选择', options: [], value: '', idx: -1, type: '' },
-      _initialized: false
+      _initialized: false,
+      _emitSuppressed: false
     }
   },
   computed: {
@@ -240,18 +233,29 @@ export default {
     },
     list: {
       handler(v) {
+        if (this._emitSuppressed) return
+        this._emitSuppressed = true
         this._initialized = false
         this.initItems()
         var self = this
-        this.$nextTick(function () { self._initialized = true })
+        this.$nextTick(function () {
+          self._initialized = true
+          self.recalcAllItems()
+          self.$nextTick(function () { self._emitSuppressed = false })
+        })
       },
       immediate: false
     }
   },
   created() {
+    this._emitSuppressed = true
     this.initItems()
     var self = this
-    this.$nextTick(function () { self._initialized = true })
+    this.$nextTick(function () {
+      self._initialized = true
+      self.recalcAllItems()
+      self.$nextTick(function () { self._emitSuppressed = false })
+    })
   },
   methods: {
     initItems() {
@@ -296,7 +300,8 @@ export default {
         estimatedLoss: '',
         applicationAttrition: '',
         workshopId: '',
-        workshopName: ''
+        workshopName: '',
+        fixedLossRate: ''
       }
     },
     onNonNegativeInput(idx, field) {
@@ -328,12 +333,71 @@ export default {
         return
       }
       var val = parseFloat(raw)
-      if (isNaN(val)) val = 0
+      if (isNaN(val)) {
+        it[field] = ''
+        this.$set(this.items, idx, it)
+        return
+      }
       var m = Math.pow(10, digits)
       var rounded = Math.round(val * m) / m
       it[field] = rounded
       this.$set(this.items, idx, it)
     },
+    getProductOption(productId) {
+      var pid = productId != null ? String(productId) : ''
+      if (!pid) return null
+      var pOpts = Array.isArray(this.productOptions) ? this.productOptions : []
+      for (var i = 0; i < pOpts.length; i++) {
+        var o = pOpts[i]
+        var id = o.id != null ? String(o.id) : (o.productId != null ? String(o.productId) : (o.value != null ? String(o.value) : ''))
+        if (id === pid) return o
+      }
+      return null
+    },
+    round2(v) {
+      var n = Number(v)
+      if (isNaN(n)) return ''
+      return Math.round(n * 100) / 100
+    },
+    recalcAll(idx) {
+      var it = this.items[idx]
+      if (!it) return
+      var priceRaw = it.actualPurchasePrice
+      var price = parseFloat(priceRaw)
+      var priceIsNumber = priceRaw !== '' && priceRaw != null && !isNaN(price)
+      var estimatedLoss = ''
+      if (priceIsNumber) {
+        var app = it.applicationAttrition
+        var appNum = parseFloat(app)
+        var appHasVal = app !== '' && app != null && !isNaN(appNum)
+        if (appHasVal) {
+          estimatedLoss = this.round2(price * appNum / 100)
+        } else {
+          var pOpt = this.getProductOption(it.productId)
+          var fixedRate = null
+          if (pOpt) {
+            fixedRate = pOpt.fixedLossRate != null ? pOpt.fixedLossRate : (pOpt.lossRate != null ? pOpt.lossRate : (pOpt.attritionRate != null ? pOpt.attritionRate : null))
+          }
+          var fixedNum = parseFloat(fixedRate)
+          if (!isNaN(fixedNum)) {
+            estimatedLoss = this.round2(price * fixedNum / 100)
+          } else if (it.fixedLossRate != null && it.fixedLossRate !== '') {
+            var fallbackNum = parseFloat(it.fixedLossRate)
+            if (!isNaN(fallbackNum)) {
+              estimatedLoss = this.round2(price * fallbackNum / 100)
+            }
+          }
+        }
+      }
+      it.estimatedLoss = estimatedLoss
+      this.$set(this.items, idx, it)
+    },
+    recalcAllItems() {
+      var len = (this.items || []).length
+      for (var i = 0; i < len; i++) {
+        this.recalcAll(i)
+      }
+    },
     onAdd() {
       if (this.items.length >= this.max) {
         uni.showToast({ title: '最多' + this.max + '条明细', icon: 'none' })
@@ -378,6 +442,14 @@ export default {
       if (type === 'product') {
         this.$set(it, 'productId', value)
         this.$set(it, 'productName', label)
+        var pOpt = this.getProductOption(value)
+        if (pOpt) {
+          var rate = pOpt.fixedLossRate != null ? pOpt.fixedLossRate : (pOpt.lossRate != null ? pOpt.lossRate : (pOpt.attritionRate != null ? pOpt.attritionRate : ''))
+          this.$set(it, 'fixedLossRate', rate != null ? rate : '')
+        } else {
+          this.$set(it, 'fixedLossRate', '')
+        }
+        this.recalcAll(idx)
       } else if (type === 'workshop') {
         this.$set(it, 'workshopId', value)
         this.$set(it, 'workshopName', label)
@@ -385,12 +457,14 @@ export default {
     },
     emitChange() {
       if (!this._initialized) return
+      if (this._emitSuppressed) return
       var list = (this.items || []).map(function (it) {
         var c = Object.assign({}, it)
         var key = c._key
         delete c._key
         delete c.collapsed
         delete c._selected
+        delete c.fixedLossRate
         if (!c.itemId) c.itemId = key
         return c
       })
--- a/pages/domestic-plan/viewBuyoutApply.vue
View file @4f32786
+++ b/pages/domestic-plan/viewBuyoutApply.vue
View file @4f32786
@@ -79,9 +79,9 @@
           </template>
         </uni-list-item>
-        <uni-list-item title="漆损率（%）">
+        <uni-list-item title="漆损">
           <template v-slot:footer>
-            <uni-easyinput v-model="paintLossRatioDisplay" :inputBorder="false" disabled placeholder="-" />
+            <uni-easyinput v-model="totalPaintDamageRatio" :inputBorder="false" disabled placeholder="-" />
           </template>
         </uni-list-item>
@@ -129,7 +129,7 @@
               </uni-list-item>
               <uni-list-item title="漆损率（%）">
                 <template v-slot:footer>
-                  <text class="readonly-text">{{ formatNumberText(item.paintLossRatio, 4) }}</text>
+                  <text class="readonly-text">{{ formatNumberText(item.paintDamageRatio, 4) }}</text>
                 </template>
               </uni-list-item>
               <uni-list-item title="是否带漆">
@@ -178,7 +178,7 @@ export default {
         oilWaterDesc: '',
         loadingFee: '',
         buyoutReason: '',
-        paintLossRatio: ''
+        paintDamageRatio: ''
       },
       lineList: []
     }
@@ -209,8 +209,8 @@ export default {
       var v = this.toNumber(this.main.loadingFee)
       return v === 0 ? '0.00' : v.toFixed(2)
     },
-    paintLossRatioDisplay() {
-      var v = this.toNumber(this.main.paintLossRatio)
+    totalPaintDamageRatio() {
+      var v = this.toNumber(this.main.paintDamageRatio)
       if (v === 0) return '0.0000'
       return v ? v.toFixed(4) : ''
     },
@@ -223,7 +223,7 @@ export default {
       for (var i = 0; i < withPaintList.length; i++) {
         var r = withPaintList[i]
         var qty = this.toNumber(r.quantity)
-        var ratio = this.toNumber(r.paintLossRatio) / 100
+        var ratio = this.toNumber(r.paintDamageRatio) / 100
         if (ratio < 0) ratio = 0
         if (ratio >= 1) ratio = 0.9999
         totalQty += qty
@@ -300,10 +300,10 @@ export default {
       }
       return null
     },
-    getPaintLossRatioFromBreed(productId, fallbackRatio) {
+    getPaintDamageRatioFromBreed(productId, fallbackRatio) {
       var opt = this.findBreedOption(productId)
       if (opt) {
-        var keys = ['paintLossRatio', 'paintLossRate', 'lossRatio', 'lacquerLossRatio']
+        var keys = ['paintDamageRatio', 'paintLossRate', 'lossRatio', 'lacquerLossRatio']
         for (var i = 0; i < keys.length; i++) {
           if (opt[keys[i]] != null && opt[keys[i]] !== '') {
             var n = Number(opt[keys[i]])
@@ -317,8 +317,8 @@ export default {
       }
       return 0
     },
-    isWithPaintByBreed(productId, productName, breedPaintLossRatio) {
-      if (breedPaintLossRatio > 0) return true
+    isWithPaintByBreed(productId, productName, breedPaintDamageRatio) {
+      if (breedPaintDamageRatio > 0) return true
       var name = String(productName || '')
       var tags = ['带漆', '漆', '漆包', '油漆', '喷漆', '覆漆']
       for (var i = 0; i < tags.length; i++) {
@@ -366,7 +366,7 @@ export default {
       var oilWaterDesc = this.pickValue(b, ['oilWaterDesc'], '')
       var loadingFee = this.pickValue(b, ['loadingFee'], '')
       var buyoutReason = this.pickValue(b, ['buyoutReason'], '')
-      var paintLossRatio = this.pickValue(b, ['paintLossRatio'], '')
+      var paintDamageRatio = this.pickValue(b, ['paintDamageRatio', 'paintLoss'], '')
       this.main = {
         code: code,
         supplierName: supplierName,
@@ -384,7 +384,7 @@ export default {
         oilWaterDesc: oilWaterDesc,
         loadingFee: loadingFee,
         buyoutReason: buyoutReason,
-        paintLossRatio: paintLossRatio
+        paintDamageRatio: paintDamageRatio
       }
     },
     buildLineList(buyout) {
@@ -394,7 +394,7 @@ export default {
       lines = bLines
       var shippingCost = this.toNumber(this.main.shippingCost)
       var loadingFee = this.toNumber(this.main.loadingFee)
-      var defaultPaintLossRatio = this.toNumber(this.main.paintLossRatio)
+      var defaultPaintDamageRatio = this.toNumber(this.main.paintDamageRatio)
       this.lineList = lines.map(function (r, i) {
         var row = r || {}
         var productId = self.pickValue(row, ['productId', 'breedId'], '')
@@ -407,9 +407,11 @@ export default {
         var coordinationRange = self.pickValue(row, ['coordinationRange'], '')
         var applicationAttrition = self.pickValue(row, ['applicationAttrition'], '')
         var workshopName = self.pickValue(row, ['workshopName', 'workshopIdName'], '')
-        var breedPaintLossRatio = self.getPaintLossRatioFromBreed(productId, defaultPaintLossRatio)
-        var withPaint = self.isWithPaintByBreed(productId, productName, breedPaintLossRatio)
-        var ratio = withPaint ? breedPaintLossRatio : 0
+        var rowPaintDamageRatio = self.pickValue(row, ['paintDamageRatio', 'paintLoss'], null)
+        var hasRowRatio = rowPaintDamageRatio != null && rowPaintDamageRatio !== '' && !isNaN(Number(rowPaintDamageRatio))
+        var breedPaintDamageRatio = self.getPaintDamageRatioFromBreed(productId, defaultPaintDamageRatio)
+        var withPaint = hasRowRatio ? (Number(rowPaintDamageRatio) > 0) : self.isWithPaintByBreed(productId, productName, breedPaintDamageRatio)
+        var ratio = hasRowRatio ? Number(rowPaintDamageRatio) : (withPaint ? breedPaintDamageRatio : 0)
         var ratioFrac = ratio / 100
         if (ratioFrac < 0) ratioFrac = 0
         if (ratioFrac >= 1) ratioFrac = 0.9999
@@ -430,7 +432,7 @@ export default {
           estimatedLoss: estimatedLoss,
           applicationAttrition: applicationAttrition,
           workshopName: workshopName,
-          paintLossRatio: ratio,
+          paintDamageRatio: ratio,
           withPaint: !!withPaint,
           pureCopperPrice: pureCopperPrice
         }
--- a/pages/schedule-plan/productRel.vue
View file @4f32786
+++ b/pages/schedule-plan/productRel.vue
View file @4f32786
@@ -66,6 +66,7 @@
                 placeholder="请输入实际采购价"
                 @input="onNonNegativeInput(idx, 'actualPurchasePrice')"
                 @blur="onNonNegativeBlur(idx, 'actualPurchasePrice', 2)"
+                @change="recalcAll(idx)"
               />
             </template>
           </uni-list-item>
@@ -91,14 +92,7 @@
               </view>
             </template>
             <template v-slot:footer>
-              <uni-easyinput
-                v-model="item.estimatedLoss"
-                type="digit"
-                :inputBorder="false"
-                placeholder="请输入预计损耗"
-                @input="onNonNegativeInput(idx, 'estimatedLoss')"
-                @blur="onNonNegativeBlur(idx, 'estimatedLoss', 2)"
-              />
+              <text class="lock-value">{{ formatTextNumber(item.estimatedLoss) }}</text>
             </template>
           </uni-list-item>
           <uni-list-item>
@@ -115,6 +109,7 @@
                 placeholder="请输入申请损耗"
                 @input="onNonNegativeInput(idx, 'applicationAttrition')"
                 @blur="onNonNegativeBlur(idx, 'applicationAttrition', 2)"
+                @change="recalcAll(idx)"
               />
             </template>
           </uni-list-item>
@@ -180,7 +175,8 @@ export default {
     return {
       items: [],
       sheet: { visible: false, title: '请选择', options: [], value: '', idx: -1, type: '' },
-      _initialized: false
+      _initialized: false,
+      _emitSuppressed: false
     }
   },
   computed: {
@@ -211,18 +207,29 @@ export default {
     },
     list: {
       handler() {
+        if (this._emitSuppressed) return
+        this._emitSuppressed = true
         this._initialized = false
         this.initItems()
         var self = this
-        this.$nextTick(function () { self._initialized = true })
+        this.$nextTick(function () {
+          self._initialized = true
+          self.recalcAllItems()
+          self.$nextTick(function () { self._emitSuppressed = false })
+        })
       },
       immediate: false
     }
   },
   created() {
+    this._emitSuppressed = true
     this.initItems()
     var self = this
-    this.$nextTick(function () { self._initialized = true })
+    this.$nextTick(function () {
+      self._initialized = true
+      self.recalcAllItems()
+      self.$nextTick(function () { self._emitSuppressed = false })
+    })
   },
   methods: {
     initItems() {
@@ -268,7 +275,8 @@ export default {
         estimatedLoss: '',
         applicationAttrition: '',
         workshopId: '',
-        workshopName: ''
+        workshopName: '',
+        fixedLossRate: ''
       }
     },
     onNonNegativeInput(idx, field) {
@@ -289,12 +297,71 @@ export default {
         return
       }
       var val = parseFloat(raw)
-      if (isNaN(val)) val = 0
+      if (isNaN(val)) {
+        it[field] = ''
+        this.$set(this.items, idx, it)
+        return
+      }
       var m = Math.pow(10, digits)
       var rounded = Math.round(val * m) / m
       it[field] = rounded
       this.$set(this.items, idx, it)
     },
+    getProductOption(productId) {
+      var pid = productId != null ? String(productId) : ''
+      if (!pid) return null
+      var pOpts = Array.isArray(this.productOptions) ? this.productOptions : []
+      for (var i = 0; i < pOpts.length; i++) {
+        var o = pOpts[i]
+        var id = o.id != null ? String(o.id) : (o.productId != null ? String(o.productId) : (o.value != null ? String(o.value) : ''))
+        if (id === pid) return o
+      }
+      return null
+    },
+    round2(v) {
+      var n = Number(v)
+      if (isNaN(n)) return ''
+      return Math.round(n * 100) / 100
+    },
+    recalcAll(idx) {
+      var it = this.items[idx]
+      if (!it) return
+      var priceRaw = it.actualPurchasePrice
+      var price = parseFloat(priceRaw)
+      var priceIsNumber = priceRaw !== '' && priceRaw != null && !isNaN(price)
+      var estimatedLoss = ''
+      if (priceIsNumber) {
+        var app = it.applicationAttrition
+        var appNum = parseFloat(app)
+        var appHasVal = app !== '' && app != null && !isNaN(appNum)
+        if (appHasVal) {
+          estimatedLoss = this.round2(price * appNum / 100)
+        } else {
+          var pOpt = this.getProductOption(it.productId)
+          var fixedRate = null
+          if (pOpt) {
+            fixedRate = pOpt.fixedLossRate != null ? pOpt.fixedLossRate : (pOpt.lossRate != null ? pOpt.lossRate : (pOpt.attritionRate != null ? pOpt.attritionRate : null))
+          }
+          var fixedNum = parseFloat(fixedRate)
+          if (!isNaN(fixedNum)) {
+            estimatedLoss = this.round2(price * fixedNum / 100)
+          } else if (it.fixedLossRate != null && it.fixedLossRate !== '') {
+            var fallbackNum = parseFloat(it.fixedLossRate)
+            if (!isNaN(fallbackNum)) {
+              estimatedLoss = this.round2(price * fallbackNum / 100)
+            }
+          }
+        }
+      }
+      it.estimatedLoss = estimatedLoss
+      this.$set(this.items, idx, it)
+    },
+    recalcAllItems() {
+      var len = (this.items || []).length
+      for (var i = 0; i < len; i++) {
+        this.recalcAll(i)
+      }
+    },
     onAdd() {
       if (this.items.length >= this.max) {
         uni.showToast({ title: '最多' + this.max + '条明细', icon: 'none' })
@@ -331,6 +398,14 @@ export default {
       if (type === 'product') {
         this.$set(it, 'productId', value)
         this.$set(it, 'productName', label)
+        var pOpt = this.getProductOption(value)
+        if (pOpt) {
+          var rate = pOpt.fixedLossRate != null ? pOpt.fixedLossRate : (pOpt.lossRate != null ? pOpt.lossRate : (pOpt.attritionRate != null ? pOpt.attritionRate : ''))
+          this.$set(it, 'fixedLossRate', rate != null ? rate : '')
+        } else {
+          this.$set(it, 'fixedLossRate', '')
+        }
+        this.recalcAll(idx)
       }
     },
     fillLineNames() {
@@ -366,12 +441,14 @@ export default {
     },
     emitChange() {
       if (!this._initialized) return
+      if (this._emitSuppressed) return
       var list = (this.items || []).map(function (it) {
         var c = Object.assign({}, it)
         var key = c._key
         delete c._key
         delete c.collapsed
         delete c._selected
+        delete c.fixedLossRate
         if (!c.itemId) c.itemId = key
         return c
       })
@@ -398,7 +475,6 @@ export default {
         { key: 'materialType', title: '料型' },
         { key: 'quantity', title: '数量' },
         { key: 'actualPurchasePrice', title: '实际采购价' },
-        { key: 'estimatedLoss', title: '买断料预计损耗' },
         { key: 'applicationAttrition', title: '申请损耗' }
       ]
       for (var i = 0; i < items.length; i++) {
--- a/pages/supple-plan/productRel.vue
View file @4f32786
+++ b/pages/supple-plan/productRel.vue
View file @4f32786
@@ -339,7 +339,11 @@ export default {
         return
       }
       var val = parseFloat(raw)
-      if (isNaN(val)) val = 0
+      if (isNaN(val)) {
+        it[field] = ''
+        this.$set(this.items, idx, it)
+        return
+      }
       var m = Math.pow(10, digits)
       var rounded = Math.round(val * m) / m
       it[field] = rounded
@@ -423,6 +427,11 @@ export default {
           var fixedNum = parseFloat(fixedRate)
           if (!isNaN(fixedNum)) {
             estimatedLoss = this.round2(actualPrice * fixedNum / 100)
+          } else if (it.fixedLossRate != null && it.fixedLossRate !== '') {
+            var fallbackNum = parseFloat(it.fixedLossRate)
+            if (!isNaN(fallbackNum)) {
+              estimatedLoss = this.round2(actualPrice * fallbackNum / 100)
+            }
           }
         }
       }
@@ -496,6 +505,8 @@ export default {
         if (pOpt) {
           var rate = pOpt.fixedLossRate != null ? pOpt.fixedLossRate : (pOpt.lossRate != null ? pOpt.lossRate : (pOpt.attritionRate != null ? pOpt.attritionRate : ''))
           this.$set(it, 'fixedLossRate', rate != null ? rate : '')
+        } else {
+          this.$set(it, 'fixedLossRate', '')
         }
         this.recalcAll(idx)
       } else if (type === 'workshop') {