snow 8 months ago
parent
commit
f0c0103e7f

BIN
dist-zip/build.zip


+ 1 - 1
src/views/InvoiceSales/capitalClaim/components/execl-files-upload/index.vue

@@ -24,7 +24,6 @@ const handleClose = () => {
 };
 const Uploadsuccess = ({ results, header }) => {
   loading.value = true;
-
   if (results.length === 0) {
     ElMessage.error("表格无有效数据!");
     loading.value = false;
@@ -41,6 +40,7 @@ const Uploadsuccess = ({ results, header }) => {
       }
     });
   }
+
   if (!headok) {
     ElMessage.error("表头与导入模板不匹配!");
     loading.value = false;

+ 5 - 4
src/views/InvoiceSales/currentcyOrderRecord/components/order-form.vue

@@ -60,7 +60,7 @@ function handleShowModal() {
 
 onMounted(() => {
   formData.companyNo = currentCompany.value.companyNo
-  formData.customerNo = 'GS2203161855277894'
+  // formData.customerNo = 'GS2203161855277894'
 });
 
 watch(() => [formData.customerNo, formData.customerNo], () => list.value = []);
@@ -91,8 +91,8 @@ watch(() => platform_type.value, () => list.value = []);
 
       <ElCol :span="12">
         <ElFormItem label="买入方公司" prop="customerNo">
-          <ElInput modelValue="北京万宇恒通国际科贸有限公司" disabled></ElInput>
-          <!-- <RemoteSelect
+          <!-- <ElInput modelValue="北京万宇恒通国际科贸有限公司" disabled></ElInput> -->
+          <RemoteSelect
             ref="RemoteSelectRef"
             v-model="formData.customerNo"
             style="width: 100%"
@@ -100,7 +100,8 @@ watch(() => platform_type.value, () => list.value = []);
             requset-prop="name"
             response-label-prop="company_name"
             response-val-prop="companyNo"
-           /> -->
+            disabledValue="GS2404151642335170"
+           />
         </ElFormItem>
       </ElCol>
     </ElRow>

+ 0 - 1
src/views/InvoiceSales/currentcyOrderRecord/detail.vue

@@ -15,7 +15,6 @@ const { id, title, isDetail, collapses } = useDetail({
 });
 
 const { push } = useRouter();
-// const { hasPermissionWithCode } = usePermission(pageName);
 const loading = shallowRef(false);
 </script>
 

+ 5 - 9
src/views/InvoiceSales/invoiceApply/components/currentcy-form-wanyu/add-edit-form.vue

@@ -86,8 +86,8 @@ async function handleCompanyChange(companyNo, isSeller = true) {
   });
 }
 
-async function handleSupplierChange({ companyNo, companyName }) {
-  ruleForm.value.buyer = companyName;
+async function handleSupplierChange(companyNo: string) {
+  // ruleForm.value.buyer = companyName;
 
   const { code, data, message } = await httpCompanylist({ noRela: true, size:1000 });
 
@@ -106,7 +106,6 @@ async function handleOpenInv() {
     const { data, orderArr, totalCommonPrice, totalCommonCount } = chooseFormRef.value?.getOpenInvInfo() || ({} as any);
     const { winv_fee, payNo } = data;
 
-    console.log(orderArr);
 
     await formRef.value.validate();
 
@@ -203,11 +202,12 @@ onMounted(() => handleCompanyChange(currentCompany.value.companyNo));
             <el-select
               style="width: 100%"
               placeholder="购买方公司抬头"
-              disabled
               v-model="ruleForm.buyer"
+              @change="handleSupplierChange"
             >
               <el-option
                 v-for="c in companyList"
+                :disabled="c.companyCode === 'GS2404151642335170'"
                 :key="c.companyCode"
                 :value="c.companyCode"
                 :label="c.companyName"
@@ -273,11 +273,7 @@ onMounted(() => handleCompanyChange(currentCompany.value.companyNo));
 
         <el-col :span="24">
           <el-form-item label="订单对账">
-            <ChooseForm 
-              ref="chooseFormRef"
-              @get-buyer="buyer =>  handleSupplierChange(buyer)" 
-              :platformType="ruleForm.platform_type" 
-             />
+            <ChooseForm ref="chooseFormRef" :platformType="ruleForm.platform_type"  />
           </el-form-item>
         </el-col>
 

+ 41 - 36
src/views/InvoiceSales/invoiceApply/components/currentcy-form/add-edit-form.vue

@@ -44,7 +44,7 @@ const max = 150;
 
 const initform = {
   companyNo: "", //销售方公司抬头
-  buy_id: "", //购买方公司抬头
+  buyNo: "", //购买方公司抬头
   invtype: "", //开票类型
   email: "", //邮箱
   remark: "", //发票备注
@@ -195,13 +195,7 @@ function handleInvoiceTitle(
   _isSeller: boolean,
   invoiceTitle: Record<string, string>
 ) {
-  if (!invoiceTitle) {
-    if (_isSeller) {
-      return (sellerInvoiceTitle.value = {});
-    }
-
-    return (purchaserInvoiceTitle.value = {});
-  }
+  if (!invoiceTitle) { return _isSeller ? (sellerInvoiceTitle.value = {}) : (purchaserInvoiceTitle.value = {})}
 
   if (_isSeller) {
     //支持的开票方式
@@ -209,26 +203,15 @@ function handleInvoiceTitle(
     denomination.value = Number(_denomination) * 10000;
     const chunks = invoiceType.split(",");
     ruleForm.value.invtype = "";
-
-    invoiceTypes.value = xs_inv_type_list.filter(({ value }) =>
-      chunks.includes(value)
-    );
-
-    // invoiceTypes.value = [
-    //   ...invoiceTypes.value,
-    //   { label: "全电专用发票", value: "fully_digitalized_special_electronic", scanValue: "31" },
-    //   { label: "全电普通发票", value: "fully_digitalized_normal_electronic", scanValue: "32" }
-    // ];
-    // console.log(chunks);
+    invoiceTypes.value = xs_inv_type_list.filter(({ value }) => chunks.includes(value));
   }
 
   _isSeller
-    ? (sellerInvoiceTitle.value = convertInvoiceTitleData(
-        convertInvoiceTitle(invoiceTitle)
-      ))
-    : (purchaserInvoiceTitle.value = convertInvoiceTitleData(invoiceTitle));
+    ? (sellerInvoiceTitle.value = convertInvoiceTitleData(convertInvoiceTitle(invoiceTitle)))
+    : (purchaserInvoiceTitle.value = convertInvoiceTitleData(convertInvoiceTitle(invoiceTitle)));
 }
 
+
 const setSellerInvoiceTitle = handleInvoiceTitle.bind(null, true);
 const setPurchaserInvoiceTitle = handleInvoiceTitle.bind(null, false);
 
@@ -263,8 +246,26 @@ watch(
   }
 );
 
-onMounted(() => {
-  handleCompanyChange(currentCompany.value.companyNo);
+async function handleSupplierChange(companyNo) {
+  // ruleForm.value.buyer = companyName;
+  const { code, data, message } = await httpCompanylist({ noRela: true, size:1000 });
+  console.log(data, '---')
+
+
+  responseHandle({
+    code,
+    message,
+    handler: () => {
+      const item = data.list.find(({ companyNo: _code }) => _code === companyNo);
+      setPurchaserInvoiceTitle(item || {});
+    }
+  })
+}
+
+onMounted(async () => {
+  await handleCompanyChange(currentCompany.value.companyNo);
+  ruleForm.value.buyNo = 'GS2404151642335170'
+  handleSupplierChange('GS2404151642335170')
 });
 </script>
 
@@ -304,21 +305,24 @@ onMounted(() => {
         <el-col :span="12">
           <el-form-item
             label="购买方公司抬头"
-            prop="buy_id"
+            prop="companyNo"
           >
-            <RemoteSelect
-              is-root
-              v-model:value="ruleForm.buy_id"
-              :api="httpInvoiceList"
+            <el-select
               style="width: 100%"
               placeholder="购买方公司抬头"
-              request-prop="name"
-              response-label-prop="invoice_title"
-              response-val-prop="id"
-              @item-change="setPurchaserInvoiceTitle"
-            />
+              v-model="ruleForm.buyNo"
+              disabled
+            >
+              <el-option
+                v-for="c in companyList"
+                :key="c.companyCode"
+                :value="c.companyCode"
+                :label="c.companyName"
+              />
+            </el-select>
           </el-form-item>
-          <InvoiceTitle :detail="purchaserInvoiceTitle" />
+
+          <InvoiceTitle v-if="ruleForm.buyNo" :detail="purchaserInvoiceTitle" />
         </el-col>
         
         <el-col :span="6">
@@ -338,6 +342,7 @@ onMounted(() => {
               />
             </el-select>
           </el-form-item>
+
           <el-form-item label="电子邮箱" prop="email">
             <el-input v-model="ruleForm.email" placeholder="电子邮箱" />
           </el-form-item>

+ 1 - 0
src/views/InvoiceSales/invoiceApply/components/currentcy-form/search-batch.vue

@@ -38,6 +38,7 @@ async function onSearch(sequenceNo = []) {
   const { code, data, message } = await httpBatchOrderList({
     ...props.payload,
     sequenceNo: sequenceNo.join(","),
+    customerNo: 'GS2404151642335170',
     is_comon: "1",
     inv_is: "1",
     cat_status: "2",

+ 1 - 0
src/views/InvoiceSales/invoiceApply/components/currentcy-form/search-check.vue

@@ -69,6 +69,7 @@ async function onSearch() {
   const { currentPage: page, pageSize: size } = pagination;
   const { code, data, message } = await httpOrderList({
     ...props.payload,
+    customerNo: 'GS2404151642335170',
     inv_is: "1",
     cat_status: "2",
     inv_status: "0",

+ 2 - 2
src/views/InvoiceSales/invoiceApply/detail.vue

@@ -27,7 +27,7 @@ const { isSuperUser } = useUserInfo();
 const radioValue = shallowRef("销售订单");
 
 const isOtherOrder = computed(() => radioValue.value === "销售订单")
-const isWanyu = computed(() => radioValue.value === "通用订单(万宇定制)")
+const isWanyu = computed(() => radioValue.value === "通用订单")
 
 const PageName = "invoiceApplyDetail";
 //   { code: "025", name: "财务审核" },
@@ -151,8 +151,8 @@ onMounted(() => {
       <el-tab-pane label="新建发票申请" name="0" v-if="isCreate">
         <ElRadioGroup v-model="radioValue">
           <ElRadio label="销售订单"/>
+          <ElRadio label="通用订单(元隆定制)" />
           <ElRadio label="通用订单" />
-          <ElRadio label="通用订单(万宇定制)" />
         </ElRadioGroup>
 
         <AddEditForm v-if="isOtherOrder" />