修改历史遗留问题

src/api/kaihe/domesticTrade/orderInformation.js

@@ -81,6 +81,29 @@ export function listFees(query) {
     params: query
   })
 }
+// 港口
+export function portInquiry(query) {
+  return request({
+    url: '/shipping/address/selectPortName',
+    method: 'get',
+    params: query
+  })
+}
+// 船名
+export function nameOfVessel(query) {
+  return request({
+    url: '/shipping/vessel/selectTVesselfNumber',
+    method: 'get',
+    params: query
+  })
+}
+// 航次
+export function voyageNumber() {
+  return request({
+    url: '/shipping/voyage/list',
+    method: 'get',
+  })
+}
 
 // 查询箱型
 export function getCntr(query) {

src/api/warehouseBusiness/shipping.js

@@ -41,3 +41,24 @@ export function addSeaprice(data) {
         data: data
     })
 }
+
+//航线明细
+export function listCorpsList() {
+    return request({
+        url: '/shipping/address/list',
+        method: 'get',
+        params: {
+            fTypes:4
+        }
+    })
+}
+//订舱代理公司
+export function shippingCompany() {
+    return request({
+        url: '/basicdata/corps/list',
+        method: 'get',
+        params: {
+            fTypeid:9
+        }
+    })
+}

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1197,7 +1197,7 @@
                   size="small"
                   :disabled="dataListSelection.length <= 0 || deliveryConfirmation"
                   @click="creditClick"
-              >入库确认{{ dataListSelection.length }}----{{ deliveryConfirmation }}
+              >入库确认
               </el-button>
               <el-button
                   size="small"
@@ -7674,6 +7674,8 @@ export default {
                 return
               }
             }
+          }else {
+            this.deliveryConfirmation = false
           }
         }
       }

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -5073,7 +5073,7 @@ export default {
                     return false;
                   }
                 }
-                if (!this.warehouseDrList[item].fFeeUnitid) {
+                if (!this.warehouseDrList[item].fBillingway) {
                   if (item === "fBusinessType") {
                   } else {
                     this.$message.error(
@@ -5103,11 +5103,11 @@ export default {
                   }
                 }
 
-                if (!this.warehouseCrList[item].fFeeUnitid) {
+                if (!this.warehouseDrList[item].fBillingway) {
                   if (item === "fBusinessType") {
                   } else {
                     this.$message.error(
-                        "请维护付款信息第" + (Number(item) + 1) + "行计价单位"
+                        "请维护收款信息第" + (Number(item) + 1) + "行计价单位"
                     );
                     return false;
                   }

src/views/appVersion/version/index.vue

@@ -117,15 +117,21 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
     <!-- 添加或修改APP版本信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="30" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="参数" prop="fParamkey">
           <el-input v-model="form.fParamkey" placeholder="请输入参数" />
         </el-form-item>
         <el-form-item label="参数值" prop="fParamvalue">
-          <el-input v-model="form.fParamvalue" placeholder="请输入参数" />
+          <el-input v-model="form.fParamvalue" placeholder="请输入参数" type="textarea" :rows="2" autosize style="width: 60%;"/>
+<!--          <el-upload-->
+<!--              class="upload-demo"-->
+<!--              :action="actionUrl"-->
+<!--              :headers="headers"-->
+<!--              multiple>-->
+<!--            <el-button size="small" type="primary">点击上传</el-button>-->
+<!--          </el-upload>-->
         </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="form.fStatus" placeholder="请选择状态">
@@ -150,6 +156,7 @@
 
 <script>
 import { listVersion, getVersion, delVersion, addVersion, updateVersion, exportVersion } from "@/api/appVersion/version";
+import {getToken} from "@/utils/auth";
 
 export default {
   name: "Version",
@@ -157,6 +164,12 @@ export default {
   },
   data() {
     return {
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      actionUrl:
+          process.env.VUE_APP_BASE_API +
+          "/warehouseBusiness/inStock/importInstock", // 上传的图片服务器地址
       // 遮罩层
       loading: true,
       // 选中数组
@@ -253,6 +266,7 @@ export default {
       const fId = row.fId || this.ids
       getVersion(fId).then(response => {
         this.form = response.data;
+        this.form.fStatus = JSON.stringify(this.form.fStatus)
         this.open = true;
         this.title = "修改APP版本信息";
       });

src/views/fleet/plans/AddOrUpdate.vue

@@ -953,7 +953,6 @@ export default {
                 this.$parent.getList();
                 this.showDialog = false;
                 if (response.code === 200){
-                  console.log(this.form)
                   changeStatus(this.form.id)
                 }
               });

src/views/kaihe/domesticTrade/myOrder/index.vue

@@ -203,8 +203,8 @@
       </span>
     </el-dialog>
     <el-table v-loading="loading" :data="corpsList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="行号" align="center" type="index" fixed/>
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="行号" align="center" type="index"/>
       <el-table-column
         v-for="(item, index) in getRowList"
         :key="index"
@@ -363,7 +363,6 @@
             surface: "1",
             label: "fBillno",
             name: "订舱号",
-            fixed:"left",
             checked: 0,
             width: 120,
           },
@@ -371,7 +370,6 @@
             surface: "2",
             label: "fServiceitems",
             name: "运输条款",
-            fixed:"left",
             checked: 0,
             width: 120,
           },
@@ -379,7 +377,6 @@
             surface: "3",
             label: "fConsigneername",
             name: "收货人",
-            fixed:"left",
             checked: 0,
             width: 120,
           },
@@ -387,7 +384,6 @@
             surface: "4",
             label: "fName",
             name: "航线",
-            fixed:"left",
             checked: 0,
             width: 120,
           },
@@ -395,7 +391,6 @@
             surface: "5",
             label: "fNo",
             name: "箱型",
-            fixed:"left",
             checked: 0,
             width: 120,
           },
@@ -403,7 +398,6 @@
             surface: "6",
             label: "fCntrcount",
             name: "箱量",
-            fixed:"left",
             checked: 0,
             width: 120,
           },

src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -37,23 +37,47 @@
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="起运港口" prop="loadportidName">
-                <el-input
-                  v-model="form.loadportidName"
-                  size="small"
-                  style="width: 100%"
-                  :disabled="modify"
-                />
+              <el-form-item label="起运港口" prop="fDestportid">
+                <el-select
+                    v-model="form.fLoadportid"
+                    filterable
+                    remote
+                    style="width: 100%;"
+                    :disabled="modify"
+                    class="elSelect"
+                    placeholder="请输入模糊查找目的港口"
+                >
+                  <el-scrollbar>
+                    <el-option
+                        v-for="(dict, index) in fMblnoOptions"
+                        :key="dict.fId"
+                        :label="dict.fName"
+                        :value="dict.fId"
+                    ></el-option>
+                  </el-scrollbar>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="目的港口" prop="destportidName">
-                <el-input
-                  v-model="form.destportidName"
-                  :disabled="modify"
-                  size="small"
-                  style="width: 100%"
-                />
+              <el-form-item label="目的港口" prop="destportid">
+                <el-select
+                    v-model="form.fDestportid"
+                    filterable
+                    remote
+                    style="width: 100%;"
+                    :disabled="modify"
+                    class="elSelect"
+                    placeholder="请输入模糊查找目的港口"
+                >
+                  <el-scrollbar>
+                    <el-option
+                        v-for="(dict, index) in fMblnoOptions"
+                        :key="dict.fId"
+                        :label="dict.fName"
+                        :value="dict.fId"
+                    ></el-option>
+                  </el-scrollbar>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -156,24 +180,48 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="船名" prop="vslidName">
-                <el-input
-                  v-model="form.vslidName"
-                  :disabled="modify"
-                  size="small"
-                  style="width: 100%"
-                />
+              <el-form-item label="船名" prop="vslid">
+                <el-select
+                    v-model="form.fVslid"
+                    filterable
+                    remote
+                    style="width: 100%;"
+                    :disabled="modify"
+                    class="elSelect"
+                    placeholder="请输入模糊查找目的船名"
+                >
+                  <el-scrollbar>
+                    <el-option
+                        v-for="(dict, index) in vslidList"
+                        :key="dict.fId"
+                        :label="dict.fName"
+                        :value="dict.fId"
+                    ></el-option>
+                  </el-scrollbar>
+                </el-select>
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
               <el-form-item label="航次" prop="voyidName">
-                <el-input
-                  v-model="form.voyidName"
-                  :disabled="modify"
-                  size="small"
-                  style="width: 100%"
-                />
+                <el-select
+                    v-model="form.fVoyid"
+                    filterable
+                    remote
+                    style="width: 100%;"
+                    :disabled="modify"
+                    class="elSelect"
+                    placeholder="请输入模糊查找目的船名"
+                >
+                  <el-scrollbar>
+                    <el-option
+                        v-for="(dict, index) in voyidList"
+                        :key="dict.fId"
+                        :label="dict.fNo"
+                        :value="dict.fId"
+                    ></el-option>
+                  </el-scrollbar>
+                </el-select>
               </el-form-item>
             </el-col>
 
@@ -1393,6 +1441,9 @@ import {
   getFName,
   getfee,
   getName,
+  portInquiry,
+  nameOfVessel,
+  voyageNumber
 } from '@/api/kaihe/domesticTrade/orderInformation'
 import Global from '@/layout/components/global'
 import { getToken } from '@/utils/auth'
@@ -1469,6 +1520,8 @@ export default {
     return {
       insurance:[],
       etentioncargo:[],
+      vslidList:[],
+      voyidList:[],
       cEsign:[],
       transport:[],
       paymentMethod:[],
@@ -1517,6 +1570,7 @@ export default {
       doNot: true,
       activeNames: ['1', '2', '3', '4', '5', '6'],
       form: {},
+      fMblnoOptions:[],
       uploadImgUrl: process.env.VUE_APP_BASE_API + '/common/upload', // 上传的图片服务器地址
       relevantAttachments: [],
       headers: { Authorization: 'Bearer ' + getToken() },
@@ -1646,6 +1700,15 @@ export default {
     }
   },
   created() {
+    nameOfVessel().then(res =>{
+      this.vslidList = res.rows
+    })
+    voyageNumber().then(res =>{
+      this.voyidList = res.rows
+    })
+    portInquiry().then(res =>{
+      this.fMblnoOptions = res.rows;
+    })
     this.getDicts('data_unitfees').then((response) => {
       if (response.data) {
         this.jFeetunitOptions = response.data

src/views/morePage/stock/index.vue

@@ -38,9 +38,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label-width="100px" label="提单号" prop="actId">
+          <el-form-item label-width="100px" label="提单号" prop="refno3">
             <el-input
-              v-model="queryParams.actId"
+              v-model="queryParams.refno3"
               placeholder="请输入提单号"
               clearable
               size="small"

src/views/warehouse/Shipping/AddOrUpdate.vue

@@ -24,25 +24,6 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="100px">
       <el-row>
         <el-col :span="8">
-          <el-form-item label="业务类型" prop="fBilltype">
-            <el-select
-              size="small"
-              v-model="form.fBilltype"
-              placeholder="请选择结算方式"
-              clearable
-              style="width: 80%"
-              :disabled="formStatus"
-            >
-              <el-option
-                v-for="(item, index) in billTypeList"
-                :key="index.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="船公司" prop="fCorpid">
             <el-select
               size="small"
@@ -63,43 +44,21 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="状态" prop="fBillstatus">
-            <el-select
-              size="small"
-              clearable
-              filterable
-              placeholder="请选择"
-              style="width: 80%"
-              v-model="form.fBillstatus"
-              :disabled="formStatus"
-            >
-              <el-option
-                v-for="(item, index) in statusList"
-                :key="index.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
           <el-form-item label="起运港" prop="polId">
             <el-select
-              size="small"
-              v-model="form.polId"
-              clearable
-              filterable
-              placeholder="请输入关键词"
-              style="width: 80%"
-              :disabled="formStatus"
+                size="small"
+                v-model="form.polId"
+                clearable
+                filterable
+                placeholder="请输入关键词"
+                style="width: 80%"
+                :disabled="formStatus"
             >
               <el-option
-                v-for="(item, index) in polList"
-                :key="index.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
+                  v-for="(item, index) in polList"
+                  :key="index.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -107,23 +66,25 @@
         <el-col :span="8">
           <el-form-item label="目的港" prop="podId">
             <el-select
-              size="small"
-              v-model="form.podId"
-              clearable
-              filterable
-              placeholder="请输入关键词"
-              style="width: 80%"
-              :disabled="formStatus"
+                size="small"
+                v-model="form.podId"
+                clearable
+                filterable
+                placeholder="请输入关键词"
+                style="width: 80%"
+                :disabled="formStatus"
             >
               <el-option
-                v-for="(item, index) in podList"
-                :key="index.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
+                  v-for="(item, index) in podList"
+                  :key="index.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
               ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="有效期" prop="fValiddate">
             <el-date-picker
@@ -138,28 +99,109 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="8">
           <el-form-item label="录入人" prop="createBy">
             <el-input
-              size="small"
-              v-model="form.createBy"
-              style="width: 80%"
-              disabled
-              laceholder="录入人"
+                size="small"
+                v-model="form.createBy"
+                style="width: 80%"
+                disabled
+                laceholder="录入人"
             >
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="16">
+        <el-col :span="8">
+          <el-form-item label="业务类型" prop="fBilltype">
+            <el-select
+                size="small"
+                v-model="form.fBilltype"
+                placeholder="请选择结算方式"
+                clearable
+                style="width: 80%"
+                :disabled="formStatus"
+            >
+              <el-option
+                  v-for="(item, index) in billTypeList"
+                  :key="index.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="状态" prop="fBillstatus">
+            <el-select
+                size="small"
+                clearable
+                filterable
+                placeholder="请选择"
+                style="width: 80%"
+                v-model="form.fBillstatus"
+                :disabled="formStatus"
+            >
+              <el-option
+                  v-for="(item, index) in statusList"
+                  :key="index.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="航线" prop="fLineid">
+            <el-select
+                size="small"
+                clearable
+                filterable
+                placeholder="请选择"
+                style="width: 80%"
+                v-model="form.fLineid"
+                :disabled="formStatus"
+            >
+              <el-option
+                  v-for="(item, index) in fLineList"
+                  :key="index.fId"
+                  :label="item.fName"
+                  :value="item.fId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="订舱代理" prop="fBookagentid">
+            <el-select
+                size="small"
+                clearable
+                filterable
+                placeholder="请选择"
+                style="width: 80%"
+                v-model="form.fBookagentid"
+                :disabled="formStatus"
+            >
+              <el-option
+                  v-for="(item, index) in fBookagentList"
+                  :key="index.fId"
+                  :label="item.fName"
+                  :value="item.fId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
           <el-form-item label="备注" prop="remarks">
             <el-input
-              style="width: 92%"
-              v-model="form.remarks"
-              type="textarea"
-              placeholder="请输入内容"
-              :disabled="formStatus"
+                style="width: 94.5%"
+                v-model="form.remarks"
+                type="textarea"
+                placeholder="请输入内容"
+                :disabled="formStatus"
             />
           </el-form-item>
         </el-col>
@@ -574,6 +616,8 @@ import {
   saveSeaprice,
   addSeaprice,
   getForm,
+  listCorpsList,
+  shippingCompany
 } from "@/api/warehouseBusiness/shipping";
 import { listCorps } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
@@ -726,6 +770,8 @@ export default {
       formStatus: false,
       deleteItem0: [],
       deleteItem1: [],
+      fLineList: [],
+      fBookagentList: [],
     };
   },
   created() {
@@ -739,8 +785,16 @@ export default {
     });
     this.getDicts("data_billType").then((response) => {
       this.billTypeList = response.data;
+      console.log(this.billTypeList)
     });
+    listCorpsList().then( response =>{
+      this.fLineList = response.rows
+    })
+    shippingCompany().then( response =>{
+      this.fBookagentList = response.rows
+    })
     this.getDicts("data_status").then((response) => {
+      console.log(response.data)
       this.statusList = response.data;
     });
     this.getDicts("port_start").then((response) => {
@@ -892,10 +946,11 @@ export default {
     },
     TFformdata(data) {
       data.fBilltype = data.fBilltype ? data.fBilltype.toString() : null;
-      data.fBillstatus =
-        data.fBillstatus != null ? data.fBilltype.toString() : null;
+      data.fBillstatus = JSON.stringify(data.fBillstatus).length > 0?JSON.stringify(data.fBillstatus):null
       data.polId = data.polId ? data.polId.toString() : null;
       data.podId = data.podId ? data.podId.toString() : null;
+      data.fLineid = data.fLineid ? Number(data.fLineid):null
+      data.fBookagentid = data.fBookagentid ? Number(data.fBookagentid):null
       data.fValiddate = data.fValiddate ? Date.parse(data.fValiddate) : null;
       this.form = data;
     },
@@ -1106,15 +1161,15 @@ export default {
     },
     goBack() {
       this.$confirm("是否确定返回列表?", "提示", {
-        confirmButtonText: "保存",
-        cancelButtonText: "取消",
+        confirmButtonText: "确认返回",
+        cancelButtonText: "立即保存",
         type: "warning",
       })
         .then(() => {
-          this.saveForm();
+          this.cancel();
         })
         .catch(() => {
-          this.cancel();
+          this.saveForm();
         });
     },
   },

src/views/warehouse/Shipping/index.vue

@@ -120,6 +120,44 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item label="航线" prop="fLineid">
+                  <el-select
+                      size="small"
+                      clearable
+                      filterable
+                      placeholder="请选择"
+                      style="width: 80%"
+                      v-model="queryParams.fLineid"
+                  >
+                    <el-option
+                        v-for="(item, index) in fLineList"
+                        :key="index.fId"
+                        :label="item.fName"
+                        :value="item.fId"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="订舱代理" prop="fBookagentid">
+                  <el-select
+                      size="small"
+                      clearable
+                      filterable
+                      placeholder="请选择"
+                      style="width: 80%"
+                      v-model="queryParams.fBookagentid"
+                  >
+                    <el-option
+                        v-for="(item, index) in fBookagentList"
+                        :key="index.fId"
+                        :label="item.fName"
+                        :value="item.fId"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
           </div>
         </el-collapse-transition>
@@ -404,7 +442,7 @@
 
 <script>
 import AddOrUpdate from "./AddOrUpdate.vue";
-import { query } from "@/api/warehouseBusiness/shipping";
+import {listCorpsList, query, shippingCompany} from "@/api/warehouseBusiness/shipping";
 import { listCorps } from "@/api/basicdata/corps";
 import { listWarehousesss } from "@/api/basicdata/warehouse";
 import { listGoods } from "@/api/basicdata/goods";
@@ -436,6 +474,8 @@ export default {
       fTrademodeidOptions: [],
       warehouseOptions: [],
       goodsOptions: [],
+      fLineList:[],
+      fBookagentList:[],
       fMblnoOptions: [],
       show: false,
       drag: false,
@@ -488,9 +528,21 @@ export default {
           name: "录入人",
           checked: 0,
           width: 100,
+        },{
+          surface: "6",
+          label: "fLineName",
+          name: "航线",
+          checked: 0,
+          width: 100,
+        },{
+          surface: "7",
+          label: "fBookagentName",
+          name: "订舱代理",
+          checked: 0,
+          width: 100,
         },
         {
-          surface: "6",
+          surface: "8",
           label: "remarks",
           name: "备注",
           checked: 0,
@@ -529,6 +581,12 @@ export default {
     listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
       this.warehouseOptions = response.rows;
     });
+    listCorpsList().then( response =>{
+      this.fLineList = response.rows
+    })
+    shippingCompany().then( response =>{
+      this.fBookagentList = response.rows
+    })
     listUser().then((response) => {
       this.userOptions = response.rows;
     });

vue.config.js

@@ -35,14 +35,15 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://192.168.1.143:9010/`,
+        // target: `http://124.70.179.5:9010/`,
         // target: `https://test.fms.tubaosoft.com/prod-api/`,
-        // target: `http://test.wms.tubaosoft.com/prod-api/`,
+        // target: `https://test.wms.tubaosoft.com/prod-api/`,
         // target: `https://zd.tubaosoft.com/prod-api/`,
         // target: `https://jianqiao.tubaosoft.com/prod-api/`,
         // target: `https://jiyong.tubaosoft.com/prod-api/`,
         // target: `https://dmu.tubaosoft.com/prod-api/`,
-        // target: `http://jingang.tubaosoft.com/prod-api/`,
-        target: `https://op.khzclogistics.com/prod-api/`,
+        target: `http://jingang.tubaosoft.com/prod-api/`,
+        // target: `https://op.khzclogistics.com/prod-api/`,
         // 华为10M
         // target: `http://121.36.212.131:9010/`,
         // target: `http://121.36.212.131:9020/`,