Merge branch 'dev0.3' of http://36.137.93.232:3000/hf/byte-sailing-new into dev0.3

src/components/contractCom/contractDetails.vue

@@ -11,7 +11,7 @@
       <el-tab-pane label="采购合同" name="second"></el-tab-pane>
       <el-tab-pane label="交易明细" name="third"></el-tab-pane>
     </el-tabs>
-    <div class="content-box" v-show="activeName !== 'third'">
+    <div class="content-box" v-if="activeName !== 'third'">
       <div class="left">
         <div
           v-for="i in leftList"
@@ -20,30 +20,30 @@
           :style="{ color: currentItem.id === i.id ? '#409eff' : '' }"
           @click="handleItemClick(i)"
         >
-          <div v-show="activeName === 'first'">v {{ i.version }}</div>
-          <div v-show="activeName === 'second'">
+          <div v-if="activeName === 'first'">v {{ i.version }}</div>
+          <div v-if="activeName === 'second'">
             {{ i.code }}
           </div>
         </div>
       </div>
       <div class="right">
         <div v-if="leftList && leftList.length > 0">
-          <div style="text-align: right" v-show="activeName === 'first'">
+          <div style="text-align: right" v-if="activeName === 'first'">
             <el-button type="primary" @click="pushProcessApproval(currentItem)"
               >查看详情</el-button
             >
           </div>
-          <div v-show="activeName === 'first'">
+          <div v-if="activeName === 'first'">
             <ContractPDF :rowData="rowData"></ContractPDF>
           </div>
-          <div v-show="activeName === 'second'">
+          <div v-if="activeName === 'second'">
             <PurchasePDF :rowData="rowDataOne"></PurchasePDF>
           </div>
         </div>
         <div v-else style="padding-left: 300px">暂无数据</div>
       </div>
     </div>
-    <div v-show="activeName === 'third'">
+    <div v-if="activeName === 'third'">
       <byTable
         :hidePagination="true"
         :hideSearch="true"

src/components/process/PurchasePayment.vue

@@ -2,19 +2,33 @@
   <div style="width: 100%; padding: 0px 15px">
     <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
       <template #deadline>
-        <div>
-          <el-date-picker v-model="formData.data.deadline" type="date" placeholder="请选择付款期限" value-format="YYYY-MM-DD" />
+        <div style="width: 100%">
+          <el-date-picker v-model="formData.data.deadline" type="date" placeholder="请选择付款期限" value-format="YYYY-MM-DD" style="width: 100%" />
         </div>
       </template>
       <template #receiptsNum>
-        <div>
+        <div style="width: 100%">
           <el-input-number
             onmousewheel="return false;"
             v-model="formData.data.receiptsNum"
             placeholder="请输入单据数量"
             :min="0"
             :precision="0"
-            :controls="false" />
+            :controls="false"
+            style="width: 100%" />
+        </div>
+      </template>
+      <template #rate>
+        <div style="width: 100%">
+          <el-input-number
+            onmousewheel="return false;"
+            v-model="formData.data.rate"
+            placeholder="请输入税率"
+            :min="0"
+            :max="100"
+            :precision="2"
+            :controls="false"
+            style="width: 100%" />
         </div>
       </template>
       <template #fileList>
@@ -115,6 +129,9 @@ let formData = reactive({
     userName: "",
     payDetailList: [],
     fileList: [],
+    advanceCode: "",
+    type: "",
+    rate: undefined,
   },
 });
 const submit = ref(null);
@@ -130,6 +147,17 @@ const judgeStatus = () => {
   }
   return false;
 };
+const type = ref([
+  {
+    label: "未核销",
+    value: "0",
+  },
+  {
+    label: "发票核销",
+    value: "1",
+  },
+]);
+const advanceCode = ref([]);
 const formOption = reactive({
   inline: true,
   labelWidth: 100,
@@ -152,21 +180,35 @@ const formConfig = computed(() => {
       fn: (val) => {
         changeSupply(val);
       },
+      style: "width: 100%",
     },
     {
       type: "slot",
       prop: "deadline",
       slotName: "deadline",
       label: "付款期限",
-      itemWidth: 50,
+      itemWidth: 33,
     },
     {
       type: "select",
-      label: "发票类型",
-      prop: "invoiceType",
-      data: invoiceType.value,
-      itemWidth: 50,
+      label: "付款类型",
+      prop: "type",
+      data: type.value,
+      itemWidth: 33,
+      style: "width: 100%",
+      fn: () => {
+        formData.data.advanceCode = "";
+      },
     },
+    // {
+    //   type: "select",
+    //   label: "预付款单号",
+    //   prop: "advanceCode",
+    //   data: advanceCode.value,
+    //   itemWidth: 34,
+    //   style: "width: 100%",
+    //   isShow: formData.data.type == "1",
+    // },
     {
       type: "input",
       prop: "remark",
@@ -178,6 +220,31 @@ const formConfig = computed(() => {
       prop: "receiptsNum",
       slotName: "receiptsNum",
       label: "单据数量",
+      itemWidth: 33,
+    },
+    {
+      type: "select",
+      label: "发票类型",
+      prop: "invoiceType",
+      data: invoiceType.value,
+      itemWidth: 33,
+      style: "width: 100%",
+      fn: (val) => {
+        if (val == "1") {
+          formData.data.rate = 13;
+        } else if (val == "2") {
+          formData.data.rate = 6;
+        } else {
+          formData.data.rate = undefined;
+        }
+      },
+    },
+    {
+      type: "slot",
+      prop: "rate",
+      slotName: "rate",
+      label: "税率 (%)",
+      itemWidth: 34,
     },
     {
       type: "slot",
@@ -262,6 +329,9 @@ const rules = ref({
   purchaseId: [{ required: true, message: "请选择采购合同", trigger: "change" }],
   money: [{ required: true, message: "请输入付款金额", trigger: "blur" }],
   name: [{ required: true, message: "请输入户名", trigger: "blur" }],
+  advanceCode: [{ required: true, message: "请选择预付款单号", trigger: "change" }],
+  type: [{ required: true, message: "请选择付款类型", trigger: "change" }],
+  rate: [{ required: true, message: "请输入税率", trigger: "blur" }],
 });
 const fileList = ref([]);
 const uploadData = ref({});

src/views/purchaseManage/purchasePayment/invoice/index.vue

@@ -307,7 +307,7 @@ const openModal = (val) => {
 };
 const changeSupply = (val) => {
   if (val) {
-    proxy.get("/purchase/getListBySupplyId", { supplyId: val }).then((res) => {
+    proxy.get("/purchase/getNoInvoiceListBySupplyId", { supplyId: val }).then((res) => {
       if (res.data && res.data.length > 0) {
         formData.data.invoiceDetailsList = res.data.map((item) => {
           return {