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

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -241,6 +241,9 @@
       // 货名
       let _goodsNameList = []
       _goodsNameList = this.$route.query.goodsNameList
+      if(_goodsNameList==undefined){
+        _goodsNameList=[]
+      }
       packList({
           constId: 'CON2'
         })
@@ -259,8 +262,13 @@
               }
             }
           }
-          this.goodnameList = _list
-          this.selectVal = _list[0].constValue
+          if(_goodsNameList.length==0){
+            this.goodnameList = response
+            this.selectVal = response[0].constValue
+          }else{
+            this.goodnameList = _list
+            this.selectVal = _list[0].constValue
+          }
         })
       switch (this.$route.query.type) {
         case "新增":

src/views/houseSelfCollect/weighingManagement.vue

@@ -74,7 +74,21 @@
       <el-table-column
         prop="suqualityTestingDate"
         label="称重时间"
-      ></el-table-column>
+      >
+        <template slot-scope="scope">
+          <sapn
+            v-if="
+              scope.row.status == '已称毛重'
+            "
+            > {{scope.row.grossDate}}</sapn
+          >
+         <sapn
+            v-if="
+              scope.row.status == '已称皮重'
+            "
+            > {{scope.row.tareDate}}</sapn
+          >
+        </template></el-table-column>
       <el-table-column prop="status" label="状态"></el-table-column>
       <el-table-column width="300" prop="contractNo1" label="操作">
         <template slot-scope="scope">