前端孟祥旭

src/views/financialManagement/collectionManagementList.vue

@@ -2,35 +2,54 @@
 <template>
   <div class="container">
     <!-- <div> -->
-    <div>
-      
-      <ws-input
-        v-model="searchKeyWord"
-        placeholder="可按照合同编号和任务编号进行查找"
-        clearable
-        maxlength="500"
-        type="input"
-        class="findValue"
-      ></ws-input>
-      <ws-button class="but" type="primary" @click="find()">
-        <img
-          width="16"
-          height="16"
-          style="
+    <BaseHeaderLayout :leftSpan="10">
+      <template slot="left">
+        <span style="width: 70px; display: inline-block; color: #8890b1"
+          >状态：</span
+        >
+        <ws-select
+          v-model="searchTypeText"
+          placeholder
+          class="typeselect"
+          @change="selecttaskType"
+          :value="searchType"
+        >
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890b1"
+          />
+        </ws-select>
+      </template>
+      <!-- 接单开始 -->
+      <template slot="right">
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按采购计划编号和标题查找"
+          clearable
+          maxlength="500"
+          type="input"
+          class="findValue"
+        ></ws-input>
+        <ws-button class="find" type="primary" @click="find()">
+          <img
+            width="16"
+            height="16"
+            style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
             "
-          src="../../../public/img/sousuo.png"
-          alt
-        />
-      </ws-button>
-      
-    </div>
-    <ws-button  @click="handleAdd()">全部</ws-button>
-    <ws-button  @click="handleAdd()">待回款</ws-button>
-    <ws-button  @click="handleAdd()">已汇款</ws-button>
+            src="../../../public/img/sousuo.png"
+            alt
+          />
+        </ws-button>
+      </template>
+    </BaseHeaderLayout>
+
     <el-table
       class="wenzi"
       :data="warehouseList.records"
@@ -45,9 +64,9 @@
       <el-table-column class="table_td" prop="basisPrice" label="应收(元)"></el-table-column>
       <el-table-column class="table_td" prop="unitPrice" label="未收(元)"></el-table-column>
       <el-table-column class="table_td" prop="receiveWarehouse" label="出货量(吨)"></el-table-column>
-      <el-table-column class="table_td" prop="" label="已开发票(元)"></el-table-column>
-      <el-table-column class="table_td" prop="" label="未开发票(元)"></el-table-column>
-      <el-table-column class="table_td" prop="" label="状态">
+      <el-table-column class="table_td" prop label="已开发票(元)"></el-table-column>
+      <el-table-column class="table_td" prop label="未开发票(元)"></el-table-column>
+      <el-table-column class="table_td" prop label="状态">
         <template slot-scope="scope">
           <el-popover
             placement="left"
@@ -58,37 +77,24 @@
           >
             <template>
               <span slot="reference">
-                <span
-                  v-if="scope.row.status == '待执行'"
-                  class="executory"
-                ></span>
-                <span
-                  v-if="scope.row.status == '执行中'"
-                  class="inExecution"
-                ></span>
-                <span v-if="scope.row.status == '已完成'" class="done"></span
-                >{{ scope.row.status }}
+                <span v-if="scope.row.status == '待执行'" class="executory"></span>
+                <span v-if="scope.row.status == '执行中'" class="inExecution"></span>
+                <span v-if="scope.row.status == '已完成'" class="done"></span>
+                {{ scope.row.status }}
               </span>
             </template>
             <div>
               <p style="margin-top: 0; padding-left: 10px">操作历史</p>
-              <div
-                v-for="(item, index) in historyList"
-                :key="index"
-                class="flex"
-              >
-                <div class="vertical-text vertical-text-left">
-                  {{ item.updateDate }}
-                </div>
+              <div v-for="(item, index) in historyList" :key="index" class="flex">
+                <div class="vertical-text vertical-text-left">{{ item.updateDate }}</div>
                 <div>
                   <div class="vertical-circle"></div>
-                  <div
-                    v-if="index != historyList.length - 1"
-                    class="vertical-line"
-                  ></div>
+                  <div v-if="index != historyList.length - 1" class="vertical-line"></div>
                 </div>
                 <div class="vertical-text">
-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
+                  {{ item.operateUser }}
+                  <br />
+                  {{ item.dealMsg }}
                 </div>
               </div>
             </div>
@@ -99,23 +105,23 @@
             style="vertical-align: text-top; position: relative; top: -1px"
             src="../../../public/img/edit.png"
             @click="editClick(scope.row)"
-            alt=""
+            alt
           />
           <!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="" label="更新时间"></el-table-column>
-      <el-table-column prop="seller" label="操作" >
+      <el-table-column class="table_td" prop label="更新时间"></el-table-column>
+      <el-table-column prop="seller" label="操作">
         <template slot-scope="scope">
           <div class="record" @click="dialogFormVisible2=true">派发</div>
-             <el-dialog
+          <el-dialog
             width="60%"
             title="派发(123)"
             :visible.sync="dialogFormVisible2"
             :append-to-body="true"
           >
-            <el-form :model="form" >
-                  <el-form-item label="默认库管" :label-width="formLabelWidth">
+            <el-form :model="form">
+              <el-form-item label="默认库管" :label-width="formLabelWidth">
                 <el-select
                   v-model="form.region"
                   autocomplete="off"
@@ -123,11 +129,9 @@
                   class="deal"
                 ></el-select>
               </el-form-item>
-              <el-form-item label="编号" :label-width="formLabelWidth">
-               
-              </el-form-item>
+              <el-form-item label="编号" :label-width="formLabelWidth"></el-form-item>
               <el-form-item label="车牌号" :label-width="formLabelWidth" class="car">
-               <el-input
+                <el-input
                   v-model="form.region"
                   autocomplete="off"
                   placeholder="请输入车牌号"
@@ -142,24 +146,14 @@
                   class="dealll"
                 ></el-input>
               </el-form-item>
-               <el-form-item label="封号" :label-width="formLabelWidth" class="fengno">
-                <el-input
-                  v-model="form.region"
-                  autocomplete="off"
-                  placeholder="请输入封号"
-                  class="dea"
-                ></el-input>
+              <el-form-item label="封号" :label-width="formLabelWidth" class="fengno">
+                <el-input v-model="form.region" autocomplete="off" placeholder="请输入封号" class="dea"></el-input>
               </el-form-item>
               <el-form-item label="库管" :label-width="formLabelWidth" class="kug">
-                <el-input
-                  v-model="form.region"
-                  autocomplete="off"
-                  placeholder=""
-                  class="deaa"
-                ></el-input>
+                <el-input v-model="form.region" autocomplete="off" placeholder class="deaa"></el-input>
               </el-form-item>
               <el-button class="bot" @click="add()">新增</el-button>
-              <hr>
+              <hr />
               <!-- <el-form v-for="(item , index) in lists" :Key="index">
               <el-form-item label="编号" :label-width="formLabelWidth">
                
@@ -198,7 +192,7 @@
               </el-form-item>
               <el-button class="bot" @click="add()">删除</el-button>
               <hr>
-            </el-form> -->
+              </el-form>-->
             </el-form>
           </el-dialog>
         </template>
@@ -212,13 +206,15 @@
       :page-size="deptCircularPage.pageSize"
       layout="total, sizes, prev, pager, next, jumper"
       :total="deptBudgetTotal"
-    >
-    </el-pagination>
+    ></el-pagination>
   </div>
   <!-- </div> -->
 </template>
 <script>
-import { procurementPlan , procurementDel } from '@/model/purchasingManagement/index'
+import {
+  procurementPlan,
+  procurementDel
+} from '@/model/purchasingManagement/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -246,8 +242,8 @@ export default {
       monetaryKey: null,
       // 表格显示数据
       tableDate: [],
-        dialogFormVisible2 :false,
-        form: {
+      dialogFormVisible2: false,
+      form: {
         transactionPrice: '',
         transactionsNumber: '',
         basis: '',
@@ -264,16 +260,20 @@ export default {
       year: '',
       pickerOptions: {},
       value2: '',
-      handleSizeChange:'',
+      handleSizeChange: '',
       deptBudgetTotal: 0,
       currentPage: 1,
       // tranTypeKey: 1,
       pageSize: 10,
       searchType: 1,
-      searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
-      pcFlag:1,
+      taskTypeList:[
+        { value: '待回款' ,type: 1},
+        { value: '已汇款' ,type: 2},
+        { value: '全部' , type: ''},
+      ],
+      pcFlag: 1,
       // 提交类型
       submitType: true,
       size: 10,
@@ -284,7 +284,7 @@ export default {
       deptCircularPage: {},
       warehouseList: [],
       deptBudgetList: {},
-      pcFlag:1,
+      pcFlag: 1,
       historyList: [],
       pickerBeginDateBefore: {
         disabledDate: time => {
@@ -308,7 +308,7 @@ export default {
         contractType: this.contractType,
         tranTypeKey: this.tranTypeKey,
         contractNo: this.contractNo,
-        pcFlag: this.pcFlag,
+        pcFlag: this.pcFlag
       })
         .toPromise()
         .then(response => {
@@ -330,7 +330,7 @@ export default {
     handleEdit(row) {
       this.$router.push({
         name: 'procurementPlanEdit',
-        query: {  id: row.id },
+        query: { id: row.id }
       })
     },
     getSpanArr(data) {
@@ -374,19 +374,19 @@ export default {
       this.$confirm(`是否将状态改为${status}`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
           editstatus({ id: row.id })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$notify.success({
                 title: '成功',
-                message: '状态修改成功',
+                message: '状态修改成功'
               })
               this.getList()
             })
-            .catch((response) => {
+            .catch(response => {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
             })
         })
@@ -410,97 +410,21 @@ export default {
     //   })
     // },
     handleDelete(row) {
-     var handleDelete = ' '
-     if(row.handleDelete == ''){
-     }
-     this.$confirm(
-       `采购计划删除后不可恢复，是否确定删除？`,
-       {
-         cancelButtonText: '取消',
-         confirmButtonText: '确定',
-         type:'warning'
-       }
-     )
-      .then(() => {
-          procurementDel({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '删除成功',
-              })
-              this.getList()
-            })
-            .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-  },
-  
-
-    //返回
-    revert() {
-      this.$router.push({ path: 'warehouseManagementList' })
-    },
-    dateFormat(fmt, date) {
-      let ret
-      const opt = {
-        'Y+': date.getFullYear().toString(), // 年
-        'm+': (date.getMonth() + 1).toString(), // 月
-        'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString() // 时
-        // "M+": date.getMinutes().toString(),         // 分
-        // "S+": date.getSeconds().toString()          // 秒
-        // 有其他格式化字符需求可以继续添加，必须转化成字符串
-      }
-      for (let k in opt) {
-        ret = new RegExp('(' + k + ')').exec(fmt)
-        if (ret) {
-          fmt = fmt.replace(
-            ret[1],
-            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-          )
-        }
-      }
-      return fmt
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    editClick(row) {
-      var status = ''
-      if (row.status == '待审核' || row.status == '已完成') {
-        status = '执行中'
-      } else if (row.status == '执行中') {
-        status = '已完成'
+      var handleDelete = ' '
+      if (row.handleDelete == '') {
       }
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${status}`, {
-        confirmButtonText: '确定',
+      this.$confirm(`采购计划删除后不可恢复，是否确定删除？`, {
         cancelButtonText: '取消',
+        confirmButtonText: '确定',
         type: 'warning'
       })
         .then(() => {
-          alsostate({ id: row.id })
+          procurementDel({ id: row.id })
             .toPromise()
             .then(response => {
               this.$notify.success({
                 title: '成功',
-                message: '状态修改成功'
+                message: '删除成功'
               })
               this.getList()
             })
@@ -511,76 +435,147 @@ export default {
         .catch(() => {
           return false
         })
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
+    }
+  },
+
+  //返回
+  revert() {
+    this.$router.push({ path: 'warehouseManagementList' })
+  },
+  dateFormat(fmt, date) {
+    let ret
+    const opt = {
+      'Y+': date.getFullYear().toString(), // 年
+      'm+': (date.getMonth() + 1).toString(), // 月
+      'd+': date.getDate().toString(), // 日
+      'H+': date.getHours().toString() // 时
+      // "M+": date.getMinutes().toString(),         // 分
+      // "S+": date.getSeconds().toString()          // 秒
+      // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    }
+    for (let k in opt) {
+      ret = new RegExp('(' + k + ')').exec(fmt)
+      if (ret) {
+        fmt = fmt.replace(
+          ret[1],
+          ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+        )
       }
-    },
-    // fujian(row) {
-    //   if (
-    //     row.receiveAttachmentPath === null ||
-    //     row.receiveAttachmentPath === ''
-    //   ) {
-    //     EventBus.$emit(
-    //       'warning',
-    //       this.$t('system.noticeCircular.NoInformation')
-    //     )
-    //   } else {
-    //     this.accessoryTFs = true
-    //   }
-    //   this.appendixIdss = row.receiveAttachmentPath
-    // },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id }
+    }
+    return fmt
+  },
+  handleClose() {
+    this.accessoryTFs = false
+  },
+  handleSizeChange(val) {
+    console.log(`每页 ${val} 条`)
+    this.pageSize = val
+    this.getList()
+  },
+  handleCurrentChange(val) {
+    this.currentPage = val
+    console.log(`当前页: ${val}`)
+    this.getList()
+  },
+  editClick(row) {
+    var status = ''
+    if (row.status == '待审核' || row.status == '已完成') {
+      status = '执行中'
+    } else if (row.status == '执行中') {
+      status = '已完成'
+    }
+    //cancelButtonClass: "btn-custom-cancel"
+    this.$confirm(`是否将状态改为${status}`, {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+      .then(() => {
+        alsostate({ id: row.id })
+          .toPromise()
+          .then(response => {
+            this.$notify.success({
+              title: '成功',
+              message: '状态修改成功'
+            })
+            this.getList()
+          })
+          .catch(response => {
+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          })
       })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then(response => {
-          this.historyList = response
-        })
-    },
-    
-    //查找
-    find() {
-      this.currentPage = 1
-      this.getList()
-    },
-    async exportlist() {
-      const { data } = await export1(
-        {
-          compId: sessionStorage.getItem('ws-pf_compId'),
-          contractType: this.contractType,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize,
-          searchType: this.searchType,
-          searchKeyWord: this.searchKeyWord,
-          startDate: this.startDate,
-          endDate: this.endDate
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${this.date.year +
-          (this.date.month ? `-${this.date.month}` : '')}_采购合同`,
-        type: 'xls'
+      .catch(() => {
+        return false
       })
-    },
-    total() {}
-  }
+  },
+  selecttaskType(e) {
+    for (var i = 0; i < this.taskTypeList.length; i++) {
+      if (this.taskTypeList[i].value == e) {
+        this.searchType = this.taskTypeList[i].type
+      }
+    }
+  },
+  // fujian(row) {
+  //   if (
+  //     row.receiveAttachmentPath === null ||
+  //     row.receiveAttachmentPath === ''
+  //   ) {
+  //     EventBus.$emit(
+  //       'warning',
+  //       this.$t('system.noticeCircular.NoInformation')
+  //     )
+  //   } else {
+  //     this.accessoryTFs = true
+  //   }
+  //   this.appendixIdss = row.receiveAttachmentPath
+  // },
+  handleExamine(row) {
+    this.$router.push({
+      name: 'salesContractExamine',
+      query: { id: row.id }
+    })
+  },
+  // 关闭 dialog时 处理文件url 初始化upload组件
+  handleCloe() {
+    this.dialogViewSpareMoney = false
+  },
+  history(row) {
+    billoperatehis({ id: row.id })
+      .toPromise()
+      .then(response => {
+        this.historyList = response
+      })
+  },
 
+  //查找
+  find() {
+    this.currentPage = 1
+    this.getList()
+  },
+  async exportlist() {
+    const { data } = await export1(
+      {
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        contractType: this.contractType,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: this.searchType,
+        searchKeyWord: this.searchKeyWord,
+        startDate: this.startDate,
+        endDate: this.endDate
+      },
+      {},
+      { responseType: 'blob' }
+    ).toPromise()
+    downloadFile({
+      res: data,
+      fileName: `${this.date.year +
+        (this.date.month ? `-${this.date.month}` : '')}_采购合同`,
+      type: 'xls'
+    })
+  },
+  total() {}
+}
 </script>
 <style lang="scss" scoped>
 .connert {
@@ -793,44 +788,58 @@ export default {
   text-align: center;
 }
 .deall {
-    margin-top: 6%;
-    margin-left: -9%;
-    width: 120px;
+  margin-top: 6%;
+  margin-left: -9%;
+  width: 120px;
 }
-.car{
+.car {
   margin-top: -57px;
 }
 .boxno {
-    margin-top: -188px;
-    margin-left: 25%;
+  margin-top: -188px;
+  margin-left: 25%;
 }
-.dealll{
+.dealll {
   margin-top: 17.6%;
   margin-left: -13.2%;
   width: 120px;
 }
 .fengno {
-    margin-top: -18%;
-    margin-left: 31%;
+  margin-top: -18%;
+  margin-left: 31%;
 }
- .dea {
-    margin-top: 22%;
-    margin-left: -9.2%;
-    width: 120px;
+.dea {
+  margin-top: 22%;
+  margin-left: -9.2%;
+  width: 120px;
 }
 .kug[data-v-8b5eee48] {
-    /* margin-top: -14%; */
-    margin-left: 50%;
-    width: 120px;
-    margin-top: -121px;
+  /* margin-top: -14%; */
+  margin-left: 50%;
+  width: 120px;
+  margin-top: -121px;
 }
 .deaa {
-   width: 120px;
-    margin-top: 62px;
-    margin-left: -66px;
+  width: 120px;
+  margin-top: 62px;
+  margin-left: -66px;
 }
-.bot{
+.bot {
   margin-left: 76%;
   margin-top: -7px;
+}
+ .base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    margin-top: -1px;
+}
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
+}
+.el-select {
+    width: 30%;
+    margin-right: 10px;
 }
 </style>

src/views/purchasingManagement/procurementPlanList.vue

@@ -828,6 +828,14 @@ export default {
 .inputs1 {
   border: none;
 }
+.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    margin-top: -1px;
+    margin-left: -6px;
+}
 // .inputChenge>>>.el-input__inner{
 // border: none;
 // }

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -175,7 +175,7 @@
           <ws-button type="primary" @click="handleAdd()">审核</ws-button>
           <ws-select
             v-model="searchKeyWord"
-            placeholder="可按照合同编号和任务编号进行查找"
+            placeholder="全部合同"
             clearable
             maxlength="500"
             type="input"