暂存

src/components/ExTableNew.vue

@@ -429,7 +429,7 @@ export default {
     position: absolute;
     top:0;
     left:0;
-    z-index: 10;
+    z-index: 7;
   }
 }
 .table-header > * {

src/components/UploadExcel/index.vue

@@ -56,6 +56,7 @@ export default {
     generateData({ header, results }) {
       this.excelData.header = header;
       this.excelData.results = results;
+      this.loading = false;
       this.onSuccess && this.onSuccess(this.excelData);
     },
     handleDrop(e) {

src/views/InvoiceSales/orderBatchBilling/addEdit.vue

@@ -113,13 +113,10 @@ export default {
       this.tableData = [];
       let list = results;
       let tableOk = true;
-      let arr1 = [];
+      this.tableData = [];
       list.forEach((v1) => {
         let b = Object.values(v1);
         let time = this.setTime((b[5] + "").replace(/^\s*|\s*$/g, ""));
-        if (time == "") {
-          tableOk = false;
-        }
         let inv_type = this.get_inv_type(b[1] + "");
         if (inv_type === -1) {
           tableOk = false;
@@ -133,18 +130,11 @@ export default {
           inv_total: b[4] + "",
           createtime: time,
         };
-        arr1.push(model);
+        this.tableData.push(model);
       });
-      this.tableData = this.unique(arr1);
-
       if (!tableOk) {
-        this.$message.error("部分数据格式不正确，请将格式转为文本导入！");
-      }
-      if (this.tableData.length != arr1.length) {
-        this.$message.error("重复数据已清除！");
+        this.$message.error("发票类型不正确，请将表格格式转为文本上传！");
       }
-      // console.log(this.tableData);
-      // console.log(this.tableHeader);
     },
     unique(arr) {
       let hash = [];
@@ -157,15 +147,10 @@ export default {
       return hash;
     },
     setTime(time) {
-      // console.log(time);
       time = time.replace(/\//g, "-");
       time = time.replace(/\./g, "-");
-      // console.log(time.length);
-      let res = "";
-      if (time.length === 19) {
-        res = new Date(time).valueOf() + "";
-      }
-      if (res.length !== 13) {
+      let key = new Date(time).valueOf() + "";
+      if (key.length !== 13) {
         time = "";
       }
       return time;
@@ -207,6 +192,13 @@ export default {
           this.loading = false;
           return;
         }
+        let arr = this.unique(this.tableData);
+        if (arr.length !== this.tableData.length) {
+          this.$message.error("发票号码不可以重复出现！");
+          this.loading = false;
+          return;
+        }
+
         this.loading = true;
         let isok = true;
         let list = [];
@@ -221,12 +213,11 @@ export default {
           list.push(model);
         });
         if (!isok) {
-          this.$message.error("导入数据不能出现空字符串！");
+          this.$message.error("导入数据不能出现空值！");
           this.loading = false;
           return;
         }
         const res = await asyncRequest.receiptimport({ data: list });
-        console.log(res);
         this.loading = false;
         if (res && res.code === 0) {
           this.showModelThis = false;

src/views/InvoiceSales/refund/index.vue

@@ -186,9 +186,8 @@
         <el-tooltip
           v-if="
             (powers.some((item) => item == '027') &&
-              scope.row.refund_status !== '3') ||
-            (powers.some((item) => item == '027') &&
-              scope.row.refund_status !== '4')
+              scope.row.refund_status !== '3') &&
+              (scope.row.refund_status !== '4')
           "
           class="item"
           effect="dark"

src/views/purchase/orderRecord/components/InvoiceReview.vue

@@ -268,11 +268,26 @@
           ref="examineForm"
           :model="examineForm"
           :rules="examineFormThis"
-          label-width="100px"
+          label-width="60px"
+          size="mini"
           class="demo-examineForm"
         >
           <el-row :gutter="10">
-            <el-col :span="18">
+            <el-col :span="12">
+              <el-form-item prop="invtime" label="时间">
+                <el-date-picker
+                  style="width: 100%"
+                  class="fl"
+                  v-model="examineForm.invtime"
+                  type="datetime"
+                  :picker-options="pickerOptions"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="发票审核时间"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="7">
               <el-form-item label="审核" prop="status">
                 <el-select
                   v-model="examineForm.status"
@@ -290,8 +305,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6" style="text-align: right">
-              <el-button type="primary" @click="submitForm"
+            <el-col :span="5" style="text-align: right">
+              <el-button type="primary" size="mini" @click="submitForm"
                 >提交审核结果</el-button
               >
             </el-col>
@@ -323,11 +338,19 @@ export default {
   mixins: [resToken],
   data() {
     return {
+      pickerOptions: {
+        disabledDate: (time) => {
+          if (time) {
+            return time.getTime() >= new Date().valueOf();
+          }
+        },
+      },
       newTimes: null,
       examineForm: {
         invid: this.id,
         status: "0",
         remark: "",
+        invtime: "",
       },
       activeForm: 0,
       oldItem: {
@@ -401,6 +424,9 @@ export default {
         remark: [
           { required: false, message: "请输入价税合计", trigger: "blur" },
         ],
+        invtime: [
+          { required: true, message: "请选择发票审核时间", trigger: "change" },
+        ],
       },
       examForm: {
         id: "",
@@ -499,6 +525,7 @@ export default {
           this.examForm[k] = JSON.parse(JSON.stringify(item[k]));
         }
       }
+
       let model = JSON.parse(JSON.stringify(this.ratioresList.list[val]));
       for (let k in model) {
         if (k === "goods") {
@@ -507,6 +534,27 @@ export default {
           this.ratioNo[k] = JSON.parse(JSON.stringify(model[k]));
         }
       }
+
+      this.examineForm.invtime =
+        this.examineForm.invtime === ""
+          ? this.transformTime(new Date())
+          : this.examineForm.invtime;
+      console.log(this.examineForm);
+    },
+    transformTime(tTime) {
+      // console.log(tTime);
+      let time = new Date(tTime);
+      // console.log(time);
+      let y = this.setNum(time.getFullYear());
+      let M = this.setNum(time.getMonth() + 1);
+      let d = this.setNum(time.getDate());
+      let H = this.setNum(time.getHours());
+      let m = this.setNum(time.getMinutes());
+      let s = this.setNum(time.getSeconds());
+      return `${y}-${M}-${d} ${H}:${m}:${s}`;
+    },
+    setNum(num) {
+      return num < 10 ? `0${num}` : num + "";
     },
     async getData() {
       console.log(this.companyNo);
@@ -666,6 +714,7 @@ export default {
           const obj = JSON.parse(JSON.stringify(this.examineForm));
           obj.invid = this.examForm.id;
           console.log(obj);
+          debugger;
           if (obj.status === "4") {
             await this.setstatus(obj);
           } else {
@@ -688,6 +737,7 @@ export default {
       }
     },
     async lastOne() {
+      debugger;
       this.loading = false;
       if (this.activeImg + 1 == this.length) {
         await this.invoiceexam();
@@ -696,10 +746,13 @@ export default {
       }
     },
 
-  
     async invoiceexam() {
+      debugger;
       this.loading = true;
-      let res = await asyncRequest.invoiceexam({ sid: this.id });
+      let res = await asyncRequest.invoiceexam({
+        sid: this.id,
+        invtime: this.examineForm.invtime,
+      });
       if (res && res.code === 0) {
         const title = "审核发票提交成功！";
         this.$notify.success({

src/views/purchase/orderRecord/components/addEdit1.vue

@@ -60,7 +60,7 @@ export default {
       newTime: 0,
       activeName: "-1",
       loading: false,
-      title: "添加订单对账",
+      title: "",
       showModelThis: this.showModel,
     };
   },
@@ -95,6 +95,7 @@ export default {
       }
     },
     async initForm() {
+      console.log(this.isDetail);
       if (this.isDetail === "003") {
         this.title = "添加订单对账";
       } else if (this.isDetail === "005") {
@@ -110,7 +111,6 @@ export default {
       this.newTime = new Date().valueOf();
     },
 
-    setActiveName() {},
   },
 };
 </script>

src/views/purchase/orderRecord/components/addEdit23.vue

@@ -65,7 +65,7 @@ export default {
       showView: true,
 
       loading: false,
-      title: "添加订单对账",
+      title: "付款回执",
       showModelThis: this.showModel,
     };
   },

src/views/purchase/orderRecord/components/addEdit4.vue

@@ -63,7 +63,7 @@ export default {
       showView: true,
 
       loading: false,
-      title: "添加订单对账",
+      title: "上传发票",
       showModelThis: this.showModel,
     };
   },

src/views/purchase/orderRecord/components/addEdit6.vue

@@ -66,7 +66,7 @@ export default {
       showView: true,
 
       loading: false,
-      title: "添加订单对账",
+      title: "审核发票",
       showModelThis: this.showModel,
     };
   },
@@ -105,44 +105,12 @@ export default {
       console.log(this.id);
       // this.active = this.dstatusOptions.findIndex((v) => v.id === this.dstatus);
       this.changea();
-      this.setActiveName();
     },
     changea() {
       this.newTime = new Date().valueOf();
     },
 
-    setActiveName() {
-      this.loading = true;
-
-      if (this.isDetail === "003") {
-        this.title = "添加订单对账";
-        this.activeName = "1";
-      } else {
-        if (this.isDetail === "007") {
-          this.title = "订单对账详情";
-          this.activeName = "1";
-        } else if (this.isDetail === "028") {
-          this.title = "业务审核";
-          this.activeName = "2";
-        } else if (this.isDetail === "034") {
-          this.title = "反馈发票信息";
-          this.activeName = "3";
-        } else if (this.isDetail === "031") {
-          this.title = "上传发票";
-          this.activeName = "4";
-        } else if (this.isDetail === "032") {
-          this.title = "校验识别结果";
-          this.activeName = "5";
-        } else if (this.isDetail === "035") {
-          this.title = "审核发票";
-          this.activeName = "6";
-        } else if (this.isDetail === "033") {
-          this.title = "付款回执";
-          this.activeName = "7";
-        }
-      }
-      this.loading = false;
-    },
+   
   },
 };
 </script>

src/views/purchase/orderRecord/components/addView.vue

@@ -442,6 +442,27 @@
           </el-row>
         </el-form-item>
       </el-col>
+      <el-col
+        :span="24"
+        v-if="ruleForm.return_img && ruleForm.return_img.length > 0"
+      >
+        <el-form-item label="回执图片" :size="'mini'" class="clear return_img">
+          <ul class="fl">
+            <li class="fl" v-for="img in ruleForm.return_img" :key="img">
+              <img
+                v-viewer
+                class="fl"
+                :src="img"
+                alt=""
+                style="
+                  width: 80px;
+                  height: 52px;
+                  border: 1px solid rgb(220, 223, 230);
+                "
+              />
+            </li>
+          </ul> </el-form-item
+      ></el-col>
       <el-col :span="24" style="text-align: right">
         <el-button
           v-if="isDetail === '003' || isDetail === '005'"
@@ -504,6 +525,7 @@ export default {
           },
         ],
         goodList: [],
+        return_img: [],
       },
       rulesThis: this.rules,
       rules: {
@@ -833,6 +855,7 @@ export default {
           ],
           goodList: data.list,
           inv_rate: data.inv_rate,
+          return_img: Array.isArray(data.return_img) ? data.return_img : [],
         };
         this.supplierNo = [data.supplierNo];
         this.handleChange(this.ruleForm.account);
@@ -861,6 +884,7 @@ export default {
               },
             ],
             goodList: [],
+            return_img: [],
           };
           this.handleChange(this.ruleForm.account);
         }
@@ -992,7 +1016,19 @@ export default {
     //   display: block !important;
     // }
   }
-
+  .return_img {
+    vertical-align: top;
+    ul {
+      vertical-align: top;
+      li {
+        img {
+          &:hover {
+            cursor: pointer;
+          }
+        }
+      }
+    }
+  }
   .scale {
     li {
       height: 40px;

src/views/purchase/orderRecord/components/orderChange.vue

@@ -15,7 +15,28 @@
     @close="closeModel"
   >
     <el-card style="margin-top: -15px">
-      <el-row :gutter="10">
+      <el-row >
+        <el-col :span="24" style="padding-bottom: 10px">
+          <el-input
+            placeholder="采购单编号"
+            style="width: 300px"
+            v-model="parmValue.sequenceNo"
+          >
+            <el-button
+              slot="append"
+              icon="el-icon-search"
+              @click.native="(parmValue.page = 1), searchList()"
+            ></el-button>
+          </el-input>
+          <el-button
+            class="fr"
+            type="warning"
+            @click.native="
+              (parmValue.sequenceNo = ''), (parmValue.page = 1), searchList()
+            "
+            >重置</el-button
+          >
+        </el-col>
         <el-col :span="24">
           <el-table
             tooltip-effect="dark"
@@ -290,7 +311,7 @@ export default {
         sequenceNo: "",
         inv_company: "",
         inv_status: "2",
-        send_status:"",
+        send_status: "",
         page: 1, // 页码
         size: 10, // 每页显示条数
       },
@@ -449,6 +470,7 @@ export default {
 .orderRecord {
   .setWidth {
     width: 100% !important;
+    
   }
 }
 </style>

src/views/purchase/orderRecord/components/proofreading.vue

@@ -158,6 +158,9 @@
           >共{{ length }}张发票，当前第{{ activeImg + 1 }}张</el-tag
         >
         <!-- {{oldresList}} -->
+        <el-button type="primary" @click="abnormal"
+          >已发现发票异常，重新修改发票
+        </el-button>
         <el-button type="primary" @click="submitForm"
           >提交本张发票校验结果
         </el-button>
@@ -367,6 +370,30 @@ export default {
         }
       }
     },
+    async abnormal() {
+      this.loading = true;
+      let model1 = {
+        sid: this.id,
+        payNo: this.payNo,
+        status: "3",
+      };
+      let res = await asyncRequest.again(model1);
+      if (res && res.code === 0) {
+        const title = "异常已提交，成功返回上一步！";
+        this.$notify.success({
+          title,
+          message: "",
+        });
+        this.showModelThis = false;
+        // 刷新
+        this.$emit("refreshAll");
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+      this.loading = false;
+    },
     async submitForm() {
       await this.$refs.examForm.validate(async (valid) => {
         if (valid) {
@@ -417,7 +444,7 @@ export default {
     async invoicecheck() {
       let res = await asyncRequest.invoicecheck({ sid: this.id });
       if (res && res.code === 0) {
-          const title = "发票结果校验成功！";
+        const title = "发票结果校验成功！";
         this.$notify.success({
           title,
           message: "",

src/views/purchase/orderRecord/components/receipt.vue

@@ -49,6 +49,16 @@
                 </p>
               </div>
             </el-form-item>
+            <el-form-item label="回执时间" prop="paytime">
+              <el-date-picker
+                v-model="ruleForm.paytime"
+                type="datetime"
+                :picker-options="pickerOptions"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="选择回执时间"
+              >
+              </el-date-picker>
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -71,12 +81,20 @@ export default {
   mixins: [resToken],
   data() {
     return {
+      pickerOptions: {
+        disabledDate: (time) => {
+          if (time) {
+            return time.getTime() >= new Date().valueOf();
+          }
+        },
+      },
       image: [],
       loading: false,
       show: false,
       ruleForm: {
         sid: this.id,
         image: [],
+        paytime: "",
       },
       feedbacksThis: this.feedbacks,
       feedbacks: {
@@ -87,6 +105,13 @@ export default {
             trigger: "change",
           },
         ],
+        paytime: [
+          {
+            required: true,
+            message: "请选择回执时间",
+            trigger: "change",
+          },
+        ],
       },
     };
   },
@@ -102,6 +127,21 @@ export default {
     this.initForm();
   },
   methods: {
+    transformTime(tTime) {
+      // console.log(tTime);
+      let time = new Date(tTime);
+      // console.log(time);
+      let y = this.setNum(time.getFullYear());
+      let M = this.setNum(time.getMonth() + 1);
+      let d = this.setNum(time.getDate());
+      let H = this.setNum(time.getHours());
+      let m = this.setNum(time.getMinutes());
+      let s = this.setNum(time.getSeconds());
+      return `${y}-${M}-${d} ${H}:${m}:${s}`;
+    },
+    setNum(num) {
+      return num < 10 ? `0${num}` : num + "";
+    },
     open() {
       this.show = true;
     },
@@ -122,6 +162,7 @@ export default {
           this.ruleForm = {
             sid: this.id,
             image: [],
+            paytime: new Date(),
           };
         }
       });
@@ -130,6 +171,7 @@ export default {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.loading = true;
+
           const obj = JSON.parse(JSON.stringify(this.ruleForm));
           let arr = [];
           obj.image.forEach((v1) => {
@@ -138,7 +180,10 @@ export default {
           obj.image = arr.join(",");
           obj.status = "4";
           obj.sid = this.id;
-          console.log(obj);
+          obj.paytime = this.transformTime(obj.paytime);
+          // console.log(obj);
+          // console.log(this.ruleForm);
+          // return;
           let res = await asyncRequest.paymentexam(obj);
           if (res && res.code === 0) {
             const title = "回执上传成功！";
@@ -274,7 +319,7 @@ export default {
       text-align: center;
     }
     .Upload {
-      width:200px;
+      width: 200px;
       height: 165px;
       line-height: 165px;
       text-align: center;

src/views/purchase/orderRecord/index.vue

@@ -24,7 +24,7 @@
       <template #table-header="{}">
         <div style="width: 100%">
           <el-row :gutter="10" style="padding: 0 0 10px 80px">
-            <el-col :span="6" style="width: 470px">
+            <el-col :span="6" style="width: 460px">
               <el-select
                 v-model="code"
                 multiple
@@ -47,26 +47,15 @@
                 />
               </el-select>
             </el-col>
-            <el-col :span="8" style="width: 155px">
-              <el-select
-                v-model="parmValue.inv_status"
-                clearable
+            <el-col :span="6" style="width: 296px">
+              <period-date-picker
+                :start="parmValue.startTime"
+                :end="parmValue.endTime"
+                :type="1"
+                :width="'132px'"
                 :size="searchSize"
-                placeholder="回票状态"
-                @change="
-                  pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
-                "
-              >
-                <el-option
-                  v-for="item in dstatusOptions"
-                  :key="item.id"
-                  :label="item.label"
-                  :value="item.id"
-                >
-                </el-option>
-              </el-select>
+                @timeReturned="timeReturned($event)"
+              ></period-date-picker>
             </el-col>
 
             <el-col
@@ -85,7 +74,7 @@
             </el-col>
             <el-col
               :span="3"
-              style="width: 66px; float: right; padding: 0"
+              style="width: 61px; float: right; padding: 0"
               v-if="powers.some((item) => item == '024')"
             >
               <el-button
@@ -97,29 +86,8 @@
                 重置
               </el-button>
             </el-col>
-
-            <el-col :span="3" style="width: 54px; float: right; padding: 0">
-              <el-button
-                icon="el-icon-search"
-                :size="searchSize"
-                class="fr"
-                type="primary"
-                @click="searchList"
-              ></el-button>
-            </el-col>
           </el-row>
           <el-row :gutter="10">
-            <el-col :span="6" style="width: 316px">
-              <period-date-picker
-                :start="parmValue.startTime"
-                :end="parmValue.endTime"
-                :type="1"
-                :width="'142px'"
-                :size="searchSize"
-                @timeReturned="timeReturned($event)"
-              ></period-date-picker>
-            </el-col>
-
             <el-col :span="8" style="width: 155px">
               <el-select
                 v-model="parmValue.inv_status"
@@ -141,15 +109,65 @@
                 </el-option>
               </el-select>
             </el-col>
-            <el-col :span="4" style="width: 270px">
+            <el-col :span="8" style="width: 155px">
+              <el-select
+                v-model="parmValue.inv_status"
+                clearable
+                :size="searchSize"
+                placeholder="回票状态"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option
+                  v-for="item in dstatusOptions"
+                  :key="item.id"
+                  :label="item.label"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-col>
+            <el-col :span="5" style="width: 350px">
+              <el-input
+                clearable
+                style="width: 100%"
+                :size="searchSize"
+                placeholder="关键字"
+                v-model="input"
+              >
+                <el-select
+                  v-model="selectK"
+                  slot="prepend"
+                  style="width: 100px"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in selectKlist"
+                    :key="item.code"
+                    :label="item.name"
+                    :value="item.code"
+                  ></el-option>
+                </el-select>
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click.native="searchList"
+                ></el-button>
+              </el-input>
+            </el-col>
+            <!-- <el-col :span="4" style="width: 270px">
               <el-input
                 clearable
                 :size="searchSize"
                 placeholder="付款编码"
                 v-model="parmValue.payNo"
+
               >
               </el-input>
-            </el-col>
+            </el-col> -->
             <el-col
               :span="2"
               style="width: 66px; float: right; padding: 0"
@@ -209,7 +227,7 @@
           <span class="el-dropdown-link">
             更多操作<i class="el-icon-arrow-down el-icon--right"></i>
           </span>
-          <el-dropdown-menu slot="dropdown">
+          <el-dropdown-menu slot="dropdown" style="min-width: 130px">
             <el-dropdown-item
               v-if="powers.some((item) => item == '007')"
               @click.native="
@@ -577,6 +595,18 @@ export default {
   },
   data() {
     return {
+      selectK: "1",
+      input: "",
+      selectKlist: [
+        {
+          code: "1",
+          name: "付款编码",
+        },
+        {
+          code: "2",
+          name: "申请人",
+        },
+      ],
       code: [],
       // 状态
       dstatusOptions: [
@@ -754,10 +784,14 @@ export default {
     };
   },
   mounted() {
+    this.selectK = "1";
+    this.input = "";
     this.searchList();
   },
   methods: {
     restSearch() {
+      this.selectK = "1";
+      this.input = "";
       this.code = [];
       // 表格 - 分页
       this.pageInfo = {
@@ -770,6 +804,7 @@ export default {
         endTime: "",
         supplierNo: "", //
         payNo: "", //
+        apply: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -841,7 +876,7 @@ export default {
     },
 
     async selectChange() {
-      console.log(this.code);
+      // console.log(this.code);
       this.parmValue.supplierNo = this.code.join(",");
       this.formValue.page = 1;
       this.pageInfo.curr = 1;
@@ -947,6 +982,14 @@ export default {
     // 刷新表格
     async searchList() {
       this.loading = true;
+      if (this.selectK === "1") {
+        this.parmValue.payNo = this.input;
+        this.parmValue.apply = "";
+      } else {
+        this.parmValue.payNo = "";
+        this.parmValue.apply = this.input;
+      }
+
       const res = await asyncRequest.list(this.parmValue);
 
       if (res && res.code === 0 && res.data) {

src/views/purchase/porder/index.vue

@@ -24,7 +24,7 @@
       <template #table-header="{ selection }">
         <div style="width: 100%">
           <el-row style="padding: 0 0 10px 80px">
-            <el-col :span="8" style="width: 460px">
+            <el-col :span="8" style="width: 440px">
               <el-select
                 v-model="code"
                 multiple
@@ -68,42 +68,37 @@
                 </el-option>
               </el-select>
             </el-col>
-
-            <el-col :span="3" style="width: 66px; float: right">
+            <el-col
+              :span="3"
+              style="width: 140px; float: right"
+              v-if="powers.some((item) => item == '041')"
+            >
               <el-button
-                v-if="powers.some((item) => item == '002')"
                 :size="searchSize"
                 type="primary"
                 class="fr"
-                style="margin-left: 10px"
-                @click="searchList"
+                @click="setBilling(selection)"
               >
-                刷新
-              </el-button>
-            </el-col>
-            <el-col :span="3" style="width: 66px; float: right">
+                批量设置回票信息</el-button
+              ></el-col
+            >
+            <el-col
+              :span="3"
+              style="width: 140px; float: right"
+              v-if="powers.some((item) => item == '042')"
+            >
               <el-button
-                type="warning"
-                class="fr"
-                v-if="powers.some((item) => item == '024')"
                 :size="searchSize"
-                @click="restSearch"
+                type="primary"
+                style="float: right"
+                @click="examBilling(selection)"
               >
-                重置
+                批量审核回票信息
               </el-button>
             </el-col>
-            <el-col :span="3" style="width: 54px; float: right">
-              <el-button
-                :size="searchSize"
-                type="primary"
-                icon="el-icon-search"
-                class="fr"
-                @click="searchList"
-              />
-            </el-col>
           </el-row>
           <el-row :gutter="10">
-            <el-col :span="8" style="width: 160px">
+            <el-col :span="8" style="width: 120px">
               <el-select
                 v-model="parmValue.send_status"
                 clearable
@@ -124,50 +119,118 @@
                 </el-option>
               </el-select>
             </el-col>
-            <el-col :span="5" style="width: 250px">
-              <el-input
+            <el-col :span="8" style="width: 120px">
+              <el-select
+                v-model="parmValue.payinfo"
                 clearable
                 :size="searchSize"
-                placeholder="采购单编号"
-                v-model="parmValue.sequenceNo"
+                placeholder="付款状态"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
               >
-              </el-input>
+                <el-option
+                  v-for="item in pay_status_list"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
             </el-col>
-            <el-col :span="4" style="width: 250px">
+            <el-col :span="8" style="width: 120px">
+              <el-select
+                v-model="parmValue.invinfo"
+                clearable
+                :size="searchSize"
+                placeholder="回票状态"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option
+                  v-for="item in inv_status_list"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-col>
+            <el-col :span="8" style="width: 120px">
+              <el-select
+                v-model="parmValue.th_status"
+                clearable
+                :size="searchSize"
+                placeholder="退货状态"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option
+                  v-for="item in th_status_list"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-col>
+            <el-col :span="5" style="width: 350px">
               <el-input
                 clearable
+                style="width: 100%"
                 :size="searchSize"
-                placeholder="财务信息编号"
-                v-model="parmValue.inv_company"
+                placeholder="关键字"
+                v-model="input"
               >
+                <el-select
+                  v-model="selectK"
+                  slot="prepend"
+                  style="width: 125px"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in selectKlist"
+                    :key="item.code"
+                    :label="item.name"
+                    :value="item.code"
+                  ></el-option>
+                </el-select>
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click.native="searchList"
+                ></el-button>
               </el-input>
             </el-col>
-            <el-col
-              :span="3"
-              style="width: 140px; float: right"
-              v-if="powers.some((item) => item == '041')"
-            >
+            <el-col :span="3" style="width: 66px; float: right">
               <el-button
+                v-if="powers.some((item) => item == '002')"
                 :size="searchSize"
                 type="primary"
                 class="fr"
-                @click="setBilling(selection)"
+                style="margin-left: 10px"
+                @click="searchList"
               >
-                批量设置回票信息</el-button
-              ></el-col
-            >
-            <el-col
-              :span="3"
-              style="width: 140px; float: right"
-              v-if="powers.some((item) => item == '042')"
-            >
+                刷新
+              </el-button>
+            </el-col>
+            <el-col :span="3" style="width: 66px; float: right">
               <el-button
+                type="warning"
+                class="fr"
+                v-if="powers.some((item) => item == '024')"
                 :size="searchSize"
-                type="primary"
-                style="float: right"
-                @click="examBilling(selection)"
+                @click="restSearch"
               >
-                批量审核回票信息
+                重置
               </el-button>
             </el-col>
           </el-row>
@@ -182,26 +245,31 @@
           class="demo-table-expand"
         >
           <el-row>
-            <el-col :span="12">
+            <el-col :span="4">
               <el-form-item size="mini" label="商品编号">
                 <span>{{ scope.row.goodNo }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
               <el-form-item size="mini" label="商品名称">
                 <span>{{ scope.row.goodName }}</span>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item size="mini" label="商品描述">
+                <span>{{ scope.row.goodDesc }}</span>
+              </el-form-item>
+            </el-col>
             <el-col :span="4">
               <el-form-item size="mini" label="单位">
                 <span>{{ scope.row.goodUnit }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <!-- <el-col :span="4">
               <el-form-item size="mini" label="单价">
                 <span>{{ scope.row.price }}</span>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="4">
               <el-form-item size="mini" label="数量">
                 <span>{{ scope.row.orderNum }}</span>
@@ -313,11 +381,6 @@
                 <span>{{ scope.row.price }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item size="mini" label="商品描述">
-                <span>{{ scope.row.goodDesc }}</span>
-              </el-form-item>
-            </el-col>
           </el-row>
         </el-form>
       </template>
@@ -337,6 +400,18 @@
           "
         ></el-tag>
       </template>
+      <template #th_info="{ scope }">
+        <el-tag
+          size="mini"
+          :type="scope.row.th_info == '1' ? 'success' : 'danger'"
+          v-text="
+            (
+              th_status_list.find((item) => item.value == scope.row.th_info) ||
+              {}
+            ).label || '--'
+          "
+        ></el-tag>
+      </template>
       <template #send_info="{ scope }">
         <el-tag
           size="mini"
@@ -443,6 +518,22 @@ export default {
   },
   data() {
     return {
+      selectK: "1",
+      input: "",
+      selectKlist: [
+        {
+          code: "1",
+          name: "采购单编码",
+        },
+        {
+          code: "2",
+          name: "财务信息编号",
+        },
+        {
+          code: "3",
+          name: "业务员名字",
+        },
+      ],
       code: [],
       showModel1: false,
       showModel2: false,
@@ -468,6 +559,20 @@ export default {
         },
       ],
 
+      th_status_list: [
+        {
+          value: "1",
+          label: "未退货",
+        },
+        {
+          value: "2",
+          label: "部分退货",
+        },
+        {
+          value: "3",
+          label: "全部退货",
+        },
+      ],
       send_status_list: [
         {
           value: "1",
@@ -533,6 +638,9 @@ export default {
         inv_company: "",
         inv_status: "",
         send_status: "",
+        payinfo: "",
+        invinfo: "",
+        th_status: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -598,6 +706,12 @@ export default {
           _slot_: "send_info",
           width: "95px",
         },
+        {
+          prop: "th_info",
+          label: "发货状态",
+          _slot_: "th_info",
+          width: "95px",
+        },
         {
           prop: "payinfo",
           label: "付款状态",
@@ -670,18 +784,24 @@ export default {
   },
   methods: {
     async restSearch() {
+      this.selectK = "1";
+      this.input = "";
       this.code = [];
       this.parmValue.code = this.code.join(",");
       this.parmValue.sequenceNo = "";
-      this.formValue.page = 1;
+      this.parmValue.page = 1;
       this.pageInfo.curr = 1;
-      this.pageInfo.inv_company = "";
-      this.pageInfo.inv_status = "";
-      this.pageInfo.send_status = "";
+      this.parmValue.inv_company = "";
+      this.parmValue.inv_status = "";
+      this.parmValue.send_status = "";
+      this.parmValue.owner = "";
       await this.searchList();
     },
     async searchList() {
       this.loading = true;
+      this.parmValue.sequenceNo = this.selectK === "1" ? this.input : "";
+      this.parmValue.inv_company = this.selectK === "2" ? this.input : "";
+      this.parmValue.owner = this.selectK === "3" ? this.input : "";
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;