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

src/components/balanceAlert.vue

@@ -161,6 +161,7 @@ export default {
               this.deptBudgetList.warehouseName == '白城内陆港' ||
               this.deptBudgetList.warehouseName == '白城鹏羽库' ||
               this.deptBudgetList.warehouseName == '洮南胡力吐粮食储备库' ||
+              this.deptBudgetList.warehouseName == '杜尔伯特家禾库' ||
               this.deptBudgetList.warehouseName == '洮南向阳乡金昊' ||
               this.deptBudgetList.warehouseName == '洮南光明储备库' ||
               this.deptBudgetList.warehouseName == '甘南林峰库' ||

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -701,6 +701,7 @@
               managementType: 1,
               serviceManagementType: that.inWarehouseType,
               loadingstatus: 1,
+              pcFlag: 5
               // statusType:1
             })
             .toPromise()
@@ -717,6 +718,7 @@
               managementType: 1,
               serviceManagementType: that.inWarehouseType,
               loadingstatus: 1,
+              pcFlag: 5
               // statusType:1
             })
             .toPromise()
@@ -748,6 +750,7 @@
                   managementType: 1,
                   serviceManagementType: that.inWarehouseType,
                   loadingstatus: 1,
+                  pcFlag: 5
                   // statusType:1
                 })
                 .toPromise()
@@ -764,6 +767,7 @@
                   managementType: 1,
                   serviceManagementType: that.inWarehouseType,
                   loadingstatus: 1,
+                  pcFlag: 5
                   // statusType:1
                 })
                 .toPromise()

src/views/houseSelfCollect/paymentManagement.vue

@@ -125,8 +125,8 @@
       </el-table-column>
       <el-table-column fixed class="table_td" prop="carNo" label="车牌号"></el-table-column>
       <el-table-column  class="table_td" prop="contractNo" label="合同号"></el-table-column>
-      <el-table-column class="table_td" v-show='warehouseName=="鲅鱼圈金信库"' width='140' prop="actualWeighingFee"
-        label="卸车过磅费（元）"></el-table-column>
+      <!-- <el-table-column class="table_td" v-show='warehouseName=="鲅鱼圈金信库"' width='140' prop="actualWeighingFee"
+        label="卸车过磅费（元）"></el-table-column> -->
       <el-table-column class="table_td" prop="goodsName" width="70" label="货名"></el-table-column>
       <el-table-column class="table_td" prop="type" width="60" label="类型"></el-table-column>
       <el-table-column class="table_td" prop="tidalGrainPrice" width="140" label="净重单价（元/公斤）"></el-table-column>
@@ -799,6 +799,7 @@
             })
           })
           .catch((res) => {
+            console.log(res)
             _this.$message.error('文件压缩失败')
           })
       },
@@ -911,19 +912,14 @@
           data
         } = param
         const sums = []
-        var _number = []
-        if (this.warehouseName == '鲅鱼圈金信库') {
-          _number = [11, 12,13, 16, 17, 18]
-        } else {
-          _number = [10, 11,12,15, 16, 17,18]
-        }
+        var _number = [11,12, 16, 17]
         if (this.modification.length > 0) {
           columns.forEach((column, index) => {
             if (index === 0) {
               sums[index] = '合计'
             
             } else if (index === _number[0] || index === _number[1] || index === _number[2] || index === _number[
-                3] || index === _number[4]|| index === _number[5]|| index === _number[6]) {
+                3] || index === _number[4]) {
               const values = this.modification.map((item) => Number(item[column.property]))
               if (!values.every((value) => isNaN(value))) {
                 sums[index] = values.reduce((prev, curr) => {
@@ -947,7 +943,7 @@
             if (index === 0) {
               sums[index] = '合计'
             } else if (index === _number[0] || index === _number[1] || index === _number[2] || index === _number[
-                3] || index === _number[4]|| index === _number[5]|| index === _number[6]) {
+                3] || index === _number[4]) {
               const values = data.map((item) => Number(item[column.property]))
               if (!values.every((value) => isNaN(value))) {
                 sums[index] = values.reduce((prev, curr) => {

src/views/outboundManagement/weighingManagementNew.vue

@@ -795,6 +795,7 @@
               warehouseName: that.warehouseName,
               managementType: 3,
               statusType: that.statusType,
+              pcFlag: 3
               // loadingstatus: 1,
             })
             .toPromise()
@@ -836,6 +837,7 @@
                   warehouseName: that.warehouseName,
                   managementType: 3,
                   statusType: that.statusType,
+                  pcFlag: 3
                   // loadingstatus: 1,
                 })
                 .toPromise()
@@ -2418,6 +2420,7 @@
             warehouseName: this.warehouseName,
             managementType: 3,
             statusType: this.statusType,
+            pcFlag: 3
           })
           .toPromise()
           .then((response) => {

src/views/statisticalReport/autoSettlementList.vue

@@ -445,6 +445,19 @@
             v-model="deptBudgetList.remark">
             </el-input>
         </el-form-item>
+        <ws-upload
+          style="margin-left:30px"
+          ref="upload"
+          table-name="maintain_work_order"
+          oss-key="mainPlan"
+          :comp-id="compId"
+          :appendix-ids="appendixIdsAdd"
+          :vesselId="deptBudgetList.addressUrl"
+          :size-limit="size"
+          @uploadSuccess="uploadSuccess"
+          @onChange="onChange"
+          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+        />
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="handleClose3">取 消</el-button>
@@ -507,6 +520,7 @@ export default {
       needReapply: true,
       totalList:[],
       carNo:'',
+      appendixIdsAdd: '',
       deptBudgetList:{},
       pickerOptions: {
           shortcuts: [{
@@ -616,12 +630,8 @@ export default {
       compId: localStorage.getItem('ws-pf_compId'),
       roleId: localStorage.getItem('ws-pf_roleId'),
       deptCircularPage: {},
-      warehouseList: [],
       orderList: {},
       tranPriceApproveList: [],
-      deptBudgetList: {},
-      id: '',
-
       pcFlag: 1,
       carryoverlist: {},
       modification: [],
@@ -677,6 +687,16 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+    },
+    onChange(files) {
+      this.fileNum = files
+      this.$refs.upload.handleSaveBill().then((res) => {
+        console.log(files)
+      })
+    },
     datechange(e){
       if (this.value2) {
           this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])

src/views/warehousenew/warehouseManagementList.vue

@@ -1338,7 +1338,7 @@
 .reservesInfo{
   display: inline-flex;
   .reservesInfo_item{
-    width: 100px;
+    width: 120px;
     background: #F5F7FA;
     // height: 54px;
     text-align: center;