From cd1415fe3420d883cbd5fc79ca4c73aac69b2e45 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 22 May 2024 09:14:32 +0800
Subject: [PATCH] md

---
 .../emisWarehouseInForm.vue                   | 237 ---------
 src/views/emis/emisWarehouseIn copy/index.vue | 484 ------------------
 .../emisWarehouseIn/emisWarehouseInForm.vue   |  68 ++-
 src/views/emis/emisWarehouseIn/index.vue      | 106 +++-
 4 files changed, 147 insertions(+), 748 deletions(-)
 delete mode 100644 src/views/emis/emisWarehouseIn copy/emisWarehouseInForm.vue
 delete mode 100644 src/views/emis/emisWarehouseIn copy/index.vue

diff --git a/src/views/emis/emisWarehouseIn copy/emisWarehouseInForm.vue b/src/views/emis/emisWarehouseIn copy/emisWarehouseInForm.vue
deleted file mode 100644
index d661ccdb..00000000
--- a/src/views/emis/emisWarehouseIn copy/emisWarehouseInForm.vue	
+++ /dev/null
@@ -1,237 +0,0 @@
-<template>
-  <div >
-       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-         <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-          <el-col :span="24">
-            <el-form-item label="进仓序列号" prop="serialNo">
-              <el-input v-model="form.serialNo" placeholder="请输入进仓序列号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="进仓单号" prop="inNo">
-              <el-input v-model="form.inNo" placeholder="请输入进仓单号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="订单号" prop="orderSn">
-              <el-input v-model="form.orderSn" placeholder="请输入订单号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="运单号" prop="billCode">
-              <el-input v-model="form.billCode" placeholder="请输入运单号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="客户编号" prop="customerCode">
-              <el-input v-model="form.customerCode" placeholder="请输入客户编号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="客户名称" prop="customerName">
-              <el-input v-model="form.customerName" placeholder="请输入客户名称" />
-            </el-form-item>
-          </el-col>
-        <el-col :span="24">
-            <el-form-item label="进仓日期" prop="entryDate">
-              <el-date-picker clearable
-                v-model="form.entryDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择进仓日期">
-              </el-date-picker>
-            </el-form-item>
-        </el-col>
-          <el-col :span="24">
-            <el-form-item label="客户确认状态" prop="confirmStatus">
-              <el-input v-model="form.confirmStatus" placeholder="请输入客户确认状态" />
-            </el-form-item>
-          </el-col>
-        <el-col :span="24">
-            <el-form-item label="确认时间" prop="confirmDate">
-              <el-date-picker clearable
-                v-model="form.confirmDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择确认时间">
-              </el-date-picker>
-            </el-form-item>
-        </el-col>
-          <el-col :span="24">
-            <el-form-item label="占用状态" prop="usedStatus">
-              <el-input v-model="form.usedStatus" placeholder="请输入占用状态" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="状态" prop="status">
-              <el-input v-model="form.status" placeholder="请输入状态" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="删除标志（0代表存在" prop="delFlag">
-              <el-input v-model="form.delFlag" placeholder="请输入删除标志（0代表存在" />
-            </el-form-item>
-          </el-col>
-
-        <!--
-         <el-form-item label="上级字典">
-              <treeselect
-                ref="tree"
-                v-model="form.parentId"
-                :options="emisWarehouseInOptions"
-                :normalizer="normalizer"
-                :default-expand-level="1"
-                :show-count="true"
-                placeholder="选择上级"
-              />
-        </el-form-item>
-        -->
-        </el-row>
-      </el-form>
-      <div style="text-align: center;margin-bottom: 10px;">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    
-  </div>
-</template>
-
-<script>
-import { listEmisWarehouseIn, getEmisWarehouseIn, delEmisWarehouseIn, addEmisWarehouseIn, updateEmisWarehouseIn } from "@/api/emis/emisWarehouseIn";
-
-export default {
-  name: "emisWarehouseInForm",
-  props:{
-    id:{
-        type:Number
-    }
-  },
-  components: {  },
-  dicts: [
-  ],
-  data() {
-    return {
-      emisWarehouseInOptions: [],
-      // 遮罩层
-      loading: true,
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "id不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-   watch: {
-      "id": {
-        handler (newValue, oldValue) {
-          this.id = newValue;
-          this.initData();
-        },
-        deep: true
-      }
-  },
-  created() {
-    this.initData();
-  },
-
-  methods: {
-    initData() {
-       
-        if(this.id !=null) {
-          this.loading = true;
-          getEmisWarehouseIn(this.id).then(response => {
-            this.form = response.data;
-            this.loading = false;
-          });
-        }else{
-            this.reset();
-        }
-        // this.getTreeselect();
-    },
-    // 取消按钮
-    cancel() {
-      this.reset();
-      this.$emit("on-cancel");
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        serialNo: null,
-        inNo: null,
-        orderSn: null,
-        billCode: null,
-        customerCode: null,
-        customerName: null,
-        entryDate: null,
-        confirmStatus: null,
-        confirmDate: null,
-        usedStatus: null,
-        status: null,
-        remark: null,
-        tenantId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        createSite: null,
-        updateSite: null
-      };
-      this.resetForm("form");
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateEmisWarehouseIn(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.$emit("on-changed");
-            });
-          } else {
-            addEmisWarehouseIn(this.form).then(response => {
-               this.$modal.msgSuccess("修改成功");
-               this.$emit("on-changed");
-            });
-          }
-        }
-      });
-    },
-    //   /** 转换菜单数据结构 */
-    //  normalizer(node) {
-    //   if (node.children && !node.children.length) {
-    //     delete node.children;
-    //   }
-    //   return {
-    //     id: node.id,
-    //     label: node.idName,
-    //     children: node.children
-    //   };
-    // },
-    //  /** 查询菜单下拉树结构 */
-    // getTreeselect() {
-    //   const queryParams = {}
-    //   listEmisWarehouseIn(queryParams).then(response => {
-    //     this.emisWarehouseInOptions = [];
-    //     const rootItem = { idId: 0, emisWarehouseInName: '-', children: [] };
-    //     rootItem.children = this.handleTree(response.data, "id");
-    //     this.emisWarehouseInOptions.push(rootItem);
-
-    //     if(this.parentId != undefined) {
-    //       this.form.parentId = this.parentId;
-    //     }
-
-    //   });
-    // },
-  }
-};
-</script>
diff --git a/src/views/emis/emisWarehouseIn copy/index.vue b/src/views/emis/emisWarehouseIn copy/index.vue
deleted file mode 100644
index 3520588e..00000000
--- a/src/views/emis/emisWarehouseIn copy/index.vue	
+++ /dev/null
@@ -1,484 +0,0 @@
-<template>
-  <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-   
-      <el-form-item label="" prop="serialNo">
-        <el-input
-          v-model="queryParams.serialNo"
-          :placeholder="$t('进仓序列号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="inNo">
-        <el-input
-          v-model="queryParams.inNo"
-          :placeholder="$t('进仓单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="orderSn">
-        <el-input
-          v-model="queryParams.orderSn"
-          :placeholder="$t('订单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="billCode">
-        <el-input
-          v-model="queryParams.billCode"
-          :placeholder="$t('运单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="customerCode">
-        <el-input
-          v-model="queryParams.customerCode"
-          :placeholder="$t('客户编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="customerName">
-        <el-input
-          v-model="queryParams.customerName"
-          :placeholder="$t('客户名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="entryDate">
-        <el-date-picker clearable
-          v-model="queryParams.entryDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('进仓日期')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="confirmStatus">
-        <el-input
-          v-model="queryParams.confirmStatus"
-          :placeholder="$t('客户确认状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="confirmDate">
-        <el-date-picker clearable
-          v-model="queryParams.confirmDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('确认时间')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="usedStatus">
-        <el-input
-          v-model="queryParams.usedStatus"
-          :placeholder="$t('占用状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="status">
-        <el-input
-          v-model="queryParams.status"
-          :placeholder="$t('状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="$t('备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          :placeholder="$t('删除标志（0代表存在')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    </SearchForm>
-
-   
-    <XdTable v-loading="loading" 
-           border stripe
-           size="small"
-           :data="emisWarehouseInList"
-           :showSearch.sync="showSearch"
-           :queryParams="queryParams"
-           :total="total"
-           @queryTable="getList"
-           @selection-change="handleSelectionChange"
-           @sort-change="handleSortChange"
-           >
-      
-      <div slot="toolbar">
-        <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button
-                  type="primary"
-                  plain
-                  icon="el-icon-plus"
-                  size="mini"
-                  @click="handleAdd"
-                  v-hasPermi="['emis:emisWarehouseIn:add']"
-                >新增</el-button>
-              </el-col>
-              <!-- 
-              <el-col :span="1.5">
-                <el-button
-                  type="success"
-                  plain
-                  icon="el-icon-edit"
-                  size="mini"
-                  :disabled="single"
-                  @click="handleUpdate"
-                  v-hasPermi="['emis:emisWarehouseIn:edit']"
-                >修改</el-button>
-              </el-col> -->
-              <el-col :span="1.5">
-                <el-button
-                  type="danger"
-                  plain
-                  icon="el-icon-delete"
-                  size="mini"
-                  :disabled="multiple"
-                  @click="handleDelete"
-                  v-hasPermi="['emis:emisWarehouseIn:remove']"
-                >删除</el-button>
-              </el-col>
-              <!-- <el-col :span="1.5">
-                <el-button
-                  type="warning"
-                  plain
-                  icon="el-icon-download"
-                  size="mini"
-                  @click="handleExport"
-                  v-hasPermi="['emis:emisWarehouseIn:export']"
-                >导出</el-button>
-              </el-col> -->
-          </el-row>
-      </div>
-      
-      <el-table-column type="selection" width="55" align="center" />
-      <!--
-      <el-table-column label="序号" align="center" min-width="60">
-             <template slot-scope="scope">
-                <span v-text="getIndex(scope.$index)"> </span>
-             </template>
-      </el-table-column>
-       
-       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
-        <template slot-scope="scope">
-            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
-         </template>
-      </el-table-column>
-
-      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
-            <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 10" style="color:red;">
-                <span class="el-tag">待确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 11" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 20" >
-                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 21" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 40" style="color:red;">
-                <span class="el-tag el-tag--danger">已拒绝</span>
-              </div>
-            </template>
-          </el-table-column>
-      -->
-
-      <el-table-column :label="$t('进仓序列号')" align="center" prop="serialNo" min-width="100" />
-      <el-table-column :label="$t('进仓单号')" align="center" prop="inNo" min-width="100" />
-      <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" />
-      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
-      <el-table-column :label="$t('客户编号')" align="center" prop="customerCode" min-width="100" />
-      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
-      <el-table-column :label="$t('进仓日期')" align="center" prop="entryDate" min-width="100" />
-      <el-table-column :label="$t('客户确认状态')" align="center" prop="confirmStatus" min-width="100" />
-      <el-table-column :label="$t('确认时间')" align="center" prop="confirmDate" min-width="100" />
-      <el-table-column :label="$t('占用状态')" align="center" prop="usedStatus" min-width="100" />
-      <el-table-column :label="$t('状态')" align="center" prop="status" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
-      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
-      <el-table-column :label="$t('操作')" 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="['emis:emisWarehouseIn:edit']"
-          >修改</el-button>
-          <!-- 
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisWarehouseIn:remove']"
-          >删除</el-button> -->
-        </template>
-      </el-table-column>
-    </XdTable>
-
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
-      <emisWarehouseInForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWarehouseInForm>
-    </el-dialog>
-    
-
-    <!--
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
-        <emisWarehouseInView :id="id" ></EmisWarehouseInView>
-    </el-dialog>
-    -->
-
-  </div>
-</template>
-
-<script>
-import { listEmisWarehouseIn, getEmisWarehouseIn, delEmisWarehouseIn, addEmisWarehouseIn, updateEmisWarehouseIn } from "@/api/emis/emisWarehouseIn";
-import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-// import emisWarehouseInView from '@/views/emis/emisWarehouseIn/emisWarehouseInView';
-import emisWarehouseInForm from '@/views/emis/emisWarehouseIn/emisWarehouseInForm';
-
-export default {
-  name: "emisWarehouseIn",
-  components: { elDateSimplePicker,emisWarehouseInForm },
-  dicts: [
-  ],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 创建时间搜索
-      dateTimeRange:[],
-      // 总条数
-      total: 0,
-      // 进仓单表格数据
-      emisWarehouseInList: [],
-    
-      currentId:null,
-      openForm: false,
-      titleForm: "",
-
-      // 弹出展示层
-      id:null,
-      titleView:"",
-      openView: false,
-      // 更新站点时间范围
-      daterangeEntryDate: [],
-      // 更新站点时间范围
-      daterangeConfirmDate: [],
-      // 更新站点时间范围
-      daterangeCreateTime: [],
-      // 更新站点时间范围
-      daterangeUpdateTime: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        serialNo: null,
-        inNo: null,
-        orderSn: null,
-        billCode: null,
-        customerCode: null,
-        customerName: null,
-        entryDate: null,
-        confirmStatus: null,
-        confirmDate: null,
-        usedStatus: null,
-        status: null,
-        remark: null,
-        delFlag: null,
-      },
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询进仓单列表 */
-    getList() {
-      this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeEntryDate && '' != this.daterangeEntryDate) {
-        this.queryParams.params["beginEntryDate"] = this.daterangeEntryDate[0];
-        this.queryParams.params["endEntryDate"] = this.daterangeEntryDate[1];
-      }
-      if (null != this.daterangeConfirmDate && '' != this.daterangeConfirmDate) {
-        this.queryParams.params["beginConfirmDate"] = this.daterangeConfirmDate[0];
-        this.queryParams.params["endConfirmDate"] = this.daterangeConfirmDate[1];
-      }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
-      listEmisWarehouseIn(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
-        this.emisWarehouseInList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    // 排序 查询字段是表格中字段名字 动态取值排序顺序
-    handleSortChange(column) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.currentId=null;
-      this.openForm= true;
-      this.titleForm = "新增";
-    },
-    handleShowMoreInput(){
-      this.moreInputVisible = !this.moreInputVisible;
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-       this.currentId= row.id;
-       this.openForm = true;
-       this.titleForm = "修改";
-    },
-    handleView(row) {
-       this.id=row.id;
-       this.titleView="查看";
-       this.openView=true;
-    //   this.router.push({ path: '/emis/emisWarehouseIn/viewDetail', query: { id: row.id }})
-    },
-    handleFormChanged(){
-        this.openForm = false;
-        this.getList();
-    },
-    cancelForm(){
-      this.openForm = false;
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除').then(function() {
-        return delEmisWarehouseIn(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-    //   this.download('emis/emisWarehouseIn/export', {
-    //     ...this.queryParams
-    //   }, `emisWarehouseIn_${new Date().getTime()}.xlsx`)
-     const loadingInstance = this.$loading({
-            text: '正在导出...'
-        })
-       var qParam = {...this.queryParams};
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
-
-       listEmisWarehouseIn(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
-        this.downloadLoading = false
-        if (response.code === 200) {
-                const curList = response.rows
-                import('@/vendor/Export2Excel').then(excel => {
-                  const tHeader = ['id','进仓序列号','进仓单号','订单号','运单号','客户编号','客户名称','进仓日期','客户确认状态','确认时间','占用状态','状态','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
-                  const filterVal = ['id','serialNo','inNo','orderSn','billCode','customerCode','customerName','entryDate','confirmStatus','confirmDate','usedStatus','status','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
-                  const data = this.formatJson(filterVal, curList, response.rows)
-                  excel.export_json_to_excel({
-                    header: tHeader,
-                    data,
-                    filename: '进仓单',
-                    autoWidth: true
-                  })
-                  loadingInstance.close()
-                })
-        }
-      });
-    },
-    formatJson(filterVal, jsonData, resData) {
-      let index = 0
-      return jsonData.map(v => filterVal.map(j => {
-        if (j === 'index') {
-          return ++index
-        }
-        if (j === 'status') {
-          var statusStr='xxx'
-          if(v[j] == 10){
-              statusStr='xxx'
-          }
-          return statusStr;
-        }
-        return v[j]
-      }))
-    },
-    /** 列索引函数  */
-    getIndex($index) {
-          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
-    },
-    /** 时间搜索响应函数 */
-    dateTimeChange(value){
-        this.dateTimeRange=value;
-    },
-  }
-};
-</script>
-
-<style scoped>
-  .el-divider{
-    margin-top: 0px;
-    background: 0 0;
-    border-top: 1px solid #E6EBF5;
-  }
-  .el-divider__text {
-    color: #0955ee;
-    cursor: pointer;
-  }
-</style>
diff --git a/src/views/emis/emisWarehouseIn/emisWarehouseInForm.vue b/src/views/emis/emisWarehouseIn/emisWarehouseInForm.vue
index 7d53d731..d661ccdb 100644
--- a/src/views/emis/emisWarehouseIn/emisWarehouseInForm.vue
+++ b/src/views/emis/emisWarehouseIn/emisWarehouseInForm.vue
@@ -1,12 +1,27 @@
 <template>
   <div >
-    <el-row :gutter="0">
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+         <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+          <el-col :span="24">
+            <el-form-item label="进仓序列号" prop="serialNo">
+              <el-input v-model="form.serialNo" placeholder="请输入进仓序列号" />
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="进仓单号" prop="inNo">
               <el-input v-model="form.inNo" placeholder="请输入进仓单号" />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="订单号" prop="orderSn">
+              <el-input v-model="form.orderSn" placeholder="请输入订单号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="运单号" prop="billCode">
+              <el-input v-model="form.billCode" placeholder="请输入运单号" />
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="客户编号" prop="customerCode">
               <el-input v-model="form.customerCode" placeholder="请输入客户编号" />
@@ -18,9 +33,9 @@
             </el-form-item>
           </el-col>
         <el-col :span="24">
-            <el-form-item label="进仓日期" prop="superiorDate">
+            <el-form-item label="进仓日期" prop="entryDate">
               <el-date-picker clearable
-                v-model="form.superiorDate"
+                v-model="form.entryDate"
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="请选择进仓日期">
@@ -28,8 +43,28 @@
             </el-form-item>
         </el-col>
           <el-col :span="24">
-            <el-form-item label="序号" prop="serialNumber">
-              <el-input v-model="form.serialNumber" placeholder="请输入序号" />
+            <el-form-item label="客户确认状态" prop="confirmStatus">
+              <el-input v-model="form.confirmStatus" placeholder="请输入客户确认状态" />
+            </el-form-item>
+          </el-col>
+        <el-col :span="24">
+            <el-form-item label="确认时间" prop="confirmDate">
+              <el-date-picker clearable
+                v-model="form.confirmDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择确认时间">
+              </el-date-picker>
+            </el-form-item>
+        </el-col>
+          <el-col :span="24">
+            <el-form-item label="占用状态" prop="usedStatus">
+              <el-input v-model="form.usedStatus" placeholder="请输入占用状态" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="状态" prop="status">
+              <el-input v-model="form.status" placeholder="请输入状态" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -37,6 +72,11 @@
               <el-input v-model="form.remark" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="删除标志（0代表存在" prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="请输入删除标志（0代表存在" />
+            </el-form-item>
+          </el-col>
 
         <!--
          <el-form-item label="上级字典">
@@ -51,10 +91,8 @@
               />
         </el-form-item>
         -->
-
-
-        </el-form>
-      </el-row>
+        </el-row>
+      </el-form>
       <div style="text-align: center;margin-bottom: 10px;">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -127,11 +165,17 @@ export default {
     reset() {
       this.form = {
         id: null,
+        serialNo: null,
         inNo: null,
+        orderSn: null,
+        billCode: null,
         customerCode: null,
         customerName: null,
-        superiorDate: null,
-        serialNumber: null,
+        entryDate: null,
+        confirmStatus: null,
+        confirmDate: null,
+        usedStatus: null,
+        status: null,
         remark: null,
         tenantId: null,
         delFlag: null,
diff --git a/src/views/emis/emisWarehouseIn/index.vue b/src/views/emis/emisWarehouseIn/index.vue
index 4a85af63..3520588e 100644
--- a/src/views/emis/emisWarehouseIn/index.vue
+++ b/src/views/emis/emisWarehouseIn/index.vue
@@ -2,6 +2,14 @@
   <div class="app-container">
     <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
    
+      <el-form-item label="" prop="serialNo">
+        <el-input
+          v-model="queryParams.serialNo"
+          :placeholder="$t('进仓序列号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="" prop="inNo">
         <el-input
           v-model="queryParams.inNo"
@@ -10,6 +18,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="" prop="orderSn">
+        <el-input
+          v-model="queryParams.orderSn"
+          :placeholder="$t('订单号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="billCode">
+        <el-input
+          v-model="queryParams.billCode"
+          :placeholder="$t('运单号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="" prop="customerCode">
         <el-input
           v-model="queryParams.customerCode"
@@ -26,18 +50,42 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="superiorDate">
+      <el-form-item label="" prop="entryDate">
         <el-date-picker clearable
-          v-model="queryParams.superiorDate"
+          v-model="queryParams.entryDate"
           type="date"
           value-format="yyyy-MM-dd HH:mm:ss"
           :placeholder="$t('进仓日期')">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="" prop="serialNumber">
+      <el-form-item label="" prop="confirmStatus">
         <el-input
-          v-model="queryParams.serialNumber"
-          :placeholder="$t('序号')"
+          v-model="queryParams.confirmStatus"
+          :placeholder="$t('客户确认状态')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="confirmDate">
+        <el-date-picker clearable
+          v-model="queryParams.confirmDate"
+          type="date"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          :placeholder="$t('确认时间')">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="" prop="usedStatus">
+        <el-input
+          v-model="queryParams.usedStatus"
+          :placeholder="$t('占用状态')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="status">
+        <el-input
+          v-model="queryParams.status"
+          :placeholder="$t('状态')"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -50,6 +98,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="" prop="delFlag">
+        <el-input
+          v-model="queryParams.delFlag"
+          :placeholder="$t('删除标志（0代表存在')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
     </SearchForm>
 
    
@@ -151,12 +207,19 @@
           </el-table-column>
       -->
 
+      <el-table-column :label="$t('进仓序列号')" align="center" prop="serialNo" min-width="100" />
       <el-table-column :label="$t('进仓单号')" align="center" prop="inNo" min-width="100" />
+      <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" />
+      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
       <el-table-column :label="$t('客户编号')" align="center" prop="customerCode" min-width="100" />
       <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
-      <el-table-column :label="$t('进仓日期')" align="center" prop="superiorDate" min-width="100" />
-      <el-table-column :label="$t('序号')" align="center" prop="serialNumber" min-width="100" />
+      <el-table-column :label="$t('进仓日期')" align="center" prop="entryDate" min-width="100" />
+      <el-table-column :label="$t('客户确认状态')" align="center" prop="confirmStatus" min-width="100" />
+      <el-table-column :label="$t('确认时间')" align="center" prop="confirmDate" min-width="100" />
+      <el-table-column :label="$t('占用状态')" align="center" prop="usedStatus" min-width="100" />
+      <el-table-column :label="$t('状态')" align="center" prop="status" min-width="100" />
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
+      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -231,7 +294,9 @@ export default {
       titleView:"",
       openView: false,
       // 更新站点时间范围
-      daterangeSuperiorDate: [],
+      daterangeEntryDate: [],
+      // 更新站点时间范围
+      daterangeConfirmDate: [],
       // 更新站点时间范围
       daterangeCreateTime: [],
       // 更新站点时间范围
@@ -240,12 +305,19 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 20,
+        serialNo: null,
         inNo: null,
+        orderSn: null,
+        billCode: null,
         customerCode: null,
         customerName: null,
-        superiorDate: null,
-        serialNumber: null,
+        entryDate: null,
+        confirmStatus: null,
+        confirmDate: null,
+        usedStatus: null,
+        status: null,
         remark: null,
+        delFlag: null,
       },
     };
   },
@@ -257,9 +329,13 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.params = {};
-      if (null != this.daterangeSuperiorDate && '' != this.daterangeSuperiorDate) {
-        this.queryParams.params["beginSuperiorDate"] = this.daterangeSuperiorDate[0];
-        this.queryParams.params["endSuperiorDate"] = this.daterangeSuperiorDate[1];
+      if (null != this.daterangeEntryDate && '' != this.daterangeEntryDate) {
+        this.queryParams.params["beginEntryDate"] = this.daterangeEntryDate[0];
+        this.queryParams.params["endEntryDate"] = this.daterangeEntryDate[1];
+      }
+      if (null != this.daterangeConfirmDate && '' != this.daterangeConfirmDate) {
+        this.queryParams.params["beginConfirmDate"] = this.daterangeConfirmDate[0];
+        this.queryParams.params["endConfirmDate"] = this.daterangeConfirmDate[1];
       }
       if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
         this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
@@ -353,8 +429,8 @@ export default {
         if (response.code === 200) {
                 const curList = response.rows
                 import('@/vendor/Export2Excel').then(excel => {
-                  const tHeader = ['id','进仓单号','客户编号','客户名称','进仓日期','序号','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
-                  const filterVal = ['id','inNo','customerCode','customerName','superiorDate','serialNumber','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
+                  const tHeader = ['id','进仓序列号','进仓单号','订单号','运单号','客户编号','客户名称','进仓日期','客户确认状态','确认时间','占用状态','状态','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
+                  const filterVal = ['id','serialNo','inNo','orderSn','billCode','customerCode','customerName','entryDate','confirmStatus','confirmDate','usedStatus','status','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
                   const data = this.formatJson(filterVal, curList, response.rows)
                   excel.export_json_to_excel({
                     header: tHeader,