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

package-lock.json

@@ -16751,6 +16751,11 @@
       "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.5.207.tgz",
       "integrity": "sha512-xGDUhnCYPfHy+unMXCLCJtlpZaaZ17Ew3WIL0tnSgKFUZXHAPD49GO9xScyszSsQMoutNDgRb+rfBXIaX/lJbw=="
     },
+    "pdfobject": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmmirror.com/pdfobject/-/pdfobject-2.2.8.tgz",
+      "integrity": "sha512-dB/soWNMLtVGHfXERXnAtsKm0XwC6lyGVYegQcZxL4rw07rNOKvawc9kddBzlGr7TbiBZuGf4Drb3kyRbTf/QA=="
+    },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",

package.json

@@ -66,6 +66,8 @@
     "node-gyp": "^5.0.6",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
+    "pdfjs-dist": "^2.6.347",
+    "pdfobject": "^2.2.8",
     "pinyin": "^2.9.1",
     "qrcodejs2": "^0.0.2",
     "querystring": "^0.2.0",
@@ -83,7 +85,6 @@
     "vue-amap": "^0.5.10",
     "vue-i18n": "7.3.2",
     "vue-pdf": "^4.2.0",
-    "pdfjs-dist": "^2.6.347",
     "vue-print-nb": "^1.7.5",
     "vue-router": "3.0.2",
     "vue-seamless-scroll": "^1.1.17",

src/views/profitable/contractprofitsdetails.vue

@@ -135,7 +135,12 @@
             <td class="col">{{tableData.seller}}</td>
           </tr>
           <tr class="row">
-            <td class="col col-bgc">结算单价（元/吨）</td>
+            <td class="col col-bgc">
+              <span v-if="tableData.agreementType == '采购合同'">采购</span>
+            <span v-if="tableData.agreementType == '收购合同'">收购</span>
+            <span v-if="tableData.agreementType == '销售合同'">销售</span>结算单价（元/吨）
+
+            </td>
             <td class="col">{{tableData.settlementPrice}}</td>
             <td class="col col-bgc">合计利润（元）</td>
             <td class="col">{{tableData.profit}}</td>
@@ -147,7 +152,11 @@
             <td class="col col-bgc">利润（元）</td>
           </tr>
           <tr v-for="item in tableData.contractList" class="row">
-            <td class="col">{{item.contractNo}}</td>
+            <td class="col">{{item.contractNo}}
+            <span v-if="item.agreementType == '采购合同'">(采购)</span>
+            <span v-if="item.agreementType == '收购合同'">(收购)</span>
+            <span v-if="item.agreementType == '销售合同'">(销售)</span>
+          </td>
             <td class="col">{{item.settlementPrice}}</td>
             <td class="col">{{item.weight}}</td>
             <td class="col">{{item.profit}}</td>

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -235,6 +235,28 @@
                   maxlength="20"
                   size="small"
                 />
+              </ws-form-item>
+              <!--扣重(吨)-->
+              <ws-form-item
+                label="扣重(吨):"
+                span="1"
+                prop="deductionWeight"
+              >
+                <ws-input
+                  v-if="item.status == '已送达' || item.status == '未装车'"
+                  v-model="item.deductionWeight"
+                  placeholder="请输入扣重"
+                  maxlength="20"
+                  :disabled="readonly"
+                  size="small"
+                />
+                <ws-input
+                  v-else
+                  v-model="item.deductionWeight"
+                  placeholder="请输入扣重"
+                  maxlength="20"
+                  size="small"
+                />
               </ws-form-item>
                <!--装车日期-->
               <ws-form-item
@@ -650,6 +672,7 @@ export default {
               )
               this.tranCarInfoList.unloadNetWeight =
                 this.deptBudgetList.unloadNetWeight
+              this.tranCarInfoList.deductionWeight =this.deptBudgetList.deductionWeight
               for (var i = 0; i < this.tranCarInfoList.length; i++) {
                 this.tranCarInfoList[i].id = this.freightspace[i].id
                 if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {