Merge branch 'master' into dev

src/api/appVersion/version.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询APP版本信息列表
+export function listVersion(query) {
+  return request({
+    url: '/appVersion/version/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询APP版本信息详细
+export function getVersion(fId) {
+  return request({
+    url: '/appVersion/version/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增APP版本信息
+export function addVersion(data) {
+  return request({
+    url: '/appVersion/version',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改APP版本信息
+export function updateVersion(data) {
+  return request({
+    url: '/appVersion/version',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除APP版本信息
+export function delVersion(fId) {
+  return request({
+    url: '/appVersion/version/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出APP版本信息
+export function exportVersion(query) {
+  return request({
+    url: '/appVersion/version/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/kaihe/containerNews/boxInformation.js

@@ -58,7 +58,7 @@ export function delCorps(fIds) {
 // 导出客户详情
 export function exportCorps(query) {
   return request({
-    url: '/shipping/route/export',
+    url: '/shipping/cntrno/export',
     method: 'get',
     params: query
   })

src/views/appVersion/version/index.vue

@@ -0,0 +1,309 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="参数" prop="fParamkey">
+        <el-input
+          v-model="queryParams.fParamkey"
+          placeholder="请输入参数"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="参数值" prop="fParamvalue">
+        <el-input
+          v-model="queryParams.fParamvalue"
+          placeholder="请输入参数值"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="fStatus">
+        <el-select v-model="queryParams.fStatus" placeholder="请选择状态">
+          <el-option label="正常" value="0"></el-option>
+          <el-option label="停用" value="1"></el-option>
+        </el-select>
+      </el-form-item>
+      <!--<el-form-item label="扩展" prop="fParamlabel">
+        <el-input
+          v-model="queryParams.fParamlabel"
+          placeholder="请输入扩展"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item>
+        <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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['appVersion:version:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['appVersion:version:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['appVersion:version:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['appVersion:version:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="versionList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键" align="center" prop="fId" />
+      <el-table-column label="参数" align="center" prop="fParamkey" />
+      <el-table-column label="参数值" align="center" prop="fParamvalue" />
+      <el-table-column label="状态" align="center" prop="fStatusName" />
+      <!--<el-table-column label="扩展" align="center" prop="fParamlabel" />-->
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['appVersion:version:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['appVersion:version:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改APP版本信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="参数" prop="fParamkey">
+          <el-input v-model="form.fParamkey" placeholder="请输入参数" />
+        </el-form-item>
+        <el-form-item label="参数值" prop="fParamvalue">
+          <el-input v-model="form.fParamvalue" placeholder="请输入参数" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-select v-model="form.fStatus" placeholder="请选择状态">
+          <el-option label="正常" value="0"></el-option>
+          <el-option label="停用" value="1"></el-option>
+          </el-select>
+        </el-form-item>
+        <!--<el-form-item label="扩展" prop="fParamlabel">
+          <el-input v-model="form.fParamlabel" placeholder="请输入扩展" />
+        </el-form-item>-->
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listVersion, getVersion, delVersion, addVersion, updateVersion, exportVersion } from "@/api/appVersion/version";
+
+export default {
+  name: "Version",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // APP版本信息表格数据
+      versionList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fParamkey: null,
+        fParamvalue: null,
+        fStatus: null,
+        fParamlabel: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询APP版本信息列表 */
+    getList() {
+      this.loading = true;
+      listVersion(this.queryParams).then(response => {
+        this.versionList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fId: null,
+        fParamkey: null,
+        fParamvalue: null,
+        fStatus: 0,
+        fParamlabel: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.fId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加APP版本信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const fId = row.fId || this.ids
+      getVersion(fId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改APP版本信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.fId != null) {
+            updateVersion(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addVersion(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const fIds = row.fId || this.ids;
+      this.$confirm('是否确认删除APP版本信息编号为"' + fIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delVersion(fIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有APP版本信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportVersion(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>

src/views/finance/applyForInvoice/chargeInvoice/index.vue

@@ -1287,7 +1287,7 @@
                 <template>
                   <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
                   <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
-                  <span v-else-if="scope.row.fBilltype == 'KHDD'">凯合订单</span>
+                  <span v-else-if="scope.row.fBilltype == 'KHDD'">凯和订单</span>
                   <span v-else>{{ scope.row.fBilltype }}</span>
                 </template>
               </span>

src/views/finance/applyForInvoice/salesInvoice/index.vue

@@ -1254,7 +1254,7 @@
                 <template>
                   <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
                   <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
-                  <span v-else-if="scope.row.fBilltype == 'KHDD'">凯合订单</span>
+                  <span v-else-if="scope.row.fBilltype == 'KHDD'">凯和订单</span>
                   <span v-else>{{ scope.row.fBilltype }}</span>
                 </template>
               </span>

src/views/finance/charge/index.vue

@@ -1117,7 +1117,7 @@
                 <template>
                   <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
                   <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
-                  <span v-else-if="scope.row.fBilltype == 'KHDD'">凯合订单</span>
+                  <span v-else-if="scope.row.fBilltype == 'KHDD'">凯和订单</span>
                   <span v-else>{{ scope.row.fBilltype }}</span>
                 </template>
               </span>

src/views/finance/contrast/index.vue

@@ -1434,7 +1434,7 @@
                       >费用补充</span
                     >
                     <span v-else-if="scope.row.fBilltype == 'KHDD'"
-                      >凯合订单</span
+                      >凯和订单</span
                     >
                   </template>
                 </span>

src/views/finance/payment/index.vue

@@ -1122,7 +1122,7 @@
                 <template>
                   <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
                   <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
-                  <span v-else-if="scope.row.fBilltype == 'KHDD'">凯合订单</span>
+                  <span v-else-if="scope.row.fBilltype == 'KHDD'">凯和订单</span>
                   <span v-else>{{ scope.row.fBilltype }}</span>
                 </template>
               </span>

src/views/index.vue

@@ -177,7 +177,7 @@
                   <span v-else-if="item.refno2 === 'KHSF'">凯和收费</span>
                   <span v-else-if="item.refno2 === 'KHFF'">凯和付费</span>
                   <span v-else-if="item.refno2 === 'ApplyFP'">凯和开票申请</span>
-                  <span v-else-if="item.refno2 === 'KHDD'">凯合订单</span>
+                  <span v-else-if="item.refno2 === 'KHDD'">凯和订单</span>
                   <span v-else-if="item.refno2 === 'SE'">下单配船</span>
                 </div>
                 <div class="home_stock_table" @click="approval(item)">
@@ -715,7 +715,7 @@
                 <span v-else-if="item.refno2 === 'KHSF'">凯和收费</span>
                 <span v-else-if="item.refno2 === 'KHFF'">凯和付费</span>
                 <span v-else-if="item.refno2 === 'ApplyFP'">凯和开票申请</span>
-                <span v-else-if="item.refno2 === 'KHDD'">凯合订单</span>
+                <span v-else-if="item.refno2 === 'KHDD'">凯和订单</span>
                 <span v-else-if="item.refno2 === 'SE'">下单配船</span>
               </div>
               <div class="home_stock_table" @click="approval(item)">

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

@@ -1266,7 +1266,7 @@
       </el-button>
       <el-button type="primary"
                  v-if="form.fBillstatus != 11 ||form.moneyStatus == null || form.moneyStatus != null && form.moneyStatus >= 4"
-                 @click="addOrUpdateHandle(form,'f_billstatus')"
+                 @click="addOrUpdateHandle('f_billstatus')"
       >查看审批
       </el-button>
       <el-button icon="el-icon-arrow-left" type="danger" v-if="cancelButton === true" @click="cancel">返回列表</el-button>
@@ -2130,7 +2130,7 @@ export default {
             let actId = ''
             if (this.form.fBillstatus < 6) {
               actId = '410'
-              this.$refs.ApprovalComments.init(form.fId,actId,status,this.form.fMblno)
+              this.$refs.ApprovalComments.init(form.fId,status,actId,this.form.fMblno)
             } else if (this.form.moneyStatus != null && this.form.moneyStatus < 6) {
               actId = '460'
               this.$refs.ApprovalComments.init(form.fId,status,actId)

src/views/morePage/stock/index.vue

@@ -665,23 +665,23 @@ export default {
                 break;
               }
               case "ApplyFP": {
-                e.refno2 = "凯合开票申请";
+                e.refno2 = "凯和开票申请";
                 break;
               }
               case "KHDZ": {
-                e.refno2 = "凯合对账";
+                e.refno2 = "凯和对账";
                 break;
               }
               case "KHSF": {
-                e.refno2 = "凯合收费";
+                e.refno2 = "凯和收费";
                 break;
               }
               case "KHFF": {
-                e.refno2 = "凯合付费";
+                e.refno2 = "凯和付费";
                 break;
               }
               case "KHDD": {
-                e.refno2 = "凯合订单";
+                e.refno2 = "凯和订单";
                 break;
               }
               default: {

src/views/system/auditConfiguration/index.vue

@@ -50,11 +50,11 @@
           <span v-if="scope.row.actId === 320">协议计划费审批流程</span>
           <span v-if="scope.row.actId === 410">下单审批流程</span>
           <span v-if="scope.row.actId === 420">配船审批流程</span>
-          <span v-if="scope.row.actId === 430">凯合对账审批流程</span>
-          <span v-if="scope.row.actId === 440">凯合收费审批流程</span>
-          <span v-if="scope.row.actId === 450">凯合付费审批流程</span>
-          <span v-if="scope.row.actId === 460">凯合费用审批流程</span>
-          <span v-if="scope.row.actId === 470">凯合发票申请审批流程</span>
+          <span v-if="scope.row.actId === 430">凯和对账审批流程</span>
+          <span v-if="scope.row.actId === 440">凯和收费审批流程</span>
+          <span v-if="scope.row.actId === 450">凯和付费审批流程</span>
+          <span v-if="scope.row.actId === 460">凯和费用审批流程</span>
+          <span v-if="scope.row.actId === 470">凯和发票申请审批流程</span>
         </template>
       </el-table-column>
       <el-table-column