瀏覽代碼

Merge branch 'develop_temp_yh14' of jianguan-web/jg-ocs-html into develop_fenbiao0309

李磊 2 年之前
父節點
當前提交
d7f830a7e6

+ 4 - 2
src/views/inventoryManagement/intelligentReplenishment/edit.vue

@@ -122,9 +122,11 @@ export default {
     },
     // 详情
     getDetail () {
+      this.spinning = true
       predictDetail({ sn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.detailData = res.data
+          this.form.stockPredictRange = res.data.stockPredictRange != undefined ? Number(res.data.stockPredictRange) : 1
           if (res.data.state == 'RUN') {
             this.current = 2
           } else {
@@ -133,6 +135,8 @@ export default {
         } else {
           this.detailData = null
         }
+        this.getTrendSn()
+        this.spinning = false
       })
     },
     // 产品范围 ok
@@ -238,8 +242,6 @@ export default {
       }
       this.$refs.ruleForm.resetFields()
       this.getDetail()
-      this.getTrendSn()
-      this.current = 0
 
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调

+ 2 - 2
src/views/supplierManagement/costSetting/chooseImportModal.vue

@@ -93,14 +93,14 @@ export default {
         { title: '供应商名称', dataIndex: 'supplierName', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'product.name', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '成本价', dataIndex: 'costText', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '成本价', dataIndex: 'costText', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text || 0) : '--') } }
       ],
       nowUnColumns: [ //  不可导入
         { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
         { title: '供应商名称', dataIndex: 'supplierName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'product.name', width: '25%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '成本价', dataIndex: 'costText', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '成本价', dataIndex: 'costText', width: '15%', align: 'right', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'importErrorMsgList', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       loadData: [],