Merge branch 'purchaseDev' into 'dev'

Purchase dev20231225

See merge request new-business/drp-web!626

src/views/purchase/apply/columns.js

@@ -23,7 +23,7 @@ export default function useColumns() {
     { item: { key: "approveUser", title: "当前审批人", width: 100 }, attr: {} },
     {
       item: { key: "isEffective", title: "是否已推价格", width: 100 },
-      attr: { is: "el-dict-tag", dictName: "is_effective"},
+      attr: { is: "el-dict-tag", dictName: "is_effective" },
     },
     {
       item: { key: "approveTime", title: "单据申请日期", width: 100 },
@@ -65,7 +65,11 @@ export default function useColumns() {
         is: "el-popover-select-v2",
         referName: "SUPPLIER_PARAM",
         valueKey: "name",
-        dataMapping: { supplier: "id", supplierName: "name" },
+        dataMapping: {
+          supplier: "id",
+          supplierCode: "code",
+          supplierName: "name",
+        },
       },
     },
     {

src/views/purchase/catalogue/columns.js

@@ -123,6 +123,7 @@ export default function useColumns() {
         valueKey: "name",
         dataMapping: {
           supplier: "id",
+          supplierCode: "code",
           supplierName: "name",
         },
       },

src/views/purchase/transferOrder/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="transferOrder">
     <div v-if="isList">
-      <el-card style="position: relative">
+      <el-card style="position: relative" v-loading="loading">
         <el-super-search
           v-model="params"
           :size="size"
@@ -11,7 +11,7 @@
           @submit="getList(params, Pages)"
         ></el-super-search>
 
-        <div class="btn_grooup">
+        <el-row class="my-4" style="text-align: right">
           <el-button-group style="margin-right: 5px">
             <el-button type="primary" :size="size" @click="addOrder"
               >新增</el-button
@@ -23,7 +23,7 @@
             @temDownload="useImportTemplate"
             :fileSize="2"
           ></BatchImport>
-        </div>
+        </el-row>
 
         <el-super-ux-table
           v-model="tableList"
@@ -48,33 +48,33 @@
             width="160"
           >
             <template slot-scope="scope">
-              <el-button type="text" size="mini" @click="check(scope.row)"
+              <el-button type="text" :size="size" @click="check(scope.row)"
                 >查看</el-button
               >
               <el-button
                 type="text"
-                size="mini"
+                :size="size"
                 v-if="scope.row.status == '0' || scope.row.status == '3'"
                 @click="edit(scope.row)"
                 >编辑</el-button
               >
               <el-button
                 type="text"
-                size="mini"
+                :size="size"
                 v-if="scope.row.status == '0' || scope.row.status == '3'"
                 @click="commit(scope.row)"
                 >提交</el-button
               >
               <el-button
                 type="text"
-                size="mini"
+                :size="size"
                 v-if="scope.row.status == '1'"
                 @click="handleBack(scope.row)"
                 >流程收回</el-button
               >
               <el-button
                 type="text"
-                size="mini"
+                :size="size"
                 v-if="scope.row.status == '0' || scope.row.status == '3'"
                 @click="deleteids(scope.row)"
                 >删除</el-button
@@ -113,7 +113,6 @@
       :row="rowDetail"
       @refresh="getList(params, Pages)"
     />
-    <Refers ref="refer" @doSubmit="selectionsToInput" :single="true" />
   </div>
 </template>
 
@@ -121,8 +120,6 @@
 import useColumns from "./columns";
 import { dicts } from "./dicts";
 import Add from "./add.vue";
-import CollapseTransition from "@/components/MyCollapse/collapse.vue";
-import Refers from "@/components/Refers/refers.vue";
 import {
   getOrderList,
   delOrder,
@@ -136,8 +133,6 @@ export default {
   dicts: [...dicts, "oa_templete_id"],
   components: {
     Add,
-    CollapseTransition,
-    Refers,
     ElSuperUxTable: () => import("@/components/super-ux-table/index.vue"),
     BatchImport: () => import("@/components/BatchImport/index.vue"),
     ElSuperSearch: () => import("@/components/super-search/index.vue"),
@@ -178,9 +173,6 @@ export default {
           label: "否",
         },
       ],
-      chuOrgOptions: [],
-      ruOrgOptions: [],
-      manOptions: [],
       tableList: [],
       // total: 0,
       tabParams: {
@@ -305,20 +297,6 @@ export default {
         .catch(() => {});
     },
 
-    selectionsToInput(selection) {
-      if (this.referCondition.title == "调出库存组织") {
-        this.chuOrgOptions = selection;
-        this.queryParams.deliveryInventoryOrg = selection[0].id;
-      }
-      if (this.referCondition.title == "调入库存组织") {
-        this.ruOrgOptions = selection;
-        this.queryParams.storageInventoryOrg = selection[0].id;
-      }
-      if (this.referCondition.title == "制单人") {
-        this.manOptions = selection;
-        this.queryParams.createBy = selection[0].code;
-      }
-    },
     //模板下载
     useImportTemplate() {
       this.download(
@@ -327,10 +305,6 @@ export default {
         `调拨单导入模板_${new Date().getTime()}.xlsx`
       );
     },
-    //导入
-    useImportData() {
-      console.log("导入");
-    },
     // 上传文件
     async onUpload(file) {
       try {
@@ -380,9 +354,4 @@ export default {
   box-sizing: border-box;
   overflow-y: scroll;
 }
-.btn_grooup {
-  margin: 10px 0;
-  display: flex;
-  justify-content: flex-end;
-}
 </style>