代码完善

src/views/purchase/arrivedGoods/ArriveGoodsForm.data.ts

@@ -94,6 +94,11 @@ export const columns: BasicColumn[] = [
       dataIndex: 'supplier',
       ifShow:false
      },
+   {
+      title: '制单人',
+      align:"center",
+      dataIndex: 'createBy',
+    },
 ];
 
 //子表表格配置

src/views/purchase/purchaseInquiryForm/PurchaseInquiryForm.data.ts

@@ -93,6 +93,11 @@ export const columns: BasicColumn[] = [
       align:"center",
       dataIndex: 'submit_dictText',
     },
+   {
+      title: '制单人',
+      align:"center",
+      dataIndex: 'createBy',
+    },
 ];
 
 //子表表格配置

src/views/purchase/purchaseOrder/PurchaseOrderForm.data.ts

@@ -152,6 +152,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'version',
     width: '250',
   },
+   {
+      title: '制单人',
+      align:"center",
+      dataIndex: 'createBy',
+    },
 ];
 
 //子表表格配置

src/views/purchase/purchaseOrder/PurchaseOrderFormList.vue

@@ -154,12 +154,12 @@
         <a-button type="primary" v-auth="'purCode:pur_order:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls">
           导出(export)</a-button
         >
-        <a-button type="primary" @click="submit"> 提交(submit)</a-button>
-        <a-button type="primary" @click="cancelSubmit"> 取消提交(cancelSubmit)</a-button>
+        <a-button type="primary" v-auth="'purCode:pur_order:add'" @click="submit"> 提交(submit)</a-button>
+        <a-button type="primary" v-auth="'purCode:pur_order:add'" @click="cancelSubmit"> 取消提交(cancelSubmit)</a-button>
         <a-button type="primary" @click="close" v-auth="'purCode:pur_order:close'"> 关闭(close)</a-button>
         <!-- <a-button type="primary" @click="cancelClose"> 取消关闭(cancel close)</a-button> -->
-        <a-button type="primary" @click="confirm"> 供应商确认(confirm)</a-button>
-        <a-button type="primary" @click="cancelConfirm"> 取消供应商确认(cancel confirm)</a-button>
+        <a-button type="primary" v-auth="'purCode:pur_order:add'" @click="confirm"> 供应商确认(confirm)</a-button>
+        <a-button type="primary" v-auth="'purCode:pur_order:add'" @click="cancelConfirm"> 取消供应商确认(cancel confirm)</a-button>
 		<a-button type="primary" v-auth="'purCode:pur_order:after'" @click="handleAfterAdd" preIcon="ant-design:plus-outlined"> 售后(add)</a-button>
 		
         <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -183,7 +183,7 @@
       </template>
       <!--字段回显插槽-->
       <template #bodyCell="{ column, record, index, text }"> </template>
-      //
+
       <template #viewFile="props">
         <a @click="viewFileDetail(props)">查看(view)</a>
       </template>
@@ -446,13 +446,13 @@
       {
         label: '查看历史版本(view history)',
         onClick: viewHistoryList.bind(null, record),
-        auth: 'saleCode:sale_inquiry_form:delete',
+        // auth: 'saleCode:sale_inquiry_form:delete',
         ifShow: record.submit == '1',
       },
       {
         label: '复制(copy)',
         onClick: handleCopy.bind(null, record),
-        //  auth: 'saleCode:sale_inquiry_form:delete',
+         auth: 'purCode:pur_order:add',
       },
       //  {
       //    label: '导出发票(export invoice)',

src/views/purchase/purchaseQuotationFrm/PurchaseQuotationForm.data.ts

@@ -101,6 +101,11 @@ export const columns: BasicColumn[] = [
       dataIndex: 'quotationSuppiler',
       ifShow:false
      },
+   {
+      title: '制单人',
+      align:"center",
+      dataIndex: 'createBy',
+    },
 ];
 
 //子表表格配置

src/views/purchase/selectionQuotationForm/SelectionQuotationForm.data.ts

@@ -66,6 +66,11 @@ export const columns: BasicColumn[] = [
         return text;
       },
     },
+   {
+      title: '制单人',
+      align:"center",
+      dataIndex: 'createBy',
+    },
 ];
 
 //子表表格配置

src/views/purchase/selectionQuotationForm/components/SelectQuotationFormForm.vue

@@ -93,7 +93,8 @@
           >
           <template #selectionSupplier="props">
             <a-select v-model:value="props.row.selectionSupplier" style="width: 100%;" @change="selectSupplier(props.row,props.rowIndex,props)"   :disabled="disabled">
-              <a-select-option v-for="item in supplierList" :key="item.value" >{{ item.label }}</a-select-option>
+             <!-- <a-select-option v-for="item in supplierList" :key="item.value" >{{ item.label }}</a-select-option> -->
+              <a-select-option v-for="item in props.row.supplierList" :key="item.value" >{{ item.label }}</a-select-option>
             </a-select>
           </template>
           <template #action="props">
@@ -412,13 +413,13 @@
           await defHttp.get({url:'/purCode/purPurchaseQuotation/supplierQuotationDetails',params}, { isTransformResponse: false }).then(res=>{
             if(res){
               SupplierQuotationDetailsTable.dataSource=res.result.records
-              supplierList.value= []
-              res.result.records.map(item=>{
-                 supplierList.value.push({label:item.suppilerName,value:item.quotationSuppiler})
-              })
-              supplierList.value = supplierList.value.filter((item, index, self) => {
-                return index === self.findIndex(obj => obj.value === item.value && obj.label === item.label);
-              });
+              // supplierList.value= []
+              // res.result.records.map(item=>{
+              //    supplierList.value.push({label:item.suppilerName,value:item.quotationSuppiler})
+              // })
+              // supplierList.value = supplierList.value.filter((item, index, self) => {
+              //   return index === self.findIndex(obj => obj.value === item.value && obj.label === item.label);
+              // });
 
             }
           })
@@ -452,6 +453,7 @@
                   item.sourceId2=item.id
                   item.sourceId3=item.childId
                   item.paymentTerm = item.paymentTerms
+                  item.supplierList = event.supplierList
                   arr[index]={...item}
                   arr[index].selectionSupplier=item.quotationSuppiler
                 }

src/views/saleCode/salesInvoice/salesInvoiceList.vue

@@ -221,7 +221,7 @@
 	import { message } from 'ant-design-vue';
 	import { useMethods } from '/@/hooks/system/useMethods';
 	const { handleExportXlsx } = useMethods();
-	const item1List = [];
+	let item1List = [];
 	const formRef = ref();
 	var queryParam = reactive<any>({});
 	var viewType = ref('');
@@ -462,7 +462,7 @@
 	}
 	async function handleView(prop) {
 		
-		this.item1List = [];
+		item1List = [];
 		var param = {
 			id: '',
 			type: '',
@@ -495,7 +495,7 @@
 						if(res.result.id == undefined || res.result.id == null){
 							st = true;
 							res.result.forEach((element) => {
-								this.item1List.push(element.billCode);
+								item1List.push(element.billCode);
 							});
 							return false;
 						}
@@ -545,7 +545,7 @@
 	}
 	async function handleRowExport(prop) {
 		
-		this.item1List = [];
+		item1List = [];
 		let param = {
 			id: '',
 			type: '',
@@ -579,7 +579,7 @@
 						if(res.result.id == undefined || res.result.id == null){
 							st = true;
 							res.result.forEach((element) => {
-								this.item1List.push(element.billCode);
+								item1List.push(element.billCode);
 							});
 							return false;
 						}