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

src/views/customer/customerList.vue

@@ -140,7 +140,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="customerName" label="客户名称">
-          <template scope="scope">
+          <!-- <template scope="scope">
             <span
               v-if="
                 scope.row.customerName == '' || scope.row.customerName == null
@@ -151,7 +151,7 @@
               v-if="scope.row.compName == '' || scope.row.compName == null"
               >{{ scope.row.customerName }}</span
             >
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="compAddress" label="地址"></el-table-column>
         <el-table-column prop="customerPhone" label="电话"> </el-table-column>

src/views/salesManagement/salesPlanOrderList.vue

@@ -85,7 +85,7 @@
         prop="unitPrice"
         label="单价(元/吨)"
       >
-        <!--改价记录-->
+        <!--改价记录--> 
         <template slot-scope="scope">
           {{ scope.row.unitPrice }}
           <i
@@ -910,13 +910,16 @@
     </el-dialog>
     <!--改价记录-->
     <el-dialog
-      width="30%"
+      width="10%"
       title="改价记录"
       :visible.sync="dialogFormVisible5"
       :append-to-body="true"
     >
       <div v-for="item in pricechange">
-        <div>{{ item.priceType }}{{ item.price }}</div>
+        <div>{{ item.priceType }}</div>
+        <div class="price">
+          {{ item.price }}
+        </div>
         <div>{{ item.updateDate }}</div>
       </div>
     </el-dialog>
@@ -2090,4 +2093,8 @@ hr {
   background-color: #fff;
   height: 50px;
 }
+.price {
+  margin-left: 97px;
+  margin-top: -19px;
+}
 </style>

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -1008,13 +1008,11 @@ export default {
           .then((response) => {
             this.dialogFormVisible11=false
             this.$message.success('结转成功')
+            this.dialogFormVisible11 = false
             this.getList()
           })
-      } else {
-        if (this.carryovercontractnolist.length > 0) {
-        } else {
+      } else if (this.carryovercontractnolist.length <=0){
           this.$message.warning('无可结转的其他合同')
-        }
       }
     },
     amendconfirm() {
@@ -1149,6 +1147,7 @@ export default {
       // }else if(this.roleId=="4ef070439cd64784bce8844fd3f0f8e1"){
       //   this.roleFlag=''
       // }
+      
       getpurchreceipt({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
@@ -1161,7 +1160,13 @@ export default {
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].identification = 'false'
+            response.records[i].settlementPrice = response.records[i].unitPrice 
+            - Math.abs(response.records[i].basisPrice)
+            - Math.abs(response.records[i].unloadingCharge)
+            - Math.abs(response.records[i].invoiceFee)
+            - Math.abs(response.records[i].deductionAmount)
           }
+          
           this.deptBudgetTotal=response.total
           this.warehouseList = response
         })

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -837,6 +837,11 @@ export default {
       })
         .toPromise()
         .then(response => {
+          for (var i = 0; i < response.records.length; i++) {
+            response.records[i].settlementPrice = response.records[i].unitPrice 
+            + response.records[i].basisPrice
+            + response.records[i].invoiceFee
+          }
           this.deptBudgetTotal=response.total
           this.warehouseList = response
         })