Merge branch 'feature/Feature-copy' into develop

src/layout/components/Navbar.vue

@@ -2,7 +2,7 @@
   <div class="navbar">
     <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
 
-    <breadcrumb class="breadcrumb-container" v-if="showBreadcrumb" />
+    <breadcrumb v-if="showBreadcrumb" class="breadcrumb-container" />
 
     <!-- <NavMenu class="navmenu" /> -->
 
@@ -16,20 +16,20 @@
           ></i>
         </el-tooltip>
       </div> -->
-      <div class="right-menu-item hover-effect" @click="handleNotice"  style="display: flex;">
+      <div class="right-menu-item hover-effect" style="display: flex;" @click="handleNotice">
         <el-badge value="示">
-          <i class="el-icon-message-solid" style="font-size: 24px; line-height: 50px"></i>
+          <i class="el-icon-message-solid" style="font-size: 24px; line-height: 50px" />
         </el-badge>
         <span style="font-size: 16px; margin-left: 15px;">到货通知</span>
       </div>
       <div class="right-menu-item hover-effect" @click="toEngine">
-        <i class="el-icon-s-platform" style="font-size: 18px;"></i>
+        <i class="el-icon-s-platform" style="font-size: 18px;" />
         <span style="font-size: 16px; margin-left: 6px;">家用工程机登录</span>
       </div>
 
       <el-badge :value="noticeCount" :max="10" :hidden="!noticeVisible" class="right-menu-item hover-effect">
         <el-tooltip effect="dark" content="系统消息" placement="bottom">
-          <i class="el-icon-message-solid" @click="goNotice" style="font-size: 24px; line-height: 50px"></i>
+          <i class="el-icon-message-solid" style="font-size: 24px; line-height: 50px" @click="goNotice" />
         </el-tooltip>
         <!-- <el-button icon="el-icon-message-solid" type="text" class="notice-icon" @click="goNotice"></el-button> -->
       </el-badge>
@@ -39,7 +39,7 @@
 
       <el-dropdown class="user-container" trigger="click">
         <div class="user right-menu-item hover-effect">
-          <i class="el-icon-user-solid"></i>
+          <i class="el-icon-user-solid" />
           <span>{{ name }}</span>
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">
@@ -56,10 +56,10 @@
     <el-dialog title="绑定工程机系统" :visible.sync="dialogFormVisible" :modal="false" width="30%">
       <el-form ref="engineForm" :model="engineForm" :rules="engineFormRules">
         <el-form-item label="账号" :label-width="formLabelWidth" prop="account">
-          <el-input v-model="engineForm.account" placeholder="请输入账号" autocomplete="off"></el-input>
+          <el-input v-model="engineForm.account" placeholder="请输入账号" autocomplete="off" />
         </el-form-item>
         <el-form-item label="密码" :label-width="formLabelWidth" prop="password">
-          <el-input v-model="engineForm.password" placeholder="请输入密码" autocomplete="off" show-password></el-input>
+          <el-input v-model="engineForm.password" placeholder="请输入密码" autocomplete="off" show-password />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -70,33 +70,46 @@
 
     <el-dialog title="到货通知" :modal="false" width="70%" :visible.sync="hasNotice" center @close="handleNotice(false)">
       <div class="mymain-container">
-      <div class="table">
-      <el-table :data="noticeList" v-loading="listLoading"  border>
-        <el-table-column property="materialOldNumber" align="left" min-width="120" label="产品编号" show-overflow-tooltip ></el-table-column>
-        <el-table-column property="materialNumber" align="left" min-width="100" label="物料编码" show-overflow-tooltip></el-table-column>
-        <el-table-column property="materialName" align="left" min-width="250" label="产品名称" show-overflow-tooltip></el-table-column>
-        <el-table-column property="specification" align="left" min-width="350" label="规格型号" show-overflow-tooltip></el-table-column>
-        <el-table-column property="stockName" align="left" min-width="100" label="到货仓库" show-overflow-tooltip></el-table-column>
-        <el-table-column property="updateTime" align="left" min-width="200" label="到货通知时间" show-overflow-tooltip></el-table-column>
-      </el-table>
-      <div class="flex">
-        <div></div>
-        <div class="fr">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-sizes="[10, 20, 30, 50]"
-            :page-size="10"
-            layout="total, prev, pager, next"
-            :total="listTotal"
-          >
-          </el-pagination>
+        <el-form ref="form" :model="form" label-width="80px" label-position="left" size="mini">
+          <el-row>
+            <el-col>  <el-form-item prop="specification" label="规格型号">
+              <div style="display: flex">
+                <el-input v-model="form.specification" clearable style="margin-right: 10px" />
+                <el-button @click="form.specification=''; getNoticeList()">重置</el-button>
+                <el-button type="primary" @click="getNoticeList">查询</el-button>
+              </div>
+            </el-form-item>
+
+            </el-col>
+          </el-row>
+
+        </el-form>
+        <div class="table">
+          <el-table v-loading="listLoading" :data="noticeList" border>
+            <el-table-column property="materialOldNumber" align="left" min-width="120" label="产品编号" show-overflow-tooltip />
+            <el-table-column property="materialNumber" align="left" min-width="100" label="物料编码" show-overflow-tooltip />
+            <el-table-column property="materialName" align="left" min-width="250" label="产品名称" show-overflow-tooltip />
+            <el-table-column property="specification" align="left" min-width="350" label="规格型号" show-overflow-tooltip />
+            <el-table-column property="stockName" align="left" min-width="100" label="到货仓库" show-overflow-tooltip />
+            <el-table-column property="updateTime" align="left" min-width="200" label="到货通知时间" show-overflow-tooltip />
+          </el-table>
+          <div class="flex">
+            <div />
+            <div class="fr">
+              <el-pagination
+                :current-page="currentPage"
+                :page-sizes="[10, 20, 30, 50]"
+                :page-size="10"
+                layout="total, prev, pager, next"
+                :total="listTotal"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+              />
+            </div>
+          </div>
         </div>
       </div>
-      </div>
-      </div>
-  </el-dialog>
+    </el-dialog>
     <!--    工程机多帐号-->
     <!--    <el-dialog-->
     <!--      title="绑定工程机系统"-->
@@ -148,48 +161,58 @@
 </template>
 
 <script>
-import { getRebateOrderMsg } from "@/api/dashboard";
-import { mapGetters } from "vuex";
-import Breadcrumb from "@/components/Breadcrumb";
-import Hamburger from "@/components/Hamburger";
-import Screenfull from "@/components/Screenfull";
-import NavMenu from "@/components/NavMenu";
-import { getNoticeListCount } from "@/api/notice";
-import {getNoticeList} from '@/api/stock'
-import { bindEngineAccount, checkEngineAccount } from "@/api/setting";
+import { getRebateOrderMsg } from '@/api/dashboard'
+import { mapGetters } from 'vuex'
+import Breadcrumb from '@/components/Breadcrumb'
+import Hamburger from '@/components/Hamburger'
+import Screenfull from '@/components/Screenfull'
+import NavMenu from '@/components/NavMenu'
+import { getNoticeListCount } from '@/api/notice'
+import { getNoticeList } from '@/api/stock'
+import { bindEngineAccount, checkEngineAccount } from '@/api/setting'
 import mixin from '@/mixin'
 export default {
-  mixins:[mixin],
+  components: {
+    Breadcrumb,
+    Hamburger,
+    Screenfull,
+    NavMenu
+  },
+  mixins: [mixin],
   data() {
     return {
-      intivalId: "",
-      timer: "",
+      intivalId: '',
+      timer: '',
       noticeCount: 0,
-      userInfo: "",
+      userInfo: '',
       engineForm: {
-        account: "",
-        password: "",
+        account: '',
+        password: ''
         // engineList: []
       },
       engineFormRules: {
         account: [
-          { required: true, message: "请输入工程机账号", trigger: "blur" },
+          { required: true, message: '请输入工程机账号', trigger: 'blur' }
         ],
         password: [
-          { required: true, message: "请输入工程机密码", trigger: "blur" },
-        ],
+          { required: true, message: '请输入工程机密码', trigger: 'blur' }
+        ]
       },
-      formLabelWidth: "100px",
+      formLabelWidth: '100px',
       dialogFormVisible: false,
-      //websocket错误连接次数
+      // websocket错误连接次数
       wsConnectErrorTime: 1,
       websock: null,
       lockReconnect: false,
-      noticeList:[]
-    };
+      noticeList: [],
+      form: {
+        specification: ''
+
+      }
+    }
   },
   mounted() {
-    const that = this;
+    const that = this
     // 开定时器轮询未读消息接口(写在全局vuex里比较好)
     // that.initNotice();
     // that.tcMessage();
@@ -203,79 +226,73 @@ export default {
     // this.initWebSocket();
   },
   created() {
-    this.userInfo = JSON.parse(localStorage.getItem("supply_user"));
+    this.userInfo = JSON.parse(localStorage.getItem('supply_user'))
   },
   beforeDestroy() {
-    window.clearInterval(this.intivalId);
-    window.clearInterval(this.timer);
+    window.clearInterval(this.intivalId)
+    window.clearInterval(this.timer)
 
-    console.log("退出清理定时器" + this.timer);
+    console.log('退出清理定时器' + this.timer)
 
-    this.websocketOnclose();
-  },
-  components: {
-    Breadcrumb,
-    Hamburger,
-    Screenfull,
-    NavMenu,
+    this.websocketOnclose()
   },
   computed: {
     showBreadcrumb() {
-      return this.$store.state.settings.breadcrumb;
+      return this.$store.state.settings.breadcrumb
     },
     noticeVisible() {
-      return this.noticeCount > 0;
+      return this.noticeCount > 0
     },
-    hasNotice:{
-      get(){
-        return  this.isNotice
+    hasNotice: {
+      get() {
+        return this.isNotice
       },
-      set(e){
+      set(e) {
         return e
       }
     },
-    ...mapGetters(["sidebar", "avatar", "device", "name","isNotice"]),
+    ...mapGetters(['sidebar', 'avatar', 'device', 'name', 'isNotice'])
 
   },
   methods: {
-    getList(){
+    getList() {
       this.getNoticeList()
-    }
-    ,
-    getNoticeList(){
+    },
+    getNoticeList() {
       this.listLoading = true
       getNoticeList({
-        pageNum:this.currentPage,
-        pageSize:this.pageSize
-      }).then(res=>{
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        specification: this.form.specification
+      }).then(res => {
         this.noticeList = res.data.records
         this.listTotal = res.data.total
         this.listLoading = false
       })
     },
-    handleNotice(flag=true){
+    handleNotice(flag = true) {
       if (flag) {
         this.getNoticeList()
       }
-      this.$store.commit("user/SET_STATUS",!this.hasNotice);
+      this.$store.commit('user/SET_STATUS', !this.hasNotice)
     },
     toggleSideBar() {
-      this.$store.dispatch("app/toggleSideBar");
+      this.$store.dispatch('app/toggleSideBar')
     },
     async logout() {
-      await this.$store.dispatch("user/logout");
+      await this.$store.dispatch('user/logout')
       // this.$router.push(`/login?redirect=${this.$route.fullPath}`)
-      this.$store.commit("tagsView/SET_RESET_VIES");
-      this.$router.push(`/login`);
+      this.$store.commit('tagsView/SET_RESET_VIES')
+      this.$router.push(`/login`)
     },
     initNotice() {
       getNoticeListCount().then((res) => {
         if (res.data > 0 && this.noticeCount !== res.data) {
-          this.noticeCount = res.data;
+          this.noticeCount = res.data
         } else if (res.data === 0 && this.noticeCount !== res.data) {
-          this.noticeCount = 0;
+          this.noticeCount = 0
         }
-      });
+      })
     },
     // async tcMessage() {
     //   // 长链接
@@ -297,29 +314,29 @@ export default {
     //   }
     // },
     goNotice() {
-      this.$router.push("/notice/index");
+      this.$router.push('/notice/index')
     },
     openEngineAccount() {
-      this.engineForm.engineList = this.userInfo.bindEnginList;
-      this.dialogFormVisible = true;
+      this.engineForm.engineList = this.userInfo.bindEnginList
+      this.dialogFormVisible = true
     },
     toEngine() {
-      const userInfoCopy = this.userInfo;
+      const userInfoCopy = this.userInfo
       if (userInfoCopy && userInfoCopy.bindEngin) {
         checkEngineAccount().then((res) => {
           if (res.code === 200) {
             // this.$refs.engineSubmit.click()
             const { href } = this.$router.resolve({
-              name: "open_engin",
-            });
-            window.open(href, "_blank");
+              name: 'open_engin'
+            })
+            window.open(href, '_blank')
           } else {
-            this.$errorMsg("账号密码错误，请重新绑定");
-            this.dialogFormVisible = true;
+            this.$errorMsg('账号密码错误，请重新绑定')
+            this.dialogFormVisible = true
           }
-        });
+        })
       } else {
-        this.dialogFormVisible = true;
+        this.dialogFormVisible = true
       }
     },
     // toEngine(index) {
@@ -345,25 +362,25 @@ export default {
         if (valid) {
           const params = {
             enginUserName: this.engineForm.account,
-            enginPassword: this.engineForm.password,
-          };
+            enginPassword: this.engineForm.password
+          }
           bindEngineAccount(params).then((res) => {
             if (res.code === 200) {
-              this.$successMsg("绑定成功，正在打开工程机系统");
-              this.dialogFormVisible = false;
-              this.$store.dispatch("user/getInfo").then(() => {
-                this.userInfo = JSON.parse(localStorage.getItem("supply_user"));
+              this.$successMsg('绑定成功，正在打开工程机系统')
+              this.dialogFormVisible = false
+              this.$store.dispatch('user/getInfo').then(() => {
+                this.userInfo = JSON.parse(localStorage.getItem('supply_user'))
                 const { href } = this.$router.resolve({
-                  name: "open_engin",
-                });
-                window.open(href, "_blank");
-              });
+                  name: 'open_engin'
+                })
+                window.open(href, '_blank')
+              })
             } else {
-              this.$errorMsg(res.message);
+              this.$errorMsg(res.message)
             }
-          });
+          })
         }
-      });
+      })
     },
     // submitForm(index) {
     //   工程机多帐号
@@ -409,7 +426,7 @@ export default {
     //     this.engineForm.engineList.splice(index, 1)
     //   }
     // }
-    initWebSocket: function () {
+    initWebSocket: function() {
       // WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https
       // var userId = this.$store.getters.userid;
       //
@@ -422,66 +439,66 @@ export default {
       // this.websock.onmessage = this.websocketOnmessage;
       // this.websock.onclose = this.websocketOnclose;
     },
-    websocketOnopen: function () {
-      console.debug("WebSocket连接成功");
-      //心跳检测重置
-      //this.heartCheck.reset().start();
+    websocketOnopen: function() {
+      console.debug('WebSocket连接成功')
+      // 心跳检测重置
+      // this.heartCheck.reset().start();
     },
-    websocketOnerror: function (e) {
-      console.debug("WebSocket连接发生错误，第%s次", this.wsConnectErrorTime);
+    websocketOnerror: function(e) {
+      console.debug('WebSocket连接发生错误，第%s次', this.wsConnectErrorTime)
 
-      this.wsConnectErrorTime = this.wsConnectErrorTime + 1;
+      this.wsConnectErrorTime = this.wsConnectErrorTime + 1
       if (this.wsConnectErrorTime > 5) {
-        console.debug("WebSocket连接错误超过5次，就不再重新连了！");
-        this.lockReconnect = true;
-        return;
+        console.debug('WebSocket连接错误超过5次，就不再重新连了！')
+        this.lockReconnect = true
+        return
       }
 
-      this.reconnect();
+      this.reconnect()
     },
-    websocketOnmessage: function (e) {
-      console.debug("-----接收消息-------", e.data);
-      let data = eval("(" + e.data + ")"); //解析对象
-      if (data.type === "RebateOrderMsg") {
+    websocketOnmessage: function(e) {
+      console.debug('-----接收消息-------', e.data)
+      const data = eval('(' + e.data + ')') // 解析对象
+      if (data.type === 'RebateOrderMsg') {
         if (data.res.hasMessage) {
           this.$notify.info({
-            title: "消息",
+            title: '消息',
             message: res.data.messages,
-            position: "bottom-right",
+            position: 'bottom-right',
             duration: 4000,
-            showClose: false,
-          });
+            showClose: false
+          })
         }
       }
     },
-    websocketOnclose: function (e) {
-      console.debug("connection closed (" + e + ")");
+    websocketOnclose: function(e) {
+      console.debug('connection closed (' + e + ')')
       if (e) {
-        console.debug("connection closed (" + e.code + ")");
+        console.debug('connection closed (' + e.code + ')')
       }
-      this.reconnect();
+      this.reconnect()
     },
     websocketSend(text) {
       // 数据发送
       try {
-        this.websock.send(text);
+        this.websock.send(text)
       } catch (err) {
-        console.debug("send failed (" + err.code + ")");
+        console.debug('send failed (' + err.code + ')')
       }
     },
     reconnect() {
-      var that = this;
-      if (that.lockReconnect) return;
-      that.lockReconnect = true;
-      //没连接上会一直重连，设置延迟避免请求过多
-      setTimeout(function () {
-        console.debug("尝试重连...");
-        that.initWebSocket();
-        that.lockReconnect = false;
-      }, 20000);
-    },
-  },
-};
+      var that = this
+      if (that.lockReconnect) return
+      that.lockReconnect = true
+      // 没连接上会一直重连，设置延迟避免请求过多
+      setTimeout(function() {
+        console.debug('尝试重连...')
+        that.initWebSocket()
+        that.lockReconnect = false
+      }, 20000)
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/sales_policy/components/AddPolicy.vue

@@ -355,6 +355,17 @@
                 />
               </template>
             </el-table-column>
+            <el-table-column
+              prop="status"
+              label="状态"
+              align="left"
+              show-overflow-tooltip
+              min-width="150"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.status?'启用':'作废' }}
+              </template>
+            </el-table-column>
             <el-table-column fixed="right" label="操作" align="center">
               <template slot-scope="scope">
                 <!--                <el-popconfirm-->
@@ -373,6 +384,7 @@
                 <!--                  >-->
                 <!--                </el-popconfirm>-->
                 <el-popconfirm
+                  v-if="!scope.row.status"
                   confirm-button-text="好的"
                   cancel-button-text="不用了"
                   icon="el-icon-info"
@@ -387,6 +399,7 @@
                   >启用</el-button>
                 </el-popconfirm>
                 <el-popconfirm
+                  v-else
                   confirm-button-text="好的"
                   cancel-button-text="不用了"
                   icon="el-icon-info"

src/views/sales_policy/components/Examine.vue

@@ -7,7 +7,7 @@
           @back="($parent.isShow = 1), ($parent.id = '')"
         />
       </el-header>
-      <div >
+      <div>
         <div class="diy-table-1">
           <el-row>
             <el-col :span="8" class="item">
@@ -148,8 +148,13 @@
                 <h4 style="display: inline-block; margin-right: 20px">
                   货品信息
                 </h4>
-                <ExportButton v-if="$parent.isShow ===4" style="display: inline-block" :exUrl="'policy/material/export'"  exText="导出货品"
-                              :ex-params="{policyId: detail.code}"></ExportButton>
+                <ExportButton
+                  v-if="$parent.isShow ===4"
+                  style="display: inline-block"
+                  :ex-url="'policy/material/export'"
+                  ex-text="导出货品"
+                  :ex-params="{policyId: detail.code}"
+                />
 
                 <el-upload
                   v-if="$parent.isShow == 5"
@@ -194,8 +199,8 @@
               align="left"
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialNumber" />
-                <span>{{scope.row.materialNumber}}</span>
+                <CopyButton :copy-text="scope.row.materialNumber" />
+                <span>{{ scope.row.materialNumber }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -206,8 +211,8 @@
               align="left"
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <CopyButton :copy-text="scope.row.materialName" />
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -218,13 +223,14 @@
               align="left"
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <CopyButton :copy-text="scope.row.specification" />
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
             <el-table-column
               prop="saleTypeCode"
-              label="销售类型编码"    min-width="160"
+              label="销售类型编码"
+              min-width="160"
               show-overflow-tooltip
               align="left"
             />
@@ -237,10 +243,14 @@
             />
             <el-table-column prop="discAmount" label="格力折扣" align="right" />
             <el-table-column prop="price" label="单价" align="right" />
-            <el-table-column label="返利钱包" align="left"     min-width="160"
-                             show-overflow-tooltip>
+            <el-table-column
+              label="返利钱包"
+              align="left"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <template  v-for="item in scope.row.walletRelaList">
+                <template v-for="item in scope.row.walletRelaList">
                   <el-tag
                     v-if="item.type==='REBATE'"
                     style="margin: 5px"
@@ -250,12 +260,16 @@
                 </template>
               </template>
             </el-table-column>
-            <el-table-column label="现金钱包" align="left"     min-width="160"
-                             show-overflow-tooltip>
+            <el-table-column
+              label="现金钱包"
+              align="left"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <template  v-for="item in scope.row.walletRelaList">
+                <template v-for="item in scope.row.walletRelaList">
                   <el-tag
-                   v-if="item.type==='COMMONLY'"
+                    v-if="item.type==='COMMONLY'"
                     style="margin: 5px"
                     type="success"
                     size="small"
@@ -263,6 +277,17 @@
                 </template>
               </template>
             </el-table-column>
+            <el-table-column
+              prop="status"
+              label="状态"
+              align="left"
+              show-overflow-tooltip
+              min-width="150"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.status?'启用':'作废' }}
+              </template>
+            </el-table-column>
             <!-- <el-table-column
               label="操作"
               align="left"
@@ -375,20 +400,25 @@
                   经销商使用范围
                 </h4>
 
-                <ExportButton style="display: inline-block"  v-if="$parent.isShow ===4" :exUrl="'policy/customer/export'"  exText="导出经销商"
-                              :ex-params="{policyId:detail.code}"></ExportButton>
+                <ExportButton
+                  v-if="$parent.isShow ===4"
+                  style="display: inline-block"
+                  :ex-url="'policy/customer/export'"
+                  ex-text="导出经销商"
+                  :ex-params="{policyId:detail.code}"
+                />
               </el-col>
             </el-row>
             <el-divider />
 
           </el-row>
- <div style="margin-bottom: 20px;">
-                      <el-radio-group v-model="detail.flag+''" >
-           <el-radio label="0" :disabled="detail.flag !=0">指定经销商</el-radio>
-           <el-radio label="1" :disabled="detail.flag !=1">广州经销商</el-radio>
-            <el-radio label="2" :disabled="detail.flag !=2">佛山经销商</el-radio>
-           </el-radio-group>
-              </div>
+          <div style="margin-bottom: 20px;">
+            <el-radio-group v-model="detail.flag+''">
+              <el-radio label="0" :disabled="detail.flag !=0">指定经销商</el-radio>
+              <el-radio label="1" :disabled="detail.flag !=1">广州经销商</el-radio>
+              <el-radio label="2" :disabled="detail.flag !=2">佛山经销商</el-radio>
+            </el-radio-group>
+          </div>
           <template v-if="$parent.isShow != 5">
             <el-table
               v-loading="listLoading"
@@ -581,102 +611,102 @@
               </el-col>
             </el-row>
           </template>
-            <div>
-             <h4 style="display: inline-block; margin-right: 20px">
-                  经销商上限
-       </h4>
-  <el-divider />
-    </div>
-    <div>
-      <div class="table">
-      <el-table
-        v-loading="clistLoading"
-        :data="list"
-        element-loading-text="Loading"
-        border
-        fit
-        highlight-current-row
-        stripe
-        @select-all="handleSelectionAllChange2"
-        @selection-change="handleSelectionChange2"
-      >
-        <!-- <el-table-column type="selection" width="55" align="left" /> -->
-        <el-table-column
-          prop="customerNumber"
-          label="经销商编号
+          <div>
+            <h4 style="display: inline-block; margin-right: 20px">
+              经销商上限
+            </h4>
+            <el-divider />
+          </div>
+          <div>
+            <div class="table">
+              <el-table
+                v-loading="clistLoading"
+                :data="list"
+                element-loading-text="Loading"
+                border
+                fit
+                highlight-current-row
+                stripe
+                @select-all="handleSelectionAllChange2"
+                @selection-change="handleSelectionChange2"
+              >
+                <!-- <el-table-column type="selection" width="55" align="left" /> -->
+                <el-table-column
+                  prop="customerNumber"
+                  label="经销商编号
 "
-          align="left"
-        >
-          <template slot-scope="scope">
-            <CopyButton :copy-text="scope.row.customerNumber" />
-            <span>{{ scope.row.customerNumber }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="customerName" label="经销商名称" align="left">
-          <template slot-scope="scope">
-            <CopyButton :copy-text="scope.row.customerName" />
-            <span>{{ scope.row.customerName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="materialName"
-          label="物料名称
+                  align="left"
+                >
+                  <template slot-scope="scope">
+                    <CopyButton :copy-text="scope.row.customerNumber" />
+                    <span>{{ scope.row.customerNumber }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="customerName" label="经销商名称" align="left">
+                  <template slot-scope="scope">
+                    <CopyButton :copy-text="scope.row.customerName" />
+                    <span>{{ scope.row.customerName }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="materialName"
+                  label="物料名称
 
 "
-          align="left"
-        >
-          <template slot-scope="scope">
-            <CopyButton :copy-text="scope.row.materialName" />
-            <span>{{ scope.row.materialName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="materialNumber"
-          label="物料编号
+                  align="left"
+                >
+                  <template slot-scope="scope">
+                    <CopyButton :copy-text="scope.row.materialName" />
+                    <span>{{ scope.row.materialName }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="materialNumber"
+                  label="物料编号
 "
-          align="left"
-        >
-          <template slot-scope="scope">
-            <CopyButton :copy-text="scope.row.materialNumber" />
-            <span>{{ scope.row.materialNumber }}</span>
-          </template>
-        </el-table-column>
+                  align="left"
+                >
+                  <template slot-scope="scope">
+                    <CopyButton :copy-text="scope.row.materialNumber" />
+                    <span>{{ scope.row.materialNumber }}</span>
+                  </template>
+                </el-table-column>
                 <el-table-column
-          prop="examineOrderNums"
-          label="已审订单数
+                  prop="examineOrderNums"
+                  label="已审订单数
 "
-          align="left"
-        >
-        <template slot-scope="scope">
-          {{scope.row.examineOrderNums | numToFixed }}
-        </template>
-        </el-table-column>
-        <el-table-column
-          prop="limitQty"
-          label="购买量上限
+                  align="left"
+                >
+                  <template slot-scope="scope">
+                    {{ scope.row.examineOrderNums | numToFixed }}
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="limitQty"
+                  label="购买量上限
 
 "
-          align="left"
-        >
-          <template slot-scope="scope">
-          {{scope.row.limitQty | numToFixed }}
-        </template>
-        </el-table-column>
-      </el-table>
-      </div>
-      <!-- 分页 -->
-      <div style="margin: 20px 0">
-        <el-pagination
-          :current-page="policyList.currentPages"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="cTotal"
-          @size-change="handleSizeChanges4"
-          @current-change="handleCurrentChanges4"
-        />
-      </div>
-    </div>
+                  align="left"
+                >
+                  <template slot-scope="scope">
+                    {{ scope.row.limitQty | numToFixed }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+            <!-- 分页 -->
+            <div style="margin: 20px 0">
+              <el-pagination
+                :current-page="policyList.currentPages"
+                :page-sizes="[10, 20, 30, 50]"
+                :page-size="10"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="cTotal"
+                @size-change="handleSizeChanges4"
+                @current-change="handleCurrentChanges4"
+              />
+            </div>
+          </div>
           <div
             v-if="$parent.isShow == 8 && detail.examineStatus == 'WAIT'"
             class="descriptions diy-table-1"
@@ -694,7 +724,7 @@
                 </template>
               </el-col>
             </el-row>
-            <el-row  class="item">
+            <el-row class="item">
               <el-col :span="4">审批说明</el-col>
               <el-col :span="20" class="col value" style="padding-left: 10px">
                 <el-input
@@ -812,23 +842,23 @@ export default {
           label: '限量'
         }
       ],
-      detailFang:false,
+      detailFang: false,
 
-          policyList: {
+      policyList: {
         pageNum: 1,
         pageSize: 10,
-        policyId: "",
-        keyword: "",
-        currentPages: 1,
+        policyId: '',
+        keyword: '',
+        currentPages: 1
       },
       list: [],
       cTotal: 1,
-      clistLoading: false,
+      clistLoading: false
     }
   },
   computed: {
     comTitle() {
-        console.log(this.detailFang,'kkk')
+      console.log(this.detailFang, 'kkk')
       let title = '详情页'
       if (this.$parent.isShow == 5) {
         title = '编辑页'
@@ -842,8 +872,8 @@ export default {
   },
   created() {},
   methods: {
-    funTitle(){
-          console.log();
+    funTitle() {
+      console.log()
       let title = '详情页'
       if (this.$parent.isShow == 5) {
         title = '编辑页'
@@ -874,30 +904,30 @@ export default {
         this.getPolicyList()
       })
     },
-getPolicyList() {
-      this.clistLoading = true;
+    getPolicyList() {
+      this.clistLoading = true
       getPolicyList({
         pageNum: this.policyList.currentPages,
         pageSize: this.policyList.pageSize,
         policyId: this.$parent.id,
-        keyword: this.policyList.keyword,
+        keyword: this.policyList.keyword
       }).then((res) => {
-        this.list = res.data.records;
-        console.log(this.list, "785787");
-        this.cTotal = res.data.total;
-        this.clistLoading = false;
-      });
+        this.list = res.data.records
+        console.log(this.list, '785787')
+        this.cTotal = res.data.total
+        this.clistLoading = false
+      })
     },
-          // 更改每页数量
+    // 更改每页数量
     handleSizeChanges4(val) {
-      this.policyList.pageSizes = val;
-      this.policyList.currentPages = 1;
-      this.getPolicyList();
+      this.policyList.pageSizes = val
+      this.policyList.currentPages = 1
+      this.getPolicyList()
     },
     // 更改当前页
     handleCurrentChanges4(val) {
-      this.policyList.currentPages = val;
-      this.getPolicyList();
+      this.policyList.currentPages = val
+      this.getPolicyList()
     },
     getCrList() {
       const customerParams = {

src/views/sales_policy/components/editPolicy.vue

@@ -359,6 +359,17 @@
                 </template>
               </el-table-column>
               <el-table-column
+                prop="status"
+                label="状态"
+                align="left"
+                show-overflow-tooltip
+                min-width="150"
+              >
+                <template slot-scope="scope">
+                  {{ scope.row.status?'启用':'作废' }}
+                </template>
+              </el-table-column>
+              <el-table-column
                 min-width="100"
                 fixed="right"
                 label="操作"
@@ -380,6 +391,7 @@
                   <!--                  >删除</el-button>-->
                   <!--                </el-popconfirm>-->
                   <el-popconfirm
+                    v-if="!scope.row.status"
                     confirm-button-text="好的"
                     cancel-button-text="不用了"
                     icon="el-icon-info"
@@ -394,6 +406,7 @@
                     >启用</el-button>
                   </el-popconfirm>
                   <el-popconfirm
+                    v-else
                     confirm-button-text="好的"
                     cancel-button-text="不用了"
                     icon="el-icon-info"

src/views/supply/engin/home_list.vue

@@ -1,35 +1,62 @@
 <template>
   <div class="app-container">
-    <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
+    <div
+      v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn"
+    >
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
+        <el-form
+          ref="screenForm"
+          :model="screenForm"
+          label-width="100px"
+          size="mini"
+          label-position="left"
+        >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
-                <el-checkbox-group v-model="screenForm.status" @change="getList()">
-                  <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{ item.label }}</el-checkbox-button>
+                <el-checkbox-group
+                  v-model="screenForm.status"
+                  @change="getList()"
+                >
+                  <el-checkbox-button
+                    v-for="(item, index) in statusList"
+                    :key="index"
+                    :label="item.value"
+                  >{{ item.label }}</el-checkbox-button>
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程订单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入工程订单号" />
+                <el-input
+                  v-model="screenForm.orderNum"
+                  placeholder="请输入工程订单号"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程编码" prop="enginNum">
-                <el-input v-model="screenForm.enginNum" placeholder="请输入工程编码" />
+                <el-input
+                  v-model="screenForm.enginNum"
+                  placeholder="请输入工程编码"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程登录编号" prop="loginNum">
-                <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号" />
+                <el-input
+                  v-model="screenForm.loginNum"
+                  placeholder="请输入工程登录编号"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="行业类别" prop="refTradeCategory">
-                <el-input v-model="screenForm.refTradeCategory" placeholder="请输入项目名称" />
+                <el-input
+                  v-model="screenForm.refTradeCategory"
+                  placeholder="请输入项目名称"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -38,7 +65,7 @@
                   v-model="screenForm.date"
                   type="datetimerange"
                   range-separator="至"
-                  style="width: 100%;"
+                  style="width: 100%"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
@@ -47,24 +74,46 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="销售类型" prop="saleType">
-                <el-select v-model="screenForm.saleType" placeholder="选择销售类型" style="width: 100%" clearable>
-                  <el-option v-for="item in salesTypeList" :key="item.id" :label="item.saleName" :value="item.id" />
+                <el-select
+                  v-model="screenForm.saleType"
+                  placeholder="选择销售类型"
+                  style="width: 100%"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in salesTypeList"
+                    :key="item.id"
+                    :label="item.saleName"
+                    :value="item.id"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="制单人" prop="createMan">
-                <el-input v-model="screenForm.createMan" placeholder="请输入制单人" />
+                <el-input
+                  v-model="screenForm.createMan"
+                  placeholder="请输入制单人"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="审核人" prop="examineMan">
-                <el-input v-model="screenForm.examineMan" placeholder="请输入审核人" />
+                <el-input
+                  v-model="screenForm.examineMan"
+                  placeholder="请输入审核人"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="表头业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择表头业务员" clearable filterable style="width: 100%">
+                <el-select
+                  v-model="screenForm.salesMan"
+                  placeholder="选择表头业务员"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                >
                   <el-option
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
@@ -76,27 +125,42 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="使用单位" prop="refUseUnit">
-                <el-input v-model="screenForm.refUseUnit" placeholder="请输入使用单位" />
+                <el-input
+                  v-model="screenForm.refUseUnit"
+                  placeholder="请输入使用单位"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="产品编码" prop="materialOldNumber">
-                <el-input v-model="screenForm.materialOldNumber" placeholder="请输入产品编码" />
+                <el-input
+                  v-model="screenForm.materialOldNumber"
+                  placeholder="请输入产品编码"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="规格型号" prop="specification">
-                <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
+                <el-input
+                  v-model="screenForm.specification"
+                  placeholder="请输入规格型号"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商" prop="customerKeyword">
-                <el-input v-model="screenForm.customerKeyword" placeholder="请输入经销商" />
+                <el-input
+                  v-model="screenForm.customerKeyword"
+                  placeholder="请输入经销商"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="区域" prop="refRegionWork">
-                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
+                <el-input
+                  v-model="screenForm.refRegionWork"
+                  placeholder="请输入区域"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -106,22 +170,36 @@
             </el-col>
             <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
               <el-form-item label="格力内部备注" prop="geLiInerNote">
-                <el-input v-model="screenForm.geLiInerNote" placeholder="格力内部备注" />
+                <el-input
+                  v-model="screenForm.geLiInerNote"
+                  placeholder="格力内部备注"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="跨区厂编号" prop="refFactoryNo">
-                <el-input v-model="screenForm.refFactoryNo" placeholder="跨区厂编号" />
+                <el-input
+                  v-model="screenForm.refFactoryNo"
+                  placeholder="跨区厂编号"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="购买单位" prop="refBuyUnitName">
-                <el-input v-model="screenForm.refBuyUnitName" placeholder="购买单位" />
+                <el-input
+                  v-model="screenForm.refBuyUnitName"
+                  placeholder="购买单位"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="保证函" prop="refPromiseProvide">
-                <el-select v-model="screenForm.refPromiseProvide" placeholder="保证函" filterable style="width: 100%">
+                <el-select
+                  v-model="screenForm.refPromiseProvide"
+                  placeholder="保证函"
+                  filterable
+                  style="width: 100%"
+                >
                   <el-option label="全部" value="" />
                   <el-option label="未保证" value="未保证" />
                   <el-option label="已保证" value="已保证" />
@@ -130,7 +208,11 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="是否直调" prop="isDirectTransfer">
-                <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直" style="width: 100%">
+                <el-select
+                  v-model="screenForm.isDirectTransfer"
+                  placeholder="选择是否直"
+                  style="width: 100%"
+                >
                   <el-option :value="null" label="默认" />
                   <el-option
                     v-for="item in transfer"
@@ -141,10 +223,32 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="!isCustomer ? 12 : 24" :lg="!isCustomer ? 24 : 24" class="tr">
+
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="订单日期" prop="orderTime">
+                <el-date-picker
+                  v-model="screenForm.orderTime"
+                  type="datetimerange"
+                  range-separator="至"
+                  style="width: 100%"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col
+              :xs="24"
+              :sm="!isCustomer ? 12 : 24"
+              :lg="!isCustomer ? 24 : 24"
+              class="tr"
+            >
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
-                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button
+                  type="primary"
+                  @click="submitScreenForm"
+                >搜索</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -154,11 +258,27 @@
       <div class="mymain-container">
         <div class="btn-group clearfix">
           <div class="fl">
-            <el-button v-if="$checkBtnRole('add', $route.meta.roles)" size="mini" type="primary" icon="el-icon-plus" @click="toForm()">新增</el-button>
-            <el-button v-if="$checkBtnRole('del', $route.meta.roles)" size="mini" type="danger" icon="el-icon-minus" :disabled="multipleSelection.length < 1" @click="batchDelete()">批量删除</el-button>
+            <el-button
+              v-if="$checkBtnRole('add', $route.meta.roles)"
+              size="mini"
+              type="primary"
+              icon="el-icon-plus"
+              @click="toForm()"
+            >新增</el-button>
+            <el-button
+              v-if="$checkBtnRole('del', $route.meta.roles)"
+              size="mini"
+              type="danger"
+              icon="el-icon-minus"
+              :disabled="multipleSelection.length < 1"
+              @click="batchDelete()"
+            >批量删除</el-button>
           </div>
           <div class="fr">
-            <ExportButton :ex-url="'engin-order/export'" :ex-params="exParams" />
+            <ExportButton
+              :ex-url="'engin-order/export'"
+              :ex-params="exParams"
+            />
           </div>
         </div>
         <div class="table">
@@ -175,196 +295,479 @@
             @selection-change="handleSelectionChange"
           >
             <el-table-column align="center" type="selection" width="55" />
-            <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="审核状态"
+              prop="examineStatus"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.examineStatus | statusFilter }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="工程订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="工程订单号"
+              prop="enginOrderNo"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copy-text="scope.row.enginOrderNo" />
                 <span>{{ scope.row.enginOrderNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="订单日期" prop="orderDate" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="订单日期"
+              prop="orderDate"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <div>
                   <span>{{ scope.row.orderDate }}</span>
-                  <el-button v-if="$checkBtnRole('date', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'WAIT')" type="text" icon="el-icon-edit" style="padding: 0; margin-left: 4px" @click="editDate(scope.row)" />
+                  <el-button
+                    v-if="
+                      $checkBtnRole('date', $route.meta.roles) &&
+                        (scope.row.examineStatus === 'SAVE' ||
+                          scope.row.examineStatus === 'WAIT')
+                    "
+                    type="text"
+                    icon="el-icon-edit"
+                    style="padding: 0; margin-left: 4px"
+                    @click="editDate(scope.row)"
+                  />
                 </div>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip />
-            <el-table-column align="left" label="制单人" prop="createName" min-width="100" show-overflow-tooltip />
-            <el-table-column align="left" label="工程登录编号" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="制单日期"
+              prop="createTime"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="制单人"
+              prop="createName"
+              min-width="100"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="工程登录编号"
+              prop="refEnginRecordNo"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copy-text="scope.row.refEnginRecordNo" />
                 <span>{{ scope.row.refEnginRecordNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip />
-            <el-table-column align="left" label="购买单位" prop="refBuyUnitName" min-width="160" show-overflow-tooltip />
-            <el-table-column align="left" label="保证函" prop="refPromiseProvide" min-width="100" show-overflow-tooltip />
-
-            <el-table-column align="left" label="跨区厂编号" prop="refFactoryNo" min-width="160" show-overflow-tooltip />
-            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip />
-            <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="120" show-overflow-tooltip />
-            <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="使用单位"
+              prop="refUseUnit"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="购买单位"
+              prop="refBuyUnitName"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="保证函"
+              prop="refPromiseProvide"
+              min-width="100"
+              show-overflow-tooltip
+            />
+
+            <el-table-column
+              align="left"
+              label="跨区厂编号"
+              prop="refFactoryNo"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="区域"
+              prop="refRegionWork"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="销售类型"
+              prop="saleTypeName"
+              min-width="120"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="物料编码"
+              prop="materialNumber"
+              min-width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copy-text="scope.row.materialNumber" />
                 <span>{{ scope.row.materialNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品编码"
+              prop="materialOldNumber"
+              min-width="140"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copy-text="scope.row.materialOldNumber" />
                 <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品名称"
+              prop="materialName"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copy-text="scope.row.materialName" />
                 <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="规格型号"
+              prop="specification"
+              min-width="350"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copy-text="scope.row.specification" />
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="总数量" prop="qty" min-width="100" sortable show-overflow-tooltip />
-            <el-table-column align="right" label="单价" prop="price" min-width="100" sortable show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="总数量"
+              prop="qty"
+              min-width="100"
+              sortable
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="right"
+              label="单价"
+              prop="price"
+              min-width="100"
+              sortable
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.price | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="110" sortable show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="订单金额"
+              prop="totalAmount"
+              min-width="110"
+              sortable
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.totalAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="实付金额" prop="payAmount" min-width="110" sortable show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="实付金额"
+              prop="payAmount"
+              min-width="110"
+              sortable
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.payAmount | numToFixed }}
               </template>
             </el-table-column>
 
-            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="经销商编码"
+              prop="customerNumber"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copy-text="scope.row.customerNumber" />
                 <span>{{ scope.row.customerNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="经销商名称"
+              prop="customerName"
+              min-width="250"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copy-text="scope.row.customerName" />
                 <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="发货数量" prop="retiredQty" min-width="110" sortable show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="发货数量"
+              prop="retiredQty"
+              min-width="110"
+              sortable
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.applySendQty }}
-              </template>
-            </el-table-column><el-table-column align="right" label="退货数量" prop="refundProductQty" min-width="110" sortable show-overflow-tooltip>
+              </template> </el-table-column><el-table-column
+              align="right"
+              label="退货数量"
+              prop="refundProductQty"
+              min-width="110"
+              sortable
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.refundProductQty }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="是否直调"
+              prop="isDirectTransfer"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{ scope.row.isDirectTransfer ? '是':'否' }}
+                {{ scope.row.isDirectTransfer ? "是" : "否" }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="110" sortable show-overflow-tooltip />
-            <el-table-column align="right" label="出库数量" prop="hasSendQty" min-width="110" sortable show-overflow-tooltip />
-
-            <el-table-column align="left" label="行业类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip />
-            <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip />
-            <el-table-column v-if="!isCustomer" align="left" label="格力内部备注" prop="geLiInerNote" min-width="160" show-overflow-tooltip />
-            <el-table-column align="left" label="返利钱包" prop="customerWalletName2" min-width="100" show-overflow-tooltip />
-            <el-table-column align="right" label="使用返利金额" prop="rebateAmount" min-width="120" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="直调数量"
+              prop="directTransferQty"
+              min-width="110"
+              sortable
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="right"
+              label="出库数量"
+              prop="hasSendQty"
+              min-width="110"
+              sortable
+              show-overflow-tooltip
+            />
+
+            <el-table-column
+              align="left"
+              label="行业类别"
+              prop="refTradeCategory"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="备注"
+              prop="remark"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              v-if="!isCustomer"
+              align="left"
+              label="格力内部备注"
+              prop="geLiInerNote"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="返利钱包"
+              prop="customerWalletName2"
+              min-width="100"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="right"
+              label="使用返利金额"
+              prop="rebateAmount"
+              min-width="120"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <div v-if="scope.row.examineStatus === 'OK'">{{ scope.row.payRebateAmount | numToFixed }}</div>
+                <div v-if="scope.row.examineStatus === 'OK'">
+                  {{ scope.row.payRebateAmount | numToFixed }}
+                </div>
                 <div v-else>{{ scope.row.rebateAmount | numToFixed }}</div>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="格力折扣" prop="discAmount" min-width="110" sortable show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="格力折扣"
+              prop="discAmount"
+              min-width="110"
+              sortable
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.discAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip />
-            <el-table-column align="left" label="表头业务员" prop="serviceName" min-width="100" show-overflow-tooltip />
-            <el-table-column align="left" label="表体业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip />
-            <el-table-column align="left" label="审核人" prop="confirmName" min-width="100" show-overflow-tooltip />
-            <el-table-column align="left" label="审核日期" prop="confirmTime" min-width="160" show-overflow-tooltip />
-            <el-table-column align="left" label="订单类型" prop="enginOrderType" min-width="100" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="备注"
+              prop="remark"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="表头业务员"
+              prop="serviceName"
+              min-width="100"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="表体业务员"
+              prop="itemServiceName"
+              min-width="100"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="审核人"
+              prop="confirmName"
+              min-width="100"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="审核日期"
+              prop="confirmTime"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="订单类型"
+              prop="enginOrderType"
+              min-width="100"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.enginOrderType | typeFilter }}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip />
-            <el-table-column align="center" label="操作" width="220" fixed="right">
+            <el-table-column
+              align="left"
+              label="单位"
+              prop="unit"
+              min-width="100"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="center"
+              label="操作"
+              width="220"
+              fixed="right"
+            >
               <template slot-scope="scope">
                 <el-popconfirm
                   v-if="scope.row.examineStatus === 'SAVE'"
-                  style="margin-right: 10px;"
+                  style="margin-right: 10px"
                   title="确定申请吗？"
-                  @onConfirm="handleSubmit(scope.row.parentId,scope.row)"
+                  @onConfirm="handleSubmit(scope.row.parentId, scope.row)"
                 >
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="scope.row.examineStatus === 'WAIT'"
-                  style="margin-right: 10px;"
+                  style="margin-right: 10px"
                   title="确定撤回吗？"
-                  @onConfirm="handleWithdraw(scope.row.parentId,scope.row)"
+                  @onConfirm="handleWithdraw(scope.row.parentId, scope.row)"
                 >
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
                 <el-popconfirm
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'"
-                  style="margin-right: 10px;"
+                  v-if="
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                      scope.row.examineStatus === 'OK'
+                  "
+                  style="margin-right: 10px"
                   title="确定弃审吗？"
-                  @onConfirm="handleAbandon(scope.row.parentId,scope.row)"
+                  @onConfirm="handleAbandon(scope.row.parentId, scope.row)"
                 >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
                 <el-button
-                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL')"
+                  v-if="
+                    $checkBtnRole('edit', $route.meta.roles) &&
+                      (scope.row.examineStatus === 'SAVE' ||
+                        scope.row.examineStatus === 'FAIL')
+                  "
                   type="text"
                   @click="toForm(scope.row)"
                 >
                   编辑
                 </el-button>
                 <el-button
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
+                  v-if="
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                      scope.row.examineStatus === 'WAIT'
+                  "
                   type="text"
                   @click="toExamine(scope.row)"
                 >
                   审批
                 </el-button>
                 <el-button
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus !== 'FAIL'"
+                  v-if="
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                      scope.row.examineStatus !== 'FAIL'
+                  "
                   type="text"
                   @click="toReturn(scope.row)"
                 >
                   退订
                 </el-button>
-                <el-button
-                  type="text"
-                  @click="toDetail(scope.row)"
-                >
+                <el-button type="text" @click="toDetail(scope.row)">
                   详情
                 </el-button>
                 <el-popconfirm
-                  v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'"
-                  style="margin-left: 10px;"
+                  v-if="
+                    $checkBtnRole('del', $route.meta.roles) &&
+                      scope.row.examineStatus !== 'OK'
+                  "
+                  style="margin-left: 10px"
                   title="确定删除吗？"
-                  @onConfirm="handleDelete(scope.row.parentId,scope.row)"
+                  @onConfirm="handleDelete(scope.row.parentId, scope.row)"
                 >
-                  <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
+                  <el-button
+                    slot="reference"
+                    type="text"
+                    style="color: #f56c6c"
+                  >删除</el-button>
                 </el-popconfirm>
               </template>
             </el-table-column>
@@ -386,13 +789,31 @@
       </div>
     </div>
 
-    <EditDateDialog :is-show.sync="isShowEditDateDialog" :date-form.sync="dateForm" />
-
-    <HomeDetail v-if="isShowDetail" :list-item="queryItem" @backListFormDetail="backList" />
-    <HomeForm v-if="isShowForm" :list-item="queryItem" @backListFormDetail="backList" />
-    <HomeExamine v-if="isShowExamine" :list-item="queryItem" @backListFormDetail="backList" />
-    <HomeReturn v-if="isShowReturn" :list-item="queryItem" @backListFormDetail="backList" />
+    <EditDateDialog
+      :is-show.sync="isShowEditDateDialog"
+      :date-form.sync="dateForm"
+    />
 
+    <HomeDetail
+      v-if="isShowDetail"
+      :list-item="queryItem"
+      @backListFormDetail="backList"
+    />
+    <HomeForm
+      v-if="isShowForm"
+      :list-item="queryItem"
+      @backListFormDetail="backList"
+    />
+    <HomeExamine
+      v-if="isShowExamine"
+      :list-item="queryItem"
+      @backListFormDetail="backList"
+    />
+    <HomeReturn
+      v-if="isShowReturn"
+      :list-item="queryItem"
+      @backListFormDetail="backList"
+    />
   </div>
 </template>
 
@@ -455,7 +876,8 @@ export default {
         refFactoryNo: '',
         refBuyUnitName: '',
         refPromiseProvide: '',
-        isDirectTransfer: null
+        isDirectTransfer: null,
+        orderTime: []
 
       },
       statusList: [
@@ -500,6 +922,8 @@ export default {
         refTradeCategory: this.screenForm.refTradeCategory,
         startCreateTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endCreateTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        startOrderTime: this.screenForm.orderTime ? this.screenForm.orderTime[0] : '',
+        endOrderTime: this.screenForm.orderTime ? this.screenForm.orderTime[1] : '',
         saleTypeId: this.screenForm.saleType,
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
@@ -570,6 +994,8 @@ export default {
         refTradeCategory: this.screenForm.refTradeCategory,
         startCreateTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endCreateTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        startOrderTime: this.screenForm.orderTime ? this.screenForm.orderTime[0] : '',
+        endOrderTime: this.screenForm.orderTime ? this.screenForm.orderTime[1] : '',
         saleTypeId: this.screenForm.saleType,
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
@@ -738,6 +1164,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>