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

src/assets/styles/index.scss

@@ -211,10 +211,14 @@ aside {
 }
 /*表格*/
 .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+  width: 8px;
+  height: 8px;
 }
 .el-table__body-wrapper::-webkit-scrollbar-thumb {
   background-color: #a1a3a9;
   border-radius: 3px;
 }
+.el-input__suffix {
+  display: flex;
+  align-items: center;
+}

src/components/Pagination/index.vue

@@ -36,7 +36,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [1, 10, 20, 30, 50];
+        return [1, 10, 20, 50, 100];
       },
     },
     // 移动端页码按钮的数量端默认值5

src/components/popover-select-v2/fetch/index.js

@@ -0,0 +1,56 @@
+import { REFER } from "@/components/popover-select/api";
+
+// 币种
+export const currency = async (prop) => {
+  try {
+    // try
+    const { code, rows } = await REFER({
+      search: prop,
+      type: "CURRENCY_PARAM",
+    });
+    if (code === 200) {
+      return rows[0] || {};
+    }
+  } catch (err) {
+    // catch
+    console.error(err);
+  } finally {
+    // finally
+  }
+};
+// 税率
+export const tax = 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
+  }
+};
+// 单位
+export const unit = 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
+  }
+};

src/components/super-search/index.vue

@@ -28,15 +28,13 @@ export default {
   },
   data() {
     const { columns } = this.$props;
-    const stroageKey = (
-      this.$parent.$parent.$options.name + "_search"
-    ).toUpperCase();
-    const loaclColumns = JSON.parse(localStorage.getItem(stroageKey));
-    const innerColumns = !!loaclColumns ? loaclColumns : columns;
+    const innerColumns = columns.map(({ item, attr }) => ({
+      attr,
+      item: { ...item, hidden: true, span: item.span || 6 },
+    }));
     return {
       drawer: false,
       visible: false,
-      stroageKey: stroageKey,
       innerColumns: innerColumns,
     };
   },
@@ -51,18 +49,13 @@ export default {
     },
     showColumns: {
       get() {
-        const columns = this.innerColumns.filter(({ item }) => item.hidden);
-        return this.visible ? columns : columns.slice(0, 4);
+        return this.innerColumns.filter(({ item }) => item.hidden);
       },
       set() {},
     },
   },
   watch: {},
   methods: {
-    changeColumns() {
-      const { stroageKey, innerColumns } = this;
-      localStorage.setItem(stroageKey, JSON.stringify(innerColumns));
-    },
     onVisible() {
       this.visible = !this.visible;
     },

src/components/super-table/index.vue

@@ -47,20 +47,16 @@ export default {
       type: Boolean,
       default: false,
     },
+    // 是否列过滤
+    filterColumns: {
+      type: Boolean,
+      default: false,
+    },
     // 是否禁止选择
     selectable: {
       type: Function,
       default: () => {},
     },
-
-    // stroage: {
-    //   type: Boolean,
-    //   default: false,
-    // },
-    // hideOperationColumns: {
-    //   type: Boolean,
-    //   default: false,
-    // },
   },
   components: {
     ElDictTag: () => import("@/components/DictTag/index.vue"),
@@ -78,7 +74,10 @@ export default {
   },
   data() {
     const { columns } = this.$props;
-    const innerColumns = columns;
+    const innerColumns = columns.map(({ item, attr }) => ({
+      attr,
+      item: { ...item, hidden: true },
+    }));
     return {
       innerColumns: innerColumns,
       rowKey: "id",
@@ -148,30 +147,10 @@ export default {
       this.selectData = value;
     },
     //
-    onCellStyle({ row, column }) {
-      const { selectable } = this.$props;
-      // 禁止状态
-      if (!selectable(row)) {
-        return {
-          cursor: "no-drop",
-        };
-      }
-      // 选中状态
-      // if (
-      //   column.label === "#" &&
-      //   this.selectData.find((item) => item.id === row.id)
-      // ) {
-      //   return {
-      //     color: "#fff",
-      //     backgroundColor: "#409EFF",
-      //   };
-      // }
-    },
-    //
     onRowClick(row, column, event) {
-      const { radio, checkbox, selectable } = this.$props;
+      const { radio, checkbox } = this.$props;
       // 单选
-      if (radio && selectable(row)) {
+      if (radio) {
         this.selectData = [row];
         this.innerValue = this.innerValue.map((item) => ({
           ...item,
@@ -180,7 +159,7 @@ export default {
         this.$emit("row-select", this.selectData);
       }
       // 多选
-      if (checkbox && selectable(row)) {
+      if (checkbox) {
         this.$refs.superTable.toggleRowSelection(
           this.innerValue.find((item) => item.id === row.id)
         );
@@ -240,16 +219,14 @@ export default {
 <template>
   <div class="el-super-table">
     <el-table
-      v-bind="$attrs"
-      v-on="$listeners"
       ref="superTable"
       border
       :row-key="rowKey"
       :data="innerValue"
-      :cell-style="onCellStyle"
-      :row-style="{ height: '50px' }"
       @row-click="onRowClick"
       @selection-change="onSelectionChange"
+      v-bind="$attrs"
+      v-on="$listeners"
     >
       <!-- 序号 -->
       <el-table-column
@@ -269,7 +246,6 @@ export default {
       <el-table-column
         v-if="checkbox"
         :column-key="rowKey"
-        :selectable="selectable"
         fixed
         width="50"
         align="center"
@@ -283,12 +259,12 @@ export default {
         :prop="item.key"
         :label="item.title"
         :fixed="item.fixed"
-        :width="item.width"
+        :width="item.width || 200"
         show-overflow-tooltip
       >
         <template slot="header" slot-scope="scope">
           <template>
-            <span v-if="item.require" style="color:red">*</span>
+            <span v-if="item.require" style="color: #ff4949">*</span>
             <span
               :style="{
                 color:
@@ -320,6 +296,7 @@ export default {
               }"
             ></icon-freeze>
             <icon-filter
+              v-if="filterColumns"
               v-model="item.filter"
               class="icon-filter"
               :filters="onFilters({ item, attr })"
@@ -337,7 +314,6 @@ export default {
               @hide="onHide"
             ></icon-hide>
           </template>
-          <!-- <template v-else>{{ item.title }}</template> -->
         </template>
         <template slot-scope="scope">
           <slot :name="item.key" v-bind="scope" :item="item" :attr="attr">
@@ -378,6 +354,7 @@ export default {
                 v-bind="attr"
                 v-model="scope.row[item.key]"
                 :size="$attrs.size"
+                style="width: 100%"
               >
               </component
             ></template>

src/main.js

@@ -29,7 +29,7 @@ import {
   selectDictLabels,
   handleTree,
 } from "@/utils/ruoyi";
-import { initParams, initRules, initDicts } from "@/utils/init.js";
+import { initParams, initRules, initDicts, initPage } from "@/utils/init.js";
 // 分页组件
 import Pagination from "@/components/Pagination";
 // 自定义表格工具组件
@@ -73,6 +73,7 @@ Vue.prototype.$init = {
   params: initParams,
   dicts: initDicts,
   rules: initRules,
+  page: initPage,
 };
 
 // 全局组件挂载

src/utils/init.js

@@ -48,3 +48,7 @@ export const initDicts = (prop) => {
     )
   );
 };
+
+export const initPage = () => {
+  return { pageNum: 1, pageSize: 20, total: 0 };
+};

src/utils/init/index.js

@@ -33,4 +33,6 @@ export const initRules = (prop) => {
   return rules;
 };
 
-export const initPage = () => ({ pageNum: 1, pageSize: 10, total: 0, });
+export const initPage = () => {
+  return { pageNum: 1, pageSize: 20, total: 0 };
+};

src/views/purchase/PurchaseDemandList/add.vue

@@ -15,13 +15,13 @@
             </el-form-item>
          </el-col>
 
-        <el-col :span="1.5">
+        <!-- <el-col :span="1.5">
             <el-form-item label="组织" prop="org" :rules="{ required: true, message: '请选择组织', trigger: 'blur' }">
               <el-select clearable size="mini" v-model="basicForm.org" :disabled="sonDisable" @focus="chooseOrg('ORG_PARAM', true, '选择组织')" style="width: 200px">
                 <el-option v-for="item in orgOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
-         </el-col>
+         </el-col> -->
 
          <el-col :span="1.5">
             <el-form-item label="单据状态">
@@ -147,11 +147,14 @@
       </el-row>
 
 
-    <span>明细信息</span>
+    
       <div class="btn_grooup">
+        <span>明细信息</span>
+        <div>
         <el-button type="primary" size="mini" @click="addLine" v-if="!sonDisable">增行</el-button>
         <el-button type="primary" size="mini" v-if="!sonDisable" @click="adjustPl">批量调整</el-button>
         <el-button type="primary" size="mini" v-if="sonPageStu == 'check' || sonPageStu == 'edit'" @click="showReserved">货权预留单</el-button>
+        </div>
       </div>
 
       <el-table
@@ -177,7 +180,7 @@
           <el-table-column show-overflow-tooltip label="默认采购组织" align="center"  prop="purOrgName" width="200px"/>
           <el-table-column show-overflow-tooltip label="需求客户" align="center"  prop="demandCustomerName" width="180px"/>
           <el-table-column show-overflow-tooltip label="行状态" align="center" prop="status" :formatter="hangStatus" width="100px"/>
-          <el-table-column show-overflow-tooltip label="物料编码" align="center" prop="materialCode" width="220px">
+          <el-table-column show-overflow-tooltip label="物料编码" align="center" prop="materialCode" width="220px" :render-header="addRedStar">
             <template slot-scope="scope">
               <el-form-item class="hang" :prop="'puDemandItemList.' + scope.$index + '.' + 'materialCode'" :rules="{ required: true, message: '请选择物料编码', trigger: 'blur' }">
                 <el-input clearable :disabled="sonDisable" size="mini" v-model="scope.row.materialCode" @paste.native="pasteMe($event, scope, scope.$index)">
@@ -192,7 +195,7 @@
           <el-table-column show-overflow-tooltip label="单位" align="center"  prop="unitName"/>
           <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center"  prop="manufacturerName" width="230px"/>
           <el-table-column show-overflow-tooltip label="最小包装" align="center"  prop="minPackage" width="100px"/>
-          <el-table-column show-overflow-tooltip label="实际(业务)需求量" align="center"  prop="qty" width="150px">
+          <el-table-column show-overflow-tooltip label="实际(业务)需求量" align="center"  prop="qty" width="150px" :render-header="addRedStar">
             <template slot-scope="scope">
               <el-form-item class="hang" :prop="'puDemandItemList.' + scope.$index + '.' + 'qty'" :rules="{ required: true, message: '请填写实际(业务)需求量', trigger: 'blur' }">
                 <el-input type="number" min="0" clearable :disabled="sonDisable" size="mini" v-model="scope.row.qty" @input="getYLSL(scope)"/>
@@ -248,13 +251,7 @@
           <el-table-column show-overflow-tooltip label="最小订货量" align="center"  prop="minOrderQty" width="120px"/>
           <el-table-column show-overflow-tooltip label="采购员" align="center" prop="buyerName" width="100px"/>
           <!-- <el-table-column show-overflow-tooltip label="采购员" align="center"  prop="buyer"/> -->
-          <el-table-column show-overflow-tooltip label="采购周期" align="center"  prop="puPeriod" width="120px">
-            <template slot-scope="scope">
-              <el-form-item class="hang">
-                <el-input type="number" min="0" clearable :disabled="sonDisable" size="mini" v-model="scope.row.puPeriod"></el-input>
-              </el-form-item>
-            </template>
-          </el-table-column>
+          <el-table-column show-overflow-tooltip label="采购周期" align="center"  prop="puPeriod" width="120px"/>
           <el-table-column show-overflow-tooltip label="交货日期" align="center"  prop="deliveryDate" width="230px">
             <template slot-scope="scope">
               <el-form-item class="hang">
@@ -273,13 +270,7 @@
           </el-table-column>
           <el-table-column show-overflow-tooltip label="有效期" align="center"  prop="expiry" width="100px"/>
           <el-table-column show-overflow-tooltip label="有效期单位" align="center"  prop="expiryUnit" width="100px"/>
-          <el-table-column show-overflow-tooltip label="安全库存" align="center"  prop="safeStock" width="100px">
-            <template slot-scope="scope">
-              <el-form-item class="hang">
-                <el-input clearable :disabled="sonDisable" size="mini" v-model="scope.row.safeStock"/>
-              </el-form-item>
-            </template>
-          </el-table-column>
+          <el-table-column show-overflow-tooltip label="安全库存" align="center"  prop="safeStock" width="100px"/>
           <el-table-column show-overflow-tooltip label="注册人" align="center"  prop="registrant" width="100px"/>
           <el-table-column show-overflow-tooltip label="预留比例" align="center" prop="reservedProportion" width="120px">
             <template slot-scope="scope">
@@ -317,7 +308,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip label="补单供应商" align="center"  prop="additionalSupplierName" width="200px">
+          <el-table-column show-overflow-tooltip label="补单供应商" align="center"  prop="additionalSupplierName" width="200px" :render-header="anotherRedStar">
             <template slot-scope="scope">
               <el-form-item class="hang" :prop="'puDemandItemList.' + scope.$index + '.' + 'additionalSupplierName'" :rules="{ required: isBDXQ, message: '请选择补单供应商', trigger: 'blur' }">
                 <el-input clearable :disabled="sonDisable || BDZT" size="mini" v-model="scope.row.additionalSupplierName" @clear="clearHang(scope.$index, '选择补单供应商')" @focus="chooseDept(scope.$index, 'SUPPLIER_PARAM', true, '选择补单供应商')">
@@ -346,13 +337,7 @@
           </el-table-column>
           <el-table-column show-overflow-tooltip label="调拨单号" align="center"  prop="allotCode"></el-table-column>
           <el-table-column show-overflow-tooltip label="调拨占有量" align="center"  prop="allotQty" width="100px"/>
-          <el-table-column show-overflow-tooltip label="最终净需求量" align="center"  prop="resDemandQty" width="120px">
-            <template slot-scope="scope">
-              <el-form-item class="hang">
-                <el-input type="number" min="0" clearable :disabled="sonDisable" size="mini" v-model="scope.row.resDemandQty"/>
-              </el-form-item>
-            </template>
-          </el-table-column>
+          <el-table-column show-overflow-tooltip label="最终净需求量" align="center"  prop="resDemandQty" width="120px"/>
           <el-table-column show-overflow-tooltip label="最终采购执行数量" align="center"  prop="executeQty" width="150px">
             <template slot-scope="scope">
               {{ scope.row.executeQty ? scope.row.executeQty : 0 }}
@@ -567,8 +552,8 @@ export default {
         customerName: '',
         customerCode: '',
         customerPrincipal: '',
-        demandPersonal: '',
-        demandDept: '',
+        demandPersonal: this.$store.state.user.name,
+        demandDept: this.$store.state.user.deptId,
         demandDate: '',
         createTime: '',
         source: '4',
@@ -638,6 +623,9 @@ export default {
       this.getDetails(this.row)
     } else if(this.pageStu == 'edit') {
       this.getDetails(this.row)
+    } else if (this.pageStu == 'add') {
+      if (this.basicForm.demandPersonal) { this.reBackRefer('CONTACTS_PARAM', this.basicForm.demandPersonal, '需求人员') }
+      if (this.basicForm.demandDept) { this.reBackRefer('DEPT_PARAM', this.basicForm.demandDept) }
     }
   },
   methods: {
@@ -652,10 +640,12 @@ export default {
       if (this.basicForm.billType == 'BDXQ' && this.basicForm.puDemandItemList.length != 0) {
         this.isBDXQ = true
         this.BDZT = false
+        this.anotherRedStar()
         this.basicForm.puDemandItemList.forEach(item => {item.isReplenishment = 'Y'})
       } else {
         this.isBDXQ = false
         this.BDZT = true
+        this.anotherRedStar()
         this.basicForm.puDemandItemList.forEach(item => {
           item.isReplenishment = 'N'
           item.additionalSupplier = null
@@ -710,6 +700,7 @@ export default {
       this.basicForm.code = ''
       this.basicForm.createBy = ''
       this.basicForm.source = '4'
+      this.basicForm.isSpeical = 'N'
       this.basicForm.puDemandItemList.forEach(item => {
         item.status = ''
         item.buyerName = ''
@@ -768,7 +759,7 @@ export default {
     },
     async save() {
       if(this.basicForm.puDemandItemList.length !== 0) {
-        this.$refs['basic'].validate((valid) => {
+        this.$refs['basic'].validate((valid, obj) => {
           if(valid) {
             this.$modal.loading("保存中...");
             if(this.sonPageStu == 'add') {
@@ -801,6 +792,14 @@ export default {
                 this.$modal.closeLoading();
               })
             }
+          } else {
+            // 校验加弹窗
+            const jiaoyan = []
+            for(let key in obj) {
+              jiaoyan.push(obj[key][0].message);
+            }
+            this.$modal.notifyWarning(jiaoyan[0]);
+            return false
           }
         })
       } else {
@@ -954,6 +953,7 @@ export default {
       console.log('删除的数组',this.delDemandItemList)
     },
     back() {
+      console.log('打印人员信息看看', this.$store.state)
       this.$emit('jugislist', true)
       this.$emit('refresh')
     },
@@ -979,9 +979,11 @@ export default {
               if(this.basicForm.billType == 'BDXQ') {
                  this.BDZT = false
                  this.isBDXQ = true
+                 this.anotherRedStar()
               } else {
                  this.BDZT = true
                  this.isBDXQ = false
+                 this.anotherRedStar()
               }
             }
           })
@@ -1554,6 +1556,25 @@ export default {
         address: ''
       }
     },
+    // 必选标识
+    addRedStar(h, { column }) {
+      return [
+        h('span', { style: 'color: #F56C6C' }, '*'),
+        h('span', ' ' + column.label)
+      ];
+    },
+    anotherRedStar(h, { column }) {
+      if(this.isBDXQ) {
+      return [
+        h('span', { style: 'color: #F56C6C' }, '*'),
+        h('span', ' ' + column.label)
+      ];
+      } else {
+       return [
+          h('span', ' ' + column.label)
+        ]; 
+      }
+    },
   }
 }
 </script>
@@ -1571,7 +1592,7 @@ export default {
 .btn_grooup {
   margin-bottom: 10px;
   display: flex;
-  justify-content: flex-end;
+  justify-content: space-between;
 }
 .hang {
   margin: auto;

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

@@ -3,10 +3,6 @@ import CONFIG from "@/config";
 export default function useColumns() {
   const TableColumns = [
     {
-      item: { key: "priceName", title: "价格名称" },
-      attr: { is: "el-input", value: "价格申报单" },
-    },
-    {
       item: { key: "priceCode", title: "价格编码" },
       attr: { is: "el-input", disabled: true, readonly: true },
     },
@@ -80,6 +76,7 @@ export default function useColumns() {
       attr: {
         is: "el-select",
         dictName: "is_effective",
+        value: "N",
       },
     },
     {
@@ -138,7 +135,10 @@ export default function useColumns() {
             },
           },
         },
-        { item: { key: "materialCode", title: "物料编码" }, attr: {} },
+        {
+          item: { key: "materialCode", title: "物料编码", require: true },
+          attr: {},
+        },
         { item: { key: "manufacturerName", title: "生产厂家" }, attr: {} },
         { item: { key: "specification", title: "规格" }, attr: {} },
         { item: { key: "model", title: "型号" }, attr: {} },
@@ -267,10 +267,11 @@ export default function useColumns() {
           },
         },
         {
-          item: { key: "priceType", title: "价格类型" },
+          item: { key: "priceType", title: "价格类型", require: true },
           attr: {
             is: "el-select",
             dictName: "sys_price_type",
+            value: "order",
           },
         },
         {
@@ -278,44 +279,13 @@ export default function useColumns() {
           attr: {
             is: "el-select",
             dictName: "is_effective",
+            value: "N",
           },
         },
         { item: { key: "createByName", title: "创建人名称" }, attr: {} },
         { item: { key: "updateByName", title: "更新人名称" }, attr: {} },
       ],
     },
-    {
-      item: {
-        title: "合同执行组织范围",
-        key: "priceApplyOrgs",
-      },
-      attr: {
-        value: [],
-      },
-      TableColumns: [
-        {
-          item: { key: "orgName", title: "组织", require: true, width: "auto" },
-          attr: {
-            is: "el-popover-select-v2",
-            valueKey: "name",
-            referName: "ORG_PARAM",
-            dataMapping: {
-              org: "id",
-              orgCode: "code",
-              orgName: "name",
-            },
-          },
-        },
-        {
-          item: { key: "createByName", title: "创建人名称", width: "auto" },
-          attr: {},
-        },
-        {
-          item: { key: "updateByName", title: "更新人名称", width: "auto" },
-          attr: {},
-        },
-      ],
-    },
   ];
 
   return { TableColumns, TabColumns };

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

@@ -1,44 +1,8 @@
 <script>
 import useColumns from "./columns";
-import { REFER } from "@/components/popover-select/api";
 import { EXIST } from "@/api/business/purchase/catalogue";
 import { ITEM, SAVE } 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
-  }
-};
+import { tax, unit, currency } from "@/components/popover-select-v2/fetch";
 
 const fetchExist = async (prop) => {
   try {
@@ -143,21 +107,13 @@ export default {
     },
     priceApply: {
       get() {
-        const {
-          params: { priceApplyOrgs, priceApplyItems },
-        } = this;
-        this.params.priceApplyOrgs = priceApplyOrgs.map((item, index) => ({
-          ...item,
-          $index: index,
-        }));
-        this.params.priceApplyItems = priceApplyItems.map((item, index) => ({
-          ...item,
-          $index: index,
-        }));
+        this.params.priceApplyItems = this.params.priceApplyItems.map(
+          (item, index) => ({
+            ...item,
+            $index: index,
+          })
+        );
         return {
-          priceApplyOrgs: this.params.priceApplyOrgs.filter(
-            ({ delFlag }) => delFlag !== "2"
-          ),
           priceApplyItems: this.params.priceApplyItems.filter(
             ({ delFlag }) => delFlag !== "2"
           ),
@@ -169,35 +125,17 @@ export default {
   watch: {},
   methods: {
     //
-    changePuOrgName(prop) {
-      const {
-        select: { id: org, code: orgCode, name: orgName },
-      } = prop;
-      const index = this.params.priceApplyOrgs.findIndex(
-        (item) => item.org === org
-      );
-      if (index === -1) {
-        this.params.priceApplyOrgs.push({
-          org,
-          orgCode,
-          orgName,
-          createByName: undefined,
-          updateByName: undefined,
-        });
-      }
-    },
-    //
     changeMaterialName(prop) {
       const { row } = prop;
       const { puOrg, customer, supplier } = this.params;
       const { rateCode, unitIdName, code: materialCode } = row;
       // task 1
-      fetchTax(rateCode).then((res) => {
+      tax(rateCode).then((res) => {
         const { ntaxrate } = res;
         row.tax = ntaxrate === "0E-8" ? "0.000000" : (ntaxrate * 1).toFixed(6);
       });
       // task 2
-      fetchUnit(unitIdName).then((res) => {
+      unit(unitIdName).then((res) => {
         const { id, code, name } = res;
         row.unit = id;
         row.unitCode = code;
@@ -236,10 +174,28 @@ export default {
       }
     },
     //
-    async open() {
+    async onOpen() {
       const { addType, selectData } = this.$props;
       if (addType === "add") {
         this.visible = true;
+        const {
+          deptId: puDept,
+          deptName: puDeptName,
+          name: buyer,
+          nickName: buyerName,
+          orgId: puOrg,
+          orgName: puOrgName,
+        } = this.$store.state.user;
+        const { id, code, name } = await currency("人民币");
+        this.params.currency = id;
+        this.params.currencyCode = code;
+        this.params.currencyName = name;
+        this.params.puOrg = puOrg;
+        this.params.puOrgName = puOrgName;
+        this.params.buyer = buyer;
+        this.params.buyerName = buyerName;
+        this.params.puDept = puDept;
+        this.params.puDeptName = puDeptName;
       }
       if (addType === "copy") {
         const [{ id }] = selectData;
@@ -258,13 +214,6 @@ export default {
             updateByName: null,
           })
         );
-        this.params.priceApplyOrgs = this.params.priceApplyOrgs.map((item) => ({
-          ...item,
-          id: null,
-          applyId: null,
-          createByName: null,
-          updateByName: null,
-        }));
       }
       if (addType === "edit") {
         const [{ id }] = selectData;
@@ -274,13 +223,10 @@ export default {
             ...item,
           })
         );
-        this.params.priceApplyOrgs = this.params.priceApplyOrgs.map((item) => ({
-          ...item,
-        }));
       }
     },
     //
-    async hide() {
+    async onHide() {
       const {
         TabColumns,
         TableColumns,
@@ -295,7 +241,7 @@ export default {
       this.params = this.$init.params([...TabColumns, ...TableColumns]);
     },
     //
-    async useRowAdd(prop) {
+    async onRowAdd(prop) {
       const {
         $notify,
         TabColumns,
@@ -316,7 +262,7 @@ export default {
       });
     },
     //
-    async useRowRemove(prop, scope) {
+    async onRowRemove(prop, scope) {
       const { addType } = this.$props;
       const {
         row: { $index },
@@ -338,24 +284,18 @@ export default {
     //
     async useSubmit(prop) {
       this.$refs[prop].$refs[prop].validate(async (valid) => {
+        console.log(this.params);
         if (valid) {
           try {
             this.loading = true;
-            const {
-              params,
-              params: { priceApplyOrgs, priceApplyItems },
-            } = this;
             if (this.addType === "edit") {
-              params.priceApplyOrgs = priceApplyOrgs.filter(
-                (item) => item.orgName
-              );
-              params.priceApplyItems = priceApplyItems.filter(
+              this.params.priceApplyItems = this.params.priceApplyItems.filter(
                 (item) => item.materialName
               );
             }
-            const { msg, code } = await SAVE(params);
+            const { msg, code } = await SAVE(this.params);
             if (code === 200) {
-              this.hide();
+              this.onHide();
               this.$emit("success");
               this.$notify.success(msg);
             }
@@ -382,17 +322,32 @@ export default {
     v-bind="$attrs"
     v-on="$listeners"
     :disabled="disabled"
-    @click="open"
+    @click="onOpen"
   >
     {{ title }}
     <el-drawer
+      :show-close="false"
       :size="width"
       :title="title"
       :visible.sync="visible"
       append-to-body
       destroy-on-close
-      @close="hide"
+      @close="onHide"
     >
+      <template slot="title">
+        <span>{{ title }}</span>
+        <el-button
+          type="primary"
+          :size="$attrs.size"
+          :loading="loading"
+          @click="useSubmit('superForm')"
+        >
+          确 认
+        </el-button>
+        <el-button :size="$attrs.size" :loading="loading" @click="onHide">
+          取 消
+        </el-button>
+      </template>
       <el-super-form
         v-model="params"
         :dict="dict"
@@ -440,41 +395,24 @@ export default {
               >
               </component>
             </template>
-            <el-table-column fixed="right" label="操作" width="75">
+            <el-table-column fixed="right" label="操作" width="100">
               <template slot="header" slot-scope="scope">
-                <el-button
-                  circle
-                  icon="el-icon-plus"
-                  :size="$attrs.size"
-                  @click="useRowAdd(tabName)"
-                >
+                <el-button :size="$attrs.size" @click="onRowAdd(tabName)">
+                  新增
                 </el-button>
               </template>
               <template slot-scope="scope">
                 <el-button
-                  circle
-                  icon="el-icon-minus"
                   :size="$attrs.size"
-                  @click.native.prevent="useRowRemove(tabName, scope)"
+                  @click.native.prevent="onRowRemove(tabName, scope)"
                 >
+                  删除
                 </el-button>
               </template>
             </el-table-column>
           </el-super-table>
         </el-tab-pane>
       </el-tabs>
-      <div style="padding: 20px; text-align: right">
-        <el-button :size="$attrs.size" :loading="loading" @click="hide"
-          >取 消</el-button
-        >
-        <el-button
-          type="primary"
-          :size="$attrs.size"
-          :loading="loading"
-          @click="useSubmit('superForm')"
-          >确 认</el-button
-        >
-      </div>
     </el-drawer>
   </el-button>
 </template>

src/views/purchase/apply/columns.js

@@ -2,7 +2,6 @@ import CONFIG from "@/config";
 
 export default function useColumns() {
   const TableColumns = [
-    { item: { key: "priceName", title: "价格名称" }, attr: {} },
     { item: { key: "priceCode", title: "价格编码" }, attr: {} },
     {
       item: { key: "status", title: "状态" },
@@ -100,10 +99,7 @@ export default function useColumns() {
         clearable: true,
       },
     },
-  ].map(({ item, attr }) => ({
-    attr,
-    item: { ...item, hidden: true, span: item.span || 6 },
-  }));
+  ];
 
   return { TableColumns, SearchColumns };
 }

src/views/purchase/apply/index.vue

@@ -16,16 +16,17 @@ export default {
   },
   data() {
     const { TableColumns, SearchColumns } = useColumns();
+    const page = this.$init.page();
     const params = this.$init.params(SearchColumns);
     return {
       size: "mini",
       loading: false,
       params: params,
+      page: page,
       tableData: [],
       selectData: [],
       SearchColumns: SearchColumns,
       TableColumns: TableColumns,
-      page: { pageNum: 1, pageSize: 10, total: 0 },
     };
   },
   computed: {},
@@ -64,13 +65,13 @@ export default {
     },
     // 重 置
     useReset() {
-      this.page.pageNum = 1;
-      this.page.pageSize = 10;
+      this.page = this.$init.page();
       this.params = this.$init.params(this.SearchColumns);
       this.useQuery(this.params, this.page);
     },
     // 选 择
     useSelect(prop) {
+      console.log("prop", prop);
       this.selectData = prop;
     },
     // 明 细
@@ -92,7 +93,7 @@ export default {
       @reset="useReset"
       @submit="useQuery(params, page)"
     ></el-super-search>
-    <div style="margin: 0 0 20px 0; text-align: right">
+    <el-row class="my-4" style="text-align: right">
       <el-button-group>
         <add-button
           :size="size"
@@ -140,39 +141,34 @@ export default {
           @success="useQuery(params, page)"
         ></subm-button>
       </el-button-group>
-    </div>
+    </el-row>
     <el-super-table
       v-model="tableData"
       :size="size"
       :dict="dict"
+      :page="page"
       :columns="TableColumns"
-      stroage
-      hideOperationColumns
+      index
+      checkbox
+      pagination
+      hiddenColumns
+      filterColumns
+      height="600"
       @row-dblclick="useSee"
-      @selection-change="useSelect"
+      @row-select="useSelect"
+      @pagination="useQuery(params, page)"
     >
-      <el-table-column fixed width="55" align="center" label="#" prop="$index">
-      </el-table-column>
-      <el-table-column fixed width="55" align="center" type="selection">
-      </el-table-column>
     </el-super-table>
-    <pagination
-      :total="page.total"
-      :page.sync="page.pageNum"
-      :limit.sync="page.pageSize"
-      @pagination="useQuery(params, page)"
-      style="height: 32px; margin: 20px 0 0 0; padding: 0 !important"
-    />
   </el-card>
 </template>
 <style scoped lang="scss">
 .el-card {
-  width: calc(100% - 20px);
-  height: 100%;
-  margin: 10px;
-  padding: 20px;
+  width: calc(100% - 32px);
+  margin: 16px;
+  padding: 16px;
+  border-radius: 8px;
 }
 .el-button-group + .el-button-group {
-  margin: 0 0 0 10px;
+  margin: 0 0 0 8px;
 }
 </style>

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

@@ -3,10 +3,6 @@ import CONFIG from "@/config";
 export default function useColumns() {
   const TableColumns = [
     {
-      item: { key: "priceName", title: "价格名称" },
-      attr: {},
-    },
-    {
       item: { key: "priceCode", title: "价格编码" },
       attr: {},
     },
@@ -181,29 +177,6 @@ export default function useColumns() {
         { item: { key: "updateByName", title: "更新人名称" }, attr: {} },
       ],
     },
-    {
-      item: {
-        title: "合同执行组织范围",
-        key: "priceApplyOrgs",
-      },
-      attr: {
-        value: [],
-      },
-      TableColumns: [
-        {
-          item: { key: "orgName", title: "组织", width: "auto" },
-          attr: {},
-        },
-        {
-          item: { key: "createByName", title: "创建人名称", width: "auto" },
-          attr: {},
-        },
-        {
-          item: { key: "updateByName", title: "更新人名称", width: "auto" },
-          attr: {},
-        },
-      ],
-    },
   ];
 
   return { TableColumns, TabColumns };

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

@@ -20,8 +20,8 @@ export default {
       ],
     } = useColumns();
     return {
-      width: "50%",
-      column: 2,
+      width: "100%",
+      column: 3,
       title: "明 细",
       visible: false,
       loading: false,
@@ -115,12 +115,19 @@ export default {
   >
     {{ title }}
     <el-drawer
+      :show-close="false"
       :size="width"
       :title="title"
       :visible.sync="visible"
       append-to-body
       @close="hide(selectData)"
     >
+      <template slot="title">
+        <span>{{ title }}</span>
+        <el-button :size="$attrs.size" :loading="loading" @click="hide">
+          取 消
+        </el-button>
+      </template>
       <div
         style="
           z-index: 6666;
@@ -170,6 +177,7 @@ export default {
             :size="$attrs.size"
             :dict="dict"
             :columns="columns"
+            :cell-style="{ height: '30px' }"
           >
           </el-super-table>
         </el-tab-pane>

src/views/purchase/catalogue/columns.js

@@ -60,7 +60,6 @@ export default function useColumns() {
       item: { key: "priceType", title: "价格类型" },
       attr: { is: "el-dict-tag", dictName: "sys_price_type" },
     },
-    { item: { key: "demandCode", title: "采购需求单号" }, attr: {} },
     { item: { key: "expiryEarly", title: "效期预警" }, attr: {} },
     { item: { key: "priority", title: "含税/无税优先" }, attr: {} },
     { item: { key: "createByName", title: "创建人" }, attr: {} },

src/views/purchase/catalogue/index.vue

@@ -137,7 +137,12 @@ export default {
       :dict="dict"
       :page="page"
       :columns="TableColumns"
+      index
       checkbox
+      pagination
+      hiddenColumns
+      filterColumns
+      height="600"
       @row-dblclick="useSee"
       @selection-change="useSelect"
       @pagination="useQuery(params, page)"

src/views/purchase/catalogue/see/columns.js

@@ -60,7 +60,6 @@ export default function useColumns() {
       item: { key: "priceType", title: "价格类型" },
       attr: { is: "el-dict-tag", dictName: "sys_price_type" },
     },
-    { item: { key: "demandCode", title: "采购需求单号" }, attr: {} },
     { item: { key: "expiryEarly", title: "效期预警" }, attr: {} },
     { item: { key: "priority", title: "含税/无税优先" }, attr: {} },
     { item: { key: "createByName", title: "创建人" }, attr: {} },

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

@@ -11,9 +11,9 @@ export default {
   data() {
     const { TableColumns } = useColumns();
     return {
-      column: 1,
+      column: 3,
       title: "明 细",
-      width: "25%",
+      width: "100%",
       visible: false,
       loading: false,
       params: {},
@@ -93,11 +93,18 @@ export default {
   >
     {{ title }}
     <el-drawer
+      :show-close="false"
       :size="width"
       :title="title"
       :visible.sync="visible"
       append-to-body
     >
+      <template slot="title">
+        <span>{{ title }}</span>
+        <el-button :size="$attrs.size" :loading="loading" @click="hide">
+          取 消
+        </el-button>
+      </template>
       <div
         style="
           z-index: 6666;

src/views/purchase/task/index.vue

@@ -170,20 +170,19 @@ export default {
       </el-button-group>
     </div>
     <el-super-table
-      :key="key"
       v-model="tableData"
       :size="size"
       :dict="dict"
       :page="page"
       :columns="TableColumns"
-      :selectable="setSelectable"
       index
       checkbox
       hiddenColumns
+      filterColumns
+      pagination
       height="600"
       @row-select="useSelect"
       @pagination="useQuery(params, page)"
-      style="flex: 1"
     >
     </el-super-table>
   </el-card>