xzt-802,807

src/api/purchase/basic.js

@@ -41,7 +41,7 @@ export function delDivision(ids) {
 // 参照统一接口
 export function getRefer(data) {
   return request({
-    url: `/refer/query?pageSize=${data.pageSize}&pageNum=${data.pageNo}`,
+    url: `/refer/query?pageSize=1000&pageNum=1`,
     method: 'post',
     data: data
   })

src/components/Refers/refers.vue

@@ -35,6 +35,7 @@
               <el-table-column show-overflow-tooltip v-if="remark" prop="remark" header-align="center" align="center" min-width="90" label="备注"/>
               <el-table-column show-overflow-tooltip v-if="shortName" prop="shortName" header-align="center" align="center" min-width="90" label="简称"/>
               <el-table-column show-overflow-tooltip v-if="mneCode" prop="mneCode" header-align="center" align="center" min-width="90" label="助记码"/>
+              <el-table-column show-overflow-tooltip v-if="deptName" prop="deptName" header-align="center" align="center" min-width="90" label="部门"/>
             </el-table>
             <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
               :current-page="searchForm.pageNo" :page-sizes="[5, 10, 15, 20]" :page-size="searchForm.pageSize"
@@ -67,6 +68,7 @@ export default {
       dataList: [],
       total: 0,
       orgName: false,
+      deptName: false,
       warehouseAttributes: false,
       warehouseCode: false,
       warehouseName: false,
@@ -137,6 +139,12 @@ export default {
           this.orgName = false
           this.warehouseAttributes = false
         }
+        // 人员内加部门
+        if(res.rows.length !== 0 && res.rows[0].deptId) {
+          this.deptName = true
+        } else {
+          this.deptName = false
+        }
         // 选择货位里面加仓库
         if(res.rows.length !== 0 && res.rows[0].warehouseCode) {
           this.warehouseCode = true

src/views/purchase/DemandSummary/index.vue

@@ -33,6 +33,16 @@
               </el-form-item>
             </el-col>
             <el-col :span="1.5">
+              <el-form-item label="生产厂家">
+                <el-input
+                v-model.trim="queryParams.manufacturer"
+                size="mini"
+                clearable
+                style="width: 200px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
               <el-form-item label="" label-width="20px">
                 <el-button type="primary" size="mini" icon="el-icon-search" plain @click="search">搜索</el-button>
                 <el-button size="mini" icon="el-icon-refresh" plain @click="reset">重置</el-button>
@@ -44,16 +54,6 @@
           <div v-show="expanded">
             <el-row :gutter="10">
               <el-col :span="1.5">
-                <el-form-item label="生产厂家">
-                  <el-input
-                  v-model.trim="queryParams.manufacturer"
-                  size="mini"
-                  clearable
-                  style="width: 200px"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="1.5">
                 <el-form-item label="预测分类">
                   <el-select v-model="queryParams.forecastClassification" size="mini" style="width: 200px" clearable>
                     <el-option
@@ -69,39 +69,6 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <!-- <el-col :span="1.5">
-                <el-form-item label="周期单位">
-                  <el-select v-model="queryParams.periodUnit" size="mini" style="width: 200px" clearable>
-                    <el-option
-                      v-for="dict in dict.type.sys_period_unit" :key="dict.value" :label="dict.label" :value="dict.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col> -->
-            </el-row>
-
-            <el-row :gutter="10">
-              <!-- <el-col :span="1.5">
-                <el-form-item label="转请购单号">
-                  <el-input
-                  v-model="queryParams.zqgdh"
-                  size="mini"
-                  placeholder=""
-                  clearable
-                  style="width: 200px"
-                  />
-                </el-form-item>
-              </el-col> -->
-              <!-- <el-col :span="1.5">
-                <el-form-item label="业务部门">
-                  <el-select clearable size="mini" v-model="queryParams.departmentName" @focus="chooseRefer('DEPT_PARAM', true, '业务部门')" style="width: 200px">
-                    <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col> -->
-            </el-row>
-
-            <el-row :gutter="10">
               <el-col :span="1.5">
                 <el-form-item label="注册人">
                   <el-input
@@ -121,6 +88,9 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+
+            <el-row :gutter="10">
               <el-col :span="1.5">
                 <el-form-item label="单据来源">
                   <el-select v-model="queryParams.billSource" size="mini" style="width: 200px" clearable>
@@ -130,9 +100,6 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
-
-            <el-row :gutter="10">
               <el-col :span="1.5">
                 <el-form-item label="需求客户">
                   <el-select clearable size="mini" v-model="queryParams.customer" @focus="chooseRefer('CUSTOMER_PARAM', true, '需求客户')" style="width: 200px">
@@ -196,9 +163,6 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
-            </el-row>
-
-            <el-row :gutter="10">
               <el-col :span="1.5">
                 <el-form-item label="采购需求单号">
                   <el-input
@@ -209,6 +173,9 @@
                   />
                 </el-form-item>
               </el-col>
+            </el-row>
+
+            <el-row :gutter="10">
               <el-col :span="1.5">
                 <el-form-item label="审批结束日期">
                   <el-date-picker

src/views/purchase/PurchaseDemandList/add.vue

@@ -1197,152 +1197,152 @@ export default {
       console.log('复制的数组',rows);
       console.log('列表的数组',this.basicForm.puDemandItemList)
       let linArr = []
-      for (let i = 0; i<rows.length; i++) {
-        console.log('items',rows[i])
-        await getRefer({ type: 'MATERIAL_PARAM', code: rows[i] }).then(res => {
-          if (res.code === 200) {
-            let line = {
-              contacts: null,
-              id: null,
-              demandId: null,
-              status: null,
-              businessDept: null,
-              businessDeptName: null,
-              materialCategory: null,
-              buyer: null,
-              buyerName: null,
-              mateiralClassifyOne: null,
-              materialClassifyOneName: null,
-              materialClassifyTwo: null,
-              materialClassifyTwoName: null,
-              materialClassifyThree: null,
-              materialClassifyThreeName: null,
-              materialClassifyFour: null,
-              materialClassifyFourName: null,
-              materialCode: null,
-              material: null,
-              materialName: null,
-              classifyId: null,
-              specification: null,
-              unit: null,
-              unitName: null,
-              manufacturerName: null,
-              registrant: null,
-              puPeriod: null,
-              expiryUnit: null,
-              expiry: null,
-              minPackage: null,
-              minOrderQty: null,
-              minBatch: null,
-              safeStock: null,
-              averageQtyMonth: null,
-              qty: null,
-              adjustmentPersonal: null,
-              adjustmentTime: null,
-              manualRegulation: null,
-              updateCause: null,
-              reservedProportion: null,
-              reservedPeriod: null,
-              reservedQty: null,
-              demandPeriod: null,
-              forecastClassify: null,
-              onemonthAvgVolume: null,
-              threemonthAvgVolume: null,
-              deliveryDate: null,
-              isUrgency: this.basicForm.billType == 'JJXQ' ? 'Y' : 'N',
-              isReplenishment: this.basicForm.billType == 'BDXQ' ? 'Y' : 'N',
-              isBatchLock: 'N',
-              remark: null,
-              puRemark: null,
-              lastWarehouseQty: null,
-              resDemandQty: null,
-              lastWarehouse: null,
-              lastWarehouseName: null,
-              deliveryWarehouse: null,
-              deliveryWarehouseName: null,
-              lastAllocation: null,
-              lastAllocationName: null,
-              deliveryAllocation: null,
-              deliveryAllocationName: null,
-              passageOn: null,
-              puOrg: null,
-              purOrgName: null,
-              lastStockQty: null,
-              superiorCenterQty: null,
-              superiorAllotQty: null,
-              availableQty: null,
-              statusAllot: 'N',
-              additionalSupplier: null,
-              additionalSupplierName: null,
-              periodUnit: null,
-              demandCustomer: this.basicForm.customer,
-              demandCustomerName: this.basicForm.customerName,
-              businessDept: this.basicForm.demandDept,
-              businessDeptName: null,
-              lastStockOrg: null,
-              lastStockOrgName: null,
-              superiorStockOrg: null,
-              superiorStockOrgName: null,
-              allotCode: null,
-              deliveryAddress: null,
-              deliveryAddressName: null,
-              contacts: null,
-              contactsPhone: null,
-              address: null,
-              source: null,
-              priceType: 'order',
-              puManagerApprover: null,
-              puManagerApproverName: null,
-              processTime: null,
-              affirmer: null,
-              tenantId: null,
-              revision: null,
-              createBy: null,
-              createByName: null,
-              createTime: null,
-              updateBy: null,
-              updateByName: null,
-              updateTime: null,
-              delFlag: 0,
-              // 新增字段
-              model: null,
-              storageCondition: null,
-              transportationCondition: null,
-            }
-            line.businessDept = res.rows[0].businessDepartment
-            line.businessDeptName = res.rows[0].businessDepartmentName
-            line.materialCode = res.rows[0].code
-            line.material = res.rows[0].id
-            line.materialName = res.rows[0].name
-            line.classifyId = res.rows[0].classifyId
-            line.materialClassifyOneName = res.rows[0].oneClass
-            line.materialClassifyTwoName = res.rows[0].twoClass
-            line.materialClassifyThreeName = res.rows[0].threeClass
-            line.materialClassifyFourName = res.rows[0].fourClass
-            line.specification = res.rows[0].specification
-            line.model = res.rows[0].model
-            line.unit = res.rows[0].unitId
-            line.unitName = res.rows[0].unitIdName
-            line.registrant = res.rows[0].registrant
-            line.manufacturerName = res.rows[0].manufacturerIdName
-            line.puPeriod = res.rows[0].deliveryPeriod
-            line.expiry = res.rows[0].usefulLife
-            line.expiryUnit = res.rows[0].expiryUnitIdName
-            // line.minPackage = res.rows[0].usefulLife
-            line.minPackage = res.rows[0].minPackQty
-            line.minOrderQty = res.rows[0].minOrderQty
-            line.minBatch = res.rows[0].minBatchQty
-            line.safeStock = res.rows[0].safeStock
-            line.purOrgName = res.rows[0].purchasingOrganizationName
-            line.puOrg = res.rows[0].purchasingOrganization
-            // 物料存储条件和运输条件
-            line.transportationCondition = res.rows[0].transportationCondition
-            line.storageCondition = res.rows[0].storageCondition
-            linArr[i] = line
-          }
+      // for (let i = 0; i<rows.length; i++) {
+        // console.log('items',rows[i])
+        await getRefer({ type: 'MATERIAL_PARAM', materialCodeList: rows }).then(res => {
+          // if (res.code === 200) {
+          //   let line = {
+          //     contacts: null,
+          //     id: null,
+          //     demandId: null,
+          //     status: null,
+          //     businessDept: null,
+          //     businessDeptName: null,
+          //     materialCategory: null,
+          //     buyer: null,
+          //     buyerName: null,
+          //     mateiralClassifyOne: null,
+          //     materialClassifyOneName: null,
+          //     materialClassifyTwo: null,
+          //     materialClassifyTwoName: null,
+          //     materialClassifyThree: null,
+          //     materialClassifyThreeName: null,
+          //     materialClassifyFour: null,
+          //     materialClassifyFourName: null,
+          //     materialCode: null,
+          //     material: null,
+          //     materialName: null,
+          //     classifyId: null,
+          //     specification: null,
+          //     unit: null,
+          //     unitName: null,
+          //     manufacturerName: null,
+          //     registrant: null,
+          //     puPeriod: null,
+          //     expiryUnit: null,
+          //     expiry: null,
+          //     minPackage: null,
+          //     minOrderQty: null,
+          //     minBatch: null,
+          //     safeStock: null,
+          //     averageQtyMonth: null,
+          //     qty: null,
+          //     adjustmentPersonal: null,
+          //     adjustmentTime: null,
+          //     manualRegulation: null,
+          //     updateCause: null,
+          //     reservedProportion: null,
+          //     reservedPeriod: null,
+          //     reservedQty: null,
+          //     demandPeriod: null,
+          //     forecastClassify: null,
+          //     onemonthAvgVolume: null,
+          //     threemonthAvgVolume: null,
+          //     deliveryDate: null,
+          //     isUrgency: this.basicForm.billType == 'JJXQ' ? 'Y' : 'N',
+          //     isReplenishment: this.basicForm.billType == 'BDXQ' ? 'Y' : 'N',
+          //     isBatchLock: 'N',
+          //     remark: null,
+          //     puRemark: null,
+          //     lastWarehouseQty: null,
+          //     resDemandQty: null,
+          //     lastWarehouse: null,
+          //     lastWarehouseName: null,
+          //     deliveryWarehouse: null,
+          //     deliveryWarehouseName: null,
+          //     lastAllocation: null,
+          //     lastAllocationName: null,
+          //     deliveryAllocation: null,
+          //     deliveryAllocationName: null,
+          //     passageOn: null,
+          //     puOrg: null,
+          //     purOrgName: null,
+          //     lastStockQty: null,
+          //     superiorCenterQty: null,
+          //     superiorAllotQty: null,
+          //     availableQty: null,
+          //     statusAllot: 'N',
+          //     additionalSupplier: null,
+          //     additionalSupplierName: null,
+          //     periodUnit: null,
+          //     demandCustomer: this.basicForm.customer,
+          //     demandCustomerName: this.basicForm.customerName,
+          //     businessDept: this.basicForm.demandDept,
+          //     businessDeptName: null,
+          //     lastStockOrg: null,
+          //     lastStockOrgName: null,
+          //     superiorStockOrg: null,
+          //     superiorStockOrgName: null,
+          //     allotCode: null,
+          //     deliveryAddress: null,
+          //     deliveryAddressName: null,
+          //     contacts: null,
+          //     contactsPhone: null,
+          //     address: null,
+          //     source: null,
+          //     priceType: 'order',
+          //     puManagerApprover: null,
+          //     puManagerApproverName: null,
+          //     processTime: null,
+          //     affirmer: null,
+          //     tenantId: null,
+          //     revision: null,
+          //     createBy: null,
+          //     createByName: null,
+          //     createTime: null,
+          //     updateBy: null,
+          //     updateByName: null,
+          //     updateTime: null,
+          //     delFlag: 0,
+          //     // 新增字段
+          //     model: null,
+          //     storageCondition: null,
+          //     transportationCondition: null,
+          //   }
+          //   line.businessDept = res.rows[0].businessDepartment
+          //   line.businessDeptName = res.rows[0].businessDepartmentName
+          //   line.materialCode = res.rows[0].code
+          //   line.material = res.rows[0].id
+          //   line.materialName = res.rows[0].name
+          //   line.classifyId = res.rows[0].classifyId
+          //   line.materialClassifyOneName = res.rows[0].oneClass
+          //   line.materialClassifyTwoName = res.rows[0].twoClass
+          //   line.materialClassifyThreeName = res.rows[0].threeClass
+          //   line.materialClassifyFourName = res.rows[0].fourClass
+          //   line.specification = res.rows[0].specification
+          //   line.model = res.rows[0].model
+          //   line.unit = res.rows[0].unitId
+          //   line.unitName = res.rows[0].unitIdName
+          //   line.registrant = res.rows[0].registrant
+          //   line.manufacturerName = res.rows[0].manufacturerIdName
+          //   line.puPeriod = res.rows[0].deliveryPeriod
+          //   line.expiry = res.rows[0].usefulLife
+          //   line.expiryUnit = res.rows[0].expiryUnitIdName
+          //   // line.minPackage = res.rows[0].usefulLife
+          //   line.minPackage = res.rows[0].minPackQty
+          //   line.minOrderQty = res.rows[0].minOrderQty
+          //   line.minBatch = res.rows[0].minBatchQty
+          //   line.safeStock = res.rows[0].safeStock
+          //   line.purOrgName = res.rows[0].purchasingOrganizationName
+          //   line.puOrg = res.rows[0].purchasingOrganization
+          //   // 物料存储条件和运输条件
+          //   line.transportationCondition = res.rows[0].transportationCondition
+          //   line.storageCondition = res.rows[0].storageCondition
+          //   linArr[i] = line
+          // }
         })
         console.log('临时数组', linArr)
-      }
+      // }
       this.basicForm.puDemandItemList.push(...linArr)
       console.log('列表', this.basicForm.puDemandItemList)
       // this.basicForm.puDemandItemList.forEach(e => {

src/views/purchase/PurchaseDemandList/index.vue

@@ -34,6 +34,13 @@
               </el-form-item>
             </el-col>
             <el-col :span="1.5">
+              <el-form-item label="需求人员">
+                <el-select clearable size="mini" v-model="queryParams.demandPersonal" @focus="chooseOrg('CONTACTS_PARAM', true, '需求人员')" style="width: 200px">
+                  <el-option v-for="item in personOptions" :key="item.id" :label="item.name" :value="item.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
               <el-form-item label="" label-width="20px">
                 <el-button type="primary" size="mini" icon="el-icon-search" plain @click="searchList">搜索</el-button>
                 <el-button size="mini" icon="el-icon-refresh" plain @click="resetList">重置</el-button>
@@ -44,13 +51,6 @@
           <div v-show="expanded">
           <el-row :gutter="10">
             <el-col :span="1.5">
-              <el-form-item label="需求人员">
-                <el-select clearable size="mini" v-model="queryParams.demandPersonal" @focus="chooseOrg('CONTACTS_PARAM', true, '需求人员')" style="width: 200px">
-                  <el-option v-for="item in personOptions" :key="item.id" :label="item.name" :value="item.code" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1.5">
               <el-form-item label="单据来源">
                 <el-select clearable v-model="queryParams.source" size="mini" style="width: 200px">
                   <el-option v-for="dict in dict.type.sys_bill_source" :key="dict.value" :label="dict.label" :value="dict.value">
@@ -66,9 +66,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-
-          <el-row :gutter="10">
             <el-col :span="1.5">
               <el-form-item label="需求部门">
                 <el-select clearable v-model="queryParams.demandDept" size="mini" @focus="chooseOrg('DEPT_PARAM', true, '需求部门')" style="width: 200px">
@@ -94,18 +91,8 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="1.5">
-              <el-form-item label="备注">
-                <el-input
-                  v-model.trim="queryParams.remark"
-                  size="mini"
-                  clearable
-                  style="width: 200px"
-                />
-                </el-form-item>
-              </el-col>
           </el-row>
-
+          
           <el-row :gutter="10">
             <el-col :span="1.5">
               <el-form-item label="物料编码">
@@ -125,6 +112,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="备注">
+                <el-input
+                  v-model.trim="queryParams.remark"
+                  size="mini"
+                  clearable
+                  style="width: 200px"
+                />
+                </el-form-item>
+              </el-col>
           </el-row>
 
           </div>