凯合样式修改

src/api/kaihe/containerNews/historyBoxNews.js

@@ -48,9 +48,9 @@ export function changeCorpsStatus(fId, fStatus) {
 }
 
 // 删除客户详情
-export function delCorps(fId) {
+export function delCorps(fIds) {
   return request({
-    url: '/shipping/route/' + fId,
+    url: '/shipping/cntrtracking/' + fIds,
     method: 'delete'
   })
 }

src/views/kaihe/basicdata/container/index.vue

@@ -286,7 +286,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="TEU" prop="fTeu" label-width="100px">
-              <el-input v-model="form.fTeu" :disabled="doNot" style="width: 80%" placeholder="请输入TEU" />
+              <el-input v-model.number="form.fTeu" :disabled="doNot" style="width: 80%" placeholder="请输入TEU" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -509,6 +509,8 @@
           fEname: [
             { required: true, message: "英文名不能为空", trigger: "blur" }
           ],
+          fTeu: [{ required: true, message: '请输入数字', trigger: 'blur',type:'number'},
+          ]
         }
       };
     },

src/views/kaihe/basicdata/portinformation/index.vue

@@ -558,7 +558,6 @@
         this.fTypesOptions = response.data;
       });
       this.getDicts("f_port").then(response => {
-        console.log(response)
         this.portOptions = response.data;
       });
       this.routeRemoteMethod()
@@ -569,9 +568,7 @@
       routeRemoteMethod(){
         let queryParams = { pageNum: 1,};
         getroute(queryParams).then((response) => {
-          console.log(response)
           this.routeOptions = response.rows;
-          console.log(this.routeOptions)
         });
       },
       //模糊查询港口名称
@@ -602,7 +599,6 @@
       getList() {
         this.loading = true;
         listCorps(this.queryParams).then(response => {
-          console.log(response)
           this.corpsList = response.rows;
           this.total = response.total;
           this.loading = false;

src/views/kaihe/basicdata/route/index.vue

@@ -474,18 +474,14 @@
       userRemoteMethod(){
         let queryParams = { pageNum: 1,};
         getuserName(queryParams).then((response) => {
-          console.log(response)
           this.ManageridOptions = response.rows;
-          console.log(this.routeOptions)
         });
       },
       //模糊查询航线名称
       routeRemoteMethod(){
         let queryParams = { pageNum: 1,};
         getroute(queryParams).then((response) => {
-          console.log(response)
           this.routeOptions = response.rows;
-          console.log(this.routeOptions)
         });
       },
       full(){
@@ -579,7 +575,6 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const fIds = row.fId || this.ids;
-        console.log(fIds)
         this.$confirm('是否确认删除航线编号为"' + fIds + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",

src/views/kaihe/basicdata/wharf/index.vue

@@ -461,9 +461,7 @@
       wharfRemoteMethod(){
         let queryParams = { pageNum: 1,};
         getwharf(queryParams).then((response) => {
-          console.log(response)
           this.wharfOptions = response.rows;
-          console.log(this.wharfOptions)
         });
       },
 

src/views/kaihe/basicdata/yard/index.vue

@@ -476,9 +476,7 @@
       yardRemoteMethod(){
         let queryParams = { pageNum: 1,};
         getyard(queryParams).then((response) => {
-          console.log(response)
           this.yardOptions = response.rows;
-          console.log(this.yardOptions)
         });
       },
       //模糊查询港口名称

src/views/kaihe/containerNews/boxDistribution/index.vue

@@ -42,10 +42,11 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table @cell-click="modiEy" v-loading="loading" :data="corpsList" @selection-change="handleSelectionChange">
+    <el-table @cell-click="modiEy" :cell-style="cellStyle" v-loading="loading" :data="corpsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" width="55" label="行号" align="center" />
       <el-table-column
+        class-name="small-padding fixed-width"
         v-for="(item,index) in boxDistributionName"
         :key="item.index"
         :label="item"
@@ -74,6 +75,10 @@
     },
     data() {
       return {
+        tableStyle:{
+          cellColor: 'dodgerblue',		//行内字体颜色
+          cellCursor:'pointer'
+        },
         //标签名
         boxDistributionName:[],
         //模糊下拉查询地点
@@ -110,12 +115,17 @@
       this.getList()
     },
     methods: {
+      cellStyle(row, rowIndex){
+        if(row.columnIndex !== 0 && row.columnIndex !== 1 && row.columnIndex !== 2 ){
+          return 'color: ' + this.tableStyle.cellColor +
+            ';cursor' + this.tableStyle.cellCursor;
+        }
+      },
       //模糊查询地点
       addressMethod(){
         let queryParams = { pageNum: 1,};
         getaddress(queryParams).then(response=>{
           this.addressOptions = response.rows
-          console.log(response)
         })
       },
       //点击列表传值跳转
@@ -137,13 +147,13 @@
              addressName:row["地点"]
           }
         }
-        if(row[column.label] != 0){
+        if(row[column.label] == 0 || column.label == '地点'){
+        }else{
           this.$router.push({
             path: "/containerNews/modifyPage",
             query: { data: JSON.stringify(res) },
           });
         }
-
       },
 
       /** 查询客户详情列表 */

src/views/kaihe/containerNews/boxInformation/index.vue

@@ -139,7 +139,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-        >导出</el-button>
+        >导入</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -239,10 +239,15 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item label="箱号" prop="fNo">
+              <el-input v-model="form.fNo" style="width: 80%" placeholder="请输入箱号" :disabled="doNot" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="箱类型" prop="fTypeid">
               <el-select
-                style="width: 90%"
+                style="width: 80%"
                 v-model="form.fTypeid"
                 placeholder="请选择箱类型"
                 clearable
@@ -299,14 +304,10 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="箱号" prop="fNo">
-              <el-input v-model="form.fNo" style="width: 80%" placeholder="请输入箱号" :disabled="doNot" />
-            </el-form-item>
-          </el-col>
+
           <el-col :span="12">
             <el-form-item label="箱来源" prop="fSource">
-              <el-select v-model="form.fSource" style="width: 78%" placeholder="请选择箱来源" :disabled="doNot">
+              <el-select v-model="form.fSource" style="width: 80%" placeholder="请选择箱来源" :disabled="doNot">
                 <el-option
                   v-for="dict in sourceOptions"
                   :key="dict.dictValue"
@@ -316,13 +317,11 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
-            <el-form-item label="租赁方式" prop="fRent">
-              <el-select v-model="form.fRent" style="width: 80%" placeholder="请选择租赁方式" :disabled="doNot">
+            <el-form-item label="箱状态" prop="fCntrstatus">
+              <el-select v-model="form.fCntrstatus" style="width: 80%" placeholder="请选择箱状态" :disabled="doNot">
                 <el-option
-                  v-for="dict in fRentOptions"
+                  v-for="dict in cntrstatusOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -330,11 +329,13 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
-            <el-form-item label="空重" prop="fUpdateef">
-              <el-select v-model="form.fUpdateef" style="width: 80%" placeholder="请请选择空重" :disabled="doNot">
+            <el-form-item label="租赁方式" prop="fRent">
+              <el-select v-model="form.fRent" style="width: 80%" placeholder="请选择租赁方式" :disabled="doNot">
                 <el-option
-                  v-for="dict in updateEFOptions"
+                  v-for="dict in fRentOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -343,10 +344,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="箱状态" prop="fCntrstatus">
-              <el-select v-model="form.fCntrstatus" style="width: 80%" placeholder="请选择箱状态" :disabled="doNot">
+            <el-form-item label="空重" prop="fUpdateef">
+              <el-select v-model="form.fUpdateef" style="width: 80%" placeholder="请选择空重" :disabled="doNot">
                 <el-option
-                  v-for="dict in cntrstatusOptions"
+                  v-for="dict in updateEFOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -354,11 +355,12 @@
               </el-select>
             </el-form-item>
           </el-col>
+
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" style="width: 90%" placeholder="请输入备注" :disabled="doNot"/>
+              <el-input v-model="form.remark" style="width: 91%" placeholder="请输入备注" :disabled="doNot"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -565,14 +567,12 @@
         let queryParams = { pageNum: 1,};
         getaddress(queryParams).then(response=>{
           this.addressOptions = response.rows
-          console.log(response)
         })
       },
       //模糊查询箱类型
       boxTypeMethod(){
         let queryParams = { pageNum: 1,};
         getType(queryParams).then(response =>{
-          console.log(response)
           this.typeOptions = response.rows
         })
       },
@@ -670,8 +670,6 @@
 
         getInforma(fId).then(response => {
           this.form = response.data;
-          console.log(response.data)
-          console.log(this.form)
           this.form.fUpdateaddress = response.data.addressName
           this.open = true;
           this.title = "修改客户详情";
@@ -682,7 +680,6 @@
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.fId != null) {
-              console.log("111")
               addboxinformation(this.form).then(response => {
                 this.msgSuccess("修改成功");
                 this.open = false;

src/views/kaihe/containerNews/historyBoxNews/index.vue

@@ -6,7 +6,7 @@
           <el-input
             v-model="queryParams.fNo"
             style="width: 240px"
-            placeholder="请输入名称"
+            placeholder="请输入箱号"
             clearable
             size="small"
             @keyup.enter.native="handleQuery"
@@ -55,9 +55,20 @@
 
       <el-table-column label="航次" align="center" prop="fVoy" />
       <el-table-column label="最新时间" align="center" prop="fUpdatetime" width="100"/>
-      <el-table-column label="地点" align="center" prop="fUpdateaddress" width="100px"/>
+      <el-table-column label="地点" align="center" prop="addressName" width="100px"/>
       <el-table-column label="空重" align="center" prop="updateEFName" width="100px"/>
       <el-table-column label="箱状态" align="center" prop="cntrstatusName" width="100px"/>
+      <el-table-column label="操作" align="center" min-width="120px" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            v-hasPermi="['shipping:cntrtracking:remove']"
+            @click="handleDelete(scope.row)"
+          >移除</el-button>
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -72,7 +83,7 @@
 </template>
 
 <script>
-  import { listCorps, getaddress } from "@/api/kaihe/containerNews/historyBoxNews";
+  import { listCorps, getaddress, delCorps } from "@/api/kaihe/containerNews/historyBoxNews";
 
   export default {
     name: "historyBoxNews",
@@ -116,12 +127,25 @@
       this.addressMethod()
     },
     methods: {
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const fIds = row.fId || this.ids;
+        this.$confirm('是否确认删除客户详情编号为"' + fIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delCorps(fIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+      },
       //模糊查询地点
       addressMethod(){
         let queryParams = { pageNum: 1,};
         getaddress(queryParams).then(response=>{
           this.addressOptions = response.rows
-          console.log(response)
         })
       },
       /** 查询客户详情列表 */

src/views/kaihe/containerNews/modifyPage/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-row>
-          <el-form-item label="地点" prop="fUpdateaddress">
+          <el-form-item label="调入地点" prop="fUpdateaddress">
             <el-select
               style="width: 240px"
               v-model="queryParams.fUpdateaddress"
@@ -69,6 +69,19 @@
           <el-button type="cyan"  size="mini" @click="determine">提交</el-button>
         </el-form-item>
       </el-row>
+      <el-row>
+        <el-form-item label="箱号" prop="fNo">
+          <el-input
+            v-model="queryParams.fNo"
+            style="width: 240px"
+            placeholder="请输入名称"
+            clearable
+            size="small"/>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="cyan"  size="mini" @click="search">搜索</el-button>
+        </el-form-item>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -138,19 +151,22 @@
         corpsList: [],
         // 查询参数
         queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          fUpdateaddress:null,
-          fUpdateEF:null,
-          fStatus:null,
-          fBdate:null,
+          // pageNum: 1,
+          // pageSize: 10,
+          // fUpdateaddress:null,
+          // fUpdateEF:null,
+          // fStatus:null,
+          // fBdate:null,
+          fNo:null,
         },
         select:'',
+        querDate:[],
       };
     },
     //页面跳转后传递参数
     activated() {
       let formDate = JSON.parse(this.$route.query.data)
+      this.querDate = JSON.parse(this.$route.query.data)
       if(formDate){
         addmodify(formDate).then(response =>{
           this.corpsList = response.rows
@@ -170,12 +186,18 @@
     },
 
     methods: {
+      //搜索
+      search(){
+        let querDates = Object.assign(this.querDate ,this.queryParams)
+        addmodify(querDates).then(response=>{
+          this.corpsList = response.rows
+        })
+      },
       //模糊查询地点
       addressMethod(){
         let queryParams = { pageNum: 1,};
         getaddress(queryParams).then(response=>{
           this.addressOptions = response.rows
-          console.log(response)
         })
       },
       //提交修改数据
@@ -242,7 +264,6 @@
       },
       //地点带入
       bringIn(value,row){
-        console.log(value)
         for(let item in this.select){
           for(let li in this.addressOptions){
             if(this.queryParams.fUpdateaddress == this.addressOptions[li].fId){

src/views/warehouseBusiness/inStock/index.vue

@@ -3187,7 +3187,7 @@ export default {
           label: "fWarehouseid",
           name: "仓库",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3195,7 +3195,7 @@ export default {
           label: "fPlanqty",
           name: "计划件数",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3203,7 +3203,7 @@ export default {
           label: "fQty",
           name: "入库件数",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3211,7 +3211,7 @@ export default {
           label: "fGrossweight",
           name: "入库毛重",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3219,7 +3219,7 @@ export default {
           label: "fNetweight",
           name: "入库净重",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3227,7 +3227,7 @@ export default {
           label: "fTruckno",
           name: "车号",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3235,7 +3235,7 @@ export default {
           label: "fDriverName",
           name: "司机名称",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3243,7 +3243,7 @@ export default {
           label: "fDriverTel",
           name: "司机电话",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3251,7 +3251,7 @@ export default {
           label: "fDriverIdCar",
           name: "司机身份证",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3259,7 +3259,7 @@ export default {
           label: "fBusinessType",
           name: "业务类别",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3267,7 +3267,7 @@ export default {
           label: "fBillstatus",
           name: "费用状态",
           checked: 0,
-          
+
           width: 100,
         },
       ],
@@ -3332,7 +3332,7 @@ export default {
           surface: "8",
           label: "fWarehouseid",
           name: "仓库",
-          
+
           checked: 0,
           width: 100,
         },
@@ -3340,7 +3340,7 @@ export default {
           surface: "9",
           label: "fPlanqty",
           name: "计划件数",
-          
+
           checked: 0,
           width: 100,
         },
@@ -3348,7 +3348,7 @@ export default {
           surface: "10",
           label: "fQty",
           name: "入库件数",
-          
+
           checked: 0,
           width: 100,
         },
@@ -3357,7 +3357,7 @@ export default {
           label: "fGrossweight",
           name: "入库毛重(KG)",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3365,7 +3365,7 @@ export default {
           label: "fNetweight",
           name: "入库净重(KG)",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3373,7 +3373,7 @@ export default {
           label: "fTruckno",
           name: "车号",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3381,7 +3381,7 @@ export default {
           label: "fDriverName",
           name: "司机名称",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3389,7 +3389,7 @@ export default {
           label: "fDriverTel",
           name: "司机电话",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3397,7 +3397,7 @@ export default {
           label: "fDriverIdCar",
           name: "司机身份证",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3405,7 +3405,7 @@ export default {
           label: "fBusinessType",
           name: "业务类别",
           checked: 0,
-          
+
           width: 100,
         },
         {
@@ -3413,7 +3413,7 @@ export default {
           label: "fBillstatus",
           name: "费用状态",
           checked: 0,
-          
+
           width: 100,
         },
       ],