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

src/api/kaihe/containerNews/modifyPage.js

@@ -1,11 +1,13 @@
 // 查询航线详情列表
 import request from '@/utils/request'
 
-export function listCorps(query) {
+export function listCorps(tCntrno) {
   return request({
-    url: '/shipping/address/selectStockDump',
-    method: 'get',
-    params: query
+    url: '/shipping/cntrno/updateTCntrno',
+    method: 'post',
+    data: {
+      tCntrno:tCntrno
+    }
   })
 }
 
@@ -17,12 +19,12 @@ export function getCorps(fId) {
   })
 }
 
-// 新增
-export function addyard(data) {
+// 新增传值
+export function addmodify(query) {
   return request({
-    url: '/shipping/address',
-    method: 'post',
-    data: data
+    url: '/shipping/cntrno/getTCntrnoDistribute',
+    method: 'get',
+    params: query
   })
 }
 

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

@@ -200,10 +200,12 @@
     <el-table 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 :show-overflow-tooltip="true" label="编号" align="center" prop="fNo" width="200px"/>
+      <el-table-column :show-overflow-tooltip="true" label="编号" align="center" prop="fNo" width="100px"/>
       <el-table-column label="名称" align="center" prop="fName" width="100px"/>
-      <el-table-column :show-overflow-tooltip="true" label="箱类型" align="center" prop="typeName" width="100px"
-      />
+
+      <el-table-column :show-overflow-tooltip="true" label="箱类型" align="center" prop="typeName" width="100px"/>
+
+
       <el-table-column :show-overflow-tooltip="true" label="英文名" align="center" width="100px" prop="fEname" />
       <el-table-column :show-overflow-tooltip="true" label="UNCODE" align="center" prop="fUncode" />
       <el-table-column :show-overflow-tooltip="true" label="TEU" align="center" prop="fTeu" />
@@ -277,7 +279,7 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="箱种类" prop="fType" label-width="90px">
+            <el-form-item label="箱种类" prop="fType" label-width="100px">
               <el-select style="width: 80%" :disabled="doNot" v-model="form.fType" placeholder="请选择箱种类">
                 <el-option
                   v-for="dict in containerOptions"
@@ -289,43 +291,43 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="UNCODE" prop="fUncode" label-width="90px">
+            <el-form-item label="UNCODE" prop="fUncode" label-width="100px">
               <el-input v-model="form.fUncode" :disabled="doNot" style="width: 80%" placeholder="请输入UNCODE" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="编号" prop="fNo" label-width="90px">
+            <el-form-item label="编号" prop="fNo" label-width="100px">
               <el-input v-model="form.fNo" :disabled="doNot" style="width: 80%" placeholder="请输入编号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="TEU" prop="fTeu" label-width="90px">
+            <el-form-item label="TEU" prop="fTeu" label-width="100px">
               <el-input v-model="form.fTeu" :disabled="doNot" style="width: 80%" placeholder="请输入TEU" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="名称" prop="fName" label-width="90px">
+            <el-form-item label="名称" prop="fName" label-width="100px">
               <el-input v-model="form.fName" :disabled="doNot" style="width: 80%" placeholder="请输入名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="英文名" prop="fEname" label-width="90px">
+            <el-form-item label="英文名" prop="fEname" label-width="100px">
               <el-input v-model="form.fEname" :disabled="doNot" style="width: 80%" placeholder="请输入英文名" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="毛重（T）" prop="fWeight" label-width="90px">
+            <el-form-item label="毛重（T）" prop="fWeight" label-width="100px">
               <el-input v-model="form.fWeight" :disabled="doNot" style="width: 80%" placeholder="请输入毛重" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="容积（立方）" prop="fCbm" label-width="90px">
+            <el-form-item label="容积（立方）" prop="fCbm" label-width="100px" >
               <el-input v-model="form.fCbm" :disabled="doNot" style="width: 80%" placeholder="请输入容积" />
             </el-form-item>
           </el-col>
@@ -341,8 +343,8 @@
 <!--          </el-col>-->
         </el-row>
         <el-row>
-          <el-col :span="12" label-width="90px">
-            <el-form-item label="尺码值" prop="fCntrsize" label-width="90px">
+          <el-col :span="12" label-width="100px">
+            <el-form-item label="尺码值" prop="fCntrsize" label-width="100px">
               <el-select
                 v-model="form.fCntrsize"
                 :disabled="doNot"
@@ -358,8 +360,8 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12" label-width="90px">
-            <el-form-item label="状态" prop="fStatus" label-width="90px">
+          <el-col :span="12" label-width="100px">
+            <el-form-item label="状态" prop="fStatus" label-width="100px">
               <el-select v-model="form.fStatus" style="width: 80%" :disabled="doNot" placeholder="请选择状态" >
                 <el-option label="正常" value="T"/>
                 <el-option label="停用" value="F"/>
@@ -368,8 +370,8 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24" label-width="90px">
-            <el-form-item label="备注" prop="remark">
+          <el-col :span="24" >
+            <el-form-item label="备注" prop="remark" label-width="100px">
               <el-input v-model="form.remark" style="width: 100%" :disabled="doNot" placeholder="" />
             </el-form-item>
           </el-col>
@@ -544,11 +546,9 @@
         this.statusOptions = response.data;
       });
       this.getDicts("f_type").then(response => {
-        console.log(response)
         this.containerOptions = response.data;
       });
       this.getDicts("f_cntrsize").then(response => {
-        console.log(response)
         this.CntrsizeOptions = response.data;
       });
     },
@@ -663,7 +663,6 @@
         this.reset();
         const fId = row.fId || this.ids
         getCorps(fId).then(response => {
-          console.log(response)
           this.form = response.data;
           this.form.fType = response.data.fType + ''
           this.form.fCntrsize = response.data.fCntrsize + ''

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

@@ -392,7 +392,7 @@
         dialogFull:false,
 
 
-        contactList:[],
+
         // 遮罩层
         loading: true,
         // 选中数组
@@ -409,16 +409,6 @@
         corpsList: [],
         // 弹出层标题
         title: "",
-        // 状态数据字典
-        statusOptions: [],
-        // 是否显示弹出层
-        open: false,
-        // 客户类别字典
-        fTypeidOptions: [],
-        // 结算表票结、月结字典
-        fStltypeidOptions: [],
-        // 删除状态字典
-        delFlagOptions: [],
         // 查询参数
         queryParams: {
           pageNum: 1,
@@ -527,7 +517,7 @@
       handleAdd() {
         this.doNot = false
         this.reset();
-        this.query();
+        // this.query();
         this.open = true;
         this.title = "添加客户详情";
       },

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

@@ -409,7 +409,6 @@
 
         //全屏放大
         dialogFull:false,
-        contactList:[],
         // 遮罩层
         loading: true,
         // 选中数组
@@ -426,16 +425,9 @@
         corpsList: [],
         // 弹出层标题
         title: "",
-        // 状态数据字典
-        statusOptions: [],
         // 是否显示弹出层
         open: false,
-        // 客户类别字典
-        fTypeidOptions: [],
-        // 结算表票结、月结字典
-        fStltypeidOptions: [],
-        // 删除状态字典
-        delFlagOptions: [],
+
         // 查询参数
         queryParams: {
           pageNum: 1,
@@ -467,18 +459,6 @@
     },
     created() {
       this.getList();
-      this.getDicts("data_customer_category").then(response => {
-        this.fTypeidOptions = response.data;
-      });
-      this.getDicts("data_stltype_type").then(response => {
-        this.fStltypeidOptions = response.data;
-      });
-      this.getDicts("data_delete_state").then(response => {
-        this.delFlagOptions = response.data;
-      });
-      this.getDicts("sys_normal_disable").then(response => {
-        this.statusOptions = response.data;
-      });
       this.getDicts("f_types").then(response => {
         this.fTypesOptions = response.data;
       });
@@ -512,20 +492,6 @@
       full(){
         this.dialogFull = !this.dialogFull
       },
-      // 客户类别默认为客户结算方式默认月结
-      query() {
-        this.$set(this.form, "fStltypeid", 1);
-      },
-      // 添加行
-      addRow(tableData,event){
-        var obj = {}
-         tableData.push(obj)
-      },
-      //删除行
-      deleteRow(index, rows) {
-        rows.splice(index, 1);
-      },
-
       /** 查询客户详情列表 */
       getList() {
         this.loading = true;
@@ -535,18 +501,7 @@
           this.loading = false;
         });
       },
-      // 客户类别字典翻译
-      fTypeidFormat(row, column) {
-        return this.selectDictLabel(this.fTypeidOptions, row.fTypeid);
-      },
-      // 结算表票结、月结字典翻译
-      fStltypeidFormat(row, column) {
-        return this.selectDictLabel(this.fStltypeidOptions, row.fStltypeid);
-      },
-      // 删除状态字典翻译
-      delFlagFormat(row, column) {
-        return this.selectDictLabel(this.delFlagOptions, row.delFlag);
-      },
+
       // 取消按钮
       cancel() {
         this.open = false;
@@ -565,10 +520,7 @@
         };
         this.resetForm("form");
       },
-      // 从表重置
-      contList() {
-        this.contactList = []
-      },
+
       // 状态修改
       handleStatusChange(row) {
         let text = row.fStatus === "0" ? "启用" : "停用";
@@ -604,8 +556,6 @@
       handleAdd() {
         this.doNot = false
         this.reset();
-        this.query();
-        this.contList();
         this.open = true;
         this.title = "添加客户详情";
       },

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

@@ -408,7 +408,6 @@
 
         //全屏放大
         dialogFull:false,
-        contactList:[],
         // 遮罩层
         loading: true,
         // 选中数组
@@ -429,12 +428,6 @@
         statusOptions: [],
         // 是否显示弹出层
         open: false,
-        // 客户类别字典
-        fTypeidOptions: [],
-        // 结算表票结、月结字典
-        fStltypeidOptions: [],
-        // 删除状态字典
-        delFlagOptions: [],
         // 查询参数
         queryParams: {
           pageNum: 1,
@@ -477,20 +470,7 @@
     },
     created() {
       this.getList();
-      this.getDicts("data_customer_category").then(response => {
-        this.fTypeidOptions = response.data;
-      });
-      this.getDicts("data_stltype_type").then(response => {
-        this.fStltypeidOptions = response.data;
-      });
-      this.getDicts("data_delete_state").then(response => {
-        this.delFlagOptions = response.data;
-      });
-      this.getDicts("sys_normal_disable").then(response => {
-        this.statusOptions = response.data;
-      });
       this.getDicts("f_types").then(response => {
-        console.log(response)
         this.fTypesOptions = response.data;
       });
       this.portRemoteMethod()
@@ -516,20 +496,6 @@
       full(){
         this.dialogFull = !this.dialogFull
       },
-      // 客户类别默认为客户结算方式默认月结
-      query() {
-        this.$set(this.form, "fStltypeid", 1);
-      },
-      // 添加行
-      addRow(tableData,event){
-        var obj = {}
-         tableData.push(obj)
-      },
-      //删除行
-      deleteRow(index, rows) {
-        rows.splice(index, 1);
-      },
-
       /** 查询客户详情列表 */
       getList() {
         this.loading = true;
@@ -539,18 +505,6 @@
           this.loading = false;
         });
       },
-      // 客户类别字典翻译
-      fTypeidFormat(row, column) {
-        return this.selectDictLabel(this.fTypeidOptions, row.fTypeid);
-      },
-      // 结算表票结、月结字典翻译
-      fStltypeidFormat(row, column) {
-        return this.selectDictLabel(this.fStltypeidOptions, row.fStltypeid);
-      },
-      // 删除状态字典翻译
-      delFlagFormat(row, column) {
-        return this.selectDictLabel(this.delFlagOptions, row.delFlag);
-      },
       // 取消按钮
       cancel() {
         this.open = false;
@@ -568,10 +522,6 @@
         };
         this.resetForm("form");
       },
-      // 从表重置
-      contList() {
-        this.contactList = []
-      },
       // 状态修改
       handleStatusChange(row) {
         let text = row.fStatus === "0" ? "启用" : "停用";
@@ -607,8 +557,6 @@
       handleAdd() {
         this.doNot = false
         this.reset();
-        this.query();
-        this.contList();
         this.open = true;
         this.title = "添加客户详情";
       },

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

@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-row>
           <el-form-item label="地点" prop="fUpdateaddress">
-            <el-input style="width: 240px" v-model="queryParams.fUpdateaddress" placeholder="请选择客户类别" clearable size="small">
+            <el-input style="width: 240px" v-model="queryParams.fUpdateaddress" placeholder="请输入或选择地点" clearable size="small">
             </el-input>
           </el-form-item>
 
@@ -11,7 +11,7 @@
             <el-input
               v-model="queryParams.fNo"
               style="width: 240px"
-              placeholder="请输入名称"
+              placeholder="请输入箱号"
               clearable
               size="small"
               @keyup.enter.native="handleQuery"
@@ -38,17 +38,6 @@
         :prop="item"
       >
       </el-table-column>
-<!--      <el-table-column :show-overflow-tooltip="true" label="地点" align="center" prop="fTypename" width="200px"/>-->
-<!--      <el-table-column label="20GP" align="center" prop="fNo" width="100px"/>-->
-<!--      <el-table-column :show-overflow-tooltip="true" label="40GP" align="center" prop="fName" width="100px"-->
-<!--      />-->
-<!--      <el-table-column :show-overflow-tooltip="true" label="40HC" align="center" width="100px" prop="fCname" />-->
-<!--      <el-table-column :show-overflow-tooltip="true" label="40HR" align="center" prop="fEname" />-->
-<!--      <el-table-column :show-overflow-tooltip="true" label="空" align="center" prop="fTel" />-->
-
-<!--      <el-table-column label="重" align="center" prop="createBy" />-->
-<!--      <el-table-column label="好" align="center" prop="createTime" width="100"/>-->
-<!--      <el-table-column label="坏" align="center" prop="updateBy" width="100px"/>-->
     </el-table>
 
     <pagination
@@ -64,23 +53,15 @@
 
 <script>
   import { listCorps, listName, getCorps, delCorps, changeCorpsStatus,exportCorps } from "@/api/kaihe/containerNews/boxDistribution";
-  import {queryUserVal} from "@/api/system/user";
-  import { isArray } from '@/utils/validate'
-  import Vue from 'vue'
   export default {
     name: "boxDistribution",
     components: {
     },
     data() {
       return {
-        //默认显示第一行
-        queryParamsHidden:false,
         //标签名
         boxDistributionName:[],
 
-
-        //全屏放大
-        dialogFull:false,
         contactList:[],
         // 遮罩层
         loading: true,
@@ -96,95 +77,45 @@
         total: 0,
         // 客户详情表格数据
         corpsList: [],
-        // 弹出层标题
-        title: "",
-        // 状态数据字典
-        statusOptions: [],
-        // 是否显示弹出层
-        open: false,
-        // 客户类别字典
-        fTypeidOptions: [],
-        // 结算表票结、月结字典
-        fStltypeidOptions: [],
-        // 删除状态字典
-        delFlagOptions: [],
         // 查询参数
         queryParams: {
           pageNum: 1,
           pageSize: 10,
           fUpdateaddress:null,
         },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-           fTypeid: [
-            { required: true, message: "客户类别不能为空", trigger: "blur" }
-          ],
-          fNo: [
-            { required: true, message: "编号不能为空", trigger: "blur" }
-          ],
-          fName: [
-            { required: true, message: "名称不能为空", trigger: "blur" }
-          ],
-          fCname:[
-            { required: true, message: "简称不能为空", trigger: "blur" }
-          ],
-          fStatus: [
-            { required: true, message: "状态默认 T ,正常T 停用F 下拉选择不能为空", trigger: "blur" }
-          ],
-        }
       };
     },
     created() {
       this.getList();
-      this.getDicts("data_customer_category").then(response => {
-        this.fTypeidOptions = response.data;
-      });
-      this.getDicts("data_stltype_type").then(response => {
-        this.fStltypeidOptions = response.data;
-      });
-      this.getDicts("data_delete_state").then(response => {
-        this.delFlagOptions = response.data;
-      });
-      this.getDicts("sys_normal_disable").then(response => {
-        this.statusOptions = response.data;
-      });
+
+    },
+    activated() {
+      this.getList()
     },
     methods: {
       modiEy(row, column, cell, event){
-        // console.log(row)
-        console.log(column)
-        // console.log(cell)
-        // console.log(event)
-        // console.log(column.property)
-        console.log(column.label)
-        console.log(row["地点"])
-        let res = {
-          column:column.label,
-          row:row["地点"]
+        let res = {}
+        if(column.label =='空' || column.label =='重'){
+           res = {
+            updateEFName:column.label,
+            fUpdateaddress:row["地点"]
+          }
+        }else if(column.label =='好' || column.label =='坏'){
+           res = {
+            cntrstatusName:column.label,
+            fUpdateaddress:row["地点"]
+          }
+        }else{
+           res = {
+            typeidName:column.label,
+            fUpdateaddress:row["地点"]
+          }
         }
         this.$router.push({
           path: "/containerNews/modifyPage",
           query: { data: JSON.stringify(res) },
         });
       },
-      full(){
-        this.dialogFull = !this.dialogFull
-      },
-      // 客户类别默认为客户结算方式默认月结
-      query() {
-        this.$set(this.form, "fStltypeid", 1);
-      },
-      // 添加行
-      addRow(tableData,event){
-        var obj = {}
-         tableData.push(obj)
-      },
-      //删除行
-      deleteRow(index, rows) {
-        rows.splice(index, 1);
-      },
 
       /** 查询客户详情列表 */
       getList() {
@@ -198,63 +129,7 @@
           this.loading = false;
         });
       },
-      // 客户类别字典翻译
-      fTypeidFormat(row, column) {
-        return this.selectDictLabel(this.fTypeidOptions, row.fTypeid);
-      },
-      // 结算表票结、月结字典翻译
-      fStltypeidFormat(row, column) {
-        return this.selectDictLabel(this.fStltypeidOptions, row.fStltypeid);
-      },
-      // 删除状态字典翻译
-      delFlagFormat(row, column) {
-        return this.selectDictLabel(this.delFlagOptions, row.delFlag);
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          fId: null,
-          fTypeid: null,
-          fNo: null,
-          fName: null,
-          fCname: null,
-          fEname: null,
-          fTel: null,
-          fFax: null,
-          fEmail: null,
-          fManage: null,
-          fAddr: null,
-          fEaddr: null,
-          fScale: null,
-          fProvince: null,
-          fCity: null,
-          fStltypeid: null,
-          fStldays: null,
-          fContractno: null,
-          fContractb: null,
-          fContracte: null,
-          fTax: null,
-          fInvtel: null,
-          fInvaddr: null,
-          fBankno: null,
-          fBankname: null,
-          fUbankno: null,
-          fUbankname: null,
-          fStatus: null,
-          delFlag: null,
-          createBy: null,
-          createTime: null,
-          updateBy: null,
-          updateTime: null,
-          remark: null
-        };
-        this.resetForm("form");
-      },
+
       // 从表重置
       contList() {
         this.contactList = []
@@ -290,133 +165,9 @@
         this.single = selection.length!==1
         this.multiple = !selection.length
       },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.query();
-        this.contList();
-        this.open = true;
-        this.title = "添加客户详情";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const fId = row.fId || this.ids
-        getCorps(fId).then(response => {
-          this.form = response.data["corp"];
-          var contactList1=response.data["customerContact"];
-          this.form.fTypeid = this.form.fTypeid.replace(/\[|]/g,'').replace(/\"/g, "").split(",")
-          if(contactList1!=null){
-            this.contactList=contactList1;
-          }else {
-            this.query();
-          }
-          this.open = true;
-          this.title = "修改客户详情";
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.form.fTypename = ''
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.fId != null) {
-              let formDate= new FormData()
-            for (let index in this.fTypeidOptions){
-              for (let item in this.form.fTypeid){
-                if (this.fTypeidOptions[index].dictValue == this.form.fTypeid[item]){
-                  this.form.fTypename += this.fTypeidOptions[index].dictLabel + ','
-                }
-              }
-            }
-              this.form.fTypename = this.form.fTypename.substring(0,this.form.fTypename.length-1)
-              formDate.append('corps',JSON.stringify(this.form));
-              formDate.append('customerContacts',JSON.stringify(this.contactList));
-              addCorps(formDate).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              let formDate= new FormData()
-              for (let index in this.fTypeidOptions){
-                for (let item in this.form.fTypeid){
-                  if (this.fTypeidOptions[index].dictValue == this.form.fTypeid[item]){
-                    this.form.fTypename += this.fTypeidOptions[index].dictLabel + ','
-                  }
-                }
-              }
-              this.form.fTypename = this.form.fTypename.substring(0,this.form.fTypename.length-1)
-              formDate.append('corps',JSON.stringify(this.form));
-              formDate.append('customerContacts',JSON.stringify(this.contactList));
-              addCorps(formDate).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-            }
-          }
-        });
-      },
-      /** 删除按钮操作 */
-      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("删除成功");
-        })
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有客户详情数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCorps(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-      }
     }
   };
 </script>
 <style lang="scss">
-.avue-crud__dialog__header {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: justify;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-.el-dialog__title {
-  color: rgba(0,0,0,.85);
-  font-weight: 500;
-  word-wrap: break-word;
-}
-.avue-crud__dialog__menu {
-  padding-right: 20px;
-  float: left;
-}
-.avue-crud__dialog__menu i {
-  color: #909399;
-  font-size: 15px;
-}
-.el-icon-full-screen{
-  cursor: pointer;
-}
-.el-icon-full-screen:before {
-  content: "\e719";
-}
+
 </style>

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

@@ -167,14 +167,15 @@
     <el-table 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 :show-overflow-tooltip="true" label="箱号" align="center" prop="fNo" width="200px"/>
+      <el-table-column :show-overflow-tooltip="true" label="箱号" align="center" prop="fNo" width="100px"/>
+      <el-table-column label="地点" align="center" prop="fUpdateaddress" width="100px"/>
       <el-table-column label="箱类型" align="center" prop="typeidName" width="100px"/>
-      <el-table-column :show-overflow-tooltip="true" label="箱主" align="center" prop="ownerName" width="100px"
-      />
+      <el-table-column label="箱状态" align="center" prop="cntrstatusName" width="100px"/>
+      <el-table-column label="空重" align="center" prop="updateEFName" width="100px"/>
+      <el-table-column :show-overflow-tooltip="true" label="箱主" align="center" prop="ownerName" width="100px"/>
       <el-table-column :show-overflow-tooltip="true" label="箱来源" align="center" width="100px" prop="sourceName" />
       <el-table-column :show-overflow-tooltip="true" label="租赁方式" align="center" prop="rentName" />
       <el-table-column :show-overflow-tooltip="true" label="备注" align="center" prop="remark" />
-
       <el-table-column label="录入人" align="center" prop="createBy" />
       <el-table-column label="录入时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
@@ -520,18 +521,6 @@
     },
     created() {
       this.getList();
-      this.getDicts("data_customer_category").then(response => {
-        this.fTypeidOptions = response.data;
-      });
-      this.getDicts("data_stltype_type").then(response => {
-        this.fStltypeidOptions = response.data;
-      });
-      this.getDicts("data_delete_state").then(response => {
-        this.delFlagOptions = response.data;
-      });
-      this.getDicts("sys_normal_disable").then(response => {
-        this.statusOptions = response.data;
-      });
       this.getDicts("f_type").then(response => {
         this.containerOptions = response.data;
       });
@@ -564,20 +553,6 @@
       full(){
         this.dialogFull = !this.dialogFull
       },
-      // 客户类别默认为客户结算方式默认月结
-      query() {
-        this.$set(this.form, "fStltypeid", 1);
-      },
-      // 添加行
-      addRow(tableData,event){
-        var obj = {}
-         tableData.push(obj)
-      },
-      //删除行
-      deleteRow(index, rows) {
-        rows.splice(index, 1);
-      },
-
       /** 查询客户详情列表 */
       getList() {
         this.loading = true;
@@ -658,8 +633,6 @@
       handleAdd() {
         this.doNot = false
         this.reset();
-        this.query();
-        this.contList();
         this.open = true;
         this.title = "添加客户详情";
       },

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

@@ -61,7 +61,7 @@
   import { isArray } from '@/utils/validate'
   import Vue from 'vue'
   export default {
-    name: "boxDistribution",
+    name: "historyBoxNews",
     components: {
     },
     data() {
@@ -86,31 +86,13 @@
         total: 0,
         // 客户详情表格数据
         corpsList: [],
-        // 弹出层标题
-        title: "",
-        // 状态数据字典
-        statusOptions: [],
-        // 是否显示弹出层
-        open: false,
-        // 客户类别字典
-        fTypeidOptions: [],
-        // 结算表票结、月结字典
-        fStltypeidOptions: [],
-        // 删除状态字典
-        delFlagOptions: [],
         // 查询参数
         queryParams: {
           pageNum: 1,
           pageSize: 10,
           fNo:null,
           fUpdateaddress:null
-
         },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-        }
       };
     },
     created() {
@@ -121,20 +103,6 @@
       full(){
         this.dialogFull = !this.dialogFull
       },
-      // 客户类别默认为客户结算方式默认月结
-      query() {
-        this.$set(this.form, "fStltypeid", 1);
-      },
-      // 添加行
-      addRow(tableData,event){
-        var obj = {}
-         tableData.push(obj)
-      },
-      //删除行
-      deleteRow(index, rows) {
-        rows.splice(index, 1);
-      },
-
       /** 查询客户详情列表 */
       getList() {
         this.loading = true;
@@ -144,82 +112,7 @@
           this.loading = false;
         });
       },
-      // 客户类别字典翻译
-      fTypeidFormat(row, column) {
-        return this.selectDictLabel(this.fTypeidOptions, row.fTypeid);
-      },
-      // 结算表票结、月结字典翻译
-      fStltypeidFormat(row, column) {
-        return this.selectDictLabel(this.fStltypeidOptions, row.fStltypeid);
-      },
-      // 删除状态字典翻译
-      delFlagFormat(row, column) {
-        return this.selectDictLabel(this.delFlagOptions, row.delFlag);
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          fId: null,
-          fTypeid: null,
-          fNo: null,
-          fName: null,
-          fCname: null,
-          fEname: null,
-          fTel: null,
-          fFax: null,
-          fEmail: null,
-          fManage: null,
-          fAddr: null,
-          fEaddr: null,
-          fScale: null,
-          fProvince: null,
-          fCity: null,
-          fStltypeid: null,
-          fStldays: null,
-          fContractno: null,
-          fContractb: null,
-          fContracte: null,
-          fTax: null,
-          fInvtel: null,
-          fInvaddr: null,
-          fBankno: null,
-          fBankname: null,
-          fUbankno: null,
-          fUbankname: null,
-          fStatus: null,
-          delFlag: null,
-          createBy: null,
-          createTime: null,
-          updateBy: null,
-          updateTime: null,
-          remark: null
-        };
-        this.resetForm("form");
-      },
-      // 从表重置
-      contList() {
-        this.contactList = []
-      },
-      // 状态修改
-      handleStatusChange(row) {
-        let text = row.fStatus === "0" ? "启用" : "停用";
-        this.$confirm('确认要"' + text + '""' + row.fName + '"吗?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return changeCorpsStatus(row.fId, row.fStatus);
-        }).then(() => {
-          this.msgSuccess(text + "成功");
-        }).catch(function() {
-          row.fStatus = row.fStatus === "0" ? "1" : "0";
-        });
-      },
+
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;
@@ -236,133 +129,10 @@
         this.single = selection.length!==1
         this.multiple = !selection.length
       },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.query();
-        this.contList();
-        this.open = true;
-        this.title = "添加客户详情";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const fId = row.fId || this.ids
-        getCorps(fId).then(response => {
-          this.form = response.data["corp"];
-          var contactList1=response.data["customerContact"];
-          this.form.fTypeid = this.form.fTypeid.replace(/\[|]/g,'').replace(/\"/g, "").split(",")
-          if(contactList1!=null){
-            this.contactList=contactList1;
-          }else {
-            this.query();
-          }
-          this.open = true;
-          this.title = "修改客户详情";
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.form.fTypename = ''
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.fId != null) {
-              let formDate= new FormData()
-            for (let index in this.fTypeidOptions){
-              for (let item in this.form.fTypeid){
-                if (this.fTypeidOptions[index].dictValue == this.form.fTypeid[item]){
-                  this.form.fTypename += this.fTypeidOptions[index].dictLabel + ','
-                }
-              }
-            }
-              this.form.fTypename = this.form.fTypename.substring(0,this.form.fTypename.length-1)
-              formDate.append('corps',JSON.stringify(this.form));
-              formDate.append('customerContacts',JSON.stringify(this.contactList));
-              addCorps(formDate).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              let formDate= new FormData()
-              for (let index in this.fTypeidOptions){
-                for (let item in this.form.fTypeid){
-                  if (this.fTypeidOptions[index].dictValue == this.form.fTypeid[item]){
-                    this.form.fTypename += this.fTypeidOptions[index].dictLabel + ','
-                  }
-                }
-              }
-              this.form.fTypename = this.form.fTypename.substring(0,this.form.fTypename.length-1)
-              formDate.append('corps',JSON.stringify(this.form));
-              formDate.append('customerContacts',JSON.stringify(this.contactList));
-              addCorps(formDate).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-            }
-          }
-        });
-      },
-      /** 删除按钮操作 */
-      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("删除成功");
-        })
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有客户详情数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCorps(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-      }
+
     }
   };
 </script>
 <style lang="scss">
-.avue-crud__dialog__header {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: justify;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-.el-dialog__title {
-  color: rgba(0,0,0,.85);
-  font-weight: 500;
-  word-wrap: break-word;
-}
-.avue-crud__dialog__menu {
-  padding-right: 20px;
-  float: left;
-}
-.avue-crud__dialog__menu i {
-  color: #909399;
-  font-size: 15px;
-}
-.el-icon-full-screen{
-  cursor: pointer;
-}
-.el-icon-full-screen:before {
-  content: "\e719";
-}
+
 </style>

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

@@ -2,53 +2,65 @@
   <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="fTypeid">
-            <el-select style="width: 240px" v-model="queryParams.fTypeid" placeholder="请选择客户类别" clearable size="small">
-              <el-option
-                v-for="dict in fTypeidOptions"
-                :key="dict.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              />
-            </el-select>
+          <el-form-item label="地点" prop="fUpdateaddress">
+            <el-input
+              style="width: 240px"
+              v-model="queryParams.fUpdateaddress"
+              placeholder="请输入调入地点"
+              clearable
+              @input="bringIn"
+              size="small"/>
           </el-form-item>
 
-          <el-form-item label="空重" prop="fNo">
+          <el-form-item label="空重" prop="fUpdateEF">
             <el-select
-              v-model="queryParams.fNo"
+              v-model="queryParams.fUpdateEF"
               style="width: 240px"
               placeholder="请输入名称"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery"
+              @change="changeUpdateEF"
             >
-
+            <el-option
+              v-for="item in this.updateEFOptions"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
             </el-select>
           </el-form-item>
-        <el-form-item label="状态" prop="fNo">
+        <el-form-item label="状态" prop="fStatus">
           <el-select
-            v-model="queryParams.fNo"
+            v-model="queryParams.fStatus"
             style="width: 240px"
             placeholder="请输入名称"
             clearable
+            @change="changeStatus"
             size="small"
-            @keyup.enter.native="handleQuery"
           >
-
+            <el-option
+              v-for="item in this.cntrstatusOptions"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
           </el-select>
-          <el-form-item label="时间" prop="fNo">
+          <el-form-item label="时间" prop="fBdate">
             <el-date-picker
-              v-model="queryParams.fNo"
+              v-model="queryParams.fBdate"
               type="date"
+              value-format="yyyy-MM-dd"
+              @change="changeDate"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
         </el-form-item>
+        <el-form-item>
+          <el-button type="cyan"  size="mini" @click="determine">提交</el-button>
+        </el-form-item>
       </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-button type="cyan"  size="mini" @click="">提交</el-button>
+<!--      <el-button type="cyan"  size="mini" @click="determine">提交</el-button>-->
 <!--        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
 <!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
@@ -58,19 +70,19 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" width="55" label="行号" align="center" />
       <el-table-column :show-overflow-tooltip="true" label="箱号" align="center" prop="fNo" width="200px"/>
-      <el-table-column label="箱型" align="center" prop="fTypeid" width="100px"/>
-      <el-table-column :show-overflow-tooltip="true" label="尺寸" align="center" prop="fName" width="100px"
+      <el-table-column label="箱型" align="center" prop="typeidName" width="100px"/>
+      <el-table-column :show-overflow-tooltip="true" label="尺寸" align="center" prop="cntrsizeName" width="100px"
       />
-      <el-table-column :show-overflow-tooltip="true" label="箱主" align="center" width="100px" prop="fOwner" />
-      <el-table-column :show-overflow-tooltip="true" label="原时间" align="center" prop="fEname" />
-      <el-table-column :show-overflow-tooltip="true" label="原地点" align="center" prop="fTel" />
+      <el-table-column :show-overflow-tooltip="true" label="箱主" align="center" width="100px" prop="ownerName" />
+      <el-table-column :show-overflow-tooltip="true" label="原时间" align="center" prop="fUpdatetime" />
+      <el-table-column :show-overflow-tooltip="true" label="原地点" align="center" prop="fUpdateaddress" />
 
-      <el-table-column label="原空重" align="center" prop="createBy" />
-      <el-table-column label="原状态" align="center" prop="createTime" width="100"/>
-      <el-table-column label="调入地点" align="center" prop="updateBy" width="100px"/>
-      <el-table-column label="调入空重" align="center" prop="updateBy" width="100px"/>
-      <el-table-column label="调入状态" align="center" prop="updateBy" width="100px"/>
-      <el-table-column label="调入时间" align="center" prop="updateBy" width="100px"/>
+      <el-table-column label="原空重" align="center" prop="updateEFName" />
+      <el-table-column label="原状态" align="center" prop="cntrstatusName" width="100"/>
+      <el-table-column label="调入地点" align="center" prop="foldSite" width="100px"/>
+      <el-table-column label="调入空重" align="center" prop="foldFUpdateef" width="100px"/>
+      <el-table-column label="调入状态" align="center" prop="foldFCntrstatus" width="100px"/>
+      <el-table-column label="调入时间" align="center" prop="foldtime" width="100px"/>
       <el-table-column label="船名" align="center" prop="fVsl" width="100px"/>
       <el-table-column label="航次" align="center" prop="fVoy" width="100px"/>
       <el-table-column label="提单号" align="center" prop="fMblno" width="100px"/>
@@ -81,374 +93,152 @@
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
-      @pagination="getList"
+
     />
 
   </div>
 </template>
 
 <script>
-  import { listCorps, getCorps, delCorps, addCorps, updateCorps, changeCorpsStatus,exportCorps } from "@/api/basicdata/corps";
-  import {queryUserVal} from "@/api/system/user";
-  import { isArray } from '@/utils/validate'
-  import Vue from 'vue'
+  import { listCorps, addmodify } from "@/api/kaihe/containerNews/modifyPage";
   export default {
     name: "boxDistribution",
     components: {
     },
     data() {
       return {
-        //默认显示第一行
-        queryParamsHidden:false,
-
-        //全屏放大
-        dialogFull:false,
-        contactList:[],
+        //空重字典表
+        updateEFOptions:[],
+        //状态字典表
+        cntrstatusOptions:[],
         // 遮罩层
         loading: true,
         // 选中数组
         ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
         // 显示搜索条件
         showSearch: true,
         // 总条数
         total: 0,
         // 客户详情表格数据
         corpsList: [],
-        // 弹出层标题
-        title: "",
-        // 状态数据字典
-        statusOptions: [],
-        // 是否显示弹出层
-        open: false,
-        // 客户类别字典
-        fTypeidOptions: [],
-        // 结算表票结、月结字典
-        fStltypeidOptions: [],
-        // 删除状态字典
-        delFlagOptions: [],
         // 查询参数
         queryParams: {
           pageNum: 1,
           pageSize: 10,
-          fTypeid: null,
-          fNo: null,
-          fName: null,
-          fCname: null,
-          fEname: null,
-          fTel: null,
-          fFax: null,
-          fEmail: null,
-          fManage: null,
-          fAddr: null,
-          fEaddr: null,
-          fScale: null,
-          fProvince: null,
-          fCity: null,
-          fStltypeid: null,
-          fStldays: null,
-          fContractno: null,
-          fContractb: null,
-          fContracte: null,
-          fTax: null,
-          fInvtel: null,
-          fInvaddr: null,
-          fBankno: null,
-          fBankname: null,
-          fUbankno: null,
-          fUbankname: null,
-          fStatus: null,
+          fUpdateaddress:null,
+          fUpdateEF:null,
+          fStatus:null,
+          fBdate:null,
         },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-           fTypeid: [
-            { required: true, message: "客户类别不能为空", trigger: "blur" }
-          ],
-          fNo: [
-            { required: true, message: "编号不能为空", trigger: "blur" }
-          ],
-          fName: [
-            { required: true, message: "名称不能为空", trigger: "blur" }
-          ],
-          fCname:[
-            { required: true, message: "简称不能为空", trigger: "blur" }
-          ],
-          fStatus: [
-            { required: true, message: "状态默认 T ,正常T 停用F 下拉选择不能为空", trigger: "blur" }
-          ],
-        }
+        select:'',
       };
     },
+    //页面跳转后传递参数
+    activated() {
+      let formDate = JSON.parse(this.$route.query.data)
+      if(formDate){
+        addmodify(formDate).then(response =>{
+          this.corpsList = response.rows
+          this.loading = false;
+        })
+      }
+    },
     created() {
-      this.getList();
-      this.getDicts("data_customer_category").then(response => {
-        this.fTypeidOptions = response.data;
-      });
-      this.getDicts("data_stltype_type").then(response => {
-        this.fStltypeidOptions = response.data;
+      this.getDicts("f_updateEF").then(response => {
+        this.updateEFOptions = response.data;
       });
-      this.getDicts("data_delete_state").then(response => {
-        this.delFlagOptions = response.data;
+      this.getDicts("f_cntrstatus").then(response => {
+        this.cntrstatusOptions = response.data;
       });
-      this.getDicts("sys_normal_disable").then(response => {
-        this.statusOptions = response.data;
-      });
-    },
-    activated() {
-      console.log(this.$route.query.data)
 
     },
-    methods: {
-      full(){
-        this.dialogFull = !this.dialogFull
-      },
-      // 客户类别默认为客户结算方式默认月结
-      query() {
-        this.$set(this.form, "fStltypeid", 1);
-      },
-      // 添加行
-      addRow(tableData,event){
-        var obj = {}
-         tableData.push(obj)
-      },
-      //删除行
-      deleteRow(index, rows) {
-        rows.splice(index, 1);
-      },
 
-      /** 查询客户详情列表 */
-      getList() {
-        this.loading = true;
-        listCorps(this.queryParams).then(response => {
-          this.corpsList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      // 客户类别字典翻译
-      fTypeidFormat(row, column) {
-        return this.selectDictLabel(this.fTypeidOptions, row.fTypeid);
-      },
-      // 结算表票结、月结字典翻译
-      fStltypeidFormat(row, column) {
-        return this.selectDictLabel(this.fStltypeidOptions, row.fStltypeid);
-      },
-      // 删除状态字典翻译
-      delFlagFormat(row, column) {
-        return this.selectDictLabel(this.delFlagOptions, row.delFlag);
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          fId: null,
-          fTypeid: null,
-          fNo: null,
-          fName: null,
-          fCname: null,
-          fEname: null,
-          fTel: null,
-          fFax: null,
-          fEmail: null,
-          fManage: null,
-          fAddr: null,
-          fEaddr: null,
-          fScale: null,
-          fProvince: null,
-          fCity: null,
-          fStltypeid: null,
-          fStldays: null,
-          fContractno: null,
-          fContractb: null,
-          fContracte: null,
-          fTax: null,
-          fInvtel: null,
-          fInvaddr: null,
-          fBankno: null,
-          fBankname: null,
-          fUbankno: null,
-          fUbankname: null,
-          fStatus: null,
-          delFlag: null,
-          createBy: null,
-          createTime: null,
-          updateBy: null,
-          updateTime: null,
-          remark: null
-        };
-        this.resetForm("form");
+    methods: {
+      //提交修改数据
+      determine(){
+        let data = []
+        for(let item in this.select) {
+          for(let li in this.corpsList) {
+            if (this.corpsList[li].fId == this.select[item].fId) {
+              if (!this.select[item].foldSite) {
+                this.select[item].foldSite = this.corpsList[li].fUpdateaddress
+              }
+              if (!this.select[item].foldFUpdateef) {
+                this.select[item].foldFUpdateef = this.corpsList[li].updateEFName
+                this.$set(this.select[item],'FUpdateef',this.corpsList[li].fUpdateef)
+              }
+              if (!this.select[item].foldFCntrstatus) {
+                this.select[item].foldFCntrstatus = this.corpsList[li].cntrstatusName
+                this.$set(this.select[item],'FCntrstatus',this.corpsList[li].fCntrstatus)
+              }
+              if (!this.select[item].foldtime) {
+                this.select[item].foldtime = this.corpsList[li].fUpdatetime
+              }
+              this.select[item].fVsl = this.corpsList[li].fVsl
+              this.select[item].fVoy = this.corpsList[li].fVoy
+              this.select[item].fMblno = this.corpsList[li].fMblno
+            }
+        }
+          data.push({
+            fId: this.select[item].fId,
+            foldSite: this.select[item].foldSite,
+            foldFUpdateef: this.select[item].FUpdateef,
+            foldFCntrstatus: this.select[item].FCntrstatus,
+            foldtime: this.select[item].foldtime,
+            fVsl: this.select[item].fVsl,
+            fVoy:this.select[item].fVoy,
+            fMblno:this.select[item].fMblno,
+          })
+        }
+        let tCntrno = data
+        listCorps(tCntrno).then(response =>{
+          this.$message.success("提交成功")
+          this.$router.push({
+            path: "/containerNews/boxDistribution",
+          });
+        })
       },
-      // 从表重置
-      contList() {
-        this.contactList = []
+      //地点带入
+      bringIn(value,row){
+        for(let item in this.select){
+          this.select[item].foldSite = value
+        }
       },
-      // 状态修改
-      handleStatusChange(row) {
-        let text = row.fStatus === "0" ? "启用" : "停用";
-        this.$confirm('确认要"' + text + '""' + row.fName + '"吗?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return changeCorpsStatus(row.fId, row.fStatus);
-        }).then(() => {
-          this.msgSuccess(text + "成功");
-        }).catch(function() {
-          row.fStatus = row.fStatus === "0" ? "1" : "0";
-        });
+      //空重带入选中列表
+      changeUpdateEF(){
+        for(let item in this.select){
+          for(let li in this.updateEFOptions){
+            if(this.queryParams.fUpdateEF == this.updateEFOptions[li].dictValue){
+              this.$set(this.select[item],'foldFUpdateef',this.updateEFOptions[li].dictLabel)
+              this.$set(this.select[item],'FUpdateef',this.queryParams.fUpdateEF)
+            }
+          }
+        }
       },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
+      //状态带入选中列表
+      changeStatus(){
+        for(let item in this.select) {
+          for (let li in this.cntrstatusOptions) {
+            if(this.queryParams.fStatus == this.cntrstatusOptions[li].dictValue)
+            this.$set(this.select[item], 'foldFCntrstatus', this.cntrstatusOptions[li].dictLabel)
+            this.$set(this.select[item], 'FCntrstatus', this.queryParams.fStatus)
+          }
+        }
       },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
+      //时间带入选列表
+      changeDate(){
+        for(let item in this.select){
+          this.$set(this.select[item],'foldtime',this.queryParams.fBdate)
+        }
       },
-      // 多选框选中数据
+      //多选框选中
       handleSelectionChange(selection) {
         this.ids = selection.map(item => item.fId)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
+        this.select = selection
       },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.query();
-        this.contList();
-        this.open = true;
-        this.title = "添加客户详情";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const fId = row.fId || this.ids
-        getCorps(fId).then(response => {
-          this.form = response.data["corp"];
-          var contactList1=response.data["customerContact"];
-          this.form.fTypeid = this.form.fTypeid.replace(/\[|]/g,'').replace(/\"/g, "").split(",")
-          if(contactList1!=null){
-            this.contactList=contactList1;
-          }else {
-            this.query();
-          }
-          this.open = true;
-          this.title = "修改客户详情";
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.form.fTypename = ''
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.fId != null) {
-              let formDate= new FormData()
-            for (let index in this.fTypeidOptions){
-              for (let item in this.form.fTypeid){
-                if (this.fTypeidOptions[index].dictValue == this.form.fTypeid[item]){
-                  this.form.fTypename += this.fTypeidOptions[index].dictLabel + ','
-                }
-              }
-            }
-              this.form.fTypename = this.form.fTypename.substring(0,this.form.fTypename.length-1)
-              formDate.append('corps',JSON.stringify(this.form));
-              formDate.append('customerContacts',JSON.stringify(this.contactList));
-              addCorps(formDate).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              let formDate= new FormData()
-              for (let index in this.fTypeidOptions){
-                for (let item in this.form.fTypeid){
-                  if (this.fTypeidOptions[index].dictValue == this.form.fTypeid[item]){
-                    this.form.fTypename += this.fTypeidOptions[index].dictLabel + ','
-                  }
-                }
-              }
-              this.form.fTypename = this.form.fTypename.substring(0,this.form.fTypename.length-1)
-              formDate.append('corps',JSON.stringify(this.form));
-              formDate.append('customerContacts',JSON.stringify(this.contactList));
-              addCorps(formDate).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-            }
-          }
-        });
-      },
-      /** 删除按钮操作 */
-      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("删除成功");
-        })
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有客户详情数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCorps(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
-      }
     }
   };
 </script>
 <style lang="scss">
-.avue-crud__dialog__header {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: justify;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-.el-dialog__title {
-  color: rgba(0,0,0,.85);
-  font-weight: 500;
-  word-wrap: break-word;
-}
-.avue-crud__dialog__menu {
-  padding-right: 20px;
-  float: left;
-}
-.avue-crud__dialog__menu i {
-  color: #909399;
-  font-size: 15px;
-}
-.el-icon-full-screen{
-  cursor: pointer;
-}
-.el-icon-full-screen:before {
-  content: "\e719";
-}
+
 </style>