Merge branch 'dev' of git.echepei.com:zhujiawei/Warehouse_management_ui 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/finance/contrast.js

@@ -16,7 +16,21 @@ export function listFleet(query) {
     params: query
   })
 }
-
+// 车队导出excel
+export function contrastExport(query) {
+  return request({
+    url: '/finances/contrast/export',
+    method: 'get',
+    params: query
+  })
+}
+// 车队导出明细excel
+export function exporItems(fId) {
+  return request({
+    url: '/finances/contrast/exportItems/'+fId,
+    method: 'get'
+  })
+}
 // 查询财务数据主详细
 export function getFee(fId) {
   return request({
@@ -145,7 +159,7 @@ export function exportWarehousebillsitems(fId) {
   })
 }
 
-//车队导入搜索 
+//车队导入搜索
 export function importFleet(params) {
   return request({
     url: '/finances/contrast/contrastList',
@@ -169,4 +183,4 @@ export function listCorps(query) {
     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/components/plugs/print.js

@@ -0,0 +1,163 @@
+// 打印类属性、方法定义
+/* eslint-disable */
+const Print = function (dom, options) {
+  if (!(this instanceof Print)) return new Print(dom, options);
+
+  this.options = this.extend({
+    'noPrint': '.no-print'
+  }, options);
+
+  if ((typeof dom) === "string") {
+    this.dom = document.querySelector(dom);
+  } else {
+    this.isDOM(dom)
+    this.dom = this.isDOM(dom) ? dom : dom.$el;
+  }
+
+  this.init();
+};
+Print.prototype = {
+  init: function () {
+    var content = this.getStyle() + this.getHtml();
+    this.writeIframe(content);
+  },
+  extend: function (obj, obj2) {
+    for (var k in obj2) {
+      obj[k] = obj2[k];
+    }
+    return obj;
+  },
+
+  getStyle: function () {
+    var str = "",
+      styles = document.querySelectorAll('style,link');
+    for (var i = 0; i < styles.length; i++) {
+      str += styles[i].outerHTML;
+    }
+    str += "<style>" + (this.options.noPrint ? this.options.noPrint : '.no-print') + "{display:none;}</style>";
+
+    return str;
+  },
+
+  getHtml: function () {
+    var inputs = document.querySelectorAll('input');
+    var textareas = document.querySelectorAll('textarea');
+    var selects = document.querySelectorAll('select');
+
+    for (var k = 0; k < inputs.length; k++) {
+      if (inputs[k].type == "checkbox" || inputs[k].type == "radio") {
+        if (inputs[k].checked == true) {
+          inputs[k].setAttribute('checked', "checked")
+        } else {
+          inputs[k].removeAttribute('checked')
+        }
+      } else if (inputs[k].type == "text") {
+        inputs[k].setAttribute('value', inputs[k].value)
+      } else {
+        inputs[k].setAttribute('value', inputs[k].value)
+      }
+    }
+
+    for (var k2 = 0; k2 < textareas.length; k2++) {
+      if (textareas[k2].type == 'textarea') {
+        textareas[k2].innerHTML = textareas[k2].value
+      }
+    }
+
+    for (var k3 = 0; k3 < selects.length; k3++) {
+      if (selects[k3].type == 'select-one') {
+        var child = selects[k3].children;
+        for (var i in child) {
+          if (child[i].tagName == 'OPTION') {
+            if (child[i].selected == true) {
+              child[i].setAttribute('selected', "selected")
+            } else {
+              child[i].removeAttribute('selected')
+            }
+          }
+        }
+      }
+    }
+    // 包裹要打印的元素
+    // fix: https://github.com/xyl66/vuePlugs_printjs/issues/36
+    let outerHTML = this.wrapperRefDom(this.dom).outerHTML
+    return outerHTML;
+  },
+  // 向父级元素循环，包裹当前需要打印的元素
+  // 防止根级别开头的 css 选择器不生效
+  wrapperRefDom: function (refDom) {
+    let prevDom = null
+    let currDom = refDom
+    // 判断当前元素是否在 body 中，不在文档中则直接返回该节点
+    if (!this.isInBody(currDom)) return currDom
+
+    while (currDom) {
+      if (prevDom) {
+        let element = currDom.cloneNode(false)
+        element.appendChild(prevDom)
+        prevDom = element
+      } else {
+        prevDom = currDom.cloneNode(true)
+      }
+
+      currDom = currDom.parentElement
+    }
+
+    return prevDom
+  },
+
+  writeIframe: function (content) {
+    var w, doc, iframe = document.createElement('iframe'),
+      f = document.body.appendChild(iframe);
+    iframe.id = "myIframe";
+    //iframe.style = "position:absolute;width:0;height:0;top:-10px;left:-10px;";
+    iframe.setAttribute('style', 'position:absolute;width:0;height:0;top:-10px;left:-10px;');
+    w = f.contentWindow || f.contentDocument;
+    doc = f.contentDocument || f.contentWindow.document;
+    doc.open();
+    doc.write(content);
+    doc.close();
+    var _this = this
+    iframe.onload = function(){
+      _this.toPrint(w);
+      setTimeout(function () {
+        document.body.removeChild(iframe)
+      }, 100)
+    }
+  },
+
+  toPrint: function (frameWindow) {
+    try {
+      setTimeout(function () {
+        frameWindow.focus();
+        try {
+          if (!frameWindow.document.execCommand('print', false, null)) {
+            frameWindow.print();
+          }
+        } catch (e) {
+          frameWindow.print();
+        }
+        frameWindow.close();
+      }, 10);
+    } catch (err) {
+      console.log('err', err);
+    }
+  },
+  // 检查一个元素是否是 body 元素的后代元素且非 body 元素本身
+  isInBody: function (node) {
+    return (node === document.body) ? false : document.body.contains(node);
+  },
+  isDOM: (typeof HTMLElement === 'object') ?
+    function (obj) {
+      return obj instanceof HTMLElement;
+    } :
+    function (obj) {
+      return obj && typeof obj === 'object' && obj.nodeType === 1 && typeof obj.nodeName === 'string';
+    }
+};
+const MyPlugin = {}
+MyPlugin.install = function (Vue, options) {
+  // 4. 添加实例方法
+  Vue.prototype.$print = Print
+}
+export default MyPlugin

src/main.js

@@ -25,6 +25,9 @@ import RightToolbar from "@/components/RightToolbar"
 import echarts from "echarts";
 import '@/utils/dialog.js'
 
+import Print from '@/components/plugs/print'
+Vue.use(Print) // 注册
+
 import Blob from '@/excel/Blob.js'
 
 import Export2Excel from '@/excel/Export2Excel.js'
@@ -247,4 +250,4 @@ Vue.directive('Space', {
         input.value = input.value.replace(/\s+/g,'')
       }
     }
-});
+});

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -88,6 +88,7 @@
           <el-form-item
             label="结算方式"
             prop="fStltypeid"
+            v-if="dataShowcar == '1'"
           >
             <el-select
               v-model="form.fStltypeid"
@@ -104,6 +105,27 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="作业类型" prop="fBusinessType" v-else>
+            <el-select
+              style="width: 80%"
+              v-model="form.fBusinessType"
+              filterable
+              @change="educationChange"
+              :disabled="
+                contrOl ||
+                browseStatus ||
+                warehouseDrList.length > 0 ||
+                warehouseCrList.length > 0
+              "
+            >
+              <el-option
+                v-for="(item, index) in businessTypeOption"
+                :key="index.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="提单号" prop="fMblno">
@@ -262,6 +284,7 @@
           <el-form-item
             label="作业类型"
             prop="fBusinessType"
+            v-if="dataShowcar == '1'"
           >
             <el-select
               style="width: 80%"
@@ -283,6 +306,22 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="结算方式" prop="fStltypeid" v-else>
+            <el-select
+              v-model="form.fStltypeid"
+              placeholder="请选择结算方式"
+              clearable
+              :disabled="browseStatus"
+              style="width: 80%"
+            >
+              <el-option
+                v-for="(item, index) in fStltypeOptions"
+                :key="index.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+            </el-select>
+          </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="劳务公司" prop="fLabour">
@@ -2729,7 +2768,7 @@
           class="print_form"
         >
           <div>
-            <div>调拨日：{{ fBsdate }}</div>
+            <div>调拨日：{{ fBsdate }}&nbsp;{{timeOut}}</div>
           </div>
           <div>
             <div>清单：{{ form.fCustomsdeclartion }}</div>
@@ -2744,24 +2783,24 @@
               <td>箱号</td>
               <td>现存库区</td>
               <td>件数</td>
-              <td>毛重</td>
-              <td>净重</td>
+              <td>毛重(吨)</td>
+              <td>净重(吨)</td>
               <td>移入库区</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fOrgwarehouseInformation }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ item.fGrossweight }}</td>
-              <td>{{ item.fNetweight }}</td>
+              <td>{{ (item.fGrossweight/1000).toFixed(2) }}</td>
+              <td>{{ (item.fNetweight/1000).toFixed(2) }}</td>
 
               <td>{{ item.fWarehouseInformation }}</td>
             </tr>
             <tr>
               <td colspan="2">合计：</td>
               <td>{{allfQty}}</td>
-              <td>{{allfNetweight}}</td>
-              <td>{{allfGrossweight}}</td>
+              <td>{{(allfNetweight/1000).toFixed(2)}}</td>
+              <td>{{(allfGrossweight/1000).toFixed(2)}}</td>
               <td></td>
             </tr>
             <tr>
@@ -3035,6 +3074,7 @@ export default {
   },
   data() {
     return {
+      timeOut:'',
       pageNum: 1,
       pageSize: 10,
       dialogWhgenlegList: [],
@@ -5047,6 +5087,12 @@ export default {
             let M = (date.getMonth() +1 <10 ?'0' + (date.getMonth() +1) : date.getMonth() +1)
             let D = date.getDate()
             this.fBsdate = Y + '-' + M + '-' + D
+            //获取当前时间
+            let now= new Date()
+            let _hour = ( 10 > now.getHours() ) ? '0' + now.getHours() : now.getHours();
+            let _minute = ( 10 > now.getMinutes() ) ? '0' + now.getMinutes() : now.getMinutes();
+            this.timeOut = _hour + ':' + _minute
+            console.log(this.data)
             this.fDriverTel = this.Printinglist[0].fDriverTel;
             // this.fBsdate = this.Printinglist[0].fBsdate;
             this.fTruckno = this.Printinglist[0].fTruckno;

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>
@@ -1690,7 +1690,6 @@ import {
   updateFee,
   exportFee,
   importFee,
-  exportWarehousebillsitems,
   importFleet,
   addFleet,
   listFleet,
@@ -1699,6 +1698,9 @@ import {
   detailFleet,
   confirmFleet,
   listCorps,
+  exporItems,
+  contrastExport,
+  exportWarehousebillsitems
 } from "@/api/finance/contrast";
 // import { listCorps } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
@@ -2182,7 +2184,7 @@ export default {
         },
         {
           surface: "14",
-          label: "fAmtcr",
+          label: "fAmt",
           name: "本次金额",
           checked: 0,
           width: 100,
@@ -3258,7 +3260,12 @@ export default {
     },
     //导出
     handleExportItems() {
-      const fIds = this.queryParams.fId;
+      let fIds = 0;
+      if (Cookies.get("sysType") == 2) {
+        fIds = this.queryParams.id;
+      } else {
+        fIds = this.queryParams.fId;
+      }
       if (fIds !== null) {
         this.$confirm("是否确认导出所有计费物资明细数据?", "警告", {
           confirmButtonText: "确定",
@@ -3266,7 +3273,11 @@ export default {
           type: "warning",
         })
           .then(function () {
-            return exportWarehousebillsitems(fIds);
+            if (Cookies.get("sysType") == 2) {
+              return exporItems(fIds);
+            } else {
+              return exportWarehousebillsitems(fIds);
+            }
           })
           .then((response) => {
             this.download(response.msg);
@@ -4658,7 +4669,11 @@ export default {
         type: "warning",
       })
         .then(function () {
-          return exportFee(queryParams);
+          if (Cookies.get("sysType") == 2) {
+            return contrastExport(queryParams);
+          } else {
+            return exportFee(queryParams);
+          }
         })
         .then((response) => {
           this.download(response.msg);

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/fleet/plans/index.vue

@@ -15,7 +15,7 @@
               placeholder="请输入提单号"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery"
+              @keyup.enter.native="handleQuery()"
               style="max-width: 187px"
             />
           </el-form-item>
@@ -125,7 +125,7 @@
                   placeholder="请输入提箱地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 />
               </el-form-item>
@@ -141,7 +141,7 @@
                   placeholder="请输入装卸货地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
@@ -158,7 +158,7 @@
                   placeholder="请输入卸箱地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
@@ -168,6 +168,12 @@
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
+        <el-button size="mini" @click="handleQuery(2)">全 部</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button size="mini" @click="handleQuery(1)">未完成</el-button>
+      </el-col>
+      <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -224,7 +230,7 @@
             type="cyan"
             icon="el-icon-search"
             size="mini"
-            @click="handleQuery"
+            @click="handleQuery()"
             >搜索</el-button
           >
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -452,15 +458,16 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        mblno: null,
         corpId: null,
+        goodsId: null,
+        loadAddr: null,
         billType: null,
         transType: null,
         transProp: null,
-        goodsId: null,
-        mblno: null,
-        loadAddr: null,
         mdLoadAddr: null,
         unLoadAddr: null,
+        incompleteStatus: 1,
       },
       billTypeList: [],
       transTypeList: [],
@@ -959,8 +966,11 @@ export default {
       return jsonData.map((v) => filterVal.map((j) => v[j]));
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery(val) {
       this.queryParams.pageNum = 1;
+      if (val) {
+        this.queryParams.incompleteStatus = val;
+      }
       this.getList();
     },
     /** 重置按钮操作 */

src/views/fleet/scheduling/index.vue

@@ -15,7 +15,7 @@
               placeholder="请输入提单号"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery"
+              @keyup.enter.native="handleQuery()"
               style="max-width: 187px"
             />
           </el-form-item>
@@ -126,7 +126,7 @@
                   placeholder="请输入提箱地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 />
               </el-form-item>
@@ -142,7 +142,7 @@
                   placeholder="请输入装卸货地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
@@ -159,7 +159,7 @@
                   placeholder="请输入卸箱地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
@@ -168,16 +168,12 @@
       </el-collapse-transition>
     </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="['fleet:ftmsorderbillsplans:add']"
-          >新增</el-button
-        >
-      </el-col> -->
+      <el-col :span="1.5">
+        <el-button size="mini" @click="handleQuery(2)">全 部</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button size="mini" @click="handleQuery(1)">未完成</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -205,7 +201,7 @@
             type="cyan"
             icon="el-icon-search"
             size="mini"
-            @click="handleQuery"
+            @click="handleQuery()"
             >搜索</el-button
           >
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -428,6 +424,7 @@ export default {
         loadAddr: null,
         mdLoadAddr: null,
         unLoadAddr: null,
+        dispatchStatus: 1,
       },
       billTypeList: [],
       transTypeList: [],
@@ -661,6 +658,7 @@ export default {
     getList() {
       this.loading = true;
       // this.queryParams["billStatus"]="40"
+      console.log(JSON.stringify(this.queryParams))
       listFtmsorderbillscntrs(this.queryParams).then((response) => {
         response.rows.map((e) => {
           if (e.createTime) {
@@ -876,8 +874,11 @@ export default {
         });
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery(val) {
       this.queryParams.pageNum = 1;
+      if (val) {
+        this.queryParams.dispatchStatus = val;
+      }
       this.getList();
     },
     /** 重置按钮操作 */

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -845,7 +845,7 @@
                         schedulingList[0].transProp == '1' &&
                         scope.row.billStatus >= 6
                       "
-                      :disabled="scope.row.mBillNo ? true : false"
+                      :disabled="scope.row.billKind != 'NN'"
                       v-hasPermi="['fleet:ftmsorderbillscars:edit']"
                       >配载</el-button
                     >

src/views/fleet/sendcar/index.vue

@@ -15,7 +15,7 @@
               placeholder="请输入提单号"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery"
+              @keyup.enter.native="handleQuery()"
               style="max-width: 187px"
             />
           </el-form-item>
@@ -78,27 +78,6 @@
             <el-col :span="6">
               <el-form-item
                 label-width="100px"
-                label="状态"
-                prop="planBillStatus"
-              >
-                <el-select
-                  v-model="queryParams.planBillStatus"
-                  placeholder="请选择状态"
-                  clearable
-                  size="small"
-                >
-                  <el-option
-                    v-for="(dict, index) in planStatusOption"
-                    :key="index.id"
-                    :label="dict.name"
-                    :value="dict.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item
-                label-width="100px"
                 label="运输性质"
                 prop="transProp"
               >
@@ -146,7 +125,7 @@
                   placeholder="请输入提箱地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 />
               </el-form-item>
@@ -162,7 +141,7 @@
                   placeholder="请输入装卸货地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
@@ -179,7 +158,7 @@
                   placeholder="请输入卸箱地点"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
+                  @keyup.enter.native="handleQuery()"
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
@@ -188,16 +167,12 @@
       </el-collapse-transition>
     </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="['fleet:plans:add']"
-          >新增</el-button
-        >
-      </el-col> -->
+      <el-col :span="1.5">
+        <el-button size="mini" @click="handleQuery(2)">全 部</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button size="mini" @click="handleQuery(1)">未完成</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -236,7 +211,7 @@
             type="cyan"
             icon="el-icon-search"
             size="mini"
-            @click="handleQuery"
+            @click="handleQuery()"
             >搜索</el-button
           >
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -466,7 +441,7 @@ export default {
         loadAddr: null,
         mdLoadAddr: null,
         unLoadAddr: null,
-        planBillStatus: null,
+        planBillStatus: 1,
       },
       billTypeList: [],
       transTypeList: [],
@@ -607,16 +582,6 @@ export default {
       vehicleList: [],
       show: false,
       collapses: [],
-      planStatusOption: [{
-        id: 6,
-        name: '待派车'
-      }, {
-        id: 20,
-        name: '派车中'
-      }, {
-        id: 60,
-        name: '派车完成'
-      }]
     };
   },
   // 使用子组件
@@ -926,8 +891,11 @@ export default {
         });
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery(val) {
       this.queryParams.pageNum = 1;
+      if (val) {
+        this.queryParams.planBillStatus = val;
+      }
       this.getList();
     },
     /** 重置按钮操作 */

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/reportManagement/whgenleg/index.vue

@@ -127,6 +127,16 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="库存箱号" prop="fLocalcntrno">
+        <el-input
+          v-model="queryParams.fLocalcntrno"
+          placeholder="库存箱号"
+          clearable
+          style="width: 200px"
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button
           type="cyan"
@@ -416,8 +426,9 @@ export default {
         pageNum: 1,
         pageSize: 50,
         fOriginalbillno: null,
-        isCntrno: null,
+        isCntrno: 0,
         fPreqty: null,
+        fLocalcntrno: null,
         fPregrossweight: null,
         fPrenetweight: null,
         fQtyd: null,
@@ -593,6 +604,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "21",
+          label: "fLocalcntrno",
+          name: "库存箱号",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       isCntrnoOptions: [
@@ -816,7 +834,6 @@ export default {
         this.$message.error("请输入仓库!");
         return false;
       }
-
       let queryParams = {
         pageNum: 1,
         pageSize: 10,
@@ -852,7 +869,9 @@ export default {
     getList() {
       this.loading = true;
       mapListWhgenleg(this.queryParams).then((response) => {
-        console.log(response);
+        response.rows.map((e) => {
+          e.fCntrno=this.queryParams.isCntrno == 1 ? null:e.fCntrno
+        })
         this.whgenlegList = response.rows;
         this.total = response.total;
         this.loading = false;

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