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

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -300,6 +300,7 @@
       this.switchType = this.$route.query.types
       if (this.$route.query.types == null) {
         this.switchType = 1
+        this.trader = '新增'
         this.imageUrl1 = ''
         this.imageUrl2 = ''
         this.imageUrl3 = ''
@@ -401,6 +402,8 @@
       cancel() {
         this.customerList = {}
         this.verifyCode = ''
+        this.disabled = false
+        this.trader = ''
         this.$router.push({
           path: 'customerManagement'
         })

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -562,6 +562,7 @@ export default {
       for (var i = 0; i < this.contractNoList.length; i++) {
         if (this.contractNoList[i].contractNo == val) {
             this.deptBudgetList.goodsName = this.contractNoList[i].goodsName
+            this.deptBudgetList.weight= this.contractNoList[i].weight
         }
       }
     },

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -502,6 +502,7 @@ export default {
       for (var i = 0; i < this.contractNoList.length; i++) {
         if (this.contractNoList[i].contractNo == val) {
             this.deptBudgetList.goodsName = this.contractNoList[i].goodsName
+            this.deptBudgetList.weight= this.contractNoList[i].weight
         }
       }
     },

src/views/tradeServicesManagement/approveWarehouseReceipt.vue

@@ -317,8 +317,8 @@
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="审核结果">
           <template scope="scope">
-            <span v-if="scope.row.approved" class="examine1">通过</span>
-            <span v-if="!scope.row.approved" class="examine2">驳回</span>
+            <span v-if="scope.row.approved" >通过</span>
+            <span v-if="!scope.row.approved" >驳回</span>
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
@@ -793,10 +793,4 @@ export default {
     margin-left: 10px;
 	}
 }
-.examine1{
-    color: #50CAD4;
-  }
-   .examine2{
-    color: #FF9F24;
-  }
 </style>

src/views/tradeServicesManagement/reviewWarehouseReceipt.vue

@@ -260,8 +260,8 @@
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="审核结果">
           <template scope="scope">
-            <span v-if="scope.row.approved" class="examine1">通过</span>
-            <span v-if="!scope.row.approved" class="examine2">驳回</span>
+            <span v-if="scope.row.approved" >通过</span>
+            <span v-if="!scope.row.approved" >驳回</span>
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
@@ -559,10 +559,4 @@ export default {
   font-weight: 600;
   margin: 20px 0;
 }
-.examine1{
-    color: #50CAD4;
-  }
-   .examine2{
-    color: #FF9F24;
-  }
 </style>

src/views/tradeServicesManagement/warehouseReceiptEdit.vue

@@ -187,8 +187,8 @@
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="审核结果">
           <template scope="scope">
-            <span v-if="scope.row.approved" class="examine1">通过</span>
-            <span v-if="!scope.row.approved" class="examine2">驳回</span>
+            <span v-if="scope.row.approved" >通过</span>
+            <span v-if="!scope.row.approved" >驳回</span>
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
@@ -528,11 +528,4 @@ export default {
     font-weight: 600;
     margin: 20px 0;
   }
-  .examine1{
-    color: #50CAD4;
-  }
-   .examine2{
-    color: #FF9F24;
-  }
-
 </style>

src/views/tradeServicesManagement/warehouseReceiptLook.vue

@@ -259,8 +259,8 @@
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="审核结果">
           <template scope="scope">
-            <span v-if="scope.row.approved" class="examine1">通过</span>
-            <span v-if="!scope.row.approved" class="examine2">驳回</span>
+            <span v-if="scope.row.approved" >通过</span>
+            <span v-if="!scope.row.approved" >驳回</span>
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
@@ -500,12 +500,6 @@ export default {
     font-weight: 600;
     margin: 20px 0;
   }
-  .examine1{
-    color: #50CAD4;
-  }
-   .examine2{
-    color: #FF9F24;
-  }
   //轮播图
   .el-carousel__item h3 {
     color: #475669;