Browse Source

feat:发票申请抬头选择过滤&列表公司显示

snow 1 year ago
parent
commit
da0c31ee5a

+ 15 - 7
src/views/customerService/invoiceApply/components/titleModal.vue

@@ -59,9 +59,9 @@
                 >
                   <el-option
                     v-for="item in statusList"
-                    :key="'status' + item.id"
-                    :label="item.label"
-                    :value="item.id"
+                    :key="'status' + item.code"
+                    :label="item.name"
+                    :value="item.code"
                   />
                 </el-select>
               </el-col>
@@ -223,9 +223,14 @@ export default {
           type:'selection',
           fixed:'left'
         },
-        {
-          prop: "title_type",
-          label: "抬头类型",
+        // {
+        //   prop: "title_type",
+        //   label: "抬头类型",
+        // },
+      {
+          prop:'companyName',
+          label:'客户公司名称',
+          width: "155px",
         },
         {
           prop: "tax_no",
@@ -357,7 +362,10 @@ export default {
         ...this.parmValue,
         limit: this.parmValue.size,
       };
-      const { code, data } = await asyncRequest.titleList(model);
+      const { code, data } = await asyncRequest.titleList({
+        ...model,
+        title_type: '客户抬头'
+      });
       if (code === 1) {
         const { list, total } = data;
         this.tableData = list;

+ 11 - 10
src/views/operate/invoicing/addEdit.vue

@@ -43,16 +43,6 @@
                   </el-select>
                 </el-form-item>
               </el-col> -->
-              <el-col :span="24">
-                <el-form-item label="发票抬头" prop="title">
-                  <el-input
-                    :disabled="isDetail"
-                    placeholder="发票抬头"
-                    maxlength="100"
-                    v-model="ruleForm.title"
-                  />
-                </el-form-item>
-              </el-col>
 
               <el-col :span="24">
                 <el-form-item label="客户公司" prop="code">
@@ -66,6 +56,17 @@
                   />
                 </el-form-item>
               </el-col>
+
+              <el-col :span="24">
+                <el-form-item label="发票抬头" prop="title">
+                  <el-input
+                    :disabled="isDetail"
+                    placeholder="发票抬头"
+                    maxlength="100"
+                    v-model="ruleForm.title"
+                  />
+                </el-form-item>
+              </el-col>
               
               <el-col :span="24">
                 <el-form-item 

+ 11 - 11
src/views/operate/supplierInvoice/addEdit.vue

@@ -43,17 +43,6 @@
                   </el-select>
                 </el-form-item>
               </el-col> -->
-              <el-col :span="24">
-                <el-form-item label="发票抬头" prop="title">
-                  <el-input
-                    :disabled="isDetail"
-                    placeholder="发票抬头"
-                    maxlength="100"
-                    v-model="ruleForm.title"
-                  />
-                </el-form-item>
-              </el-col>
-
               <el-col :span="24">
                 <el-form-item label="供应商公司" prop="code">
                   <search-supplier 
@@ -65,6 +54,17 @@
                     style="width:100%" />
                 </el-form-item>
               </el-col>
+
+              <el-col :span="24">
+                <el-form-item label="发票抬头" prop="title">
+                  <el-input
+                    :disabled="isDetail"
+                    placeholder="发票抬头"
+                    maxlength="100"
+                    v-model="ruleForm.title"
+                  />
+                </el-form-item>
+              </el-col>
               
               <el-col :span="24">
                 <el-form-item label="统一社会信用代码" prop="tax_no" label-width="140px">

+ 15 - 7
src/views/platformService/settlement/components/titleModal.vue

@@ -59,9 +59,9 @@
                 >
                   <el-option
                     v-for="item in statusList"
-                    :key="'status' + item.id"
-                    :label="item.label"
-                    :value="item.id"
+                    :key="'status' + item.code"
+                    :label="item.name"
+                    :value="item.code"
                   />
                 </el-select>
               </el-col>
@@ -76,7 +76,7 @@
                 </el-button>
               </el-col>
               <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
-                <el-button type="warning" :size="searchList" @click="restSearch">
+                <el-button type="warning" :size="'mini'" @click="restSearch">
                   重置
                 </el-button>
               </el-col>
@@ -223,9 +223,14 @@ export default {
           type:'selection',
           fixed:'left'
         },
+        // {
+        //   prop: "title_type",
+        //   label: "抬头类型",
+        // },
         {
-          prop: "title_type",
-          label: "抬头类型",
+          prop:'companyName',
+          label:'供应商名称',
+          width: "155px",
         },
         {
           prop: "tax_no",
@@ -357,7 +362,10 @@ export default {
         ...this.parmValue,
         limit: this.parmValue.size,
       };
-      const { code, data } = await asyncRequest.titleList(model);
+      const { code, data } = await asyncRequest.titleList({
+        ...model,
+        title_type: '供应商抬头'
+      });
       if (code === 1) {
         const { list, total } = data;
         this.tableData = list;

+ 1 - 1
src/views/platformService/settlement/components/waitSupplierUpload.vue

@@ -33,7 +33,7 @@
               @focus="titleVisible = true" 
             />
 
-            <div style="display:flex;margin-bottom:10px"  v-if="invoiceApply">
+            <div style="display:flex;margin-bottom:10px" v-else>
               <show-data-table 
               :sitem="invoiceInfo"
               style="padding: -5px 0 10px 0"