yuansh 1 týždeň pred
rodič
commit
cb8c3feeac

+ 10 - 1
src/views/purchase/purchaseQuotationFrm/components/PurchaseQuotationFormForm.vue

@@ -174,7 +174,7 @@
                 :label-col="formItemLayout.labelCol1"
                 :wrapper-col="formItemLayout.wrapperCol1"
               >
-                <JDictSelectTag v-model:value="formData.qualityGradeHead" placeholder="请选择" dictCode="quality_grade" />
+                <JDictSelectTag v-model:value="formData.qualityGradeHead" @change="changeFormInquiryTeam" placeholder="请选择" dictCode="quality_grade" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -554,6 +554,14 @@
           formData.qutationProject = '';
         }
       }
+      function changeFormInquiryTeam() {
+        const xTable = PuechaseQuotationFormProductTableRef.value!.getXTable();
+        var arrProduct = [...xTable.data];
+        arrProduct.map((item) => {
+          item.qualityGrade = formData.qualityGradeHead;
+        });
+        PuechaseQuotationFormProductTable.dataSource = arrProduct;
+      }
       function changeFormDeliveryTime() {
         const xTable = PuechaseQuotationFormProductTableRef.value!.getXTable();
         var arrProduct = [...xTable.data];
@@ -700,6 +708,7 @@
         SelectSupplierInquiry,
         addProductFromCustomer,
         changeFormDeliveryTime,
+        changeFormInquiryTeam,
         changeSupplier,
         notAllowEdit,
         ClassList,

+ 104 - 35
src/views/saleCode/saleInterfaceSync/SaleInterfaceSync.data.ts

@@ -47,38 +47,17 @@ export const columns: BasicColumn[] = [
     dataIndex: 'referenceNumber'
    },
    {
-    title: '请求交货日期',
-    align:"center",
-    dataIndex: 'requestedDeliveryDate',
-    customRender:({text}) =>{
-      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
-      return text;
-    },
-   },
-   {
-    title: '建议截止日期',
-    align:"center",
-    dataIndex: 'adviseBeforeDate',
-    customRender:({text}) =>{
-      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
-      return text;
-    },
-   },
-   {
-    title: '提交日期',
-    align:"center",
-    dataIndex: 'submittedDate'
-   },
-   {
-    title: '创建日期',
+    title: '提交',
     align:"center",
-    dataIndex: 'createdDate'
+    dataIndex: 'submit',
+    customRender:function (t, r, index) {
+      if(t.text==0){
+        return '否(no)'
+      }else if(t.text==1){
+        return '是(yes)'
+      }
+    }
    },
-   // {
-   //  title: '内容',
-   //  align:"center",
-   //  dataIndex: 'content'
-   // },
    {
     title: '同步状态',
     align:"center",
@@ -93,11 +72,43 @@ export const columns: BasicColumn[] = [
       }
     }
    },
+   {
+    title: '关闭',
+    align:"center",
+    dataIndex: 'close',
+    customRender:function (t, r, index) {
+      if(t.text==0){
+        return '否(no)'
+      }else if(t.text==1){
+        return '是(yes)'
+      }
+    }
+   },
+   {
+    title: '关闭原因',
+    align:"center",
+    dataIndex: 'closeInfo'
+   },
+   // ,{
+   //  title: '提交日期',
+   //  align:"center",
+   //  dataIndex: 'submittedDate'
+   // },
    {
     title: '同步信息',
     align:"center",
     dataIndex: 'syncInfo'
    },
+   {
+    title: '创建日期',
+    align:"center",
+    dataIndex: 'createdDate'
+   },
+   // {
+   //  title: '内容',
+   //  align:"center",
+   //  dataIndex: 'content'
+   // },
    {
     title: '同步人',
     align:"center",
@@ -113,6 +124,24 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'syncCode'
    },
+   {
+    title: '请求交货日期',
+    align:"center",
+    dataIndex: 'requestedDeliveryDate',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+   },
+   {
+    title: '建议截止日期',
+    align:"center",
+    dataIndex: 'adviseBeforeDate',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+   },
    {
     title: 'subject',
     align:"center",
@@ -188,11 +217,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'buyerEmail'
    },
-   {
-    title: 'status',
-    align:"center",
-    dataIndex: 'status'
-   },
+   // {
+   //  title: 'status',
+   //  align:"center",
+   //  dataIndex: 'status'
+   // },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -208,6 +237,46 @@ export const searchFormSchema: FormSchema[] = [
       component: 'Input',
       //colProps: {span: 6},
  	},
+  {
+        label: "提交",
+        field: "submit",
+        component: 'Select',
+        componentProps: {
+            options: [
+                { label: '是(yes)', value: '1' },
+                { label: '否(no)', value: '0' }
+            ],
+            clearable: true,
+            placeholder: '请选择状态'
+        },
+  },
+  {
+        label: "关闭",
+        field: "close",
+        component: 'Select',
+        componentProps: {
+            options: [
+                { label: '是(yes)', value: '1' },
+                { label: '否(no)', value: '0' }
+            ],
+            clearable: true,
+            placeholder: '请选择状态'
+        },
+  },
+  {
+        label: "同步状态",
+        field: "sync",
+        component: 'Select',
+        componentProps: {
+            options: [
+                { label: '未同步(no)', value: '0' },
+                { label: '同步成功(yes)', value: '1' },
+                { label: '同步失败(err)', value: '2' }
+            ],
+            clearable: true,
+            placeholder: '请选择状态'
+        },
+  },
      {
       label: "提交日期",
       field: "submittedDate",

+ 10 - 8
src/views/saleCode/saleInterfaceSync/SaleInterfaceSyncList.vue

@@ -4,13 +4,19 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" v-auth="'saleCode:sale_interface_sync:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+       <!-- <a-button type="primary" v-auth="'saleCode:sale_interface_sync:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
         <a-button type="primary" v-auth="'saleCode:sale_interface_sync:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls">
           导出</a-button
         >
         <j-upload-button type="primary" v-auth="'saleCode:sale_interface_sync:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls"
           >导入</j-upload-button
-        >
+        > -->
+        <!-- 高级查询 -->
+        <!-- <super-query :config="superQueryConfig" @search="handleSuperQuery" /> -->
+        <!-- 获取接口数据 -->
+        <a-button type="primary" v-auth="'saleCode:sale_interface_sync:deleteBatch'" @click="showSyncModal">获取接口数据</a-button>
+        <!-- 同步订单 -->
+        <a-button type="primary" v-auth="'saleCode:sale_interface_sync:deleteBatch'" @click="handleSyncOrder">同步订单</a-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -37,12 +43,7 @@
             <Icon icon="mdi:chevron-down" />
           </a-button>
         </a-dropdown>
-        <!-- 高级查询 -->
-        <!-- <super-query :config="superQueryConfig" @search="handleSuperQuery" /> -->
-        <!-- 获取接口数据 -->
-        <a-button type="primary" v-auth="'saleCode:sale_interface_sync:deleteBatch'" @click="showSyncModal">获取接口数据</a-button>
-        <!-- 同步订单 -->
-        <a-button type="primary" v-auth="'saleCode:sale_interface_sync:deleteBatch'" @click="handleSyncOrder">同步订单</a-button>
+       
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -251,6 +252,7 @@
         label: '编辑',
         onClick: handleEdit.bind(null, record),
         auth: 'saleCode:sale_interface_sync:edit',
+        ifShow: record.submit == '0',
       },
     ];
   }