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

src/views/houseSelfCollect/weightCheck.vue

@@ -429,7 +429,9 @@
       },
       async closePort() {
         console.log('closePort');
-        this.reader.cancel()
+        if(this.reader){
+          this.reader.cancel()
+        }
       },
       async openPort() {
         console.log('openPort', navigator);
@@ -725,7 +727,9 @@
                           grossWeight(this.weighingList)
                           .toPromise()
                           .then((response) => {
-                            this.reader.cancel()
+                            if(this.reader){
+                              this.reader.cancel()
+                            }
                             this.$notify.success({
                               title: '成功',
                               message: '保存成功',
@@ -752,7 +756,9 @@
               tare(this.weighingList)
                 .toPromise()
                 .then((response) => {
-                  this.reader.cancel()
+                  if(this.reader){
+                    this.reader.cancel()
+                  }
                   this.$notify.success({
                     title: '成功',
                     message: '保存成功',

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -87,62 +87,62 @@
           </el-select>
         </el-col>
       </el-row>
-      <div v-if="contractNo != ''">
-        <span v-if="orderList.seller"
-          >卖方: {{ orderList.seller }} </span
-        >
-        <span v-else>卖方:--</span>
-        <span v-if="orderList.goodsName">货名: {{ orderList.goodsName }}</span>
-        <span v-else>货名:--</span>
-        
-        <span v-if="orderList.weight"
-          >合同重量: {{ orderList.weight }} 吨</span
-        >
-        <span v-else>合同重量: 0 吨</span>
+      <el-row v-if="contractNo != ''" class="content2">
+        <div class="content2-item">
+          <span v-if="orderList.seller" class="seller"
+            >卖方: {{ orderList.seller }} </span
+          >
+          <span v-else>卖方:--</span>
+          <div class="row2">
+            <span v-if="orderList.goodsName">货名: {{ orderList.goodsName }}</span>
+            <span v-else>货名:--</span>
+            
+            <span v-if="orderList.weight"
+              >合同重量: {{ orderList.weight }} 吨</span
+            >
+            <span v-else>合同重量: 0 吨</span>
 
-        <span v-if="settlementWeight1"
-          >入库量: {{ settlementWeight1 }} 吨</span
-        >
-        <span v-else>入库量: 0 吨</span>
+            <span v-if="settlementWeight1"
+              >入库量: {{ settlementWeight1 }} 吨</span
+            >
+            <span v-else>入库量: 0 吨</span>
 
-        <span v-if="orderList.unitContractPrice"
-          >合同单价: {{ orderList.unitContractPrice }} 元/吨</span
-        >
-        <span v-else>合同单价: 0 元/吨</span>
+            <span v-if="orderList.unitContractPrice"
+              >合同单价: {{ orderList.unitContractPrice }} 元/吨</span
+            >
+            <span v-else>合同单价: 0 元/吨</span>
 
-        <span v-if="payingMoney"
-          >应付: {{ payingMoney }} 元</span
-        >
-        <span v-else>应付: 0 元</span>
+            <span v-if="payingMoney"
+              >应付: {{ payingMoney }} 元</span
+            >
+            <span v-else>应付: 0 元</span>
 
-        <span v-if="payedMoney"
-          >已付: {{ payedMoney }} 元</span
-        >
-        <span v-else>已付: 0 元</span>
+            <span v-if="payedMoney"
+              >已付: {{ payedMoney }} 元</span
+            >
+            <span v-else>已付: 0 元</span>
 
-        <span v-if="payNotMoney"
-          >未付: {{ payNotMoney }} 元</span
-        >
-        <span v-else>未付: 0 元</span>
+            <span v-if="payNotMoney"
+              >未付: {{ payNotMoney }} 元</span
+            >
+            <span v-else>未付: 0 元</span>
 
-        <span v-if="orderList.deposit"
-          >定金: {{ orderList.deposit }} 元 
-          <!-- {{ orderList.depositUrl }} -->
-           <img
-            width="18"
-            height="20"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/fujian.png"
-            @click="fujian()"
-            alt=""
-          />
-          <!-- <span v-if="addressUrlArray.length > 0">{{
-            addressUrlArray.length
-          }}</span> -->
-          </span
-        >
-        <span v-else>定金: 0 元</span>
-      </div>
+            <span v-if="orderList.deposit"
+              >定金: {{ orderList.deposit }} 元 
+              <!-- {{ orderList.depositUrl }} -->
+              <img
+                width="18"
+                height="20"
+                style="vertical-align: text-top; position: relative; top: -1px"
+                src="../../../public/img/fujian.png"
+                @click="fujian()"
+                alt=""
+              />
+              </span>
+            <span v-else>定金: 0 元</span>
+          </div>
+        </div>
+      </el-row>
       <el-table
         class="wenzi"
         :data="warehouseList.records"
@@ -668,8 +668,10 @@ export default {
           this.$t('system.noticeCircular.NoInformation')
         )
       }
-      this.appendixIdss = this.orderList.depositUrl
-      this.accessoryTFs = true
+      else{
+          this.accessoryTFs = true
+          this.appendixIdss = this.orderList.depositUrl
+      }
     },
      //定金附件
     fujian1(item) {
@@ -1198,6 +1200,14 @@ export default {
   padding: 0 4px !important;
   position: relative;
 }
+.content2-item {
+  padding: 10px;
+}
+.content2 {
+  margin-top: 10px;
+  border-radius: 5px;
+  background: #F0F3FE;
+}
 .record:after {
   position: absolute;
   content: '';
@@ -1299,6 +1309,15 @@ export default {
   position: absolute;
   left: 0;
 }
+.seller {
+  font-size: 16px;
+  font-weight: 600;
+  color: #323233;
+  line-height: 24px;
+}
+.row2>span {
+  margin-right: 20px;
+}
 .el-button--primary {
   background-color: #5878e8;
   border-color: #5878e8;

src/views/warehouse/warehouseManagementRecord.vue

@@ -449,6 +449,7 @@
 			record(status, status1) {
 				this.status = status1
 				this.searchType = status
+				this.currentPage = '1'
 				this.getList()
 			},
 			// 上传附件