前端改bug

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -950,6 +950,7 @@
         this.pListTotal = this.pListTop.concat(this.pListBottom)
         if (this.information == '毛重') {
           this.index = 0
+          console.log(this.mList)
           this.carList = this.mList
           this.carList1 = this.mListTotal
           if (this.mList.length != 0) {
@@ -963,6 +964,7 @@
           }
         } else {
           this.index = 1
+          console.log(this.pList)
           this.carList = this.pList
           this.carList1 = this.pListTotal
           if (this.pList.length != 0) {

src/views/profitable/cashoutaduit.vue

@@ -51,13 +51,14 @@
             </el-input>
           </el-form-item>
           <el-form-item label-width='100px' label="附件">
-          <div>
+          <div v-if='srcList.length>0'>
             <span v-for='item in srcList'><el-image
               style="width: 100px; height: 100px;border:1px solid #000;display:inline-block;margin:10px;"
               :src="item"
                :preview-src-list="srcList"></el-image></span>
              
           </div>
+          <div v-else>暂无附件</div>
         </el-form-item>
         </el-form>
         <!-- <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
@@ -278,9 +279,14 @@
           this.deptBudgetList=response
           this.deptBudgetList.taskId=this.$route.query.taskId 
           if(response.addressUrl){
-            var arr=[]
-            var srcs=response.addressUrl.split(',')
-            this.srcList=srcs
+            this.srcList=[]
+            // var srcs=response.addressUrl.split(',')
+          var arr=response.addressUrl.split(',')
+          for (let i = 0; i < arr.length; i++) {
+            if(arr[i]!=''){
+              this.srcList.push()
+            }
+          }
           }
         })
 

src/views/profitable/expensemanagementdetails.vue

@@ -149,12 +149,12 @@
       <div  style='padding:20px;' v-for="(item,index) in recordList" :style="{'border-bottom':(index!=recordList.length-1?'1px solid #ccc':'none')}"
 >
         <div style='width:100%;justify-content: space-between;' class='flex'>
-          <div style='width:33.333%;text-align:center;'>{{item.operateUser}}</div>
-          <div style='width:33.333%;text-align:center;'>{{item.dealMsg}}</div>
-          <div style='width:33.333%;text-align:center;'>{{item.operateDate}}</div>
+          <div style='width:33.333%;text-align:left;'>{{item.operateUser}}</div>
+          <div style='width:33.333%;text-align:center;'>{{item.dealMsg!='请款'?item.approveResult==1?'通过':'驳回':item.dealMsg}}</div>
+          <div style='width:33.333%;text-align:right;'>{{item.operateDate}}</div>
         </div>
-        <div v-if='index<recordList.length-1' style='width:100%;text-align:center;'>{{item.verifyRemark}}</div>
-        <div v-else style='width:100%;text-align:center;'>{{item.verifyRemark}}</div>
+        <div v-if='index<recordList.length-1' style='width:100%;text-align:left;'>审核意见：{{item.verifyRemark}}</div>
+        <div v-else style='width:100%;text-align:left;'>审核意见：{{item.verifyRemark}}</div>
       </div>
     </el-dialog>
     <WinseaContentModal v-model="fujianshow" :title="title"

src/views/profitable/expensemanagentlook.vue

@@ -45,13 +45,14 @@
             </el-input>
           </el-form-item>
           <el-form-item label-width='100px' label="附件">
-          <div>
+          <div v-if='srcList.length>0'>
             <span v-for='item in srcList'><el-image
               style="width: 100px; height: 100px;border:1px solid #000;display:inline-block;margin:10px;"
               :src="item"
                :preview-src-list="srcList"></el-image></span>
              
           </div>
+          <div v-else>暂无附件</div>
         </el-form-item>
         </el-form>
         <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
@@ -144,7 +145,13 @@
         .toPromise()
         .then((response) => {
           this.deptBudgetList=response
-          this.srcList=response.addressUrl.split(',')
+          this.srcList=[]
+          var arr=response.addressUrl.split(',')
+          for (let i = 0; i < arr.length; i++) {
+            if(arr[i]!=''){
+              this.srcList.push()
+            }
+          }
         })
 
       },

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -178,8 +178,8 @@
         currentPage: 1,
         primary: '1',
         pageSize: 10,
-        searchType: 1,
-        searchTypeText: '待审核',
+        searchType: '',
+        searchTypeText: '全部任务',
         searchKeyWord: '',
         inOutType:'',
         inOutTypeList:[

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -200,7 +200,7 @@
 					</el-form-item>
 					<!--重量（吨）-->
 					<el-form-item label="重量（吨）">
-						<el-input disabled  @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）"
+						<el-input  @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
 					<!-- 品级 -->

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -172,14 +172,12 @@
           <el-form-item
             label="重量（吨）"
             span="1"
-            style="margin-left: 650px; margin-top: -40px"
           >
             <el-input
               v-model="dataList.weight"
               placeholder="请输入重量（吨）"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!-- 品级 -->
@@ -211,7 +209,6 @@
               placeholder="请输入容重"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--水分（%）<=-->
@@ -219,7 +216,6 @@
             v-if="dataList.taskTypeKey != 3 || dataList1.taskTypeKey != 3"
             label="水分（%）<="
             span="1"
-            style="margin-left: 350px; margin-top: -40px"
           >
             <el-input
               @input="waterContentchange"
@@ -227,7 +223,6 @@
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--单价(元/吨)-->
@@ -235,7 +230,6 @@
             v-if="dataList.taskTypeKey != 3 || dataList1.taskTypeKey != 3"
             label="单价(元/吨)"
             span="1"
-            style="margin-left: 650px; margin-top: -40px"
             v-show="Pricetype"
           >
             <el-input
@@ -244,7 +238,6 @@
               placeholder="请输入单价"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--预计出库日期-->
@@ -421,7 +414,6 @@
           <el-form-item
             label="重量（吨）"
             span="1"
-            style="margin-left: 650px; margin-top: -40px"
           >
             <el-input
               @input="weightchange"
@@ -429,7 +421,6 @@
               placeholder="请输入重量（吨）"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!-- 品级 -->
@@ -463,7 +454,6 @@
               placeholder="请输入容重"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--水分（%）<=-->
@@ -471,7 +461,6 @@
             v-if="dataList.taskTypeKey != 3 || dataList1.taskTypeKey != 3"
             label="水分（%）<="
             span="1"
-            style="margin-left: 350px; margin-top: -40px"
           >
             <el-input
               @input="waterContentchange"
@@ -480,7 +469,6 @@
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--单价(元/吨)-->
@@ -488,7 +476,6 @@
             v-if="dataList.taskTypeKey != 3 || dataList1.taskTypeKey != 3"
             label="单价(元/吨)"
             span="1"
-            style="margin-left: 650px; margin-top: -40px"
             v-show="Pricetype"
           >
             <el-input
@@ -498,7 +485,6 @@
               placeholder="请输入单价"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--预计出库日期-->
@@ -642,14 +628,12 @@
           <el-form-item
             label="重量（吨）"
             span="1"
-            style="margin-left: 650px; margin-top: -40px"
           >
             <el-input
               v-model="dataList.weight"
               placeholder="请输入重量（吨）"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!-- 品级 -->
@@ -682,7 +666,6 @@
               placeholder="请输入容重"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--水分（%）<=-->
@@ -690,7 +673,6 @@
             v-if="dataList.taskTypeKey != 3 || dataList1.taskTypeKey != 3"
             label="水分（%）<="
             span="1"
-            style="margin-left: 350px; margin-top: -40px"
           >
             <el-input
               :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
@@ -698,7 +680,6 @@
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--单价(元/吨)-->
@@ -706,7 +687,6 @@
             v-if="dataList.taskTypeKey != 3 || dataList1.taskTypeKey != 3"
             label="单价(元/吨)"
             span="1"
-            style="margin-left: 650px; margin-top: -40px"
             v-show="Pricetype"
           >
             <el-input
@@ -715,7 +695,6 @@
               placeholder="请输入单价"
               maxlength="120"
               size="small"
-              class="huom"
             />
           </el-form-item>
           <!--预计出库日期-->

src/views/warehousenew/warehousingOrder.vue

@@ -606,6 +606,13 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             });
             return
         }
+        if(currectData.length==0){
+          this.$message({
+              message: '请选择一条数据！',
+              type: 'warning'
+            });
+            return
+        }
         // console.log(currectData)
         var arr1=currectData
         for (let i = 0; i < arr1.length; i++) {
@@ -631,6 +638,8 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             _this.form.distributionEd=response.distributionMoney
             _this.form.distributionCan=response.accumulatedPrepayment-response.recoveryPrepayments-response.distributionMoney
             _this.form.distributionNot=arr1[i].amountNotPayable
+            this.currectdata=currectData
+            this.marginshow=true
           }).catch(() => {
            this.$message({
               message: '无可分配金额',
@@ -639,8 +648,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             return
           })
         }
-        this.currectdata=currectData
-        this.marginshow=true
+        
       },
       distribution(){
         let _this= this
@@ -663,6 +671,14 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             });
             return
         }
+        
+        if(currectData.length==0){
+          this.$message({
+              message: '请选择一条数据！',
+              type: 'warning'
+            });
+            return
+        }
         // console.log(currectData)
         var arr1=currectData
         for (let i = 0; i < arr1.length; i++) {