Browse Source

Merge branch 'develop_yh58' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh58

lilei 1 month ago
parent
commit
19f149ef83

+ 2 - 2
src/views/setting/dailyReportSettings/categoryTargetList.vue

@@ -69,7 +69,7 @@
                 v-if="record.editable"
                 v-if="record.editable"
                 size="small"
                 size="small"
                 :min="0"
                 :min="0"
-                :max="999999999"
+                :max="999999999.99"
                 placeholder="请输入"
                 placeholder="请输入"
                 :value="text"
                 :value="text"
                 :precision="2"
                 :precision="2"
@@ -185,7 +185,7 @@ export default {
     columns () {
     columns () {
       const _this = this
       const _this = this
       const arr = [
       const arr = [
-        { title: (_this.pageType === 'CATEGORY_MONTHLY_TARGET' ? '类别' : '项目'), dataIndex: 'productTypeName', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: (_this.pageType === 'CATEGORY_MONTHLY_TARGET' ? '类别' : '项目'), dataIndex: 'productTypeName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '1月', dataIndex: 'value01', width: '8%', align: 'right', scopedSlots: { customRender: 'month1' } },
         { title: '1月', dataIndex: 'value01', width: '8%', align: 'right', scopedSlots: { customRender: 'month1' } },
         { title: '2月', dataIndex: 'value02', width: '8%', align: 'right', scopedSlots: { customRender: 'month2' } },
         { title: '2月', dataIndex: 'value02', width: '8%', align: 'right', scopedSlots: { customRender: 'month2' } },
         { title: '3月', dataIndex: 'value03', width: '8%', align: 'right', scopedSlots: { customRender: 'month3' } },
         { title: '3月', dataIndex: 'value03', width: '8%', align: 'right', scopedSlots: { customRender: 'month3' } },

+ 1 - 1
src/views/setting/dailyReportSettings/estimatedOrderList.vue

@@ -69,7 +69,7 @@
                 v-if="record.editable"
                 v-if="record.editable"
                 size="small"
                 size="small"
                 :min="0"
                 :min="0"
-                :max="999999999"
+                :max="pageType === 'REGIONAL_ESTIMATED_ORDER'?999999999.99:999999999"
                 placeholder="请输入"
                 placeholder="请输入"
                 :precision="pageType === 'REGIONAL_ESTIMATED_ORDER'?2:0"
                 :precision="pageType === 'REGIONAL_ESTIMATED_ORDER'?2:0"
                 :value="text"
                 :value="text"

+ 1 - 2
src/views/setting/dailyReportSettings/partitionTargetList.vue

@@ -70,7 +70,7 @@
                 v-if="record.editable"
                 v-if="record.editable"
                 size="small"
                 size="small"
                 :min="0"
                 :min="0"
-                :max="999999999"
+                :max="999999999.99"
                 placeholder="请输入"
                 placeholder="请输入"
                 :precision="2"
                 :precision="2"
                 :value="text"
                 :value="text"
@@ -118,7 +118,6 @@
 
 
 <script>
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { commonMixin } from '@/utils/mixin'
-import debounce from 'lodash/debounce'
 // 组件
 // 组件
 import { STable } from '@/components'
 import { STable } from '@/components'
 // 接口
 // 接口