4 ay önce · ff783074d5
--- a/index.html
+++ b/index.html
@@ -1,6 +1,16 @@
 
				 <!DOCTYPE html>
			
 
				 <html lang="en">
			
 
				 
			
 
				+<script>
			
 
				+  var _hmt = _hmt || [];
			
 
				+  (function() {
			
 
				+    var hm = document.createElement("script");
			
 
				+    hm.src = "https://hm.baidu.com/hm.js?4f0c566c70e12dbb6889e4134f3f5b67";
			
 
				+    var s = document.getElementsByTagName("script")[0]; 
			
 
				+    s.parentNode.insertBefore(hm, s);
			
 
				+  })();
			
 
				+</script>  
			
 
				+
			
 
				 <head>
			
 
				   <meta charset="UTF-8" />
			
 
				   <link rel="icon" href="/logo_1.png" />
			
--- a/src/api/invoice.ts
+++ b/src/api/invoice.ts
@@ -30,7 +30,7 @@ export const httpSaleInvoice = (data?: object): postType => {
 
				 
			
 
				 //采购单回票发票票面信息
			
 
				 export const httpPurchaseInvoice = (data?: object): postType => {
			
 
				-  return http.request("post", `${yewuApi}cgdticket`, { data });
			
 
				+  return http.request("post", `${newApi}/cxinv/invoice/Ticket`, { data });
			
 
				 };
			
 
				 
			
 
				 
			
--- a/src/components/Invoice/src/configs.ts
+++ b/src/components/Invoice/src/configs.ts
@@ -32,6 +32,8 @@ export type InvoiceDetail = Partial<{
 
				     totalPrice: string; //总价
			
 
				     taxRate: string; //税率
			
 
				     tax: string; //税额
			
 
				+
			
 
				+    cat_code: string // 税目编码
			
 
				   };
			
 
				 
			
 
				   amountTax: string; //总税额
			
@@ -81,7 +83,8 @@ export const SALE: InvoiceDetail = {
 
				     goodPrice: "DJ", //单价
			
 
				     totalPrice: "JE", //总价
			
 
				     taxRate: "SL", //税率
			
 
				-    tax: "SE" //税额
			
 
				+    tax: "SE", //税额
			
 
				+    cat_code: 'SPBM', // 税目编码
			
 
				   },
			
 
				 
			
 
				   amountTax: "tax_fee", //总税额
			
@@ -131,7 +134,9 @@ export const PURCHASE: InvoiceDetail = {
 
				     goodPrice: "unit_price", //单价
			
 
				     totalPrice: "amount", //总价
			
 
				     taxRate: "tax_rate", //税率
			
 
				-    tax: "tax" //税额
			
 
				+    tax: "tax", //税额
			
 
				+
			
 
				+    cat_code: 'license_plate_number'
			
 
				   },
			
 
				 
			
 
				   amountTax: "subtotal_tax", //总税额
			
--- a/src/components/Invoice/src/index.vue
+++ b/src/components/Invoice/src/index.vue
@@ -209,10 +209,15 @@ watchEffect(() => {
 
				     </el-row>
			
 
				     <div class="row-div">
			
 
				       <el-row>
			
 
				-        <el-col :span="8" class="no-border">
			
 
				+        <el-col :span="5" class="no-border">
			
 
				           <div class="tc">货物或应税劳务、服务名称</div>
			
 
				         </el-col>
			
 
				-        <el-col :span="3">
			
 
				+
			
 
				+        <el-col :span="4" class="no-border">
			
 
				+          <div class="tc">税目编码</div>
			
 
				+        </el-col>
			
 
				+
			
 
				+        <el-col :span="2">
			
 
				           <div class="tc">规格型号</div>
			
 
				         </el-col>
			
 
				         <el-col :span="1">
			
@@ -243,10 +248,15 @@ watchEffect(() => {
 
				             v-for="(item, index) in invoiceDetail[prop.goodList]"
			
 
				             :key="index"
			
 
				           >
			
 
				-            <el-col :span="8" class="no-border">
			
 
				+            <el-col :span="5" class="no-border">
			
 
				               <div class="tc">{{ item[prop.listInfo.name] }}</div>
			
 
				             </el-col>
			
 
				-            <el-col :span="3">
			
 
				+
			
 
				+            <el-col :span="4" class="no-border">
			
 
				+              <div class="tc">{{ item[prop.listInfo.cat_code] }}</div>
			
 
				+            </el-col>
			
 
				+
			
 
				+            <el-col :span="2">
			
 
				               <div class="tc">{{ item[prop.listInfo.spec] }}</div>
			
 
				             </el-col>
			
 
				             <el-col :span="1">
			
--- a/src/components/OrderRelationApproval/src/index.vue
+++ b/src/components/OrderRelationApproval/src/index.vue
@@ -37,7 +37,7 @@ const pagination = ref({
 
				 
			
 
				 // const currentPage = ref([])
			
 
				 
			
 
				-const formData = ref({ status: props.rejectCode, remark: '' })
			
 
				+const formData = ref({ status: props.successCode, remark: '' })
			
 
				 
			
 
				 
			
 
				 const stat = computed(() => 
			
@@ -69,6 +69,11 @@ const invoiceDetailTask  = useTask<any>({ initialData: [], success(data = []) {
 
				     })
			
 
				   })
			
 
				 
			
 
				+
			
 
				+  list.forEach(item => {
			
 
				+    if(Object.keys(item.diff_info).length !== 0) formData.value.status = props.rejectCode
			
 
				+  })
			
 
				+
			
 
				   orders.value = list
			
 
				   pagination.value.page = 1
			
 
				   const { page, size } = pagination.value
			
@@ -149,6 +154,10 @@ async function handleStatusChange(){
 
				       emit('submit', { ...formData.value, ItemRemark })
			
 
				     })
			
 
				   }else{
			
 
				+    if(Number(stat.value.unRemark) !== 0){
			
 
				+      ElMessage.warning('请填写所有异常数据的备注')
			
 
				+      return
			
 
				+    }
			
 
				     const ItemRemark = orders.value.map(item => ({ id: item.id, remark: item.remark }))
			
 
				     emit('submit', { ...formData.value, ItemRemark })
			
 
				   }
			
--- a/src/views/supplyNew/invoiceRelation/index.vue
+++ b/src/views/supplyNew/invoiceRelation/index.vue
@@ -247,12 +247,11 @@ function handleRefresh(row){
 
				           :icon="useRenderIcon('scaletooriginal')"
			
 
				           @click="() => invoiceModalRef.onDisplay(row)"
			
 
				         />
			
 
				-        <ElTooltip v-if="row.status == '11' && hasPermissionWithCode('010') && row.has_account != 1" content="撤销回票申请" placement="top">
			
 
				+        <ElTooltip v-if="row.status == '11' && hasPermissionWithCode('010')" content="撤销回票申请" placement="top">
			
 
				           <ElButton link type="primary" :icon="useRenderIcon('refresh')" @click="handleRefresh(row)" />
			
 
				         </ElTooltip>
			
 
				       </template>
			
 
				     </PageContainer>
			
 
				-
			
 
				     <InvoiceModal ref="invoiceModalRef" />
			
 
				     <ExcelUpload ref="excelUploadRef" />
			
 
				 
			
--- a/src/views/system/updates/components/update-modal.vue
+++ b/src/views/system/updates/components/update-modal.vue
@@ -20,7 +20,7 @@ const editorConfig = { placeholder: "请输入内容..." };
 
				 const formData = ref({
			
 
				   module: "",
			
 
				   system: "",
			
 
				-  sys_type: "",
			
 
				+  sys_type: "VER",
			
 
				   version: "",
			
 
				   addtime: ""
			
 
				 });
			
@@ -53,7 +53,7 @@ function handleClose() {
 
				   formData.value = {
			
 
				     module: "",
			
 
				     system: "",
			
 
				-    sys_type: "",
			
 
				+    sys_type: "VER",
			
 
				     version: "",
			
 
				     addtime: ""
			
 
				   };