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

src/views/contractManagement/collectionContractRecord.vue

@@ -171,7 +171,7 @@
             <div class="upLoad">
               <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
                 :on-success="handleAvatarSuccess">
-                
+
                 <div v-if='imageUrl.length>0'>
                   <div style='display:inline-block;' v-for='item in imageUrl'>
                     <img :src="item" class="avatar" />
@@ -205,7 +205,7 @@
               <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <!-- <img v-if="imageUrl" :src="imageUrl" class="avatar" />
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i> -->   
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i> -->
                 <div v-if='imageUrl.length>0'>
                   <div style='display:inline-block;' v-for='item in imageUrl'>
                     <img :src="item" class="avatar" />
@@ -222,42 +222,6 @@
         </ws-form>
       </div>
     </el-dialog>
-    <!-- 付款截图 -->
-    <!--    <el-dialog width="50%" :visible.sync="showPayImgs" :append-to-body="true" title="付款截图">
-      <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
-        :on-success="handleAvatarSuccess1" :file-list='payImg' :limit='1'>
-        <i slot="default" class="el-icon-plus"></i>
-        <div slot="file" slot-scope="{file}">
-          <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-
-          <span class="el-upload-list__item-actions">
-            <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-              <i class="el-icon-zoom-in"></i>
-            </span>
-            <span v-if="!disabled" class="el-upload-list__item-delete" @click="_handleRemove(file)">
-              <i class="el-icon-delete"></i>
-            </span>
-          </span>
-        </div>
-      </el-upload>
-      <div style="text-align: center; margin: 10px auto">
-        <el-button @click="showPayImgs = false" type="primary">关闭</el-button>
-      </div>
-    </el-dialog> -->
-    <!--    <div style="text-align: center">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal"></el-pagination>
-      <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint"
-        :title="printData.compName + '结算凭证'">
-        <paymentPrint :printData="printData" :customerInfo="customerList" :showType="ruleForm.type"></paymentPrint>
-        <div style="text-align: center">
-          <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
-          <el-button type="primary" @click="printSmall">打印小票</el-button>
-          <el-button type="primary" @click="printBig">打印单据</el-button>
-        </div>
-      </el-dialog>
-    </div> -->
     <el-dialog :visible.sync="dialogVisible">
       <img width="100%" :src="dialogImageUrl" alt="">
     </el-dialog>
@@ -1268,9 +1232,10 @@
         if (this.modification.length == 0) {
           this.$message.warning('请选择要驳回的条目')
         } else {
+
           for (let i = 0; i < this.modification.length; i++) {
             if (!this.modification[i].taskId) {
-              this.$message.warning('序号第' + (i + 1) + '条数据无需审核，请重新勾选审核数据！')
+              this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
               return
             }
           }
@@ -1326,7 +1291,7 @@
         } else {
           for (let i = 0; i < this.modification.length; i++) {
             if (!this.modification[i].taskId) {
-              this.$message.warning('序号第' + (i + 1) + '条数据无需审核，请重新勾选审核数据！')
+              this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
               return
             }
             if (this.modification[i].num > this.modification[i].grainDelivery) {

src/views/houseSelfCollect/paymentManagement.vue

@@ -880,7 +880,7 @@
         } else {
 			for(let i =0;i<this.modification.length;i++){
 			  if(!this.modification[i].taskId){
-			     this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+			     this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 			     return
 			  }
 			}
@@ -1208,7 +1208,7 @@
         } else {
 			for(let i =0;i<this.modification.length;i++){
 			  if(!this.modification[i].taskId){
-				 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+				  this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 				 return
 			  }
 			}
@@ -1303,7 +1303,7 @@
         } else {
 			for(let i =0;i<this.modification.length;i++){
 			  if(!this.modification[i].taskId){
-			     this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+			     this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 			     return
 			  }
 			}

src/views/statisticalReport/autoSettlementList.vue

@@ -1197,7 +1197,7 @@ export default {
       } else {
 		  for(let i =0;i<this.modification.length;i++){
 		    if(!this.modification[i].taskId){
-		  	 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+		  	  this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 		  	 return
 		    }
 		  }
@@ -1239,7 +1239,7 @@ export default {
       } else {
 		  for(let i =0;i<this.modification.length;i++){
 		    if(!this.modification[i].taskId){
-		       this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+		        this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 		       return
 		    }
 		  }

src/views/statisticalReport/huoyunList.vue

@@ -1038,7 +1038,7 @@ export default {
       } else {
 		  for(let i =0;i<this.modification.length;i++){
 		    if(!this.modification[i].taskId){
-		  	 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+		  	  this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 		  	 return
 		    }
 		  }
@@ -1076,7 +1076,7 @@ export default {
       } else {
 		  for(let i =0;i<this.modification.length;i++){
 		    if(!this.modification[i].taskId){
-		       this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+		       this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 		       return
 		    }
 		  }

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -361,7 +361,7 @@
         } else {
 			for(let i =0;i<this.modification.length;i++){
 			  if(!this.modification[i].taskId){
-				 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+				  this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 				 return
 			  }
 			}
@@ -554,7 +554,7 @@
         } else {
 			for(let i =0;i<this.modification.length;i++){
 			  if(!this.modification[i].taskId){
-			     this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+			      this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 			     return
 			  }
 			}

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -679,7 +679,7 @@
         } else {
 			for(let i =0;i<this.modification.length;i++){
 			  if(!this.modification[i].taskId){
-				 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+				 this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 				 return
 			  }
 			}
@@ -717,7 +717,7 @@
         } else {
 			for(let i =0;i<this.modification.length;i++){
 			  if(!this.modification[i].taskId){
-			     this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+			      this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 			     return
 			  }
 			}

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -641,7 +641,7 @@ export default {
       } else {
 		  for(let i =0;i<this.modification.length;i++){
 		    if(!this.modification[i].taskId){
-		  	 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+		  	  this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 		  	 return
 		    }
 		  }
@@ -661,7 +661,7 @@ export default {
       } else {
 		  for(let i =0;i<this.modification.length;i++){
 		    if(!this.modification[i].taskId){
-		       this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+		        this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 		       return
 		    }
 		  }

src/views/statisticalReport/shippingList.vue

@@ -1038,7 +1038,7 @@ export default {
       } else {
 		  for(let i =0;i<this.warehouseList.records.length;i++){
 		    if(!this.warehouseList.records[i].taskId){
-		  	 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+		  	 this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 		  	 return
 		    }
 		  }

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -943,7 +943,7 @@ export default {
       } else {
 		  for(let i =0;i<this.modification.length;i++){
 		    if(!this.modification[i].taskId){
-		  	 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
+		  	  this.$message.warning('勾选数据中存在超出账号权限的审核条目，请重新勾选！')
 		  	 return
 		    }
 		  }