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

src/views/purchase/DemandSummary/index.vue

@@ -236,7 +236,7 @@
           <el-button type="primary" size="small" @click="confirms">确认</el-button>
           <el-button type="primary" size="small" @click="cancels">取消</el-button>
           <el-button type="primary" size="small" @click="audits">审核</el-button>
-          <!-- <el-button type="primary" size="small" @click="cancelAudits">弃审</el-button> -->
+          <el-button type="primary" size="small" @click="closeLine">行关闭</el-button>
 
           <el-dropdown size="small" @command="handleCommand">
             <el-button size="small" type="primary" style="margin: 0 10px;">
@@ -306,14 +306,14 @@
           <el-table-column show-overflow-tooltip label="四级品类" align="center" prop="materialClassifyFourName" width="150px"/>
           <el-table-column show-overflow-tooltip label="采购员" align="center" prop="buyerName" width="150px">
             <template slot-scope="scope">
-                <el-input :disabled="scope.row.status !== '1' || lineDisable" size="small" v-model="scope.row.buyerName">
+                <el-input readonly :disabled="scope.row.status !== '1' || lineDisable" size="small" v-model="scope.row.buyerName">
                   <el-button size="small" :disabled="scope.row.status !== '1' || lineDisable" slot="append" icon="el-icon-more" @click="chooseSon(scope.$index, 'CONTACTS_PARAM', true, '采购员')"></el-button>
                 </el-input>
             </template>
           </el-table-column>
           <el-table-column show-overflow-tooltip label="默认采购组织" align="center" prop="purchaseOrgName" width="280px">
             <template slot-scope="scope">
-                <el-input :disabled="scope.row.status !== '1' || lineDisable" size="small" v-model="scope.row.purchaseOrgName">
+                <el-input readonly :disabled="scope.row.status !== '1' || lineDisable" size="small" v-model="scope.row.purchaseOrgName">
                   <el-button size="small" :disabled="scope.row.status !== '1' || lineDisable" slot="append" icon="el-icon-more" @click="chooseSon(scope.$index, 'ORG_PARAM', true, '默认采购组织')"></el-button>
                 </el-input>
             </template>
@@ -374,7 +374,7 @@ import Refers from '@/components/Refers/refers.vue'
 import TreeRefers from '@/components/Refers/treeRefer.vue'
 import popDialog from '@/components/PopDialog/index.vue'
 import CollapseTransition from '@/components/MyCollapse/collapse.vue'
-import {getSummaryList, auditSummary, confirmSummary , cancelSummary , cancelAuditSummary, editSummaryList } from '@/api/purchase/DemandSummary.js'
+import {getSummaryList, auditSummary, confirmSummary , cancelSummary , shutDownSummary, editSummaryList } from '@/api/purchase/DemandSummary.js'
 export default {
   name: 'demandSummary',
   dicts: ['sys_row_status', 'predictive_classify', 'sys_period_unit', 'sys_business', 'sys_bill_source'],
@@ -649,18 +649,19 @@ export default {
         })
       }
     },
-    cancelAudits() {
+    // 行关闭
+    closeLine() {
       if (this.ids.length == 0) {
         this.$modal.msgWarning("请选中至少一条数据");
       } else {
         let param = this.ids.join()
-        cancelAuditSummary(param).then(res => {
+        shutDownSummary(param).then(res => {
           if (res.code === 200) {
             this.$modal.msgSuccess("操作成功");
             this.getList(this.queryParams)
           }
         })
-      } 
+      }
     },
     // 搜索区参照选择
     chooseRefer(type, isPage, title, stordocId) {

src/views/purchase/PurchaseDemandList/add.vue

@@ -671,12 +671,10 @@ export default {
         this.$refs['basic'].validate((valid) => {
           if(valid) {
             if(this.sonPageStu == 'add') {
-              this.$modal.loading("操作中...");
               this.handleData()
               addDemand(this.basicForm).then(res => {
                 console.log(333)
                 if (res.code === 200) {
-                  this.$modal.closeLoading();
                   this.$modal.msgSuccess("保存成功");
                   this.$emit('jugislist', true)
                   let queryParams = {
@@ -687,11 +685,15 @@ export default {
                 }
               })
             } else if (this.sonPageStu == 'edit') {
-              this.$modal.loading("操作中...");
-              this.basicForm.puDemandItemList.push(...this.delDemandItemList)
-              editDemand(this.basicForm).then(res => {
+              let list = []
+              list.push(...this.basicForm.puDemandItemList, ...this.delDemandItemList)
+              // 深拷贝一下参数对象
+              let param = JSON.parse(JSON.stringify(this.basicForm))
+              console.log('深拷贝对象',param);
+              param.puDemandItemList = list
+              // this.basicForm.puDemandItemList.push(...this.delDemandItemList)
+              editDemand(param).then(res => {
                 if (res.code === 200) {
-                  this.$modal.closeLoading();
                   this.$modal.msgSuccess("编辑成功");
                   this.$emit('jugislist', true)
                   let queryParams = {
@@ -1012,6 +1014,12 @@ export default {
       this.basicForm.puDemandItemList[this.tableIndex].lastWarehouse = null
       this.basicForm.puDemandItemList[this.tableIndex].lastAllocation = null
       this.basicForm.puDemandItemList[this.tableIndex].lastAllocationName = null
+      this.basicForm.puDemandItemList[this.tableIndex].materialClassifyOne = null
+      this.basicForm.puDemandItemList[this.tableIndex].materialClassifyTwo = null
+      this.basicForm.puDemandItemList[this.tableIndex].materialClassifyThree = null
+      this.basicForm.puDemandItemList[this.tableIndex].materialClassifyFour = null
+      this.basicForm.puDemandItemList[this.tableIndex].lastStockOrg = null
+      this.basicForm.puDemandItemList[this.tableIndex].lastStockOrgName = null
       // 通过选择物料查询采购员
       queryMan(selection[0].id).then(res => {
         if(res.code === 200 && res.rows.length !== 0) {
@@ -1101,6 +1109,7 @@ export default {
     cleanCustomer() {
       this.basicForm.customer = ''
       this.basicForm.customerName = ''
+      this.basicForm.customerCode = ''
       if (this.basicForm.puDemandItemList.length !== 0) {
         this.basicForm.puDemandItemList.forEach(item => {
           item.demandCustomerName = ''

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

@@ -31,7 +31,7 @@ export const FormColumns = [
     referName: "ORG_PARAM",
     valueKey: "name",
     dataMapping: {
-      puOrg: "code",
+      puOrg: "id",
       puOrgName: "name",
     },
     require: true,
@@ -173,20 +173,28 @@ export const TabColumns = [
         title: "物料名称",
         key: "materialName",
         inputType: "PopoverSelect",
-        width: 200,
+        width: 300,
         referName: "MATERIAL_PARAM",
         dataMapping: {
+          model: "model",
           material: "id",
-          unit: "unitId",
           materialCode: "code",
           materialName: "name",
+          unitName: "unitIdName",
+          puUnitName: "unitIdName",
           specification: "specification",
-          manufacturer: "manufacturerIdName",
+          manufacturer: "manufacturerId",
+          manufacturerName: "manufacturerIdName",
         },
+        require: true,
       },
       { title: "物料编码", key: "materialCode" },
       {
         title: "生产厂家",
+        key: "manufacturerName",
+      },
+      {
+        title: "生产厂家编码",
         key: "manufacturer",
       },
       {
@@ -201,10 +209,11 @@ export const TabColumns = [
         title: "单位名称",
         key: "unitName",
         inputType: "PopoverSelect",
-        width: 200,
+        width: 300,
         referName: "UNIT_PARAM",
         dataMapping: {
-          unit: "name",
+          unit: "code",
+          unitName: "name",
         },
       },
       {
@@ -215,10 +224,11 @@ export const TabColumns = [
         title: "采购单位名称",
         key: "puUnitName",
         inputType: "PopoverSelect",
-        width: 200,
+        width: 300,
         referName: "UNIT_PARAM",
         dataMapping: {
-          puUnit: "name",
+          puUnit: "code",
+          puUnitName: "name",
         },
       },
       {
@@ -229,7 +239,8 @@ export const TabColumns = [
         title: "采购换算率",
         key: "conversionRate",
         inputType: "InputNumber",
-        width: 200,
+        width: 300,
+        require: true,
       },
       {
         title: "税率%",
@@ -239,25 +250,28 @@ export const TabColumns = [
         dataMapping: {
           tax: "ntaxrate",
         },
-        width: 200,
+        width: 300,
+        require: true,
       },
       {
         title: "含税单价",
         key: "taxPrice",
         inputType: "InputNumber",
-        width: 200,
+        width: 300,
+        require: true,
       },
       {
         title: "无税单价",
-        key: "taxFreePrice",
+        key: "price",
         inputType: "ComputedInput",
-        width: 200,
+        width: 300,
         computed: (prop) => {
           const { tax, taxPrice } = prop;
           const newTax = Number(tax) / 100;
-          const taxFreePrice = (taxPrice / (1 + newTax)).toFixed(8);
-          return taxFreePrice === "NaN" ? null : taxFreePrice;
+          const price = (taxPrice / (1 + newTax)).toFixed(8);
+          return price === "NaN" ? null : price;
         },
+        require: true,
       },
       {
         key: "currencyName",
@@ -279,6 +293,7 @@ export const TabColumns = [
         inputType: "DatePicker",
         valueFormat: "yyyy-MM-dd",
         value: new Date(),
+        require: true,
       },
       {
         key: "periodEnd",
@@ -290,12 +305,13 @@ export const TabColumns = [
             return time.getTime() < Date.now() + 3600 * 1000 * 24 * 365;
           },
         },
+        require: true,
       },
       {
         title: "客户名称",
         key: "customerName",
         inputType: "PopoverSelect",
-        width: 200,
+        width: 300,
         referName: "CUSTOMER_PARAM",
         dataMapping: {
           customer: "code",
@@ -313,14 +329,14 @@ export const TabColumns = [
       {
         title: "首次报批",
         key: "isApprovalFirst",
-        width: 200,
+        width: 300,
         inputType: "Select",
         referName: "is_effective",
       },
       {
         title: "价格调整",
         key: "isPriceAdjustment",
-        width: 200,
+        width: 300,
         inputType: "Select",
         referName: "is_effective",
       },
@@ -333,9 +349,10 @@ export const TabColumns = [
       {
         title: "配送价",
         key: "isDistributionPrice",
-        width: 200,
+        width: 300,
         inputType: "Select",
         referName: "is_effective",
+        require: true,
       },
       {
         title: "创建人名称",

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

@@ -18,6 +18,24 @@ export default {
   },
   computed: {},
   watch: {
+    "params.puOrg": {
+      handler: function (newProp, oldProp) {
+        if (oldProp) {
+          this.params.priceApplyOrgs = this.params.priceApplyOrgs.filter(
+            (item) => item.org !== oldProp
+          );
+        }
+        if (newProp) {
+          const { puOrg: org, puOrgName: orgName } = this.params;
+          this.params.priceApplyOrgs.push({
+            org,
+            orgName,
+            createByName: undefined,
+            updateByName: undefined,
+          });
+        }
+      },
+    },
     "params.priceApplyItems": {
       handler: function () {},
       deep: true,

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

@@ -31,7 +31,7 @@ export const FormColumns = [
     referName: "ORG_PARAM",
     valueKey: "name",
     dataMapping: {
-      puOrg: "code",
+      puOrg: "id",
       puOrgName: "name",
     },
     require: true,
@@ -156,9 +156,11 @@ export const FormColumns = [
   {
     key: "status",
     title: "单据状态",
-    inputType: "Input",
+    inputType: "Select",
+    referName: "sys_status",
     disabled: true,
     readonly: true,
+    value: "0",
   },
 ];
 
@@ -171,20 +173,28 @@ export const TabColumns = [
         title: "物料名称",
         key: "materialName",
         inputType: "PopoverSelect",
-        width: 200,
+        width: 300,
         referName: "MATERIAL_PARAM",
         dataMapping: {
+          model: "model",
           material: "id",
           materialCode: "code",
           materialName: "name",
-          puUnit: "unitIdName",
+          unitName: "unitIdName",
+          puUnitName: "unitIdName",
           specification: "specification",
-          manufacturer: "manufacturerIdName",
+          manufacturer: "manufacturerId",
+          manufacturerName: "manufacturerIdName",
         },
+        require: true,
       },
       { title: "物料编码", key: "materialCode" },
       {
         title: "生产厂家",
+        key: "manufacturerName",
+      },
+      {
+        title: "生产厂家编码",
         key: "manufacturer",
       },
       {
@@ -199,10 +209,11 @@ export const TabColumns = [
         title: "单位名称",
         key: "unitName",
         inputType: "PopoverSelect",
-        width: 200,
+        width: 300,
         referName: "UNIT_PARAM",
         dataMapping: {
-          puUnit: "name",
+          unit: "code",
+          unitName: "name",
         },
       },
       {
@@ -213,10 +224,11 @@ export const TabColumns = [
         title: "采购单位名称",
         key: "puUnitName",
         inputType: "PopoverSelect",
-        width: 200,
+        width: 300,
         referName: "UNIT_PARAM",
         dataMapping: {
-          puUnit: "name",
+          puUnit: "code",
+          puUnitName: "name",
         },
       },
       {
@@ -227,7 +239,8 @@ export const TabColumns = [
         title: "采购换算率",
         key: "conversionRate",
         inputType: "InputNumber",
-        width: 200,
+        width: 300,
+        require: true,
       },
       {
         title: "税率%",
@@ -237,25 +250,28 @@ export const TabColumns = [
         dataMapping: {
           tax: "ntaxrate",
         },
-        width: 200,
+        width: 300,
+        require: true,
       },
       {
         title: "含税单价",
         key: "taxPrice",
         inputType: "InputNumber",
-        width: 200,
+        width: 300,
+        require: true,
       },
       {
         title: "无税单价",
-        key: "taxFreePrice",
+        key: "price",
         inputType: "ComputedInput",
-        width: 200,
+        width: 300,
         computed: (prop) => {
           const { tax, taxPrice } = prop;
           const newTax = Number(tax) / 100;
-          const taxFreePrice = (taxPrice / (1 + newTax)).toFixed(8);
-          return taxFreePrice === "NaN" ? null : taxFreePrice;
+          const price = (taxPrice / (1 + newTax)).toFixed(8);
+          return price === "NaN" ? null : price;
         },
+        require: true,
       },
       {
         key: "currencyName",
@@ -276,18 +292,26 @@ export const TabColumns = [
         title: "价格有效期（起）",
         inputType: "DatePicker",
         valueFormat: "yyyy-MM-dd",
+        value: new Date(),
+        require: true,
       },
       {
         key: "periodEnd",
         title: "价格有效期（止）",
         inputType: "DatePicker",
         valueFormat: "yyyy-MM-dd",
+        pickerOptions: {
+          disabledDate(time) {
+            return time.getTime() < Date.now() + 3600 * 1000 * 24 * 365;
+          },
+        },
+        require: true,
       },
       {
         title: "客户名称",
         key: "customerName",
         inputType: "PopoverSelect",
-        width: 200,
+        width: 300,
         referName: "CUSTOMER_PARAM",
         dataMapping: {
           customer: "code",
@@ -299,18 +323,22 @@ export const TabColumns = [
         key: "customer",
       },
       {
+        title: "最近价格",
+        key: "recentlyPrice",
+      },
+      {
         title: "首次报批",
         key: "isApprovalFirst",
-        width: 200,
+        width: 300,
         inputType: "Select",
-        referName: "sys_yes_no",
+        referName: "is_effective",
       },
       {
         title: "价格调整",
         key: "isPriceAdjustment",
-        width: 200,
+        width: 300,
         inputType: "Select",
-        referName: "sys_yes_no",
+        referName: "is_effective",
       },
       {
         key: "priceType",
@@ -321,9 +349,10 @@ export const TabColumns = [
       {
         title: "配送价",
         key: "isDistributionPrice",
-        width: 200,
+        width: 300,
         inputType: "Select",
-        referName: "sys_yes_no",
+        referName: "is_effective",
+        require: true,
       },
       {
         title: "创建人名称",

src/views/purchase/apply/hooks/function.js

@@ -1,6 +1,55 @@
 import { REFER } from "@/components/popover-select/api";
 import { EXIST } from "@/api/business/purchase/catalogue";
-import {  ITEM } from "@/api/business/purchase/apply";
+import { ITEM } from "@/api/business/purchase/apply";
+
+const fetchTax = async (prop) => {
+  try {
+    // try
+    const { code, rows } = await REFER({
+      search: prop,
+      type: "TAX_RATE_PARAM",
+    });
+    if (code === 200) {
+      return rows[0] || {};
+    }
+  } catch (err) {
+    // catch
+    console.error(err);
+  } finally {
+    // finally
+  }
+};
+
+const fetchUnit = async (prop) => {
+  try {
+    // try
+    const { code, rows } = await REFER({
+      search: prop,
+      type: "UNIT_PARAM",
+    });
+    if (code === 200) {
+      return rows[0] || {};
+    }
+  } catch (err) {
+    // catch
+    console.error(err);
+  } finally {
+    // finally
+  }
+};
+
+const fetchExist = async (prop) => {
+  try {
+    // try
+    const { code, data } = await EXIST(prop);
+    if (code === 200) return data;
+  } catch (err) {
+    // catch
+    console.error(err);
+  } finally {
+    // finally
+  }
+};
 
 export default function useMethods() {
   const fetchItem = async ({ _this, prop }) => {
@@ -20,44 +69,28 @@ export default function useMethods() {
     }
   };
   const fetchRefer = async ({ _this, prop, type, source }) => {
-    const { rateCode } = prop;
     if (type === "MATERIAL_PARAM") {
-      try {
-        // try
-        _this.loading = true;
-        // task 1
-        const { code, rows } = await REFER({
-          search: rateCode,
-          type: "TAX_RATE_PARAM",
-        });
-        if (code === 200) {
-          const [{ ntaxrate }] = rows;
-          source.tax = ntaxrate === "0E-8" ? "0.00000000" : ntaxrate;
-        }
-        // task 2
-        const { materialCode } = source;
-        const { puOrg, customer, supplier } = _this.params;
-        const {
-          code: code2,
-          data: { recentlyPrice, isApprovalFirst, isPriceAdjustment },
-        } = await EXIST({
-          puOrg,
-          customer,
-          supplier,
-          materialCode,
-        });
-        if (code2 === 200) {
+      const { puOrg, customer, supplier } = _this.params;
+      const { rateCode, unitIdName, code: materialCode } = prop;
+      // task 1
+      fetchTax(rateCode).then(({ ntaxrate }) => {
+        source.tax = ntaxrate === "0E-8" ? "0.00000000" : ntaxrate;
+      });
+      // task 2
+      fetchUnit(unitIdName).then(({ code, name }) => {
+        source.unit = code;
+        source.unitName = name;
+        source.puUnit = code;
+        source.puUnitName = name;
+      });
+      // task 3
+      fetchExist({ puOrg, customer, supplier, materialCode }).then(
+        ({ recentlyPrice, isApprovalFirst, isPriceAdjustment }) => {
           source.recentlyPrice = recentlyPrice;
           source.isApprovalFirst = isApprovalFirst;
           source.isPriceAdjustment = isPriceAdjustment;
         }
-      } catch (err) {
-        // catch
-        console.error(err);
-      } finally {
-        // finally
-        _this.loading = false;
-      }
+      );
     }
   };
 

src/views/purchase/catalogue/export/index.vue

@@ -0,0 +1,37 @@
+<script>
+import { EXPORT } from "@/api/business/purchase/catalogue";
+
+export default {
+  name: "ExportDialog",
+  data() {
+    return {};
+  },
+  computed: {},
+  watch: {},
+  methods: {
+    //
+    open(prop, page) {
+      this.$confirm("是否确认导出所有数据项?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "info",
+      })
+        .then(async () => {
+          const { pageNum, pageSize } = page;
+          this.download(
+            "pu/price/catalogue/export",
+            { ...prop, pageNum, pageSize },
+            `catalogue_${new Date().getTime()}.xlsx`
+          );
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+  },
+  created() {},
+  mounted() {},
+  destroyed() {},
+};
+</script>
+<template></template>

src/views/purchase/catalogue/index.vue

@@ -9,6 +9,7 @@ export default {
     SeeModel: () => import("./see/index.vue"),
     InvalidModel: () => import("./invalid/index.vue"),
     EnableModel: () => import("./enable/index.vue"),
+    ExportModel: () => import("./export/index.vue"),
   },
   data() {
     return {
@@ -105,6 +106,11 @@ export default {
         return !!prop.length;
       }
     },
+    // 导 出
+    async useExport(prop, page) {
+      const { open } = this.$refs.ExportModel;
+      await open(prop, page);
+    },
   },
 };
 </script>
@@ -121,6 +127,7 @@ export default {
     :body-style="{ padding: 0 }"
   >
     <see-model ref="SeeModel"></see-model>
+    <export-model ref="ExportModel"></export-model>
     <invalid-model
       ref="InvalidModel"
       @success="useQuery(params, page)"
@@ -199,6 +206,9 @@ export default {
         查 询
       </el-button>
       <el-button :size="size" @click="useReset"> 重 置 </el-button>
+      <el-button :size="size" @click="useExport(params, page)">
+        导 出
+      </el-button>
       <el-button
         v-show="hasPowerInvalid(selectData)"
         :size="size"

src/views/purchase/task/first-direct/index.vue

@@ -37,6 +37,7 @@ export default {
         const { code, data } = await FIRSTDIRECT(prop);
         if (code === 200) {
           this.data = data;
+          console.log(this.data);
           return true;
         } else {
           return false;
@@ -134,7 +135,7 @@ export default {
           :prop="cItem.key"
           :label="cItem.title"
           :fixed="cItem.fixed"
-          :width="cItem.width || 180"
+          :width="cItem.width || 200"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -144,6 +145,7 @@ export default {
               :size="size"
               :min="cItem.min(item)"
               :max="cItem.max(item)"
+              +
               :placeholder="cItem.placeholder"
               :controls-position="cItem.controlsPosition"
               style="width: 90%"

src/views/purchase/task/index.vue

@@ -61,10 +61,8 @@ export default {
     // 查 询
     async useQuery(prop, page) {
       const { pageNum, pageSize } = page;
-      const {
-        date: [startDate, endDate],
-        documentsCodes: code,
-      } = prop;
+      const { date, documentsCodes: code } = prop;
+      const [startDate, endDate] = date || [];
       const documentsCodes = code
         ? code.replace(/\s*/g, "").replaceAll("，", ",")
         : undefined;

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

@@ -50,7 +50,23 @@ export default {
 };
 </script>
 <template>
-  <el-drawer :visible.sync="visible" :size="width" :title="title">
+  <el-drawer
+    :size="width"
+    :title="title"
+    :show-close="false"
+    :visible.sync="visible"
+  >
+    <template slot="title">
+      <span>{{ title }}</span>
+      <span>
+        <el-button
+          :size="size"
+          circle
+          icon="el-icon-close"
+          @click="visible = false"
+        ></el-button>
+      </span>
+    </template>
     <el-descriptions :size="size" :column="column" border style="margin: 10px">
       <el-descriptions-item
         v-if="params[column.key]"

src/views/purchase/transferOrder/add.vue

@@ -166,7 +166,7 @@
          </el-col>
         <el-col :span="1.5">
             <el-form-item label="调出仓库">
-              <el-select clearable size="small" v-model="basicForm.deliveryWarehouse" :disabled="sonDisable || isOrg" @change="controlDCHW" @focus="chooseRefer('WAREHOUSE_PARAM', true, '调出仓库', basicForm.deliveryInventoryOrg)" style="width: 200px">
+              <el-select clearable size="small" v-model="basicForm.deliveryWarehouse" :disabled="sonDisable || isOrg" @change="controlDCHW" @focus="chooseRefer('WAREHOUSE_PARAM', true, '调出仓库', basicForm.deliveryInventoryOrg, 'N', 'N')" style="width: 200px">
                 <el-option v-for="item in chuHouseOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>