Merge branch 'develop'

src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -599,13 +599,17 @@ export default {
         return
       }
 
-      for (let i = 0; i < this.details.items.length; i++) {
+      if (this.isCustomer) {
+        for (let i = 0; i < this.details.items.length; i++) {
             this.details.items[i].contractAmount = this.details.items[i].contractQty * this.details.items[i].contractPrice
               if (!this.details.items[i].contractAmount) {
                 return this.$errorMsg('合同单价、合同数量不能为空')
               }
 
           }
+      }
+
+
 
       this.fileList.forEach((el) => {
 

src/views/deposit_home/components/refund_list-detail.vue

@@ -1119,13 +1119,17 @@ export default {
             return;
           }
 
-          for (let i = 0; i < this.detailList.items.length; i++) {
+          if (this.isCustomer) {
+            for (let i = 0; i < this.detailList.items.length; i++) {
             this.detailList.items[i].contractAmount = this.detailList.items[i].contractQty * this.detailList.items[i].contractPrice
               if (!this.detailList.items[i].contractAmount) {
                 return this.$errorMsg('合同单价、合同数量不能为空')
               }
 
           }
+          }
+
+
 
       //     this.detailList.items.map(e=>{
       //     e.contractAmount = e.contractQty * e.contractPrice
@@ -1195,13 +1199,18 @@ export default {
             this.$message.error("请选择安装时间");
             return;
           }
-          for (let i = 0; i < this.detailList.items.length; i++) {
+
+          if (this.isCustomer) {
+            for (let i = 0; i < this.detailList.items.length; i++) {
             this.detailList.items[i].contractAmount = this.detailList.items[i].contractQty * this.detailList.items[i].contractPrice
               if (!this.detailList.items[i].contractAmount) {
                 return this.$errorMsg('合同单价、合同数量不能为空')
               }
 
           }
+          }
+
+
           let data = {
             ...this.detailList,
             checkBy: this.checkBy,

src/views/finance/receivable_list.vue

@@ -114,6 +114,8 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="项目费用名称" prop="projectName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="审核人" prop="examineBy" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="审核时间" prop="examineTime" min-width="160" show-overflow-tooltip></el-table-column>
 
             <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip fixed="right">
               <template slot-scope="scope">

src/views/supply/pickup/check.vue

@@ -203,7 +203,25 @@
           </el-row>
         </el-form>
       </div>
+      <div>
+        <el-form :model="screenForm" ref="form"  label-width="120px"  size="mini">
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="8" :lg="8">
 
+          <el-form-item label="申请发货单号">
+            <el-input v-model="screenForm.invoiceId" clearable></el-input>
+          </el-form-item>
+          </el-col>
+            <el-col :xs="24" :sm="8" :lg="8">
+              <el-button size="mini" type="primary" @click="getList"
+                >查 询</el-button
+              >
+            </el-col>
+          </el-row>
+
+        </el-form>
+
+      </div>
       <div class="main-title">
         <div class="title">提货单</div>
         <div class="fr">
@@ -455,19 +473,19 @@
           </el-table>
         </div>
       </div>
-      <!-- <div class="pagination clearfix">
+      <div class="pagination clearfix">
         <div class="fr">
           <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
             :current-page="currentPage"
-            :page-sizes="[10, 20, 30, 50]"
+            :page-sizes="[200, 300, 500]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
             :total="listTotal">
           </el-pagination>
         </div>
-      </div> -->
+      </div>
 
       <div class="page-footer">
         <div class="footer">
@@ -579,7 +597,8 @@ export default {
         warehouse: "",
         customerId: "",
         logisticsId:"",
-        storeId:""
+        storeId:"",
+        invoiceId:''
       },
       statusList: [
         { label: "未打单", value: 0 },
@@ -643,6 +662,7 @@ export default {
       this.screenForm.customerId = ''
       this.screenForm.logisticsId =''
       this.screenForm.warehouse = ''
+      this.screenForm.invoiceId = ''
       this.screenForm.status = '0'
       this.dataList = [];
         this.listTotal = 0;
@@ -776,15 +796,16 @@ export default {
       this.listLoading = true;
 
       let params = {
-        pageNum: 1,
-        pageSize: -1,
+        pageNum: this.currentPage,
+        pageSize: 200,
         // takerId: this.screenForm.manId,
         status: this.screenForm.status,
         takerPhone: this.screenForm.phone,
         // customerName:this.screenForm.customerName,
         correspondId: this.screenForm.warehouse,
         customerId: this.screenForm.customerId,
-        logisticsId:this.screenForm.logisticsId
+        logisticsId:this.screenForm.logisticsId,
+        invoiceId:this.screenForm.invoiceId
       };
       getPickupList(params).then((res) => {
         this.dataList = res.data.records;