全部节点-销售部门销售员采购部门采购员显示文字

src/views/inventiry/salesOutbound/components/salesOutForm.vue

@@ -26,12 +26,12 @@
 						</a-col>
             <a-col :span="12">
 							<a-form-item label="销售部门(sale department)" v-bind="validateInfos.saleDepartment"  id="SaleOrderForm-saleDepartment" name="saleDepartment">
-								<a-input v-model:value="formData.saleDepartment" placeholder="请输入" disabled allow-clear ></a-input>
+								<a-input v-model:value="formData.saleDepartmentName" placeholder="请输入" disabled allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
 							<a-form-item label="业务员(salesman)" v-bind="validateInfos.salesman"  id="SaleOrderForm-salesman" name="salesman">
-								<a-input v-model:value="formData.salesman" placeholder="请输入" disabled allow-clear ></a-input>
+								<a-input v-model:value="formData.salesmanName" placeholder="请输入" disabled allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
@@ -178,8 +178,10 @@
         customer:"",
         customerName:'',
         saleDepartment: '',   
+        saleDepartmentName: '',   
         productionClass: '',   
         salesman:'',   
+        salesmanName:'',   
         goodsAllocation:'',
         warehouse:'',
         notes:'',
@@ -219,7 +221,9 @@
         stockOutTable.dataSource = [];
         activeKey.value = 'stockOut'
         formData.salesman=userStore.getUserInfo.username;
+        formData.salesmanName=userStore.getUserInfo.realname;
         formData.saleDepartment = userStore.getUserInfo.orgCode
+        formData.saleDepartmentName = userStore.getUserInfo.orgName
       }
       async function edit(row) {
         //主表数据

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

@@ -54,12 +54,12 @@ export const columns: BasicColumn[] = [
    {
     title: '采购部门(purchase department)',
     align:"center",
-    dataIndex: 'purchaseDepartment'
+    dataIndex: 'purchaseDepartmentName'
    },
    {
     title: '采购员(purchaseman)',
     align:"center",
-    dataIndex: 'purchaseman'
+    dataIndex: 'purchasemanName'
    },
    {
       title: '提交(submit)',

src/views/purchase/arrivedGoods/components/ArriveGoodsFormForm.vue

@@ -90,12 +90,12 @@
 						</a-col> 
             <a-col :span="12">
 							<a-form-item label="采购部门(purchase department)" v-bind="validateInfos.purchaseDepartment" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-purchaseDepartment" name="purchaseDepartment">
-								<a-input v-model:value="formData.purchaseDepartment" placeholder="请输入"  allow-clear disabled></a-input>
+								<a-input v-model:value="formData.purchaseDepartmentName" placeholder="请输入"  allow-clear disabled></a-input>
 							</a-form-item>
 						</a-col>   
             <a-col :span="12">
 							<a-form-item label="采购员(purchasesman)" v-bind="validateInfos.purchaseman" id="SaleOrderForm-purchaseman" name="purchaseman">
-								<a-input v-model:value="formData.purchaseman" placeholder="请输入采购员(salesman)"  allow-clear disabled ></a-input>
+								<a-input v-model:value="formData.purchasemanName" placeholder="请输入采购员(salesman)"  allow-clear disabled ></a-input>
 							</a-form-item>
 						</a-col> 
             <a-col :span="12">
@@ -253,7 +253,9 @@
         recipientAddress:'',
         warrantyTerms:'',
         purchaseDepartment:'',
+        purchaseDepartmentName:'',
         purchaseman:'',
+        purchasemanName:'',
         invoiceDate:'',
         notes:'',
         arrivalDetails:"",
@@ -291,7 +293,9 @@
         arriveDetailsFormProductTable.dataSource = [];
         activeKey.value = 'arriveDetailsFormProduct'
         formData.purchaseman=userStore.getUserInfo.username;
+        formData.purchasemanName=userStore.getUserInfo.realname;
         formData.purchaseDepartment = userStore.getUserInfo.orgCode
+        formData.purchaseDepartmentName = userStore.getUserInfo.orgName
         getSupplierOption()
       }
       async function edit(row) {

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

@@ -54,12 +54,12 @@ export const columns: BasicColumn[] = [
    {
     title: '采购部门(purchase department)',
     align:"center",
-    dataIndex: 'purchaseDepartment'
+    dataIndex: 'purchaseDepartmentName'
    },
    {
     title: '采购员(purchaseman)',
     align:"center",
-    dataIndex: 'purchaseman',
+    dataIndex: 'purchasemanName',
     width:'250'
    },
    {

src/views/purchase/purchaseOrder/components/PurchaseOrderFormForm.vue

@@ -116,12 +116,12 @@
 						</a-col>
             <a-col :span="12">
 							<a-form-item label="采购部门(purchase department)" v-bind="validateInfos.purchaseDepartment" id="SaleOrderForm-purchaseDepartment" name="purchaseDepartment">
-								<a-input v-model:value="formData.purchaseDepartment" placeholder="请输入"  allow-clear disabled></a-input>
+								<a-input v-model:value="formData.purchaseDepartmentName" placeholder="请输入"  allow-clear disabled></a-input>
 							</a-form-item>
 						</a-col>   
             <a-col :span="12">
 							<a-form-item label="采购员(purchasesman)" v-bind="validateInfos.purchaseman" id="SaleOrderForm-purchaseman" name="purchaseman"  :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1">
-								<a-input v-model:value="formData.purchaseman" placeholder="请输入采购员(salesman)"  allow-clear disabled ></a-input>
+								<a-input v-model:value="formData.purchasemanName" placeholder="请输入采购员(salesman)"  allow-clear disabled ></a-input>
 							</a-form-item>
 						</a-col> 
             <a-col :span="12">
@@ -291,7 +291,9 @@
         warrantyTerms:'',
         exchangeRate:'',
         purchaseDepartment:"",
+        purchaseDepartmentName:"",
         purchaseman:'',
+        purchasemanName:'',
         currency:'',
         notes:''
       });
@@ -328,7 +330,9 @@
         purOrderFormShipFormProductTable.dataSource = [];
         activeKey.value = 'purOrderFormShipFormProduct'
         formData.purchaseman=userStore.getUserInfo.username;
+        formData.purchasemanName=userStore.getUserInfo.realname;
         formData.purchaseDepartment = userStore.getUserInfo.orgCode
+        formData.purchaseDepartmentName = userStore.getUserInfo.orgName
       }
       async function copy(data,id){
         //主表数据

src/views/saleCode/deliveryNotice/components/deliveryNoticeForm.vue

@@ -76,7 +76,7 @@
 						</a-col>
             <a-col :span="12">
 							<a-form-item label="销售部门(sale department)" v-bind="validateInfos.saleDepartment" id="SaleInquiryFormForm-saleDepartment" name="saleDepartment">
-								<a-input v-model:value="formData.saleDepartment" placeholder=""  allow-clear disabled></a-input>
+								<a-input v-model:value="formData.saleDepartmentName" placeholder=""  allow-clear disabled></a-input>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
@@ -101,7 +101,7 @@
 						</a-col>
             <a-col :span="12">
 							<a-form-item label="业务员(salesman)" v-bind="validateInfos.salesman" id="quotationFormForm-salesman" name="salesman">
-								<a-input v-model:value="formData.salesman" placeholder=""  allow-clear disabled></a-input>
+								<a-input v-model:value="formData.salesmanName" placeholder=""  allow-clear disabled></a-input>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
@@ -274,16 +274,17 @@
         isExport:'',
         warrantyPeriod:'',
         saleDepartment:'',
+        saleDepartmentName:'',
         packagebRequirement:'', 
         linkMan:'',    
         address:'', 
         linkNumber:'',
         salesman: '', 
+        salesmanName: '', 
         fnumber:"",
         blno: '',   
         notes: '',   
         invoiceHeader:'',
-        invoiceHeader:'',
       });
 
       //表单验证
@@ -320,7 +321,9 @@
         getOptiom()
         getCustomerOptions()
         formData.salesman=userStore.getUserInfo.username;
+        formData.salesmanName=userStore.getUserInfo.realname;
         formData.saleDepartment = userStore.getUserInfo.orgCode
+        formData.saleDepartmentName = userStore.getUserInfo.orgName
         notAllowEdit.value = false
       }
       //编辑方法

src/views/saleCode/quotation/components/quotationFormForm.vue

@@ -81,7 +81,7 @@
 						</a-col>
             <a-col :span="12">
 							<a-form-item label="销售部门(sale department)" v-bind="validateInfos.saleDepartment" id="SaleInquiryFormForm-saleDepartment" name="saleDepartment">
-								<a-input v-model:value="formData.saleDepartment" placeholder=""  allow-clear disabled></a-input>
+								<a-input v-model:value="formData.saleDepartmentName" placeholder=""  allow-clear disabled></a-input>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
@@ -91,7 +91,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="业务员(salesman)" v-bind="validateInfos.salesman" id="quotationFormForm-salesman" name="salesman">
-								<a-input v-model:value="formData.salesman" placeholder=""  allow-clear disabled></a-input>
+								<a-input v-model:value="formData.salesmanName" placeholder=""  allow-clear disabled></a-input>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
@@ -279,8 +279,10 @@
         placeDelivery: '',
         custumerDiscount: '',
         saleDepartment:'',
+        saleDepartmentName: '', 
         packagingMethod:'',      
         salesman: '', 
+        salesmanName: '',   
         quotationNotes:"",
         attachs: '',   
         supplierAttachs: '',   
@@ -322,7 +324,9 @@
         getCustomerOptions()
         quotationPeriod.value = []
         formData.salesman=userStore.getUserInfo.username;
+        formData.salesmanName=userStore.getUserInfo.realname;
         formData.saleDepartment = userStore.getUserInfo.orgCode
+        formData.saleDepartmentName = userStore.getUserInfo.orgName
         notAllowEdit.value = false
       }
       //编辑方法

src/views/saleCode/saleContract/SaleContract.data.ts

@@ -59,12 +59,12 @@ export const columns: BasicColumn[] = [
    {
     title: '销售部门(sale department)',
     align:"center",
-    dataIndex: 'saleDepartment'
+    dataIndex: 'saleDepartmentName'
    },
    {
     title: '业务员(salesman)',
     align:"center",
-    dataIndex: 'salesman'
+    dataIndex: 'saleDepartmentName'
    },
    {
     title: '关闭(close)',
@@ -201,24 +201,6 @@ export const searchFormSchema: FormSchema[] = [
       },
       //colProps: {span: 6},
  	},
-	{
-      label: "业务员(salesman)",
-      field: "salesman",
-      labelWidth: 150,
-      component: 'JSelectUser',
-      componentProps:{
-      },
-      //colProps: {span: 6},
- 	},
-   {
-    label: "销售部门(sale department)",
-    field: "saleDepartment",
-    labelWidth: 180,
-    component: 'JSelectDept',
-    componentProps:{
-    },
-    //colProps: {span: 6},
- },
    {
     label: "提交(submit)",
     field: "status",
@@ -380,22 +362,34 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '销售部门(sale department)',
-    field: 'saleDepartment',
+    field: 'saleDepartmentName',
     labelWidth: 200,
     component: 'Input',
     dynamicDisabled:true,  
     componentProps:{
     },
   },
+  {
+	  label: '',
+	  field: 'saleDepartment',
+	  component: 'Input',
+	  show: false
+	},
   {
     label: '业务员(salesman)',
-    field: 'salesman',
+    field: 'salesmanName',
     labelWidth: 200,
     component: 'Input',
     dynamicDisabled:true,  
     componentProps:{
     },
   },
+  {
+	  label: '',
+	  field: 'salesman',
+	  component: 'Input',
+	  show: false
+	},
   {
     label: '汇率(exchange rate)',
     field: 'exchangeRate',

src/views/saleCode/saleContract/components/SaleContractModal.vue

@@ -140,6 +140,8 @@
           await setFieldsValue({ billDate: moment(new Date()).format('YYYY-MM-DD')});
           await setFieldsValue({ salesman: userStore.getUserInfo.username });
           await setFieldsValue({ saleDepartment: userStore.getUserInfo.orgCode });
+          await setFieldsValue({ salesmanName: userStore.getUserInfo.realname });
+          await setFieldsValue({ saleDepartmentName: userStore.getUserInfo.orgName });
         }
         // 隐藏底部时禁用整个表单
        setProps({ disabled: !data?.showFooter })

src/views/saleCode/saleInquiryForm/components/SaleInquiryFormForm.vue

@@ -67,12 +67,12 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="销售部门(sale department)" v-bind="validateInfos.saleDepartment" id="SaleInquiryFormForm-saleDepartment" name="saleDepartment">
-								<a-input v-model:value="formData.saleDepartment" placeholder=""  allow-clear disabled></a-input>
+								<a-input v-model:value="formData.saleDepartmentName" placeholder=""  allow-clear disabled></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="业务员(salesman)" v-bind="validateInfos.salesman" id="SaleInquiryFormForm-salesman" name="salesman">
-								<a-input v-model:value="formData.salesman" placeholder=""  allow-clear disabled></a-input>
+								<a-input v-model:value="formData.salesmanName" placeholder=""  allow-clear disabled></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -241,7 +241,9 @@
         model: '',   
         maker: '',   
         saleDepartment: '',   
+        saleDepartmentName: '',   
         salesman: '',   
+        salesmanName: '',   
         inquiryTeam: '',   
         deliveryTime: '',   
         attachs: '',   
@@ -282,7 +284,9 @@
         getCustomerOptions()
         inquiryPeriod.value = []
         formData.salesman=userStore.getUserInfo.username;
+        formData.salesmanName=userStore.getUserInfo.realname;
         formData.saleDepartment = userStore.getUserInfo.orgCode
+        formData.saleDepartmentName = userStore.getUserInfo.orgName
       }
 
       async function edit(row) {

src/views/saleCode/salesOrder/components/SlaeOrderFormForm.vue

@@ -122,7 +122,7 @@
 						</a-col> 
             <a-col :span="12">
 							<a-form-item label="销售部门(sale department)" v-bind="validateInfos.saleDepartment" id="SaleOrderForm-saleDepartment" name="saleDepartment" >
-								<a-input v-model:value="formData.saleDepartment" placeholder="请输入"  allow-clear disabled ></a-input>
+								<a-input v-model:value="formData.saleDepartmentName" placeholder="请输入"  allow-clear disabled ></a-input>
 							</a-form-item>
 						</a-col>   
             <a-col :span="12">
@@ -132,7 +132,7 @@
 						</a-col> 
             <a-col :span="12">
 							<a-form-item label="业务员(salesman)" v-bind="validateInfos.salesman" id="SaleOrderForm-salesman" name="salesman" >
-								<a-input v-model:value="formData.salesman" placeholder="请输入业务员(salesman)"  allow-clear disabled ></a-input>
+								<a-input v-model:value="formData.salesmanName" placeholder="请输入业务员(salesman)"  allow-clear disabled ></a-input>
 							</a-form-item>
 						</a-col>    
             <a-col :span="12">
@@ -321,7 +321,9 @@
         isExport:'',
         packagebRequirement:'',
         saleDepartment:'',
+        saleDepartmentName:'',
         salesman:'',
+        salesmanName:'',
         customerOrder:'',
         doubleDiscount:'',
         convertedAmount:'',
@@ -368,7 +370,9 @@
         SaleOrderFormShipFormProductTable.dataSource = [];
         activeKey.value = 'SaleOrderFormShipFormProduct'
         formData.salesman=userStore.getUserInfo.username;
+        formData.salesmanName=userStore.getUserInfo.realname;
         formData.saleDepartment = userStore.getUserInfo.orgCode
+        formData.saleDepartmentName = userStore.getUserInfo.orgName
       }
       async function copy(data,id){
         //主表数据