Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/views/purchase/DemandSummary/add.vue

@@ -41,20 +41,32 @@
         <!-- <el-table-column show-overflow-tooltip label="末级供应仓库存量" align="center" prop="lastWarehouseQty" width="150"/> -->
         <el-table-column show-overflow-tooltip label="月销量" align="center" prop="totalMonthlySales"/>
         <el-table-column show-overflow-tooltip label="采购周期" align="center" prop="puPeriod"/>
-        <el-table-column show-overflow-tooltip label="最终净需求量" align="center" prop="resDemandQty" width="120"/>
+        <el-table-column show-overflow-tooltip label="最终净需求量" align="center" prop="resDemandQty" width="120">
+          <template slot-scope="scope">
+            {{scope.row.resDemandQty ? parseFloat(scope.row.resDemandQty).toFixed(0) : '0'}}
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip label="最终采购量" align="center" prop="puQtyRes" width="120">
           <template slot-scope="scope">
-            <el-input size="mini" :disabled="scope.row.status !== '1' || lineDisable" v-model="scope.row.puQtyRes"/>
+            <el-input clearable type="number" min="0" size="mini" :disabled="scope.row.status !== '1' || lineDisable" v-model="scope.row.puQtyRes"/>
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip label="需求客户" align="center" prop="customerName" width="150"/>
-        <el-table-column show-overflow-tooltip label="最小订货量" align="center" prop="minOrderQty" width="100"/>
+        <el-table-column show-overflow-tooltip label="最小订货量" align="center" prop="minOrderQty" width="100">
+          <template slot-scope="scope">
+            {{scope.row.minOrderQty ? parseFloat(scope.row.minOrderQty).toFixed(0) : '0'}}
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip label="最小包装量" align="center" prop="minPackage" width="100"/>
-        <el-table-column show-overflow-tooltip label="最小批量" align="center" prop="minBatch" width="100"/>
+        <el-table-column show-overflow-tooltip label="最小批量" align="center" prop="minBatch" width="100">
+          <template slot-scope="scope">
+            {{scope.row.minBatch ? parseFloat(scope.row.minBatch).toFixed(0) : '0'}}
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip label="修改人" align="center" prop="updateByName" width="100"/>
         <el-table-column show-overflow-tooltip label="修改原因" align="center" prop="updateCause" width="150">
           <template slot-scope="scope">
-            <el-input size="mini" :disabled="scope.row.status !== '1' || lineDisable" v-model="scope.row.updateCause"/>
+            <el-input clearable size="mini" :disabled="scope.row.status !== '1' || lineDisable" v-model="scope.row.updateCause"/>
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip label="业务备注" align="center" prop="remark" width="150"/>
@@ -97,7 +109,7 @@
         <el-table-column show-overflow-tooltip label="供应货位" align="center" prop="lastAllocationName" width="120"/>
         <el-table-column show-overflow-tooltip label="默认采购组织" align="center" prop="orgName" width="250px">
           <template slot-scope="scope">
-              <el-input :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.orgName" @clear="clean(scope.row, '默认采购组织')" @focus="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')">
+              <el-input clearable :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.orgName" @clear="clean(scope.row, '默认采购组织')" @focus="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')">
                 <el-button size="mini" :disabled="scope.row.status !== '1' || lineDisable" slot="append" icon="el-icon-more" @click="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')"></el-button>
               </el-input>
           </template>
@@ -278,6 +290,9 @@ export default {
         }
       }).then(() => {
         this.loading = false
+        this.tableList.forEach(item => {
+          item.puQtyRes = parseInt(item.puQtyRes)
+        })
       }).catch(err => {
         this.loading = false
       })

src/views/purchase/apply/add/columns.js

@@ -169,6 +169,7 @@ export default function useColumns() {
           item: { key: "conversionRate", title: "采购换算率", required: true },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
             value: 1,
             disabled: true,
@@ -188,6 +189,7 @@ export default function useColumns() {
           item: { key: "taxPrice", title: "含税单价", required: true },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -255,6 +257,7 @@ export default function useColumns() {
           item: { key: "recentlyPrice", title: "最近价格" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
             disabled: true,
           },
@@ -379,6 +382,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice", title: "中标价1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -386,6 +390,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice", title: "单价1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -393,6 +398,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit", title: "利润比1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -405,6 +411,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice1", title: "中标价2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -412,6 +419,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice1", title: "单价2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -419,6 +427,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit1", title: "利润比2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -431,6 +440,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice2", title: "中标价3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -438,6 +448,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice2", title: "单价3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -445,6 +456,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit2", title: "利润比3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },

src/views/purchase/apply/add/index.vue

@@ -155,8 +155,8 @@
       },
       //
       async onRowAdd(prop, pushParams = {}) {
-        // this.$refs.superForm.validate(async (valid) => {
-        //   if (valid) {
+        this.$refs.superForm.validate(async (valid) => {
+          if (valid) {
             const {TabColumns} = this;
             const {TableColumns} = TabColumns.find(
               ({item: {key}}) => key === prop
@@ -166,8 +166,8 @@
               ...this.$init.params(TableColumns),
               ...pushParams,
             });
-        //   }
-        // });
+          }
+        });
       },
       //
       async onRowRemove(prop, scope) {
@@ -253,7 +253,7 @@
           :name="item.key"
           lazy
         >
-          <div v-loading="loading" style="height: 600px; display: flex">
+          <div v-loading="loading" style="height: 250px; display: flex">
             <el-super-table
               v-model="params[item.key]"
               :dict="dict"

src/views/purchase/apply/copy/columns.js

@@ -169,6 +169,7 @@ export default function useColumns() {
           item: { key: "conversionRate", title: "采购换算率", required: true },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
             value: 1,
             disabled: true,
@@ -188,6 +189,7 @@ export default function useColumns() {
           item: { key: "taxPrice", title: "含税单价", required: true },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -255,6 +257,7 @@ export default function useColumns() {
           item: { key: "recentlyPrice", title: "最近价格" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
             disabled: true,
           },
@@ -380,6 +383,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice", title: "中标价1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -387,6 +391,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice", title: "单价1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -394,6 +399,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit", title: "利润比1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -406,6 +412,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice1", title: "中标价2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -413,6 +420,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice1", title: "单价2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -420,6 +428,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit1", title: "利润比2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -432,6 +441,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice2", title: "中标价3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -439,6 +449,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice2", title: "单价3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -446,6 +457,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit2", title: "利润比3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },

src/views/purchase/apply/copy/index.vue

@@ -308,7 +308,7 @@ export default {
           :name="item.key"
           lazy
         >
-          <div v-loading="loading" style="height: 600px; display: flex">
+          <div v-loading="loading" style="height: 250px; display: flex">
             <el-super-table
               v-model="params[item.key]"
               :dict="dict"

src/views/purchase/apply/edit/columns.js

@@ -169,6 +169,7 @@ export default function useColumns() {
           item: { key: "conversionRate", title: "采购换算率", required: true },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
             value: 1,
             disabled: true,
@@ -188,6 +189,7 @@ export default function useColumns() {
           item: { key: "taxPrice", title: "含税单价", required: true },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -255,6 +257,7 @@ export default function useColumns() {
           item: { key: "recentlyPrice", title: "最近价格" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
             disabled: true,
           },
@@ -380,6 +383,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice", title: "中标价1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -387,6 +391,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice", title: "单价1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -394,6 +399,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit", title: "利润比1" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -406,6 +412,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice1", title: "中标价2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -413,6 +420,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice1", title: "单价2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -420,6 +428,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit1", title: "利润比2" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -432,6 +441,7 @@ export default function useColumns() {
           item: { width: 150, key: "bidPrice2", title: "中标价3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -439,6 +449,7 @@ export default function useColumns() {
           item: { width: 150, key: "unitPrice2", title: "单价3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },
@@ -446,6 +457,7 @@ export default function useColumns() {
           item: { width: 150, key: "profit2", title: "利润比3" },
           attr: {
             is: "el-input-number",
+            min: 0,
             precision: CONFIG.precision,
           },
         },

src/views/purchase/apply/edit/index.vue

@@ -330,7 +330,7 @@
           :name="item.key"
           lazy
         >
-          <div v-loading="loading" style="height: 600px; display: flex">
+          <div v-loading="loading" style="height: 250px; display: flex">
             <el-super-table
               v-model="priceApply[item.key]"
               :dict="dict"

src/views/purchase/apply/see/index.vue

@@ -91,6 +91,7 @@ export default {
     },
     //
     async hide() {
+      console.log("关闭！！！！！！！", this.$props)
       const {
         TabColumns: [
           {

src/views/purchase/catalogue/columns.js

@@ -92,6 +92,7 @@ export default function useColumns() {
       item: { width: 100, key: "puOrgName", title: "采购组织" },
       attr: {
         is: "el-popover-select-v2",
+        clearable: true,
         referName: "ORG_PARAM",
         valueKey: "name",
         dataMapping: {
@@ -104,6 +105,7 @@ export default function useColumns() {
       item: { width: 100, key: "manufacturerName", title: "生产厂家" },
       attr: {
         is: "el-popover-select-v2",
+        clearable: true,
         referName: "MANUFACTURER_PARAM",
         valueKey: "name",
         dataMapping: {
@@ -116,6 +118,7 @@ export default function useColumns() {
       item: { width: 100, key: "supplierName", title: "供应商" },
       attr: {
         is: "el-popover-select-v2",
+        clearable: true,
         referName: "SUPPLIER_PARAM",
         valueKey: "name",
         dataMapping: {
@@ -126,7 +129,7 @@ export default function useColumns() {
     },
     {
       item: { width: 100, key: "applyCode", title: "来源单据" },
-      attr: { is: "el-input" },
+      attr: { clearable: true, is: "el-input" },
     },
     {
       item: {key: "materialCodeList", title: "物料编码"},
@@ -156,6 +159,7 @@ export default function useColumns() {
     {
       item: { key: "materialClassifyList", title: "物料一级分类"},
       attr: {
+        clearable: true,
         is: "el-popover-multiple-tree-select",
         referName: "MATERIALCLASSIFY_PARAM",
         valueKey: "code",
@@ -163,19 +167,20 @@ export default function useColumns() {
     },
     {
       item: { width: 100, key: "source", title: "价格来源" },
-      attr: { is: "el-select", dictName: "price_source" },
+      attr: { clearable: true, is: "el-select", dictName: "price_source" },
     },
     {
       item: { width: 100, key: "status", title: "有效状态" },
-      attr: { is: "el-select", dictName: "price_invalid" },
+      attr: { clearable: true, is: "el-select", dictName: "price_invalid" },
     },
     {
       item: { width: 100, key: "enableStatus", title: "启用状态", span: 4 },
-      attr: { is: "el-select", dictName: "price_enable" },
+      attr: { clearable: true, is: "el-select", dictName: "price_enable" },
     },
     {
       item: { width: 100, key: "createTime", title: "价格日期", span: 8 },
       attr: {
+        clearable: true,
         is: "el-date-picker",
         type: "datetimerange",
         rangeSeparator: "至",
@@ -187,6 +192,7 @@ export default function useColumns() {
     {
       item: { width: 100, key: "invalid", title: "价格失效日期", span: 8 },
       attr: {
+        clearable: true,
         is: "el-date-picker",
         type: "datetimerange",
         rangeSeparator: "至",