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

src/components/Refers/treeRefer.vue

@@ -10,8 +10,8 @@
                 <el-input placeholder="输入关键字进行过滤" size="small" v-model="filterText" style="margin-bottom: 16px">
                 </el-input>
 
-                <el-tree class="filter-tree" :data="threedata" :props="defaultProps" accordion node-key="id"
-                  highlight-current @node-click="clickTree" :filter-node-method="filterNode" ref="tree">
+                <el-tree class="filter-tree" :data="threedata" :props="defaultProps" show-checkbox check-strictly accordion node-key="id"
+                  highlight-current @check="clickTree" :filter-node-method="filterNode" ref="tree">
                   <span slot-scope="{ node, data }">
                     {{ data.code }}{{ data.name }}
                   </span>
@@ -78,8 +78,10 @@ export default {
       });
     },
     clickTree(data) {
-      console.log("树形节点信息：", data);
-      this.choosePoint = data;
+      // console.log("树形节点信息：", data);
+      // this.choosePoint = data;
+      // console.log('查看打勾的',this.$refs.tree.getCheckedNodes())
+      this.choosePoint = this.$refs.tree.getCheckedNodes()
     },
     filterNode(value, data) {
       if (!value) return true;

src/views/business/spd/target/targetTemplate/detail.vue

@@ -11,6 +11,7 @@
                             <el-date-picker
                                 v-model="form.year"
                                 type="year"
+                                value-format="yyyy-MM-dd"
                                 clearable
                                 >
                             </el-date-picker>

src/views/business/spd/target/targetTemplate/index.vue

@@ -10,7 +10,7 @@
                 <el-date-picker
                   v-model="queryParams.params.year"
                   type="year"
-                  value-format="yyyy"
+                  value-format="yyyy-MM-dd"
                   clearable
                   >
                 </el-date-picker>

src/views/purchase/DemandSummary/add.vue

@@ -26,22 +26,22 @@
           ref="table"
         >
         <el-table-column show-overflow-tooltip type="selection" fixed="left"/>
-        <el-table-column show-overflow-tooltip label="序号" align="center" type="index" width="55" fixed="left"/>
+        <el-table-column show-overflow-tooltip label="需求单号" align="center" prop="code" width="100"/>
+        <!-- <el-table-column show-overflow-tooltip label="序号" align="center" type="index" width="55" fixed="left"/> -->
         <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowNo">
           <template slot-scope="scope">
             {{ scope.$index + 1 + '0' }}
           </template>
         </el-table-column>
-        <el-table-column show-overflow-tooltip label="行状态" align="center" prop="status" width="100px" :formatter="hangStatus"/>
-        <el-table-column show-overflow-tooltip label="物料编码" align="center" prop="materialCode" width="120px"/>
-        <el-table-column show-overflow-tooltip label="品名" align="center" prop="materialName" width="180"/>
+        <el-table-column show-overflow-tooltip label="物料编码" align="center" prop="materialCode" width="120"/>
+        <el-table-column show-overflow-tooltip label="品名" align="center" prop="materialName" width="120"/>
         <el-table-column show-overflow-tooltip label="规格" align="center" prop="specification"/>
         <el-table-column show-overflow-tooltip label="单位" align="center" prop="unit"/>
-        <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center" prop="manufacturerName" width="230"/>
+        <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center" prop="manufacturerName" width="120"/>
         <!-- <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="100">
           <template slot-scope="scope">
             {{scope.row.resDemandQty ? parseFloat(scope.row.resDemandQty).toFixed(0) : '0'}}
           </template>
@@ -51,7 +51,7 @@
             <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="customerName" 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'}}
@@ -104,7 +104,6 @@
               </el-input>
           </template>
         </el-table-column>
-        <el-table-column show-overflow-tooltip label="需求单单号" align="center" prop="code" width="150"/>
         <el-table-column show-overflow-tooltip label="供应仓库" align="center" prop="lastWarehouseName" width="100"/>
         <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">
@@ -115,6 +114,7 @@
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip label="业务类型" align="center" prop="billType" width="120" :formatter="formatterBillType"/>
+        <el-table-column show-overflow-tooltip label="行状态" align="center" prop="status" width="100px" :formatter="hangStatus"/>
         <el-table-column show-overflow-tooltip label="收货仓库" align="center" prop="deliveryWarehouseName" width="200">
             <template slot-scope="scope">
               <el-input clearable :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.deliveryWarehouseName" @clear="clean(scope.row, '收货仓库')" @focus="chooseMxCK(scope.$index, 'WAREHOUSE_PARAM', true, '收货仓库', scope.row.org)">

src/views/purchase/DemandSummary/index.vue

@@ -24,6 +24,7 @@
                 <el-select
                 v-model="queryParams.materialClassifyFour"
                 size="mini"
+                multiple
                 clearable
                 @focus="chooseTreeRefer('MATERIALCLASSIFY_PARAM', false, '选择品类')"
                 style="width: 200px"
@@ -242,8 +243,7 @@
           show-summary
           :summary-method="getSummaries"
           highlight-current-row
-          height="355"
-          max-height="355"
+          max-height="620"
           style="font-size: 12px;"
           :cell-class-name="cellClassName"
           @selection-change="handleSelectionChange"
@@ -254,50 +254,60 @@
           <el-table-column type="selection" width="60" fixed="left"/>
           <el-table-column show-overflow-tooltip  label="序号" type="index" align="center" width="50px" fixed="left"/>
           <!-- <el-table-column show-overflow-tooltip v-if="showColumn.status" label="行号" align="center" prop="rowNo"/> -->
-          <el-table-column show-overflow-tooltip v-if="showColumn.status" label="行状态" align="center" prop="status" width="100px" :formatter="hangStatus"/>
-          <el-table-column show-overflow-tooltip v-if="showColumn.materialClassifyOneName" label="一级品类" align="center" prop="materialClassifyOneName" width="80"/>
-          <el-table-column show-overflow-tooltip v-if="showColumn.materialCode" label="物料编码" align="center" prop="materialCode" width="150px"/>
-          <el-table-column show-overflow-tooltip v-if="showColumn.materialName" label="品名" align="center" prop="materialName" width="150px"/>
-          <el-table-column show-overflow-tooltip v-if="showColumn.specification" label="规格" align="center" prop="specification" width="100px"/>
-          <el-table-column show-overflow-tooltip v-if="showColumn.unit" label="单位" align="center" prop="unit"/>
-          <el-table-column show-overflow-tooltip v-if="showColumn.manufacturer" label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
-          <el-table-column show-overflow-tooltip v-if="showColumn.demandNum" label="需求单位数" align="center" prop="demandNum" width="80px"/>
-          <el-table-column show-overflow-tooltip v-if="showColumn.evensalesforyear" label="近1月月均需求" align="center" prop="evensalesforyear" width="80px">
+          <el-table-column show-overflow-tooltip v-if="showColumn.status" label="行状态" align="center" prop="status" width="50px" :formatter="hangStatus"/>
+          <el-table-column show-overflow-tooltip v-if="showColumn.finalBuyQty" label="最终采购量" align="center" prop="finalBuyQty" width="80px">
             <template slot-scope="scope">
-              {{scope.row.evensalesforyear ? parseFloat(scope.row.evensalesforyear).toFixed(2) : '0.00'}}
+                <el-input size="mini" :disabled="scope.row.status !== '1' || lineDisable" v-model="scope.row.finalBuyQty" @change="jilu(scope.$index)"/>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip v-if="showColumn.evensalesforthrmonth" label="近3月月均需求" align="center" prop="evensalesforthrmonth" width="80px">
+          <el-table-column show-overflow-tooltip v-if="showColumn.artificialAdjust" label="人工调整数" align="center" prop="artificialAdjust" width="50px">
             <template slot-scope="scope">
-              {{scope.row.evensalesforthrmonth ? parseFloat(scope.row.evensalesforthrmonth).toFixed(2) : '0.00'}}
+              {{scope.row.artificialAdjust = scope.row.finalBuyQty - scope.row.suggestionPurchase}}
             </template>
           </el-table-column>
+          <el-table-column show-overflow-tooltip v-if="showColumn.materialClassifyOneName" label="一级品类" align="center" prop="materialClassifyOneName" width="50"/>
+          <el-table-column show-overflow-tooltip v-if="showColumn.materialCode" label="物料编码" align="center" prop="materialCode" width="50px"/>
+          <el-table-column show-overflow-tooltip v-if="showColumn.materialName" label="品名" align="center" prop="materialName" width="50px"/>
+          <el-table-column show-overflow-tooltip v-if="showColumn.specification" label="规格" align="center" prop="specification" width="50px"/>
+          <el-table-column show-overflow-tooltip v-if="showColumn.unit" label="单位" align="center" prop="unit" width="50"/>
+          <el-table-column show-overflow-tooltip v-if="showColumn.manufacturer" label="生产厂家/代理人" align="center" prop="manufacturer" width="80px"/>
+          <el-table-column show-overflow-tooltip v-if="showColumn.demandNum" label="需求单位数" align="center" prop="demandNum" width="50px"/>
           <el-table-column show-overflow-tooltip v-if="showColumn.netDemandNum" label="总最终净需求量" align="center" prop="netDemandNum" width="80px">
             <template slot-scope="scope">
               {{scope.row.netDemandNum ? parseFloat(scope.row.netDemandNum).toFixed(2) : '0.00'}}
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip v-if="showColumn.totalMonthlySales" label="总月销量" align="center" prop="totalMonthlySales" width="80px">
+          <el-table-column show-overflow-tooltip v-if="showColumn.evensalesforyear" label="近1月月均需求" align="center" prop="evensalesforyear" width="50">
+            <template slot-scope="scope">
+              {{scope.row.evensalesforyear ? parseFloat(scope.row.evensalesforyear).toFixed(2) : '0.00'}}
+            </template>
+          </el-table-column>
+          <el-table-column show-overflow-tooltip v-if="showColumn.evensalesforthrmonth" label="近3月月均需求" align="center" prop="evensalesforthrmonth" width="50">
+            <template slot-scope="scope">
+              {{scope.row.evensalesforthrmonth ? parseFloat(scope.row.evensalesforthrmonth).toFixed(2) : '0.00'}}
+            </template>
+          </el-table-column>
+          <el-table-column show-overflow-tooltip v-if="showColumn.totalMonthlySales" label="总月销量" align="center" prop="totalMonthlySales" width="50">
             <template slot-scope="scope">
               {{scope.row.totalMonthlySales ? parseFloat(scope.row.totalMonthlySales).toFixed(2) : '0.00'}}
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip v-if="showColumn.demandCycle" label="需求可用周期" align="center" prop="demandCycle" width="80px">
+          <el-table-column show-overflow-tooltip v-if="showColumn.demandCycle" label="需求可用周期" align="center" prop="demandCycle" width="50px">
             <template slot-scope="scope">
               {{scope.row.demandCycle ? parseFloat(scope.row.demandCycle).toFixed(1) : '0.0'}}
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip v-if="showColumn.dullQut" label="呆滞量" align="center" prop="dullQut" width="80px">
+          <el-table-column show-overflow-tooltip v-if="showColumn.dullQut" label="呆滞量" align="center" prop="dullQut" width="50px">
             <template slot-scope="scope">
               {{parseFloat(scope.row.dullQut).toFixed(2)}}
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip v-if="showColumn.buyPeriod" label="采购周期" align="center" prop="buyPeriod" width="80px" />
-          <el-table-column show-overflow-tooltip v-if="showColumn.centralPublicStock" label="中心公共库存" align="center" prop="centralPublicStock" width="80px"/>
-          <el-table-column show-overflow-tooltip v-if="showColumn.centralWarehouse" label="中心仓专属货位" align="center" prop="centralWarehouse" width="80px"/>
-          <el-table-column show-overflow-tooltip v-if="showColumn.regionPublicStock" label="区域分仓公共库存" align="center" prop="regionPublicStock" width="80px"/>
-          <el-table-column show-overflow-tooltip v-if="showColumn.eachWarehouseStock" label="各项目仓库存" align="center" prop="eachWarehouseStock" width="80px"/>
-          <el-table-column show-overflow-tooltip v-if="showColumn.commerceWarehouse" label="电商仓库" align="center" prop="commerceWarehouse"  width="80px" />
+          <el-table-column show-overflow-tooltip v-if="showColumn.buyPeriod" label="采购周期" align="center" prop="buyPeriod" width="50px" />
+          <el-table-column show-overflow-tooltip v-if="showColumn.centralPublicStock" label="中心公共库存" align="center" prop="centralPublicStock" width="50"/>
+          <el-table-column show-overflow-tooltip v-if="showColumn.centralWarehouse" label="中心仓专属货位" align="center" prop="centralWarehouse" width="50"/>
+          <el-table-column show-overflow-tooltip v-if="showColumn.eachWarehouseStock" label="各项目仓库存" align="center" prop="eachWarehouseStock" width="50"/>
+          <el-table-column show-overflow-tooltip v-if="showColumn.commerceWarehouse" label="电商仓库" align="center" prop="commerceWarehouse"  width="50" />
+          <el-table-column show-overflow-tooltip v-if="showColumn.regionPublicStock" label="区域分仓公共库存" align="center" prop="regionPublicStock" width="50"/>
           <el-table-column show-overflow-tooltip v-if="showColumn.buyTransit" label="采购在途" align="center" prop="buyTransit"  width="80px" />
           <el-table-column show-overflow-tooltip v-if="showColumn.lendTransit" label="借出在途" align="center" prop="lendTransit"  width="80px" />
           <el-table-column show-overflow-tooltip v-if="showColumn.transferTransit" label="调拨在途" align="center" prop="transferTransit"  width="80px"/>
@@ -305,11 +315,6 @@
           <el-table-column show-overflow-tooltip v-if="showColumn.minPackage" label="最小包装量" align="center" prop="minPackage"  width="80px"/>
           <el-table-column show-overflow-tooltip v-if="showColumn.minOrder" label="最小订货量" align="center" prop="minOrder"  width="80px"/>
           <el-table-column show-overflow-tooltip v-if="showColumn.minBatch" label="最小批量" align="center" prop="minBatch"  width="80px"/>
-          <el-table-column show-overflow-tooltip v-if="showColumn.artificialAdjust" label="人工调整数" align="center" prop="artificialAdjust" width="80px">
-            <template slot-scope="scope">
-              {{scope.row.artificialAdjust = scope.row.finalBuyQty - scope.row.suggestionPurchase}}
-            </template>
-          </el-table-column>
           <el-table-column show-overflow-tooltip v-if="showColumn.modifyReason" label="修改原因" align="center" prop="modifyReason" width="150px">
             <template slot-scope="scope">
                 <el-input size="mini" :disabled="scope.row.status !== '1'|| lineDisable || scope.row.artificialAdjust == '0'" v-model="scope.row.modifyReason" @change="jilu(scope.$index)"/>
@@ -317,11 +322,6 @@
           </el-table-column>
           <el-table-column show-overflow-tooltip v-if="showColumn.suggestionPurchase" label="建议采购量" align="center" prop="suggestionPurchase"  width="80px"/>
           <!-- <el-table-column show-overflow-tooltip v-if="showColumn.status" label="建议净采购量" align="center" prop="suggestBuyQty" width="100px"/> -->
-          <el-table-column show-overflow-tooltip v-if="showColumn.finalBuyQty" label="最终采购量" align="center" prop="finalBuyQty" width="80px">
-            <template slot-scope="scope">
-                <el-input size="mini" :disabled="scope.row.status !== '1' || lineDisable" v-model="scope.row.finalBuyQty" @change="jilu(scope.$index)"/>
-            </template>
-          </el-table-column>
           <el-table-column show-overflow-tooltip v-if="showColumn.materialClassifyTwoName" label="二级品类" align="center" prop="materialClassifyTwoName" width="120px"/>
           <el-table-column show-overflow-tooltip v-if="showColumn.materialClassifyThreeName" label="三级品类" align="center" prop="materialClassifyThreeName" width="120px"/>
           <el-table-column show-overflow-tooltip v-if="showColumn.materialClassifyFourName" label="四级品类" align="center" prop="materialClassifyFourName" width="120px"/>
@@ -481,7 +481,7 @@ export default {
         rowStatus: ['1'],
         buyer: '',
         buyerName: '',
-        materialClassifyFour: '',
+        materialClassifyFour: [],
         manufacturer: '',
         forecastClassification: '',
         periodUnit: '',
@@ -588,7 +588,7 @@ export default {
         rowStatus: ['1'],
         buyer: '',
         buyerName: '',
-        materialClassifyFour: '',
+        materialClassifyFour: [],
         manufacturer: '',
         forecastClassification: '',
         periodUnit: '',
@@ -860,8 +860,8 @@ export default {
       this.$refs.tree.init(this.referCondition)
     },
     selectionsToInput2(selection) {
-      this.classOptions.push(selection)
-      this.queryParams.materialClassifyFour = selection.id
+      this.classOptions = selection
+      this.queryParams.materialClassifyFour = selection.map(item => {return item.id})
     },
     // 搜索区物料编码
     chooseMaterial() {

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

@@ -138,7 +138,7 @@
           puOrg,
           supplier,
           materialCode: prop.row.materialCode,
-          customer: prop.row.customer,
+          customer: prop.row.customerName ? prop.row.customer : '',
           customerName: prop.row.customerName,
           priceType: prop.row.priceType
         });
@@ -296,7 +296,7 @@
                   v-model="scope.row[scope.item.key]"
                   :size="$attrs.size"
                   :source.sync="scope.row"
-                  @change="changeCustomerName({ ...scope, selectData: $event })"
+                  @input="changeCustomerName({ ...scope, selectData: $event })"
                 >
                 </component>
               </template>

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

@@ -148,7 +148,7 @@
           puOrg,
           supplier,
           materialCode: prop.row.materialCode,
-          customer: prop.row.customer,
+          customer: prop.row.customerName ? prop.row.customer : '',
           customerName: prop.row.customerName,
           priceType: prop.row.priceType
         });
@@ -348,7 +348,7 @@
                   v-model="scope.row[scope.item.key]"
                   :size="$attrs.size"
                   :source.sync="scope.row"
-                  @change="changeCustomerName({ ...scope, selectData: $event })"
+                  @input="changeCustomerName({ ...scope, selectData: $event })"
                 >
                 </component>
               </template>

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

@@ -172,7 +172,14 @@
           isApprovalFirst,
           purchasequantity,
           recentlyPriceDate
-          } = await fetchExist({puOrg, supplier, materialCode: prop.row.materialCode, customer:prop.row.customer,customerName: prop.row.customerName, priceType: prop.row.priceType});
+          } = await fetchExist({
+            puOrg,
+            supplier,
+            materialCode: prop.row.materialCode,
+            customer: prop.row.customerName ? prop.row.customer : '',
+            customerName: prop.row.customerName,
+            priceType: prop.row.priceType
+          });
           prop.row.yPurchaseQuantity = purchasequantity
           prop.row.recentlyPrice = recentlyPrice
           prop.row.isApprovalFirst = isApprovalFirst
@@ -358,7 +365,7 @@
                   v-model="scope.row[scope.item.key]"
                   :size="$attrs.size"
                   :source.sync="scope.row"
-                  @change="changeCustomerName({ ...scope, selectData: $event })"
+                  @input="changeCustomerName({ ...scope, selectData: $event })"
                 >
                 </component>
               </template>