前端

src/api/V2/houseSelfCollect/index.js

@@ -91,3 +91,5 @@ export const API_GET_SHIPPINGINFOFORMATION = '/shippingInformation/selectShippin
 export const API_POST_INSPECTIONCHECK = '/qualityInspectionManagement/api/editQualityInspection'
 //单据二维码
 export const API_GAT_QRCODE = '/weighingManagement/generateQRCodeImage'
+//车型
+export const API_GAT_INFO = '/commonSysParameter/getInfo'

src/model/houseSelfCollect/index.js

@@ -47,7 +47,8 @@ import {
   API_POST_EXPORT,
   API_GET_SHIPPINGINFOFORMATION,
   API_POST_INSPECTIONCHECK,
-  API_GAT_QRCODE
+  API_GAT_QRCODE,
+  API_GAT_INFO
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -142,4 +143,6 @@ export const getshippinginfo  = appRx.get(API_GET_SHIPPINGINFOFORMATION, errorCa
 // 确认初检信息
 export const postCheck  = appRx.post(API_POST_INSPECTIONCHECK, errorCatcher, errorHandle, filter)
 // 单据二维码
-export const getQRcode  = appRx.get(API_GAT_QRCODE, errorCatcher, errorHandle, filter)
+export const getQRcode  = appRx.get(API_GAT_QRCODE, errorCatcher, errorHandle, filter)
+// 车型
+export const getcartype  = appRx.get(API_GAT_INFO, errorCatcher, errorHandle, filter)

src/views/houseSelfCollect/inspectInfo.vue

@@ -42,13 +42,19 @@
                   :value="item.goodsName" />
               </ws-select>
             </ws-form-item>
+            <ws-form-item label="客户" span="1" prop="customerName">
+              <el-select v-model="inspect.customerName" clearable filterable placeholder="请选择" class="typeselect"
+                @change="customerChange" :disabled="disabled1">
+                <el-option v-for="item in customerList" :key="item.valueKey" :label="item.value" :value="item.value" />
+              </el-select>
+            </ws-form-item>
             <ws-form-item label="车牌号" span="1" prop="carNumber">
-              <!-- <el-select v-model="inspect.carNumber" clearable filterable  placeholder="请选择" class="typeselect" @change="shipperNameChange"
+              <el-select v-model="inspect.carNumber" clearable filterable  placeholder="请选择" class="typeselect" @change="shipperNameChange"
                 :disabled="disabled1">
                 <el-option v-for="(item,index) in carNumberList" :key="index" :label="item.carNo" :value="index" />
-              </el-select> -->
-              <ws-input @change='carnochange' v-model="inspect.carNumber" placeholder="请输入车牌号" maxlength="10" size="small"
-                :disabled="disabled" />
+              </el-select>
+              <!-- <ws-input @change='carnochange' v-model="inspect.carNumber" placeholder="请输入车牌号" maxlength="10" size="small"
+                :disabled="disabled" /> -->
             </ws-form-item>
             <ws-form-item label="箱号-1" span="1" prop="boxNo">
               <ws-input :disabled="disabled" v-model="inspect.boxNo" placeholder="请输入箱号" maxlength="20" size="small" />
@@ -84,12 +90,6 @@
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
               </ws-select>
             </ws-form-item>
-            <ws-form-item label="客户" span="1" prop="customerName">
-              <el-select v-model="inspect.customerName" clearable filterable placeholder="请选择" class="typeselect"
-                @change="customerChange" :disabled="disabled1">
-                <el-option v-for="item in customerList" :key="item.valueKey" :label="item.value" :value="item.value" />
-              </el-select>
-            </ws-form-item>
             <ws-form-item label="净重单价（元/公斤）" span="1" prop="tidalGrainPrice" v-if="inspect.type == '潮粮'">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价"
                 maxlength="10" size="small" :disabled="disabled2" />
@@ -98,12 +98,16 @@
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.dryGrainPrice" placeholder="请输入干粮单价"
                 maxlength="10" size="small" :disabled="disabled2" />
             </ws-form-item>
-            <el-row>
               <ws-form-item label="复检备注" span="2" prop="reMemo" v-if="information == '编辑复检' || statusShow == '已复检'">
                 <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-if="statusShow != '已复检'" />
                 <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-else disabled />
               </ws-form-item>
-            </el-row>
+               <ws-form-item label="车型" span="2" prop="dryGrainPrice" v-if="types==4&&warehouseName=='鲅鱼圈金信库'||types==1&&warehouseName=='鲅鱼圈金信库'">
+                <el-select v-model="inspect.carModel" clearable filterable placeholder="请选择" class="typeselect"
+                 :disabled="disabled3">
+                <el-option v-for="item in cartypeList" :key="item.constValue" :label="item.constValue" :value="item.constValue" />
+              </el-select>
+            </ws-form-item>
           </ws-info-table>
 
           <div class="title">质检数据</div>
@@ -181,7 +185,8 @@
     getCount,
     getDryGrainPrice,
     getshippinginfo,
-    postCheck
+    postCheck,
+    getcartype
   } from '@/model/houseSelfCollect/index'
   import {
     packList
@@ -219,6 +224,7 @@
         gradeList: [],
         customerList: [],
         getbinNumberList: [],
+        cartypeList:[],
         cangid: '', //仓库id
         warehouseName: '',
         unitPrice: 0,
@@ -1082,6 +1088,11 @@
       },
 
       getList(ids) {
+        // 车型
+        getcartype({constId:'QUA1'}).toPromise()
+          .then((response) => {
+            this.cartypeList=response
+          })
         // 货名
         getinspectLookGoods({
             warehouseId: this.cangid

src/views/houseSelfCollect/paymentManagement.vue

@@ -418,12 +418,12 @@
         },
       }
     },
-    activated() {
+    mounted() {
       this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
       this.getPassYearFormatDate()
       this.getWarehouse()
 
-      // this.getList()
+      this.getList()
     },
     updated() {
       this.$nextTick(() => {
@@ -624,12 +624,43 @@
       },
       //合计
       getSummaries(param) {
+        console.log(param)
         const {
           columns,
           data
         } = param
         const sums = []
-        columns.forEach((column, index) => {
+        if(this.modification.length>0){
+          columns.forEach((column, index) => {
+            console.log(column, index)
+          if (index === 0) {
+            sums[index] = '合计'
+          } else if (
+            index === 10 ||
+            index === 11 || index === 15 || index === 16
+
+          ) {
+            const values = this.modification.map((item) => Number(item[column.property]))
+            if (!values.every((value) => isNaN(value))) {
+              sums[index] = values.reduce((prev, curr) => {
+                const value = Number(curr)
+                if (!isNaN(value)) {
+                  return prev + curr
+                } else {
+                  return prev
+                }
+              }, 0)
+              sums[index] = sums[index].toFixed(3)
+            } else {
+              sums[index] = '元'
+            }
+          } else {
+            sums[index] = '--'
+          }
+        })
+        }else{
+          console.log(22222)
+          columns.forEach((column, index) => {
           if (index === 0) {
             sums[index] = '合计'
           } else if (
@@ -655,6 +686,8 @@
             sums[index] = '--'
           }
         })
+        }
+        
         // sums[6]=sums[6].toFixed(2)
         // sums[sums.length-2]=sums[sums.length-2].toFixed(2)
         return sums