소스 검색

Merge remote-tracking branch 'origin/bf_dev' into bf_dev

lazhaoqian 4 년 전
부모
커밋
d4d3a8b6b9

+ 7 - 0
src/api/kaihe/shipDynamics/vesselDetail.js

@@ -8,6 +8,13 @@ export function listCorps(query) {
     params: query
   })
 }
+//查询航线
+export function routeSelection() {
+  return request({
+    url: '/shipping/address/selectAirLineName',
+    method: 'get'
+  })
+}
 
 // 查询港口详情详细
 export function getCorps(fId) {

+ 1 - 1
src/utils/request.js

@@ -10,7 +10,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 100000
 })
 // request拦截器
 service.interceptors.request.use(config => {

+ 3 - 3
src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -86,7 +86,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8" v-if="true">
-          <el-form-item label="计费单位" prop="fFeetUnit">
+          <el-form-item :label="'计费1单位'+form.fFeetUnit" prop="fFeetUnit">
             <el-select
                 v-model="form.fFeetUnit"
                 placeholder="请选择计费单位"
@@ -7092,7 +7092,6 @@ export default {
       //if (this.form.fId) fId = this.form.fId
       getWarehousebills(fId).then((response) => {
         this.TFformdata(response.data.warehousebills);
-        console.log(this.copyStatus)
         if (!this.copyStatus || this.recordStatus === true) {
           if (response.data.warehouseBillsItem) {
             response.data.warehouseBillsItem.map((e) => {
@@ -7141,7 +7140,7 @@ export default {
           this.$set(this.form, "fNetweight", 0);
           this.$set(this.form, "fPlanvolumn", 0);
           this.$set(this.form, "fGrossweight", 0);
-          this.recordStatus = true
+          // this.recordStatus = true
         }
       });
     },
@@ -7487,6 +7486,7 @@ export default {
               } else {
                 this.form.fMarks = "";
               }
+              this.$set(this.form,'fFeetunit',this.form.fFeetUnit)
               formData.append("tWarehouseBills", JSON.stringify(this.form));
               // 库存明细
               formData.append(

+ 1 - 0
src/views/Warehousing/inStock/index.vue

@@ -940,6 +940,7 @@ export default {
       const fId = row.fId || this.ids[0] || row;
       this.copyStatus = null;
       this.formId = fId;
+      console.log(this.formId)
       this.$nextTick(() => {
         this.$refs.addOrUpdateRef.init();
       });

+ 1 - 1
src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -5064,7 +5064,7 @@ export default {
           this.$set(this.form, "fId", null);
           this.$set(this.form, "fMblno", null);
           this.$set(this.form, "fMarks", null);
-          this.$set(this.form, "fProductName", null);
+          this.$set(this.form, "fProductName",null);
           this.$set(this.form, "fNetweight", 0);
           this.$set(this.form, "fPlanvolumn", 0);
           this.$set(this.form, "fGrossweight", 0);

+ 38 - 10
src/views/kaihe/containerNews/boxInformation/index.vue

@@ -45,7 +45,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="箱主" prop="fOwner">
+        <el-form-item label="租贷公司" prop="fOwner">
           <el-select
             v-model="queryParams.fOwner"
             style="width: 200px"
@@ -359,7 +359,7 @@
         </div>
       </template>
 
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="箱号" prop="fNo">
@@ -409,12 +409,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="箱主" prop="fOwner">
+            <el-form-item label="租贷公司" prop="fOwner">
               <el-select
                 v-model="form.fOwner"
                 style="width: 80%"
                 :disabled="doNot"
-                placeholder="请选择箱主"
+                placeholder="请选择租贷公司"
               >
                 <el-option
                   v-for="dict in ownerOptions"
@@ -514,9 +514,19 @@
               </span>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同协议号" prop="fPactDealHorn">
+              <el-input v-model="form.fPactDealHorn" style="width: 80%" placeholder="请输入合同协议号" :disabled="doNot"/>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item label="箱公司" prop="fBoxLord">
+              <el-input v-model="form.fBoxLord" style="width: 80%" placeholder="请输入箱公司" :disabled="doNot"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input
                 v-model="form.remark"
@@ -613,12 +623,12 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="fOwner" label="箱主" align="center">
+        <el-table-column prop="fOwner" label="租贷公司" align="center">
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.fOwner"
               style="width: 80%"
-              placeholder="请选择箱主"
+              placeholder="请选择租贷公司"
             >
               <el-option
                 v-for="dict in ownerOptions"
@@ -803,7 +813,7 @@ export default {
         {
           surface: '4',
           label: 'ownerName',
-          name: '箱主',
+          name: '租贷公司',
           fixed: 'left',
           checked: 0,
           width: 120
@@ -890,6 +900,18 @@ export default {
           name: '箱龄(月)',
           checked: 0,
           width: 120
+        },{
+          surface: '17',
+          label: 'fPactDealHorn',
+          name: '合同协议号',
+          checked: 0,
+          width: 120
+        },{
+          surface: '18',
+          label: 'fBoxLord',
+          name: '箱公司',
+          checked: 0,
+          width: 120
         }
       ],
       //自定义列宽
@@ -980,11 +1002,17 @@ export default {
           { required: true, message: '最新地点不能为空', trigger: 'blur' }
         ],
         fOwner: [
-          { required: true, message: '箱主不能为空', trigger: 'blur' }
+          { required: true, message: '租贷公司不能为空', trigger: 'blur' }
         ],
         fUpdateef: [
           { required: true, message: '空重不能为空', trigger: 'blur' }
         ],
+        fPactDealHorn: [
+          { required: true, message: '合同协议号不能为空', trigger: 'blur' }
+        ],
+        fBoxLord: [
+          { required: true, message: '箱公司不能为空', trigger: 'blur' }
+        ],
         fCntrstatus: [
           { required: true, message: '箱状态不能为空', trigger: 'blur' }
         ]
@@ -1087,7 +1115,7 @@ export default {
           return this.$message.error('第' + i + '行最新地点不能为空')
         }
         if (!this.boxLeadIn[item].fOwner) {
-          return this.$message.error('第' + i + '行箱主不能为空')
+          return this.$message.error('第' + i + '行租贷公司不能为空')
         }
         if (!this.boxLeadIn[item].fSource) {
           return this.$message.error('第' + i + '行箱来源不能为空')

+ 1 - 16
src/views/kaihe/domesticTrade/myOrder/index.vue

@@ -218,23 +218,8 @@
         sortable
       >
         <template slot-scope="scope">
-          <span v-if="item.label == 'fBillno'">{{scope.row.fBillno}}</span>
-          <span v-if="item.label == 'fServiceitems'">{{scope.row.fServiceitems}}</span>
-          <span v-if="item.label == 'fConsigneername'">{{scope.row.fConsigneername}}</span>
-          <span v-if="item.label == 'fName'">{{scope.row.fName}}</span>
-          <span v-if="item.label == 'fNo'">{{scope.row.fNo}}</span>
-          <span v-if="item.label == 'fCntrcount'">{{scope.row.fCntrcount}}</span>
-          <span v-if="item.label == 'fBsdate'">{{scope.row.fBsdate}}</span>
-          <span v-if="item.label == 'fBillstatus'">{{scope.row.fBillstatus}}</span>
-          <span v-if="item.label == 'vslName'">{{scope.row.vslName}}</span>
-          <span v-if="item.label == 'voyNo'">{{scope.row.voyNo}}</span>
-          <span v-if="item.label == 'fMblno'">{{scope.row.fMblno}}</span>
-          <span v-if="item.label == 'corpName'">{{scope.row.corpName}}</span>
-          <span v-if="item.label == 'goodsName'">{{scope.row.goodsName}}</span>
-          <span v-if="item.label == 'createBy'">{{scope.row.createBy}}</span>
           <span v-if="item.label == 'createTime'">{{ (scope.row.createTime).slice(0,10) }}</span>
-          <span v-if="item.label == 'loadportName'">{{scope.row.loadportName}}</span>
-          <span v-if="item.label == 'moneyStatus'">{{scope.row.moneyStatus}}</span>
+          <span v-else>{{scope.row[item.label]}}</span>
         </template>
       </el-table-column>
 <!--      <el-table-column label="订舱号" align="center" prop="fBillno"/>-->

+ 3 - 3
src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -286,9 +286,9 @@
             <!--              </el-form-item>-->
             <!--            </el-col>-->
             <el-col :span="6">
-              <el-form-item label="目的港口" prop="portofdischargeidName">
+              <el-form-item label="目的港口" prop="distinationidName">
                 <el-input
-                  v-model="estimatedTime.portofdischargeidName"
+                  v-model="estimatedTime.distinationidName"
                   :disabled="doNot"
                   size="small"
                   style="width: 100%"
@@ -632,7 +632,7 @@
           <!--          </el-table-column>-->
           <el-table-column prop="address" label="操作" align="center">
             <template slot-scope="scope">
-              <el-button size="small" :disabled="scope.row.fManual == 0 || modify"
+              <el-button size="small" :disabled="modify"
                          @click="deleteRow(scope.$index, dataList)"
               >移除
               </el-button>

+ 46 - 20
src/views/kaihe/shipDynamics/vesselDetail/index.vue

@@ -332,6 +332,7 @@
           <span v-if="item.label == 'fStatus'">{{scope.row.fStatus}}</span>
           <span v-if="item.label == 'remark'">{{scope.row.remark}}</span>
           <span v-if="item.label == 'createBy'">{{scope.row.createBy}}</span>
+          <span v-if="item.label == 'fLaneName'">{{scope.row.fLaneName}}</span>
           <span v-if="item.label == 'createTime'">{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
           <span v-if="item.label == 'updateBy'">{{scope.row.updateBy}}</span>
           <span v-if="item.label == 'updateTime'">{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
@@ -644,14 +645,26 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="航线" prop="fLaneid" label-width="110px">
+                <el-select style="width:80%;" placeholder="请选择" :disabled="doNot"
+                           v-model="form.fLaneid">
+                  <el-option
+                      v-for="(dict, index) in rouTe"
+                      :key="dict.fId"
+                      :label="dict.fName"
+                      :value="dict.fId"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="总teu" prop="fTeu" label-width="110px">
               <el-input style="width: 80%" size="small" v-model="form.fTeu" :disabled="doNot"/>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
           <el-col :span="12">
             <el-form-item label="状态" prop="fStatus" label-width="110px">
               <el-select v-model="form.fStatus" style="width: 80%" :disabled="doNot" placeholder="请输入状态" >
@@ -685,7 +698,7 @@
 </template>
 
 <script>
-  import { getvessel,listCorps, getCorps, delCorps, addyard,getport, getManage, changeCorpsStatus,exportCorps } from "@/api/kaihe/shipDynamics/vesselDetail";
+  import { getvessel,listCorps, getCorps, delCorps, addyard,getport, getManage, changeCorpsStatus,exportCorps,routeSelection } from "@/api/kaihe/shipDynamics/vesselDetail";
   import draggable from "vuedraggable";
   import Vue from 'vue'
   import Cookies from 'js-cookie'
@@ -754,6 +767,7 @@
     data() {
       return {
         setRowList: [],
+        rouTe: [],
         getRowList: [],
         tableDate: [
           {
@@ -774,6 +788,14 @@
           },
           {
             surface: "3",
+            label: "fLaneName",
+            name: "航线",
+            fixed:"left",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "4",
             label: "portofloadidName",
             name: "装货港",
             fixed:"left",
@@ -781,7 +803,7 @@
             width: 120,
           },
           {
-            surface: "4",
+            surface: "5",
             label: "portofdischargeidName",
             name: "卸货港",
             fixed:"left",
@@ -789,7 +811,7 @@
             width: 120,
           },
           {
-            surface: "5",
+            surface: "6",
             label: "distinationidName",
             name: "目的地",
             fixed:"left",
@@ -797,7 +819,7 @@
             width: 120,
           },
           {
-            surface: "6",
+            surface: "7",
             label: "portoftransshipmentName",
             name: "中转港",
             fixed:"left",
@@ -805,7 +827,7 @@
             width: 120,
           },
           {
-            surface: "7",
+            surface: "8",
             label: "fEtd",
             name: "预计开船日期",
             fixed:"left",
@@ -813,84 +835,84 @@
             width: 120,
           },
           {
-            surface: "8",
+            surface: "9",
             label: "fAtd",
             name: "开船日期",
             checked: 0,
             width: 120,
           },
           {
-            surface: "9",
+            surface: "10",
             label: "fEta",
             name: "预计到达日期",
             checked: 0,
             width: 120,
           },
           {
-            surface: "10",
+            surface: "11",
             label: "fAta",
             name: "到港日",
             checked: 0,
             width: 120,
           },
           {
-            surface: "11",
+            surface: "12",
             label: "manageidName",
             name: "船管人",
             checked: 0,
             width: 120,
           },
           {
-            surface: "12",
+            surface: "13",
             label: "fTel",
             name: "联系方式",
             checked: 0,
             width: 120,
           },
           {
-            surface: "13",
+            surface: "14",
             label: "fDays",
             name: "航期",
             checked: 0,
             width: 120,
           },
           {
-            surface: "14",
+            surface: "15",
             label: "fStatus",
             name: "状态",
             checked: 0,
             width: 120,
           },
           {
-            surface: "15",
+            surface: "16",
             label: "remark",
             name: "备注",
             checked: 0,
             width: 120,
           },
           {
-            surface: "16",
+            surface: "17",
             label: "createBy",
             name: "录入人",
             checked: 0,
             width: 120,
           },
           {
-            surface: "17",
+            surface: "18",
             label: "createTime",
             name: "录入时间",
             checked: 0,
             width: 120,
           },
           {
-            surface: "18",
+            surface: "19",
             label: "updateBy",
             name: "最新修改人",
             checked: 0,
             width: 120,
           },
           {
-            surface: "19",
+            surface: "20",
             label: "updateTime",
             name: "最新修改时间",
             checked: 0,
@@ -985,6 +1007,7 @@
           fDistinationid:[{ required: true, message: "目的地不能为空", trigger: "blur" }],
           fEtd:[{ required: true, message: "预计开船日期不能为空", trigger: "blur" }],
           fEta:[{ required: true, message: "预计到达时间不能为空", trigger: "blur" }],
+          fLaneid:[{ required: true, message: "航线不能为空", trigger: "blur" }],
           fTel:[{ required: true, message: "手机号不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
           fDucomentrayoffdate:[{ required: true, message: "截单日期不能为空", trigger: "blur" }]
         }
@@ -1000,6 +1023,9 @@
       this.getList()
     },
     created() {
+      routeSelection().then(res =>{
+        this.rouTe = res.rows;
+      })
       this.setRowList = this.tableDate;
       this.getRowList = this.tableDate;
       this.getList();

+ 7 - 4
vue.config.js

@@ -34,15 +34,18 @@ module.exports = {
     proxy: {
       // 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: `http://192.168.1.177:9010/`,
         // target: `https://test.fms.tubaosoft.com/prod-api/`,
         // target: `https://test.wms.tubaosoft.com/prod-api/`,
-        // target: `https://zd.tubaosoft.com/prod-api/`,
+        // target: `https://test.tms.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: `http://jingang.tubaosoft.com/prod-api/`,
+
+        // target: `https://jingrun.tubaosoft.com/prod-api/`,
         // target: `https://op.khzclogistics.com/prod-api/`,
         // 华为10M
         // target: `http://121.36.212.131:9010/`,