Переглянути джерело

Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

gjy 3 роки тому
батько
коміт
ccf3d5e1cf
43 змінених файлів з 951 додано та 1013 видалено
  1. 3 0
      src/App.vue
  2. 3 5
      src/components/base/BaseContainer/index.vue
  3. 76 75
      src/layout/index/index.vue
  4. 1 1
      src/layout/index/top/index.vue
  5. 11 6
      src/styles/media.scss
  6. 2 2
      src/views/contractManagement/futuresPurchaseContractAdd.vue
  7. 3 3
      src/views/contractManagement/futuresPurchaseContractEdit.vue
  8. 2 2
      src/views/contractManagement/futuresSalesContractAdd.vue
  9. 2 2
      src/views/contractManagement/futuresSalesContractEdit.vue
  10. 717 835
      src/views/contractManagement/purchaseContract.vue
  11. 3 3
      src/views/contractManagement/purchaseContractAdd.vue
  12. 2 2
      src/views/contractManagement/purchaseContractEdit.vue
  13. 1 1
      src/views/contractManagement/salesContractAdd.vue
  14. 1 2
      src/views/financialManagement/collectionManagementList.vue
  15. 1 1
      src/views/houseSelfCollect/acquisitionManagementAdd.vue
  16. 1 1
      src/views/houseSelfCollect/paymentManagement.vue
  17. 0 1
      src/views/outboundManagement/collectionManagement.vue
  18. 1 0
      src/views/purchasingManagement/procurementPlanEdit.vue
  19. 1 2
      src/views/purchasingManagement/purchaseOrderList.vue
  20. 1 0
      src/views/salesManagement/salesPlanEdit.vue
  21. 1 2
      src/views/salesManagement/salesPlanOrderList.vue
  22. 0 1
      src/views/statisticalReport/autoSettlementList.vue
  23. 3 1
      src/views/statisticalReport/huoyunList.vue
  24. 2 1
      src/views/statisticalReport/purchaseReceiptStatisticsList.vue
  25. 7 4
      src/views/taskManagement/tranManagementTransportAdd.vue
  26. 7 4
      src/views/taskManagement/tranManagementTransportEdit.vue
  27. 16 17
      src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue
  28. 23 4
      src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue
  29. 15 1
      src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue
  30. 5 0
      src/views/tradeServicesManagement/approveWarehouseReceipt.vue
  31. 6 0
      src/views/tradeServicesManagement/reviewWarehouseReceipt.vue
  32. 6 6
      src/views/tradeServicesManagement/warehouseReceiptAdd.vue
  33. 7 7
      src/views/tradeServicesManagement/warehouseReceiptEdit.vue
  34. 1 1
      src/views/tranManagement/tranManagementVehicleDispatching.vue
  35. 1 1
      src/views/warehouse/warehouseManagementAdd.vue
  36. 1 0
      src/views/warehouse/warehouseManagementDelivery.vue
  37. 1 1
      src/views/warehouse/warehouseManagementEdit.vue
  38. 3 3
      src/views/warehouse/warehouseManagementGross.vue
  39. 5 5
      src/views/warehouse/warehouseManagementNoWeightIn.vue
  40. 1 1
      src/views/warehouse/warehouseManagementNoWeightOut.vue
  41. 3 3
      src/views/warehouse/warehouseManagementPerfectput.vue
  42. 3 3
      src/views/warehouse/warehouseManagementPut.vue
  43. 2 3
      src/views/warehouse/warehouseManagementTare.vue

+ 3 - 0
src/App.vue

@@ -117,4 +117,7 @@ input[type='number'] {
   outline: 0;
   background-color: #5473E8!important;
 }
+.el-pagination{
+  padding: 0!important;
+}
 </style>

+ 3 - 5
src/components/base/BaseContainer/index.vue

@@ -14,17 +14,15 @@ export default {
 
 <style lang="scss">
 .basic-container {
-  // padding: 10px 6px;
-  // min-width: 1166px;
-  margin: 10px;
-  height: calc(100% - 10px);
-  overflow: hidden;
+  height: 100%;
   border-radius: 4px;
   box-sizing: border-box;
   .el-card {
     width: 100%;
+    height: 100%;
     &__body {
       padding: 0 !important;
+      height: 100%;
     }
   }
   // &:first-child {

+ 76 - 75
src/layout/index/index.vue

@@ -1,6 +1,5 @@
 <template>
-  <div class="winseaview-contail"
-       :class="{'winseaview--collapse':isCollapse}">
+  <div class="winseaview-contail" :class="{'winseaview--collapse':isCollapse}">
     <!-- <screenshot></screenshot> -->
     <div class="winseaview-header">
       <!-- 顶部导航栏 -->
@@ -18,89 +17,91 @@
         <!-- 主体视图层 -->
         <BaseContainer id="layout_body">
           <keep-alive>
-            <router-view class="winseaview-view"
-                         v-if="$route.meta.keepAlive" />
+            <router-view class="winseaview-view" v-if="$route.meta.keepAlive" />
           </keep-alive>
-          <router-view class="winseaview-view"
-                       v-if="!$route.meta.keepAlive" />
+          <router-view class="winseaview-view" v-if="!$route.meta.keepAlive" />
         </BaseContainer>
       </div>
     </div>
-    <div class="winseaview-shade"
-         @click="showCollapse"></div>
+    <div class="winseaview-shade" @click="showCollapse"></div>
   </div>
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex';
-import screenshot from './screenshot';
-import tags from './tags';
-import top from './top/';
-import sidebar from './sidebar/';
-import { getScreen } from '@/utils/assist';
-// import { validatenull } from "@/utils/validate";
-// import { getStore } from "@/utils/store.js";
-export default {
-  components: {
-    top,
-    tags,
-    sidebar,
-    screenshot
-  },
-  name: 'index',
-  data () {
-    return {
-      //刷新token锁
-      refreshLock: false,
-      //刷新token的时间
-      refreshTime: ''
-    };
-  },
-  created () {
-    //实时检测刷新token
-    this.refreshToken();
-  },
-  mounted () {
-    this.init();
-  },
-  computed: mapGetters(['isLock', 'isCollapse', 'website']),
-  props: [],
-  methods: {
-    ...mapActions(['setScreen']),
-    showCollapse () {
-      this.$store.commit('SET_COLLAPSE');
+  import {
+    mapActions,
+    mapGetters
+  } from 'vuex';
+  import screenshot from './screenshot';
+  import tags from './tags';
+  import top from './top/';
+  import sidebar from './sidebar/';
+  import {
+    getScreen
+  } from '@/utils/assist';
+  // import { validatenull } from "@/utils/validate";
+  // import { getStore } from "@/utils/store.js";
+  export default {
+    components: {
+      top,
+      tags,
+      sidebar,
+      screenshot
     },
-    // 屏幕检测
-    init () {
-      this.setScreen(getScreen());
-      window.onresize = () => {
-        setTimeout(() => {
-          this.setScreen(getScreen());
-        }, 0);
+    name: 'index',
+    data() {
+      return {
+        //刷新token锁
+        refreshLock: false,
+        //刷新token的时间
+        refreshTime: ''
       };
     },
-    // 10分钟检测一次token
-    refreshToken () {
-      /*this.refreshTime = setInterval(() => {
-        const token = getStore({
-          name: "token",
-          debug: true
-        });
-        const date = calcDate(token.datetime, new Date().getTime());
-        if (validatenull(date)) return;
-        if (!(date.seconds >= this.website.tokenTime) && !this.refreshLock) {
-          this.refreshLock = true;
-          this.$store
-            .dispatch("RefeshToken")
-            .then(() => {
-              this.refreshLock = false;
-            })
-            .catch(() => {
-              this.refreshLock = false;
-            });
-        }
-      }, 10000);*/
+    created() {
+      //实时检测刷新token
+      this.refreshToken();
+    },
+    mounted() {
+      this.init();
+    },
+    computed: mapGetters(['isLock', 'isCollapse', 'website']),
+    props: [],
+    methods: {
+      ...mapActions(['setScreen']),
+      showCollapse() {
+        this.$store.commit('SET_COLLAPSE');
+      },
+      // 屏幕检测
+      init() {
+        this.setScreen(getScreen());
+        window.onresize = () => {
+          setTimeout(() => {
+            this.setScreen(getScreen());
+          }, 0);
+        };
+      },
+      // 10分钟检测一次token
+      refreshToken() {
+        /*this.refreshTime = setInterval(() => {
+          const token = getStore({
+            name: "token",
+            debug: true
+          });
+          const date = calcDate(token.datetime, new Date().getTime());
+          if (validatenull(date)) return;
+          if (!(date.seconds >= this.website.tokenTime) && !this.refreshLock) {
+            this.refreshLock = true;
+            this.$store
+              .dispatch("RefeshToken")
+              .then(() => {
+                this.refreshLock = false;
+              })
+              .catch(() => {
+                this.refreshLock = false;
+              });
+          }
+        }, 10000);*/
+      }
     }
-  }
-};
+  };
 </script>

+ 1 - 1
src/layout/index/top/index.vue

@@ -51,7 +51,7 @@
       </div>
       <div class="compName-row">
         <!-- <span class="compName">{{compName}}</span> -->
-        <el-select style='width:260px;' @change='compNameChange' v-model="compName" placeholder="请选择">
+        <el-select style='width:260px;' @change='compNameChange' v-model="compName" placeholder="请选择" filterable clearable>
         <el-option
           v-for="item in compNameoptions"
           :key="item"

+ 11 - 6
src/styles/media.scss

@@ -9,9 +9,10 @@
 .winseaview-contail {
   width: 100%;
   height: 100%;
-background: #E8ECF6;
+  background: #E8ECF6;
   background-size: 100%;
   background-repeat: no-repeat;
+  overflow: hidden;
   .winseaview-logo {
     &_subtitle {
       i {
@@ -29,6 +30,10 @@ background: #E8ECF6;
     }
   }
 }
+.winseaview-layout{
+  height: 100%;
+  padding: 10px;
+}
 
 .winseaview-left {
   position: fixed;
@@ -50,6 +55,7 @@ background: #E8ECF6;
   .winseaview-main {
     width: calc(100% - 60px);
     left: 60px;
+    height: calc(100% - 40px);
   }
 }
 
@@ -64,22 +70,19 @@ background: #E8ECF6;
   position: relative;
   left: 200px;
   padding: 0;
-  // padding-bottom: 20px;
   width: calc(100% - 200px);
-  // height: calc(100% - 50px);
+  height: calc(100% - 40px);
   box-sizing: border-box;
-  overflow: hidden;
   .el-tabs__item {
     color: #999999;
   }
 }
 
 .winseaview-view {
-  // padding-bottom: 22px;
   width: 100%;
   box-sizing: border-box;
   padding: 10px;
-  box-sizing: border-box;
+  height:100%;
 }
 
 .winseaview-footer {
@@ -163,6 +166,7 @@ background: #E8ECF6;
   .winseaview-main {
     left: 0;
     width: 100%;
+    height: calc(100% - 40px);
   }
   .winseaview-header {
     // margin-bottom: 15px;
@@ -180,6 +184,7 @@ background: #E8ECF6;
     .winseaview-main {
       left: $width;
       width: 100%;
+      height: calc(100% - 40px);
     }
     .winseaview-header {
       padding: 0;

+ 2 - 2
src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -73,7 +73,7 @@
         </ws-form-item>
         <!--验收方式-->
         <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
-          <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" filterable
+          <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" filterable clearable
             @change="selectunitList">
             <el-option v-for="(item, index) in unitList" :key="item.constValue" :label="item.constValue"
               :value="item.constValue">
@@ -134,7 +134,7 @@
         <!--收货库-->
         <el-form-item label="收货库" span="1" prop="receiveWarehouse">
           <el-select v-model="deptBudgetList.receiveWarehouse" placeholder="请选择收货库" class="typeselect"
-            @change="selectwarehouseName">
+            @change="selectwarehouseName" filterable clearable>
             <el-option v-for="item in warehouseNameList" :key="item.constKey" :label="item.warehouseName"
               :value="item.warehouseName" />
           </el-select>

+ 3 - 3
src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -141,7 +141,7 @@
             v-model="deptBudgetList.acceptanceMethod"
             placeholder="请选择验收方式"
             style="width: 100%"
-            filterable
+            filterable clearable
             @change="selectunitList"
           >
             <el-option
@@ -257,6 +257,7 @@
             placeholder="请选择收货库"
             class="typeselect"
             @change="selectwarehouseName"
+            filterable clearable
           >
             <el-option
               v-for="item in warehouseNameList"
@@ -349,8 +350,7 @@
           <el-select
             v-model="deptBudgetList.personCharge"
             placeholder="请选择临时仓库负责人"
-            filterable
-            
+            filterable clearable
             @change="selectstaff"
           >
             <el-option

+ 2 - 2
src/views/contractManagement/futuresSalesContractAdd.vue

@@ -73,7 +73,7 @@
         </ws-form-item>
         <!--验收方式-->
         <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
-          <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" filterable
+          <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" filterable clearable
             @change="selectunitList">
             <el-option v-for="(item, index) in unitList" :key="item.constValue" :label="item.constValue"
               :value="item.constValue">
@@ -127,7 +127,7 @@
         <!--出货库-->
         <el-form-item label="出货库" span="1" prop="receiveWarehouse">
           <el-select v-model="deptBudgetList.receiveWarehouse" placeholder="请选择出货库" class="typeselect"
-            @change="selectwarehouseName">
+            @change="selectwarehouseName" filterable clearable>
             <el-option v-for="item in warehouseNameList" :key="item.constKey" :label="item.warehouseName"
               :value="item.warehouseName" />
           </el-select>

+ 2 - 2
src/views/contractManagement/futuresSalesContractEdit.vue

@@ -69,7 +69,7 @@
         </ws-form-item>
         <!--验收方式-->
         <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
-          <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" filterable
+          <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" filterable clearable
             @change="selectunitList">
             <el-option v-for="(item, index) in unitList" :key="item.constValue" :label="item.constValue"
               :value="item.constValue">
@@ -122,7 +122,7 @@
         <!--出货库-->
         <el-form-item label="出货库" span="1" prop="receiveWarehouse">
           <el-select v-model="deptBudgetList.receiveWarehouse" placeholder="请选择出货库" class="typeselect"
-            @change="selectwarehouseName">
+            @change="selectwarehouseName" filterable clearable>
             <el-option v-for="item in warehouseNameList" :key="item.constKey" :label="item.warehouseName"
               :value="item.warehouseName" />
           </el-select>

+ 717 - 835
src/views/contractManagement/purchaseContract.vue

@@ -1,83 +1,36 @@
-<!--采购合同-->
+<!--现货采购合同-->
 <!--2019年5月30日 20:25:16 by jlx-->
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
-        <ws-button
-          type="primary"
-          @click="handleAdd()"
-          v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`"
-          >添加</ws-button
-        >
-        <ws-button
-          @click="exportlist()"
-          v-hasPermission="
+        <ws-button type="primary" @click="handleAdd()"
+          v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
+        <ws-button @click="exportlist()" v-hasPermission="
             `contractManagement.buyContract.buyContractInfo.view`
-          "
-          >导出</ws-button
-        >
+          ">导出</ws-button>
       </template>
       <template slot="right">
-        <span style="width: 142px; 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"
-          />
+        <span style="width: 142px; 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>
-        <el-date-picker
-          v-model="value2"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :picker-options="pickerOptions"
-        >
+        <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
+          start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
         </el-date-picker>
-        <el-input
-          v-model="searchKeyWord"
-          placeholder="可按照合同编号、买方名称、卖方名称进行查找"
-          clearable
-          maxlength="500"
-          type="input"
-          class="findValue"
-          @keyup.enter.native="find()"
-        ></el-input>
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <el-input v-model="searchKeyWord" placeholder="可按照合同编号、买方名称、卖方名称进行查找" clearable maxlength="500" type="input"
+          class="findValue" @keyup.enter.native="find()"></el-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>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <el-table
-      class="wenzi"
-      :data="contractList.records"
-      style="width: 100%; margin-top: 10px"
-      height="780"
-    >
+    <el-table class="wenzi" :data="contractList.records" style="width: 100%; margin-top: 10px" height="calc(100% - 75px)">
       <el-table-column type="index" label="序号">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -122,44 +75,24 @@
           <span v-if="scope.row.approveStatus">{{
             scope.row.approveStatus
           }}</span>
-          <el-popover
-            v-else
-            placement="left"
-            :width="285"
-            trigger="click"
-            visible-arrow="false"
-            @show="history(scope.row)"
-          >
+          <el-popover v-else placement="left" :width="285" trigger="click" visible-arrow="false"
+            @show="history(scope.row)">
             <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 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 }}
@@ -167,15 +100,9 @@
               </div>
             </div>
           </el-popover>
-          <img
-            v-if="!scope.row.approveStatus"
-            width="17"
-            height="18"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/edit.png"
-            @click="editClick(scope.row)"
-            alt=""
-          />
+          <img v-if="!scope.row.approveStatus" width="17" height="18"
+            style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
+            @click="editClick(scope.row)" alt="" />
           <!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
         </template>
       </el-table-column>
@@ -186,14 +113,8 @@
       </el-table-column>
       <el-table-column prop="addressUrl" label="附件">
         <template slot-scope="scope">
-          <img
-            width="18"
-            height="20"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/fujian.png"
-            @click="fujian(scope.row)"
-            alt=""
-          />
+          <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
           <span v-if="scope.row.addressUrlArray != null">
             {{
               scope.row.addressUrlArray.length == 0
@@ -205,430 +126,394 @@
       </el-table-column>
       <el-table-column prop="address" label="操作" width="140">
         <template slot-scope="scope">
-          <img
-            width="16"
-            height="16"
-            style="vertical-align: text-top; margin: 0 6px"
-            src="../../../public/img/chakan.png"
-            @click="handleExamine(scope.row)"
-            v-hasPermission="
+          <img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
+            src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.view`
-            "
-            alt=""
-          />
-          <div
-            v-if="
+            " alt="" />
+          <div v-if="
               (scope.row.approveStatus != '待决策人审核' &&
                 !scope.row.approveStatus) 
-            "
-            style="display: inline-block"
-          >
-            <img
-              width="17"
-              height="16"
-              style="vertical-align: text-top; margin: 0 6px"
-              src="../../../public/img/bianji.png"
-              @click="handleEdit(scope.row)"
-              v-hasPermission="
+            " style="display: inline-block">
+            <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
+              src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
                 `contractManagement.buyContract.buyContractInfo.edit`
-              "
-              alt=""
-            />
+              " alt="" />
           </div>
-          <img
-            width="16"
-            height="17"
-            style="
+          <img width="16" height="17" style="
               vertical-align: text-top;
               position: relative;
               top: -1px;
               margin: 0 6px;
-            "
-             v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'"
-            src="../../../public/img/shanchu.png"
+            " v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
-            "
-            @click="handleDelete(scope.row)"
-            alt=""
-          />
+            " @click="handleDelete(scope.row)" alt="" />
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      :page-size="deptCircularPage.pageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="deptBudgetTotal"
-    >
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
     </el-pagination>
 
-    <WinseaContentModal
-      v-model="accessoryTFs"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose"
-    >
-      <ws-upload
-        ref="upload"
-        :size-limit="size"
-        @onChange="onChange"
-        :comp-id="compId"
-        :appendix-ids="appendixIdss"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose">
+      <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
   </div>
 </template>
 <script>
-import {
-  getList,
-  export1,
-  editstatus,
-  billoperatehis,
-  deletecontract,
-  editInfo,
-} from '@/model/contarct/index'
-import { downloadFile } from '@/utils/batchDown'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { dayjs, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
+  import {
+    getList,
+    export1,
+    editstatus,
+    billoperatehis,
+    deletecontract,
+    editInfo,
+  } from '@/model/contarct/index'
+  import {
+    downloadFile
+  } from '@/utils/batchDown'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    dayjs,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-    isShow(val) {
-      this.showType = val
-    },
-  },
-  data() {
-    return {
-      id: '',
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      size: 10,
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      deliver_type: 1,
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      pageSize: 10,
-      appendixIdsAdd: '',
-      searchType: 1,
-      searchTypeText: '未完成',
-      searchKeyWord: '',
-      contractType: 2,
-      goodsType: 1,
-      startDate: null,
-      endDate: null,
-      addressUrls: [],
-      accesscard: false,
-      // 提交类型
-      submitType: true,
-      deptCircularPage: {},
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
+    watch: {
+      vesselId(val) {
+        this.getList()
       },
-      contractList: [],
-      deptBudgetList: {},
-      historyList: [],
-      appendixIdss: [],
-      fileList: [],
-      compId: localStorage.getItem('ws-pf_compId'),
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+      isShow(val) {
+        this.showType = val
       },
-      accessoryTFs: false,
-      taskTypeList: [
-        {
-          value: '未完成',
-          type: 1,
-        },
-        {
-          value: '已完成',
-          type: 2,
+    },
+    data() {
+      return {
+        id: '',
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+        size: 10,
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        deliver_type: 1,
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        appendixIdsAdd: '',
+        searchType: 1,
+        searchTypeText: '未完成',
+        searchKeyWord: '',
+        contractType: 2,
+        goodsType: 1,
+        startDate: null,
+        endDate: null,
+        addressUrls: [],
+        accesscard: false,
+        // 提交类型
+        submitType: true,
+        deptCircularPage: {},
+        date: {
+          year: dayjs().format('YYYY'),
+          month: dayjs().format('MM'),
         },
-        {
-          value: '全部合同',
-          type: '',
+        contractList: [],
+        deptBudgetList: {},
+        historyList: [],
+        appendixIdss: [],
+        fileList: [],
+        compId: localStorage.getItem('ws-pf_compId'),
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
         },
-      ],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: '本周',
-            onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              var thisDay = start.getDay()
-              var thisDate = start.getDate()
-              if (thisDay != 0) {
-                start.setDate(thisDate - thisDay)
-              }
-              picker.$emit('pick', [start, end])
-            },
+        accessoryTFs: false,
+        taskTypeList: [{
+            value: '未完成',
+            type: 1,
           },
           {
-            text: '本月',
-            onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setDate(1)
-              picker.$emit('pick', [start, end])
-            },
+            value: '已完成',
+            type: 2,
           },
           {
-            text: '本季度',
-            onClick(picker) {
-              var oDate = new Date()
+            value: '全部合同',
+            type: '',
+          },
+        ],
+        pickerOptions: {
+          shortcuts: [{
+              text: '本周',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date()
+                var thisDay = start.getDay()
+                var thisDate = start.getDate()
+                if (thisDay != 0) {
+                  start.setDate(thisDate - thisDay)
+                }
+                picker.$emit('pick', [start, end])
+              },
+            },
+            {
+              text: '本月',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date()
+                start.setDate(1)
+                picker.$emit('pick', [start, end])
+              },
+            },
+            {
+              text: '本季度',
+              onClick(picker) {
+                var oDate = new Date()
 
-              var thisYear = oDate.getFullYear()
-              var thisMonth = oDate.getMonth() + 1
+                var thisYear = oDate.getFullYear()
+                var thisMonth = oDate.getMonth() + 1
 
-              var n = Math.ceil(thisMonth / 3) // 季度
+                var n = Math.ceil(thisMonth / 3) // 季度
 
-              var Month = n * 3 - 1
+                var Month = n * 3 - 1
 
-              var start = new Date(thisYear, Month - 2, 1)
-              var end = new Date()
+                var start = new Date(thisYear, Month - 2, 1)
+                var end = new Date()
 
-              picker.$emit('pick', [start, end])
+                picker.$emit('pick', [start, end])
+              },
             },
-          },
-        ],
-      },
-      value1: '',
-      value2: '',
-    }
-  },
-  activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    onChange() {
-      this.$refs.upload
-        .handleSaveBill()
-        .then(async (response) => {
-          this.deptBudgetList.addressUrl = response
-          this.deptBudgetList.id = this.id
-          this.deptBudgetList.flag = 1
-          editInfo(this.deptBudgetList)
-            .toPromise()
-            .then((response) => {
-              this.accessoryTFs = false
-              this.$message.success('上传成功')
-              this.getList()
-            })
-        })
-        .catch((res) => {
-          EventBus.$emit('error', (JSON.parse(res) || {}).message)
-          this.$refs.upload.clearFiles()
-        })
-    },
-    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')
-          )
-        }
+          ],
+        },
+        value1: '',
+        value2: '',
       }
-      return fmt
-    },
-
-    handleClose() {
-      this.dialogViewSpareMoney = false
     },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
+    activated() {
+      //cg.viewBudget
+      //cg.viewSpareMoney
+      // this.getVesselData();
       this.getList()
+      this.showType = this.isShow
     },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    getList() {
-      getList({
-        compId: localStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
-        goodsType: this.goodsType,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        contrPage: this.contrPage,
-      })
-        .toPromise()
-        .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if(response.records[i].completedQuantity){
-              response.records[i].completedQuantity=response.records[i].completedQuantity.toFixed(3)
-            }
-            
-            if (response.records[i].addressUrl != null) {
-              if (response.records[i].addressUrl) {
-                response.records[i].addressUrlArray =
-                  response.records[i].addressUrl.split(',')
+    methods: {
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async (response) => {
+            this.deptBudgetList.addressUrl = response
+            this.deptBudgetList.id = this.id
+            this.deptBudgetList.flag = 1
+            editInfo(this.deptBudgetList)
+              .toPromise()
+              .then((response) => {
+                this.accessoryTFs = false
+                this.$message.success('上传成功')
+                this.getList()
+              })
+          })
+          .catch((res) => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
+      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.dialogViewSpareMoney = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      getList() {
+        getList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            contractType: this.contractType,
+            goodsType: this.goodsType,
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchType: this.searchType,
+            searchKeyWord: this.searchKeyWord,
+            startDate: this.startDate,
+            endDate: this.endDate,
+            contrPage: this.contrPage,
+          })
+          .toPromise()
+          .then((response) => {
+            for (var i = 0; i < response.records.length; i++) {
+              if (response.records[i].completedQuantity) {
+                response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
+              }
+
+              if (response.records[i].addressUrl != null) {
+                if (response.records[i].addressUrl) {
+                  response.records[i].addressUrlArray =
+                    response.records[i].addressUrl.split(',')
+                }
+              } else {
+                response.records[i].addressUrlArray = []
               }
-            } else {
-              response.records[i].addressUrlArray = []
             }
-          }
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.contractList = response
-          for (var i = 0; i < response.records.length; i++) {
-            var arr = new Array()
-            this.addressUrls[i] = new Array()
-            if (this.contractList.records[i].addressUrl != null) {
-              arr = this.contractList.records[i].addressUrl.split(',')
-              this.addressUrls[i] = arr
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+            this.contractList = response
+            for (var i = 0; i < response.records.length; i++) {
+              var arr = new Array()
+              this.addressUrls[i] = new Array()
+              if (this.contractList.records[i].addressUrl != null) {
+                arr = this.contractList.records[i].addressUrl.split(',')
+                this.addressUrls[i] = arr
+              }
             }
-          }
-        })
-    },
-    // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-
-      // this.deptBudgetList.
-      // this.formData.append('files', files)
-      // this.feedbackObj.uploadNameAttachment = data.appendixName
-      // this.feedbackObj.pathUploadAttachment = data.appendixPath
-      // // this.newAppendixs = files
-      // this.onChangeFlag = true
-    },
-    editClick(row) {
-      var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
-        status = '执行中'
-      } else if (row.status == '执行中') {
-        status = '已完成'
-      }
-      this.$confirm(`是否将状态改为${status}`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          editstatus({
-            id: row.id,
           })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功',
+      },
+      // 上传附件
+      uploadSuccess(data, files, url) {
+        console.log(data, files, url)
+
+        // this.deptBudgetList.
+        // this.formData.append('files', files)
+        // this.feedbackObj.uploadNameAttachment = data.appendixName
+        // this.feedbackObj.pathUploadAttachment = data.appendixPath
+        // // this.newAppendixs = files
+        // this.onChangeFlag = true
+      },
+      editClick(row) {
+        var status = ''
+        if (row.status == '待执行' || row.status == '已完成') {
+          status = '执行中'
+        } else if (row.status == '执行中') {
+          status = '已完成'
+        }
+        this.$confirm(`是否将状态改为${status}`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            editstatus({
+                id: row.id,
+              })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '状态修改成功',
+                })
+                this.getList()
               })
-              this.getList()
-            })
-            .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .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
+          }
+        }
+      },
+      fujian(row) {
+        this.id = row.id
+        this.accessoryTFs = true
+        this.appendixIdss = row.addressUrl
+        console.log(this.appendixIdss)
+      },
+      handleExamine(row) {
+        console.log(row)
+        this.$router.push({
+          name: 'purchaseContractExamine',
+          query: {
+            id: row.id,
+            status: row.status,
+          },
         })
-        .catch(() => {
-          return false
+      },
+      handleAdd() {
+        this.$router.push({
+          path: 'purchaseContractAdd',
         })
-    },
-    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) {
-      this.id = row.id
-      this.accessoryTFs = true
-      this.appendixIdss = row.addressUrl
-      console.log(this.appendixIdss)
-    },
-    handleExamine(row) {
-      console.log(row)
-      this.$router.push({
-        name: 'purchaseContractExamine',
-        query: {
-          id: row.id,
-          status: row.status,
-        },
-      })
-    },
-    handleAdd() {
-      this.$router.push({
-        path: 'purchaseContractAdd',
-      })
-    },
-    handleEdit(row) {
-      this.$router.push({
-        name: 'purchaseContractEdit',
-        query: {
-          id: row.id,
-        },
-      })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    history(row) {
-      console.log(row)
-      billoperatehis({
-        id: row.id,
-      })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
+      },
+      handleEdit(row) {
+        this.$router.push({
+          name: 'purchaseContractEdit',
+          query: {
+            id: row.id,
+          },
         })
-    },
-    find() {
-      if (this.value2) {
-        this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-        this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-      } else {
-        this.startDate = ''
-        this.endDate = ''
-      }
-      this.currentPage = 1
-      this.getList()
-    },
-    async exportlist() {
-      const { data } = await export1(
-        {
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      history(row) {
+        console.log(row)
+        billoperatehis({
+            id: row.id,
+          })
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
+      find() {
+        if (this.value2) {
+          this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+          this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+        } else {
+          this.startDate = ''
+          this.endDate = ''
+        }
+        this.currentPage = 1
+        this.getList()
+      },
+      async exportlist() {
+        const {
+          data
+        } = await export1({
           compId: localStorage.getItem('ws-pf_compId'),
           contractType: this.contractType,
           goodsType: this.goodsType,
@@ -638,407 +523,404 @@ export default {
           searchKeyWord: this.searchKeyWord,
           startDate: this.startDate,
           endDate: this.endDate,
-        },
-        {},
-        {
+        }, {}, {
           responseType: 'blob',
-        }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
+        }).toPromise()
+        downloadFile({
+          res: data,
+          fileName: `${
           this.date.year + (this.date.month ? `-${this.date.month}` : '')
         }_采购合同`,
-        type: 'xls',
-      })
-    },
-    // deletecontract(){},
-    //删除
-    handleDelete(row) {
-      var text = ''
-      if (row.deliverType == 1) {
-        text =
-          '删除该合同将同时永久删除合同对应的临时仓库相关数据,是否确定删除?'
-      } else {
-        text = '合同删除后不可恢复,是否继续删除?'
-      }
-      this.$confirm(text, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          deletecontract({
-            id: row.id,
+          type: 'xls',
+        })
+      },
+      // deletecontract(){},
+      //删除
+      handleDelete(row) {
+        var text = ''
+        if (row.deliverType == 1) {
+          text =
+            '删除该合同将同时永久删除合同对应的临时仓库相关数据,是否确定删除?'
+        } else {
+          text = '合同删除后不可恢复,是否继续删除?'
+        }
+        this.$confirm(text, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
           })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '删除成功',
+          .then(() => {
+            deletecontract({
+                id: row.id,
               })
-              this.getList()
-            })
-            .catch((response) => {})
-        })
-        .catch(() => {
-          return false
-        })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '删除成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {})
+          })
+          .catch(() => {
+            return false
+          })
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-
-.flex {
-  display: flex;
-}
-
-.el-range-editor.el-input__inner {
-  margin-left: 10px;
-}
-
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: -10px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-
-.el-button--default {
-  border: 1px solid #5473e8;
-  color: #5473e8;
-}
-
-.warning {
-  width: 100%;
-  height: 2px;
-  background: red;
-}
-
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-}
-
-.executory {
-  background: #ff9f24;
-}
-
-.inExecution {
-  background: #5878e8;
-}
-
-.done {
-  background: #50cad4;
-}
-
-.top-grade {
-  background: linear-gradient(90deg, #5678e9, #7993f6);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-
-.second-class {
-  background: linear-gradient(90deg, #50cdd9, #82e2ea);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-
-.third-class {
-  background: linear-gradient(90deg, #ffa735, #ffbf70);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-
-.substandard {
-  background: linear-gradient(90deg, #b2b4bb, #ced0d5);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-
-.wrap {
-  width: 400px;
-  position: absolute;
-  top: 131px;
-  left: 794px;
-  transform-origin: right center;
-  z-index: 2005;
-}
-
-.vertical-line {
-  height: 64px;
-  border-left: 2px solid #e9ecf7;
-  margin-left: 4px;
-  padding: 0 3px;
-  // border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
-  // border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
-  // border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
-}
-
-.el-pagination {
-  padding: 10px 15px;
-  margin-bottom: 0;
-  text-align: center;
-}
-
-/deep/.el-pager li.active {
-  color: #5878e8;
-  cursor: default;
-}
-
-/deep/.el-pager li:hover {
-  color: #5878e8;
-  cursor: default;
-}
-
-.vertical-circle {
-  width: 10px;
-  height: 10px;
-  border: 2px solid #5878e8;
-  background-color: #ffffff;
-  -webkit-border-radius: 100px;
-}
-
-.vertical-circle:first-child {
-  color: red;
-}
-
-.vertical-text {
-  margin: 0 10px;
-  color: #8890b1;
-  font-size: 12px;
-  margin-top: -4px;
-}
-
-/deep/.el-table .el-table__header .cell,
-/deep/.el-table .el-table__body .cell {
-  text-align: center;
-}
-
-.typeselect {
-  width: 500px;
-}
-
-.padding-xs {
-  padding: 15px;
-  text-align: right;
-}
-
-.clearfix:after {
-  content: '';
-  display: block;
-  clear: both;
-}
-
-.el-table {
-  font-size: 16px;
-}
-
-.taskType {
-  width: 100%;
-  background-color: #fff;
-  margin-top: 2px;
-  margin-bottom: 10px;
-  list-style: none;
-
-  // padding-bottom: 20px;
-  li {
-    float: left;
-    border: 1px solid #6ea0f3;
-    border-radius: 5px;
-    max-width: 190px;
-    padding: 0 5px;
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .flex {
+    display: flex;
+  }
+
+  .el-range-editor.el-input__inner {
+    margin-left: 10px;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: -10px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    border: 1px solid #5473e8;
+    color: #5473e8;
+  }
+
+  .warning {
+    width: 100%;
+    height: 2px;
+    background: red;
+  }
+
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .top-grade {
+    background: linear-gradient(90deg, #5678e9, #7993f6);
+    color: #fff;
+    padding: 3px;
+    border-radius: 2px;
+  }
+
+  .second-class {
+    background: linear-gradient(90deg, #50cdd9, #82e2ea);
+    color: #fff;
+    padding: 3px;
+    border-radius: 2px;
+  }
+
+  .third-class {
+    background: linear-gradient(90deg, #ffa735, #ffbf70);
+    color: #fff;
+    padding: 3px;
+    border-radius: 2px;
+  }
+
+  .substandard {
+    background: linear-gradient(90deg, #b2b4bb, #ced0d5);
+    color: #fff;
+    padding: 3px;
+    border-radius: 2px;
+  }
+
+  .wrap {
+    width: 400px;
+    position: absolute;
+    top: 131px;
+    left: 794px;
+    transform-origin: right center;
+    z-index: 2005;
+  }
+
+  .vertical-line {
+    height: 64px;
+    border-left: 2px solid #e9ecf7;
+    margin-left: 4px;
+    padding: 0 3px;
+    // border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
+    // border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
+    // border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
+  }
+
+  .el-pagination {
+    padding: 10px 15px;
+    margin-bottom: 0;
     text-align: center;
-    margin: 10px 20px;
-    cursor: pointer;
-    font-size: 14px;
+  }
 
-    p {
-      margin: 8px 0px;
+  /deep/.el-pager li.active {
+    color: #5878e8;
+    cursor: default;
+  }
 
-      span {
-        color: #e74c3c;
-      }
-    }
+  /deep/.el-pager li:hover {
+    color: #5878e8;
+    cursor: default;
   }
 
-  li:hover {
-    background-color: #e4eeff;
-    color: #1d6ced;
+  .vertical-circle {
+    width: 10px;
+    height: 10px;
+    border: 2px solid #5878e8;
+    background-color: #ffffff;
+    -webkit-border-radius: 100px;
   }
-}
-
-.el-date-editor--date {
-  margin: 0 10px;
-}
-
-.findValue {
-  margin: 0 10px;
-}
-
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-
-.button-container {
-  display: flex;
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  align-items: center;
-  background-color: #fff;
-  width: 100%;
-  height: 50px;
-  padding: 0 10px;
-
-  & > div {
-    margin-left: 10px;
-    display: flex;
-    flex-wrap: nowrap;
-    flex-direction: row;
 
-    & > span {
-      line-height: 50px;
-    }
+  .vertical-circle:first-child {
+    color: red;
   }
 
-  /deep/.auditFlow-box {
-    position: unset;
-    margin-left: 10px;
+  .vertical-text {
+    margin: 0 10px;
+    color: #8890b1;
+    font-size: 12px;
+    margin-top: -4px;
+  }
 
-    &/deep/.auditFlow-icon {
-      width: auto;
-      padding-right: 30px;
-    }
+  /deep/.el-table .el-table__header .cell,
+  /deep/.el-table .el-table__body .cell {
+    text-align: center;
+  }
 
-    &/deep/.auditFlow-main {
-      position: absolute;
-    }
+  .typeselect {
+    width: 500px;
   }
-}
-
-.box-app {
-  display: inline-block;
-  float: left;
-  margin-left: 30px;
-  line-height: 50px;
-}
-
-/deep/.el-dialog {
-  .el-form-item {
-    margin-bottom: 0 !important;
-
-    .el-input--medium {
-      textarea {
-        min-height: 100px !important;
-      }
-    }
+
+  .padding-xs {
+    padding: 15px;
+    text-align: right;
   }
-}
 
-.collapse-bottom {
-  margin-bottom: 20px;
-}
+  .clearfix:after {
+    content: '';
+    display: block;
+    clear: both;
+  }
 
-.input-main .textarea .el-textarea__inner {
-  width: 100%;
-  z-index: 1;
-}
+  .el-table {
+    font-size: 16px;
+  }
+
+  .taskType {
+    width: 100%;
+    background-color: #fff;
+    margin-top: 2px;
+    margin-bottom: 10px;
+    list-style: none;
+
+    // padding-bottom: 20px;
+    li {
+      float: left;
+      border: 1px solid #6ea0f3;
+      border-radius: 5px;
+      max-width: 190px;
+      padding: 0 5px;
+      text-align: center;
+      margin: 10px 20px;
+      cursor: pointer;
+      font-size: 14px;
+
+      p {
+        margin: 8px 0px;
+
+        span {
+          color: #e74c3c;
+        }
+      }
+    }
 
-/*.crt-main .textarea /deep/ .el-form-item__label {*/
-/*  height: 82px;*/
-/*}*/
-// 控制select为只读的时候显示样式
+    li:hover {
+      background-color: #e4eeff;
+      color: #1d6ced;
+    }
+  }
 
-.hide-sel {
-  .el-input__inner {
-    border: 0px;
+  .el-date-editor--date {
+    margin: 0 10px;
   }
 
-  .el-icon-arrow-up {
-    display: none;
+  .findValue {
+    margin: 0 10px;
   }
 
-  .el-textarea__inner {
-    background-color: #fff !important;
-    border: 0;
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
   }
 
-  .el-date-editor {
-    i {
-      display: none;
+  .button-container {
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    align-items: center;
+    background-color: #fff;
+    width: 100%;
+    height: 50px;
+    padding: 0 10px;
+
+    &>div {
+      margin-left: 10px;
+      display: flex;
+      flex-wrap: nowrap;
+      flex-direction: row;
+
+      &>span {
+        line-height: 50px;
+      }
+    }
+
+    /deep/.auditFlow-box {
+      position: unset;
+      margin-left: 10px;
+
+      &/deep/.auditFlow-icon {
+        width: auto;
+        padding-right: 30px;
+      }
+
+      &/deep/.auditFlow-main {
+        position: absolute;
+      }
     }
   }
 
-  .is-disabled {
-    .el-input__inner:hover {
-      background-color: #fff !important;
-      border: 0;
+  .box-app {
+    display: inline-block;
+    float: left;
+    margin-left: 30px;
+    line-height: 50px;
+  }
+
+  /deep/.el-dialog {
+    .el-form-item {
+      margin-bottom: 0 !important;
+
+      .el-input--medium {
+        textarea {
+          min-height: 100px !important;
+        }
+      }
     }
+  }
+
+  .collapse-bottom {
+    margin-bottom: 20px;
+  }
+
+  .input-main .textarea .el-textarea__inner {
+    width: 100%;
+    z-index: 1;
+  }
 
-    color: #606266;
+  /*.crt-main .textarea /deep/ .el-form-item__label {*/
+  /*  height: 82px;*/
+  /*}*/
+  // 控制select为只读的时候显示样式
 
+  .hide-sel {
     .el-input__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
+      border: 0px;
+    }
+
+    .el-icon-arrow-up {
+      display: none;
     }
 
     .el-textarea__inner {
       background-color: #fff !important;
       border: 0;
+    }
+
+    .el-date-editor {
+      i {
+        display: none;
+      }
+    }
+
+    .is-disabled {
+      .el-input__inner:hover {
+        background-color: #fff !important;
+        border: 0;
+      }
+
       color: #606266;
+
+      .el-input__inner {
+        background-color: #fff !important;
+        border: 0;
+        color: #606266;
+      }
+
+      .el-textarea__inner {
+        background-color: #fff !important;
+        border: 0;
+        color: #606266;
+      }
     }
   }
-}
 
-// 控制select为只读的时候显示样式
-/deep/.ws-class-table-col {
-  height: auto;
-  padding: 0px 2px;
-
-  /deep/.el-input__inner {
+  // 控制select为只读的时候显示样式
+  /deep/.ws-class-table-col {
+    height: auto;
     padding: 0px 2px;
-  }
-}
 
-/deep/.is-disabled {
-  .el-input__prefix,
-  .el-input__suffix {
-    display: none;
+    /deep/.el-input__inner {
+      padding: 0px 2px;
+    }
   }
 
-  .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
-    color: #000 !important;
-    font-size: 14px;
-    cursor: text;
-    padding: 0 !important;
+  /deep/.is-disabled {
+    .el-input__prefix,
+    .el-input__suffix {
+      display: none;
+    }
+
+    .el-input__inner {
+      background-color: #fff;
+      border-color: #fff !important;
+      color: #000 !important;
+      font-size: 14px;
+      cursor: text;
+      padding: 0 !important;
+    }
   }
-}
 
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
 </style>

+ 3 - 3
src/views/contractManagement/purchaseContractAdd.vue

@@ -90,7 +90,7 @@
              @select="handleSelect"></el-autocomplete>
              -->
             <el-select filterable  v-model="deptBudgetList.seller" placeholder="请选择卖方名称" class="typeselect" 
-            @change="sellerSelect">
+            @change="sellerSelect" filterable clearable>
 
             <el-option v-for="(item,index) in customerinfo" :key="index"  :label="item.customerName"
               :value="item.customerName" />
@@ -104,7 +104,7 @@
           </ws-form-item> -->
            <!-- 发货反馈负责人(多选) -->
             <ws-form-item label="发货反馈负责人" span="1" prop="agent" v-if="deptBudgetList.deliverType == '2'">
-              <el-select  v-model="deptBudgetList.agent"  multiple filterable allow-create default-first-option placeholder="请选择经办人"  @change="feedbackLeaderChange" >
+              <el-select  v-model="deptBudgetList.agent"  multiple filterable clearable allow-create default-first-option placeholder="请选择经办人"  @change="feedbackLeaderChange" >
                 <el-option v-for="(item,index1) in feedbackLeaders" :key="index1" :label="item.staffName" :value="item.staffName"></el-option>
                 </el-select>
               </ws-form-item>
@@ -126,7 +126,7 @@
 
         <!--验收方式-->
         <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
-          <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" filterable
+          <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" filterable clearable
             @change="selectunitList">
             <el-option v-for="(item, index) in unitList" :key="item.constValue" :label="item.constValue"
               :value="item.constValue">

+ 2 - 2
src/views/contractManagement/purchaseContractEdit.vue

@@ -77,7 +77,7 @@
         </ws-form-item>
         <!-- 验收方式 -->
         <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
-          <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" filterable
+          <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" filterable clearable
             @change="selectunitList">
             <el-option v-for="(item, index) in unitList" :key="item.constValue" :label="item.constValue"
               :value="item.constValue">
@@ -197,7 +197,7 @@
 
         <!-- 临时仓库负责人 -->
         <ws-form-item label="临时仓库负责人" span="1" prop="packingMethod" v-if="deptBudgetList.deliverType == 1">
-          <el-select v-model="deptBudgetList.personCharge" placeholder="请选择临时仓库负责人" filterable @change="selectstaff">
+          <el-select v-model="deptBudgetList.personCharge" placeholder="请选择临时仓库负责人" filterable clearable @change="selectstaff">
             <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
           </el-select>
         </ws-form-item>

+ 1 - 1
src/views/contractManagement/salesContractAdd.vue

@@ -50,7 +50,7 @@
             <!-- <ws-input v-model="deptBudgetList.buyer" placeholder="请输入买方名称" maxlength="100" size="small" /> -->
             <!-- <el-autocomplete class="inline-input" v-model="deptBudgetList.buyer" :fetch-suggestions="querySearch1"
               placeholder="请输入买方名称" @select="handleSelect"></el-autocomplete> -->
-              <el-select filterable v-model="deptBudgetList.buyer" placeholder="请选择买方名称" class="typeselect" 
+              <el-select  v-model="deptBudgetList.buyer" placeholder="请选择买方名称" class="typeselect" filterable clearable
             @change="buyerSelect">
             <el-option v-for="item in customerinfo" :key="item.customerName"  :label="item.customerName"
               :value="item.customerName" />

+ 1 - 2
src/views/financialManagement/collectionManagementList.vue

@@ -135,8 +135,7 @@
             autocomplete="off"
             placeholder="请选择默认库管"
             class="deal"
-            filterable
-            
+            filterable clearable
             @change="selectstaff"
           >
             <el-option

+ 1 - 1
src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -14,7 +14,7 @@
         <div class="row1">
           <div class="grid-content">
             <el-form-item label="货名">
-              <el-select v-model="selectVal" placeholder="请选择" @change="goodsChange" :disabled="!isEdit">
+              <el-select v-model="selectVal" placeholder="请选择" @change="goodsChange" :disabled="!isEdit" filterable clearable>
                 <el-option v-for="item in goodnameList" :key="item.constValue" :label="item.constValue"
                   :value="item.constValue">
                 </el-option>

+ 1 - 1
src/views/houseSelfCollect/paymentManagement.vue

@@ -36,7 +36,7 @@
         <ws-button :type="invoicing === 0 ? 'primary' : ''" @click="screen(0)">未开票</ws-button>
       </template>
       <template slot="right">
-        <el-select class="warehouse_select" v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange"
+        <el-select class="warehouse_select" v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange" filterable clearable
           style="margin: 0 10px">
           <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
           </el-option>

+ 0 - 1
src/views/outboundManagement/collectionManagement.vue

@@ -28,7 +28,6 @@
             placeholder="请选择合同"
             clearable
             filterable
-            
             @change="contractchange"
             maxlength="500"
             type="input"

+ 1 - 0
src/views/purchasingManagement/procurementPlanEdit.vue

@@ -128,6 +128,7 @@
               maxlength="120"
               class="typeselect"
               size="small"
+              filterable clearable
             />
             <el-option
               v-for="item in warehouseList1"

+ 1 - 2
src/views/purchasingManagement/purchaseOrderList.vue

@@ -746,8 +746,7 @@
             v-model="aduitlist.contractNo"
             placeholder="请选择合同编号"
             class="deal"
-            filterable
-           
+            filterable clearable
           >
             <el-option
               v-for="item in options"

+ 1 - 0
src/views/salesManagement/salesPlanEdit.vue

@@ -110,6 +110,7 @@
               maxlength="120"
               size="small"
               class="typeselect"
+              filterable clearable
             />
             <el-option
               v-for="item in warehouseList1"

+ 1 - 2
src/views/salesManagement/salesPlanOrderList.vue

@@ -769,8 +769,7 @@
             v-model="aduitlist.contractNo"
             placeholder="请选择合同编号"
             class="deal"
-            filterable
-           
+            filterable clearable
           >
             <el-option
               v-for="item in options"

+ 0 - 1
src/views/statisticalReport/autoSettlementList.vue

@@ -65,7 +65,6 @@
             placeholder="请选择合同"
             clearable
             filterable
-           
             @change="contractchange"
             maxlength="500"
             type="input"

+ 3 - 1
src/views/statisticalReport/huoyunList.vue

@@ -62,7 +62,7 @@
           <el-select
             v-model="contractNo"
             placeholder="请选择合同"
-         
+           filterable clearable
             @change="contractchange"
             maxlength="500"
             class="findValue"
@@ -80,6 +80,7 @@
             @change="taskNochange"
             maxlength="500"
             class="findValue"
+            filterable clearable
           >
             <el-option
               v-for="item in taskNoList"
@@ -94,6 +95,7 @@
             @change="processNochange"
             maxlength="500"
             class="findValue"
+            filterable clearable
           >
             <el-option
               v-for="item in processNoList"

+ 2 - 1
src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -364,6 +364,7 @@
             data="1"
             autocomplete="off"
             class="deal"
+            filterable clearable
           >
             <el-option
               v-for="item in invoiceTypeList"
@@ -392,7 +393,7 @@
     >
       <el-form :model="form">
         <el-form-item label="发票类型" :label-width="formLabelWidth">
-          <el-select v-model="invoiceType" autocomplete="off" class="deal">
+          <el-select v-model="invoiceType" autocomplete="off" class="deal" filterable clearable>
             <el-option
               v-for="item in invoiceTypeList"
               :key="item.value"

+ 7 - 4
src/views/taskManagement/tranManagementTransportAdd.vue

@@ -42,6 +42,7 @@
             v-model="deptBudgetList.taskType"
             placeholder="请输入任务类型"
             @change="selecttaskType"
+            filterable clearable
           >
             <el-option
               v-for="item in taskType"
@@ -59,6 +60,7 @@
             @change=" (val) => {
                   selectcontractNo(val)
                 }"
+                filterable clearable
           >
             <el-option
               v-for="item in contractNoList"
@@ -100,6 +102,7 @@
             v-model="deptBudgetList.sendWarehouse"
             placeholder="选择仓库"
             class="typeselect"
+            filterable clearable
           >
             <el-option
               v-for="item in warehouseList"
@@ -145,6 +148,7 @@
             :disabled="warehouse"
             placeholder="请输入收货库点"
             style="width: 100%"
+            filterable clearable
           >
             <el-option
               v-for="item in warehouseList1"
@@ -241,6 +245,7 @@
                   selecttaskwayList(val, index)
                 }
               "
+              filterable clearable
             >
               <el-option
                 v-for="item in taskwayList"
@@ -307,8 +312,7 @@
             <el-select
             v-model="item.sender"
             placeholder="请选择发货人"
-            filterable
-           
+            filterable clearable
             @change=" (val) => {
                   selectstaff(val, index)
                 }"
@@ -359,8 +363,7 @@
              <el-select
             v-model="item.receiver"
             placeholder="请选择收货人"
-            filterable
-           
+           filterable clearable
             @change="(val) => {
                   selectstaff1(val, index)
                 }"

+ 7 - 4
src/views/taskManagement/tranManagementTransportEdit.vue

@@ -40,6 +40,7 @@
             v-model="deptBudgetList.taskType"
             placeholder="请输入任务类型"
             @change="selecttaskType"
+            filterable clearable
           >
             <el-option
               v-for="item in taskType"
@@ -56,6 +57,7 @@
              @change=" (val) => {
                   selectcontractNo(val)
                 }"
+                filterable clearable
           >
             <el-option
               v-for="item in contractNoList"
@@ -97,6 +99,7 @@
             placeholder="选择仓库"
             class="typeselect"
             @change="sendWarehousechange"
+            filterable clearable
           >
             <el-option
               v-for="item in warehouseList"
@@ -143,6 +146,7 @@
             :disabled="warehouse"
             placeholder="请输入收货库点"
             style="width: 100%"
+            filterable clearable
           >
             <el-option
               v-for="item in warehouseList"
@@ -240,6 +244,7 @@
                   selecttaskwayList(val, index)
                 }
               "
+              filterable clearable
             >
               <el-option
                 v-for="item in taskwayList"
@@ -305,8 +310,7 @@
             <el-select
             v-model="item.sender"
             placeholder="请选择发货人"
-            filterable
-           
+            filterable clearable
             @change="(val) => {
                   selectstaff(val, index)
                 }"
@@ -357,8 +361,7 @@
              <el-select
             v-model="item.receiver"
             placeholder="请选择收货人"
-            filterable
-           
+            filterable clearable
             @change="(val) => {
                   selectstaff1(val, index)
                 }"

+ 16 - 17
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -42,7 +42,7 @@
 					<el-form-item label="出库类型">
 						<el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.inOutType" placeholder="请选择出库类型" class="typeselect"
-							@change="selectstorageType">
+							@change="selectstorageType" filterable clearable>
 							<el-option v-for="item in storageType" :key="item.constKey" v-if="
                   (dataList.taskTypeKey == 1 &&
                     item.constValue != '移库出库') ||
@@ -54,8 +54,7 @@
 					</el-form-item>
 					<!-- 合同编号 -->
 					<el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
-						<el-select filterable @change="changecontract" v-model="dataList.contractNo" placeholder="请输入合同编号"
-							class="typeselect">
+						<el-select filterable @change="changecontract" v-model="dataList.contractNo" placeholder="请输入合同编号" class="typeselect" filterable clearable>
 							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
 								:value="item.contractNo"></el-option>
 						</el-select>
@@ -70,7 +69,7 @@
 					<!-- 货名 -->
 					<el-form-item label="货名" class="huom">
 						<el-select :disabled="dataList.taskTypeKey != 3" v-model="dataList.goodsName" placeholder="货名"
-							class="huom" @change="selectgoodsName">
+							class="huom" @change="selectgoodsName" filterable clearable>
 							<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
 								:value="item.constValue"></el-option>
 						</el-select>
@@ -83,7 +82,7 @@
 					<!-- 品级 -->
 					<el-form-item label="品级">
 						<el-select :disabled='gradestatus' v-model="dataList.grade" placeholder class="typeselect"
-							@change="selectpackingMethod">
+							@change="selectpackingMethod" filterable clearable>
 							<el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
 								:value="item.constValue" />
 						</el-select>
@@ -115,7 +114,7 @@
 					</el-form-item> -->
 					<!--经办人-->
 					<el-form-item label="发货人">
-            <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable
+            <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable clearable
               @change="selectstaff">
               <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
@@ -146,7 +145,7 @@
 					<el-form-item label="入库类型">
 						<el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList1.inOutType" placeholder="请选择入库类型" class="typeselect"
-							@change="selectstorageType1">
+							@change="selectstorageType1" filterable clearable>
 							<el-option v-for="item in storageType1" :key="item.constKey" v-if="
                   (dataList1.taskTypeKey == 2 &&
                     item.constValue != '移库入库') ||
@@ -159,7 +158,7 @@
 					<!-- 合同编号 -->
 					<el-form-item v-if="dataList1.taskTypeKey != 3" label="合同编号">
 						<el-select @change="changecontract1" v-model="dataList1.contractNo" placeholder="请输入合同编号"
-							class="typeselect">
+							class="typeselect" filterable clearable>
 							<el-option v-for="item in contractNoList1" :key="item.constKey" :label="item.contractNo"
 								:value="item.contractNo"></el-option>
 						</el-select>
@@ -172,7 +171,7 @@
 					</el-form-item>
 					<!-- 货名 -->
 					<el-form-item label="货名" class="huom">
-						<el-select :disabled="dataList.taskTypeKey != 3 || dataList.taskTypeKey == 3"
+						<el-select :disabled="dataList.taskTypeKey != 3 || dataList.taskTypeKey == 3" filterable clearable
 							v-model="dataList.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1">
 							<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
 								:value="item.constValue"></el-option>
@@ -186,7 +185,7 @@
 					<!-- 品级 -->
 					<el-form-item label="品级">
 						<el-select :disabled="dataList.taskTypeKey == 3" v-model="dataList1.grade" placeholder
-							class="typeselect" @change="selectpackingMethod1">
+							class="typeselect" @change="selectpackingMethod1" filterable clearable>
 							<el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
 								:value="item.constValue" />
 						</el-select>
@@ -221,7 +220,7 @@
 					</el-form-item> -->
 					<!-- 经办人-->
 					<el-form-item label="收货人">
-            <el-select v-model="dataList1.agent" placeholder="请选择收货人" filterable :filter-method="dataFilter1"
+            <el-select v-model="dataList1.agent" placeholder="请选择收货人" filterable clearable :filter-method="dataFilter1"
               @change="selectstaff1">
               <el-option v-for="item in options1" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
@@ -253,7 +252,7 @@
 					<el-form-item label="出库类型">
 						<el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.inOutType" placeholder="请选择出库类型" class="typeselect"
-							@change="selectstorageType1">
+							@change="selectstorageType1" filterable clearable>
 							<el-option v-for="item in storageType" :key="item.constKey" v-if="
                   (dataList.taskTypeKey == 1 &&
                     item.constValue != '移库出库') ||
@@ -266,14 +265,14 @@
 					<!-- 合同编号 -->
 					<el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
 						<el-select @change="changecontract" v-model="dataList.contractNo" placeholder="请输入合同编号"
-							class="typeselect">
+							class="typeselect" filterable clearable>
 							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
 								:value="item.contractNo"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
 						<el-select @change="selectTaskNo" v-model="dataList.moveTaskNo" placeholder="请输入移库任务编号"
-							class="typeselect">
+							class="typeselect" filterable clearable>
 							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
 								:value="item.contractNo"></el-option>
 						</el-select>
@@ -281,7 +280,7 @@
 					<!-- 货名 -->
 					<el-form-item label="货名" class="huom">
 						<el-select :disabled="dataList.taskTypeKey != 3" v-model="dataList.goodsName" placeholder="货名"
-							class="huom" @change="selectgoodsName">
+							class="huom" @change="selectgoodsName " filterable clearable>
 							<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
 								:value="item.constValue"></el-option>
 						</el-select>
@@ -294,7 +293,7 @@
 					<!-- 品级 -->
 					<el-form-item label="品级">
 						<el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
-							v-model="dataList.grade" placeholder class="typeselect" @change="selectpackingMethod">
+							v-model="dataList.grade" placeholder class="typeselect" @change="selectpackingMethod" filterable clearable>
 							<el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
 								:value="item.constValue" />
 						</el-select>
@@ -329,7 +328,7 @@
 					</el-form-item> -->
 					<!--发货人-->
 					<el-form-item label="发货人">
-            <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable
+            <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable clearable
               @change="selectstaff">
               <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>

+ 23 - 4
src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -90,6 +90,7 @@
               placeholder="请选择仓库名"
               class="typeselect"
               @change="selectwarehouseName"
+              filterable clearable
             >
               <el-option
                 v-for="item in warehouseNameList"
@@ -107,6 +108,7 @@
               placeholder="请选择出库类型"
               class="typeselect"
               @change="selectstorageType"
+              filterable clearable
             >
               <el-option
                 v-for="item in storageType"
@@ -131,6 +133,7 @@
               v-model="dataList.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
+              filterable clearable
             >
               <el-option
                 v-for="item in contractNoList"
@@ -147,6 +150,7 @@
               v-model="dataList.moveTaskNo"
               placeholder="请输入移库任务编号"
               class="typeselect"
+              filterable clearable
             >
               <el-option
                 v-for="item in contractNoList"
@@ -164,6 +168,7 @@
               placeholder="货名"
               class="huom"
               @change="selectgoodsName"
+              filterable clearable
             >
               <el-option
                 v-for="item in goodnameList"
@@ -191,6 +196,7 @@
               placeholder
               class="typeselect"
               @change="selectpackingMethod"
+              filterable clearable
             >
               <el-option
                 v-for="item in gradeList"
@@ -263,8 +269,8 @@
               disabled
               v-model="dataList.agent"
               placeholder="请选择发货人"
-              filterable
               @change="selectstaff"
+              filterable clearable
             >
               <el-option
                 v-for="item in options"
@@ -292,7 +298,7 @@
              <el-select
               v-model="dataList.binNumber"
               placeholder="请输入仓位号"
-              filterable
+              filterable clearable
               @change="binNumberChange1"
             >
               <el-option
@@ -340,6 +346,7 @@
               v-model="dataList1.warehouseName"
               placeholder="请选择仓库名"
               class="typeselect"
+              filterable clearable
             >
               <el-option
                 v-for="item in warehouseNameList"
@@ -360,6 +367,7 @@
               placeholder="请选择入库类型"
               class="typeselect"
               @change="selectstorageType1"
+              filterable clearable
             >
               <el-option
                 v-for="item in storageType1"
@@ -384,6 +392,7 @@
               v-model="dataList1.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
+              filterable clearable
             >
               <el-option
                 v-for="item in contractNoList"
@@ -399,6 +408,7 @@
               v-model="dataList1.moveTaskNo"
               placeholder="请输入移库任务编号"
               class="typeselect"
+              filterable clearable
             >
               <el-option
                 v-for="item in contractNoList"
@@ -416,6 +426,7 @@
               placeholder="货名"
               class="huom"
               @change="selectgoodsName1"
+              filterable clearable
             >
               <el-option
                 v-for="item in goodnameList"
@@ -444,6 +455,7 @@
               placeholder
               class="typeselect"
               @change="selectpackingMethod1"
+              filterable clearable
             >
               <el-option
                 v-for="item in gradeList"
@@ -521,6 +533,7 @@
               placeholder="请选择收货人"
               filterable
               @change="selectstaff1"
+              filterable clearable
             >
               <el-option
                 v-for="item in options"
@@ -543,8 +556,8 @@
             <el-select
               v-model="dataList1.binNumber"
               placeholder="请输入仓位号"
-              filterable
               @change="binNumberChange"
+              filterable clearable
             >
               <el-option
                 v-for="(item, index) in binNumberList"
@@ -584,6 +597,7 @@
               v-model="dataList.warehouseName"
               placeholder="请选择仓库名"
               class="typeselect"
+              filterable clearable
             >
               <el-option
                 v-for="item in warehouseNameList"
@@ -601,6 +615,7 @@
               placeholder="请选择出库类型"
               class="typeselect"
               @change="selectstorageType"
+              filterable clearable
             >
               <el-option
                 v-for="item in storageType"
@@ -624,6 +639,7 @@
               v-model="dataList.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
+              filterable clearable
             >
               <el-option
                 v-for="item in contractNoList"
@@ -639,6 +655,7 @@
               v-model="dataList.moveTaskNo"
               placeholder="请输入移库任务编号"
               class="typeselect"
+              filterable clearable
             >
               <el-option
                 v-for="item in contractNoList"
@@ -656,6 +673,7 @@
               placeholder="货名"
               class="huom"
               @change="selectgoodsName"
+              filterable clearable
             >
               <el-option
                 v-for="item in goodnameList"
@@ -684,6 +702,7 @@
               placeholder
               class="typeselect"
               @change="selectpackingMethod"
+              filterable clearable
             >
               <el-option
                 v-for="item in gradeList"
@@ -754,8 +773,8 @@
             <el-select
               v-model="dataList.agent"
               placeholder="请选择发货人"
-              filterable
               @change="selectstaff"
+              filterable clearable
             >
               <el-option
                 v-for="item in options"

+ 15 - 1
src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -63,6 +63,7 @@
               class="typeselect"
               @change="selectwarehouseName"
               disabled
+              filterable clearable
             >
               <el-option
                 v-for="item in warehouseNameList"
@@ -80,6 +81,7 @@
               placeholder="请选择出库类型"
               class="typeselect"
               @change="selectstorageType"
+              filterable clearable
             >
               <el-option
                 v-for="item in storageType"
@@ -103,6 +105,7 @@
               v-model="dataList.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
+              filterable clearable
             >
               <el-option
                 v-for="item in moveTaskNo"
@@ -128,6 +131,7 @@
               placeholder="货名"
               class="huom"
               @change="selectgoodsName"
+              filterable clearable
             >
               <el-option
                 v-for="item in goodnameList"
@@ -154,6 +158,7 @@
               placeholder
               class="typeselect"
               @change="selectpackingMethod"
+              filterable clearable
             >
               <el-option
                 v-for="item in gradeList"
@@ -259,7 +264,7 @@
         <el-form v-if="!deletetask" ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
-            <el-select v-model="dataList1.warehouseName" placeholder="请选择仓库名" class="typeselect" disabled>
+            <el-select v-model="dataList1.warehouseName" placeholder="请选择仓库名" class="typeselect" disabled filterable clearable>
               <el-option
                 v-for="item in warehouseNameList"
                 :key="item.constKey"
@@ -276,6 +281,7 @@
               placeholder="请选择入库类型"
               class="typeselect"
               @change="selectstorageType1"
+              filterable clearable
             >
               <el-option
                 v-for="item in storageType1"
@@ -299,6 +305,7 @@
               v-model="dataList1.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
+              filterable clearable
             >
               <el-option
                 v-for="item in contractNoList"
@@ -324,6 +331,7 @@
               placeholder="货名"
               class="huom"
               @change="selectgoodsName1"
+              filterable clearable
             >
               <el-option
                 v-for="item in goodnameList"
@@ -352,6 +360,7 @@
               placeholder
               class="typeselect"
               @change="selectpackingMethod1"
+              filterable clearable
             >
               <el-option
                 v-for="item in gradeList"
@@ -460,6 +469,7 @@
               class="typeselect"
               @change="selectwarehouseName"
               disabled
+              filterable clearable
             >
               <el-option
                 v-for="item in warehouseNameList"
@@ -477,6 +487,7 @@
               placeholder="请选择出库类型"
               class="typeselect"
               @change="selectstorageType"
+              filterable clearable
             >
               <el-option
                 v-for="item in storageType"
@@ -500,6 +511,7 @@
               v-model="dataList.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
+              filterable clearable
             >
               <el-option
                 v-for="item in contractNoList"
@@ -525,6 +537,7 @@
               placeholder="货名"
               class="huom"
               @change="selectgoodsName"
+              filterable clearable
             >
               <el-option
                 v-for="item in goodnameList"
@@ -553,6 +566,7 @@
               placeholder
               class="typeselect"
               @change="selectpackingMethod"
+              filterable clearable
             >
               <el-option
                 v-for="item in gradeList"

+ 5 - 0
src/views/tradeServicesManagement/approveWarehouseReceipt.vue

@@ -43,6 +43,7 @@
           v-model="deptBudgetList.renown"
           placeholder="请选择名头"
           disabled
+          filterable clearable
         >
           <el-option
             :label="item.compName"
@@ -62,6 +63,7 @@
           v-model="deptBudgetList.warehouseName"
           placeholder="请选择仓库"
           disabled
+          filterable clearable
         >
           <el-option
             :label="item.warehouseName"
@@ -76,6 +78,7 @@
           v-model="deptBudgetList.warehouseNo"
           placeholder="请选择仓位号"
           disabled
+          filterable clearable
         >
           <el-option
             :label="item.binNumber"
@@ -103,6 +106,7 @@
           v-model="deptBudgetList.goodsName"
           placeholder="请选择货名"
           disabled
+          filterable clearable
         >
           <el-option
             v-for="(item, index) in goodsList"
@@ -118,6 +122,7 @@
           v-model="deptBudgetList.grade"
           placeholder="请选择品级"
           disabled
+          filterable clearable
         >
           <el-option label="一等" value="一等"></el-option>
           <el-option label="二等" value="二等"></el-option>

+ 6 - 0
src/views/tradeServicesManagement/reviewWarehouseReceipt.vue

@@ -43,6 +43,7 @@
           v-model="deptBudgetList.renown"
           placeholder="请选择名头"
           disabled
+          filterable clearable
         >
           <el-option
             :label="item.compName"
@@ -62,6 +63,7 @@
           v-model="deptBudgetList.warehouseName"
           placeholder="请选择仓库"
           disabled
+          filterable clearable
         >
           <el-option
             :label="item.warehouseName"
@@ -76,6 +78,7 @@
           v-model="deptBudgetList.warehouseNo"
           placeholder="请选择仓位号"
           disabled
+          filterable clearable
         >
           <el-option
             :label="item.binNumber"
@@ -103,6 +106,7 @@
           v-model="deptBudgetList.goodsName"
           placeholder="请选择货名"
           disabled
+          filterable clearable
         >
           <el-option
             v-for="(item, index) in goodsList"
@@ -118,6 +122,7 @@
           v-model="deptBudgetList.grade"
           placeholder="请选择品级"
           disabled
+          filterable clearable
         >
           <el-option label="一等" value="一等"></el-option>
           <el-option label="二等" value="二等"></el-option>
@@ -234,6 +239,7 @@
           v-model="deptBudgetList.bank"
           placeholder="请选择银行"
           disabled
+          filterable clearable
         >
           <el-option label="区域一" value="shanghai"></el-option>
           <el-option label="区域二" value="beijing"></el-option>

+ 6 - 6
src/views/tradeServicesManagement/warehouseReceiptAdd.vue

@@ -22,19 +22,19 @@
         </el-col>
       </el-form-item>
       <el-form-item label="名头" prop="renown" class="forlist">
-        <el-select v-model="deptBudgetList.renown" placeholder="请选择名头" @change="changeCompOptionList">
+        <el-select v-model="deptBudgetList.renown" placeholder="请选择名头" @change="changeCompOptionList" filterable clearable>
           <el-option :label="item.compName" :key="index" :value="item.compId" v-for="(item,index) in compOptionList">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="仓库名称" prop="warehouseName" class="forlist">
-        <el-select v-model="deptBudgetList.warehouseName" filterable placeholder="请选择仓库" @change="changeWarehouse">
+        <el-select v-model="deptBudgetList.warehouseName" filterable placeholder="请选择仓库" @change="changeWarehouse" clearable>
           <el-option v-for="(item,index) in warehouseList" :key='index' :label="item.warehouseName" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="仓位号" prop="warehouseNo" class="forlist">
-        <el-select v-model="deptBudgetList.warehouseNo" placeholder="请选择仓位号" @change="changeWarehouseNo">
+        <el-select v-model="deptBudgetList.warehouseNo" placeholder="请选择仓位号" @change="changeWarehouseNo" filterable clearable>
           <el-option :label="item.binNumber" :value="item.id" v-for="(item,index) in cwNumberList" :key='index'>
           </el-option>
         </el-select>
@@ -43,13 +43,13 @@
         <el-input disabled v-model="deptBudgetList.warehouseAddress" placeholder="请输入仓库地址" size="small"></el-input>
       </el-form-item>
       <el-form-item prop="goodsName" label="货名">
-        <el-select v-model="deptBudgetList.goodsName" placeholder="请选择货名" @change="changeGoodsName">
+        <el-select v-model="deptBudgetList.goodsName" placeholder="请选择货名" @change="changeGoodsName" filterable clearable>
           <el-option :label="item.goodsName" :value="item.id" v-for="(item,index) in goodsList" :key='index' >
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="grade" label="品级">
-        <el-select v-model="deptBudgetList.grade" placeholder="请选择品级">
+        <el-select v-model="deptBudgetList.grade" placeholder="请选择品级" filterable clearable>
           <el-option label="一等" value="一等"></el-option>
           <el-option label="二等" value="二等"></el-option>
           <el-option label="三等" value="三等"></el-option>
@@ -88,7 +88,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="第三方" span="1" prop="three" class="forlist">
-        <el-select v-model="deptBudgetList.three" placeholder="无" @change="threeChange">
+        <el-select v-model="deptBudgetList.three" placeholder="无" @change="threeChange" filterable clearable>
           <el-option :label="item1.constValue" :value="item1.constValue" v-for="(item1,index) in threeList" :key="index"></el-option>
           <!-- <el-option label="第三方2" value="three2"></el-option> -->
         </el-select>

+ 7 - 7
src/views/tradeServicesManagement/warehouseReceiptEdit.vue

@@ -39,17 +39,17 @@
         ></el-input>
       </el-form-item>
       <el-form-item label="名头" span="1" prop="taskNo" class="renown">
-        <el-select v-model="deptBudgetList.renown" placeholder="请选择名头" @change="changeCompOptionList">
+        <el-select v-model="deptBudgetList.renown" placeholder="请选择名头" @change="changeCompOptionList" filterable clearable>
           <el-option :label="item.compName" :value="item.compId" v-for="(item,index) in compOptionList" :Key="index"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="仓库名称" span="1" prop="warehouseName" class="forlist">
-        <el-select v-model="deptBudgetList.warehouseName" placeholder="请选择仓库" @change="changeWarehouse">
+        <el-select v-model="deptBudgetList.warehouseName" placeholder="请选择仓库" @change="changeWarehouse" filterable clearable>
           <el-option :label="item.warehouseName" :value="item.id" v-for="(item,index) in warehouseList" :key="index"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="仓位号" span="1" prop="warehouseNo" class="forlist">
-        <el-select v-model="deptBudgetList.warehouseNo" placeholder="请选择仓位号"  @change="changeWarehouseNo">
+        <el-select v-model="deptBudgetList.warehouseNo" placeholder="请选择仓位号"  @change="changeWarehouseNo" filterable clearable>
            <el-option :label="item.binNumber" :value="item.id" v-for="(item,index) in cwNumberList" :key='index'></el-option>
         </el-select>
       </el-form-item>
@@ -62,13 +62,13 @@
         ></el-input>
       </el-form-item>
       <el-form-item prop="goodsName" label="货名" span="1">
-           <el-select v-model="deptBudgetList.goodsName" placeholder="请选择货名" @change="changeGoodsName">
+           <el-select v-model="deptBudgetList.goodsName" placeholder="请选择货名" @change="changeGoodsName" filterable clearable>
           <el-option v-for="(item,index) in goodsList" :key='index' :label="item.goodsName" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="grade" label="品级" span="1">
-      <el-select v-model="deptBudgetList.grade" placeholder="请选择品级">
+      <el-select v-model="deptBudgetList.grade" placeholder="请选择品级" filterable clearable>
           <el-option label="一等" value="一等"></el-option>
           <el-option label="二等" value="二等"></el-option>
           <el-option label="三等" value="三等"></el-option>
@@ -165,12 +165,12 @@
       />
       <div class="title1">外审部门</div>
       <el-form-item prop="bank" label="银行" span="1">
-        <el-select v-model="deptBudgetList.bank" placeholder="请选择银行" @change="bankChange">
+        <el-select v-model="deptBudgetList.bank" placeholder="请选择银行" @change="bankChange" filterable clearable>
          <el-option :label="item.constValue" :value="item.constValue" v-for="(item,index) in bankList" :key="index"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="第三方" span="1" prop="taskNo" class="forlist" >
-          <el-select v-model="deptBudgetList.three" placeholder="无" @change="threeChange">
+          <el-select v-model="deptBudgetList.three" placeholder="无" @change="threeChange" filterable clearable>
         <el-option :label="item1.constValue" :value="item1.constValue" v-for="(item1,index) in threeList" :key="index"></el-option>
         </el-select>
       </el-form-item>

+ 1 - 1
src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -138,7 +138,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="司机电话:" span="1" prop="impurity" label-width="125px">
-                  <el-select v-show="!item.temporaryDriverFlag" v-model="item.driverPhone" placeholder="请选择司机电话"
+                  <el-select v-show="!item.temporaryDriverFlag" v-model="item.driverPhone" placeholder="请选择司机电话" filterable clearable
                     class="row-item" @change="
                                (val) => {
                                  phonechange(val, index)

+ 1 - 1
src/views/warehouse/warehouseManagementAdd.vue

@@ -38,7 +38,7 @@
         <!--其他负责人-->
         <ws-form-item label="其他负责人" span="1" prop="otherPersonCharge">
           <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他负责人" @change="selectstaffOther"
-            multiple filterable>
+            multiple filterable clearable>
             <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName"
               :value="item.staffMobilePhone" />
           </el-select>

+ 1 - 0
src/views/warehouse/warehouseManagementDelivery.vue

@@ -241,6 +241,7 @@
                 <el-select
                   v-model="deptBudgetList.outType"
                   placeholder="请选择运输方式"
+                  filterable clearable
                 >
                   <el-option
                     v-for="item in multiSelector"

+ 1 - 1
src/views/warehouse/warehouseManagementEdit.vue

@@ -41,7 +41,7 @@
           <!--其他负责人-->
           <ws-form-item label="其他负责人" v-if="warehouseType == 1" span="1" prop="otherPersonCharge">
             <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他负责人" @change="selectstaffOther"
-              :filter-method="dataFilter1" filterable multiple>
+              :filter-method="dataFilter1" filterable clearable multiple>
               <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName"
                 :value="item.staffMobilePhone " />
             </el-select>

+ 3 - 3
src/views/warehouse/warehouseManagementGross.vue

@@ -449,8 +449,8 @@
                   size="small"
                 />
                 <el-select
-                  v-if="options2.length > 0"
-                  filterable
+                  v-if="carstatus && options2.length > 0"
+                  filterable clearable
                   :filter-method="dataFilter2"
                   v-model="deptBudgetList.carNo"
                   placeholder="请选择车牌号"
@@ -466,7 +466,7 @@
                 </el-select>
                 <el-select
                   v-if="!carstatus && options2.length > 0"
-                  filterable
+                  filterable clearable
                   :filter-method="dataFilter2"
                   v-model="deptBudgetList.carNo"
                   placeholder="请选择车牌号"

+ 5 - 5
src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -41,7 +41,7 @@
               <!--任务编号-->
               <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
                 <el-select filterable clearable v-model="dataList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
-                  @change="contractNoChange">
+                  @change="contractNoChange" filterable clearable>
                   <el-option v-for="item in deptBudgetList2" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
                     :value="item.inOutTaskNo" />
                 </el-select>
@@ -53,7 +53,7 @@
               </ws-form-item>
 
               <ws-form-item label="合同编号" span="1" prop="contractNo">
-                <el-select disabled filterable :filter-method="dataFilter1" v-model="dataList.contractNo"
+                <el-select disabled filterable clearable :filter-method="dataFilter1" v-model="dataList.contractNo"
                   placeholder="请选择合同编号或移库任务编号" class="typeselect" @change="contractNoChange">
                   <el-option v-for="item in outContractNo1" :key="item.constKey" :label="item.contractNo"
                     :value="item.contractNo" />
@@ -109,7 +109,7 @@
               </ws-form-item>
               <!--经办人-->
               <ws-form-item label="经办人" span="1" prop="agent">
-                <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable @change="selectstaff">
+                <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable clearable @change="selectstaff">
                   <el-option v-for="item in options" :key="item.value" :label="item.staffName"
                     :value="item.staffName" />
                 </el-select>
@@ -200,7 +200,7 @@
               </ws-form-item>
               <!--入库方式-->
               <ws-form-item label="运输方式" span="1" prop="outType">
-                <el-select v-model="deptBudgetList.outType" placeholder="请选择运输方式">
+                <el-select v-model="deptBudgetList.outType" placeholder="请选择运输方式" filterable clearable>
                   <el-option v-for="item in multiSelector" :key="item.value" :label="item.name" :value="item.name" />
                 </el-select>
               </ws-form-item>
@@ -211,7 +211,7 @@
               deptBudgetList.outType == '集装箱船'
             ">
                 <ws-input v-if="!carstatus" v-model="dataList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
-                <el-select v-if="carstatus" filterable :filter-method="dataFilter2" v-model="dataList.carNo"
+                <el-select v-if="carstatus" filterable clearable :filter-method="dataFilter2" v-model="dataList.carNo"
                   placeholder="请选择车牌号" class="typeselect" @change="carChange">
                   <el-option v-for="item in options2" :key="item.constKey"
                     :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />

+ 1 - 1
src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -41,7 +41,7 @@
               <!--任务编号-->
               <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
                 <el-select filterable clearable v-model="dataList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
-                  @change="contractNoChange">
+                  @change="contractNoChange" >
                   <el-option v-for="item in deptBudgetList2" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
                     :value="item.inOutTaskNo" />
                 </el-select>

+ 3 - 3
src/views/warehouse/warehouseManagementPerfectput.vue

@@ -37,7 +37,7 @@
             <ws-info-table>
               <ws-form-item label="合同编号" span="1" prop="contractNo">
                 <el-select
-                filterable
+                filterable clearable
                 :filter-method="dataFilter1"
                   v-model="dataList.contractNo"
                   placeholder="请选择合同编号或移库任务编号"
@@ -378,7 +378,7 @@
                 />
                 <el-select
                   v-if='carstatus&&options2.length>0'
-                  filterable
+                  filterable clearable
                   :filter-method="dataFilter2"
                   v-model="dataList.carNo"
                   placeholder="请选择车牌号"
@@ -394,7 +394,7 @@
                 </el-select>
                 <el-select
                   v-if='!carstatus&&options2.length>0'
-                  filterable
+                  filterable clearable
                   :filter-method="dataFilter2"
                   v-model="dataList.carNo"
                   placeholder="请选择车牌号"

+ 3 - 3
src/views/warehouse/warehouseManagementPut.vue

@@ -63,7 +63,7 @@
               <!--合同编号-->
               <ws-form-item label="合同编号" span="1" prop="contractNo">
                 <el-select
-                  filterable
+                  filterable clearable
                   :filter-method="dataFilter1"
                   v-model="deptBudgetList.contractNo"
                   placeholder="请选择合同编号或移库任务编号"
@@ -426,7 +426,7 @@
                 />
                 <el-select
                   v-if='carstatus&&options2.length>0'
-                  filterable
+                  filterable clearable
                   :filter-method="dataFilter2"
                   v-model="deptBudgetList.carNo"
                   placeholder="请选择车牌号"
@@ -442,7 +442,7 @@
                 </el-select>
                 <el-select
                   v-if='!carstatus&&options2.length>0'
-                  filterable
+                  filterable clearable
                   :filter-method="dataFilter2"
                   v-model="deptBudgetList.carNo"
                   placeholder="请选择车牌号"

+ 2 - 3
src/views/warehouse/warehouseManagementTare.vue

@@ -462,7 +462,7 @@
           console.log(response)
           this.deptBudgetList1 = response
         })
-      if (this.$route.query.automaticWeightAcquisition == '1') {
+      if (this.$route.query.automaticWeightAcquisition == '0') {
         this.isShowBalance = true
       }
     },
@@ -1876,11 +1876,10 @@
 
   .balance-row {
     display: flex;
-    margin: 20px 0;
+    margin: 20px 0 0 0;
 
     .left {
       width: 500px;
-      margin-bottom: 0;
     }
   }
 </style>