Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/api/fleet/carManage.js

@@ -8,3 +8,26 @@ export function listFtmsorderbills(query) {
     params: query
   })
 }
+// 查询详情
+export function lookOver(fId) {
+  return request({
+    url: '/fleet/carManage/' + fId,
+    method: 'get'
+  })
+}
+// 模糊查询车队名称
+export function company(companyName) {
+  return request({
+    url: '/fleet/companyMsg/list',
+    method: 'get',
+    params: companyName
+  })
+}
+// 新增
+export function preservation(data) {
+  return request({
+    url: '/fleet/carManage/add',
+    method: 'post',
+    data: data
+  })
+}

src/components/Uploadfile/index.vue

@@ -45,7 +45,6 @@ export default {
       console.log(res)
       this.$emit("input", res);
       this.$emit("fileName", res.fileName);
-      
       this.File = res.url;
       console.log(res.url)
       this.loading.close();
@@ -91,4 +90,4 @@ export default {
   line-height: 30px;
    margin-left:0px!important;
 }
-</style>
+</style>

src/views/basicdata/fleet/carManage-add-or-update.vue

@@ -1,257 +1,139 @@
-
 <template>
   <el-dialog
     :title="!dataForm.id ? '车辆注册' : '修改'"
     :close-on-click-modal="false"
-    :visible.sync="visible" width="80%">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="125px">
-          <el-form-item label="车队名称" prop="fleetCompanyId" style="width: 325px">
-<!--            <el-input v-model="dataForm.fleetCompanyId" placeholder="车队id"></el-input>-->
-            <el-select v-model="dataForm.fleetCompanyId" style="width: 200px" placeholder="请选择">
-              <el-option
-                v-for="item in optionsProjectTypeItem"
-                :key="item.id"
-                :label="item.companyName"
-                :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="车牌号" prop="carNum" style="width: 325px">
-            <el-input v-model="dataForm.carNum" style="width: 200px" placeholder="车牌号"></el-input>
-          </el-form-item>
-          <el-form-item label="驾驶员" prop="carNum" style="width: 325px">
-            <el-input v-model="dataForm.carNum" style="width: 200px" placeholder="驾驶员"></el-input>
-          </el-form-item>
-          <el-form-item label="挂号" prop="hangNum" style="width: 325px">
-            <el-input v-model="dataForm.hangNum" style="width: 200px" placeholder="挂号"></el-input>
-          </el-form-item>
-          <el-form-item label="燃油类型" prop="fuelType" style="width: 325px">
-            <el-input v-model="dataForm.fuelType" style="width: 200px" placeholder="燃油类型"></el-input>
-          </el-form-item>
-          <el-form-item label="车辆类型" prop="carType" style="width: 325px">
-            <el-input v-model="dataForm.carType" style="width: 200px" placeholder="车辆类型"></el-input>
-          </el-form-item>
-          <el-form-item label="车辆名称" prop="carName" style="width: 325px">
-            <el-input v-model="dataForm.carName" style="width: 200px" placeholder="车辆名称"></el-input>
-          </el-form-item>
-          <el-form-item label="车辆品牌" prop="carBrand" style="width: 325px">
-            <el-input v-model="dataForm.carBrand" style="width: 200px" placeholder="车辆品牌"></el-input>
-          </el-form-item>
-          <el-form-item label="制造单位" prop="manufactureUnit" style="width: 325px">
-            <el-input v-model="dataForm.manufactureUnit" style="width: 200px" placeholder="制造单位"></el-input>
-          </el-form-item>
-          <el-form-item label="发证机关" prop="officeOfCertificate" style="width: 325px">
-            <el-input v-model="dataForm.officeOfCertificate" style="width: 200px" placeholder="发证机关"></el-input>
-          </el-form-item>
-          <el-form-item label="牵引车辆型号" prop="pullCarType" style="width: 325px">
-            <el-input v-model="dataForm.pullCarType" style="width: 200px" placeholder="牵引车辆型号"></el-input>
-          </el-form-item>
-          <el-form-item label="牵引车车架号" prop="pullCarShelfNum" style="width: 325px">
-            <el-input v-model="dataForm.pullCarShelfNum" style="width: 200px" placeholder="牵引车车架号"></el-input>
-          </el-form-item>
-          <el-form-item label="挂车型号" prop="mountCarType" style="width: 325px">
-            <el-input v-model="dataForm.mountCarType" style="width: 200px" placeholder="挂车型号"></el-input>
-          </el-form-item>
-          <el-form-item label="挂车车架号" prop="mountCarNum" style="width: 325px">
-            <el-input v-model="dataForm.mountCarNum" style="width: 200px" placeholder="挂车车架号"></el-input>
-          </el-form-item>
-          <el-form-item label="发动机型号" prop="engine" style="width: 325px">
-            <el-input v-model="dataForm.engine" style="width: 200px" placeholder="发动机型号"></el-input>
-          </el-form-item>
-          <el-form-item label="核载人数" prop="carLoadPersion" style="width: 325px">
-            <el-input v-model="dataForm.carLoadPersion" style="width: 200px" placeholder="核载人数"></el-input>
-          </el-form-item>
-          <el-form-item label="购车日期" prop="buyCarDate" style="width: 325px">
-<!--            <el-input v-model="dataForm.buyCarDate" placeholder="购车日期"></el-input>-->
-            <el-date-picker
-              style="width: 200px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              v-model="dataForm.buyCarDate"
-              type="date"
-              placeholder="创建时间">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="注册日期" prop="regiestDate" style="width: 325px">
-<!--            <el-input v-model="dataForm.regiestDate" placeholder="注册日期"></el-input>-->
-            <el-date-picker
-              style="width: 200px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              v-model="dataForm.regiestDate"
-              type="date"
-              placeholder="创建时间">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="报废日期" prop="abandonDate" style="width: 325px">
-<!--            <el-input v-model="dataForm.abandonDate" placeholder="报废日期"></el-input>-->
-            <el-date-picker
-              style="width: 200px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              v-model="dataForm.abandonDate"
-              type="date"
-              placeholder="创建时间">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="外阔尺寸mm" prop="outerSize" style="width: 325px">
-            <el-input v-model="dataForm.outerSize" style="width: 200px" placeholder="外阔尺寸mm"></el-input>
-          </el-form-item>
-          <el-form-item label="总重量kg" prop="sumWeight" style="width: 325px">
-            <el-input v-model="dataForm.sumWeight" style="width: 200px" placeholder="总重量kg"></el-input>
-          </el-form-item>
-          <el-form-item label="核定重量kg" prop="vouchWeight" style="width: 325px">
-            <el-input v-model="dataForm.vouchWeight" style="width: 200px" placeholder="核定重量kg"></el-input>
-          </el-form-item>
-          <el-form-item label="装备质量kg" prop="equipWeight" style="width: 325px">
-            <el-input v-model="dataForm.equipWeight" style="width: 200px" placeholder="装备质量kg"></el-input>
-          </el-form-item>
-      <el-collapse accordion>
+    :visible.sync="visible" width="80%"
+  >
+    <el-form :model="dataFormD" :rules="dataRule" ref="dataFormD" @keyup.enter.native="dataFormSubmit()"
+             label-width="125px"
+    >
+      <el-form-item label="车队名称" prop="fleetCompanyId" style="width: 325px">
+        <el-select
+          v-model="dataFormD.fleetCompanyId"
+          filterable
+          remote
+          reserve-keyword
+          placeholder="请输入关键词"
+          :remote-method="handleSelect"
+        >
+          <el-option
+            v-for="item in optionsProjectTypeItem"
+            :key="item.id"
+            :label="item.companyName"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="车牌号" prop="carNum" style="width: 325px">
+        <el-input v-model="dataFormD.carNum" style="width: 200px" placeholder="车牌号"></el-input>
+      </el-form-item>
+      <el-form-item label="驾驶员" prop="carNum" style="width: 325px">
+        <el-input v-model="dataFormD.carNum" style="width: 200px" placeholder="驾驶员"></el-input>
+      </el-form-item>
+      <el-form-item label="挂号" prop="hangNum" style="width: 325px">
+        <el-input v-model="dataFormD.hangNum" style="width: 200px" placeholder="挂号"></el-input>
+      </el-form-item>
+      <el-form-item label="燃油类型" prop="fuelType" style="width: 325px">
+        <el-input v-model="dataFormD.fuelType" style="width: 200px" placeholder="燃油类型"></el-input>
+      </el-form-item>
+      <el-form-item label="车辆类型" prop="carType" style="width: 325px">
+        <el-input v-model="dataFormD.carType" style="width: 200px" placeholder="车辆类型"></el-input>
+      </el-form-item>
+      <el-form-item label="车辆名称" prop="carName" style="width: 325px">
+        <el-input v-model="dataFormD.carName" style="width: 200px" placeholder="车辆名称"></el-input>
+      </el-form-item>
+      <el-form-item label="车辆品牌" prop="carBrand" style="width: 325px">
+        <el-input v-model="dataFormD.carBrand" style="width: 200px" placeholder="车辆品牌"></el-input>
+      </el-form-item>
+      <el-form-item label="制造单位" prop="manufactureUnit" style="width: 325px">
+        <el-input v-model="dataFormD.manufactureUnit" style="width: 200px" placeholder="制造单位"></el-input>
+      </el-form-item>
+      <el-form-item label="发证机关" prop="officeOfCertificate" style="width: 325px">
+        <el-input v-model="dataFormD.officeOfCertificate" style="width: 200px" placeholder="发证机关"></el-input>
+      </el-form-item>
+      <el-form-item label="牵引车辆型号" prop="pullCarType" style="width: 325px">
+        <el-input v-model="dataFormD.pullCarType" style="width: 200px" placeholder="牵引车辆型号"></el-input>
+      </el-form-item>
+      <el-form-item label="牵引车车架号" prop="pullCarShelfNum" style="width: 325px">
+        <el-input v-model="dataFormD.pullCarShelfNum" style="width: 200px" placeholder="牵引车车架号"></el-input>
+      </el-form-item>
+      <el-form-item label="挂车型号" prop="mountCarType" style="width: 325px">
+        <el-input v-model="dataFormD.mountCarType" style="width: 200px" placeholder="挂车型号"></el-input>
+      </el-form-item>
+      <el-form-item label="挂车车架号" prop="mountCarNum" style="width: 325px">
+        <el-input v-model="dataFormD.mountCarNum" style="width: 200px" placeholder="挂车车架号"></el-input>
+      </el-form-item>
+      <el-form-item label="发动机型号" prop="engine" style="width: 325px">
+        <el-input v-model="dataFormD.engine" style="width: 200px" placeholder="发动机型号"></el-input>
+      </el-form-item>
+      <el-form-item label="核载人数" prop="carLoadPersion" style="width: 325px">
+        <el-input v-model="dataFormD.carLoadPersion" style="width: 200px" placeholder="核载人数"></el-input>
+      </el-form-item>
+      <el-form-item label="购车日期" prop="buyCarDate" style="width: 325px">
+        <!--            <el-input v-model="dataForm.buyCarDate" placeholder="购车日期"></el-input>-->
+        <el-date-picker
+          style="width: 200px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          v-model="dataFormD.buyCarDate"
+          type="date"
+          placeholder="创建时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="注册日期" prop="regiestDate" style="width: 325px">
+        <!--            <el-input v-model="dataForm.regiestDate" placeholder="注册日期"></el-input>-->
+        <el-date-picker
+          style="width: 200px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          v-model="dataFormD.regiestDate"
+          type="date"
+          placeholder="创建时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="报废日期" prop="abandonDate" style="width: 325px">
+        <!--            <el-input v-model="dataForm.abandonDate" placeholder="报废日期"></el-input>-->
+        <el-date-picker
+          style="width: 200px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          v-model="dataFormD.abandonDate"
+          type="date"
+          placeholder="创建时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="外阔尺寸mm" prop="outerSize" style="width: 325px">
+        <el-input v-model="dataFormD.outerSize" style="width: 200px" placeholder="外阔尺寸mm"></el-input>
+      </el-form-item>
+      <el-form-item label="总重量kg" prop="sumWeight" style="width: 325px">
+        <el-input v-model="dataFormD.sumWeight" style="width: 200px" placeholder="总重量kg"></el-input>
+      </el-form-item>
+      <el-form-item label="核定重量kg" prop="vouchWeight" style="width: 325px">
+        <el-input v-model="dataFormD.vouchWeight" style="width: 200px" placeholder="核定重量kg"></el-input>
+      </el-form-item>
+      <el-form-item label="装备质量kg" prop="equipWeight" style="width: 325px">
+        <el-input v-model="dataFormD.equipWeight" style="width: 200px" placeholder="装备质量kg"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-collapse accordion>
+      <el-form label-width="125px">
         <el-collapse-item title="图片上传">
-          <el-form-item label="行驶证头图片" prop="drivingLicenseSrc" style="width: 325px">
-            <!--            <el-input v-model="dataForm.drivingLicenseSrc" placeholder="行驶证头src"></el-input>-->
-            <el-upload
-              class="upload-demo"
-              :limit="1"
-              :multiple="false"
-              :action="uploadURL"
-              :file-list="fileList"
-              :headers = "uploadHeaders"
-              :on-success="handleSuccess"
-              :on-remove="handleRemove"
-            >
-              <el-button size="small" type="primary">点击上传</el-button>
-              <!--              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="行驶证挂件图片" prop="drivingPendantSrc" style="width: 325px">
-            <!--            <el-input v-model="dataForm.drivingPendantSrc" placeholder="行驶证挂件src"></el-input>-->
-            <el-upload
-              class="upload-demo"
-              :limit="1"
-              :multiple="false"
-              :action="uploadURL"
-              :file-list="fileList"
-              :headers = "uploadHeaders"
-              :on-success="handleSuccess1"
-              :on-remove="handleRemove"
-              list-type="picture">
-              <el-button size="small" type="primary">点击上传</el-button>
-              <!--              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="运营证头图片" prop="operationLicenseSrc" style="width: 325px">
-            <!--            <el-input v-model="dataForm.operationLicenseSrc" placeholder="运营证头src"></el-input>-->
-            <el-upload
-              class="upload-demo"
-              :limit="1"
-              :multiple="false"
-              :action="uploadURL"
-              :file-list="fileList"
-              :headers = "uploadHeaders"
-              :on-success="handleSuccess2"
-              :on-remove="handleRemove"
-              list-type="picture">
-              <el-button size="small" type="primary">点击上传</el-button>
-              <!--              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="技术评定证书图片" prop="technologySrc" style="width: 325px">
-            <!--            <el-input v-model="dataForm.technologySrc" placeholder="技术评定证书src"></el-input>-->
-            <el-upload
-              class="upload-demo"
-              :limit="1"
-              :multiple="false"
-              :action="uploadURL"
-              :file-list="fileList"
-              :headers = "uploadHeaders"
-              :on-success="handleSuccess3"
-              :on-remove="handleRemove"
-              list-type="picture">
-              <el-button size="small" type="primary">点击上传</el-button>
-              <!--              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="营运挂载图片" prop="drivingLoadSrc" style="width: 325px">
-            <!--            <el-input v-model="dataForm.drivingLoadSrc" placeholder="营运挂载src"></el-input>-->
-            <el-upload
-              class="upload-demo"
-              :limit="1"
-              :multiple="false"
-              :action="uploadURL"
-              :file-list="fileList"
-              :headers = "uploadHeaders"
-              :on-success="handleSuccess4"
-              :on-remove="handleRemove"
-              list-type="picture">
-              <el-button size="small" type="primary">点击上传</el-button>
-              <!--              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="二级维护图片" prop="secondLvMaintainSrc" style="width: 325px">
-            <!--            <el-input v-model="dataForm.secondLvMaintainSrc" placeholder="二级维护src"></el-input>-->
-            <el-upload
-              class="upload-demo"
-              :limit="1"
-              :multiple="false"
-              :action="uploadURL"
-              :file-list="fileList"
-              :headers = "uploadHeaders"
-              :on-success="handleSuccess5"
-              :on-remove="handleRemove"
-              list-type="picture">
-              <el-button size="small" type="primary">点击上传</el-button>
-              <!--              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="交强险图片" prop="tafficConstranintInsuranceSrc" style="width: 325px">
-            <!--            <el-input v-model="dataForm.tafficConstranintInsuranceSrc" placeholder="交强险src"></el-input>-->
-            <el-upload
-              class="upload-demo"
-              :limit="1"
-              :multiple="false"
-              :action="uploadURL"
-              :file-list="fileList"
-              :headers = "uploadHeaders"
-              :on-success="handleSuccess6"
-              :on-remove="handleRemove"
-              list-type="picture">
-              <el-button size="small" type="primary">点击上传</el-button>
-              <!--              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="商业保险图片" prop="" style="width: 325px">
-            <!--            <el-input v-model="dataForm.businessInsuranceSrc" placeholder="商业保险src"></el-input>-->
-            <el-upload
-              class="upload-demo"
-              :limit="1"
-              :multiple="false"
-              :action="uploadURL"
-              :file-list="fileList"
-              :headers = "uploadHeaders"
-              :on-success="handleSuccess7"
-              :on-remove="handleRemove"
-              list-type="picture">
-              <el-button size="small" type="primary">点击上传</el-button>
-              <!--              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="承运人保险图片" prop="accpetCarrageInsuranceSrc" style="width: 325px">
-            <!--            <el-input v-model="dataForm.accpetCarrageInsuranceSrc" placeholder="承运人保险src"></el-input>-->
-            <el-upload
-              class="upload-demo"
-              :limit="1"
-              :multiple="false"
-              :action="uploadURL"
-              :file-list="fileList"
-              :headers = "uploadHeaders"
-              :on-success="handleSuccess8"
-              :on-remove="handleRemove"
-              list-type="picture">
-              <el-button size="small" type="primary">点击上传</el-button>
-              <!--              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
-            </el-upload>
-          </el-form-item>
+          <el-upload
+            :action="uploadImgUrl"
+            list-type="picture-card"
+            :limit="1"
+            :on-success="success"
+            :on-preview="handlePictureCardPreview"
+            :on-remove="handleRemove">
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="">
+          </el-dialog>
         </el-collapse-item>
-      </el-collapse>
-    </el-form>
+      </el-form>
+    </el-collapse>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取消</el-button>
       <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
@@ -260,129 +142,92 @@
 </template>
 
 <script>
-  export default {
-    props: {
-      dataForm: {
-        type: Object,
-        require: false
-      }
-    },
-    data () {
-      return {
-        visible: false,
-        msg: '',
-        dataRule: {
-          fleetCompanyId: [
-            {required: true, message: '请输入车队id', trigger: 'blur'}
-          ],
-          carNum: [
-            {required: true, message: '请输入车牌号', trigger: 'blur'}
-          ]
-        },
-        optionsProjectTypeItem: [],
-        fileList: [],
-        uploadHeaders: {
-          // localStorage.setItem('token', data.token)
-          token: localStorage.getItem('token')
-        },
-        uploadURL: 'http://test.echepei.com/api/admin/fleet/carManage/uplodaImgForDrivingLicense'
-      }
-    },
-    methods: {
-      init () {
-        this.visible = true
-        this.needCondition()
+import { preservation, company, lookOver } from '@/api/fleet/carManage'
+import { getToken } from '@/utils/auth'
+
+export default {
+  props: {
+    dataForm: {
+      type: Object,
+      require: false
+    }
+  },
+  data() {
+    return {
+      disabled: false,
+      imageUrl: '',
+      dataFormD: {},
+      visible: false,
+      loading: false,
+      msg: '',
+      uploadImgUrl: process.env.VUE_APP_BASE_API + '/common/upload', // 上传的图片服务器地址
+      headers: {
+        Authorization: 'Bearer ' + getToken()
       },
-      // 获取下拉选项
-      needCondition () {
-        // this.$http({
-        //   url: this.$http.adornUrl(`/fleet/companyMsg/list`),
-        //   method: 'post'
-        // }).then(({data}) => {
-        //   if (data && data.code === 0) {
-        //     this.optionsProjectTypeItem = data.list
-        //   } else {
-        //     this.$message.error(data.msg)
-        //   }
-        // })
+      dataRule: {
+        fleetCompanyId: [
+          { required: true, message: '请输入车队id', trigger: 'blur' }
+        ],
+        carNum: [
+          { required: true, message: '请输入车牌号', trigger: 'blur' }
+        ]
       },
-      // 表单提交
-      dataFormSubmit () {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            this.$http({
-              url: this.$http.adornUrl(`/fleet/carManage/${!this.dataForm.id ? 'save' : 'update'}`),
-              method: 'post',
-              data: this.$http.adornData(this.dataForm)
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                    this.visible = false
-                    this.$emit('refreshDataList')
-                  }
-                })
-              } else {
-                this.$message.error(data.msg)
-              }
-            })
-          }
+      optionsProjectTypeItem: [],
+      fileList: [],
+      dialogImageUrl: '',
+      dialogVisible: false
+    }
+  },
+  methods: {
+    success(response, file, fileList){
+      console.log(response, file, fileList)
+    },
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    init() {
+      this.visible = true
+      if (this.dataForm.Id) {
+        lookOver(this.dataForm.Id).then(data => {
+          console.log(data)
+          this.dataFormD = data.data
         })
-      }, // 图片上传回调
-      handleSuccess (response) {
-        // 这里可以写文件上传成功后的处理,但是一定要记得给imgPath赋值
-        console.log(response)
-        this.dataForm.drivingLicenseSrc = response.msg
-      },
-      handleSuccess1 (response) {
-        // 这里可以写文件上传成功后的处理,但是一定要记得给imgPath赋值
-        console.log(response)
-        this.dataForm.drivingPendantSrc = response.msg
-      },
-      handleSuccess2 (response) {
-        // 这里可以写文件上传成功后的处理,但是一定要记得给imgPath赋值
-        console.log(response)
-        this.dataForm.operationLicenseSrc = response.msg
-      },
-      handleSuccess3 (response) {
-        // 这里可以写文件上传成功后的处理,但是一定要记得给imgPath赋值
-        console.log(response)
-        this.dataForm.technologySrc = response.msg
-      },
-      handleSuccess4 (response) {
-        // 这里可以写文件上传成功后的处理,但是一定要记得给imgPath赋值
-        console.log(response)
-        this.dataForm.drivingLoadSrc = response.msg
-      },
-      handleSuccess5 (response) {
-        // 这里可以写文件上传成功后的处理,但是一定要记得给imgPath赋值
-        console.log(response)
-        this.dataForm.secondLvMaintainSrc = response.msg
-      },
-      handleSuccess6 (response) {
-        // 这里可以写文件上传成功后的处理,但是一定要记得给imgPath赋值
-        console.log(response)
-        this.dataForm.tafficConstranintInsuranceSrc = response.msg
-      },
-      handleSuccess7 (response) {
-        // 这里可以写文件上传成功后的处理,但是一定要记得给imgPath赋值
-        console.log(response)
-        this.dataForm.businessInsuranceSrc = response.msg
-      },
-      handleSuccess8 (response) {
-        // 这里可以写文件上传成功后的处理,但是一定要记得给imgPath赋值
-        console.log(response)
-        this.dataForm.accpetCarrageInsuranceSrc = response.msg
-      },
-      // 文件列表移除文件时的钩子
-      handleRemove (response) {
-        this.dataForm.imgPath = ''
       }
+    },
+    handleSelect(query) {
+      company(query).then(data => {
+        console.log(data)
+        this.optionsProjectTypeItem = data.rows
+      })
+    },
+    // 表单提交
+    dataFormSubmit() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          preservation(this.dataForm).then(data => {
+            if (data && data.code === 200) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.visible = false
+                  this.$emit('refreshDataList')
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }
+      })
     }
   }
+}
 </script>
 <style scoped>
 
@@ -391,10 +236,39 @@
   margin-bottom: 20px;
   display: inline-block;
 }
+
 .el-select {
   display: block;
 }
+
 .upload-demo {
   margin-left: 50px;
 }
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
 </style>

src/views/basicdata/fleet/companyMsg-add-or-update.vue

@@ -240,7 +240,7 @@ export default {
         if (valid) {
           console.log(valid)
           preservation(this.dataForm_s).then(data=>{
-            console.log(data)
+            this.$message.success('操作成功');
           })
         }
       })

src/views/finance/charge/index.vue

@@ -107,7 +107,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="chargeList" @selection-change="handleSelectionChange" show-summary :summary-method="listTotal">
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="60" align="center"/>
       <el-table-column label="序号" type="index" width="55" align="center"/>
       <el-table-column label="系统编号" :show-overflow-tooltip="true" align="center" prop="fBillno" width="120"/>
       <el-table-column label="货权方" :show-overflow-tooltip="true" align="center" prop="fCtrlcorpid" width="120"/>

src/views/finance/contrast/index.vue

@@ -127,7 +127,7 @@
       show-summary
       :summary-method="listTotal"
     >
-      <el-table-column width="50" align="center" type="selection"/>
+      <el-table-column width="60" align="center" type="selection"/>
       <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
       <el-table-column label="行号" align="center" type="index"/>
       <el-table-column label="系统编号" align="center" prop="fBillno" show-overflow-tooltip width="120"/>

src/views/finance/payment/index.vue

@@ -107,7 +107,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="chargeList" @selection-change="handleSelectionChange" show-summary :summary-method="listTotal">
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="60" align="center"/>
       <el-table-column label="序号" type="index" width="55" align="center"/>
       <el-table-column label="系统编号" :show-overflow-tooltip="true" align="center" prop="fBillno" width="120"/>
       <el-table-column label="货权方" :show-overflow-tooltip="true" align="center" prop="fCtrlcorpid" width="120"/>

src/views/reportManagement/Statistics/index.vue

@@ -131,7 +131,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="whgenlegList">
+    <el-table v-loading="loading" :data="whgenlegList" show-summary :summary-method="getSum">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="行号" align="center" />
       <el-table-column label="客户" align="center" prop="fName" show-overflow-tooltip width="120"/>
@@ -369,6 +369,29 @@ export default {
     })
   },
   methods: {
+    //合计
+    getSum(param){
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总计'
+        } else if (index ===9 || index ===10 || index ===11 ) {
+          const values = data.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)
+          }
+        }
+      })
+      return sums
+    },
     treeseLect(tree){
       this.queryParams.fWarehouseid = tree.id
     },

src/views/reportManagement/whgenleg/index.vue

@@ -120,7 +120,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="whgenlegList">
+    <el-table v-loading="loading" :data="whgenlegList" show-summary :summary-method="getSum">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="行号" align="center" width="120"/>
       <el-table-column label="客户" align="center" prop="fCorpid" show-overflow-tooltip width="120"/>
@@ -346,6 +346,29 @@ export default {
     })
   },
   methods: {
+    //合计
+    getSum(param){
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总计'
+        } else if (index ===13  || index ===10 || index ===11 || index ===12 || index ===14 || index ===15 || index ===16 || index ===17 || index ===18) {
+          const values = data.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)
+          }
+        }
+      })
+      return sums
+    },
     treeseLect(tree){
       this.queryParams.fWarehouseLocationid = tree.id
     },

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -245,7 +245,7 @@
       show-summary :summary-method="getSum"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="60" align="center"/>
       <el-table-column type="index" label="行号" align="center"/>
       <el-table-column  label="制单人" align="center" prop="createBy" />
       <el-table-column
@@ -2769,7 +2769,7 @@
                 this.$message.error('请维护主表计费单位为件数、毛重(kg)或净重(kg)')
                 return false
               }
-              if (!this.dataList[li].fWarehouselocids) {
+              if (!this.dataList[li].fWarehouselocid) {
                 this.$message({ message: '请维护第' + Number(li) + 1 + '行库区', type: 'warning' })
                 return false
               }

src/views/warehouseBusiness/inStock/index.vue

@@ -270,7 +270,7 @@
       @selection-change="handleSelectionChange"
       show-summary :summary-method="getSum"
     >
-      <el-table-column type="selection" width="55" fixed align="center" />
+      <el-table-column type="selection" width="60" fixed align="center" />
       <el-table-column type="index" label="行号" align="center" fixed/>
       <el-table-column  label="制单人" align="center" prop="createBy" fixed/>
       <el-table-column
@@ -464,7 +464,7 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="业务日期" prop="fBsdate">
+            <el-form-item label="入库日期" prop="fBsdate">
               <el-date-picker
                 v-model="form.fBsdate"
                 style="width: 80%"
@@ -472,7 +472,7 @@
                 :disabled="browseStatus || formBrowseStatus"
                 @change="changefBsdate"
                 value-format="timestamp"
-                placeholder="业务日期"
+                placeholder="入库日期"
               >
               </el-date-picker>
             </el-form-item>
@@ -725,7 +725,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="15">
+          <el-col :span="14">
             <el-form-item label="备注" prop="remark">
               <el-input
                 style="width: 100%"
@@ -736,12 +736,24 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="2">
             <el-form-item>
               <el-button @click="detailsHidden ? (detailsHidden = false) : (detailsHidden = true)">{{ detailsHidden ? '隐藏' : '展开' }}
               </el-button>
             </el-form-item>
-
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="fChargedate">
+              <el-date-picker
+                v-model="form.fChargedate"
+                type="date"
+                style="width:80%"
+                :disabled="browseStatus || formBrowseStatus"
+                value-format="timestamp"
+                placeholder="仓储费计算日期"
+              >
+              </el-date-picker>
+            </el-form-item>
           </el-col>
         </el-row>
 
@@ -3955,6 +3967,11 @@ export default {
           fMarks:this.form.fMarks,
           fBusinessType:this.form.fBusinessType
         });
+          this.fWbuOptions = []
+          let queryParams = { pageNum: 1, pageSize: 10};
+          listFees(queryParams).then((response) => {
+            this.fWbuOptions = response.rows;
+          });
       }
     },
     addpayment() {
@@ -3980,6 +3997,11 @@ export default {
           fMarks: this.form.fMarks,
           fBusinessType: this.form.fBusinessType
         });
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       }
     },
     queryUser() {
@@ -4135,6 +4157,7 @@ export default {
         for (let whgen in this.dialogWhgenlegList) {
           let feeId = this.dialogWhgenlegList[whgen].feeFId;
           getFees(feeId).then((response) => {
+            console.log(response)
             this.fWbuOptions.push(response.data);
           });
           let qty = 1;
@@ -4179,7 +4202,11 @@ export default {
         for (let zhgen in this.dialogWhgenlegList) {
           let feeId = this.dialogWhgenlegList[zhgen].feeFId;
           getFees(feeId).then((response) => {
-            this.fWbuOptions.push(response.data);
+            this.fWbuOptions = []
+            let queryParams = { pageNum: 1, pageSize: 10};
+            listFees(queryParams).then((response) => {
+              this.fWbuOptions = response.rows;
+            });
           });
           let qty = 1;
           if (this.dialogWhgenlegList[zhgen].fFeeUnitid == 1) {
@@ -4428,6 +4455,10 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(status) {
+      let queryParams = {pageNum: 1, pageSize: 10};
+      listFees(queryParams).then((response) => {
+        this.fWbuOptions = response.rows;
+      });
       this.reset()
       this.form = {
         fItemsStatus: null,
@@ -4470,10 +4501,11 @@ export default {
           }
           this.$set(this.form, "fEta", Date.parse(this.form.fEta));
           this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
+          this.$set(this.form, "fFeeUnitid", this.form.fFeeunitid + "");
           this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
           this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
           this.$set(this.form, "createTime", Date.parse(this.form.createTime));
-          this.$set(this.form, "fFeeUnitid", this.form.fFeeunitid + "");
+          this.$set(this.form, "fChargedate", Date.parse(this.form.fChargedate));
           this.$set(this.form, "fPlannetweight", this.form.fPlannetweight.toFixed(2));
           this.$set(this.form, "fPlangrossweight", this.form.fPlangrossweight.toFixed(2));
         }
@@ -4536,10 +4568,16 @@ export default {
         this.open = true;
         this.title = "修改仓入库";
         this.warehousesssMethod()
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       });
       queryUserVal().then((response)=>{
         this.current = response.user.userName
       })
+
     },
     // 库存总账多选框
     whgenlegSelectionChange(selection) {
@@ -4709,6 +4747,7 @@ export default {
       }
     },
     changefBsdate(row) {
+      this.$set(this.form, 'fChargedate', row)
       if (this.dataList.length > 0) {
         for (var i = 0; i < this.dataList.length; i++) {
           this.$set(this.dataList[i], "fBsdate", row);
@@ -4811,10 +4850,11 @@ export default {
                 }
                 this.$set(this.form, "fEta", Date.parse(this.form.fEta));
                 this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
+                this.$set(this.form, "fFeeUnitid", this.form.fFeeunitid + "");
                 this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
                 this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
                 this.$set(this.form, "createTime", Date.parse(this.form.createTime));
-                this.$set(this.form, "fFeeUnitid", this.form.fFeeunitid + "");
+                this.$set(this.form, "fChargedate", Date.parse(this.form.fChargedate));
                 this.$set(this.form, "fPlannetweight", this.form.fPlannetweight.toFixed(2));
                 this.$set(this.form, "fPlangrossweight", this.form.fPlangrossweight.toFixed(2));
               }
@@ -5062,6 +5102,7 @@ export default {
                   this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
                   this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
                   this.$set(this.form, "createTime", Date.parse(this.form.createTime));
+                  this.$set(this.form, "fChargedate", Date.parse(this.form.fChargedate));
                   this.$set(this.form, "fFeeUnitid", this.form.fFeeunitid + "");
                   this.$set(this.form, "fPlannetweight", this.form.fPlannetweight.toFixed(2));
                   this.$set(this.form, "fPlangrossweight", this.form.fPlangrossweight.toFixed(2));
@@ -5217,6 +5258,7 @@ export default {
               this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
               this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
               this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
+              this.$set(this.form, "fChargedate", Date.parse(this.form.fChargedate));
               this.dataList = response.data.warehousebillsitems
               for (let list in this.dataList) {
                 this.$set(this.dataList[list], 'fBsdate', Date.parse(this.dataList[list].fBsdate))
@@ -5304,34 +5346,57 @@ export default {
             return false
           }
         }
-        for(let item in this.warehouseDrList){
-          if(!this.warehouseDrList[item].fCorpid){
-            this.$message.error("请维护收款信息第"+ (Number(item)+1) +"行客户名称")
-            return false
+
+        for(let item in this.warehouseDrList) {
+          if (!this.warehouseDrList[item].fCorpid) {
+            if (item === 'fBusinessType') {
+              console.log(item)
+            } else {
+              console.log(this.warehouseDrList[item].fCorpid)
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行客户名称")
+              return false
+            }
           }
-          if(!this.warehouseDrList[item].fFeeid){
-            this.$message.error("请维护收款信息第"+ (Number(item)+1) +"行费用名称")
-            return false
+          if (!this.warehouseDrList[item].fFeeid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行费用名称")
+              return false
+            }
           }
-          if(!this.warehouseDrList[item].fFeeUnitid){
-            this.$message.error("请维护收款信息第"+ (Number(item)+1) +"行计价单位")
-            return false
+          if (!this.warehouseDrList[item].fFeeUnitid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行计价单位")
+              return false
+            }
           }
         }
-        for(let item in this.warehouseCrList){
-          if(!this.warehouseCrList[item].fCorpid){
-            this.$message.error("请维护付款信息第"+ (Number(item)+1) +"行客户名称")
-            return false
+        for(let item in this.warehouseCrList) {
+          if (!this.warehouseCrList[item].fCorpid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行客户名称")
+              return false
+            }
           }
-          if(!this.warehouseCrList[item].fFeeid){
-            this.$message.error("请维护付款信息第"+ (Number(item)+1) +"行费用名称")
-            return false
+          if (!this.warehouseCrList[item].fFeeid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行费用名称")
+              return false
+            }
           }
-          if(!this.warehouseCrList[item].fFeeUnitid){
-            this.$message.error("请维护付款信息第"+ (Number(item)+1) +"行计价单位")
-            return false
+
+          if (!this.warehouseCrList[item].fFeeUnitid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行计价单位")
+              return false
+            }
           }
         }
+
         if (valid) {
           this.form.fBillstatus = status
           this.form.fNetweight = this.fNetweight

src/views/warehouseBusiness/outStock/index.vue

@@ -255,7 +255,7 @@
       @selection-change="handleSelectionChange"
       show-summary :summary-method="getSum"
     >
-      <el-table-column type="selection" width="55" fixed align="center" />
+      <el-table-column type="selection" width="60" fixed align="center" />
       <el-table-column type="index" label="行号" fixed align="center" />
       <el-table-column  label="制单人" align="center" prop="createBy" fixed/>
       <el-table-column
@@ -3668,11 +3668,17 @@ export default {
             }
           }
         }
-        if (!haveGoods) {
-          getFees(feeId).then((response) => {
-            this.fWbuOptions.push(response.data)
-          })
-        }
+        // if (!haveGoods) {
+        //   console.log("111")
+        //
+        // }
+        getFees(feeId).then((response) => {
+          this.fWbuOptions = []
+          let queryParams = { pageNum: 1, pageSize: 10 };
+          listFees(queryParams).then((response) => {
+            this.fWbuOptions = response.rows;
+          });
+        })
         let qty = 1;
         if (this.dialogWhgenlegList[zhgen].fFeeUnitid === 1) {
           qty = this.fQty
@@ -4045,6 +4051,11 @@ export default {
           fMarks: this.form.fMarks,
           fBusinessType: this.form.fBusinessType
         });
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       }
     },
     //仓库电话、仓库联系人带入
@@ -4077,6 +4088,11 @@ export default {
           fMarks: this.form.fMarks,
           fBusinessType: this.form.fBusinessType
         });
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       }
     },
     queryUser() {
@@ -4375,6 +4391,11 @@ export default {
         this.open = true;
         this.title = "修改仓入库";
         this.warehousesssMethod()
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       });
       queryUserVal().then((response)=>{
         this.current = response.user.userName
@@ -5063,20 +5084,55 @@ export default {
           }
         }
 
-        // for (let index in this.warehouseDrList) {
-        //   if (!this.warehouseDrList[index].fCorpid) {
-        //     console.log(index)
-        //     console.log(this.warehouseDrList[index].fCorpid)
-        //     this.$message.error('请选择客户名称')
-        //     return false
-        //   }
-        // }
-        // for (let list in this.warehouseCrList) {
-        //   if (!this.warehouseCrList[list].fCorpid) {
-        //     this.$message.error('请选择客户名称')
-        //     return false
-        //   }
-        // }
+        for(let item in this.warehouseDrList) {
+          if (!this.warehouseDrList[item].fCorpid) {
+            if (item === 'fBusinessType') {
+              console.log(item)
+            } else {
+              console.log(this.warehouseDrList[item].fCorpid)
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行客户名称")
+              return false
+            }
+          }
+          if (!this.warehouseDrList[item].fFeeid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行费用名称")
+              return false
+            }
+          }
+          if (!this.warehouseDrList[item].fFeeunitid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行计价单位")
+              return false
+            }
+          }
+        }
+        for(let item in this.warehouseCrList) {
+          if (!this.warehouseCrList[item].fCorpid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行客户名称")
+              return false
+            }
+          }
+          if (!this.warehouseCrList[item].fFeeid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行费用名称")
+              return false
+            }
+          }
+
+          if (!this.warehouseCrList[item].fFeeunitid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行计价单位")
+              return false
+            }
+          }
+        }
         if (valid) {
           setTimeout(() => {
             this.form.fBillstatus = status

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -256,7 +256,7 @@
       show-summary :summary-method="getSum"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" fixed align="center" />
+      <el-table-column type="selection" width="60" fixed align="center" />
       <el-table-column type="index" label="行号" fixed align="center" />
       <el-table-column  label="制单人" align="center" prop="createBy" fixed/>
       <el-table-column
@@ -3515,11 +3515,18 @@ export default {
             }
           }
         }
-        if (!haveGoods) {
-          getFees(feeId).then((response) => {
-            this.fWbuOptions.push(response.data)
-          })
-        }
+        getFees(feeId).then((response) => {
+          this.fWbuOptions = []
+          let queryParams = { pageNum: 1, pageSize: 10 };
+          listFees(queryParams).then((response) => {
+            this.fWbuOptions = response.rows;
+          });
+        })
+        // if (!haveGoods) {
+        //   getFees(feeId).then((response) => {
+        //     this.fWbuOptions.push(response.data)
+        //   })
+        // }
         let qty = 1;
         if (this.dialogWhgenlegList[zhgen].fFeeUnitid === 1) {
           qty = this.fQty
@@ -3759,6 +3766,11 @@ export default {
           fMarks:this.form.fMarks,
           fBusinessType: this.form.fBusinessType
         });
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       }
     },
     addpayment() {
@@ -3782,6 +3794,11 @@ export default {
           fMarks: this.form.fMarks,
           fBusinessType: this.form.fBusinessType
         });
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       }
     },
     queryUser() {
@@ -4247,6 +4264,11 @@ export default {
         this.title = "修改调拨";
 
         this.warehousesssMethod()
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       });
     },
     // 数量计算
@@ -4884,18 +4906,55 @@ export default {
             return false
           }
         }
-        // for (let list in this.warehouseDrList) {
-        //   if (!this.warehouseDrList[list].fCorpid) {
-        //     this.$message.error('请选择客户名称')
-        //     return false
-        //   }
-        // }
-        // for (let list in this.warehouseCrList) {
-        //   if (!this.warehouseCrList[list].fCorpid) {
-        //     this.$message.error('请选择客户名称')
-        //     return false
-        //   }
-        // }
+        for(let item in this.warehouseDrList) {
+          if (!this.warehouseDrList[item].fCorpid) {
+            if (item === 'fBusinessType') {
+              console.log(item)
+            } else {
+              console.log(this.warehouseDrList[item].fCorpid)
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行客户名称")
+              return false
+            }
+          }
+          if (!this.warehouseDrList[item].fFeeid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行费用名称")
+              return false
+            }
+          }
+          if (!this.warehouseDrList[item].fFeeunitid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行计价单位")
+              return false
+            }
+          }
+        }
+        for(let item in this.warehouseCrList) {
+          if (!this.warehouseCrList[item].fCorpid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行客户名称")
+              return false
+            }
+          }
+          if (!this.warehouseCrList[item].fFeeid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行费用名称")
+              return false
+            }
+          }
+
+          if (!this.warehouseCrList[item].fFeeunitid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行计价单位")
+              return false
+            }
+          }
+        }
         if (valid) {
           setTimeout(() => {
             this.form.fBillstatus = status

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -296,14 +296,14 @@
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item label="客户名称" prop="fCorpid">
               <el-select
                 v-model="form.fCorpid"
                 filterable
                 remote
                 :disabled="browseStatus"
-                style="width: 80%"
+                style="width:80%"
                 :remote-method="corpsRemoteMethod"
                 placeholder="请输入模糊查找"
               >
@@ -316,11 +316,12 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item label="货品名称" prop="fGoodsid">
               <el-select
                 v-model="form.fGoodsid"
                 filterable
+                style="width:80%"
                 :disabled="browseStatus"
                 remote
                 :remote-method="goodsRemoteMethod"
@@ -335,22 +336,25 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item label="提单号" prop="fMblno">
               <el-input
                 v-model="form.fMblno"
-                style="width: 80%"
+                style="width:80%"
                 :disabled="browseStatus"
                 placeholder="手工输入"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+        </el-row>
+        <el-row>
+        <el-col :span="8">
             <el-form-item disabled label="仓储费截止日期" prop="fBillingDeadline">
               <el-date-picker
                 v-model="form.fBillingDeadline"
                 size="large"
                 type="date"
+                style="width:80%"
                 :disabled="browseStatus"
                 value-format="timestamp"
                 placeholder="仓储费计算截止日期"
@@ -358,54 +362,55 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item label="业务编号" prop="fBillno">
               <el-input
                 disabled
                 v-model="form.fBillno"
-                style="width: 80%"
+                style="width:80%"
                 placeholder="业务编号"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item label="制单人" prop="createBy">
               <el-input
                 disabled
                 v-model="form.createBy"
-                style="width: 80%"
+                style="width:80%"
                 placeholder="制单人"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item disabled label="制单日期" prop="fbilldate">
               <el-date-picker
                 v-model="form.createTime"
                 size="large"
                 type="date"
                 disabled
-                style="width:200px"
+                style="width:80%"
                 value-format="timestamp"
                 placeholder="制单日期"
               >
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item disabled label="备注" prop="remark">
               <el-input
+                style="width:80%"
                 :disabled="browseStatus"
                 v-model="form.remark"
-                placeholder="制单人"
+                placeholder=""
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div style="font-size:18px">
+      <div style="font-size:18px; padding-top:8px">
         计费物资明细
         <el-button :disabled="browseStatus" @click="calculateCost">计算仓储费</el-button>
         <el-button type="primary" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>
@@ -1466,8 +1471,11 @@
         this.disappear = false
         this.notChange = true
         this.browseStatus = status;
-        let data = row || this.ids;
-        getStorageFeeCalculation(data.fId).then((response) => {
+        let fId = row.fId || this.ids;
+        if (fId.length === 1){
+          fId = fId[0].fId
+        }
+        getStorageFeeCalculation(fId).then((response) => {
           this.fMblnoOptions = []
           if (response.data.corps) {
             this.fMblnoOptions.push(response.data.corps)