Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/App.vue

@@ -14,12 +14,12 @@ import { EventBus } from 'base-core-lib'
 export default {
   name: 'App',
   components: { RookieTraining },
-  provide () {
+  provide() {
     return {
       reload: this.reload // 将reload方法导出
     }
   },
-  data () {
+  data() {
     return {
       isRouterAlive: true
     }
@@ -28,28 +28,28 @@ export default {
     ...mapGetters(['isLoadding', 'roles'])
   },
   watch: {
-    $route (to, from) {
+    $route(to, from) {
       EventBus.$emit('routerCheck', { to, from })
     }
   },
-  created () {
+  created() {
     if (window.location.host === 'winsea.com') {
       window.location.href = 'https://www.winsea.com'
       return
     }
     // EventBus.$emit('dayTheme')
   },
-  mounted () {
+  mounted() {
     // setTimeout(() => {
     // 设置灰度模式
     // toggleGrayMode(true)
     // }, 2000);
   },
   methods: {
-    reload () {
+    reload() {
       // reload实现
       this.isRouterAlive = false
-      this.$nextTick(function () {
+      this.$nextTick(function() {
         this.isRouterAlive = true
       })
     }
@@ -62,14 +62,28 @@ export default {
   height: 100%;
   overflow: hidden;
 }
-.flex{
-  display:flex;
+.flex {
+  display: flex;
 }
-.gird{
-  display:gird;
+.gird {
+  display: gird;
 }
-.el-select-dropdown .el-scrollbar .el-scrollbar__wrap
-{
-overflow: scroll!important;
+.el-select-dropdown .el-scrollbar .el-scrollbar__wrap {
+  overflow: scroll !important;
+}
+.el-table .el-scrollbar .el-scrollbar__wrap {
+  overflow: scroll !important;
+}
+::-webkit-scrollbar {
+  width: 0 !important;
+  height: 10px !important;
+}
+::-webkit-scrollbar-thumb {
+  height: 8px !important;
+  background: #dadce7;
+  border-radius: 4px !important;
+}
+::-webkit-scrollbar-track-piece {
+  background: #f9fafe !important;
 }
 </style>

src/views/customer/customerList.vue

@@ -155,7 +155,7 @@
         </el-table-column>
         <el-table-column prop="compAddress" label="地址"></el-table-column>
         <el-table-column prop="customerPhone" label="电话"> </el-table-column>
-        <el-table-column prop="payTaxesCard" label="纳税人识别号">
+        <el-table-column width='170' prop="payTaxesCard" label="纳税人识别号">
           <template scope="scope">
             <span
               v-if="
@@ -175,9 +175,10 @@
         <el-table-column prop="bankCard" label="银行卡号"> </el-table-column>
         <el-table-column prop="totalDeposit" label="总定金(元)">
         </el-table-column>
-        <el-table-column prop="freezingDeposit" label="冻结定金(元)">
+        <el-table-column width='150' prop="freezingDeposit" label="冻结定金(元)">
         </el-table-column>
         <el-table-column
+         width='150'
           class="table_td"
           prop="depositRatio"
           label="定金比例(元/吨)"

src/views/platformaudit/driverreview.vue

@@ -51,7 +51,7 @@
         ref="expandstable"
         :expand-row-keys="expands"
         :row-key="getRowKeys"
-        height="780"
+        height="680"
       >
         <el-table-column type="expand">
           <template slot-scope="props">

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -24,7 +24,7 @@
         </div>
          <el-form ref="dataList" :model="dataList" label-width="140px">
           <ws-form-item label="标题" span="1" prop="title" >
-            <el-input v-model="dataList.title" maxlength="16" placeholder="标题须包含企业简称，不超过16个字" />
+            <el-input v-model="dataList.title" maxlength="16" class="typeselect" placeholder="标题须包含企业简称，不超过16个字" />
               <span class="unchangeable">*</span>
           </ws-form-item>
           <ws-form-item label="货名" span="1" prop="goodsName" >
@@ -52,7 +52,7 @@
             <span class="unchangeable">*</span>
           </ws-form-item>
           <ws-form-item label="最小成交量（吨）" span="1" prop="minimumVolume" >
-            <el-input v-model="dataList.minimumVolume" placeholder="请输入最小成交量" />
+            <el-input v-model="dataList.minimumVolume" class="typeselect" placeholder="请输入最小成交量" />
             <span class="unchangeable">*</span>
           </ws-form-item>
           <ws-form-item label="类型" span="1" prop="procurementPlanType" >
@@ -92,7 +92,7 @@
             <el-input
               v-model="dataList.procurementPrice"
               maxlength="120"
-              size="small"
+              class="typeselect"
               placeholder="请输入采购价格"
             />
             <span class="unchangeable">*</span>
@@ -117,8 +117,8 @@
             <el-cascader
               :options="options_"
               v-model="selectedOptions"
+              class="typeselect"
               clearable
-              size="large"
               placeholder="请选择收货库所在地区"
               @change="handleChange"
               style="width:200%"
@@ -160,18 +160,19 @@
             <el-input
             maxlength='30'
               v-model="dataList.baggingNotes"
-              size="small"
+              class="typeselect"
               placeholder="请输入装袋要求如：98斤，王中王彩袋"
             />
           </el-form-item>
           <ws-form-item label="买方" span="1" prop="buyer" >
-            <el-input maxlength='25' v-model="dataList.buyer" size="small" placeholder="请输入买方名称" />
+            <el-input maxlength='25' v-model="dataList.buyer" class="typeselect" placeholder="请输入买方名称" />
             <span class="unchangeable">*</span>
           </ws-form-item>
           <el-form-item label="买方电话" span="1" prop="buyerPhone" >
             <el-input
               v-model="dataList.buyerPhone"
               filterable
+              class="typeselect"
               :filter-method="dataFilter"
               placeholder="请输入买方电话"
             ></el-input>
@@ -181,12 +182,14 @@
             <el-input
               v-model="dataList.invoiceFeePerson"
               placeholder="请输入发票费（个人）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <el-form-item label="发票费（企业）" span="1" prop="invoiceFeeCompany" >
             <el-input
               v-model="dataList.invoiceFeeCompany"
               placeholder="请输入发票费（企业）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <div class="small-title"></div>
@@ -212,10 +215,10 @@
             <el-input v-model="dataList.impurity" class="typeselect" placeholder="请输入杂质占比" />
           </el-form-item>
           <el-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
-            <el-input v-model="dataList.mildewGrain" placeholder="请输入霉变粒占比" />
+            <el-input v-model="dataList.mildewGrain" class="typeselect" placeholder="请输入霉变粒占比" />
           </el-form-item>
           <el-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
-            <el-input v-model="dataList.imperfectGrain" maxlength="120" placeholder="请输入不完善粒占比" />
+            <el-input v-model="dataList.imperfectGrain" class="typeselect" maxlength="120" placeholder="请输入不完善粒占比" />
           </el-form-item>
           <el-form-item label="蛋白（%）>=" span="1" prop="protein">
             <el-input v-model="dataList.protein" class="typeselect" placeholder="请输入蛋白占比" />
@@ -254,6 +257,7 @@
             <el-cascader
               :options="options1_"
               v-model="selectedOptions1"
+              class="typeselect"
               clearable
               size="large"
               placeholder="请选择产地"
@@ -264,6 +268,7 @@
           <el-form-item label="产出年份" span="1" prop="outputYear">
             <el-date-picker
               v-model="dataList.outputYear"
+              class="typeselect"
               type="year"
               align="right"
               unlink-panels

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -34,6 +34,7 @@
             <el-input
               v-model="dataList.title"
               maxlength="16"
+              class="typeselect"
               placeholder="标题须包含企业简称，不超过16个字"
             />
           </ws-form-item>
@@ -71,6 +72,7 @@
             <el-input
               v-model="dataList.minimumVolume"
               placeholder="请输入最小成交量"
+              class="typeselect"
             />
           </ws-form-item>
           <!--类型-->
@@ -92,7 +94,7 @@
           </ws-form-item>
           <!-- 价格类型 -->
           <ws-form-item label="价格类型" span="1" prop="priceType">
-            <el-input v-model="dataList.priceType" disabled />
+            <el-input v-model="dataList.priceType" class="typeselect" disabled />
           </ws-form-item>
           <!-- 基差 -->
           <ws-form-item
@@ -101,7 +103,7 @@
             span="1"
             prop="basisPrice"
           >
-            <el-input v-model="dataList.basisPrice" placeholder="请输入基差" />
+            <el-input v-model="dataList.basisPrice" class="typeselect" placeholder="请输入基差" />
           </ws-form-item>
           <!--采购价格（元）-->
           <ws-form-item
@@ -114,6 +116,7 @@
               v-model="dataList.procurementPrice"
               maxlength="120"
               size="small"
+              class="typeselect"
               placeholder="请输入采购价格"
             />
           </ws-form-item>
@@ -123,6 +126,7 @@
               disabled
               v-model="dataList.receiveWarehouse"
               maxlength="120"
+              class="typeselect"
               size="small"
             />
             <el-option
@@ -139,6 +143,7 @@
               v-model="selectedOptions"
               clearable
               size="large"
+              class="typeselect"
               placeholder="请选择收货库所在地区"
               @change="handleChange"
               style="width: 200%"
@@ -186,6 +191,7 @@
             <el-input
               v-model="dataList.baggingNotes"
               size="small"
+              class="typeselect"
               placeholder="请输入装袋要求如：98斤，王中王彩袋"
             />
           </el-form-item>
@@ -194,8 +200,8 @@
             <el-input
               v-model="dataList.buyer"
               maxlength="120"
-              size="small"
               placeholder="请输入买方名称"
+              class="typeselect"
             />
           </ws-form-item>
           <!-- 买方电话 -->
@@ -205,18 +211,21 @@
               filterable
               :filter-method="dataFilter"
               placeholder="请输入买方电话"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <el-form-item label="发票费（个人）" span="1" prop="invoiceFeePerson" >
             <el-input
               v-model="dataList.invoiceFeePerson"
               placeholder="请输入发票费（个人）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <el-form-item label="发票费（企业）" span="1" prop="invoiceFeeCompany" >
             <el-input
               v-model="dataList.invoiceFeeCompany"
               placeholder="请输入发票费（企业）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <div class="small-title"></div>
@@ -264,6 +273,7 @@
             <el-input
               v-model="dataList.mildewGrain"
               placeholder="请输入霉变粒占比"
+              class="typeselect"
             />
           </el-form-item>
           <!--不完善粒（%）<=-->
@@ -272,6 +282,7 @@
               v-model="dataList.imperfectGrain"
               maxlength="120"
               placeholder="请输入不完善粒占比"
+              class="typeselect"
             />
           </el-form-item>
           <!-- 蛋白（%）<= -->
@@ -320,7 +331,7 @@
               :options="options1_"
               v-model="selectedOptions1"
               clearable
-              size="large"
+              class="typeselect"
               placeholder="请选择产地"
               @change="handleChange1"
               style="width: 200%"
@@ -333,6 +344,7 @@
               type="year"
               align="right"
               unlink-panels
+              class="typeselect"
               value-format='yyyy'
               range-separator="至"
               placeholder="产出年份"
@@ -1107,7 +1119,7 @@ export default {
   text-align: left;
 }
 /deep/.el-input--small {
-  font-size: 13px;
+  font-size: 14px;
   position: relative;
   display: inline-block;
 }

src/views/purchasingManagement/purchaseOrderList.vue

@@ -730,18 +730,20 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="合同编号" :label-width="formLabelWidth">
-          <ws-select
+          <el-select
             v-model="aduitlist.contractNo"
             placeholder="请选择合同编号"
             class="deal"
+            filterable
+            :filter-method="dataFilter"
           >
-            <ws-option
-              v-for="item in contractNolist"
+            <el-option
+              v-for="item in options"
               :key="item.constKey"
               :label="item.contractNo"
               :value="item.contractNo"
             />
-          </ws-select>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -959,6 +961,7 @@ export default {
       year: '',
       pickerOptions: {},
       value2: '',
+      options:[],
       deptBudgetTotal: 0,
       currentPage: 1,
       tranTypeKey: 1,
@@ -992,7 +995,7 @@ export default {
       deptBudgetList: {},
       pcFlag: 1,
       invoiceList: [],
-      contractNolist: [],
+      contractNoList: [],
       pricechange: [],
       aduitlist: {
         unloadingCharge: 0,
@@ -1062,6 +1065,24 @@ export default {
       this.customerlist.compName = ''
       this.customerlist.payTaxesCard = ''
     },
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.aduitlist.contractNo = val
+      if (val) {
+        //val存在
+        this.options = this.contractNoList.filter(item => {
+          if (
+            !!~item.contractNo.indexOf(val) ||
+            !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options =this.contractNoList
+      }
+    },
     //修改基差
     varietyClick(row) {
       if (row.basis) {
@@ -1738,7 +1759,8 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          this.contractNolist = response
+          this.contractNoList = response
+          this.options=response
         })
     },
     handleRemove(file) {

src/views/salesManagement/salesPlanAdd.vue

@@ -37,6 +37,7 @@
             <el-input
               v-model="dataList.title"
               maxlength="16"
+              class="typeselect"
               placeholder="标题须包含企业简称，不超过16个字"
             />
             <span class="unchangeable">*</span>
@@ -44,6 +45,7 @@
           <!-- 货名 -->
           <ws-form-item label="货名" span="1" prop="goodsName" >
             <ws-select
+               style="font-size: 14px"
               v-model="dataList.goodsName"
               placeholder
               class="typeselect"
@@ -76,6 +78,7 @@
             <el-input
               v-model="dataList.minimumVolume"
               placeholder="请输入最小成交量"
+              class="typeselect"
             />
             <span class="unchangeable">*</span>
           </el-form-item>
@@ -98,7 +101,7 @@
           </ws-form-item>
           <!-- 价格类型 -->
           <ws-form-item label="价格类型" span="1" prop="priceType">
-            <el-input v-model="dataList.priceType" disabled />
+            <el-input v-model="dataList.priceType" class="typeselect" disabled />
           </ws-form-item>
            <ws-form-item
             v-show="dataList.salePlanType=='期货'"
@@ -106,7 +109,7 @@
             span="1"
             prop="basisPrice"
           >
-            <el-input v-model="dataList.basisPrice" placeholder="请输入基差" />
+            <el-input v-model="dataList.basisPrice" class="typeselect" placeholder="请输入基差" />
             <span class="unchangeable">*</span>
           </ws-form-item>
           <ws-form-item
@@ -119,6 +122,7 @@
               v-model="dataList.salePrice"
               maxlength="120"
               size="small"
+              class="typeselect"
               placeholder="请输入销售价格"
             />
             <span class="unchangeable">*</span>
@@ -145,7 +149,7 @@
               :options="options_"
               v-model="selectedOptions"
               clearable
-              size="large"
+              class="typeselect"
               placeholder="请选择出货库所在地区"
               @change="handleChange"
               style="width: 200%"
@@ -193,6 +197,7 @@
               maxlength="30"
               v-model="dataList.baggingNotes"
               size="small"
+              class="typeselect"
               placeholder="请输入装袋要求如：98斤，王中王彩袋"
             />
           </el-form-item>
@@ -201,6 +206,7 @@
               maxlength="25"
               v-model="dataList.seller"
               size="small"
+              class="typeselect"
               placeholder="请输入卖方名称"
             />
             <span class="unchangeable">*</span>
@@ -209,23 +215,26 @@
             <el-input
               v-model="dataList.sellerPhone"
               filterable
+              class="typeselect"
               :filter-method="dataFilter"
               placeholder="请输入卖方电话"
             ></el-input>
             <span class="unchangeable">*</span>
-            <el-form-item label="发票费（个人）" span="1" prop="invoiceFeePerson" >
+          </el-form-item>
+             <el-form-item label="发票费（个人）" span="1" prop="invoiceFeePerson" >
             <el-input
               v-model="dataList.invoiceFeePerson"
               placeholder="请输入发票费（个人）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <el-form-item label="发票费（企业）" span="1" prop="invoiceFeeCompany" >
             <el-input
               v-model="dataList.invoiceFeeCompany"
               placeholder="请输入发票费（企业）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
-          </el-form-item>
           <div class="small-title"></div>
         </el-form>
       </div>
@@ -268,6 +277,7 @@
             <el-input
               v-model="dataList.mildewGrain"
               placeholder="请输入霉变粒占比"
+              class="typeselect"
             />
           </el-form-item>
           <el-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
@@ -275,6 +285,7 @@
               v-model="dataList.imperfectGrain"
               maxlength="120"
               placeholder="请输入不完善粒占比"
+              class="typeselect"
             />
           </el-form-item>
           <el-form-item label="蛋白（%）>=" span="1" prop="protein">
@@ -323,6 +334,7 @@
               placeholder="请选择产地"
               @change="handleChange1"
               style="width: 200%"
+              class="typeselect"
             />
           </ws-form-item>
           <el-form-item label="产出年份" span="1" prop="outputYear">
@@ -334,6 +346,7 @@
               value-format='yyyy'
               range-separator="至"
               placeholder="产出年份"
+              class="typeselect"
             ></el-date-picker>
           </el-form-item>
         </el-form>
@@ -1176,7 +1189,7 @@ export default {
   text-align: left;
 }
 /deep/.el-input--small {
-  font-size: 13px;
+  font-size: 14px;
   position: relative;
   display: inline-block;
 }
@@ -1274,7 +1287,7 @@ export default {
   align-items: center;
   text-align: left;
   overflow: hidden;
-  font-size: 12px;
+  font-size: 14px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #232323;

src/views/salesManagement/salesPlanEdit.vue

@@ -26,7 +26,7 @@
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 标题 -->
           <ws-form-item label="标题" span="1" prop="title">
-            <el-input v-model="dataList.title" maxlength="16" placeholder="标题须包含企业简称，不超过16个字" />
+            <el-input v-model="dataList.title" maxlength="16" class="typeselect" placeholder="标题须包含企业简称，不超过16个字" />
           </ws-form-item>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1" prop="goodsName">
@@ -55,7 +55,7 @@
           </ws-form-item>
           <!-- 最小成交量 -->
           <ws-form-item label="最小成交量（吨）" span="1" prop="minimumVolume">
-            <el-input v-model="dataList.minimumVolume" placeholder="请输入最小成交量" />
+            <el-input v-model="dataList.minimumVolume" class="typeselect" placeholder="请输入最小成交量" />
           </ws-form-item>
           <!--类型-->
           <ws-form-item label="类型" span="1" prop="salePlanType">
@@ -76,7 +76,7 @@
           </ws-form-item>
           <!-- 价格类型 -->
           <ws-form-item label="价格类型" span="1" prop="priceType">
-            <el-input v-model="dataList.priceType" disabled />
+            <el-input v-model="dataList.priceType" class="typeselect" disabled />
           </ws-form-item>
           <!-- 基差 -->
           <ws-form-item
@@ -85,7 +85,7 @@
             span="1"
             prop="basisPrice"
           >
-            <el-input v-model="dataList.basisPrice" placeholder="请输入基差" />
+            <el-input v-model="dataList.basisPrice" class="typeselect" placeholder="请输入基差" />
           </ws-form-item>
           <!--销售价格（元）-->
           <ws-form-item
@@ -98,6 +98,7 @@
               v-model="dataList.salePrice"
               maxlength="120"
               size="small"
+              class="typeselect"
               placeholder="请输入销售价格"
             />
           </ws-form-item>
@@ -108,7 +109,7 @@
               v-model="dataList.sendWarehouse"
               maxlength="120"
               size="small"
-              
+              class="typeselect"
             />
             <el-option
               v-for="item in warehouseList1"
@@ -124,6 +125,7 @@
               v-model="selectedOptions"
               clearable
               size="large"
+              class="typeselect"
               placeholder="请选择出货库所在地区"
               @change="handleChange"
               style="width:200%"
@@ -166,12 +168,13 @@
             <el-input
               v-model="dataList.baggingNotes"
               size="small"
+              class="typeselect"
               placeholder="请输入装袋要求如：98斤，王中王彩袋"
             />
           </el-form-item>
           <!-- 卖方 -->
           <ws-form-item label="卖方" span="1" prop="seller">
-            <el-input v-model="dataList.seller" maxlength="120" size="small" placeholder="请输入卖方名称" />
+            <el-input v-model="dataList.seller" maxlength="120" size="small" class="typeselect" placeholder="请输入卖方名称" />
           </ws-form-item>
           <!-- 卖方电话 -->
           <el-form-item label="卖方电话" span="1" prop="sellerPhone">
@@ -179,6 +182,7 @@
               v-model="dataList.sellerPhone"
               filterable
               :filter-method="dataFilter"
+              class="typeselect"
               placeholder="请输入卖方电话"
             ></el-input>
           </el-form-item>
@@ -186,12 +190,14 @@
             <el-input
               v-model="dataList.invoiceFeePerson"
               placeholder="请输入发票费（个人）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <el-form-item label="发票费（企业）" span="1" prop="invoiceFeeCompany" >
             <el-input
               v-model="dataList.invoiceFeeCompany"
               placeholder="请输入发票费（企业）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <div class="small-title"></div>
@@ -220,11 +226,11 @@
           </el-form-item>
           <!-- 霉变粒 -->
           <el-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
-            <el-input v-model="dataList.mildewGrain" placeholder="请输入霉变粒占比" />
+            <el-input v-model="dataList.mildewGrain" class="typeselect" placeholder="请输入霉变粒占比" />
           </el-form-item>
           <!--不完善粒（%）<=-->
           <el-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
-            <el-input v-model="dataList.imperfectGrain" maxlength="120" placeholder="请输入不完善粒占比" />
+            <el-input v-model="dataList.imperfectGrain" class="typeselect" maxlength="120" placeholder="请输入不完善粒占比" />
           </el-form-item>
           <!-- 蛋白（%）<= -->
           <el-form-item label="蛋白（%）>=" span="1" prop="protein">
@@ -269,6 +275,7 @@
               v-model="selectedOptions1"
               clearable
               size="large"
+              class="typeselect"
               placeholder="请选择产地"
               @change="handleChange1"
               style="width:200%"
@@ -285,6 +292,7 @@
               value-format='yyyy'
               range-separator="至"
               placeholder="产出年份"
+              class="typeselect"
             ></el-date-picker>
           </el-form-item>
         </el-form>
@@ -1079,7 +1087,7 @@ export default {
   text-align: left;
 }
 /deep/.el-input--small {
-  font-size: 13px;
+  font-size: 14px;
   position: relative;
   display: inline-block;
 }

src/views/salesManagement/salesPlanOrderList.vue

@@ -751,18 +751,20 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="合同编号" :label-width="formLabelWidth">
-          <ws-select
+          <el-select
             v-model="aduitlist.contractNo"
             placeholder="请选择合同编号"
             class="deal"
+            filterable
+            :filter-method="dataFilter"
           >
-            <ws-option
-              v-for="item in contractNolist"
+            <el-option
+              v-for="item in options"
               :key="item.constKey"
               :label="item.contractNo"
               :value="item.contractNo"
             />
-          </ws-select>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -1036,7 +1038,8 @@ export default {
       transactionRecordList: {},
       pcFlag: 1,
       invoiceList: [],
-      contractNolist: [],
+      contractNoList: [],
+      options:[],
       pricechange: [],
       searchTypeList: [
         { value: '待审核', type: 1 },
@@ -1124,6 +1127,24 @@ export default {
       })
       }
     },
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.aduitlist.contractNo = val
+      if (val) {
+        //val存在
+        this.options = this.contractNoList.filter(item => {
+          if (
+            !!~item.contractNo.indexOf(val) ||
+            !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options =this.contractNoList
+      }
+    },
     //完成
     handle(item) {
       this.$confirm(`状态修改为已完成后不可再进行交易操作，是否确定修改？`, {
@@ -1690,6 +1711,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.contractNolist = response
+          this.options=response
         })
     },
     Changepricerecord(item) {

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -470,6 +470,7 @@ export default {
       this.getList()
     },
     handlepayment() {
+      this.allmoney=0
       if (this.modification.length == 0) {
         this.$message.warning('请选择一条要付款的条目')
       } else {
@@ -487,6 +488,7 @@ export default {
       }
     },
     handlecollect() {
+      this.allmoney1=0
       if (this.modification.length == 0) {
         this.$message.warning('请选择一条要收款的条目')
       } else {
@@ -496,6 +498,7 @@ export default {
             this.modification[i].status != '部分收款'
           ) {
             this.$message.warning('只有已通过或部分收款的条目才可进行收款操作')
+            return
           }
           this.allmoney1 += this.modification[i].collectionNotPayable
         }
@@ -632,6 +635,9 @@ export default {
         })
           .toPromise()
           .then((response) => {
+            this.money=''
+            this.paymentDate=''
+            this.paymentScreenshot=''
             this.$message.success('付款成功')
             this.dialogFormVisible1 = false
             this.getList()
@@ -654,6 +660,9 @@ export default {
           .toPromise()
           .then((response) => {
             this.$message.success('收款成功')
+            this.collectmoney=''
+            this.collectionDate=''
+            this.collectionScreenshot=''
             this.dialogFormVisible2 = false
             this.getList()
           })

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -260,6 +260,7 @@
         <el-table-column
           width="100"
           class="table_td"
+          v-hasPermission="`report.procurementInReport.draw`"
           prop="alreadyInvoice"
           label="已开发票(元)"
         >
@@ -727,6 +728,7 @@ export default {
             this.modification[i].status != '部分付款'
           ) {
             this.$message.warning('只有已通过或部分付款的条目才可进行付款操作')
+            return
           }
           this.amountNotPayable += this.modification[i].amountNotPayable
         }

src/views/statisticalReport/salesClosingCashierList.vue

@@ -636,6 +636,7 @@ export default {
             this.multipleSelection[i].status != '部分付款'
           ) {
             this.$message.warning('只有已通过或部分付款的条目才可进行付款操作')
+            return
           }
         }
         this.dialogFormVisible1 = true
@@ -659,6 +660,7 @@ export default {
             this.multipleSelection[i].status != '部分收款'
           ) {
             this.$message.warning('只有已通过或部分收款的条目才可进行收款操作')
+            return
           }
         }
         this.dialogFormVisible2 = true

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -759,6 +759,7 @@ export default {
             this.modification[i].status != '部分收款'
           ) {
             this.$message.warning('只有已通过或部分收款的条目才可进行收款操作')
+            return
           }
           this.collectionNotPayable += this.modification[i].collectionNotPayable
         }
@@ -829,6 +830,7 @@ export default {
               this.salesDeliveryReportList = {}
               this.money = ''
               this.collectionDate = ''
+              this.collectionScreenshot=''
               this.dialogFormVisible1 = false
               this.getList()
             })