会议提出bug的修改

src/views/publicComponents/SelectQuotationModal.vue

@@ -235,16 +235,16 @@
             width:250,
         },
         {
-            title: '数量(quanlity)',
-            key: 'quanlity',
-            dataIndex: 'quanlity',
+            title: '数量(quantity)',
+            key: 'quantity',
+            dataIndex: 'quantity',
             align:"center",
             width:250,
         },
         {
             title: '单价(price)',
-            key: 'taxPrice',
-            dataIndex: 'taxPrice',
+            key: 'salePrice',
+            dataIndex: 'salePrice',
             align:"center",
             width:250,
         },

src/views/publicComponents/SelectSaleOrderModal.vue

@@ -49,8 +49,8 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="客户(customer)">
-                                <a-input placeholder="请输入" v-model:value="queryParams.customerName"></a-input>
+                            <a-form-item label="供应商(supplier)">
+                                <a-input placeholder="请输入" v-model:value="queryParams.supplierName" :disabled="fatherSupplierName!==''"></a-input>
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
@@ -143,6 +143,7 @@
     var visible = ref(false)
     var fatherProject = ref('')
     var fatherSourceCode = ref('')
+    var fatherSupplierName =ref('')
     const columns = [
         {
             title: '订单编号号(bill code)',
@@ -164,12 +165,14 @@
             key: 'projectName',
             align:"center",
             width:250,
+            ellipsis: true,
         },
         {
-            title: '客户(custormer)',
-            dataIndex: 'customerName',
-            key: 'customerName',
-            align:"center"
+            title: '供应商(supplier)',
+            dataIndex: 'supplierName',
+            key: 'supplierName',
+            align:"center",
+            ellipsis: true,
         },
         {
             title: '优先级(priority)',
@@ -237,9 +240,9 @@
             width:250,
         },
         {
-            title: '数量(quanlity)',
-            key: 'quanlity',
-            dataIndex: 'quanlity',
+            title: '数量(quantity)',
+            key: 'quantity',
+            dataIndex: 'quantity',
             align:"center",
             width:250,
         },
@@ -285,8 +288,8 @@
         projectName:'',
         productionClass:'',
         priority:'',
-        customer:'',
-        customerName:'',
+        supplierId:'',
+        supplierName:'',
         headModel:'',
         englishName:'',
         productCode:'',
@@ -333,6 +336,11 @@
         }else {
             queryParams.value.project = params.project
         }
+        if(fatherSupplierName.value&&fatherSupplierName.value!==''){
+            queryParams.value.supplierName = fatherSupplierName.value
+        }else {
+            queryParams.value.supplierName = params.supplierName
+        }
         return filterObj(params);
     }
     function handleTableChange(paginations, filters, sorter){
@@ -371,8 +379,8 @@
             projectName:'',
             productionClass:'',
             priority:'',
-            customer:'',
-            customerName:'',
+            supplierId:'',
+            supplierName:'',
             headModel:'',
             englishName:'',
             productCode:'',
@@ -394,15 +402,24 @@
         selectedRows.value = rows
     }
     function handleOk(){
-        var arr = []
-        selectedRows.value.map(item=>arr.push(item.billCode))
+        var arr = [],
+        arrSupplierName=[]
+        selectedRows.value.map(item=>{
+            arr.push(item.billCode)
+            arrSupplierName.push(item.supplierName)
+        })
         if(fatherSourceCode.value&&fatherSourceCode.value!==''){
             arr.push(fatherSourceCode.value)
         }
+        if(fatherSupplierName.value&&fatherSupplierName.value!==''){
+            arrSupplierName.push(fatherSupplierName.value)
+        }
         if(selectedRowKeys.value.length==0){
             message.error('请勾选数据');
         }else if(new Set(arr).size!==1){
-            message.error('请勾选报价单号相同的数据');
+            message.error('请勾选订单编号相同的数据');
+        }else if(new Set(arrSupplierName).size!==1){
+            message.error('请勾选供应商相同的数据');
         }else{
             emit('selectSaleOrder', selectedRows.value)
             handleCancel()
@@ -419,8 +436,8 @@
             projectName:'',
             productionClass:'',
             priority:'',
-            customer:'',
-            customerName:'',
+            supplierId:'',
+            supplierName:'',
             headModel:'',
             englishName:'',
             productCode:'',
@@ -443,6 +460,16 @@
         }else{
             fatherSourceCode.value = ''
         }
+        if(formData.sourceCode&&formData.sourceCode!==''){
+            fatherSourceCode.value = formData.sourceCode2
+        }else{
+            fatherSourceCode.value = ''
+        }
+        if(formData.supplierName&&formData.supplierName!==''){
+            fatherSupplierName.value = formData.supplierName
+        }else{
+            fatherSupplierName.value = ''
+        }
         loadData()
         getOptiom()
     }

src/views/publicComponents/SelectSupplierQuotationModal.vue

@@ -212,9 +212,9 @@
             width:250,
         },
         {
-            title: '数量(quanlity)',
-            key: 'quanlity',
-            dataIndex: 'quanlity',
+            title: '数量(quantity)',
+            key: 'quantity',
+            dataIndex: 'quantity',
             align:"center",
             width:250,
         },

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

@@ -215,7 +215,7 @@ export const purchaseOrderProductColumns: JVxeColumn[] = [
     {
       title: '型号(model)',
       key: 'model',
-      type: JVxeTypes.normal,
+      type: JVxeTypes.input,
       placeholder: '请输入${title}',
       width:"200px",
       defaultValue:'',
@@ -283,7 +283,7 @@ export const purchaseOrderProductColumns: JVxeColumn[] = [
     {
       title: '数量(quantity)',
       key: 'quantity',
-      type: JVxeTypes.inputNumber,
+      type: JVxeTypes.normal,
       placeholder: '请输入${title}',
       width:"200px",
       defaultValue:'',
@@ -291,7 +291,7 @@ export const purchaseOrderProductColumns: JVxeColumn[] = [
     {
       title: '单价(price)',
       key: 'taxPrice',
-      type: JVxeTypes.inputNumber,
+      type: JVxeTypes.normal,
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',

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

@@ -22,7 +22,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-supplier" name="supplier">
-                <a-input   v-model:value="formData.supplierName"  placeholder="请选择" allow-clear  ></a-input>
+                <a-input   v-model:value="formData.supplierName"  placeholder="请选择" allow-clear   :disabled="notAllowEdit"></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -90,42 +90,47 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="发货方式(delivery)" v-bind="validateInfos.delivery" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-delivery" name="delivery">
-                <JDictSelectTag v-model:value="formData.delivery" placeholder="请选择" dictCode="delivery_methods" />
+							<a-form-item label="运输方式(transport)" v-bind="validateInfos.transport" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-transport" name="transport">
+                <JDictSelectTag v-model:value="formData.transport" placeholder="请选择" dictCode="delivery_methods" />
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="质保期(warranty period)" v-bind="validateInfos.warrantyPeriod" id="SaleOrderForm-warrantyPeriod" name="warrantyPeriod">
+							<a-form-item label="发货方式(delivery)" v-bind="validateInfos.delivery"  id="SaleOrderForm-delivery" name="delivery">
+                <JDictSelectTag v-model:value="formData.delivery" placeholder="请选择" dictCode="delivery_sale_order" />
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="质保期(warranty period)" v-bind="validateInfos.warrantyPeriod" id="SaleOrderForm-warrantyPeriod" name="warrantyPeriod" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1">
                 <a-input v-model:value="formData.warrantyPeriod" placeholder="请输入" style="width: 85%;margin-right: 1%;"/>月(month)
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="质保条款(warranty terms)" v-bind="validateInfos.warrantyTerms" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-warrantyTerms" name="warrantyTerms">
+							<a-form-item label="质保条款(warranty terms)" v-bind="validateInfos.warrantyTerms" id="SaleOrderForm-warrantyTerms" name="warrantyTerms">
 								<a-input v-model:value="formData.warrantyTerms" placeholder="请输入质保条款(warranty terms)"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col> 
 						<a-col :span="12">
-							<a-form-item label="汇率(exchange rate)" v-bind="validateInfos.exchangeRate" id="SaleOrderForm-exchangeRate" name="exchangeRate">
+							<a-form-item label="汇率(exchange rate)" v-bind="validateInfos.exchangeRate" id="SaleOrderForm-exchangeRate" name="exchangeRate"  :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1">
 								<a-input v-model:value="formData.exchangeRate" placeholder="请输入厂家(maker)"  allow-clear ></a-input>
 							</a-form-item>
 						</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-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-form-item>
 						</a-col>   
             <a-col :span="12">
-							<a-form-item label="采购员(purchasesman)" v-bind="validateInfos.purchaseman" id="SaleOrderForm-purchaseman" name="purchaseman">
+							<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-form-item>
 						</a-col> 
             <a-col :span="12">
-							<a-form-item label="币种(currency)" v-bind="validateInfos.currency" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-currency" name="currency">
+							<a-form-item label="币种(currency)" v-bind="validateInfos.currency" id="SaleOrderForm-currency" name="currency">
                 <JDictSelectTag v-model:value="formData.currency" placeholder="请选择" dictCode="currency" />
 							</a-form-item>
 						</a-col> 
             <a-col :span="12">
-							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="SaleOrderForm-notes" name="notes">
+							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="SaleOrderForm-notes" name="notes"  :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1">
 								<a-input v-model:value="formData.notes"></a-input>
 							</a-form-item>
 						</a-col>           
@@ -280,6 +285,7 @@
         recipientAddress:'',
         paymentTerms:'',
         delivery:'',
+        transport:'',
         warrantyPeriod:'',
         warrantyTerms:'',
         exchangeRate:'',
@@ -509,6 +515,8 @@
         if(formData.sourceCode==''){
           formData.project = data[0].project
           formData.projectName = data[0].projectName
+          formData.supplierName = data[0].supplierName
+          formData.supplier = data[0].supplierId
           formData.priority =data[0].priority
           formData.productionClass =data[0].productionClass
           formData.model =data[0].headModel

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

@@ -581,6 +581,8 @@
           item.supplierCurrency = item.currency
           item.supplierId = item.selectionSupplier
           item.supplierName = item.selectionSupplier_dictText
+          item.purchasePrice = item.taxPrice
+          item.taxAmount = 0
         })
         var arrProduct = data.concat(saleQuotationFormProductTable.dataSource)
         saleQuotationFormProductTable.dataSource=arrProduct     

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

@@ -551,7 +551,7 @@ export const saleContractProductColumns: JVxeColumn[] = [
     {
       title: '数量(quantity)',
       key: 'quantity',
-      type: JVxeTypes.inputNumber,
+      type: JVxeTypes.normal,
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',
@@ -575,7 +575,7 @@ export const saleContractProductColumns: JVxeColumn[] = [
     {
       title: '单价(tax price)',
       key: 'taxPrice',
-      type: JVxeTypes.inputNumber,
+      type: JVxeTypes.normal,
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',

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

@@ -269,6 +269,7 @@
         data.map(item=>{
           item.model = item.childModel
           item.sourceId = item.childId
+          item.taxPrice = item.salePrice
         })
         var arrProduct = data.concat(saleContractProductTable.dataSource)
         saleContractProductTable.dataSource=arrProduct 

src/views/saleCode/saleInquiryForm/SaleInquiryForm.data.ts

@@ -125,7 +125,7 @@ export const columns: BasicColumn[] = [
     customRender:function (t, r, index) {
       if(t.text==1){
         return '是(yes)'
-      }else if(t.text==0){
+      }else if(t.text=="0"){
         return '否(no)'
       }
     }

src/views/saleCode/saleInquiryForm/SaleInquiryFormList.vue

@@ -132,7 +132,7 @@
           <a-button type="primary" v-auth="'saleCode:sale_inquiry_form:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button>
           <a-button  type="primary" v-auth="'saleCode:sale_inquiry_form:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出(export)</a-button>
           <a-button  type="primary"  @click="setStatus"> 设置其他状态(set other status)</a-button>
-          <a-button  type="primary"  @click="submit" v-auth="'saleCode:sale_inquiry_form:submitBatch'"> 提交(submit)</a-button>
+          <a-button  type="primary"  @click="SubmitBatch" v-auth="'saleCode:sale_inquiry_form:submitBatch'"> 提交(batch submit)</a-button>
           <a-button  type="primary"  @click="cancelSubmit" v-auth="'saleCode:sale_inquiry_form:returnSubmitBatch'"> 取消提交(cancelSubmit)</a-button>
           <a-dropdown v-if="selectedRowKeys.length > 0">
               <template #overlay>
@@ -197,7 +197,7 @@
            canResize:false,
            useSearchForm: false,
            actionColumn: {
-               width: 200,
+               width: 300,
                fixed:'right'
            },
            scroll:{
@@ -314,12 +314,14 @@
            label: '编辑(edit)',
            onClick: handleEdit.bind(null, record),
            auth: 'saleCode:sale_inquiry_form:edit',
-           ifShow: record.submit=='0'||!record.submit
+           ifShow: record.submit=='0',
+          //  ifShow: record.submit=='0'||!record.submit
          },
          {
            label: '详情(detail)',
            onClick: handleDetail.bind(null, record),
-           ifShow: record.submit='1'
+           ifShow: record.submit=='1',
+          //  ifShow: record.submit='1'
          }
        ]
    }
@@ -330,8 +332,9 @@
        return [
          {
            label: '详情(detail)',
-           onClick: handleDetail.bind(null, record),
-           ifShow: record.submit=='0'||!record.submit
+           onClick: handleDetail.bind(null, record),      
+           ifShow: record.submit=='0',
+        //  ifShow: record.submit=='0'||!record.submit
          },
           {
            label: '删除(delete)',
@@ -341,7 +344,8 @@
              placement: 'topLeft'
            },
            auth: 'saleCode:sale_inquiry_form:delete',
-           ifShow: record.submit=='0'||!record.submit
+           ifShow: record.submit=='0',
+          //  ifShow:record.submit=='0'||!record.submit
          }
        ]
    }
@@ -353,7 +357,7 @@
      SetOtherStatusRef.value.getTable(ids)
     }
   }
-  function submit(){
+  function SubmitBatch(){
     if(selectedRowKeys.value.length==0){
       message.warning('请选择数据')
     }else{

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

@@ -35,6 +35,11 @@
 								<a-input v-model:value="formData.customerInquiryNumber" placeholder="请输入客户询价单号(customer inquiry number)"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
+            <a-col :span="12">
+							<a-form-item label="客户询价日期(customer inquiry time)" v-bind="validateInfos.inquiryTime" id="SaleInquiryFormForm-inquiryTime" name="inquiryTime">
+								<a-date-picker placeholder="请选择客户询价日期(customer inquiry time)"  v-model:value="formData.inquiryTime"  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+							</a-form-item>
+						</a-col>
 						<a-col :span="12">
 							<a-form-item label="询价有效期(inquiry period)" v-bind="validateInfos.inquiryPeriodEnd" id="SaleInquiryFormForm-inquiryPeriodEnd" name="inquiryPeriodEnd">
                 <a-range-picker v-model:value="inquiryPeriod" :format="['YYYY-MM-DD','YYYY-MM-DD']"  @change="onChangeInquiryPeriod" style="width: 100%" />
@@ -225,7 +230,6 @@
         status: undefined,
         delFlag: undefined,
         otherStatus: '',   
-        submit: '',   
         billDate: moment(new Date()).format('YYYY-MM-DD'),   
         billCode: '',   
         inquiryProject: '',   
@@ -245,7 +249,8 @@
         inquiryTeam: '',   
         deliveryTime: '',   
         attachs: '',   
-        inquiryNotes: '',   
+        inquiryNotes: '',  
+        inquiryTime:'' 
       });
 
       //表单验证

src/views/saleCode/salesOrder/SaleOrderForm.data.ts

@@ -281,7 +281,7 @@ export const saleOrderProductColumns: JVxeColumn[] = [
     {
       title: '数量(quantity)',
       key: 'quantity',
-      type: JVxeTypes.inputNumber,
+      type: JVxeTypes.normal,
       placeholder: '请输入${title}',
       width:"200px",
       defaultValue:'',
@@ -305,7 +305,7 @@ export const saleOrderProductColumns: JVxeColumn[] = [
     {
       title: '单价(price)',
       key: 'taxPrice',
-      type: JVxeTypes.inputNumber,
+      type: JVxeTypes.normal,
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',

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

@@ -517,6 +517,7 @@
           item.model = item.childModel
           item.deliveryTime = formData.deliveryTime
           item.sourceId = 'Quo'+item.childId
+          item.taxPrice = item.salePrice
         })
         var arrProduct = data.concat(SaleOrderFormShipFormProductTable.dataSource)
         notAllowEdit.value=true