diff --git a/code/WebApp/vue/SettleAccount-vue.rar b/code/WebApp/vue/SettleAccount-vue.rar
new file mode 100644
index 00000000..aa037c27
Binary files /dev/null and b/code/WebApp/vue/SettleAccount-vue.rar differ
diff --git a/code/WebApp/vue/package.json b/code/WebApp/vue/package.json
index f9f80d0c..d70ac53b 100644
--- a/code/WebApp/vue/package.json
+++ b/code/WebApp/vue/package.json
@@ -52,7 +52,6 @@
     "driver.js": "0.9.5",
     "dropzone": "5.5.1",
     "echarts": "4.2.1",
-    "el-table-transfer": "^0.1.4",
     "element-ui": "2.13.0",
     "file-saver": "2.0.1",
     "fuse.js": "3.4.4",
@@ -61,6 +60,7 @@
     "jszip": "3.2.1",
     "lockr": "^0.8.5",
     "moment": "^2.29.1",
+    "node-sass": "^4.14.1",
     "normalize.css": "^7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
@@ -73,15 +73,14 @@
     "vue": "2.6.10",
     "vue-bus": "^1.2.1",
     "vue-count-to": "1.0.13",
-    "vue-cropper": "^0.5.8",
+    "vue-cropper": "^0.5.5",
     "vue-i18n": "7.3.2",
     "vue-infinite-scroll": "^2.0.2",
     "vue-lazyload": "^1.3.3",
     "vue-loader": "^15.9.5",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",
-    "vue-style-loader": "^4.1.3",
-    "vuedraggable": "^2.24.3",
+    "vuedraggable": "^2.20.0",
     "vuex": "3.1.0",
     "xlsx": "0.14.1"
   },
@@ -90,10 +89,10 @@
     "@babel/register": "7.0.0",
     "@vue/cli-plugin-babel": "3.5.3",
     "@vue/cli-plugin-eslint": "^3.9.1",
-    "@vue/cli-plugin-unit-jest": "^4.5.15",
-    "@vue/cli-service": "^4.5.15",
+    "@vue/cli-plugin-unit-jest": "^4.5.9",
+    "@vue/cli-service": "^4.5.9",
     "@vue/test-utils": "1.0.0-beta.29",
-    "autoprefixer": "^9.8.8",
+    "autoprefixer": "^9.5.1",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.1",
     "babel-jest": "^26.6.3",
@@ -105,9 +104,7 @@
     "html-webpack-plugin": "3.2.0",
     "husky": "1.3.1",
     "lint-staged": "8.1.5",
-    "mini-css-extract-plugin": "^2.4.6",
     "mockjs": "1.0.1-beta3",
-    "node-sass": "^4.14.1",
     "plop": "2.3.0",
     "postcss-loader": "^4.0.4",
     "postcss-px-to-viewport": "^1.1.1",
@@ -115,13 +112,11 @@
     "sass-loader": "^7.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",
     "script-loader": "0.7.2",
-    "serve-static": "^1.14.2",
+    "serve-static": "^1.13.2",
     "svg-sprite-loader": "4.1.3",
     "svgo": "1.2.0",
     "vue-happy-scroll": "^2.1.1",
-    "vue-template-compiler": "2.6.10",
-    "webpack": "^4.46.0",
-    "webpack-cli": "^4.9.1"
+    "vue-template-compiler": "2.6.10"
   },
   "engines": {
     "node": ">=8.9",
diff --git a/code/WebApp/vue/src/api.rar b/code/WebApp/vue/src/api.rar
new file mode 100644
index 00000000..5bb55a97
Binary files /dev/null and b/code/WebApp/vue/src/api.rar differ
diff --git a/code/WebApp/vue/src/api/monitor/job.js b/code/WebApp/vue/src/api/monitor/job.js
new file mode 100644
index 00000000..58c43434
--- /dev/null
+++ b/code/WebApp/vue/src/api/monitor/job.js
@@ -0,0 +1,80 @@
+import request from '@/utils/request'
+
+// 查询定时任务调度列表
+export function listJob(query) {
+  return request({
+    url: '/monitor/job/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询定时任务调度详细
+export function getJob(jobId) {
+  return request({
+    url: '/monitor/job/' + jobId,
+    method: 'get'
+  })
+}
+
+// 新增定时任务调度
+export function addJob(data) {
+  return request({
+    url: '/monitor/job',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改定时任务调度
+export function updateJob(data) {
+  return request({
+    url: '/monitor/job',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除定时任务调度
+export function delJob(jobId) {
+  return request({
+    url: '/monitor/job/' + jobId,
+    method: 'delete'
+  })
+}
+
+// 导出定时任务调度
+export function exportJob(query) {
+  return request({
+    url: '/monitor/job/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 任务状态修改
+export function changeJobStatus(jobId, status) {
+  const data = {
+    jobId,
+    status
+  }
+  return request({
+    url: '/monitor/job/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+
+// 定时任务立即执行一次
+export function runJob(jobId, jobGroup) {
+  const data = {
+    jobId,
+    jobGroup
+  }
+  return request({
+    url: '/monitor/job/run',
+    method: 'put',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/code/WebApp/vue/src/api/monitor/jobLog.js b/code/WebApp/vue/src/api/monitor/jobLog.js
new file mode 100644
index 00000000..be1fffdf
--- /dev/null
+++ b/code/WebApp/vue/src/api/monitor/jobLog.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+// 查询调度日志列表
+export function listJobLog(query) {
+  return request({
+    url: '/monitor/jobLog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除调度日志
+export function delJobLog(jobLogId) {
+  return request({
+    url: '/monitor/jobLog/' + jobLogId,
+    method: 'delete'
+  })
+}
+
+// 清空调度日志
+export function cleanJobLog() {
+  return request({
+    url: '/monitor/jobLog/clean',
+    method: 'delete'
+  })
+}
+
+// 导出调度日志
+export function exportJobLog(query) {
+  return request({
+    url: '/monitor/jobLog/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/code/WebApp/vue/src/api/monitor/server.js b/code/WebApp/vue/src/api/monitor/server.js
new file mode 100644
index 00000000..feed7836
--- /dev/null
+++ b/code/WebApp/vue/src/api/monitor/server.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 查询服务器详细
+export function getServer() {
+  return request({
+    url: '/monitor/server',
+    method: 'get'
+  })
+}
\ No newline at end of file
diff --git a/code/WebApp/vue/src/assets/iconfont.rar b/code/WebApp/vue/src/assets/iconfont.rar
new file mode 100644
index 00000000..4107ff2c
Binary files /dev/null and b/code/WebApp/vue/src/assets/iconfont.rar differ
diff --git a/code/WebApp/vue/src/assets/img/win-logo-1.png b/code/WebApp/vue/src/assets/img/win-logo-1.png
deleted file mode 100644
index e54df714..00000000
Binary files a/code/WebApp/vue/src/assets/img/win-logo-1.png and /dev/null differ
diff --git a/code/WebApp/vue/src/axios/index.js b/code/WebApp/vue/src/axios/index.js
index f020c7f7..85b19642 100644
--- a/code/WebApp/vue/src/axios/index.js
+++ b/code/WebApp/vue/src/axios/index.js
@@ -15,13 +15,8 @@ axios.defaults.timeout = 10000
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8;'
 //TODO:配置读取
 axios.defaults.headers['Accept-Language'] = "zh-Hans"
-
-
+// axios.defaults.baseURL = '';
 axios.defaults.baseURL = config.base.ip + ':' + config.base.backend_port
-//axios.defaults.baseURL = 'http://localhost:44344'; //?? 登录调试
-
-
-
 // POST传参序列化
 axios.interceptors.request.use((config) => {
   // eslint-disable-next-line eqeqeq
diff --git a/code/WebApp/vue/src/components/1.vue b/code/WebApp/vue/src/components/1.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/code/WebApp/vue/src/components/CreateCom/Job-Select.vue b/code/WebApp/vue/src/components/CreateCom/Job-Select.vue
deleted file mode 100644
index d088f156..00000000
--- a/code/WebApp/vue/src/components/CreateCom/Job-Select.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<template>
-  <el-select
-    v-model="dataValue"
-    style="width: 200px"
-    placeholder="请选择版本"
-    @change="valueChange"
-  >
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value"
-    />
-  </el-select>
-</template>
-<script type="text/javascript">
-import stringMixin from "./stringMixin";
-
-export default {
-  name: "JobSelect",
-  components: {},
-  props: {
-    options: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      dataValue: "",
-    };
-  },
-  created() {},
-  watch: {
-    options: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          //加上默认初始值
-          this.dataValue = this.options[0].value;
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {},
-  methods: {
-    // 输入的值
-    valueChange(val) {
-      /** 回调筛选数据 */
-      this.$emit("value-change", {
-        index: this.index,
-        value: val,
-        data: this.options,
-      });
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>
diff --git a/code/WebApp/vue/src/components/CreateCom/Xh-JS-Select copy.vue b/code/WebApp/vue/src/components/CreateCom/Xh-JS-Select copy.vue
deleted file mode 100644
index 852af765..00000000
--- a/code/WebApp/vue/src/components/CreateCom/Xh-JS-Select copy.vue	
+++ /dev/null
@@ -1,64 +0,0 @@
-<template>
-  <el-select
-    v-model="dataValue"
-    style="width: 200px"
-    placeholder="请选择"
-    @change="valueChange"
-  >
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value"
-    />
-  </el-select>
-</template>
-<script type="text/javascript">
-import stringMixin from "./stringMixin";
-
-export default {
-  name: "XhJSSelect",
-  components: {},
-  props: {
-    options: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      dataValue: "",
-    };
-  },
-  created() {},
-  watch: {
-    options: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          //加上默认初始值
-          this.dataValue = this.options[0].value;
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {},
-  methods: {
-    // 输入的值
-    valueChange(val) {
-      /** 回调筛选数据 */
-      this.$emit("value-change", {
-        index: this.index,
-        value: val,
-        data: this.options,
-      });
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>
diff --git a/code/WebApp/vue/src/components/CreateCom/Xh-JS-Select-Label.vue b/code/WebApp/vue/src/components/CreateCom/Xh-JS-Select-Label.vue
deleted file mode 100644
index 2450ef12..00000000
--- a/code/WebApp/vue/src/components/CreateCom/Xh-JS-Select-Label.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <el-select
-    v-model="dataValue"
-    style="width: 200px"
-    placeholder="请选择"
-    @change="valueChange"
-  >
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value"
-    />
-  </el-select>
-</template>
-<script type="text/javascript">
-import stringMixin from "./stringMixin";
-
-export default {
-  name: "XhJSSelect",
-  components: {},
-  props: {
-    options: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      dataValue: "",
-    };
-  },
-  created() {},
-  watch: {
-    options: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          //加上默认初始值
-          this.dataValue = this.options[0].value;
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {},
-  methods: {
-    // 输入的值
-    valueChange(val) {
-      const obj = this.options.find((item) => {
-        return item.value == val;//传入id值
-      });
-      /** 回调筛选数据 */
-      this.$emit("value-change", {
-        index: this.index,
-        value: obj.label,
-        data: this.options,
-      });
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>
diff --git a/code/WebApp/vue/src/components/CreateCom/Xh-JS-Select.vue b/code/WebApp/vue/src/components/CreateCom/Xh-JS-Select.vue
index 852af765..4859217e 100644
--- a/code/WebApp/vue/src/components/CreateCom/Xh-JS-Select.vue
+++ b/code/WebApp/vue/src/components/CreateCom/Xh-JS-Select.vue
@@ -30,6 +30,7 @@ export default {
   data() {
     return {
       dataValue: "",
+      dataLable: "",
     };
   },
   created() {},
@@ -41,6 +42,7 @@ export default {
         } else {
           //加上默认初始值
           this.dataValue = this.options[0].value;
+          //this.dataLable = this.options[0].label;
         }
       },
       immediate: true,
@@ -50,10 +52,11 @@ export default {
   methods: {
     // 输入的值
     valueChange(val) {
-      /** 回调筛选数据 */
+      /** 回调筛选数据 */-
       this.$emit("value-change", {
         index: this.index,
         value: val,
+        //label: this.dataLable,
         data: this.options,
       });
     },
diff --git a/code/WebApp/vue/src/components/CreateCom/XhSwitch.rar b/code/WebApp/vue/src/components/CreateCom/XhSwitch.rar
new file mode 100644
index 00000000..0b1891a5
Binary files /dev/null and b/code/WebApp/vue/src/components/CreateCom/XhSwitch.rar differ
diff --git a/code/WebApp/vue/src/components/ImportExcel-benteng/index-1.vue b/code/WebApp/vue/src/components/ImportExcel-benteng/index-1.vue
new file mode 100644
index 00000000..42f80eac
--- /dev/null
+++ b/code/WebApp/vue/src/components/ImportExcel-benteng/index-1.vue
@@ -0,0 +1,752 @@
+<template>
+  <el-dialog
+    :visible="show"
+    :title="'导入' + crmTypeName"
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    width="600px"
+    @close="closeView"
+  >
+    <div class="dialog-body">
+      <div v-if="stepsActive == 1" class="step-section">
+        <div class="sections">
+          <div class="sections__title" v-loading="loading">
+            一、导入说明：
+            <div class="sections__tips">
+              1、提供的导入模板需要.xlsx文件格式！不支持“.xls”文件，即不支持Excel97-2003!
+            </div>
+            <div class="sections__tips">
+              2、模板名称可以进行修改，但不要删除模板中设置的字段！
+            </div>
+            <div class="sections__tips">
+              3、导入文件大小请勿超过100MB！且目前只支持单个Sheet页签！
+            </div>
+          </div>
+        </div>
+        <div class="sections">
+          <div class="sections__title">二、导入条件设置（没有则不用设置）</div>
+          <div class="sections__tips">
+            <span class="demonstration">选择版本：</span>
+            <el-select
+              v-model="versionValue"
+              clearable
+              :disabled="isEditYearMont"
+              style="width: 188px"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in factoryList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+            <span class="demonstration">选择工厂：</span>
+            <el-select
+              v-model="FacotryValue"
+              clearable
+              :disabled="isEditFactory"
+              style="width: 188px"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in facotryList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="sections">
+          <div class="sections__title">三、请选择需要导入的文件</div>
+          <div class="content">
+            <flexbox class="file-select">
+              <el-upload
+                ref="upload"
+                class="avatar-uploader"
+                drag
+                action="#"
+                :http-request="httpRequestfiles"
+                :headers="httpHeader"
+                :file-list="fileuploadList"
+                :before-upload="beforeAvatarUpload"
+                :before-remove="beforeRemove"
+                :on-remove="handleRemove"
+                multiple
+                :limit="10"
+              >
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+                </div>
+              </el-upload>
+            </flexbox>
+          </div>
+        </div>
+      </div>
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 2"
+        element-loading-text="数据导入中,请耐心等待..."
+        element-loading-spinner="el-icon-loading"
+        class="step-section"
+      />
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 3"
+        class="step-section"
+      >
+        <div class="result-info">
+          <el-card style="height: 300px; margin-top: -20px" shadow="always">
+            <i class="wk wk-success result-info__icon" />
+            <p class="result-info__detail">
+              结果：
+              <span class="result-info__detail--all"
+                >{{ this.resultData.successMessage }}
+              </span>
+            </p>
+
+            <el-button
+              v-if="this.resultData && this.resultData.errSize > 0"
+              class="result-info__btn--err"
+              type="text"
+              @click="downloadErrData"
+              >下载错误数据</el-button
+            >
+          </el-card>
+        </div>
+      </div>
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 4"
+        class="step-section"
+      >
+        <div class="result-info">
+          <el-card style="height: 300px" shadow="always">
+            <i class="wk wk-success result-info__icon" />
+            <p class="result-info__detail">
+              结果：
+              <span class="result-info__detail--all"
+                >{{ this.resultData.successMessage }}
+              </span>
+            </p>
+          </el-card>
+        </div>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-popover
+        v-model="historyPopoverShow"
+        placement="top"
+        width="800"
+        popper-class="no-padding-popover"
+        trigger="click"
+      >
+      </el-popover>
+
+      <!-- <el-button  @click="closeView">取消</el-button> -->
+      <el-button :class="{ 'is-hidden': !showCancel }" @click="closeView"
+        >取消</el-button
+      >
+      <el-button v-if="sureTitle" type="primary" @click="sureClick">{{
+        sureTitle
+      }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { downloadFile } from "@/utils/crmindex.js";
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+export default {
+  name: "CRMImport", // 文件导入
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    // CRM类型
+    crmType: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      options: [
+        {
+          value: "3",
+          label: "新增",
+        },
+        {
+          value: "0",
+          label: "修改",
+        },
+      ],
+      loading: false,
+      fieldList: [],
+      factoryList: [], //工厂列表
+      FacotryValue: "", //年度期间选择项
+      facotryList: [], //年度期间
+      versionValue: "",
+      stateValue: "",
+      config: 1, // 	1 覆盖，2跳过
+      /** 编辑控制 */
+      isEditFactory: false, // 是否是编辑中
+      isEditYearMont: false, // 是否是编辑中
+      isState: true, // 是否是编辑中
+      //file: { name: "" },
+      stepsActive: 1,
+      stepList: [
+        {
+          icon: "wk wk-upload",
+          title: "上传文件",
+          status: "wait",
+        },
+        {
+          icon: "wk wk-data-import",
+          title: "导入数据",
+          status: "wait",
+        },
+        {
+          icon: "wk wk-success",
+          title: "导入完成",
+          status: "wait",
+        },
+      ],
+      //resultData: null,
+      resultData: {
+        totalSize: 0,
+        errSize: 0,
+        errTemplate: "",
+        errMessage: "",
+        successMessage: "",
+      },
+      processData: {
+        count: 0,
+        status: "",
+      },
+      messageId: null,
+      intervalTimer: null,
+      fileuploadList: [],
+      isLt2M: "",
+      isFileType: "",
+      historyPopoverShow: false,
+      yeareVale: "",
+      monthVale: "",
+      page: 1,
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "project",
+            action: 0,
+            value: "factory",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      listQueryCustom: {
+        Filters: [
+          {
+            logic: 0,
+            column: "customerCode",
+            action: 0,
+            value: "T51Z40",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+    };
+  },
+  computed: {
+    sureTitle() {
+      return {
+        1: "立即导入",
+        2: "导入中",
+        3: "确定",
+      }[this.stepsActive];
+    },
+    showCancel() {
+      return this.stepsActive != 2;
+    },
+    getMoudleDisable() {
+      if (this.crmType == "btcarconsign") {
+        //只版本可用
+        this.isEditYearMont = false;
+        this.isEditFactory = true;
+      }
+    },
+    crmTypeName() {
+      return (
+        {
+          btcarseq: "奔腾-轿车车序输入表",
+          btcarkb: "奔腾-轿车看板输入表",
+          btcarconsign: "奔腾-轿车结算数据输入表",
+        }[this.crmType] || ""
+      );
+    },
+    getWebApi() {
+      if (this.FacotryValue === "T51Z40-A") {
+        //轿车一厂
+        return (
+          {
+            btcarseq: "/api/settleaccount/BTCarSeqFirst/ExcelImport",
+            btcarkb: "/api/settleaccount/BTCarKBFirst/ExcelImport",
+            btcarconsign: "/api/settleaccount/BTCarConsign/ExcelImport",
+          }[this.crmType] || ""
+        );
+      } else if (this.FacotryValue === "T51Z40-B") {
+        //轿车二厂
+        return (
+          {
+            btcarseq: "/api/settleaccount/BTCarSeqSecond/ExcelImport",
+            btcarkb: "/api/settleaccount/BTCarKBSecond/ExcelImport",
+            btcarconsign: "/api/settleaccount/BTCarConsign/ExcelImport",
+          }[this.crmType] || ""
+        );
+      } else {
+        alert("请正确选择相关导入工厂！");
+      }
+    },
+    getImportTemplate() {
+      //模板名称
+      return (
+        {
+          btcarseq: "奔腾-轿车车序输入表.xlsx",
+          btcarkb: "奔腾-轿车看板输入表.xlsx",
+        }[this.crmType] || ""
+      );
+    },
+    httpHeader() {
+      //文件上传时，带token认证信息，提高安全性
+      return {
+        Authorization: "Bearer " + getToken(),
+      };
+    },
+  },
+  watch: {
+    show: function (val) {
+      this.stepsActive = 1;
+      this.getAllYearMonth(); //加载版本
+      this.getAllFactory(); //加载工厂
+      this.getMoudleDisable(); //判断设置条件是否可用
+      if (val) {
+        this.stepsActive = 1;
+      } else {
+        if (this.stepsActive == 3) {
+          //以下是重置数据
+          this.stepsActive = 1;
+          this.stepList = [
+            {
+              icon: "wk wk-upload",
+              title: "上传文件",
+              status: "wait",
+            },
+            {
+              icon: "wk wk-data-import",
+              title: "导入数据",
+              status: "wait",
+            },
+            {
+              icon: "wk wk-success",
+              title: "导入完成",
+              status: "wait",
+            },
+          ];
+          this.resultData = null;
+        }
+      }
+    },
+
+    stepsActive() {
+      this.$emit(
+        "status",
+        {
+          1: "wait",
+          2: "process",
+          3: "finish",
+        }[this.stepsActive]
+      );
+    },
+  },
+  mounted() {},
+  methods: {
+    getAllYearMonth() {
+      //取版本列表信息
+      // this.listQuery.SkipCount = (this.page - 1) * 500;
+      this.$axios
+        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .then((response) => {
+          this.factoryList = [];
+          response.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.factoryList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    getAllFactory() {
+      this.listQueryCustom.SkipCount = (this.page - 1) * 500;
+      this.$axios
+        .posts("/api/settleaccount/Factory/list", this.listQueryCustom)
+        .then((response) => {
+          //取工厂列表信息
+          this.facotryList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.code;
+            options.label = element.desc;
+            this.facotryList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleImportExcelClick() {
+      //父组件中，初始化此子组件时调用
+      this.fileuploadList = [];
+      //this.$refs.upload.clearFiles();
+    },
+    httpRequestfiles(data) {
+      let _this = this;
+      let rd = new FileReader(); // 创建文件读取对象
+      let file = data.file;
+      this.fileuploadList.push(file);
+      rd.readAsDataURL(file); // 文件读取装换为base64类型
+    },
+    beforeAvatarUpload(file) {
+      var FileExt = file.name.replace(/.+\./, "");
+      if (["xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
+        this.$message({
+          type: "warning",
+          message: "只支持xlsx类型文件！",
+        });
+        this.isFileType = "0";
+        return false;
+      } else {
+        this.isFileType = "1";
+      }
+      this.isLt2M = file.size / 1024 / 1024 < 100 ? "1" : "0";
+      if (this.isLt2M === "0") {
+        this.$message.error("上传文件大小不能超过 100MB!");
+      }
+      return this.isLt2M === "1" ? true : false;
+    },
+    beforeRemove(file, fileList) {
+      if (this.isLt2M === "1" && this.isFileType === "1") {
+        return this.$confirm(`确定移除 ${file.name}？`);
+      }
+    },
+    handleRemove(file, fileList) {
+      //附件列表删除操作
+      const index = this.fileuploadList.indexOf(file.originFileObj);
+      const newFileList = this.fileuploadList.slice();
+      newFileList.splice(index, 1);
+      this.fileuploadList = newFileList;
+    },
+    //执行按钮
+    sureClick() {
+      if (
+        this.fileuploadList === [] ||
+        JSON.stringify(this.fileuploadList) === "[]"
+      ) {
+        this.$message.error("请选择导入文件");
+        return false;
+      }
+
+      if (this.stepsActive == 1) {
+        if (this.stepList[0].status == "wait") {
+          this.stepsActive = 2;
+          let alertInfo = "";
+          if (this.FacotryValue === "T51Z40-A") {
+            alertInfo = "轿车一厂";
+          } else {
+            alertInfo = "轿车二厂";
+          }
+          this.$confirm("当前导入的数据是：" + alertInfo + "请确认?", "提示", {
+            confirmButtonText: "确认",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.saveTemplateData();
+            })
+            .catch(() => {
+              this.$message({
+                type: "info",
+                message: "已取消删除",
+              });
+              this.stepsActive = 1;
+            });
+
+          // setTimeout(() => {
+          //   this.saveTemplateData();
+          // }, 1000);
+          if (this.stepList[1].status == "finish") {
+          }
+        } else {
+          if (this.fileuploadList === "[]") {
+            this.$message.error("请选择导入文件");
+          }
+        }
+      } else {
+        this.closeView();
+      }
+    },
+
+    saveTemplateData() {
+      this.loading = true;
+      //--上传附件，批量或拖拽
+      if (JSON.stringify(this.fileuploadList) != "[]") {
+        let fd = new FormData();
+        const { fileuploadList } = this;
+        fileuploadList.forEach((file) => {
+          fd.append("files", file); // 添加文件
+        });
+        fd.append("branchId", "3FA85F64-5717-4562-B3FC-2C963F66AFA6");
+        fd.append("year", "2021");
+        fd.append("period", "03");
+        fd.append("customerCode", this.FacotryValue);
+        fd.append("factory", this.FacotryValue);
+        fd.append("version", this.versionValue);
+        const webapi = this.getWebApi;
+        console.log("奔腾轿车导入条件：" + JSON.stringify(webapi));
+        this.$axios
+          .posts(webapi, fd)
+          .then(async (res) => {
+            console.log("奔腾导入条件：" + JSON.stringify(res));
+            if (res === "Success") {
+              if (this.isLt2M === "1" && this.isFileType === "1") {
+                this.$notify({
+                  title: "成功",
+                  message: "数据导入成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.stepList[1].status = "finish";
+                this.resultData.successMessage = "数据导入成功！";
+                this.stepsActive = 4;
+              }
+            } else {
+              this.stepList[0].status = "wait";
+              this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
+              this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见
+              this.resultData.successMessage = "数据导入失败！";
+              this.stepsActive = 3;
+            }
+            this.$emit("status", "finish");
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      } else {
+        this.loading = false;
+        this.$message({
+          message: "未上传任何附件，请查检！",
+          type: "warning",
+        });
+      }
+    },
+
+    /**
+     * 下载错误模板
+     */
+    downloadErrData() {
+      let fileNameOfProject = this.resultData.errTemplate;
+      this.$axios
+        .BolbGets(
+          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+        )
+        .then((response) => {
+          if (fileNameOfProject.indexOf("_") != -1) {
+            let downName =
+              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
+              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+            downloadFile(response, downName);
+            this.$notify({
+              title: "成功",
+              message: "错误数据-导出成功！",
+              type: "success",
+              duration: 2000,
+            });
+          } else {
+            downloadFile(response, fileNameOfProject);
+            this.$notify({
+              title: "成功",
+              message: "错误数据-导出成功！",
+              type: "success",
+              duration: 2000,
+            });
+          }
+          this.listLoading = false;
+        })
+        .catch((error) => {
+          this.listLoading = false;
+        });
+    },
+    // 关闭操作
+    closeView() {
+      this.$emit("update:show", false);
+      this.$emit("close", this.stepsActive == 3 ? "finish" : "");
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "@/styles/xr-theme.scss";
+.el-steps {
+  margin-bottom: 15px;
+
+  /deep/ .el-step__title {
+    font-size: 14px;
+  }
+
+  /deep/ .el-step.is-simple .el-step__arrow::before,
+  /deep/ .el-step.is-simple .el-step__arrow::after {
+    height: 10px;
+    width: 2px;
+  }
+
+  /deep/ .el-step.is-simple .el-step__arrow::after {
+    transform: rotate(45deg) translateY(3px);
+  }
+  /deep/ .el-step.is-simple .el-step__arrow::before {
+    transform: rotate(-45deg) translateY(-2px);
+  }
+}
+
+.step-section {
+  min-height: 300px;
+
+  /deep/ .el-loading-spinner {
+    top: 45%;
+    .el-icon-loading {
+      font-size: 40px;
+      color: #999;
+    }
+
+    .el-loading-text {
+      color: #333;
+    }
+  }
+}
+
+.sections {
+  font-size: 14px;
+  color: #333;
+
+  &__title {
+    font-weight: 600;
+  }
+
+  &__tips {
+    padding-left: 30px;
+    margin: 8px 0 15px;
+    color: #999;
+    font-size: 12px;
+    line-height: 1.4;
+  }
+
+  .download {
+    cursor: pointer;
+    color: #2362fb;
+  }
+}
+
+.sections__tips + .content {
+  padding-top: 0;
+}
+
+.content {
+  padding: 10px 10px 10px 30px;
+  .el-select {
+    width: 400px;
+  }
+  .user-cell {
+    width: 400px;
+  }
+}
+
+#importInputFile {
+  display: none;
+}
+
+.file-select {
+  .el-input {
+    width: 400px;
+  }
+  button {
+    margin-left: 20px;
+  }
+}
+
+.is-hidden {
+  visibility: hidden;
+}
+
+.history-btn {
+  float: left;
+  margin-left: 15px;
+}
+
+// 结果信息
+.result-info {
+  text-align: center;
+  padding-top: 50px;
+
+  &__icon {
+    font-size: 40px;
+    color: $xr-color-primary;
+  }
+
+  &__des {
+    margin-top: -15px;
+    color: #333;
+    font-size: 30px;
+  }
+
+  &__detail {
+    margin-top: 35px;
+    font-size: 20px;
+    color: #666;
+    &--all {
+      color: #333;
+      font-weight: 600;
+    }
+
+    &--suc {
+      color: $xr-color-primary;
+      font-weight: 600;
+    }
+
+    &--err {
+      margin-top: 25px;
+      color: #f94e4e;
+      font-weight: 600;
+    }
+  }
+
+  &__btn--err {
+    margin-top: 10px;
+    font-size: 20px;
+  }
+}
+</style>
+
+
+
diff --git a/code/WebApp/vue/src/components/ImportExcel-base/index.vue b/code/WebApp/vue/src/components/ImportExcel-benteng/index.vue
similarity index 78%
rename from code/WebApp/vue/src/components/ImportExcel-base/index.vue
rename to code/WebApp/vue/src/components/ImportExcel-benteng/index.vue
index f8468ed3..3547141e 100644
--- a/code/WebApp/vue/src/components/ImportExcel-base/index.vue
+++ b/code/WebApp/vue/src/components/ImportExcel-benteng/index.vue
@@ -42,7 +42,7 @@
                 <el-select
                   v-model="versionValue"
                   clearable
-                  :disabled="isEditFactory"
+                  :disabled="isEditYearMont"
                   style="width: 188px"
                   placeholder="请选择"
                 >
@@ -53,6 +53,21 @@
                     :value="item.value"
                   ></el-option>
                 </el-select>
+                <span class="demonstration">选择工厂：</span>
+                <el-select
+                  v-model="FacotryValue"
+                  clearable
+                  :disabled="isEditFactory"
+                  style="width: 188px"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in facotryList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
               </div>
             </div>
             <div class="sections">
@@ -93,10 +108,11 @@
         <div
           v-loading="loading"
           v-if="stepsActive == 2"
-          element-loading-text="导入中"
+          element-loading-text="数据导入中,请耐心等待..."
           element-loading-spinner="el-icon-loading"
           class="step-section"
         />
+
         <div
           v-loading="loading"
           v-else-if="stepsActive == 3"
@@ -109,6 +125,7 @@
                 <span class="result-info__detail--all"
                   >{{ this.resultData.successMessage }}
                 </span>
+
                 <el-button
                   v-if="this.resultData && this.resultData.errSize > 0"
                   class="result-info__btn--err"
@@ -121,7 +138,11 @@
           </div>
         </div>
 
-        <div v-loading="loading" v-if="stepsActive == 4" class="step-section">
+        <div
+          v-loading="loading"
+          v-else-if="stepsActive == 4"
+          class="step-section"
+        >
           <div class="result-info">
             <el-card style="height: 300px" shadow="always">
               <i class="el-icon-success" />
@@ -130,13 +151,6 @@
                   >{{ this.resultData.successMessage }}
                 </span>
               </p>
-              <!-- <p class="result-info__des">数据导入结果：</p>
-            <p class="result-info__detail">
-              导入成功数据
-              <span class="result-info__detail--all"
-                >{{ this.resultData.totalSize }} </span
-              >条有效数据！
-            </p> -->
             </el-card>
           </div>
         </div>
@@ -195,8 +209,8 @@ export default {
       loading: false,
       fieldList: [],
       factoryList: [], //工厂列表
-      YearMonthValue: "", //年度期间选择项
-      yearMonthList: [], //年度期间
+      FacotryValue: "", //年度期间选择项
+      facotryList: [], //年度期间
       versionValue: "",
       stateValue: "",
       config: 1, // 	1 覆盖，2跳过
@@ -262,7 +276,7 @@ export default {
             logic: 0,
             column: "customerCode",
             action: 0,
-            value: "U22000",
+            value: "T51Z40",
           }, //默认查询可用的
         ],
         SkipCount: 0,
@@ -275,103 +289,69 @@ export default {
     sureTitle() {
       return {
         1: "立即导入",
-        // 2: "导入中...",
-        // 3: "确定",
-        // 4: "确定",
+        2: "取消导入",
+        3: "确定",
+        4: "确定",
       }[this.stepsActive];
     },
     showCancel() {
       return this.stepsActive == 1;
     },
     getMoudleDisable() {
-      if (this.crmType == "prebatch") {
-        //只状态可用
-        this.isEditYearMont = true;
-        this.isEditFactory = true;
-        this.isState = false;
-      } else {
+      if (this.crmType == "btcarconsign") {
+        //只版本可用
         this.isEditYearMont = false;
-        this.isEditFactory = false;
+        this.isEditFactory = true;
       }
     },
     crmTypeName() {
       return (
         {
-          invoice: "大众发票汇总",
-          vWKanBan: "大众看板结算明细",
-          scrapClaims: "CP7报废和索赔",
-          sparePart: "大众备件结算明细",
-          hqHPlatform: "红旗H平台导入",
-          hqMPlatform: "红旗M平台导入",
-          bomdatabase: "产品结构BOM",
-          prebatch: "预批量",
-          secondaryPriceRatio: "二配结算价格比例",
-          factory: "工厂设置",
-          // materialRelation: "零件匹配关系",
-          carMaterialConfig: "车型代码与零件匹配",
-          materialRelationSupplier: "供应商零件设置表",
-          material: "物料主数据",
-          inventorydetail: "库存明细",
-          codeSetting: "通用代码设置",
-          estimatedSum: "应付暂估汇总",
-          estimatedInventoryDetail: "应付暂估收货明细",
-          customerStorageLocation: "客户存储地点",
-          secondaryAdjustment: "二配数量调整输入",
-          secondaryDiscount: "二配折扣调整输入",
+          btcarseq: "奔腾-轿车车序输入表",
+          btcarkb: "奔腾-轿车看板输入表",
+          btcarconsign: "奔腾-轿车结算数据输入表",
         }[this.crmType] || ""
       );
     },
     getWebApi() {
-      return (
-        {
-          invoice: "/api/settleaccount/Invoices/ExcelImport", //大众发票导入
-          vWKanBan: "/api/settleaccount/VWKanBan/ExcelImport", //大众看板结算明细导入
-          scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7报废和索赔导入
-          sparePart: "/api/settleaccount/SparePart/ExcelImport", //大众备件结算明细导入
-          hqHPlatform: "/api/settleaccount/HQHPlatform/ExcelImport", //红旗H平台导入
-          hqMPlatform: "/api/settleaccount/HQMPlatform/ExcelImport", //红旗M平台导入
-          bomdatabase: "/api/settleaccount/bom/ExcelImport",
-          prebatch: "/api/settleaccount/Prebatch/ExcelImport",
-          secondaryPriceRatio:
-            "/api/settleaccount/SecondaryPriceRatio/ExcelImport",
-          factory: "/api/settleaccount/Factory/ExcelImport",
-          // materialRelation:
-          //   "/api/settleaccount/MaterialRelationshipDetail/ExcelImport-TH",
-          carMaterialConfig: "/api/settleaccount/CarMaterialConfig/ExcelImport",
-          materialRelationSupplier:
-            "/api/settleaccount/SupplierItemSetUp/ExcelImport",
-          material: "/api/settleaccount/Material/ExcelImport-TH",
-          inventorydetail: "/api/settleaccount/InventoryDetail/ExcelImport",
-          codeSetting: "/api/settleaccount/CodeSetting/ExcelImport",
-          estimatedSum: "/api/settleaccount/EstimatedSum/ExcelImport",
-          estimatedInventoryDetail:
-            "/api/settleaccount/EstimatedInventoryDetail/ExcelImport",
-          customerStorageLocation:
-            "/api/settleaccount/CustomerStorageLocation/ExcelImport",
-          secondaryAdjustment:
-            "/api/settleaccount/SecondaryAdjustment/ExcelImport",
-          secondaryDiscount: "/api/settleaccount/SecondaryDiscount/ExcelImport",
-        }[this.crmType] || ""
-      );
+      if (this.crmType == "btcarconsign") {
+        return (
+          {
+            btcarconsign: "/api/settleaccount/BTCarConsign/ExcelImport",
+          }[this.crmType] || ""
+        );
+      } else {
+        if (this.FacotryValue === "T51Z40-A") {
+          //轿车一厂
+          return (
+            {
+              btcarseq: "/api/settleaccount/BTCarSeqFirst/ExcelImport",
+              btcarkb: "/api/settleaccount/BTCarKBFirst/ExcelImport",
+            }[this.crmType] || ""
+          );
+        } else if (this.FacotryValue === "T51Z40-B") {
+          //轿车二厂
+          return (
+            {
+              btcarseq: "/api/settleaccount/BTCarSeqSecond/ExcelImport",
+              btcarkb: "/api/settleaccount/BTCarKBSecond/ExcelImport",
+            }[this.crmType] || ""
+          );
+        } else {
+          //alert("请正确选择相关导入工厂！");
+          this.$message({
+            message: "请正确选择相关导入工厂！",
+            type: "warning",
+          });
+        }
+      }
     },
     getImportTemplate() {
       //模板名称
       return (
         {
-          invoice: "大众发票汇总导入.xlsx",
-          bomdatabase: "产品结构Bom导入模板.xlsx",
-          secondaryPriceRatio: "二配价格比例导入模板.xlsx",
-          factory: "工厂设置模板.xlsx",
-          materialRelation: "零件匹配关系.xlsx",
-          carMaterialConfig: "车型代码与零件匹配.xlsx",
-          materialRelationSupplier: "供应商零件设置表.xlsx",
-          material: "物料主数据.xlsx",
-          inventorydetail: "库存明细信息.xlsx",
-          codeSetting: "通用代码设置数据.xlsx",
-          estimatedSum: "应付暂估汇总.xlsx",
-          estimatedInventoryDetail: "应付暂估收货明细.xlsx",
-          customerStorageLocation: "客户存储地点.xlsx",
-          secondaryAdjustment: "二配调整输入.xlsx",
+          btcarseq: "奔腾-轿车车序输入表.xlsx",
+          btcarkb: "奔腾-轿车看板输入表.xlsx",
         }[this.crmType] || ""
       );
     },
@@ -386,6 +366,7 @@ export default {
     show: function (val) {
       this.stepsActive = 1;
       this.getAllYearMonth(); //加载版本
+      this.getAllFactory(); //加载工厂
       this.getMoudleDisable(); //判断设置条件是否可用
       if (val) {
         this.stepsActive = 1;
@@ -429,6 +410,8 @@ export default {
   mounted() {},
   methods: {
     getAllYearMonth() {
+      //取版本列表信息
+      // this.listQuery.SkipCount = (this.page - 1) * 500;
       this.$axios
         .posts("/api/settleaccount/CentralizedControl/openlist")
         .then((response) => {
@@ -444,6 +427,24 @@ export default {
           this.listLoading = false;
         });
     },
+    getAllFactory() {
+      this.listQueryCustom.SkipCount = (this.page - 1) * 500;
+      this.$axios
+        .posts("/api/settleaccount/Factory/list", this.listQueryCustom)
+        .then((response) => {
+          //取工厂列表信息
+          this.facotryList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.code;
+            options.label = element.desc;
+            this.facotryList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
     handleImportExcelClick() {
       //父组件中，初始化此子组件时调用
       this.fileuploadList = [];
@@ -488,6 +489,16 @@ export default {
     },
     //执行按钮
     sureClick() {
+      if (
+        this.crmType == "btcarconsign" ||
+        this.crmType == "btcarseq" ||
+        this.crmType == "btcarkb"
+      ) {
+        if (this.versionValue == "") {
+          this.$message.error("必须选择版本！");
+          return false;
+        }
+      }
       if (
         this.fileuploadList === [] ||
         JSON.stringify(this.fileuploadList) === "[]"
@@ -495,12 +506,44 @@ export default {
         this.$message.error("请选择导入文件");
         return false;
       }
+
       if (this.stepsActive == 1) {
         if (this.stepList[0].status == "wait") {
           this.stepsActive = 2;
-          this.saveTemplateData();
           this.activeName = "second";
-          console.log(this.crmTypeName);
+          let alertInfo = "";
+          if (this.crmType == "btcarconsign") {
+            this.saveTemplateData();
+          } else {
+            if (this.FacotryValue === "T51Z40-A") {
+              alertInfo = "轿车一厂";
+            } else if (this.FacotryValue === "T51Z40-B") {
+              alertInfo = "轿车二厂";
+            }
+            this.$confirm(
+              "当前导入的数据是：" + alertInfo + "请确认?",
+              "提示",
+              {
+                confirmButtonText: "确认",
+                cancelButtonText: "取消",
+                type: "warning",
+              }
+            )
+              .then(() => {
+                this.saveTemplateData();
+              })
+              .catch(() => {
+                this.$message({
+                  type: "info",
+                  message: "已取消删除",
+                });
+                this.stepsActive = 1;
+              });
+          }
+
+          // setTimeout(() => {
+          //   this.saveTemplateData();
+          // }, 1000);
           if (this.stepList[1].status == "finish") {
           }
         } else {
@@ -515,25 +558,31 @@ export default {
 
     saveTemplateData() {
       this.loading = true;
-      //保存项目、合同管理、客户等信息的共用方法
       //--上传附件，批量或拖拽
       if (JSON.stringify(this.fileuploadList) != "[]") {
         let fd = new FormData();
         const { fileuploadList } = this;
+        let factorInfo = "";
+        if (this.crmType == "btcarconsign") {
+          factorInfo = "bengtengjiesuan ";
+        } else {
+          factorInfo = this.FacotryValue;
+        }
         fileuploadList.forEach((file) => {
           fd.append("files", file); // 添加文件
         });
         fd.append("branchId", "3FA85F64-5717-4562-B3FC-2C963F66AFA6");
         fd.append("year", "2021");
         fd.append("period", "03");
-        fd.append("customerCode", "03");
-        fd.append("factory", this.YearMonthValue);
+        fd.append("customerCode", factorInfo);
+        fd.append("factory", this.FacotryValue);
         fd.append("version", this.versionValue);
         const webapi = this.getWebApi;
+        console.log("奔腾轿车导入条件：" + JSON.stringify(webapi));
         this.$axios
           .posts(webapi, fd)
           .then(async (res) => {
-            console.log("大众导入条件：" + JSON.stringify(res));
+            console.log("奔腾导入条件：" + JSON.stringify(res));
             if (res === "Success") {
               if (this.isLt2M === "1" && this.isFileType === "1") {
                 this.$notify({
@@ -553,11 +602,7 @@ export default {
               this.resultData.successMessage = "数据导入失败！";
               this.stepsActive = 3;
             }
-            console.log(this.stepsActive);
             this.$emit("status", "finish");
-            // this.$nextTick(() => {
-            //   this.loading = false;
-            // });
             this.loading = false;
           })
           .catch(() => {
@@ -660,10 +705,6 @@ export default {
     transform: translateX(297px) !important;
   }
 }
-
-/deep/.el-tabs__item {
-  padding: 0 20px;
-}
 .el-steps {
   margin-bottom: 15px;
 
@@ -686,7 +727,7 @@ export default {
 }
 
 .step-section {
-  min-height: 250px;
+  min-height: 300px;
 
   /deep/ .el-loading-spinner {
     top: 45%;
@@ -764,8 +805,8 @@ export default {
   text-align: center;
   .el-card {
     border: none;
-    height: 250px !important;
   }
+  //显示结果box的padding
   /deep/.el-card__body {
     padding: 60px 20px 20px 20px;
   }
@@ -788,7 +829,7 @@ export default {
   }
 
   &__detail {
-    margin-top: 25px;
+    margin-top: 35px;
     font-size: 20px;
     color: #666;
     &--all {
@@ -813,4 +854,7 @@ export default {
     font-size: 20px;
   }
 }
-</style>
\ No newline at end of file
+</style>
+
+
+
diff --git a/code/WebApp/vue/src/components/ImportExcel-qad/index.vue b/code/WebApp/vue/src/components/ImportExcel-faw/index-1.vue
similarity index 64%
rename from code/WebApp/vue/src/components/ImportExcel-qad/index.vue
rename to code/WebApp/vue/src/components/ImportExcel-faw/index-1.vue
index aadf301c..246344e3 100644
--- a/code/WebApp/vue/src/components/ImportExcel-qad/index.vue
+++ b/code/WebApp/vue/src/components/ImportExcel-faw/index-1.vue
@@ -7,141 +7,138 @@
     width="600px"
     @close="closeView"
   >
-    <el-tabs
-      v-model="activeName"
-      :class="stepsActive == 1 ? '' : 'el-tabs__active-go'"
-      @tab-click="handleClick"
-    >
-      <el-tab-pane
-        label="①文件上传"
-        name="first"
-        :disabled="stepsActive == 2 ? true : false"
-      >
-        <div class="dialog-body">
-          <div v-if="stepsActive == 1" class="step-section">
-            <div class="sections">
-              <div class="sections__title" v-loading="loading">
-                一、导入说明：
-                <div class="sections__tips">
-                  1、提供的导入模板需要.xlsx文件格式！不支持“.xls”文件，即不支持Excel97-2003!
-                </div>
-                <div class="sections__tips">
-                  2、模板名称可以进行修改，但不要删除模板中设置的字段！
-                </div>
-                <div class="sections__tips">
-                  3、导入文件大小请勿超过100MB！且目前只支持单个Sheet页签！
-                </div>
-              </div>
+    <div class="dialog-body">
+      <div v-if="stepsActive == 1" class="step-section">
+        <div class="sections">
+          <div class="sections__title" v-loading="loading">
+            一、导入说明：
+            <div class="sections__tips">
+              1、提供的导入模板需要.xlsx文件格式！不支持“.xls”文件，即不支持Excel97-2003!
             </div>
-            <div class="sections">
-              <div class="sections__title">
-                二、导入条件设置（没有则不用设置）
-              </div>
-              <div class="sections__tips">
-                <span class="demonstration">选择版本：</span>
-                <el-select
-                  v-model="versionValue"
-                  clearable
-                  :disabled="isEditFactory"
-                  style="width: 188px"
-                  placeholder="请选择"
-                >
-                  <el-option
-                    v-for="item in factoryList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
-                </el-select>
-              </div>
+            <div class="sections__tips">
+              2、模板名称可以进行修改，但不要删除模板中设置的字段！
             </div>
-            <div class="sections">
-              <div class="sections__title">三、请选择需要导入的文件</div>
-              <div class="content">
-                <flexbox class="file-select">
-                  <el-upload
-                    ref="upload"
-                    class="avatar-uploader"
-                    drag
-                    action="#"
-                    :http-request="httpRequestfiles"
-                    :headers="httpHeader"
-                    :file-list="fileuploadList"
-                    :before-upload="beforeAvatarUpload"
-                    :before-remove="beforeRemove"
-                    :on-remove="handleRemove"
-                    multiple
-                    :limit="10"
-                  >
-                    <i class="el-icon-upload"></i>
-                    <div class="el-upload__text">
-                      将文件拖到此处，或
-                      <em>点击上传</em>
-                    </div>
-                  </el-upload>
-                </flexbox>
-              </div>
+            <div class="sections__tips">
+              3、导入文件大小请勿超过100MB！且目前只支持单个Sheet页签！
             </div>
           </div>
         </div>
-      </el-tab-pane>
-      <el-tab-pane
-        label="②导入数据"
-        name="second"
-        :disabled="stepsActive == 2 ? false : true"
-      >
-        <div
-          v-loading="loading"
-          v-if="stepsActive == 2"
-          element-loading-text="导入中"
-          element-loading-spinner="el-icon-loading"
-          class="step-section"
-        />
-        <div
-          v-loading="loading"
-          v-else-if="stepsActive == 3"
-          class="step-section"
-        >
-          <div class="result-info">
-            <el-card style="height: 300px; margin-top: -20px" shadow="always">
-              <i class="el-icon-error" />
-              <p class="result-info__detail">
-                <span class="result-info__detail--all"
-                  >{{ this.resultData.successMessage }}
-                </span>
-                <el-button
-                  v-if="this.resultData && this.resultData.errSize > 0"
-                  class="result-info__btn--err"
-                  type="text"
-                  @click="downloadErrData"
-                  >下载错误数据</el-button
-                >
-              </p>
-            </el-card>
+        <div class="sections">
+          <div class="sections__title">二、导入条件设置（没有则不用设置）</div>
+          <div class="sections__tips">
+            <span class="demonstration">选择版本：</span>
+            <el-select
+              v-model="versionValue"
+              clearable
+              :disabled="isEditFactory"
+              style="width: 188px"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in factoryList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+            <!-- <span class="demonstration">选择工厂：</span>
+            <el-select
+              v-model="FacotryValue"
+              clearable
+              :disabled="isEditYearMont"
+              style="width: 188px"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in facotryList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select> -->
           </div>
         </div>
+        <div class="sections">
+          <div class="sections__title">三、请选择需要导入的文件</div>
+          <div class="content">
+            <flexbox class="file-select">
+              <el-upload
+                ref="upload"
+                class="avatar-uploader"
+                drag
+                action="#"
+                :http-request="httpRequestfiles"
+                :headers="httpHeader"
+                :file-list="fileuploadList"
+                :before-upload="beforeAvatarUpload"
+                :before-remove="beforeRemove"
+                :on-remove="handleRemove"
+                multiple
+                :limit="10"
+              >
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+                </div>
+              </el-upload>
+            </flexbox>
+          </div>
+        </div>
+      </div>
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 2"
+        element-loading-text="数据导入中,请耐心等待..."
+        element-loading-spinner="el-icon-loading"
+        class="step-section"
+      />
 
-        <div v-loading="loading" v-if="stepsActive == 4" class="step-section">
-          <div class="result-info">
-            <el-card style="height: 300px" shadow="always">
-              <i class="el-icon-success" />
-              <p class="result-info__detail">
-                <span class="result-info__detail--all"
-                  >{{ this.resultData.successMessage }}
-                </span>
-              </p>
-              <!-- <p class="result-info__des">数据导入结果：</p>
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 3"
+        class="step-section"
+      >
+        <div class="result-info">
+          <el-card style="height: 300px; margin-top: -20px" shadow="always">
+            <i class="wk wk-success result-info__icon" />
             <p class="result-info__detail">
-              导入成功数据
+              结果：
               <span class="result-info__detail--all"
-                >{{ this.resultData.totalSize }} </span
-              >条有效数据！
-            </p> -->
-            </el-card>
-          </div>
+                >{{ this.resultData.successMessage }}
+              </span>
+            </p>
+
+            <el-button
+              v-if="this.resultData && this.resultData.errSize > 0"
+              class="result-info__btn--err"
+              type="text"
+              @click="downloadErrData"
+              >下载错误数据</el-button
+            >
+          </el-card>
         </div>
-      </el-tab-pane>
-    </el-tabs>
+      </div>
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 4"
+        class="step-section"
+      >
+        <div class="result-info">
+          <el-card style="height: 300px" shadow="always">
+            <i class="wk wk-success result-info__icon" />
+            <p class="result-info__detail">
+              结果：
+              <span class="result-info__detail--all"
+                >{{ this.resultData.successMessage }}
+              </span>
+            </p>
+          </el-card>
+        </div>
+      </div>
+    </div>
     <span slot="footer" class="dialog-footer">
       <el-popover
         v-model="historyPopoverShow"
@@ -195,8 +192,8 @@ export default {
       loading: false,
       fieldList: [],
       factoryList: [], //工厂列表
-      YearMonthValue: "", //年度期间选择项
-      yearMonthList: [], //年度期间
+      FacotryValue: "", //年度期间选择项
+      facotryList: [], //年度期间
       versionValue: "",
       stateValue: "",
       config: 1, // 	1 覆盖，2跳过
@@ -262,42 +259,39 @@ export default {
             logic: 0,
             column: "customerCode",
             action: 0,
-            value: "U22000",
+            value: "T51Z59",
           }, //默认查询可用的
         ],
         SkipCount: 0,
         MaxResultCount: 1000,
       },
-      activeName: "first",
     };
   },
   computed: {
     sureTitle() {
       return {
         1: "立即导入",
-        // 2: "导入中...",
-        // 3: "确定",
-        // 4: "确定",
+        2: "导入中",
+        3: "确定",
       }[this.stepsActive];
     },
     showCancel() {
-      return this.stepsActive == 1;
-    },
-    getMoudleDisable() {
-      this.isEditYearMont = false;
-      this.isEditFactory = false;
+      return this.stepsActive != 2;
     },
     crmTypeName() {
       return (
         {
-          ItemInvoicePrice: "QAD出库账单",
+          jfcarkb: "解放-看板输入表",
+          jfcarconsign: "解放-结算数据输入表",
         }[this.crmType] || ""
       );
     },
     getWebApi() {
       return (
         {
-          ItemInvoicePrice: "/api/settleaccount/ItemInvoicePrice/ExcelImport",
+          //解放汽车
+          jfcarkb: "/api/settleaccount/JFCarKB/ExcelImport",
+          jfcarconsign: "/api/settleaccount/JFCarConsign/ExcelImport",
         }[this.crmType] || ""
       );
     },
@@ -305,7 +299,8 @@ export default {
       //模板名称
       return (
         {
-          bomdatabase: "产品结构Bom导入模板.xlsx",
+          btcarseq: "解放-看板输入表.xlsx",
+          btcarkb: "解放-结算数据输入表.xlsx",
         }[this.crmType] || ""
       );
     },
@@ -320,7 +315,7 @@ export default {
     show: function (val) {
       this.stepsActive = 1;
       this.getAllYearMonth(); //加载版本
-      this.getMoudleDisable(); //判断设置条件是否可用
+      this.getAllFactory(); //加载工厂
       if (val) {
         this.stepsActive = 1;
       } else {
@@ -363,6 +358,8 @@ export default {
   mounted() {},
   methods: {
     getAllYearMonth() {
+      //取版本列表信息
+      // this.listQuery.SkipCount = (this.page - 1) * 500;
       this.$axios
         .posts("/api/settleaccount/CentralizedControl/openlist")
         .then((response) => {
@@ -378,6 +375,24 @@ export default {
           this.listLoading = false;
         });
     },
+    getAllFactory() {
+      this.listQueryCustom.SkipCount = (this.page - 1) * 500;
+      this.$axios
+        .posts("/api/settleaccount/Factory/list", this.listQueryCustom)
+        .then((response) => {
+          //取工厂列表信息
+          this.facotryList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.code;
+            options.label = element.desc;
+            this.facotryList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
     handleImportExcelClick() {
       //父组件中，初始化此子组件时调用
       this.fileuploadList = [];
@@ -429,12 +444,15 @@ export default {
         this.$message.error("请选择导入文件");
         return false;
       }
+
       if (this.stepsActive == 1) {
         if (this.stepList[0].status == "wait") {
           this.stepsActive = 2;
           this.saveTemplateData();
-          this.activeName = "second";
-          console.log(this.crmTypeName);
+
+          // setTimeout(() => {
+          //   this.saveTemplateData();
+          // }, 1000);
           if (this.stepList[1].status == "finish") {
           }
         } else {
@@ -449,7 +467,6 @@ export default {
 
     saveTemplateData() {
       this.loading = true;
-      //保存项目、合同管理、客户等信息的共用方法
       //--上传附件，批量或拖拽
       if (JSON.stringify(this.fileuploadList) != "[]") {
         let fd = new FormData();
@@ -457,13 +474,17 @@ export default {
         fileuploadList.forEach((file) => {
           fd.append("files", file); // 添加文件
         });
-        
+        fd.append("branchId", "3FA85F64-5717-4562-B3FC-2C963F66AFA6");
+        fd.append("year", "2021");
+        fd.append("period", "03");
+        fd.append("customerCode", "V85Z27");
+        fd.append("factory", "V85Z27");
         fd.append("version", this.versionValue);
         const webapi = this.getWebApi;
         this.$axios
           .posts(webapi, fd)
           .then(async (res) => {
-            console.log("大众导入条件：" + JSON.stringify(res));
+            console.log("解放导入条件：" + JSON.stringify(fd));
             if (res === "Success") {
               if (this.isLt2M === "1" && this.isFileType === "1") {
                 this.$notify({
@@ -483,7 +504,6 @@ export default {
               this.resultData.successMessage = "数据导入失败！";
               this.stepsActive = 3;
             }
-            console.log(this.stepsActive);
             this.$emit("status", "finish");
             // this.$nextTick(() => {
             //   this.loading = false;
@@ -491,10 +511,6 @@ export default {
             this.loading = false;
           })
           .catch(() => {
-            this.stepList[1].status = "finish";
-            this.resultData.errSize = 0;
-            this.resultData.successMessage = "导入模板有错误，请检查！";
-            this.stepsActive = 3;
             this.loading = false;
           });
       } else {
@@ -546,54 +562,12 @@ export default {
     closeView() {
       this.$emit("update:show", false);
       this.$emit("close", this.stepsActive == 3 ? "finish" : "");
-      this.activeName = "first";
-    },
-    handleClick(tab) {
-      // console.log(tab.index)
-      // console.log(tab.name)
-      if (tab.name == "first") {
-        //  console.log(tab.name)
-        this.fileuploadList = [];
-        this.stepsActive = 1;
-      }
     },
   },
 };
 </script>
 <style scoped lang="scss">
 @import "@/styles/xr-theme.scss";
-/deep/.el-dialog {
-  margin-top: 9vh !important;
-}
-/deep/.el-dialog__body {
-  padding: 20px 20px;
-}
-//Tabs标签Flex布局
-/deep/.el-tabs__nav {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-}
-//去掉el-tab-pane底部灰色线条
-/deep/.el-tabs__nav-wrap::after {
-  height: 0 !important;
-}
-//Tabs标签el-tab-pane蓝色下划线
-/deep/.el-tabs__active-bar {
-  left: 90px;
-  width: 90px !important;
-}
-//Tabs标签el-tab-pane蓝色下划线点击录入后样式
-/deep/ .el-tabs__active-go {
-  .el-tabs__active-bar {
-    transform: translateX(297px) !important;
-  }
-}
-
-/deep/.el-tabs__item {
-  padding: 0 20px;
-}
 .el-steps {
   margin-bottom: 15px;
 
@@ -616,7 +590,7 @@ export default {
 }
 
 .step-section {
-  min-height: 250px;
+  min-height: 300px;
 
   /deep/ .el-loading-spinner {
     top: 45%;
@@ -692,23 +666,11 @@ export default {
 // 结果信息
 .result-info {
   text-align: center;
-  .el-card {
-    border: none;
-    height: 250px !important;
-  }
-  /deep/.el-card__body {
-    padding: 60px 20px 20px 20px;
-  }
-  i {
-    font-size: 60px;
-  }
-  // 错误结果icon
-  .el-icon-error {
-    color: red;
-  }
-  //正确结果icon
-  .el-icon-success {
-    color: chartreuse;
+  padding-top: 50px;
+
+  &__icon {
+    font-size: 40px;
+    color: $xr-color-primary;
   }
 
   &__des {
@@ -718,7 +680,7 @@ export default {
   }
 
   &__detail {
-    margin-top: 25px;
+    margin-top: 35px;
     font-size: 20px;
     color: #666;
     &--all {
@@ -743,4 +705,7 @@ export default {
     font-size: 20px;
   }
 }
-</style>
\ No newline at end of file
+</style>
+
+
+
diff --git a/code/WebApp/vue/src/components/ImportExcel-expend/index.vue b/code/WebApp/vue/src/components/ImportExcel-faw/index.vue
similarity index 87%
rename from code/WebApp/vue/src/components/ImportExcel-expend/index.vue
rename to code/WebApp/vue/src/components/ImportExcel-faw/index.vue
index 9902e657..a06cb2de 100644
--- a/code/WebApp/vue/src/components/ImportExcel-expend/index.vue
+++ b/code/WebApp/vue/src/components/ImportExcel-faw/index.vue
@@ -53,6 +53,21 @@
                     :value="item.value"
                   ></el-option>
                 </el-select>
+                <!-- <span class="demonstration">选择工厂：</span>
+            <el-select
+              v-model="FacotryValue"
+              clearable
+              :disabled="isEditYearMont"
+              style="width: 188px"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in facotryList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select> -->
               </div>
             </div>
             <div class="sections">
@@ -93,10 +108,11 @@
         <div
           v-loading="loading"
           v-if="stepsActive == 2"
-          element-loading-text="导入中"
+          element-loading-text="数据导入中,请耐心等待..."
           element-loading-spinner="el-icon-loading"
           class="step-section"
         />
+
         <div
           v-loading="loading"
           v-else-if="stepsActive == 3"
@@ -121,7 +137,11 @@
           </div>
         </div>
 
-        <div v-loading="loading" v-if="stepsActive == 4" class="step-section">
+        <div
+          v-loading="loading"
+          v-else-if="stepsActive == 4"
+          class="step-section"
+        >
           <div class="result-info">
             <el-card style="height: 300px" shadow="always">
               <i class="el-icon-success" />
@@ -130,13 +150,6 @@
                   >{{ this.resultData.successMessage }}
                 </span>
               </p>
-              <!-- <p class="result-info__des">数据导入结果：</p>
-            <p class="result-info__detail">
-              导入成功数据
-              <span class="result-info__detail--all"
-                >{{ this.resultData.totalSize }} </span
-              >条有效数据！
-            </p> -->
             </el-card>
           </div>
         </div>
@@ -195,8 +208,8 @@ export default {
       loading: false,
       fieldList: [],
       factoryList: [], //工厂列表
-      YearMonthValue: "", //年度期间选择项
-      yearMonthList: [], //年度期间
+      FacotryValue: "", //年度期间选择项
+      facotryList: [], //年度期间
       versionValue: "",
       stateValue: "",
       config: 1, // 	1 覆盖，2跳过
@@ -262,7 +275,7 @@ export default {
             logic: 0,
             column: "customerCode",
             action: 0,
-            value: "U22000",
+            value: "T51Z59",
           }, //默认查询可用的
         ],
         SkipCount: 0,
@@ -275,37 +288,28 @@ export default {
     sureTitle() {
       return {
         1: "立即导入",
-        // 2: "导入中...",
-        // 3: "确定",
-        // 4: "确定",
+        2: "取消导入",
+        3: "确定",
+        4: "确定",
       }[this.stepsActive];
     },
     showCancel() {
       return this.stepsActive == 1;
     },
-    getMoudleDisable() {
-      if (this.crmType == "prebatch") {
-        //只状态可用
-        this.isEditYearMont = true;
-        this.isEditFactory = true;
-        this.isState = false;
-      } else {
-        this.isEditYearMont = false;
-        this.isEditFactory = false;
-      }
-    },
     crmTypeName() {
       return (
         {
-          settlementCrossReference: "结算件对照关系",
+          jfcarkb: "解放-看板输入表",
+          jfcarconsign: "解放-结算数据输入表",
         }[this.crmType] || ""
       );
     },
     getWebApi() {
       return (
         {
-          settlementCrossReference:
-            "/api/settleaccount/SettlementCrossReference/ExcelImport",
+          //解放汽车
+          jfcarkb: "/api/settleaccount/JFCarKB/ExcelImport",
+          jfcarconsign: "/api/settleaccount/JFCarConsign/ExcelImport",
         }[this.crmType] || ""
       );
     },
@@ -313,7 +317,8 @@ export default {
       //模板名称
       return (
         {
-          settlementCrossReference: "结算件对照关系.xlsx",
+          btcarseq: "解放-看板输入表.xlsx",
+          btcarkb: "解放-结算数据输入表.xlsx",
         }[this.crmType] || ""
       );
     },
@@ -328,7 +333,7 @@ export default {
     show: function (val) {
       this.stepsActive = 1;
       this.getAllYearMonth(); //加载版本
-      this.getMoudleDisable(); //判断设置条件是否可用
+      this.getAllFactory(); //加载工厂
       if (val) {
         this.stepsActive = 1;
       } else {
@@ -371,6 +376,8 @@ export default {
   mounted() {},
   methods: {
     getAllYearMonth() {
+      //取版本列表信息
+      // this.listQuery.SkipCount = (this.page - 1) * 500;
       this.$axios
         .posts("/api/settleaccount/CentralizedControl/openlist")
         .then((response) => {
@@ -386,6 +393,24 @@ export default {
           this.listLoading = false;
         });
     },
+    getAllFactory() {
+      this.listQueryCustom.SkipCount = (this.page - 1) * 500;
+      this.$axios
+        .posts("/api/settleaccount/Factory/list", this.listQueryCustom)
+        .then((response) => {
+          //取工厂列表信息
+          this.facotryList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.code;
+            options.label = element.desc;
+            this.facotryList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
     handleImportExcelClick() {
       //父组件中，初始化此子组件时调用
       this.fileuploadList = [];
@@ -400,28 +425,15 @@ export default {
     },
     beforeAvatarUpload(file) {
       var FileExt = file.name.replace(/.+\./, "");
-      // if (["xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
-      //   this.$message({
-      //     type: "warning",
-      //     message: "只支持xlsx类型文件！",
-      //   });
-      //   this.isFileType = "0";
-      //   return false;
-      // } else {
-      //   this.isFileType = "1";
-      // }
-      if (
-        ["xlsx"].indexOf(FileExt.toLowerCase()) === 0 ||
-        ["csv"].indexOf(FileExt.toLowerCase()) === 0
-      ) {
-        this.isFileType = "1";
-      } else {
+      if (["xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
         this.$message({
           type: "warning",
           message: "只支持xlsx类型文件！",
         });
         this.isFileType = "0";
         return false;
+      } else {
+        this.isFileType = "1";
       }
       this.isLt2M = file.size / 1024 / 1024 < 100 ? "1" : "0";
       if (this.isLt2M === "0") {
@@ -443,6 +455,15 @@ export default {
     },
     //执行按钮
     sureClick() {
+       if (
+        this.crmType == "jfcarconsign" ||
+        this.crmType == "jfcarkb"
+      ) {
+        if (this.versionValue == "") {
+          this.$message.error("必须选择版本！");
+          return false;
+        }
+      }
       if (
         this.fileuploadList === [] ||
         JSON.stringify(this.fileuploadList) === "[]"
@@ -450,12 +471,15 @@ export default {
         this.$message.error("请选择导入文件");
         return false;
       }
+
       if (this.stepsActive == 1) {
         if (this.stepList[0].status == "wait") {
           this.stepsActive = 2;
           this.saveTemplateData();
           this.activeName = "second";
-          console.log(this.crmTypeName);
+          // setTimeout(() => {
+          //   this.saveTemplateData();
+          // }, 1000);
           if (this.stepList[1].status == "finish") {
           }
         } else {
@@ -470,7 +494,6 @@ export default {
 
     saveTemplateData() {
       this.loading = true;
-      //保存项目、合同管理、客户等信息的共用方法
       //--上传附件，批量或拖拽
       if (JSON.stringify(this.fileuploadList) != "[]") {
         let fd = new FormData();
@@ -481,14 +504,14 @@ export default {
         fd.append("branchId", "3FA85F64-5717-4562-B3FC-2C963F66AFA6");
         fd.append("year", "2021");
         fd.append("period", "03");
-        fd.append("customerCode", "03");
-        fd.append("factory", this.YearMonthValue);
+        fd.append("customerCode", "V85Z27");
+        fd.append("factory", "V85Z27");
         fd.append("version", this.versionValue);
         const webapi = this.getWebApi;
         this.$axios
           .posts(webapi, fd)
           .then(async (res) => {
-            console.log("大众导入条件：" + JSON.stringify(res));
+            console.log("解放导入条件：" + JSON.stringify(fd));
             if (res === "Success") {
               if (this.isLt2M === "1" && this.isFileType === "1") {
                 this.$notify({
@@ -508,7 +531,6 @@ export default {
               this.resultData.successMessage = "数据导入失败！";
               this.stepsActive = 3;
             }
-            console.log(this.stepsActive);
             this.$emit("status", "finish");
             // this.$nextTick(() => {
             //   this.loading = false;
@@ -615,10 +637,6 @@ export default {
     transform: translateX(297px) !important;
   }
 }
-
-/deep/.el-tabs__item {
-  padding: 0 20px;
-}
 .el-steps {
   margin-bottom: 15px;
 
@@ -641,7 +659,7 @@ export default {
 }
 
 .step-section {
-  min-height: 250px;
+  min-height: 300px;
 
   /deep/ .el-loading-spinner {
     top: 45%;
@@ -717,10 +735,11 @@ export default {
 // 结果信息
 .result-info {
   text-align: center;
+
   .el-card {
     border: none;
-    height: 250px !important;
   }
+  //显示结果box的padding
   /deep/.el-card__body {
     padding: 60px 20px 20px 20px;
   }
@@ -743,7 +762,7 @@ export default {
   }
 
   &__detail {
-    margin-top: 25px;
+    margin-top: 35px;
     font-size: 20px;
     color: #666;
     &--all {
@@ -768,4 +787,7 @@ export default {
     font-size: 20px;
   }
 }
-</style>
\ No newline at end of file
+</style>
+
+
+
diff --git a/code/WebApp/vue/src/components/ImportExcel-invoice/index.vue b/code/WebApp/vue/src/components/ImportExcel-hq/index-1.vue
similarity index 60%
rename from code/WebApp/vue/src/components/ImportExcel-invoice/index.vue
rename to code/WebApp/vue/src/components/ImportExcel-hq/index-1.vue
index f82f1465..1f0e02e0 100644
--- a/code/WebApp/vue/src/components/ImportExcel-invoice/index.vue
+++ b/code/WebApp/vue/src/components/ImportExcel-hq/index-1.vue
@@ -7,143 +7,130 @@
     width="600px"
     @close="closeView"
   >
-    <el-tabs
-      v-model="activeName"
-      :class="stepsActive == 1 ? '' : 'el-tabs__active-go'"
-      @tab-click="handleClick"
-    >
-      <el-tab-pane
-        label="①文件上传"
-        name="first"
-        :disabled="stepsActive == 2 ? true : false"
-      >
-        <div class="dialog-body">
-          <div v-if="stepsActive == 1" class="step-section">
-            <div class="sections">
-              <div class="sections__title" v-loading="loading">
-                一、导入说明：
-                <div class="sections__tips">
-                  1、提供的导入模板不支持“.xls”文件，即不支持Excel97-2003!
-                </div>
-                <div class="sections__tips">
-                  2、模板名称可以进行修改，但不要删除模板中设置的字段！
-                </div>
-                <div class="sections__tips">
-                  3、导入文件大小请勿超过100MB！且目前只支持单个Sheet页签！
-                </div>
-              </div>
+    <div class="dialog-body">
+      <div v-if="stepsActive == 1" class="step-section">
+        <div class="sections">
+          <div class="sections__title" v-loading="loading">
+            一、导入说明：
+            <div class="sections__tips">
+              1、提供的导入模板需要.xlsx文件格式！不支持“.xls”文件，即不支持Excel97-2003!
             </div>
-            <div class="sections">
-              <div class="sections__title">
-                二、导入条件设置（没有则不用设置）
-              </div>
-              <div class="sections__tips">
-                <span class="demonstration">选择版本：</span>
-                <el-select
-                  v-model="versionValue"
-                  clearable
-                  :disabled="isEditFactory"
-                  style="width: 188px"
-                  placeholder="请选择"
-                >
-                  <el-option
-                    v-for="item in factoryList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
-                </el-select>
-              </div>
+            <div class="sections__tips">
+              2、模板名称可以进行修改，但不要删除模板中设置的字段！
             </div>
-            <div class="sections">
-              <div class="sections__title">三、请选择需要导入的文件</div>
-              <div class="content">
-                <flexbox class="file-select">
-                  <el-upload
-                    ref="upload"
-                    class="avatar-uploader"
-                    drag
-                    action="#"
-                    :http-request="httpRequestfiles"
-                    :headers="httpHeader"
-                    :file-list="fileuploadList"
-                    :before-upload="beforeAvatarUpload"
-                    :before-remove="beforeRemove"
-                    :on-remove="handleRemove"
-                    multiple
-                    :limit="10"
-                  >
-                    <i class="el-icon-upload"></i>
-                    <div class="el-upload__text">
-                      将文件拖到此处，或
-                      <em>点击上传</em>
-                    </div>
-                  </el-upload>
-                </flexbox>
-              </div>
+            <div class="sections__tips">
+              3、导入文件大小请勿超过100MB！且目前只支持单个Sheet页签！
             </div>
           </div>
         </div>
-      </el-tab-pane>
-      <el-tab-pane
-        label="②导入数据"
-        name="second"
-        :disabled="stepsActive == 2 ? false : true"
-      >
-        <div
-          v-loading="loading"
-          v-if="stepsActive == 2"
-          element-loading-text="导入中"
-          element-loading-spinner="el-icon-loading"
-          class="step-section"
-        />
-        <div
-          v-loading="loading"
-          v-else-if="stepsActive == 3"
-          class="step-section"
-        >
-          <div class="result-info">
-            <el-card style="height: 300px; margin-top: -20px" shadow="always">
-              <i class="el-icon-error" />
-              <p class="result-info__detail">
-                <span class="result-info__detail--all"
-                  >{{ this.resultData.successMessage }}
-                </span>
-                <el-button
-                  v-if="this.resultData && this.resultData.errSize > 0"
-                  class="result-info__btn--err"
-                  type="text"
-                  @click="downloadErrData"
-                  >下载错误数据</el-button
-                >
-              </p>
-            </el-card>
+        <div class="sections">
+          <div class="sections__title">二、导入条件设置（没有则不用设置）</div>
+          <div class="sections__tips">
+            <span class="demonstration">选择版本：</span>
+            <el-select
+              v-model="versionValue"
+              clearable
+              :disabled="isEditFactory"
+              style="width: 188px"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in factoryList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
           </div>
         </div>
-
-        <div v-loading="loading" v-if="stepsActive == 4" class="step-section">
-          <div class="result-info">
-            <el-card style="height: 300px" shadow="always">
-              <i class="el-icon-success" />
-              <p class="result-info__detail">
-                <span class="result-info__detail--all"
-                  >{{ this.resultData.successMessage }}
-                </span>
-              </p>
-              <p class="result-info__detail">
-                <router-link
-                  :to="{
-                    name: 'BackGroundWork',
-                    params: { taskId: this.resultData.taskId },
-                  }"
-                  >[单击跳转至后台监控界面]</router-link
-                >
-              </p>
-            </el-card>
+        <div class="sections">
+          <div class="sections__title">三、请选择需要导入的文件</div>
+          <div class="content">
+            <flexbox class="file-select">
+              <el-upload
+                ref="upload"
+                class="avatar-uploader"
+                drag
+                action="#"
+                :http-request="httpRequestfiles"
+                :headers="httpHeader"
+                :file-list="fileuploadList"
+                :before-upload="beforeAvatarUpload"
+                :before-remove="beforeRemove"
+                :on-remove="handleRemove"
+                multiple
+                :limit="10"
+              >
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+                </div>
+              </el-upload>
+            </flexbox>
           </div>
         </div>
-      </el-tab-pane>
-    </el-tabs>
+      </div>
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 2"
+        element-loading-text="数据导入中,请耐心等待..."
+        element-loading-spinner="el-icon-loading"
+        class="step-section"
+      />
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 3"
+        class="step-section"
+      >
+        <div class="result-info">
+          <el-card style="height: 300px; margin-top: -20px" shadow="always">
+            <i class="wk wk-success result-info__icon" />
+            <p class="result-info__detail">
+              结果：
+              <span class="result-info__detail--all"
+                >{{ this.resultData.successMessage }}
+              </span>
+            </p>
+
+            <el-button
+              v-if="this.resultData && this.resultData.errSize > 0"
+              class="result-info__btn--err"
+              type="text"
+              @click="downloadErrData"
+              >下载错误数据</el-button
+            >
+          </el-card>
+        </div>
+      </div>
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 4"
+        class="step-section"
+      >
+        <div class="result-info">
+          <el-card style="height: 300px" shadow="always">
+            <i class="wk wk-success result-info__icon" />
+            <p class="result-info__detail">
+              结果：
+              <span class="result-info__detail--all"
+                >{{ this.resultData.successMessage }}
+              </span>
+            </p>
+            <!-- <p class="result-info__des">数据导入结果：</p>
+            <p class="result-info__detail">
+              导入成功数据
+              <span class="result-info__detail--all"
+                >{{ this.resultData.totalSize }} </span
+              >条有效数据！
+            </p> -->
+          </el-card>
+        </div>
+      </div>
+    </div>
     <span slot="footer" class="dialog-footer">
       <el-popover
         v-model="historyPopoverShow"
@@ -197,7 +184,7 @@ export default {
       loading: false,
       fieldList: [],
       factoryList: [], //工厂列表
-      YearMonthValue: "TH", //年度期间选择项
+      YearMonthValue: "", //年度期间选择项
       yearMonthList: [], //年度期间
       versionValue: "",
       stateValue: "",
@@ -232,7 +219,6 @@ export default {
         errTemplate: "",
         errMessage: "",
         successMessage: "",
-        taskId: "",
       },
       processData: {
         count: 0,
@@ -271,20 +257,18 @@ export default {
         SkipCount: 0,
         MaxResultCount: 1000,
       },
-      activeName: "first",
     };
   },
   computed: {
     sureTitle() {
       return {
         1: "立即导入",
-        // 2: "导入中...",
-        // 3: "确定",
-        // 4: "确定",
+        2: "导入中",
+        3: "确定",
       }[this.stepsActive];
     },
     showCancel() {
-      return this.stepsActive == 1;
+      return this.stepsActive != 2;
     },
     getMoudleDisable() {
       if (
@@ -322,17 +306,24 @@ export default {
         this.isEditFactory = false;
       }
     },
-    crmTypeName() {
+   crmTypeName() {
       return (
         {
-          invoice: "开票数据",
+          standardKanban: "红旗-标准看板输入表",
+          specialKanban: "红旗-特殊看板输入表",
+          standardConsign: "红旗-标准结算数据输入表",
+          specialConsign: "红旗-特殊结算数据输入表",
         }[this.crmType] || ""
       );
     },
     getWebApi() {
       return (
         {
-          invoice: "/api/settleaccount/Invoices/ExcelImport-TH",
+          //红旗汽车
+          standardKanban: "/api/settleaccount/HQKBs/ExcelImport",
+          specialKanban: "/api/settleaccount/HQSpecKBs/ExcelImport",
+          standardConsign: "/api/settleaccount/HQConsign/ExcelImport",
+          specialConsign: "/api/settleaccount/HQSpecConsign/ExcelImport",
         }[this.crmType] || ""
       );
     },
@@ -340,7 +331,10 @@ export default {
       //模板名称
       return (
         {
-          invoice: "发票模板.xlsx",
+          standardKanban: "红旗-标准看板输入表.xlsx",
+          specialKanban: "红旗-特殊看板输入表.xlsx",
+          standardConsign: "红旗-标准结算数据输入表.xlsx",
+          specialConsign: "红旗-特殊结算数据输入表.xlsx",
         }[this.crmType] || ""
       );
     },
@@ -355,6 +349,7 @@ export default {
     show: function (val) {
       this.stepsActive = 1;
       this.getAllYearMonth(); //加载版本
+      this.getAllFactory(); //加载工厂
       this.getMoudleDisable(); //判断设置条件是否可用
       if (val) {
         this.stepsActive = 1;
@@ -397,7 +392,27 @@ export default {
   },
   mounted() {},
   methods: {
+    // getAllYearMonth() {
+    //   //取工厂列表信息
+    //   this.factoryList = [];
+    //   //this.listQuery.SkipCount = (this.page - 1) * 500;
+    //   this.$axios
+    //     .posts("/api/settleaccount/CentralizedControl/openlist")
+    //     .then((response) => {
+    //       response.items.forEach((element) => {
+    //         let options = {};
+    //         options.value = element.version;
+    //         options.label = element.version;
+    //         this.factoryList.push(options);
+    //       });
+    //     })
+    //     .catch(() => {
+    //       this.listLoading = false;
+    //     });
+    // },
     getAllYearMonth() {
+      //取版本列表信息
+      // this.listQuery.SkipCount = (this.page - 1) * 500;
       this.$axios
         .posts("/api/settleaccount/CentralizedControl/openlist")
         .then((response) => {
@@ -413,6 +428,24 @@ export default {
           this.listLoading = false;
         });
     },
+    getAllFactory() {
+      //取工厂列表信息
+      this.yearMonthList = [];
+      this.listQueryCustom.SkipCount = (this.page - 1) * 500;
+      this.$axios
+        .posts("/api/settleaccount/Factory/list", this.listQueryCustom)
+        .then((response) => {
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.code;
+            options.label = element.desc;
+            this.yearMonthList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
     handleImportExcelClick() {
       //父组件中，初始化此子组件时调用
       this.fileuploadList = [];
@@ -457,6 +490,10 @@ export default {
     },
     //执行按钮
     sureClick() {
+      if(this.versionValue===""){
+        this.$message.error("请选择版本");
+        return false;
+      }
       if (
         this.fileuploadList === [] ||
         JSON.stringify(this.fileuploadList) === "[]"
@@ -468,8 +505,9 @@ export default {
         if (this.stepList[0].status == "wait") {
           this.stepsActive = 2;
           this.saveTemplateData();
-          this.activeName = "second";
-          console.log(this.crmTypeName);
+          // setTimeout(() => {
+          //   this.saveTemplateData();
+          // }, 1000);
           if (this.stepList[1].status == "finish") {
           }
         } else {
@@ -495,49 +533,33 @@ export default {
         fd.append("branchId", "3FA85F64-5717-4562-B3FC-2C963F66AFA6");
         fd.append("year", "2021");
         fd.append("period", "03");
-        //fd.append("customerCode", "03");
-        //fd.append("factory", "TH");
+        fd.append("customerCode", "T51Z59");
+        fd.append("factory", this.YearMonthValue);
         fd.append("version", this.versionValue);
         const webapi = this.getWebApi;
         this.$axios
           .posts(webapi, fd)
           .then(async (res) => {
-            console.log("发票导入条件：" + JSON.stringify(res));
-            if (Number.isInteger(res)) {
-              this.resultData.taskId = res;
-              this.$notify({
-                title: "成功",
-                message: "文件上传成功！",
-                type: "success",
-                duration: 2000,
-              });
-              this.stepList[1].status = "finish";
-              this.resultData.successMessage =
-                "文件已经上传至后台，任务号：" +
-                res +
-                "，请在后台作业监控界面中查看进度！";
-              this.stepsActive = 4;
+            console.log("红旗导入条件：" + JSON.stringify(res));
+            if (res === "Success") {
+              if (this.isLt2M === "1" && this.isFileType === "1") {
+                this.$notify({
+                  title: "成功",
+                  message: "数据导入成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.stepList[1].status = "finish";
+                this.resultData.successMessage = "数据导入成功！";
+                this.stepsActive = 4;
+              }
+            } else {
+              this.stepList[0].status = "wait";
+              this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
+              this.resultData.errSize = 1;//保持大于0，用于控制错误数据下载按钮的可不可见
+              this.resultData.successMessage = "数据导入失败！";
+              this.stepsActive = 3;
             }
-            // if (res === "Success") {
-            //   if (this.isLt2M === "1" && this.isFileType === "1") {
-            //     this.$notify({
-            //       title: "成功",
-            //       message: "数据导入成功！",
-            //       type: "success",
-            //       duration: 2000,
-            //     });
-            //     this.stepList[1].status = "finish";
-            //     this.resultData.successMessage = "数据导入成功！";
-            //     this.stepsActive = 4;
-            //   }
-            // } else {
-            //   this.stepList[0].status = "wait";
-            //   this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
-            //   this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见
-            //   this.resultData.successMessage = "数据导入失败！";
-            //   this.stepsActive = 3;
-            // }
-            console.log(this.stepsActive);
             this.$emit("status", "finish");
             // this.$nextTick(() => {
             //   this.loading = false;
@@ -545,10 +567,6 @@ export default {
             this.loading = false;
           })
           .catch(() => {
-            this.stepList[1].status = "finish";
-            this.resultData.errSize = 0;
-            this.resultData.successMessage = "导入模板有错误，请检查！";
-            this.stepsActive = 3;
             this.loading = false;
           });
       } else {
@@ -559,10 +577,6 @@ export default {
         });
       }
     },
-    goTo() {
-      //直接跳转
-      this.$router.push("/views/ux/backGroundWork");
-    },
 
     /**
      * 下载错误模板
@@ -604,54 +618,12 @@ export default {
     closeView() {
       this.$emit("update:show", false);
       this.$emit("close", this.stepsActive == 3 ? "finish" : "");
-      this.activeName = "first";
-    },
-    handleClick(tab) {
-      // console.log(tab.index)
-      // console.log(tab.name)
-      if (tab.name == "first") {
-        //  console.log(tab.name)
-        this.fileuploadList = [];
-        this.stepsActive = 1;
-      }
     },
   },
 };
 </script>
 <style scoped lang="scss">
 @import "@/styles/xr-theme.scss";
-/deep/.el-dialog {
-  margin-top: 9vh !important;
-}
-/deep/.el-dialog__body {
-  padding: 20px 20px;
-}
-//Tabs标签Flex布局
-/deep/.el-tabs__nav {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-}
-//去掉el-tab-pane底部灰色线条
-/deep/.el-tabs__nav-wrap::after {
-  height: 0 !important;
-}
-//Tabs标签el-tab-pane蓝色下划线
-/deep/.el-tabs__active-bar {
-  left: 90px;
-  width: 90px !important;
-}
-//Tabs标签el-tab-pane蓝色下划线点击录入后样式
-/deep/ .el-tabs__active-go {
-  .el-tabs__active-bar {
-    transform: translateX(297px) !important;
-  }
-}
-
-/deep/.el-tabs__item {
-  padding: 0 20px;
-}
 .el-steps {
   margin-bottom: 15px;
 
@@ -674,7 +646,7 @@ export default {
 }
 
 .step-section {
-  min-height: 250px;
+  min-height: 300px;
 
   /deep/ .el-loading-spinner {
     top: 45%;
@@ -750,23 +722,11 @@ export default {
 // 结果信息
 .result-info {
   text-align: center;
-  .el-card {
-    border: none;
-    height: 250px !important;
-  }
-  /deep/.el-card__body {
-    padding: 60px 20px 20px 20px;
-  }
-  i {
-    font-size: 60px;
-  }
-  // 错误结果icon
-  .el-icon-error {
-    color: red;
-  }
-  //正确结果icon
-  .el-icon-success {
-    color: chartreuse;
+  padding-top: 50px;
+
+  &__icon {
+    font-size: 40px;
+    color: $xr-color-primary;
   }
 
   &__des {
@@ -776,7 +736,7 @@ export default {
   }
 
   &__detail {
-    margin-top: 25px;
+    margin-top: 35px;
     font-size: 20px;
     color: #666;
     &--all {
@@ -801,4 +761,11 @@ export default {
     font-size: 20px;
   }
 }
-</style>
\ No newline at end of file
+</style>
+
+
+
+
+
+
+
diff --git a/code/WebApp/vue/src/components/ImportExcel-hq/index.vue b/code/WebApp/vue/src/components/ImportExcel-hq/index.vue
index 0103a93a..4a1ac7cb 100644
--- a/code/WebApp/vue/src/components/ImportExcel-hq/index.vue
+++ b/code/WebApp/vue/src/components/ImportExcel-hq/index.vue
@@ -53,16 +53,6 @@
                     :value="item.value"
                   ></el-option>
                 </el-select>
-                <span class="demonstration">适合功能：</span>
-                <el-select
-                  v-model="valueSelect"
-                  clearable
-                  placeholder="请选结算或二配"
-                  size="medium"
-                >
-                  <el-option label="结算" value="R0003"></el-option>
-                  <el-option label="二配" value="R0001"></el-option>
-                </el-select>
               </div>
             </div>
             <div class="sections">
@@ -103,10 +93,11 @@
         <div
           v-loading="loading"
           v-if="stepsActive == 2"
-          element-loading-text="导入中"
+          element-loading-text="数据导入中,请耐心等待..."
           element-loading-spinner="el-icon-loading"
           class="step-section"
         />
+
         <div
           v-loading="loading"
           v-else-if="stepsActive == 3"
@@ -119,6 +110,7 @@
                 <span class="result-info__detail--all"
                   >{{ this.resultData.successMessage }}
                 </span>
+
                 <el-button
                   v-if="this.resultData && this.resultData.errSize > 0"
                   class="result-info__btn--err"
@@ -131,24 +123,27 @@
           </div>
         </div>
 
-        <div v-loading="loading" v-if="stepsActive == 4" class="step-section">
+        <div
+          v-loading="loading"
+          v-else-if="stepsActive == 4"
+          class="step-section"
+        >
           <div class="result-info">
             <el-card style="height: 300px" shadow="always">
               <i class="el-icon-success" />
               <p class="result-info__detail">
+                结果：
                 <span class="result-info__detail--all"
                   >{{ this.resultData.successMessage }}
                 </span>
               </p>
-              <p class="result-info__detail">
-                <router-link
-                  :to="{
-                    name: 'BackGroundWork',
-                    params: { taskId: this.resultData.taskId },
-                  }"
-                  >[单击跳转至后台监控界面]</router-link
-                >
-              </p>
+              <!-- <p class="result-info__des">数据导入结果：</p>
+            <p class="result-info__detail">
+              导入成功数据
+              <span class="result-info__detail--all"
+                >{{ this.resultData.totalSize }} </span
+              >条有效数据！
+            </p> -->
             </el-card>
           </div>
         </div>
@@ -210,7 +205,6 @@ export default {
       YearMonthValue: "", //年度期间选择项
       yearMonthList: [], //年度期间
       versionValue: "",
-      valueSelect: "",
       stateValue: "",
       config: 1, // 	1 覆盖，2跳过
       /** 编辑控制 */
@@ -243,7 +237,6 @@ export default {
         errTemplate: "",
         errMessage: "",
         successMessage: "",
-        taskId: "",
       },
       processData: {
         count: 0,
@@ -289,26 +282,68 @@ export default {
     sureTitle() {
       return {
         1: "立即导入",
-        // 2: "导入中...",
-        // 3: "确定",
-        // 4: "确定",
+        2: "取消导入",
+        3: "确定",
+        4: "确定",
       }[this.stepsActive];
     },
     showCancel() {
       return this.stepsActive == 1;
     },
+    getMoudleDisable() {
+      if (
+        this.crmType == "codeSetting" ||
+        this.crmType == "factory" ||
+        this.crmType == "customerStorageLocation" ||
+        this.crmType == "materialRelationSupplier" ||
+        this.crmType == "carMaterialConfig" ||
+        this.crmType == "materialRelation"
+      ) {
+        //版本和工厂都可以用
+        this.isEditYearMont = true;
+        this.isEditFactory = true;
+      } else if (
+        this.crmType == "secondaryPriceRatio" ||
+        this.crmType == "secondaryAdjustment" ||
+        this.crmType == "secondaryDiscount" ||
+        this.crmType == "estimatedInventoryDetail" ||
+        this.crmType == "estimatedSum"
+      ) {
+        //只版本可用
+        this.isEditYearMont = true;
+        this.isEditFactory = false;
+      } else if (this.crmType == "material") {
+        //只工厂可用
+        this.isEditYearMont = false;
+        this.isEditFactory = true;
+      } else if (this.crmType == "prebatch") {
+        //只状态可用
+        this.isEditYearMont = true;
+        this.isEditFactory = true;
+        this.isState = false;
+      } else {
+        this.isEditYearMont = false;
+        this.isEditFactory = false;
+      }
+    },
     crmTypeName() {
       return (
         {
-          materialRelation: "总成与结算件关系",
+          standardKanban: "红旗-标准看板输入表",
+          specialKanban: "红旗-特殊看板输入表",
+          standardConsign: "红旗-标准结算数据输入表",
+          specialConsign: "红旗-特殊结算数据输入表",
         }[this.crmType] || ""
       );
     },
     getWebApi() {
       return (
         {
-          materialRelation:
-            "/api/settleaccount/MaterialRelationshipDetail/ExcelImport-TH",
+          //红旗汽车
+          standardKanban: "/api/settleaccount/HQKBs/ExcelImport",
+          specialKanban: "/api/settleaccount/HQSpecKBs/ExcelImport",
+          standardConsign: "/api/settleaccount/HQConsign/ExcelImport",
+          specialConsign: "/api/settleaccount/HQSpecConsign/ExcelImport",
         }[this.crmType] || ""
       );
     },
@@ -316,19 +351,10 @@ export default {
       //模板名称
       return (
         {
-          // bomdatabase: "产品结构Bom导入模板.xlsx",
-          // secondaryPriceRatio: "二配价格比例导入模板.xlsx",
-          // factory: "工厂设置模板.xlsx",
-          // materialRelation: "零件匹配关系.xlsx",
-          // carMaterialConfig: "车型代码与零件匹配.xlsx",
-          // materialRelationSupplier: "供应商零件设置表.xlsx",
-          // material: "物料主数据.xlsx",
-          // inventorydetail: "库存明细信息.xlsx",
-          // codeSetting: "通用代码设置数据.xlsx",
-          // estimatedSum: "应付暂估汇总.xlsx",
-          // estimatedInventoryDetail: "应付暂估收货明细.xlsx",
-          // customerStorageLocation: "客户存储地点.xlsx",
-          // secondaryAdjustment: "二配调整输入.xlsx",
+          standardKanban: "红旗-标准看板输入表.xlsx",
+          specialKanban: "红旗-特殊看板输入表.xlsx",
+          standardConsign: "红旗-标准结算数据输入表.xlsx",
+          specialConsign: "红旗-特殊结算数据输入表.xlsx",
         }[this.crmType] || ""
       );
     },
@@ -343,6 +369,8 @@ export default {
     show: function (val) {
       this.stepsActive = 1;
       this.getAllYearMonth(); //加载版本
+      this.getAllFactory(); //加载工厂
+      this.getMoudleDisable(); //判断设置条件是否可用
       if (val) {
         this.stepsActive = 1;
       } else {
@@ -384,7 +412,27 @@ export default {
   },
   mounted() {},
   methods: {
+    // getAllYearMonth() {
+    //   //取工厂列表信息
+    //   this.factoryList = [];
+    //   //this.listQuery.SkipCount = (this.page - 1) * 500;
+    //   this.$axios
+    //     .posts("/api/settleaccount/CentralizedControl/openlist")
+    //     .then((response) => {
+    //       response.items.forEach((element) => {
+    //         let options = {};
+    //         options.value = element.version;
+    //         options.label = element.version;
+    //         this.factoryList.push(options);
+    //       });
+    //     })
+    //     .catch(() => {
+    //       this.listLoading = false;
+    //     });
+    // },
     getAllYearMonth() {
+      //取版本列表信息
+      // this.listQuery.SkipCount = (this.page - 1) * 500;
       this.$axios
         .posts("/api/settleaccount/CentralizedControl/openlist")
         .then((response) => {
@@ -400,6 +448,24 @@ export default {
           this.listLoading = false;
         });
     },
+    getAllFactory() {
+      //取工厂列表信息
+      this.yearMonthList = [];
+      this.listQueryCustom.SkipCount = (this.page - 1) * 500;
+      this.$axios
+        .posts("/api/settleaccount/Factory/list", this.listQueryCustom)
+        .then((response) => {
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.code;
+            options.label = element.desc;
+            this.yearMonthList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
     handleImportExcelClick() {
       //父组件中，初始化此子组件时调用
       this.fileuploadList = [];
@@ -444,6 +510,10 @@ export default {
     },
     //执行按钮
     sureClick() {
+      if (this.versionValue === "") {
+        this.$message.error("请选择版本");
+        return false;
+      }
       if (
         this.fileuploadList === [] ||
         JSON.stringify(this.fileuploadList) === "[]"
@@ -451,20 +521,14 @@ export default {
         this.$message.error("请选择导入文件");
         return false;
       }
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        return;
-      }
-      if (this.valueSelect === "") {
-        this.$message.error("必需选择适用功能！");
-        return;
-      }
       if (this.stepsActive == 1) {
         if (this.stepList[0].status == "wait") {
           this.stepsActive = 2;
           this.saveTemplateData();
           this.activeName = "second";
-          console.log(this.crmTypeName);
+          // setTimeout(() => {
+          //   this.saveTemplateData();
+          // }, 1000);
           if (this.stepList[1].status == "finish") {
           }
         } else {
@@ -487,51 +551,36 @@ export default {
         fileuploadList.forEach((file) => {
           fd.append("files", file); // 添加文件
         });
-        // fd.append("branchId", "3FA85F64-5717-4562-B3FC-2C963F66AFA6");
-        // fd.append("year", "2021");
-        // fd.append("period", "03");
-        fd.append("customerCode", this.valueSelect);
+        fd.append("branchId", "3FA85F64-5717-4562-B3FC-2C963F66AFA6");
+        fd.append("year", "2021");
+        fd.append("period", "03");
+        fd.append("customerCode", "T51Z59");
+        fd.append("factory", this.YearMonthValue);
         fd.append("version", this.versionValue);
         const webapi = this.getWebApi;
         this.$axios
           .posts(webapi, fd)
           .then(async (res) => {
-            console.log("总成与结算件的导入条件：" + JSON.stringify(res));
-            if (Number.isInteger(res)) {
-              this.resultData.taskId = res;
-              this.$notify({
-                title: "成功",
-                message: "文件上传成功！",
-                type: "success",
-                duration: 2000,
-              });
-              this.stepList[1].status = "finish";
-              this.resultData.successMessage =
-                "文件已经上传至后台，任务号：" +
-                res +
-                "，请在后台作业监控界面中查看进度！";
-              this.stepsActive = 4;
+            console.log("红旗导入条件：" + JSON.stringify(res));
+            if (res === "Success") {
+              if (this.isLt2M === "1" && this.isFileType === "1") {
+                this.$notify({
+                  title: "成功",
+                  message: "数据导入成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.stepList[1].status = "finish";
+                this.resultData.successMessage = "数据导入成功！";
+                this.stepsActive = 4;
+              }
+            } else {
+              this.stepList[0].status = "wait";
+              this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
+              this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见
+              this.resultData.successMessage = "数据导入失败！";
+              this.stepsActive = 3;
             }
-            // if (res === "Success") {
-            //   if (this.isLt2M === "1" && this.isFileType === "1") {
-            //     this.$notify({
-            //       title: "成功",
-            //       message: "数据导入成功！",
-            //       type: "success",
-            //       duration: 2000,
-            //     });
-            //     this.stepList[1].status = "finish";
-            //     this.resultData.successMessage = "数据导入成功！";
-            //     this.stepsActive = 4;
-            //   }
-            // } else {
-            //   this.stepList[0].status = "wait";
-            //   this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
-            //   this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见
-            //   this.resultData.successMessage = "数据导入失败！";
-            //   this.stepsActive = 3;
-            // }
-            console.log(this.stepsActive);
             this.$emit("status", "finish");
             // this.$nextTick(() => {
             //   this.loading = false;
@@ -553,10 +602,7 @@ export default {
         });
       }
     },
-    goTo() {
-      //直接跳转
-      this.$router.push("/views/ux/backGroundWork");
-    },
+
     /**
      * 下载错误模板
      */
@@ -641,10 +687,6 @@ export default {
     transform: translateX(297px) !important;
   }
 }
-
-/deep/.el-tabs__item {
-  padding: 0 20px;
-}
 .el-steps {
   margin-bottom: 15px;
 
@@ -667,7 +709,7 @@ export default {
 }
 
 .step-section {
-  min-height: 250px;
+  min-height: 300px;
 
   /deep/ .el-loading-spinner {
     top: 45%;
@@ -743,10 +785,11 @@ export default {
 // 结果信息
 .result-info {
   text-align: center;
+
   .el-card {
     border: none;
-    height: 250px !important;
   }
+  //显示结果box的padding
   /deep/.el-card__body {
     padding: 60px 20px 20px 20px;
   }
@@ -769,7 +812,7 @@ export default {
   }
 
   &__detail {
-    margin-top: 25px;
+    margin-top: 35px;
     font-size: 20px;
     color: #666;
     &--all {
@@ -794,4 +837,11 @@ export default {
     font-size: 20px;
   }
 }
-</style>
\ No newline at end of file
+</style>
+
+
+
+
+
+
+
diff --git a/code/WebApp/vue/src/components/ImportExcel-vw/index-1.vue b/code/WebApp/vue/src/components/ImportExcel-vw/index-1.vue
new file mode 100644
index 00000000..3cecac30
--- /dev/null
+++ b/code/WebApp/vue/src/components/ImportExcel-vw/index-1.vue
@@ -0,0 +1,814 @@
+<template>
+  <el-dialog
+    :visible="show"
+    :title="'导入' + crmTypeName"
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    width="600px"
+    @close="closeView"
+  >
+    <div class="dialog-body">
+      <div v-if="stepsActive == 1" class="step-section">
+        <div class="sections">
+          <div class="sections__title" v-loading="loading">
+            一、导入说明：
+            <div class="sections__tips">
+              1、提供的导入模板需要.xlsx文件格式！不支持“.xls”文件，即不支持Excel97-2003!
+            </div>
+            <div class="sections__tips">
+              2、模板名称可以进行修改，但不要删除模板中设置的字段！
+            </div>
+            <div class="sections__tips">
+              3、导入文件大小请勿超过100MB！且目前只支持单个Sheet页签！
+            </div>
+          </div>
+        </div>
+        <div class="sections">
+          <div class="sections__title">二、导入条件设置（没有则不用设置）</div>
+          <div class="sections__tips">
+            <span class="demonstration">选择版本：</span>
+            <el-select
+              v-model="versionValue"
+              clearable
+              :disabled="isEditFactory"
+              style="width: 188px"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in factoryList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+            <span class="demonstration">选择工厂：</span>
+            <el-select
+              v-model="YearMonthValue"
+              clearable
+              :disabled="isEditYearMont"
+              style="width: 188px"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in yearMonthList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="sections">
+          <div class="sections__title">三、请选择需要导入的文件</div>
+          <div class="content">
+            <flexbox class="file-select">
+              <el-upload
+                ref="upload"
+                class="avatar-uploader"
+                drag
+                action="#"
+                :http-request="httpRequestfiles"
+                :headers="httpHeader"
+                :file-list="fileuploadList"
+                :before-upload="beforeAvatarUpload"
+                :before-remove="beforeRemove"
+                :on-remove="handleRemove"
+                multiple
+                :limit="10"
+              >
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+                </div>
+              </el-upload>
+            </flexbox>
+          </div>
+        </div>
+      </div>
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 2"
+        element-loading-text="数据导入中,请耐心等待..."
+        element-loading-spinner="el-icon-loading"
+        class="step-section"
+      />
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 3"
+        class="step-section"
+      >
+        <div class="result-info">
+          <el-card style="height: 300px; margin-top: -20px" shadow="always">
+            <i class="wk wk-success result-info__icon" />
+            <p class="result-info__detail">
+              结果：
+              <span class="result-info__detail--all"
+                >{{ this.resultData.successMessage }}
+              </span>
+            </p>
+
+            <el-button
+              v-if="this.resultData && this.resultData.errSize > 0"
+              class="result-info__btn--err"
+              type="text"
+              @click="downloadErrData"
+              >下载错误数据</el-button
+            >
+          </el-card>
+        </div>
+      </div>
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 4"
+        class="step-section"
+      >
+        <div class="result-info">
+          <el-card style="height: 300px" shadow="always">
+            <i class="wk wk-success result-info__icon" />
+            <p class="result-info__detail">
+              结果：
+              <span class="result-info__detail--all"
+                >{{ this.resultData.successMessage }}
+              </span>
+            </p>
+            <!-- <p class="result-info__des">数据导入结果：</p>
+            <p class="result-info__detail">
+              导入成功数据
+              <span class="result-info__detail--all"
+                >{{ this.resultData.totalSize }} </span
+              >条有效数据！
+            </p> -->
+          </el-card>
+        </div>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-popover
+        v-model="historyPopoverShow"
+        placement="top"
+        width="800"
+        popper-class="no-padding-popover"
+        trigger="click"
+      >
+      </el-popover>
+
+      <!-- <el-button  @click="closeView">取消</el-button> -->
+      <el-button :class="{ 'is-hidden': !showCancel }" @click="closeView"
+        >取消</el-button
+      >
+      <el-button v-if="sureTitle" type="primary" @click="sureClick">{{
+        sureTitle
+      }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { downloadFile } from "@/utils/crmindex.js";
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+export default {
+  name: "CRMImport", // 文件导入
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    // CRM类型
+    crmType: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      options: [
+        {
+          value: "3",
+          label: "新增",
+        },
+        {
+          value: "0",
+          label: "修改",
+        },
+      ],
+      loading: false,
+      fieldList: [],
+      factoryList: [], //工厂列表
+      YearMonthValue: "", //年度期间选择项
+      yearMonthList: [], //年度期间
+      versionValue: "",
+      stateValue: "",
+      config: 1, // 	1 覆盖，2跳过
+      /** 编辑控制 */
+      isEditFactory: false, // 是否是编辑中
+      isEditYearMont: false, // 是否是编辑中
+      isState: true, // 是否是编辑中
+      //file: { name: "" },
+      stepsActive: 1,
+      stepList: [
+        {
+          icon: "wk wk-upload",
+          title: "上传文件",
+          status: "wait",
+        },
+        {
+          icon: "wk wk-data-import",
+          title: "导入数据",
+          status: "wait",
+        },
+        {
+          icon: "wk wk-success",
+          title: "导入完成",
+          status: "wait",
+        },
+      ],
+      //resultData: null,
+      resultData: {
+        totalSize: 0,
+        errSize: 0,
+        errTemplate: "",
+        errMessage: "",
+        successMessage: "",
+      },
+      processData: {
+        count: 0,
+        status: "",
+      },
+      messageId: null,
+      intervalTimer: null,
+      fileuploadList: [],
+      isLt2M: "",
+      isFileType: "",
+      historyPopoverShow: false,
+      yeareVale: "",
+      monthVale: "",
+      page: 1,
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "project",
+            action: 0,
+            value: "factory",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      listQueryCustom: {
+        Filters: [
+          {
+            logic: 0,
+            column: "customerCode",
+            action: 0,
+            value: "U22000",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+    };
+  },
+  computed: {
+    sureTitle() {
+      return {
+        1: "立即导入",
+        2: "导入中",
+        3: "确定",
+      }[this.stepsActive];
+    },
+    showCancel() {
+      return this.stepsActive != 2;
+    },
+    getMoudleDisable() {
+      if (
+        this.crmType == "codeSetting" ||
+        this.crmType == "factory" ||
+        this.crmType == "customerStorageLocation" ||
+        this.crmType == "materialRelationSupplier" ||
+        this.crmType == "carMaterialConfig" ||
+        this.crmType == "materialRelation"
+      ) {
+        //版本和工厂都可以用
+        this.isEditYearMont = true;
+        this.isEditFactory = true;
+      } else if (
+        this.crmType == "secondaryPriceRatio" ||
+        this.crmType == "secondaryAdjustment" ||
+        this.crmType == "secondaryDiscount" ||
+        this.crmType == "estimatedInventoryDetail" ||
+        this.crmType == "estimatedSum"
+      ) {
+        //只版本可用
+        this.isEditYearMont = true;
+        this.isEditFactory = false;
+      } else if (this.crmType == "material") {
+        //只工厂可用
+        this.isEditYearMont = false;
+        this.isEditFactory = true;
+      } else if (this.crmType == "prebatch") {
+        //只状态可用
+        this.isEditYearMont = true;
+        this.isEditFactory = true;
+        this.isState = false;
+      } else {
+        this.isEditYearMont = false;
+        this.isEditFactory = false;
+      }
+    },
+    crmTypeName() {
+      return (
+        {
+          bomdatabase: "产品结构BOM",
+          prebatch: "预批量",
+          secondaryPriceRatio: "二配结算价格比例",
+          factory: "工厂设置",
+          materialRelation: "零件匹配关系",
+          carMaterialConfig: "车型代码与零件匹配",
+          materialRelationSupplier: "供应商零件设置表",
+          material: "物料主数据",
+          inventorydetail: "库存明细",
+          codeSetting: "通用代码设置",
+          estimatedSum: "应付暂估汇总",
+          estimatedInventoryDetail: "应付暂估收货明细",
+          customerStorageLocation: "客户存储地点",
+          secondaryAdjustment: "二配数量调整输入",
+          secondaryDiscount: "二配折扣调整输入",
+        }[this.crmType] || ""
+      );
+    },
+    getWebApi() {
+      return (
+        {
+          bomdatabase: "/api/settleaccount/bom/ExcelImport",
+          prebatch: "/api/settleaccount/Prebatch/ExcelImport",
+          secondaryPriceRatio:
+            "/api/settleaccount/SecondaryPriceRatio/ExcelImport",
+          factory: "/api/settleaccount/Factory/ExcelImport",
+          materialRelation:
+            "/api/settleaccount/MaterialRelationship/ExcelImport",
+          carMaterialConfig: "/api/settleaccount/CarMaterialConfig/ExcelImport",
+          materialRelationSupplier:
+            "/api/settleaccount/SupplierItemSetUp/ExcelImport",
+          material: "/api/settleaccount/material/ExcelImport",
+          inventorydetail: "/api/settleaccount/InventoryDetail/ExcelImport",
+          codeSetting: "/api/settleaccount/CodeSetting/ExcelImport",
+          estimatedSum: "/api/settleaccount/EstimatedSum/ExcelImport",
+          estimatedInventoryDetail:
+            "/api/settleaccount/EstimatedInventoryDetail/ExcelImport",
+          customerStorageLocation:
+            "/api/settleaccount/CustomerStorageLocation/ExcelImport",
+          secondaryAdjustment:
+            "/api/settleaccount/SecondaryAdjustment/ExcelImport",
+          secondaryDiscount: "/api/settleaccount/SecondaryDiscount/ExcelImport",
+        }[this.crmType] || ""
+      );
+    },
+    getImportTemplate() {
+      //模板名称
+      return (
+        {
+          bomdatabase: "产品结构Bom导入模板.xlsx",
+          secondaryPriceRatio: "二配价格比例导入模板.xlsx",
+          factory: "工厂设置模板.xlsx",
+          materialRelation: "零件匹配关系.xlsx",
+          carMaterialConfig: "车型代码与零件匹配.xlsx",
+          materialRelationSupplier: "供应商零件设置表.xlsx",
+          material: "物料主数据.xlsx",
+          inventorydetail: "库存明细信息.xlsx",
+          codeSetting: "通用代码设置数据.xlsx",
+          estimatedSum: "应付暂估汇总.xlsx",
+          estimatedInventoryDetail: "应付暂估收货明细.xlsx",
+          customerStorageLocation: "客户存储地点.xlsx",
+          secondaryAdjustment: "二配调整输入.xlsx",
+        }[this.crmType] || ""
+      );
+    },
+    httpHeader() {
+      //文件上传时，带token认证信息，提高安全性
+      return {
+        Authorization: "Bearer " + getToken(),
+      };
+    },
+  },
+  watch: {
+    show: function (val) {
+      this.stepsActive = 1;
+      this.getAllYearMonth(); //加载版本
+      this.getAllFactory(); //加载工厂
+      this.getMoudleDisable(); //判断设置条件是否可用
+      if (val) {
+        this.stepsActive = 1;
+      } else {
+        if (this.stepsActive == 3) {
+          //以下是重置数据
+          this.stepsActive = 1;
+          this.stepList = [
+            {
+              icon: "wk wk-upload",
+              title: "上传文件",
+              status: "wait",
+            },
+            {
+              icon: "wk wk-data-import",
+              title: "导入数据",
+              status: "wait",
+            },
+            {
+              icon: "wk wk-success",
+              title: "导入完成",
+              status: "wait",
+            },
+          ];
+          this.resultData = null;
+        }
+      }
+    },
+
+    stepsActive() {
+      this.$emit(
+        "status",
+        {
+          1: "wait",
+          2: "process",
+          3: "finish",
+        }[this.stepsActive]
+      );
+    },
+  },
+  mounted() {},
+  methods: {
+    // getAllYearMonth() {
+    //   //取工厂列表信息
+    //   this.factoryList = [];
+    //   //this.listQuery.SkipCount = (this.page - 1) * 500;
+    //   this.$axios
+    //     .posts("/api/settleaccount/CentralizedControl/openlist")
+    //     .then((response) => {
+    //       response.items.forEach((element) => {
+    //         let options = {};
+    //         options.value = element.version;
+    //         options.label = element.version;
+    //         this.factoryList.push(options);
+    //       });
+    //     })
+    //     .catch(() => {
+    //       this.listLoading = false;
+    //     });
+    // },
+    getAllYearMonth() {
+      //取版本列表信息
+      // this.listQuery.SkipCount = (this.page - 1) * 500;
+      this.$axios
+        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .then((response) => {
+          this.factoryList = [];
+          response.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.factoryList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    getAllFactory() {
+      //取工厂列表信息
+      this.yearMonthList = [];
+      this.listQueryCustom.SkipCount = (this.page - 1) * 500;
+      this.$axios
+        .posts("/api/settleaccount/Factory/list", this.listQueryCustom)
+        .then((response) => {
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.code;
+            options.label = element.desc;
+            this.yearMonthList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleImportExcelClick() {
+      //父组件中，初始化此子组件时调用
+      this.fileuploadList = [];
+      //this.$refs.upload.clearFiles();
+    },
+    httpRequestfiles(data) {
+      let _this = this;
+      let rd = new FileReader(); // 创建文件读取对象
+      let file = data.file;
+      this.fileuploadList.push(file);
+      rd.readAsDataURL(file); // 文件读取装换为base64类型
+    },
+    beforeAvatarUpload(file) {
+      var FileExt = file.name.replace(/.+\./, "");
+      if (["xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
+        this.$message({
+          type: "warning",
+          message: "只支持xlsx类型文件！",
+        });
+        this.isFileType = "0";
+        return false;
+      } else {
+        this.isFileType = "1";
+      }
+      this.isLt2M = file.size / 1024 / 1024 < 100 ? "1" : "0";
+      if (this.isLt2M === "0") {
+        this.$message.error("上传文件大小不能超过 100MB!");
+      }
+      return this.isLt2M === "1" ? true : false;
+    },
+    beforeRemove(file, fileList) {
+      if (this.isLt2M === "1" && this.isFileType === "1") {
+        return this.$confirm(`确定移除 ${file.name}？`);
+      }
+    },
+    handleRemove(file, fileList) {
+      //附件列表删除操作
+      const index = this.fileuploadList.indexOf(file.originFileObj);
+      const newFileList = this.fileuploadList.slice();
+      newFileList.splice(index, 1);
+      this.fileuploadList = newFileList;
+    },
+    //执行按钮
+    sureClick() {
+      if (
+        this.fileuploadList === [] ||
+        JSON.stringify(this.fileuploadList) === "[]"
+      ) {
+        this.$message.error("请选择导入文件");
+        return false;
+      }
+      if (this.stepsActive == 1) {
+        if (this.stepList[0].status == "wait") {
+          this.stepsActive = 2;
+          this.saveTemplateData();
+          // setTimeout(() => {
+          //   this.saveTemplateData();
+          // }, 1000);
+          if (this.stepList[1].status == "finish") {
+          }
+        } else {
+          if (this.fileuploadList === "[]") {
+            this.$message.error("请选择导入文件");
+          }
+        }
+      } else {
+        this.closeView();
+      }
+    },
+
+    saveTemplateData() {
+      this.loading = true;
+      //保存项目、合同管理、客户等信息的共用方法
+      //--上传附件，批量或拖拽
+      if (JSON.stringify(this.fileuploadList) != "[]") {
+        let fd = new FormData();
+        const { fileuploadList } = this;
+        fileuploadList.forEach((file) => {
+          fd.append("files", file); // 添加文件
+        });
+        fd.append("branchId", "3FA85F64-5717-4562-B3FC-2C963F66AFA6");
+        fd.append("year", "2021");
+        fd.append("period", "03");
+        fd.append("customerCode", "03");
+        fd.append("factory", this.YearMonthValue);
+        fd.append("version", this.versionValue);
+        const webapi = this.getWebApi;
+        this.$axios
+          .posts(webapi, fd)
+          .then(async (res) => {
+            console.log("大众导入条件：" + JSON.stringify(res));
+            if (res === "Success") {
+              if (this.isLt2M === "1" && this.isFileType === "1") {
+                this.$notify({
+                  title: "成功",
+                  message: "数据导入成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.stepList[1].status = "finish";
+                this.resultData.successMessage = "数据导入成功！";
+                this.stepsActive = 4;
+              }
+            } else {
+              this.stepList[0].status = "wait";
+              this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
+              this.resultData.errSize = 1;//保持大于0，用于控制错误数据下载按钮的可不可见
+              this.resultData.successMessage = "数据导入失败！";
+              this.stepsActive = 3;
+            }
+            this.$emit("status", "finish");
+            // this.$nextTick(() => {
+            //   this.loading = false;
+            // });
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      } else {
+        this.loading = false;
+        this.$message({
+          message: "未上传任何附件，请查检！",
+          type: "warning",
+        });
+      }
+    },
+
+    /**
+     * 下载错误模板
+     */
+    downloadErrData() {
+      let fileNameOfProject = this.resultData.errTemplate;
+      this.$axios
+        .BolbGets(
+          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+        )
+        .then((response) => {
+          if (fileNameOfProject.indexOf("_") != -1) {
+            let downName =
+              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
+              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+            downloadFile(response, downName);
+            this.$notify({
+              title: "成功",
+              message: "错误数据-导出成功！",
+              type: "success",
+              duration: 2000,
+            });
+          } else {
+            downloadFile(response, fileNameOfProject);
+            this.$notify({
+              title: "成功",
+              message: "错误数据-导出成功！",
+              type: "success",
+              duration: 2000,
+            });
+          }
+          this.listLoading = false;
+        })
+        .catch((error) => {
+          this.listLoading = false;
+        });
+    },
+    // 关闭操作
+    closeView() {
+      this.$emit("update:show", false);
+      this.$emit("close", this.stepsActive == 3 ? "finish" : "");
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "@/styles/xr-theme.scss";
+.el-steps {
+  margin-bottom: 15px;
+
+  /deep/ .el-step__title {
+    font-size: 14px;
+  }
+
+  /deep/ .el-step.is-simple .el-step__arrow::before,
+  /deep/ .el-step.is-simple .el-step__arrow::after {
+    height: 10px;
+    width: 2px;
+  }
+
+  /deep/ .el-step.is-simple .el-step__arrow::after {
+    transform: rotate(45deg) translateY(3px);
+  }
+  /deep/ .el-step.is-simple .el-step__arrow::before {
+    transform: rotate(-45deg) translateY(-2px);
+  }
+}
+
+.step-section {
+  min-height: 300px;
+
+  /deep/ .el-loading-spinner {
+    top: 45%;
+    .el-icon-loading {
+      font-size: 40px;
+      color: #999;
+    }
+
+    .el-loading-text {
+      color: #333;
+    }
+  }
+}
+
+.sections {
+  font-size: 14px;
+  color: #333;
+
+  &__title {
+    font-weight: 600;
+  }
+
+  &__tips {
+    padding-left: 30px;
+    margin: 8px 0 15px;
+    color: #999;
+    font-size: 12px;
+    line-height: 1.4;
+  }
+
+  .download {
+    cursor: pointer;
+    color: #2362fb;
+  }
+}
+
+.sections__tips + .content {
+  padding-top: 0;
+}
+
+.content {
+  padding: 10px 10px 10px 30px;
+  .el-select {
+    width: 400px;
+  }
+  .user-cell {
+    width: 400px;
+  }
+}
+
+#importInputFile {
+  display: none;
+}
+
+.file-select {
+  .el-input {
+    width: 400px;
+  }
+  button {
+    margin-left: 20px;
+  }
+}
+
+.is-hidden {
+  visibility: hidden;
+}
+
+.history-btn {
+  float: left;
+  margin-left: 15px;
+}
+
+// 结果信息
+.result-info {
+  text-align: center;
+  padding-top: 50px;
+
+  &__icon {
+    font-size: 40px;
+    color: $xr-color-primary;
+  }
+
+  &__des {
+    margin-top: -15px;
+    color: #333;
+    font-size: 30px;
+  }
+
+  &__detail {
+    margin-top: 35px;
+    font-size: 20px;
+    color: #666;
+    &--all {
+      color: #333;
+      font-weight: 600;
+    }
+
+    &--suc {
+      color: $xr-color-primary;
+      font-weight: 600;
+    }
+
+    &--err {
+      margin-top: 25px;
+      color: #f94e4e;
+      font-weight: 600;
+    }
+  }
+
+  &__btn--err {
+    margin-top: 10px;
+    font-size: 20px;
+  }
+}
+</style>
+
+
+
diff --git a/code/WebApp/vue/src/components/ImportExcel-vw/index.vue b/code/WebApp/vue/src/components/ImportExcel-vw/index.vue
index d1e8b5a6..c94b4245 100644
--- a/code/WebApp/vue/src/components/ImportExcel-vw/index.vue
+++ b/code/WebApp/vue/src/components/ImportExcel-vw/index.vue
@@ -53,7 +53,7 @@
                     :value="item.value"
                   ></el-option>
                 </el-select>
-                <!-- <span class="demonstration">选择工厂：</span>
+                <span class="demonstration">选择工厂：</span>
                 <el-select
                   v-model="YearMonthValue"
                   clearable
@@ -67,7 +67,7 @@
                     :label="item.label"
                     :value="item.value"
                   ></el-option>
-                </el-select> -->
+                </el-select>
               </div>
             </div>
             <div class="sections">
@@ -145,15 +145,13 @@
                   >{{ this.resultData.successMessage }}
                 </span>
               </p>
-              <p class="result-info__detail">
-                <router-link
-                  :to="{
-                    name: 'BackGroundWork',
-                    params: { taskId: this.resultData.taskId },
-                  }"
-                  >[单击跳转至后台监控界面]</router-link
-                >
-              </p>
+              <!-- <p class="result-info__des">数据导入结果：</p>
+            <p class="result-info__detail">
+              导入成功数据
+              <span class="result-info__detail--all"
+                >{{ this.resultData.totalSize }} </span
+              >条有效数据！
+            </p> -->
             </el-card>
           </div>
         </div>
@@ -247,7 +245,6 @@ export default {
         errTemplate: "",
         errMessage: "",
         successMessage: "",
-        taskId: "",
       },
       processData: {
         count: 0,
@@ -307,7 +304,8 @@ export default {
         this.crmType == "factory" ||
         this.crmType == "customerStorageLocation" ||
         this.crmType == "materialRelationSupplier" ||
-        this.crmType == "carMaterialConfig" 
+        this.crmType == "carMaterialConfig" ||
+        this.crmType == "materialRelation"
       ) {
         //版本和工厂都可以用
         this.isEditYearMont = true;
@@ -315,6 +313,8 @@ export default {
       } else if (
         this.crmType == "secondaryPriceRatio" ||
         this.crmType == "secondaryAdjustment" ||
+        this.crmType == "secondaryAdjustmentBT" ||
+        this.crmType == "secondaryAdjustmentHQ" ||
         this.crmType == "secondaryDiscount" ||
         this.crmType == "estimatedInventoryDetail" ||
         this.crmType == "estimatedSum"
@@ -324,8 +324,8 @@ export default {
         this.isEditFactory = false;
       } else if (this.crmType == "material") {
         //只工厂可用
-        this.isEditYearMont = true;
-        this.isEditFactory = false;
+        this.isEditYearMont = false;
+        this.isEditFactory = true;
       } else if (this.crmType == "prebatch") {
         //只状态可用
         this.isEditYearMont = true;
@@ -339,16 +339,54 @@ export default {
     crmTypeName() {
       return (
         {
-          settleAccount: "大众已结算数据",
-          unSettleAccount: "大众未结数据",
+          bomdatabase: "产品结构BOM",
+          prebatch: "预批量",
+          secondaryPriceRatio: "二配结算价格比例",
+          factory: "工厂设置",
+          materialRelation: "零件匹配关系",
+          carMaterialConfig: "车型代码与零件匹配",
+          materialRelationSupplier: "供应商零件设置表",
+          material: "物料主数据",
+          inventorydetail: "库存明细",
+          codeSetting: "通用代码设置",
+          estimatedSum: "应付暂估汇总",
+          estimatedInventoryDetail: "应付暂估收货明细",
+          customerStorageLocation: "客户存储地点",
+          secondaryAdjustment: "二配数量调整输入",
+          secondaryAdjustmentBT: "奔腾-二配数量调整输入",
+          secondaryAdjustmentHQ:"红旗-二配数量调整输入",
+          secondaryDiscount: "二配折扣调整输入",
         }[this.crmType] || ""
       );
     },
     getWebApi() {
       return (
         {
-          settleAccount: "/api/settleaccount/SettleAccount/ExcelImport-PG",
-          unSettleAccount: "/api/settleaccount/UnSettleAccount/ExcelImport",
+          bomdatabase: "/api/settleaccount/bom/ExcelImport",
+          prebatch: "/api/settleaccount/Prebatch/ExcelImport",
+          secondaryPriceRatio:
+            "/api/settleaccount/SecondaryPriceRatio/ExcelImport",
+          factory: "/api/settleaccount/Factory/ExcelImport",
+          materialRelation:
+            "/api/settleaccount/MaterialRelationship/ExcelImport",
+          carMaterialConfig: "/api/settleaccount/CarMaterialConfig/ExcelImport",
+          materialRelationSupplier:
+            "/api/settleaccount/SupplierItemSetUp/ExcelImport",
+          material: "/api/settleaccount/material/ExcelImport",
+          inventorydetail: "/api/settleaccount/InventoryDetail/ExcelImport",
+          codeSetting: "/api/settleaccount/CodeSetting/ExcelImport",
+          estimatedSum: "/api/settleaccount/EstimatedSum/ExcelImport",
+          estimatedInventoryDetail:
+            "/api/settleaccount/EstimatedInventoryDetail/ExcelImport",
+          customerStorageLocation:
+            "/api/settleaccount/CustomerStorageLocation/ExcelImport",
+          secondaryAdjustment:
+            "/api/settleaccount/SecondaryAdjustment/ExcelImport",
+          secondaryAdjustmentBT://新增 奔腾二配导入
+            "/api/settleaccount/SecondaryAdjustmentBT/ExcelImport",
+          secondaryAdjustmentHQ://新增 红旗二配导入
+            "/api/settleaccount/SecondaryAdjustmentHQ/ExcelImport",
+          secondaryDiscount: "/api/settleaccount/SecondaryDiscount/ExcelImport",
         }[this.crmType] || ""
       );
     },
@@ -356,19 +394,21 @@ export default {
       //模板名称
       return (
         {
-          // bomdatabase: "产品结构Bom导入模板.xlsx",
-          // secondaryPriceRatio: "二配价格比例导入模板.xlsx",
-          // factory: "工厂设置模板.xlsx",
-          // materialRelation: "零件匹配关系.xlsx",
-          // carMaterialConfig: "车型代码与零件匹配.xlsx",
-          // materialRelationSupplier: "供应商零件设置表.xlsx",
-          // material: "物料主数据.xlsx",
-          // inventorydetail: "库存明细信息.xlsx",
-          // codeSetting: "通用代码设置数据.xlsx",
-          // estimatedSum: "应付暂估汇总.xlsx",
-          // estimatedInventoryDetail: "应付暂估收货明细.xlsx",
-          // customerStorageLocation: "客户存储地点.xlsx",
-          // secondaryAdjustment: "二配调整输入.xlsx",
+          bomdatabase: "产品结构Bom导入模板.xlsx",
+          secondaryPriceRatio: "二配价格比例导入模板.xlsx",
+          factory: "工厂设置模板.xlsx",
+          materialRelation: "零件匹配关系.xlsx",
+          carMaterialConfig: "车型代码与零件匹配.xlsx",
+          materialRelationSupplier: "供应商零件设置表.xlsx",
+          material: "物料主数据.xlsx",
+          inventorydetail: "库存明细信息.xlsx",
+          codeSetting: "通用代码设置数据.xlsx",
+          estimatedSum: "应付暂估汇总.xlsx",
+          estimatedInventoryDetail: "应付暂估收货明细.xlsx",
+          customerStorageLocation: "客户存储地点.xlsx",
+          secondaryAdjustment: "二配调整输入.xlsx",
+          secondaryAdjustmentBT: "奔腾-二配调整输入.xlsx",
+          secondaryAdjustmentHQ:"红旗-二配调整输入xlsx"
         }[this.crmType] || ""
       );
     },
@@ -383,6 +423,7 @@ export default {
     show: function (val) {
       this.stepsActive = 1;
       this.getAllYearMonth(); //加载版本
+      this.getAllFactory(); //加载工厂
       this.getMoudleDisable(); //判断设置条件是否可用
       if (val) {
         this.stepsActive = 1;
@@ -441,6 +482,24 @@ export default {
           this.listLoading = false;
         });
     },
+    getAllFactory() {
+      //取工厂列表信息
+      this.yearMonthList = [];
+      this.listQueryCustom.SkipCount = (this.page - 1) * 500;
+      this.$axios
+        .posts("/api/settleaccount/Factory/list", this.listQueryCustom)
+        .then((response) => {
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.code;
+            options.label = element.desc;
+            this.yearMonthList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
     handleImportExcelClick() {
       //父组件中，初始化此子组件时调用
       this.fileuploadList = [];
@@ -485,6 +544,22 @@ export default {
     },
     //执行按钮
     sureClick() {
+      if (
+        this.crmType == "secondaryPriceRatio" ||
+        this.crmType == "secondaryAdjustment" ||
+        this.crmType == "secondaryAdjustmentBT" ||
+        this.crmType == "secondaryAdjustmentHQ" ||
+        this.crmType == "secondaryDiscount" ||
+        this.crmType == "estimatedInventoryDetail" ||
+        this.crmType == "inventorydetail" ||
+        this.crmType == "bomdatabase" ||
+        this.crmType == "estimatedSum"
+      ) {
+        if (this.versionValue == "") {
+          this.$message.error("必须选择版本！");
+          return false;
+        }
+      }
       if (
         this.fileuploadList === [] ||
         JSON.stringify(this.fileuploadList) === "[]"
@@ -524,26 +599,31 @@ export default {
         fd.append("year", "2021");
         fd.append("period", "03");
         fd.append("customerCode", "03");
+        fd.append("factory", this.YearMonthValue);
         fd.append("version", this.versionValue);
         const webapi = this.getWebApi;
         this.$axios
           .posts(webapi, fd)
           .then(async (res) => {
             console.log("大众导入条件：" + JSON.stringify(res));
-            if (Number.isInteger(res)) {
-              this.resultData.taskId = res;
-              this.$notify({
-                title: "成功",
-                message: "文件上传成功！",
-                type: "success",
-                duration: 2000,
-              });
-              this.stepList[1].status = "finish";
-              this.resultData.successMessage =
-                "文件已经上传至后台，任务号：" +
-                res +
-                "，请在后台作业监控界面中查看进度！";
-              this.stepsActive = 4;
+            if (res === "Success") {
+              if (this.isLt2M === "1" && this.isFileType === "1") {
+                this.$notify({
+                  title: "成功",
+                  message: "数据导入成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.stepList[1].status = "finish";
+                this.resultData.successMessage = "数据导入成功！";
+                this.stepsActive = 4;
+              }
+            } else {
+              this.stepList[0].status = "wait";
+              this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
+              this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见
+              this.resultData.successMessage = "数据导入失败！";
+              this.stepsActive = 3;
             }
             console.log(this.stepsActive);
             this.$emit("status", "finish");
@@ -567,10 +647,7 @@ export default {
         });
       }
     },
-    goTo() {
-      //直接跳转
-      this.$router.push("/views/ux/backGroundWork");
-    },
+
     /**
      * 下载错误模板
      */
diff --git a/code/WebApp/vue/src/components/ImportExcel/index.vue b/code/WebApp/vue/src/components/ImportExcel/index.vue
index 84cf0c5d..be15da81 100644
--- a/code/WebApp/vue/src/components/ImportExcel/index.vue
+++ b/code/WebApp/vue/src/components/ImportExcel/index.vue
@@ -298,7 +298,7 @@ export default {
       return (
         {
           bomdatabase: "产品结构BOM",
-         // materialRelation: "零件匹配关系",
+          materialRelation: "零件匹配关系",
           material: "物料主数据",
           inventorydetail: "库存明细",
           codeSetting: "通用代码设置",
@@ -311,7 +311,7 @@ export default {
       return (
         {
           bomdatabase: "/api/settleaccount/bom/ExcelImport",
-         // materialRelation: "/api/settleaccount/materialRelation/ExcelImport",
+          materialRelation: "/api/settleaccount/materialRelation/ExcelImport",
           material: "/api/settleaccount/material/ExcelImport",
           inventorydetail: "/api/settleaccount/InventoryDetail​/ExcelImport",
           codeSetting: "/api/settleaccount/CodeSetting/ExcelImport",
diff --git a/code/WebApp/vue/src/components/ImportTxt/index-1.vue b/code/WebApp/vue/src/components/ImportTxt/index-1.vue
new file mode 100644
index 00000000..b74b57d9
--- /dev/null
+++ b/code/WebApp/vue/src/components/ImportTxt/index-1.vue
@@ -0,0 +1,766 @@
+<template>
+  <el-dialog
+    :visible="show"
+    :title="'导入' + crmTypeName"
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    width="600px"
+    @close="closeView"
+  >
+    <div class="dialog-body">
+      <div v-if="stepsActive == 1" class="step-section">
+        <div class="sections">
+          <div class="sections__title" v-loading="loading">
+            一、导入说明：
+            <div class="sections__tips">
+              1、提供的导入模板需要.txt文本格式！
+            </div>
+            <div class="sections__tips">
+              2、模板名称可以进行修改，但不要删除模板中设置的字段！
+            </div>
+            <div class="sections__tips">3、导入文件大小请勿超过100MB！</div>
+          </div>
+        </div>
+        <div class="sections">
+          <div class="sections__title">
+            二、导入条件设置（没有则不用设置）。
+          </div>
+          <div class="sections__tips">
+            <span class="demonstration">选择版本：</span>
+            <el-select
+              v-model="versionValue"
+              clearable
+              :disabled="isEditFactory"
+              style="width: 188px"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in factoryList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+            <span class="demonstration">大众厂线：</span>
+            <el-select
+              v-model="CarModekValue"
+              clearable
+              :disabled="isEditYearMont"
+              style="width: 188px"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in carModelList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </div>
+          <div class="sections__tips">
+            <span class="demonstration">开始时间：</span>
+            <el-date-picker
+              v-model="startTimeVale"
+              :disabled="isTimeUse"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期时间"
+            >
+            </el-date-picker>
+          </div>
+          <div class="sections__tips">
+            <span class="demonstration">结束时间：</span>
+            <el-date-picker
+              v-model="endTimeVale"
+              :disabled="isTimeUse"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期时间"
+            >
+            </el-date-picker>
+          </div>
+        </div>
+        <div class="sections">
+          <div class="sections__title">三、请选择需要导入的文件</div>
+          <div class="content">
+            <flexbox class="file-select">
+              <el-upload
+                ref="upload"
+                class="avatar-uploader"
+                drag
+                action="#"
+                :http-request="httpRequestfiles"
+                :headers="httpHeader"
+                :file-list="fileuploadList"
+                :before-upload="beforeAvatarUpload"
+                :before-remove="beforeRemove"
+                :on-remove="handleRemove"
+                multiple
+                :limit="10"
+              >
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+                </div>
+              </el-upload>
+            </flexbox>
+          </div>
+        </div>
+      </div>
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 2"
+        element-loading-text="数据导入中,请耐心等待..."
+        element-loading-spinner="el-icon-loading"
+        class="step-section"
+      />
+
+        <div
+        v-loading="loading"
+        v-else-if="stepsActive == 3"
+        class="step-section"
+      >
+        <div class="result-info">
+          <el-card style="height: 300px; margin-top: -20px" shadow="always">
+            <i class="wk wk-success result-info__icon" />
+            <!-- <p class="result-info__detail">
+              导入成功数据：
+              <span class="result-info__detail--all"
+                >{{ this.resultData.totalSize }} </span
+              >条有效数据！
+            </p> -->
+            <p class="result-info__detail">
+              结果：
+              <span class="result-info__detail--all"
+                >{{ this.resultData.successMessage }}
+              </span>
+            </p>
+
+            <el-button
+              v-if="this.resultData && this.resultData.errSize > 0"
+              class="result-info__btn--err"
+              type="text"
+              @click="downloadErrData"
+              >下载错误数据</el-button
+            >
+          </el-card>
+        </div>
+      </div>
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 4"
+        class="step-section"
+      >
+        <div class="result-info">
+          <el-card style="height: 300px" shadow="always">
+            <!-- <i class="wk wk-success result-info__icon" />
+            <p class="result-info__des">数据导入结果：</p>
+            <p class="result-info__detail">
+              导入成功数据
+              <span class="result-info__detail--all"
+                >{{ this.resultData.totalSize }} </span
+              >条有效数据！
+            </p> -->
+            <i class="wk wk-success result-info__icon" />
+            <p class="result-info__detail">
+              结果：
+              <span class="result-info__detail--all"
+                >{{ this.resultData.successMessage }}
+              </span>
+            </p>
+          </el-card>
+        </div>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-popover
+        v-model="historyPopoverShow"
+        placement="top"
+        width="800"
+        popper-class="no-padding-popover"
+        trigger="click"
+      >
+      </el-popover>
+
+      <!-- <el-button  @click="closeView">取消</el-button> -->
+      <el-button :class="{ 'is-hidden': !showCancel }" @click="closeView"
+        >取消</el-button
+      >
+      <el-button v-if="sureTitle" type="primary" @click="sureClick">{{
+        sureTitle
+      }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { downloadFile } from "@/utils/crmindex.js";
+import { getToken } from "@/utils/auth"; // get token from cookie
+import { formatTimeToTimestamp } from "@/utils/index";
+
+export default {
+  name: "CRMImport", // 文件导入
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    // CRM类型
+    crmType: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      fieldList: [],
+      factoryList: [], //工厂列表
+      CarModekValue: [], //车型选择项
+      carModelList: [], //车型列表
+      versionValue: "",
+      config: 1, // 	1 覆盖，2跳过
+      /** 编辑控制 */
+      isEditFactory: false, // 是否是编辑中
+      isEditYearMont: false, // 是否是编辑中
+      isTimeUse: false, // 是否是编辑中
+      //file: { name: "" },
+      stepsActive: 1,
+      stepList: [
+        {
+          icon: "wk wk-upload",
+          title: "上传文件",
+          status: "wait",
+        },
+        {
+          icon: "wk wk-data-import",
+          title: "导入数据",
+          status: "wait",
+        },
+        {
+          icon: "wk wk-success",
+          title: "导入完成",
+          status: "wait",
+        },
+      ],
+      //resultData: null,
+      resultData: {
+        totalSize: 0,
+        errSize: 0,
+        errTemplate: "",
+        errMessage: "",
+        successMessage: "",
+      },
+      processData: {
+        count: 0,
+        status: "",
+      },
+      messageId: null,
+      intervalTimer: null,
+      fileuploadList: [],
+      isLt2M: "",
+      isFileType: "",
+      historyPopoverShow: false,
+      startTimeVale: "",
+      endTimeVale: "",
+      page: 1,
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "version",
+            action: 0,
+            value: "",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      listQueryCustom: {
+        Filters: [
+          {
+            logic: 0,
+            column: "project",
+            action: 0,
+            value: "生产线",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+    };
+  },
+  computed: {
+    sureTitle() {
+      return {
+        1: "立即导入",
+        2: "导入中",
+        3: "确定",
+      }[this.stepsActive];
+    },
+    showCancel() {
+      return this.stepsActive != 2;
+    },
+    getMoudleDisable() {
+      if (this.crmType == "settleAccount") {
+        this.isEditYearMont = true;
+        //this.isEditFactory = true;
+        this.isTimeUse = true;
+      } else if (this.crmType == "material") {
+        //物料-工厂可用
+        this.isEditYearMont = true;
+        this.isEditFactory = false;
+      } else if (
+        this.crmType == "estimatedSum" ||
+        this.crmType == "estimatedInventoryDetail"
+      ) {
+        this.isEditYearMont = false;
+        this.isEditFactory = true;
+      } else {
+        this.isEditYearMont = false;
+        this.isEditFactory = false;
+      }
+    },
+    crmTypeName() {
+      return (
+        {
+          fis: "FIS发运数据",
+          settleAccount: "R3数据",
+        }[this.crmType] || ""
+      );
+    },
+    getWebApi() {
+      return (
+        {
+          fis: "/api/settleaccount/fis/ExcelImport",
+          settleAccount: "/api/settleaccount/SettleAccount/ExcelImport",
+        }[this.crmType] || ""
+      );
+    },
+    getImportTemplate() {
+      //模板名称
+      return (
+        {
+          fis: "FIS发运数据导入模板.xlsx",
+          settleAccount: "R3数据模板.xlsx",
+        }[this.crmType] || ""
+      );
+    },
+    httpHeader() {
+      //文件上传时，带token认证信息，提高安全性
+      return {
+        Authorization: "Bearer " + getToken(),
+      };
+    },
+  },
+  watch: {
+    show: function (val) {
+      this.stepsActive = 1;
+      this.getAllFactory(); //加载版本
+      this.getAllCarModel(); //加载车型
+      this.getMoudleDisable(); //判断设置条件是否可用
+      if (val) {
+        this.stepsActive = 1;
+      } else {
+        if (this.stepsActive == 3) {
+          //以下是重置数据
+          this.stepsActive = 1;
+          this.stepList = [
+            {
+              icon: "wk wk-upload",
+              title: "上传文件",
+              status: "wait",
+            },
+            {
+              icon: "wk wk-data-import",
+              title: "导入数据",
+              status: "wait",
+            },
+            {
+              icon: "wk wk-success",
+              title: "导入完成",
+              status: "wait",
+            },
+          ];
+          this.resultData = null;
+        }
+      }
+    },
+
+    stepsActive() {
+      this.$emit(
+        "status",
+        {
+          1: "wait",
+          2: "process",
+          3: "finish",
+        }[this.stepsActive]
+      );
+    },
+  },
+  mounted() {},
+  methods: {
+    getAllFactory() {
+      //取版本列表信息
+      this.factoryList = [];
+      // this.listQuery.SkipCount = (this.page - 1) * 500;
+      this.$axios
+        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .then((response) => {
+          response.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.factoryList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    getAllCarModel() {
+      //取车型列表信息
+      this.carModelList = [];
+      this.listQueryCustom.SkipCount = (this.page - 1) * 500;
+      console.log(JSON.stringify(this.listQueryCustom));
+      this.$axios
+        .posts("/api/settleaccount/CodeSetting/list", this.listQueryCustom)
+        .then((response) => {
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.value;
+            options.label = element.description;
+            this.carModelList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleImportExcelClick() {
+      //父组件中，初始化此子组件时调用
+      this.fileuploadList = [];
+      //this.$refs.upload.clearFiles();
+    },
+    httpRequestfiles(data) {
+      let _this = this;
+      let rd = new FileReader(); // 创建文件读取对象
+      let file = data.file;
+      this.fileuploadList.push(file);
+      rd.readAsDataURL(file); // 文件读取装换为base64类型
+    },
+    beforeAvatarUpload(file) {
+      var FileExt = file.name.replace(/.+\./, "");
+      if (["txt"].indexOf(FileExt.toLowerCase()) === -1) {
+        this.$message({
+          type: "warning",
+          message: "只支持txt文本类型文件！",
+        });
+        this.isFileType = "0";
+        return false;
+      } else {
+        this.isFileType = "1";
+      }
+      this.isLt2M = file.size / 1024 / 1024 < 100 ? "1" : "0";
+      if (this.isLt2M === "0") {
+        this.$message.error("上传文件大小不能超过 100MB!");
+      }
+      return this.isLt2M === "1" ? true : false;
+    },
+    beforeRemove(file, fileList) {
+      if (this.isLt2M === "1" && this.isFileType === "1") {
+        return this.$confirm(`确定移除 ${file.name}？`);
+      }
+    },
+    handleRemove(file, fileList) {
+      //附件列表删除操作
+      const index = this.fileuploadList.indexOf(file.originFileObj);
+      const newFileList = this.fileuploadList.slice();
+      newFileList.splice(index, 1);
+      this.fileuploadList = newFileList;
+    },
+    //执行按钮
+    sureClick() {
+      if (this.startTimeVale && this.endTimeVale) {
+        if (
+          formatTimeToTimestamp(this.startTimeVale) >=
+          formatTimeToTimestamp(this.endTimeVale)
+        ) {
+          this.$message.error("开始时间必须小于结束时间!");
+          return false;
+        }
+      }
+      if (
+        this.fileuploadList === [] ||
+        JSON.stringify(this.fileuploadList) === "[]"
+      ) {
+        this.$message.error("请选择导入文件");
+        return false;
+      }
+      if (this.stepsActive == 1) {
+        if (this.stepList[0].status == "wait") {
+          this.stepsActive = 2;
+          this.saveTemplateData();
+          // setTimeout(() => {
+          //   this.saveTemplateData();
+          // }, 1000);
+          if (this.stepList[1].status == "finish") {
+          }
+        } else {
+          if (this.fileuploadList === "[]") {
+            this.$message.error("请选择导入文件");
+          }
+        }
+      } else {
+        this.closeView();
+      }
+    },
+
+    saveTemplateData() {
+      this.loading = true;
+      //保存项目、合同管理、客户等信息的共用方法
+      //--上传附件，批量或拖拽
+      if (JSON.stringify(this.fileuploadList) != "[]") {
+        let fd = new FormData();
+        const { fileuploadList } = this;
+        fileuploadList.forEach((file) => {
+          fd.append("files", file); // 添加文件
+        });
+        fd.append("branchId", "3FA85F64-5717-4562-B3FC-2C963F66AFA6");
+        fd.append("year", "2021");
+        fd.append("period", "03");
+        fd.append("customerCode", "03");
+        fd.append("factory", "03");
+        fd.append("beginDate", this.startTimeVale);
+        fd.append("endDate", this.endTimeVale);
+        fd.append("model", this.CarModekValue);
+        fd.append("version", this.versionValue);
+        const webapi = this.getWebApi;
+        this.$axios
+          .posts(webapi, fd)
+          .then(async (res) => {
+             console.log("导入条件：" + JSON.stringify(res));
+            if (res === "Success") {
+              if (this.isLt2M === "1" && this.isFileType === "1") {
+                this.$notify({
+                  title: "成功",
+                  message: "数据导入成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.stepList[1].status = "finish";
+                this.resultData.successMessage = "数据导入成功！";
+                this.stepsActive = 4;
+              }
+            } else {
+              this.stepList[0].status = "wait";
+              this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
+              this.resultData.errSize = 1;//保持大于0，用于控制错误数据下载按钮的可不可见
+              this.resultData.successMessage = "数据导入失败！";
+              this.stepsActive = 3;
+            }
+            this.$emit("status", "finish");
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      } else {
+        this.loading = false;
+        this.$message({
+          message: "未上传任何附件，请查检！",
+          type: "warning",
+        });
+      }
+    },
+
+   /**
+     * 下载错误模板
+     */
+    downloadErrData() {
+      let fileNameOfProject = this.resultData.errTemplate;
+      this.$axios
+        .BolbGets(
+          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+        )
+        .then((response) => {
+          if (fileNameOfProject.indexOf("_") != -1) {
+            let downName =
+              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
+              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+            downloadFile(response, downName);
+            this.$notify({
+              title: "成功",
+              message: "错误数据-导出成功！",
+              type: "success",
+              duration: 2000,
+            });
+          } else {
+            downloadFile(response, fileNameOfProject);
+            this.$notify({
+              title: "成功",
+              message: "错误数据-导出成功！",
+              type: "success",
+              duration: 2000,
+            });
+          }
+          this.listLoading = false;
+        })
+        .catch((error) => {
+          this.listLoading = false;
+        });
+    },
+    // 关闭操作
+    closeView() {
+      this.$emit("update:show", false);
+      this.$emit("close", this.stepsActive == 3 ? "finish" : "");
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "@/styles/xr-theme.scss";
+.el-steps {
+  margin-bottom: 15px;
+
+  /deep/ .el-step__title {
+    font-size: 14px;
+  }
+
+  /deep/ .el-step.is-simple .el-step__arrow::before,
+  /deep/ .el-step.is-simple .el-step__arrow::after {
+    height: 10px;
+    width: 2px;
+  }
+
+  /deep/ .el-step.is-simple .el-step__arrow::after {
+    transform: rotate(45deg) translateY(3px);
+  }
+  /deep/ .el-step.is-simple .el-step__arrow::before {
+    transform: rotate(-45deg) translateY(-2px);
+  }
+}
+
+.step-section {
+  min-height: 300px;
+
+  /deep/ .el-loading-spinner {
+    top: 45%;
+    .el-icon-loading {
+      font-size: 40px;
+      color: #999;
+    }
+
+    .el-loading-text {
+      color: #333;
+    }
+  }
+}
+
+.sections {
+  font-size: 14px;
+  color: #333;
+
+  &__title {
+    font-weight: 600;
+  }
+
+  &__tips {
+    padding-left: 30px;
+    margin: 8px 0 15px;
+    color: #999;
+    font-size: 12px;
+    line-height: 1.4;
+  }
+
+  .download {
+    cursor: pointer;
+    color: #2362fb;
+  }
+}
+
+.sections__tips + .content {
+  padding-top: 0;
+}
+
+.content {
+  padding: 10px 10px 10px 30px;
+  .el-select {
+    width: 400px;
+  }
+  .user-cell {
+    width: 400px;
+  }
+}
+
+#importInputFile {
+  display: none;
+}
+
+.file-select {
+  .el-input {
+    width: 400px;
+  }
+  button {
+    margin-left: 20px;
+  }
+}
+
+.is-hidden {
+  visibility: hidden;
+}
+
+.history-btn {
+  float: left;
+  margin-left: 15px;
+}
+
+// 结果信息
+.result-info {
+  text-align: center;
+  padding-top: 50px;
+
+  &__icon {
+    font-size: 40px;
+    color: $xr-color-primary;
+  }
+
+  &__des {
+    margin-top: -15px;
+    color: #333;
+    font-size: 30px;
+  }
+
+  &__detail {
+    margin-top: 35px;
+    font-size: 20px;
+    color: #666;
+    &--all {
+      color: #333;
+      font-weight: 600;
+    }
+
+    &--suc {
+      color: $xr-color-primary;
+      font-weight: 600;
+    }
+
+    &--err {
+      margin-top: 25px;
+      color: #f94e4e;
+      font-weight: 600;
+    }
+  }
+
+  &__btn--err {
+    margin-top: 10px;
+    font-size: 20px;
+  }
+}
+</style>
+
+
+
diff --git a/code/WebApp/vue/src/components/ImportTxt/index.vue b/code/WebApp/vue/src/components/ImportTxt/index.vue
index 8a2b1e7d..329a54bd 100644
--- a/code/WebApp/vue/src/components/ImportTxt/index.vue
+++ b/code/WebApp/vue/src/components/ImportTxt/index.vue
@@ -151,13 +151,13 @@
                 <span class="result-info__detail--all"
                   >{{ this.resultData.successMessage }}
                 </span>
-                <!-- <el-button
+                <el-button
                   v-if="this.resultData && this.resultData.errSize > 0"
                   class="result-info__btn--err"
                   type="text"
                   @click="downloadErrData"
                   >下载错误数据</el-button
-                > -->
+                >
               </p>
             </el-card>
           </div>
@@ -345,7 +345,6 @@ export default {
         {
           fis: "FIS发运数据",
           settleAccount: "R3数据",
-          AssemblyCfgERP:"总成SAP数据",
         }[this.crmType] || ""
       );
     },
@@ -353,8 +352,7 @@ export default {
       return (
         {
           fis: "/api/settleaccount/fis/ExcelImport",
-          settleAccount: "/api/settleaccount/SettleAccount/ExcelImport", 
-          AssemblyCfgERP:"/api/newjit/assembly-cfg-erp/import",
+          settleAccount: "/api/settleaccount/SettleAccount/ExcelImport",
         }[this.crmType] || ""
       );
     },
@@ -364,7 +362,6 @@ export default {
         {
           fis: "FIS发运数据导入模板.xlsx",
           settleAccount: "R3数据模板.xlsx",
-          AssemblyCfgERP:"BOM-批量导入模板.txt",
         }[this.crmType] || ""
       );
     },
@@ -427,7 +424,7 @@ export default {
       this.factoryList = [];
       // this.listQuery.SkipCount = (this.page - 1) * 500;
       this.$axios
-        .posts("/api/newjit/assembly-cfg-erp/import")
+        .posts("/api/settleaccount/CentralizedControl/openlist")
         .then((response) => {
           response.forEach((element) => {
             let options = {};
@@ -440,25 +437,25 @@ export default {
           this.listLoading = false;
         });
     },
-    // getAllCarModel() {
-    //   //取车型列表信息
-    //   this.carModelList = [];
-    //   this.listQueryCustom.SkipCount = (this.page - 1) * 500;
-    //   console.log(JSON.stringify(this.listQueryCustom));
-    //   this.$axios
-    //     .posts("/api/settleaccount/CodeSetting/list", this.listQueryCustom)
-    //     .then((response) => {
-    //       response.items.forEach((element) => {
-    //         let options = {};
-    //         options.value = element.value;
-    //         options.label = element.description;
-    //         this.carModelList.push(options);
-    //       });
-    //     })
-    //     .catch(() => {
-    //       this.listLoading = false;
-    //     });
-    // },
+    getAllCarModel() {
+      //取车型列表信息
+      this.carModelList = [];
+      this.listQueryCustom.SkipCount = (this.page - 1) * 500;
+      console.log(JSON.stringify(this.listQueryCustom));
+      this.$axios
+        .posts("/api/settleaccount/CodeSetting/list", this.listQueryCustom)
+        .then((response) => {
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.value;
+            options.label = element.description;
+            this.carModelList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
     handleImportExcelClick() {
       //父组件中，初始化此子组件时调用
       this.fileuploadList = [];
@@ -503,6 +500,10 @@ export default {
     },
     //执行按钮
     sureClick() {
+      if (this.versionValue == "") {
+        this.$message.error("必须选择版本！");
+        return false;
+      }
       if (this.startTimeVale && this.endTimeVale) {
         if (
           formatTimeToTimestamp(this.startTimeVale) >=
@@ -563,48 +564,24 @@ export default {
           .posts(webapi, fd)
           .then(async (res) => {
             console.log("导入条件：" + JSON.stringify(res));
-            if(this.crmType !== "AssemblyCfgERP"){
-              if (res === "Success") {
-                if (this.isLt2M === "1" && this.isFileType === "1") {
-                  this.$notify({
-                    title: "成功",
-                    message: "数据导入成功！",
-                    type: "success",
-                    duration: 2000,
-                  });
-                  this.stepList[1].status = "finish";
-                  this.resultData.successMessage = "数据导入成功！";
-                  this.stepsActive = 4;
-                }
-              } else {
-                this.stepList[0].status = "wait";
-                this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
-                this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见
-                this.resultData.successMessage = "数据导入失败！";
-                this.stepsActive = 3;
-              }
-            }
-            else{
-                console.log(res.status)
-              if (res.status === true) {
-                if (this.isLt2M === "1" && this.isFileType === "1") {
-                  this.$notify({
-                    title: "成功",
-                    message: "数据导入成功！",
-                    type: "success",
-                    duration: 2000,
-                  });
-                  this.stepList[1].status = "finish";
-                  this.resultData.successMessage = "数据导入成功！";
-                  this.stepsActive = 4;
-                }
-              } else {
-                this.stepList[0].status = "wait";
-                this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
-                this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见
-                this.resultData.successMessage = res.message;
-                this.stepsActive = 3;
+            if (res === "Success") {
+              if (this.isLt2M === "1" && this.isFileType === "1") {
+                this.$notify({
+                  title: "成功",
+                  message: "数据导入成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.stepList[1].status = "finish";
+                this.resultData.successMessage = "数据导入成功！";
+                this.stepsActive = 4;
               }
+            } else {
+              this.stepList[0].status = "wait";
+              this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
+              this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见
+              this.resultData.successMessage = "数据导入失败！";
+              this.stepsActive = 3;
             }
             this.$emit("status", "finish");
             this.loading = false;
diff --git a/code/WebApp/vue/src/components/ImportTxt/index525.rar b/code/WebApp/vue/src/components/ImportTxt/index525.rar
new file mode 100644
index 00000000..0f68f14f
Binary files /dev/null and b/code/WebApp/vue/src/components/ImportTxt/index525.rar differ
diff --git a/code/WebApp/vue/src/components/Pagination/index.vue b/code/WebApp/vue/src/components/Pagination/index.vue
index ac5fe9f0..a7324e3c 100644
--- a/code/WebApp/vue/src/components/Pagination/index.vue
+++ b/code/WebApp/vue/src/components/Pagination/index.vue
@@ -35,7 +35,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [15, 50, 100, 500]
+        return [15, 200, 300, 500]
       }
     },
     layout: {
diff --git a/code/WebApp/vue/src/components/PasteExcel/index.vue b/code/WebApp/vue/src/components/PasteExcel/index.vue
deleted file mode 100644
index efb85e6b..00000000
--- a/code/WebApp/vue/src/components/PasteExcel/index.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-  <el-dialog v-loading="loading" @close="hiddenView">
-    <flexbox class="content">
-      <div class="book">
-        <el-input type="text" v-model="paster" @paste.native="pasteMe" />
-        <el-table :data="tableData">
-          <el-table-column
-            prop="name"
-            label="说明：只支持从Excel上粘贴复制，不支持手输！"
-            width="120"
-          >
-          </el-table-column>
-        </el-table>
-      </div>
-    </flexbox>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submiteBillNo()">确定录入</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-
-
-<script>
-export default {
-  props: {
-    typeName: {
-      type: String,
-      default: "",
-    },
-  },
-  data() {
-    return {
-      loading: false,
-      paster: "",
-      pasterValue: "",
-      tableData: [
-        {
-          name: "单据号",
-        },
-      ],
-    };
-  },
-  methods: {
-    submiteBillNo() {
-      var getbillNo = this.pasterValue.substring(
-        0,
-        this.pasterValue.length - 1
-      );
-      this.$emit("savebillNo", { biilNo: getbillNo, billName: this.typeName });
-      this.hiddenView();
-    },
-    hiddenView() {
-      this.$emit("close");
-    },
-    pasteMe(e) {
-      let source = e.clipboardData.getData("Text");
-      // 首先对源头进行解析
-      let rows = source.split("\r\n"); // 拆成很多行
-      this.pasterValue = "";
-      for (let i = 0; i < rows.length; i++) {
-        if (rows[i] != "") {
-          // 如果某一行不是空，再按列拆分
-          let columns = rows[i].split("\t"); // 已经按列划分
-          // console.log(columns);
-          let dataone = {}; // 声明一行数组
-          for (let j = 0; j < columns.length; j++) {
-            // 读取tableData里的第j对应的key值
-            let keys = Object.keys(this.tableData[j]); // key的名
-            dataone[keys[j]] = columns[j];
-            this.pasterValue += columns[j] + ",";
-          }
-          this.tableData.push(dataone);
-          console.log(this.tableData);
-        }
-      }
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.book {
-  width: 50%;
-  height: 400px;
-  border: 1px solid red;
-  margin: 0 auto;
-  margin-top: 50px;
-  overflow-y: scroll;
-}
-.el-input__inner {
-  height: 100px !important;
-}
-</style>
diff --git a/code/WebApp/vue/src/components/UploadFiles/index.vue b/code/WebApp/vue/src/components/UploadFiles/index.vue
new file mode 100644
index 00000000..cbc71d9a
--- /dev/null
+++ b/code/WebApp/vue/src/components/UploadFiles/index.vue
@@ -0,0 +1,594 @@
+<template>
+  <el-dialog
+    :visible="show"
+    :title="'导入' + crmTypeName"
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    width="600px"
+    @close="closeView"
+  >
+    <div class="dialog-body">
+      <div v-if="stepsActive == 1" class="step-section">
+        <div class="sections">
+          <div class="sections__title" v-loading="loading">
+            一、导入说明：
+            <div class="sections__tips">
+              1、提供的导入模板需要文本格式，即.txt文件格式！
+            </div>
+            <div class="sections__tips">
+              2、请勿删除模板中设置的字段！
+            </div>
+            <div class="sections__tips">3、导入文件大小请勿超过100MB！</div>
+          </div>
+        </div>
+        <div class="sections">
+          <div class="sections__title">
+            二、导入条件设置（年、月，工厂，无则不用设置）。
+          </div>
+          <div class="sections__tips">
+            <span class="demonstration">选择年份：</span>
+            <el-date-picker
+              v-model="yeareVale"
+              style="width: 188px"
+              type="year"
+              format="yyyy 年"
+              value-format="yyyy"
+              placeholder="选择年"
+            >
+            </el-date-picker>
+            <span class="demonstration">选择月份：</span>
+            <el-date-picker
+              v-model="monthVale"
+              style="width: 188px"
+              type="month"
+              format=" MM 月"
+              value-format="MM"
+              placeholder="选择月"
+            >
+            </el-date-picker>
+          </div>
+          <div class="sections__tips">
+            <span class="demonstration">选择工厂：</span>
+            <el-select
+              v-model="selectValue"
+              clearable
+              style="width: 188px"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in factoryList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="sections">
+          <div class="sections__title">三、请选择需要导入的文件</div>
+          <div class="content">
+            <flexbox class="file-select">
+              <el-upload
+                ref="upload"
+                class="avatar-uploader"
+                drag
+                action="#"
+                :http-request="httpRequestfiles"
+                :headers="httpHeader"
+                :file-list="fileuploadList"
+                :before-upload="beforeAvatarUpload"
+                :before-remove="beforeRemove"
+                :on-remove="handleRemove"
+                multiple
+                :limit="1"
+              >
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+                </div>
+              </el-upload>
+            </flexbox>
+          </div>
+        </div>
+      </div>
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 2"
+        element-loading-text="数据导入中,请耐心等待..."
+        element-loading-spinner="el-icon-loading"
+        class="step-section"
+      />
+
+      <div
+        v-loading="loading"
+        v-else-if="stepsActive == 3"
+        class="step-section"
+      >
+        <div class="result-info">
+          <el-card style="height: 300px; margin-top: -20px" shadow="always">
+            <i class="wk wk-success result-info__icon" />
+            <p class="result-info__detail">
+              导入成功数据：
+              <span class="result-info__detail--all"
+                >{{ this.resultData.totalSize }} </span
+              >条有效数据！
+            </p>
+          </el-card>
+        </div>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-popover
+        v-model="historyPopoverShow"
+        placement="top"
+        width="800"
+        popper-class="no-padding-popover"
+        trigger="click"
+      >
+      </el-popover>
+
+      <!-- <el-button  @click="closeView">取消</el-button> -->
+      <el-button :class="{ 'is-hidden': !showCancel }" @click="closeView"
+        >取消</el-button
+      >
+      <el-button v-if="sureTitle" type="primary" @click="sureClick">{{
+        sureTitle
+      }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { downloadFile } from "@/utils/crmindex.js";
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+export default {
+  name: "CRMImport", // 文件导入
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    // CRM类型
+    crmType: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      fieldList: [],
+      factoryList: [], //工厂列表
+      selectValue: [], //工厂选择项
+      config: 1, // 	1 覆盖，2跳过
+      //file: { name: "" },
+      page: 1,
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "description",
+            action: 0,
+            value: "工厂",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+
+      stepsActive: 1,
+      stepList: [
+        {
+          icon: "wk wk-upload",
+          title: "上传文件",
+          status: "wait",
+        },
+        {
+          icon: "wk wk-data-import",
+          title: "导入数据",
+          status: "wait",
+        },
+        {
+          icon: "wk wk-success",
+          title: "导入完成",
+          status: "wait",
+        },
+      ],
+      //resultData: null,
+      resultData: {
+        totalSize: 0,
+        errSize: 0,
+        errTemplate: "",
+        errMessage: "",
+      },
+      processData: {
+        count: 0,
+        status: "",
+      },
+      messageId: null,
+      intervalTimer: null,
+      fileuploadList: [],
+      isLt2M: "",
+      isFileType: "",
+      historyPopoverShow: false,
+      yeareVale: "",
+      monthVale: "",
+    };
+  },
+  computed: {
+    sureTitle() {
+      return {
+        1: "立即导入",
+        2: "最小化",
+        3: "确定",
+      }[this.stepsActive];
+    },
+    showCancel() {
+      return this.stepsActive != 2;
+    },
+    crmTypeName() {
+      return (
+        {
+          fis: "FIS发运数据",
+          materialRelation: "零件匹配关系",
+          material: "物料主数据",
+          inventorydetail: "库存明细",
+          codeSetting: "通用代码设置",
+          estimatedSum: "应付暂估汇总",
+          estimatedInventoryDetail: "应付暂估收货明细",
+        }[this.crmType] || ""
+      );
+    },
+    getWebApi() {
+      return (
+        {
+          fis: "/api/settleaccount/FIS/ExcelImport",
+          materialRelation: "/api/settleaccount/materialRelation/ExcelImport",
+          material: "/api/settleaccount/material/ExcelImport",
+          inventorydetail: "/api/settleaccount/InventoryDetail​/ExcelImport",
+          codeSetting: "/api/settleaccount/CodeSetting/ExcelImport",
+          estimatedSum: "/api/settleaccount/EstimatedSum/ExcelImport",
+          estimatedInventoryDetail:
+            "/api/settleaccount/EstimatedInventoryDetail/ExcelImport",
+        }[this.crmType] || ""
+      );
+    },
+    httpHeader() {
+      //文件上传时，带token认证信息，提高安全性
+      return {
+        Authorization: "Bearer " + getToken(),
+      };
+    },
+  },
+  watch: {
+    show: function (val) {
+      this.getAllFactory();
+      if (val) {
+        this.stepsActive = 1;
+      } else {
+        if (this.stepsActive == 3) {
+          //以下是重置数据
+          this.stepsActive = 1;
+          this.stepList = [
+            {
+              icon: "wk wk-upload",
+              title: "上传文件",
+              status: "wait",
+            },
+            {
+              icon: "wk wk-data-import",
+              title: "导入数据",
+              status: "wait",
+            },
+            {
+              icon: "wk wk-success",
+              title: "导入完成",
+              status: "wait",
+            },
+          ];
+          this.resultData = null;
+        }
+      }
+    },
+
+    stepsActive() {
+      this.$emit(
+        "status",
+        {
+          1: "wait",
+          2: "process",
+          3: "finish",
+        }[this.stepsActive]
+      );
+    },
+  },
+  mounted() {},
+  methods: {
+    getAllFactory() {
+      //取工厂列表信息
+      this.factoryList = [];
+      this.listQuery.SkipCount = (this.page - 1) * 500;
+      this.$axios
+        .posts("/api/settleaccount/CodeSetting/list", this.listQuery)
+        .then((response) => {
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.project;
+            options.label = element.value;
+            this.factoryList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleImportExcelClick() {
+      //父组件中，初始化此子组件时调用
+      this.fileuploadList = [];
+      //this.$refs.upload.clearFiles();
+    },
+    httpRequestfiles(data) {
+      let _this = this;
+      let rd = new FileReader(); // 创建文件读取对象
+      let file = data.file;
+      this.fileuploadList.push(file);
+      rd.readAsDataURL(file); // 文件读取装换为base64类型
+    },
+    beforeAvatarUpload(file) {
+      var FileExt = file.name.replace(/.+\./, "");
+      if (["txt"].indexOf(FileExt.toLowerCase()) === -1) {
+        this.$message({
+          type: "warning",
+          message: "只支持文本txt类型文件！",
+        });
+        this.isFileType = "0";
+        return false;
+      } else {
+        this.isFileType = "1";
+      }
+      this.isLt2M = file.size / 1024 / 1024 < 100 ? "1" : "0";
+      if (this.isLt2M === "0") {
+        this.$message.error("上传文件大小不能超过 100MB!");
+      }
+      return this.isLt2M === "1" ? true : false;
+    },
+    beforeRemove(file, fileList) {
+      if (this.isLt2M === "1" && this.isFileType === "1") {
+        return this.$confirm(`确定移除 ${file.name}？`);
+      }
+    },
+    handleRemove(file, fileList) {
+      //附件列表删除操作
+      const index = this.fileuploadList.indexOf(file.originFileObj);
+      const newFileList = this.fileuploadList.slice();
+      newFileList.splice(index, 1);
+      this.fileuploadList = newFileList;
+    },
+    //执行按钮
+    sureClick() {
+      if (
+        this.fileuploadList === [] ||
+        JSON.stringify(this.fileuploadList) === "[]"
+      ) {
+        this.$message.error("请选择导入文件");
+        return false;
+      }
+      if (this.stepsActive == 1) {
+        if (this.stepList[0].status == "wait") {
+          this.stepsActive = 2;
+          this.loading = true;
+          setTimeout(() => {
+            this.saveTemplateData();
+          }, 1000);
+          if (this.stepList[1].status == "finish") {
+          }
+        } else {
+          if (this.fileuploadList === "[]") {
+            this.$message.error("请选择导入文件");
+          }
+        }
+      } else {
+        this.closeView();
+      }
+    },
+
+    saveTemplateData() {
+      //保存项目、合同管理、客户等信息的共用方法
+      //--上传附件，批量或拖拽
+      if (JSON.stringify(this.fileuploadList) != "[]") {
+        let fd = new FormData();
+        const { fileuploadList } = this;
+        fileuploadList.forEach((file) => {
+          fd.append("files", file); // 添加文件
+        });
+        fd.append("yeareVale", this.yeareVale);
+        fd.append("monthVale", this.monthVale);
+        const webapi = this.getWebApi;
+        this.$axios
+          .posts(webapi, fd)
+          .then((res) => {
+            //此处，导出模板上设置的错误
+            this.loading = false;
+            this.resultData = res;
+            this.stepList[1].status = "finish";
+            this.resultData.totalSize = res.length; //返回导入成功的数据总数
+            if (
+              this.isLt2M === "1" &&
+              this.isFileType === "1" &&
+              res.totalSize > 0
+            ) {
+              this.$notify({
+                title: "成功",
+                message: "数据导入成功！",
+                type: "success",
+                duration: 2000,
+              });
+            }
+            this.stepsActive = 3;
+            this.$emit("status", "finish");
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      } else {
+        this.loading = false;
+        this.$message({
+          message: "未上传任何附件，请查检！",
+          type: "warning",
+        });
+      }
+    },
+    // 关闭操作
+    closeView() {
+      this.$emit("update:show", false);
+      this.$emit("close", this.stepsActive == 3 ? "finish" : "");
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "@/styles/xr-theme.scss";
+.el-steps {
+  margin-bottom: 15px;
+
+  /deep/ .el-step__title {
+    font-size: 14px;
+  }
+
+  /deep/ .el-step.is-simple .el-step__arrow::before,
+  /deep/ .el-step.is-simple .el-step__arrow::after {
+    height: 10px;
+    width: 2px;
+  }
+
+  /deep/ .el-step.is-simple .el-step__arrow::after {
+    transform: rotate(45deg) translateY(3px);
+  }
+  /deep/ .el-step.is-simple .el-step__arrow::before {
+    transform: rotate(-45deg) translateY(-2px);
+  }
+}
+
+.step-section {
+  min-height: 300px;
+
+  /deep/ .el-loading-spinner {
+    top: 45%;
+    .el-icon-loading {
+      font-size: 40px;
+      color: #999;
+    }
+
+    .el-loading-text {
+      color: #333;
+    }
+  }
+}
+
+.sections {
+  font-size: 14px;
+  color: #333;
+
+  &__title {
+    font-weight: 600;
+  }
+
+  &__tips {
+    padding-left: 30px;
+    margin: 8px 0 15px;
+    color: #999;
+    font-size: 12px;
+    line-height: 1.4;
+  }
+
+  .download {
+    cursor: pointer;
+    color: #2362fb;
+  }
+}
+
+.sections__tips + .content {
+  padding-top: 0;
+}
+
+.content {
+  padding: 10px 10px 10px 30px;
+  .el-select {
+    width: 400px;
+  }
+  .user-cell {
+    width: 400px;
+  }
+}
+
+#importInputFile {
+  display: none;
+}
+
+.file-select {
+  .el-input {
+    width: 400px;
+  }
+  button {
+    margin-left: 20px;
+  }
+}
+
+.is-hidden {
+  visibility: hidden;
+}
+
+.history-btn {
+  float: left;
+  margin-left: 15px;
+}
+
+// 结果信息
+.result-info {
+  text-align: center;
+  padding-top: 50px;
+
+  &__icon {
+    font-size: 40px;
+    color: $xr-color-primary;
+  }
+
+  &__des {
+    margin-top: -15px;
+    color: #333;
+    font-size: 30px;
+  }
+
+  &__detail {
+    margin-top: 35px;
+    font-size: 20px;
+    color: #666;
+    &--all {
+      color: #333;
+      font-weight: 600;
+    }
+
+    &--suc {
+      color: $xr-color-primary;
+      font-weight: 600;
+    }
+
+    &--err {
+      margin-top: 25px;
+      color: #f94e4e;
+      font-weight: 600;
+    }
+  }
+
+  &__btn--err {
+    margin-top: 10px;
+    font-size: 20px;
+  }
+}
+</style>
+
+
+
diff --git a/code/WebApp/vue/src/directive/scrollx/index.js b/code/WebApp/vue/src/directive/scrollx/index.js
deleted file mode 100644
index c985d24b..00000000
--- a/code/WebApp/vue/src/directive/scrollx/index.js
+++ /dev/null
@@ -1,136 +0,0 @@
-
-// 盒子滚动条拖拽
-import { on, off } from '@/utils/dom'
-import Vue from 'vue'
-import { debounce } from 'throttle-debounce'
-
-let targetDrag = { // 托拽
-  isDown: false,
-  coord: {
-    x: 0,
-    y: 0
-  }
-}
-
-let dom = null
-let ignoreClass = [] // 忽略的类名
-
-const scrollMousedown = event => {
-  dom.style.cursor = 'pointer'
-  targetDrag.isDown = true
-  targetDrag.coord.x = event.pageX
-  targetDrag.coord.y = event.pageY
-}
-
-const scrollMouseup = event => {
-  dom.style.cursor = 'default'
-  targetDrag.isDown = false
-  targetDrag.coord.x = 0
-  targetDrag.coord.y = 0
-}
-
-const scrollMousemove = event => {
-  const movX = targetDrag.coord.x - event.pageX
-  targetDrag.coord.x = event.pageX
-  if (checkDomIsIgnore(event)) {
-    dom.style.cursor = 'default'
-    targetDrag.isDown = false
-  } else if (targetDrag.isDown) {
-    dom.scrollLeft = dom.scrollLeft + movX
-  }
-}
-
-const scrollMouseout = event => {
-  dom.style.cursor = 'default'
-  targetDrag.isDown = false
-}
-
-const scrollMousewheel = event => {
-  if (checkIsIgnore(event)) {
-    dom.style.cursor = 'default'
-    targetDrag.isDown = false
-  } else {
-    dom.scrollLeft += event.deltaY
-  }
-}
-
-/**
- * 检查dom是否忽略
- * @param {*} e
- */
-const checkDomIsIgnore = debounce(300, (e) => {
-  let ignore = false
-  ignoreClass.forEach(element => {
-    var items = document.getElementsByClassName(element)
-    if (items && !ignore) {
-      for (let index = 0; index < items.length; index++) {
-        const element = items[index]
-        if (element.contains(e.target)) {
-          ignore = true
-          break
-        }
-      }
-    }
-  })
-  return ignore
-})
-
-/**
- * 忽略滚轮
- * @param {*} e
- */
-const checkIsIgnore = (e) => {
-  let ignore = false
-  ignoreClass.forEach(element => {
-    var items = document.getElementsByClassName(element)
-    if (items && !ignore) {
-      for (let index = 0; index < items.length; index++) {
-        const element = items[index]
-        const rect = element.getBoundingClientRect()
-        if ((e.clientY > rect.top && (e.clientY < (rect.top + rect.height))) && (e.clientX > rect.left && (e.clientX < (rect.left + rect.width)))) {
-          ignore = true
-          break
-        }
-      }
-    }
-  })
-  return ignore
-}
-
-export default Vue.directive('scrollx', {
-  bind: function(el, binding, vnode) {
-    const valueData = binding.value
-    ignoreClass = valueData.ignoreClass
-  },
-
-  inserted: function(el) {
-    dom = el
-
-    // 鼠标按下
-    on(el, 'mousedown', scrollMousedown)
-    on(el, 'mouseout', scrollMouseout)
-    on(el, 'wheel', scrollMousewheel)
-    // 鼠标释放
-    on(el, 'mouseup', scrollMouseup)
-    // 鼠标托拽
-    on(el, 'mousemove', scrollMousemove)
-  },
-
-  unbind: function(el) {
-    off(el, 'mousedown', scrollMousedown)
-    off(el, 'mouseup', scrollMouseup)
-    off(el, 'mouseout', scrollMouseout)
-    off(el, 'wheel', scrollMousewheel)
-    off(el, 'mousemove', scrollMousemove)
-
-    // 清空
-    targetDrag = { // 托拽
-      isDown: false,
-      coord: {
-        x: 0,
-        y: 0
-      }
-    }
-  }
-})
-
diff --git a/code/WebApp/vue/src/icons/svg/BOM.svg b/code/WebApp/vue/src/icons/svg/BOM.svg
deleted file mode 100644
index 2bd7ac43..00000000
--- a/code/WebApp/vue/src/icons/svg/BOM.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622532176185" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4873" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M512 70.656c59.392 0 117.76 11.264 172.032 34.816 52.224 22.528 99.328 54.272 140.288 94.208 40.96 40.96 72.704 88.064 94.208 140.288 22.528 54.272 34.816 111.616 34.816 172.032 0 59.392-11.264 117.76-34.816 172.032-22.528 52.224-54.272 99.328-94.208 140.288-40.96 40.96-88.064 72.704-140.288 94.208-54.272 23.552-112.64 34.816-172.032 34.816-59.392 0-117.76-11.264-172.032-34.816-52.224-22.528-99.328-54.272-140.288-94.208-40.96-40.96-72.704-88.064-94.208-140.288-22.528-54.272-34.816-112.64-34.816-172.032 0-59.392 11.264-117.76 34.816-172.032 22.528-52.224 54.272-99.328 94.208-140.288 40.96-40.96 88.064-72.704 140.288-94.208 55.296-22.528 112.64-34.816 172.032-34.816M512 20.48C240.64 20.48 20.48 240.64 20.48 512s220.16 491.52 491.52 491.52 491.52-220.16 491.52-491.52S783.36 20.48 512 20.48z m0 0" fill="#8a8a8a" p-id="4874"></path><path d="M88.064 672.768V377.856h114.688c19.456 0 35.84 2.048 48.128 6.144 13.312 4.096 23.552 12.288 33.792 25.6 9.216 13.312 14.336 27.648 14.336 45.056 0 16.384-5.12 30.72-14.336 43.008-9.216 12.288-22.528 19.456-38.912 23.552 20.48 4.096 36.864 12.288 47.104 25.6 10.24 13.312 16.384 28.672 16.384 47.104 0 22.528-7.168 41.984-22.528 57.344-15.36 15.36-37.888 23.552-68.608 23.552H88.064zM138.24 501.76h64.512c13.312 0 23.552-4.096 31.744-12.288 8.192-8.192 11.264-18.432 11.264-30.72 0-13.312-4.096-23.552-13.312-29.696-9.216-6.144-19.456-9.216-30.72-9.216h-63.488v81.92z m0 126.976h68.608c14.336 0 25.6-4.096 34.816-11.264 8.192-7.168 12.288-18.432 12.288-30.72s-4.096-22.528-13.312-30.72c-8.192-8.192-19.456-12.288-33.792-12.288h-68.608v84.992zM465.92 677.888c-38.912 0-69.632-14.336-91.136-44.032s-32.768-65.536-32.768-108.544c0-43.008 11.264-78.848 34.816-107.52s54.272-43.008 92.16-43.008 68.608 14.336 91.136 43.008c22.528 28.672 33.792 65.536 33.792 108.544 0 46.08-11.264 81.92-34.816 110.592-24.576 26.624-55.296 40.96-93.184 40.96z m0-43.008c19.456 0 35.84-8.192 49.152-23.552 13.312-15.36 19.456-45.056 19.456-86.016 0-33.792-5.12-60.416-16.384-79.872-11.264-19.456-27.648-28.672-51.2-28.672-46.08 0-68.608 36.864-68.608 110.592 0 35.84 6.144 62.464 17.408 80.896 12.288 17.408 28.672 26.624 50.176 26.624zM931.84 672.768h-54.272V414.72l-81.92 258.048H768l-81.92-258.048v258.048h-43.008V377.856h82.944l61.44 190.464 60.416-190.464H931.84v294.912z" fill="#8a8a8a" p-id="4875"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/业务.svg b/code/WebApp/vue/src/icons/svg/业务.svg
deleted file mode 100644
index 6e92d16b..00000000
--- a/code/WebApp/vue/src/icons/svg/业务.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622537264732" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14720" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M74.752 898.56h875.008v32.768H74.752v-32.768zM136.704 791.04h99.328c34.816 0 62.976-28.16 62.976-62.464v-198.656c0-34.816-28.16-62.464-62.976-62.464H136.704c-34.816 0-62.464 28.16-62.464 62.464v198.656c0 34.304 28.16 62.464 62.464 62.464z m-30.208-261.12c0-16.896 13.312-30.208 30.208-30.208h99.328c16.896 0 30.208 13.312 30.208 30.208v198.656c0 16.896-13.312 30.208-30.208 30.208H136.704c-16.896 0-30.208-13.312-30.208-30.208v-198.656zM462.336 791.04h99.328c34.816 0 62.464-28.16 62.464-62.464V156.16c0-34.816-28.16-62.464-62.464-62.464H462.336c-34.816 0-62.464 28.16-62.464 62.464v572.416c-0.512 34.304 27.648 62.464 62.464 62.464zM432.128 155.648c0-16.896 13.312-30.208 30.208-30.208h99.328c16.896 0 30.208 13.312 30.208 30.208v572.416c0 16.896-13.312 30.208-30.208 30.208H462.336c-16.896 0-30.208-13.312-30.208-30.208V155.648zM787.456 791.04h99.328c34.816 0 62.464-28.16 62.464-62.464V325.632c0-34.816-28.16-62.464-62.464-62.464h-99.328c-34.816 0-62.464 28.16-62.464 62.464v402.432c0 34.816 28.16 62.976 62.464 62.976z m-30.208-465.408c0-16.896 13.312-30.208 30.208-30.208h99.328c16.896 0 30.208 13.312 30.208 30.208v402.432c0 16.896-13.312 30.208-30.208 30.208h-99.328c-16.896 0-30.208-13.312-30.208-30.208V325.632z" fill="" p-id="14721"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/供货.svg b/code/WebApp/vue/src/icons/svg/供货.svg
deleted file mode 100644
index 387a1e2b..00000000
--- a/code/WebApp/vue/src/icons/svg/供货.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622602045529" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5042" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css"></style></defs><path d="M827.164911 686.308303h-574.257967a25.678202 25.678202 0 1 1 0-51.356404h574.257967a30.440341 30.440341 0 0 0 30.767155-25.818265l60.13368-293.478502c-1.447317-9.337528-13.44604-19.18862-30.206903-19.18862h-686.308303a25.678202 25.678202 0 0 1 0-51.356404h686.308303c45.053572 0 81.703369 32.681348 81.703369 72.459217a25.398076 25.398076 0 0 1-0.513564 5.13564l-60.693931 296.279761A81.703369 81.703369 0 0 1 827.164911 686.308303z m116.719099-368.832354z" fill="#5BBD0E" p-id="5043"></path><path d="M224.847672 519.446679a25.678202 25.678202 0 0 1-25.3047-21.56969l-51.356404-317.475949a25.724889 25.724889 0 0 1-0.326813-4.108513c0-13.25929-14.006292-24.464323-30.346966-24.464323h-51.356404a25.678202 25.678202 0 1 1 0-51.356404h51.356404c44.213195 0 80.349428 32.681348 81.656682 73.533033l51.076277 315.655131a25.678202 25.678202 0 0 1-21.476314 29.459901 25.958328 25.958328 0 0 1-3.921762 0.326814z" fill="#5BBD0E" p-id="5044"></path><path d="M906.533899 817.033694h-592.933024c-40.571559 0-73.999909-29.366525-81.329868-71.432089v-0.933753l-65.362695-476.213924A25.678202 25.678202 0 1 1 217.657776 261.450782l65.362695 475.793735c2.427757 13.212602 11.85866 28.47946 30.67378 28.479461h592.933023a25.678202 25.678202 0 0 1 0 51.356403z" fill="#5BBD0E" p-id="5045"></path><path d="M357.954133 924.415265m-56.025168 0a56.025168 56.025168 0 1 0 112.050336 0 56.025168 56.025168 0 1 0-112.050336 0Z" fill="#5BBD0E" p-id="5046"></path><path d="M824.830529 924.415265m-56.025167 0a56.025168 56.025168 0 1 0 112.050335 0 56.025168 56.025168 0 1 0-112.050335 0Z" fill="#5BBD0E" p-id="5047"></path><path d="M876.186933 653.626955l-625.614371 9.337528-46.68764-368.832353h718.989651l-46.68764 359.494825z" fill="#5BBD0D" p-id="5048"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/单据导入.svg b/code/WebApp/vue/src/icons/svg/单据导入.svg
deleted file mode 100644
index 59012d4e..00000000
--- a/code/WebApp/vue/src/icons/svg/单据导入.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622535513697" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10088" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css"></style></defs><path d="M457.6 996.4H134.2C60.2 996.4 0 936.3 0 862.2V160.4c0-74 60.2-134.2 134.2-134.2h623.7c74 0 134.2 60.2 134.2 134.2v232.9c0 11.3-9.3 20.6-20.6 20.6s-20.6-9.3-20.6-20.6V160.4c0-51.4-41.6-93.1-93.1-93.1H134.2c-51.4 0-93.1 41.6-93.1 93.1v701.8c0 51.4 41.6 93.1 93.1 93.1h323.4c11.3 0 20.6 9.3 20.6 20.6s-9.3 20.5-20.6 20.5z m0 0" fill="#3f81c1" p-id="10089"></path><path d="M1023.7 595.4c0-0.5 0-0.5 0 0 1.5-7.7-0.5-15.9-6.2-21.6L911.1 470.4l-1.5-1.5c-0.5-0.5-1-1-2.1-1.5-0.5-0.5-1.5-0.5-2.1-1-0.5-0.5-1-0.5-2.1-1-0.5-0.5-1.5-0.5-2.1-0.5-0.5 0-1.5-0.5-2.1-0.5H890c-1 0-1.5 0.5-2.1 0.5s-1.5 0.5-2.1 0.5c-0.5 0.5-1.5 0.5-2.1 1-0.5 0.5-1 0.5-1.5 1s-1.5 1-2.1 1.5c-0.5 0.5-1 0.5-1.5 1L533.2 815.4c-3.1 3.1-5.1 6.7-5.7 10.8 0 0.5-0.5 1-0.5 1.5-3.6 14.9-16.5 75.1 1.5 110l1.5 3.1 2.6 2.6c12.9 12.9 33.4 17 56 17 19.5 0 41.1-3.1 61.7-5.7 4.6-0.5 9.3-1 13.4-2.1 0 0 6.2-4.1 8.7-6.7l345-339.9c2.6-2.6 4.1-5.1 5.1-8.2 0.7-0.4 1.2-1.4 1.2-2.4zM645.3 909.5" fill="#3f81c1" p-id="10090"></path><path d="M743.5 284.3H281.8c-11.3 0-20.6-9.3-20.6-20.6s9.3-20.6 20.6-20.6h461.7c11.3 0 20.6 9.3 20.6 20.6-0.1 11.4-9.3 20.6-20.6 20.6z m0 0M605.7 588.7H281.8c-11.3 0-20.6-9.3-20.6-20.6s9.3-20.6 20.6-20.6h323.9c11.3 0 20.6 9.3 20.6 20.6-0.1 11.4-9.3 20.6-20.6 20.6z m0 0M522.9 740.4H281.8c-11.3 0-20.6-9.3-20.6-20.6s9.3-20.6 20.6-20.6h241.1c11.3 0 20.6 9.3 20.6 20.6s-8.8 20.6-20.6 20.6z m0 0M743.5 436.5H281.8c-11.3 0-20.6-9.3-20.6-20.6s9.3-20.6 20.6-20.6h461.7c11.3 0 20.6 9.3 20.6 20.6-0.1 11.4-9.3 20.6-20.6 20.6z m0 0M180.5 286.4h-29.3c-11.3 0-20.6-9.3-20.6-20.6s9.3-20.6 20.6-20.6h29.3c11.3 0 20.6 9.3 20.6 20.6-0.1 11.3-9.3 20.6-20.6 20.6z m0 0M180.5 436.5h-29.3c-11.3 0-20.6-9.3-20.6-20.6s9.3-20.6 20.6-20.6h29.3c11.3 0 20.6 9.3 20.6 20.6-0.1 11.4-9.3 20.6-20.6 20.6z m0 0M180.5 599.5h-29.3c-11.3 0-20.6-9.3-20.6-20.6s9.3-20.6 20.6-20.6h29.3c11.3 0 20.6 9.3 20.6 20.6-0.1 11.3-9.3 20.6-20.6 20.6z m0 0M180.5 740.4h-29.3c-11.3 0-20.6-9.3-20.6-20.6s9.3-20.6 20.6-20.6h29.3c11.3 0 20.6 9.3 20.6 20.6-0.1 11.3-9.3 20.6-20.6 20.6z m0 0" fill="#3f81c1" p-id="10091"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/发货.svg b/code/WebApp/vue/src/icons/svg/发货.svg
deleted file mode 100644
index 69bd4674..00000000
--- a/code/WebApp/vue/src/icons/svg/发货.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622601685053" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2526" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css"></style></defs><path d="M806.787879 667.151515a93.090909 93.090909 0 1 1 0 186.181818 93.090909 93.090909 0 0 1 0-186.181818z m-480.969697 0a93.090909 93.090909 0 1 1 0 186.181818 93.090909 93.090909 0 0 1 0-186.181818z m480.969697 46.545455a46.545455 46.545455 0 1 0 0 93.090909 46.545455 46.545455 0 0 0 0-93.090909z m-480.969697 0a46.545455 46.545455 0 1 0 0 93.090909 46.545455 46.545455 0 0 0 0-93.090909z m302.545454-527.515152a38.787879 38.787879 0 0 1 38.710303 36.243394L667.151515 224.969697v54.287515l151.117576 0.015515a54.30303 54.30303 0 0 1 33.295515 11.403637l2.777212 2.327272 120.397576 107.008a54.30303 54.30303 0 0 1 18.121697 37.282909l0.108606 3.304728V729.212121h-69.818182a23.272727 23.272727 0 0 1-2.234182-46.436848L923.151515 682.666667l23.272727-0.015515v-242.036364a7.757576 7.757576 0 0 0-1.706666-4.856243l-0.899879-0.961939-120.397576-107.023515a7.757576 7.757576 0 0 0-3.754666-1.830788L818.269091 325.818182 667.151515 325.802667V682.666667h23.272727a23.272727 23.272727 0 0 1 2.234182 46.436848L690.424242 729.212121h-248.242424a23.272727 23.272727 0 0 1-2.234182-46.436848L442.181818 682.666667H620.606061V232.727273H170.666667v116.363636a23.272727 23.272727 0 0 1-21.038546 23.164121L147.393939 372.363636a23.272727 23.272727 0 0 1-23.164121-21.038545L124.121212 349.090909v-124.121212a38.787879 38.787879 0 0 1 36.243394-38.710303L162.909091 186.181818h465.454545z m-480.969697 434.424243a23.272727 23.272727 0 0 1 23.164122 21.038545L170.666667 643.878788V682.666667h38.787878a23.272727 23.272727 0 0 1 23.164122 21.038545L232.727273 705.939394a23.272727 23.272727 0 0 1-21.038546 23.164121L209.454545 729.212121h-46.545454a38.787879 38.787879 0 0 1-38.710303-36.243394L124.121212 690.424242v-46.545454A23.272727 23.272727 0 0 1 147.393939 620.606061z m124.121213-77.575758a23.272727 23.272727 0 0 1 2.234181 46.436849L271.515152 589.575758h-232.727273a23.272727 23.272727 0 0 1-2.234182-46.436849L38.787879 543.030303h232.727273z m536.60703-170.666667a38.787879 38.787879 0 0 1 27.430788 11.357091l52.968727 52.968728A38.787879 38.787879 0 0 1 899.878788 464.120242V535.272727a38.787879 38.787879 0 0 1-38.787879 38.787879h-124.121212a38.787879 38.787879 0 0 1-38.787879-38.787879v-124.121212a38.787879 38.787879 0 0 1 38.787879-38.787879z m-3.211637 46.545455H744.727273v108.606061h108.60606v-60.183273L804.910545 418.909091zM318.060606 465.454545a23.272727 23.272727 0 0 1 2.234182 46.436849L318.060606 512h-232.727273a23.272727 23.272727 0 0 1-2.234181-46.436848L85.333333 465.454545h232.727273z m46.545455-77.575757a23.272727 23.272727 0 0 1 2.234181 46.436848L364.606061 434.424242h-248.242425a23.272727 23.272727 0 0 1-2.234181-46.436848L116.363636 387.878788h248.242425z" fill="#333333" p-id="2527"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/发运.svg b/code/WebApp/vue/src/icons/svg/发运.svg
deleted file mode 100644
index 741eae27..00000000
--- a/code/WebApp/vue/src/icons/svg/发运.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622534301304" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9271" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css"></style></defs><path d="M510 498.9c0 11.3-9.1 20.5-20.1 20.5h-362c-11.1 0-20.1-9.3-20.1-20.5 0-11.3 9.1-20.5 20.1-20.5h362c11-0.1 20.1 9.2 20.1 20.5zM375.2 368.6c0 11.3-9.1 20.5-20.1 20.5H127.9c-11.1 0-20.1-9.3-20.1-20.5 0-11.3 9.1-20.5 20.1-20.5h227.3c11 0 20 9.2 20 20.5zM267.4 238.3c0 11.3-9.1 20.5-20.1 20.5H127.9c-11.1 0-20.1-9.3-20.1-20.5 0-11.3 9.1-20.5 20.1-20.5h119.5c11 0.1 20 9.2 20 20.5z m676.2 253.3l-274.1 0.4c-3.3 0-6.5-1.3-8.8-3.7-2.3-2.3-3.7-5.5-3.7-8.9V311.3c0-6.9 5.6-12.5 12.4-12.5h172.3c4.5 0 8.6 2.4 10.8 6.3l98.7 173.3c1.5 2.7 1.5 6.1 0 8.8-1.6 2.7-4.5 4.4-7.6 4.4zM1024 474c0.1-12-5.8-26.4-11.3-37.4l-0.6-1.2c-4.6-8.8-8.7-15.1-8.7-15.1L900.5 239.8c-3.7-6.5-10.6-10.5-18-10.5h-226v-40.9c0-44.1-31.5-80.2-70.1-80.2H70.1c-38.6-0.1-70.1 36-70.1 80.2v543.8c0.1 36.7 29.6 66.4 66.1 66.5h81.4c3.1-30.1 17.4-57.9 41.4-79.3 26.3-23.5 61-36.5 97.9-36.5 72.7 0 132.5 50.9 139.2 115.8h172.8c6.7-64.8 66.5-115.8 139.2-115.8 72.6 0 132.5 50.9 139.2 115.8h80.6c36.5-0.1 66-29.8 66.1-66.5V474.3l0.1-0.3zM738 732.2c-50.1 0-90.8 35.2-90.8 78.6v26.8c0 43.3 40.8 78.6 90.8 78.6 50.1 0 90.8-35.2 90.9-78.6v-26.8c0-43.3-40.8-78.6-90.9-78.6z m-451.2 0c-24.8 0-48 8.5-65.3 24-16.5 14.7-25.6 34.1-25.6 54.6v26.8c0 20.4 9.1 39.8 25.6 54.6 17.3 15.5 40.5 24 65.3 24 50.1 0 90.9-35.2 90.9-78.6v-26.8c-0.1-43.4-40.8-78.6-90.9-78.6z" fill="#3E82FE" p-id="9272"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/售后.svg b/code/WebApp/vue/src/icons/svg/售后.svg
deleted file mode 100644
index 8b64b6b7..00000000
--- a/code/WebApp/vue/src/icons/svg/售后.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622534008325" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6259" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css"></style></defs><path d="M934.4 256C864 134.4 755.2 51.2 620.8 19.2c-185.6-51.2-384 6.4-512 153.6l-89.6-57.6 6.4 224c0 19.2 25.6 32 38.4 19.2l192-115.2-89.6-44.8c115.2-121.6 288-166.4 448-128 115.2 32 217.6 108.8 275.2 211.2 64 108.8 76.8 230.4 44.8 345.6-32 115.2-108.8 217.6-211.2 275.2-108.8 64-230.4 76.8-345.6 44.8C256 915.2 160 838.4 96 729.6c-6.4-12.8-25.6-19.2-38.4-12.8-12.8 6.4-19.2 25.6-12.8 38.4C115.2 876.8 224 960 358.4 998.4c44.8 19.2 89.6 25.6 134.4 25.6 89.6 0 179.2-25.6 256-70.4C870.4 883.2 953.6 774.4 985.6 640c38.4-128 19.2-262.4-51.2-384z" p-id="6260"></path><path d="M665.6 716.8V582.4H339.2v140.8h64V704H608v19.2h57.6z m-262.4-57.6v-32H608v32H403.2zM377.6 300.8C352 345.6 326.4 384 288 416c6.4 19.2 19.2 38.4 25.6 64l25.6-25.6v115.2h57.6v-6.4h300.8v-38.4H550.4v-25.6H672v-38.4H550.4v-19.2H672v-38.4H550.4V384h140.8v-38.4h-128c-6.4-19.2-19.2-32-25.6-51.2L480 307.2c6.4 12.8 12.8 25.6 12.8 38.4H416c6.4-6.4 12.8-19.2 12.8-25.6l-51.2-19.2z m115.2 224h-96v-25.6h102.4v25.6z m0-64h-96v-19.2h102.4v19.2z m0-76.8v25.6h-96V384h96z" p-id="6261"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/售后报表.svg b/code/WebApp/vue/src/icons/svg/售后报表.svg
deleted file mode 100644
index 9cf76aac..00000000
--- a/code/WebApp/vue/src/icons/svg/售后报表.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622616785265" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6755" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css"></style></defs><path d="M358.5 503h142v34h-142v-34z m142 171h-279V196h580v260.9h35V162h-649v546h123.1l-88 154h34.2l93.6-154h150.1v-34z m0-85h-142v34h142v-34zM557 386.1l-131-131-143 143 24.1 24.1L426 303.4l131 131 161-161-24.1-24.1L557 386.1z m150.4 134.6c-22.6 0-44.3 9-60.3 25s-25 37.7-25 60.3c0 47.1 38.2 85.3 85.3 85.3 47.1 0 85.3-38.2 85.3-85.3 0.1-47.1-38.1-85.3-85.3-85.3z m0 136.5c-28.3 0-51.2-22.9-51.2-51.2 0-28.3 22.9-51.2 51.2-51.2 28.3 0 51.2 22.9 51.2 51.2 0 28.3-22.9 51.2-51.2 51.2z m68.3 51.2c22.6 0 44.3 9 60.3 25s25 37.7 25 60.3V862h-34.1v-68.3c0-28.3-22.9-51.2-51.2-51.2H639.2c-28.3 0-51.2 22.9-51.2 51.2V862h-34.1v-68.3c0-22.6 9-44.3 25-60.3s37.7-25 60.3-25h136.5z" fill="#1D1717" p-id="6756"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/器具.svg b/code/WebApp/vue/src/icons/svg/器具.svg
deleted file mode 100644
index f27421ef..00000000
--- a/code/WebApp/vue/src/icons/svg/器具.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622532681822" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2820" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M1011.2 185.6l-12.8-51.2L876.8 256c-12.8 12.8-32 19.2-51.2 19.2-19.2 0-38.4-12.8-51.2-25.6-25.6-25.6-25.6-70.4 0-96L889.6 32l-51.2-12.8C768-6.4 704 0 640 32c-57.6 32-102.4 89.6-121.6 153.6-12.8 51.2-12.8 108.8 6.4 160L345.6 524.8c-128-51.2-275.2 12.8-326.4 147.2-19.2 57.6-19.2 108.8-6.4 166.4l12.8 51.2 121.6-115.2c32-38.4 83.2-32 108.8-6.4 12.8 12.8 19.2 32 19.2 57.6s-6.4 38.4-19.2 51.2l-121.6 121.6 51.2 12.8c25.6 6.4 44.8 12.8 70.4 12.8 44.8 0 83.2-12.8 121.6-32 57.6-32 102.4-89.6 121.6-153.6 12.8-51.2 12.8-108.8-6.4-160l179.2-179.2c128 51.2 275.2-12.8 326.4-147.2 25.6-51.2 25.6-108.8 12.8-166.4z m-70.4 147.2c-38.4 102.4-147.2 147.2-249.6 108.8l-38.4-12.8-236.8 236.8 12.8 38.4c19.2 38.4 19.2 76.8 12.8 115.2-12.8 51.2-44.8 89.6-89.6 115.2-32 12.8-57.6 25.6-89.6 25.6l38.4-32c25.6-25.6 38.4-57.6 38.4-102.4s-12.8-76.8-38.4-102.4c-25.6-25.6-57.6-38.4-102.4-38.4-38.4 0-70.4 12.8-102.4 44.8l-32 32c0-19.2 6.4-44.8 12.8-64 38.4-102.4 147.2-147.2 249.6-108.8l38.4 12.8 236.8-236.8-12.8-38.4c-19.2-38.4-19.2-83.2-6.4-121.6 12.8-51.2 44.8-89.6 89.6-115.2 25.6-12.8 57.6-25.6 89.6-25.6l-38.4 38.4c-51.2 51.2-51.2 134.4 0 185.6 25.6 25.6 57.6 44.8 96 44.8s70.4-12.8 102.4-38.4l32-32c0 25.6-6.4 44.8-12.8 70.4z" fill="#444444" p-id="2821"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/客户零件.svg b/code/WebApp/vue/src/icons/svg/客户零件.svg
deleted file mode 100644
index 527a4435..00000000
--- a/code/WebApp/vue/src/icons/svg/客户零件.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622534190701" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8449" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css"></style></defs><path d="M449.170286 67.145143c196.315429 0 192.950857 143.506286 192.950857 194.121143 0 62.976-9.508571 107.008-24.429714 138.020571-16.310857 33.645714-31.012571 58.075429-31.451429 58.660572-11.264 12.580571-7.899429 39.497143 5.778286 49.883428 13.750857 10.24 38.912 0.658286 50.102857-11.922286 3.364571-3.657143 80.457143-91.721143 80.457143-234.642285 0-76.653714-20.553143-129.097143-64.658286-177.956572C608.768 28.964571 536.576 0 449.170286 0 282.404571 0 184.246857 90.185143 184.246857 255.707429c0 71.899429 10.093714 123.099429 30.866286 175.835428 20.992 53.248 53.394286 100.425143 99.181714 144.384v55.149714c-30.500571 5.339429-82.358857 15.36-134.802286 31.085715-48.347429 14.262857-87.405714 30.208-115.858285 47.542857-42.203429 25.526857-63.561143 138.971429-63.561143 171.666286 0 53.686857 60.196571 74.24 183.954286 123.245714 83.456 32.987429 182.125714 13.677714 185.490285 14.555428 2.852571 0.731429 6.070857 0 8.850286 0a32.182857 32.182857 0 0 0 31.158857-21.723428c4.608-15.872 4.608-49.737143-31.158857-52.809143-35.766857-3.072-84.114286 23.405714-163.254857-8.045714-106.642286-42.276571-137.508571-35.401143-137.508572-55.222857 0-18.870857-10.24-104.009143 88.722286-133.339429 75.264-22.454857 187.392-52.882286 188.196572-53.028571 15.652571-2.194286 35.035429-24.356571 35.035428-38.765715V563.931429c0-7.826286-10.752-24.868571-16.822857-30.427429-85.650286-78.409143-113.371429-145.554286-113.371429-277.869714 0-62.902857 17.700571-102.180571 48.128-136.265143 32.914286-36.717714 73.508571-52.297143 141.677715-52.297143z m409.965714 622.372571H661.138286a32.914286 32.914286 0 1 0 0 65.901715h197.997714a33.060571 33.060571 0 0 0 0-65.901715z m32.914286-131.876571H628.224c-72.850286 0-131.949714 59.026286-131.949714 131.876571v197.778286c0 72.777143 59.099429 131.803429 131.949714 131.803429h263.972571c72.850286 0 131.949714-59.026286 131.949715-131.803429V689.517714c0-72.850286-59.099429-131.876571-131.949715-131.876571z m72.265143 329.654857c0 36.425143-35.693714 73.289143-72.192 73.289143H628.150857c-36.425143 0-65.974857-36.864-65.974857-73.289143V689.517714c0-36.498286 29.549714-73.289143 65.974857-73.289143h263.972572c36.498286 0 72.192 36.790857 72.192 73.289143v197.778286z m-171.154286-65.901714H661.138286a32.914286 32.914286 0 1 0 0 65.901714h132.022857a33.060571 33.060571 0 0 0 0-65.901714z" p-id="8450"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/库房.svg b/code/WebApp/vue/src/icons/svg/库房.svg
deleted file mode 100644
index e8dc267d..00000000
--- a/code/WebApp/vue/src/icons/svg/库房.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622533021736" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3640" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M348.16 608.64H268.8c-29.44 0-36.48 7.04-36.48 40.96v85.12c0 33.92 6.4 40.96 36.48 40.96h79.36c29.44 0 36.48-7.04 36.48-40.96v-85.12c3.2-33.92-3.84-40.96-36.48-40.96z m0-211.2H268.8c-29.44 0-36.48 7.04-36.48 40.96v85.12c0 33.92 6.4 40.96 36.48 40.96h79.36c29.44 0 36.48-7.04 36.48-40.96V438.4c3.2-33.92-3.84-40.96-36.48-40.96z m0 422.4H268.8c-29.44 0-36.48 7.04-36.48 40.96v85.12c0 33.92 6.4 40.96 36.48 40.96h79.36c29.44 0 36.48-7.04 36.48-40.96v-85.12c3.2-34.56-3.84-40.96-36.48-40.96z" p-id="3641"></path><path d="M1011.2 366.72L539.52 16C536.32 12.8 533.12 8.96 526.08 5.76c-16.64-7.04-35.84-3.2-42.88 13.44L14.72 369.92c-12.8 14.08-16.64 37.76-6.4 51.2 9.6 17.28 29.44 23.68 46.08 13.44l33.28-23.68v575.36c0 20.48 16.64 37.76 36.48 37.76s36.48-17.28 36.48-37.76V356.48l349.44-262.4 356.48 265.6 76.16 54.4 26.24 17.28c16.64 10.24 36.48 3.2 46.08-13.44 12.8-13.44 12.8-37.76-3.84-51.2z" p-id="3642"></path><path d="M757.12 547.2v74.88H529.28v67.84h227.84v74.88h76.16v-74.88h82.56V622.08h-82.56V547.2h-76.16z" p-id="3643"></path><path d="M694.4 727.68H615.04v74.88H529.28v67.84h85.76v85.12h79.36v-74.88h231.04V812.8h-231.04v-85.12z" p-id="3644"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/报表.svg b/code/WebApp/vue/src/icons/svg/报表.svg
deleted file mode 100644
index 12908bc3..00000000
--- a/code/WebApp/vue/src/icons/svg/报表.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622602452321" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6547" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css"></style></defs><path d="M696.20736 166.86592c24.37632 21.66272 27.7504 27.51488 51.75808 48.85504-15.62624 15.19616-195.00032 187.07456-204.12416 195.92704a1480110.4896 1480110.4896 0 0 0-100.41856-84.26496c-12.53376 12.04736-283.41248 268.27776-293.2992 277.80096-0.73216 0.70656-1.11104 1.72032-1.6128 2.53952 12.92288 11.392 38.6816 38.80448 44.24192 33.52064 7.1168-6.76352 243.83488-232.0896 252.91264-240.92672l102.67136 84.34176c9.14944-8.94464 234.2912-235.2896 239.00672-240.1024 26.52672 23.01952 26.83392 25.02144 53.376 48.0512 1.4592-7.11168 56.2176-181.2224 57.82016-188.11904v-1.07008c-2.46784 0.28672-187.10016 60.21632-202.33216 63.44704zM793.5488 850.3296h71.68V412.48256h-71.68v437.84704zM603.82208 850.18112h71.68v-327.30624h-71.68v327.30624zM408.064 850.14016h71.68v-249.28768h-71.68v249.28768zM233.32864 850.12992h71.68v-152.86272h-71.68v152.86272z" p-id="6548"></path><path d="M940.8 911.66208H119.89504V87.0912c0-8.48384-5.97504-15.36-13.34784-15.36h-29.6192c-7.3728 0-13.34784 6.87616-13.34784 15.36v869.00224c0 3.35872 1.47456 6.38976 3.82464 8.73984 0.11264 0.128 0.24064 0.24064 0.3584 0.36864 0.1536 0.14848 0.29184 0.30208 0.45056 0.43008 2.34496 2.35008 5.36576 3.80928 8.71424 3.80928h863.87712c8.48896 0 15.36-5.96992 15.36-13.34784v-31.0784c-0.00512-7.3728-6.87616-13.35296-15.36512-13.35296z" p-id="6549"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/日历.svg b/code/WebApp/vue/src/icons/svg/日历.svg
deleted file mode 100644
index da1c0000..00000000
--- a/code/WebApp/vue/src/icons/svg/日历.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622532359157" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8457" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M507.056 833.35h-308.99c-27.191 0-49.439-7.416-66.742-24.72-7.416-7.415-9.888-17.303-9.888-27.19V311.774c0-27.191 29.663-49.438 64.27-51.91h64.27c9.888 0 14.832-2.472 14.832-9.888v-19.775c4.943-19.776 19.775-29.663 44.494-29.663 19.776 0 34.607 12.36 37.08 32.135v2.472c2.471 27.19 2.471 27.19 34.606 27.19h269.44c12.36 0 17.303-2.471 17.303-12.359v-17.303c2.472-19.776 19.776-29.663 42.023-29.663 22.247 0 37.079 12.36 39.55 29.663 0 9.887-4.943 22.247 2.473 27.19 9.887 4.945 24.719 2.473 37.078 2.473h37.08c37.078 2.472 66.741 24.719 66.741 54.382V781.44c0 32.135-32.135 54.382-76.63 56.854-98.876-4.944-205.169-4.944-308.99-4.944z m2.472-422.699h-308.99c-12.36 0-17.304 2.472-17.304 12.36v341.125c0 14.832 7.416 17.304 22.247 17.304h608.094c22.247 0 22.247 0 22.247-17.304V425.483c0-12.36-2.472-14.832-17.303-14.832h-308.99z" fill="#1296DB" p-id="8458"></path><path d="M316.718 707.282h-39.55c-17.304 0-24.72-7.416-27.192-19.775v-42.023c0-12.36 9.888-19.776 24.72-19.776h84.045c17.303 0 24.719 7.416 24.719 22.248v39.55c0 12.36-7.416 19.776-24.72 19.776h-42.022z m192.81 0h-39.55c-17.304 0-27.192-7.416-27.192-19.775v-39.551c0-14.832 7.416-19.776 24.72-22.248h81.573c14.831 0 24.72 7.416 24.72 19.776v42.023c0 12.36-9.889 19.775-24.72 19.775h-39.55z m192.81-81.574h42.023c14.831 0 24.72 7.416 22.247 19.776v44.495c0 12.36-9.888 19.775-24.72 19.775h-84.044c-14.832 0-24.72-7.416-24.72-19.775v-42.023c0-12.36 9.888-19.776 24.72-19.776 14.831-4.943 29.663-2.472 44.494-2.472z m-192.81-59.326h-42.023c-17.303 0-24.719-4.944-24.719-19.775v-44.495c0-12.36 7.416-17.303 22.247-17.303h86.518c14.831 0 22.247 7.416 24.719 19.775v42.023c0 12.36-7.416 19.775-24.72 19.775h-42.022z m-192.81-81.573h42.023c14.831 0 24.719 7.416 24.719 17.303v44.495c0 12.36-7.416 17.303-22.247 17.303h-86.518c-14.831 0-22.247-4.943-22.247-17.303V499.64c0-12.36 9.888-17.303 24.72-17.303 12.359 2.472 24.718 2.472 39.55 2.472z m383.148 81.573h-42.022c-14.832 0-24.72-7.415-24.72-19.775v-44.495c0-12.36 7.416-17.303 22.248-17.303h86.517c14.831 0 22.247 7.416 22.247 17.303v44.495c0 9.888-7.416 17.303-22.247 17.303-12.36 2.472-27.191 2.472-42.023 2.472z" fill="#1296DB" p-id="8459"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/索赔授权.svg b/code/WebApp/vue/src/icons/svg/索赔授权.svg
deleted file mode 100644
index 50f7fcd7..00000000
--- a/code/WebApp/vue/src/icons/svg/索赔授权.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622535730094" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13853" width="64" height="64" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"></style></defs><path d="M733.9 709.9c-22.9 0-41.3 18.9-40.7 41.9 0.6 20.7 17.1 38 37.8 39.5 23.8 1.7 43.7-17.2 43.7-40.6 0-22.6-18.3-40.8-40.8-40.8z" p-id="13854"></path><path d="M734.9 653.8c-81.3 0.1-149.4 68.2-149.5 149.5-0.1 82.7 67 149.7 149.7 149.7 82.2-0.1 149.4-67.3 149.5-149.5 0.1-82.7-67-149.7-149.7-149.7z m13.9 163.4v28.9h13.8c7.6 0 13.8 6.2 13.8 13.8 0 7.6-6.2 13.8-13.8 13.8h-13.7V915c0 4.9-2.6 9.5-6.9 11.9-4.3 2.5-9.5 2.5-13.8 0-4.3-2.4-6.9-7-6.9-11.9v-97.8c-34.7-7-58.4-39.2-54.9-74.4s33.2-62 68.6-61.9v0.1c35.4 0 65 26.8 68.5 61.9 3.6 35.1-20 67.2-54.7 74.3zM627.9 117.8c0-26.1-19-47.8-42.4-47.8H394.3c-23.5 0-42.4 21.6-42.4 47.8s19 47.8 42.4 47.8h192.1c22.6-0.1 41.5-21.7 41.5-47.8zM639.7 646.8V627c0-1.9-1.5-3.4-3.4-3.4h-87.1c-1.9 0-3.4 1.5-3.4 3.4v60c0 1.9 1.5 3.4 3.4 3.4h41.5c13.6-17.3 30.1-32.1 49-43.6z" p-id="13855"></path><path d="M551.7 804.8c0-25.2 5.1-49.3 14.3-71.1h-16.9c-1.9 0-3.4 1.5-3.4 3.4V751c0 1.9-1.5 3.4-3.4 3.4h-36.5c-1.9 0-3.4-1.5-3.4-3.4V583.8c0-1.9 1.5-3.4 3.4-3.4h172.7c1.9 0 3.4 1.5 3.4 3.4v45.5c16.8-5.1 34.6-7.8 53-7.8 42.6 0 81.8 14.5 112.9 38.9V215.2c0-62.2-30.7-105.5-93.8-105.5h-80c-2 0-3.5 1.7-3.3 3.7 0.4 3.6 0.4 7.6 0.4 11.6 0 38.7-25.2 76.6-55 76.6H357.4c-31.4 0-56.7-37.7-56.8-76.3v-0.5c0.6-4 0.8-7.5 1.2-11.3 0.2-2-1.3-3.7-3.3-3.7h-80.9c-68.5 0-85.6 43.2-85.6 105.5V832c0 66.7 23.4 104.6 90.1 104.6h385.5c-34.5-33.4-55.9-80.1-55.9-131.8z m-66.3-415c0-1.9 1.5-3.4 3.4-3.4h73.8c2.3 0 4-2.3 3.1-4.5-3.4-9.1-6.7-17.2-10.6-24.8-1-2 0.2-4.4 2.4-4.8l37.9-6.8c1.6-0.3 3.1 0.6 3.7 2.1 4.6 11.9 8.7 23.9 12.6 36.5 0.4 1.4 1.7 2.4 3.2 2.4h76.2c1.9 0 3.4 1.5 3.4 3.4v36.5c0 1.9-1.5 3.4-3.4 3.4H488.8c-1.9 0-3.4-1.5-3.4-3.4v-36.6z m-6.3 120c0-1.9 1.5-3.4 3.4-3.4h42.7c2.3 0 3.9-2.2 3.2-4.4-5-15.4-11.8-30.8-18.7-45.6-0.8-1.8 0-3.8 1.8-4.6l35.2-13.8c1.6-0.6 3.5 0.1 4.3 1.7 9.8 20.9 17.3 42.5 23.3 64.2 0.4 1.5 1.7 2.5 3.2 2.5h33c1.4 0 2.6-0.8 3.1-2.1 8.3-20.9 15.7-42.4 22.5-64.8 0.6-1.8 2.5-2.8 4.3-2.2l36.8 13c1.7 0.6 2.6 2.5 2.1 4.2-5.5 16.1-11.7 31.6-19.1 47.1-1.1 2.2 0.6 4.8 3 4.8h39c1.9 0 3.4 1.5 3.4 3.4v37.5c0 1.9-1.5 3.4-3.4 3.4H482.5c-1.9 0-3.4-1.5-3.4-3.4v-37.5zM315 365.5c0-1.9 1.5-3.4 3.4-3.4H464c1.9 0 3.4 1.5 3.4 3.4v277.4c0 1.9-1.5 3.4-3.4 3.4h-32c-1.9 0-3.4-1.5-3.4-3.4V407c0-1.9-1.5-3.4-3.4-3.4H358c-1.9 0-3.4 1.5-3.4 3.4v242.1c0 1.9-1.5 3.4-3.4 3.4h-33c-1.9 0-3.4-1.5-3.4-3.4V365.5z m9 392.9c-1.5 0.8-3.4 0.3-4.4-1.2l-19.8-31.3c-1-1.6-0.5-3.8 1.2-4.7 28-14.9 46.7-32.4 57.2-53.2 0.1-0.1 0.1-0.2 0.1-0.3 9.8-24.3 16.1-54.9 17-92.7V434c0-1.9 1.5-3.4 3.4-3.4h27.5c1.9 0 3.4 1.5 3.4 3.4v141.8c-0.9 50.5-8.1 90.1-22.6 119.9-13 26.3-33.8 47.4-63 62.7zM484.2 724l-25.6 25.6c-1.5 1.5-4 1.3-5.2-0.5-12.8-20-29.5-42.3-51.4-65.3-1.3-1.3-1.2-3.4 0.1-4.7l22.4-21.6c1.3-1.2 3.3-1.3 4.6 0 20.8 19.5 39.3 40.5 55.4 62.2 1.1 1.3 0.9 3.1-0.3 4.3z" p-id="13856"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/销售.svg b/code/WebApp/vue/src/icons/svg/销售.svg
deleted file mode 100644
index 4a53d133..00000000
--- a/code/WebApp/vue/src/icons/svg/销售.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622535656080" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13047" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css"></style></defs><path d="M512 0C229.7 0 0 229.7 0 512s229.7 512 512 512 512-229.7 512-512S794.3 0 512 0z m0 969.1C260 969.1 54.9 764 54.9 512 54.9 260 260 54.9 512 54.9S969.1 260 969.1 512c0 252-205.1 457.1-457.1 457.1z m123.9-724.9L554.6 394c-21.7 40.6-34.9 67.6-39.8 81h-1.4c-14.3-32.5-54.6-109.4-121.1-230.8h-76.5L458 488.5H341.4v54h136.7v74.4H341.4v54.6h136.7v108.3h67.8V671.5h131.8v-54.6H545.9v-74.4h131.8v-54H564.6l143.6-244.3h-72.3z" p-id="13048"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/icons/svg/零件类型.svg b/code/WebApp/vue/src/icons/svg/零件类型.svg
deleted file mode 100644
index 2df88f95..00000000
--- a/code/WebApp/vue/src/icons/svg/零件类型.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1622533807892" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4468" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M751.2 906.4l-579.2-0.8c-28.8 0-52.8-23.2-52.8-52.8V168.8c0-28.8 23.2-52.8 52.8-52.8h225.6v245.6l63.2-60.8 65.6 60.8V116.8h224c28.8 0 52.8 23.2 52.8 52.8v184c0 14.4 12 26.4 26.4 26.4s26.4-12 26.4-26.4v-184C856 111.2 808.8 64 750.4 64H172c-58.4 0.8-104.8 48-104.8 105.6v684.8c0 58.4 47.2 105.6 105.6 105.6H752c14.4 0 26.4-12 26.4-26.4-0.8-15.2-12.8-27.2-27.2-27.2z" p-id="4469"></path><path d="M514.4 485.6c0-14.4-12-26.4-26.4-26.4H224.8c-14.4 0-26.4 12-26.4 26.4s12 26.4 26.4 26.4H488c15.2-0.8 26.4-12 26.4-26.4z m-289.6 184c-14.4 0-26.4 12-26.4 26.4s12 26.4 26.4 26.4h158.4c14.4 0 26.4-12 26.4-26.4s-12-26.4-26.4-26.4H224.8z m512.8-100.8c-45.6-1.6-84 34.4-85.6 80.8-1.6 45.6 34.4 84.8 80.8 85.6h2.4c45.6 0 83.2-36.8 83.2-82.4 0-45.6-36-82.4-80.8-84z m0 122.4c-21.6 0-39.2-17.6-39.2-39.2s17.6-39.2 39.2-39.2 39.2 17.6 39.2 39.2-17.6 39.2-39.2 39.2z" p-id="4470"></path><path d="M955.2 608.8c-1.6-7.2-4-13.6-8.8-19.2-4.8-5.6-12-8.8-19.2-8.8-24.8 0-44.8-20.8-45.6-45.6 0.8-6.4 1.6-12 4-17.6 6.4-15.2 1.6-32.8-11.2-42.4l-52.8-30.4c-4.8-1.6-9.6-2.4-14.4-2.4-10.4 0-20 4-26.4 11.2-9.6 10.4-22.4 18.4-36 20.8-14.4-3.2-27.2-10.4-36.8-21.6-10.4-10.4-26.4-13.6-40.8-8l-56 30.4c-13.6 9.6-18.4 27.2-11.2 42.4 2.4 5.6 4 11.2 4 17.6 0 24.8-20.8 44.8-45.6 45.6-7.2 0-13.6 3.2-18.4 8.8-4.8 5.6-8 12-8.8 19.2-2.4 14.4-4 28.8-4.8 43.2 0.8 14.4 2.4 28.8 4.8 43.2 1.6 7.2 4 13.6 8.8 19.2 4.8 5.6 11.2 8 18.4 8.8 24.8 0 44.8 20.8 45.6 45.6-0.8 6.4-1.6 12-4 17.6-6.4 15.2-1.6 32.8 11.2 42.4l52.8 29.6c14.4 5.6 30.4 2.4 40.8-8.8 9.6-11.2 23.2-19.2 37.6-22.4 14.4 3.2 28 11.2 37.6 22.4 10.4 11.2 26.4 14.4 40.8 8.8l50.4-29.6c13.6-9.6 18.4-27.2 11.2-42.4-2.4-5.6-4-11.2-4-17.6 0-24.8 20-45.6 45.6-45.6 7.2 0 14.4-3.2 19.2-8.8 4.8-5.6 8-12 8.8-19.2 2.4-14.4 4-28.8 4.8-43.2 0.8-14.4 0-28.8-1.6-43.2z m-41.6 71.2c-44 6.4-77.6 44-77.6 88.8 0 8.8 1.6 17.6 4.8 26.4l-37.6 20.8c-4.8-4.8-10.4-8.8-16-12.8-15.2-12-33.6-19.2-52.8-19.2-18.4 0.8-35.2 7.2-49.6 19.2-5.6 4-10.4 8.8-15.2 12.8l-36-20c14.4-47.2-11.2-97.6-58.4-112-4.8-1.6-9.6-2.4-13.6-3.2-0.8-8.8-0.8-18.4 0-27.2-0.8-8.8-0.8-18.4 0-27.2 48.8-5.6 83.2-49.6 77.6-98.4-0.8-5.6-1.6-10.4-3.2-15.2l39.2-20.8c4.8 4.8 10.4 8.8 16 12.8 14.4 11.2 31.2 17.6 48.8 18.4 17.6-0.8 34.4-7.2 48.8-17.6 5.6-4 10.4-8 15.2-12.8l36.8 20.8a76.8 76.8 0 0 0-4.8 26.4c0 44.8 32.8 82.4 77.6 88.8 0.8 8.8 0.8 18.4 0 27.2v24z" p-id="4471"></path></svg>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/layout-old.rar b/code/WebApp/vue/src/layout-old.rar
new file mode 100644
index 00000000..d9fbb258
Binary files /dev/null and b/code/WebApp/vue/src/layout-old.rar differ
diff --git a/code/WebApp/vue/src/layout/components/ManagerNavbar.vue b/code/WebApp/vue/src/layout/components/ManagerNavbar.vue
new file mode 100644
index 00000000..00b88d12
--- /dev/null
+++ b/code/WebApp/vue/src/layout/components/ManagerNavbar.vue
@@ -0,0 +1,116 @@
+<template>
+  <div class="navbar">
+    <img
+      :src="logo"
+      class="logo" >
+    <div class="nav-title">
+      系统设置
+    </div>
+    <div
+      class="back-home"
+      @click="enterHome">返回首页</div>
+    <div
+      class="go-out"
+      @click="enterLogin">退出系统</div>
+  </div>
+</template>
+
+<script>
+import { Loading } from 'element-ui'
+import { mapGetters } from 'vuex'
+
+export default {
+  components: {},
+  props: {
+    navIndex: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {
+    ...mapGetters(['logo'])
+  },
+  mounted() {},
+  methods: {
+    enterHome() {
+      this.$router.replace({
+        path: '/'
+      })
+    },
+    enterLogin() {
+      this.$confirm('退出登录？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          var loading = Loading.service({
+            target: document.getElementById('#app')
+          })
+          this.$store
+            .dispatch('user/logout')
+            .then(() => {
+              loading.close()
+              this.$router.push('/login')
+            })
+            .catch(() => {
+              loading.close()
+            })
+        })
+        .catch(() => {})
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.navbar {
+  height: 45px;
+  min-height: 45px;
+  display: flex;
+  align-items: center;
+  padding: 0 90px 0 30px;
+  background-color: white;
+  .logo {
+    width: 150px;
+    height: 40px;
+    display: block;
+    flex-shrink: 0;
+    margin-right: 60px;
+  }
+  .nav-title {
+    flex: 1;
+    font-size: 16px;
+    color: #333333;
+  }
+}
+
+.back-home {
+  width: 94px;
+  height: 36px;
+  line-height: 36px;
+  background-color: #3e84e9;
+  border-radius: 3px;
+  text-align: center;
+  color: #fff;
+  font-size: 14px;
+  margin-right: 10px;
+  cursor: pointer;
+}
+
+.go-out {
+  width: 94px;
+  height: 36px;
+  line-height: 36px;
+  background-color: #c2c2c2;
+  border-radius: 3px;
+  text-align: center;
+  color: #fff;
+  font-size: 14px;
+  cursor: pointer;
+}
+</style>
+
diff --git a/code/WebApp/vue/src/layout/components/Sidebar.vue b/code/WebApp/vue/src/layout/components/Sidebar.vue
new file mode 100644
index 00000000..8c20f5e2
--- /dev/null
+++ b/code/WebApp/vue/src/layout/components/Sidebar.vue
@@ -0,0 +1,350 @@
+<template>
+  <div class="container">
+      <el-popover
+        v-if="createButtonTitle != ''"
+        :offset="addOffset"
+        :visible-arrow="false"
+        placement="right"
+        popper-class="no-padding-popover"
+        trigger="hover">
+        <slot name="add"/>
+        <div
+          slot="reference"
+          :style="{ 'background-color': createButtonBackgroundColor }"
+          class="create-button"
+          @click="quicklyCreate">
+          <div
+            v-show="!buttonNameCollapse"
+            class="button-name">{{ createButtonTitle }}</div>
+          <div
+            v-show="!buttonNameCollapse"
+            class="button-line"/>
+          <i
+            :class="createButtonIcon"
+            class="button-mark"/>
+        </div>
+      </el-popover>
+      <el-menu
+      :default-active="activeIndex"
+      :style="{'border-right-color': backgroundColor}"
+      :text-color="textColor"
+      :background-color="backgroundColor"
+      :active-text-color="activeTextColor"
+      :collapse="isCollapse()"
+      class="el-menu-vertical"
+      :unique-opened="false"
+      :collapse-transition="false"
+      @select="handleselect"
+      >
+      <template
+        v-for="(item, index) in getShowMenu(items)">
+        <router-link
+          v-if="!item.children"
+          :key="index"
+          :to="getFullPath(item.path)">
+          <el-menu-item
+            :index="getFullPath(item.path)"
+            :class="{'menu-item-select': activeIndex == getFullPath(item.path)}"
+            class="menu-item-defalt">
+            <i class="iconfont" :class="item.meta.icon" :style="{ 'color': activeIndex == getFullPath(item.path) ? activeTextColor : textColor, fontSize: item.meta.fontSize || '16px'}"/>
+            <span slot="title">{{ item.meta.title }}</span>
+            <el-badge
+              v-if="item.meta.num && item.meta.num > 0"
+              :max="99"
+              :value="item.meta.num"/>
+          </el-menu-item>
+        </router-link>
+        <el-submenu
+          v-else
+          :key="index"
+          :index="getFullPath(item.path)">
+          <template
+            v-if="!item.hidden"
+            slot="title">
+            <i
+              :class="item.meta.icon"
+              :style="{fontSize: item.meta.fontSize || '16px'}"
+              class="iconfont"/>
+            <span slot="title">{{ item.meta.title }}</span>
+          </template>
+          <router-link
+            v-for="(subitem, subindex) in getShowMenu(item.children)"
+            :key="subindex"
+            :to="getFullPath(subitem.path)">
+            <el-menu-item
+              :index="getFullPath(subitem.path)"
+              :class="{'menu-item-select': activeIndex == getFullPath(subitem.path) }"
+              class="menu-item-defalt">
+              {{ subitem.meta.title }}
+            </el-menu-item>
+          </router-link>
+        </el-submenu>
+      </template>
+    </el-menu>
+    <div
+      :style="{ 'background-color':backgroundColor }"
+      class="sidebar-bottom">
+      <div class="sidebar-container">
+        <img
+          :style="{ 'right': buttonNameCollapse ? '3px' : '0' }"
+          class="collapse-button"
+          src="@/assets/img/collapse_white.png"
+          alt=""
+          @click="toggleSideBarClick">
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { mapGetters } from 'vuex'
+  import variables from '@/styles/variables.scss'
+  import Logo from './Sidebar/Logo'
+  export default {
+    inject: ['reload'],  // 注入重载的功能（注入依赖）
+    name: 'Sidebar',
+    components: { Logo },
+    props: {
+      mainRouter: {
+        type: String,
+        default: ''
+      },
+      addOffset: {
+        type: Number,
+        default: 70
+      },
+      /** 选择项目 */
+      items: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      backgroundColor: {
+        type: String,
+        default: '#2D3037'
+      },
+      activeTextColor: {
+        type: String,
+        default: '#fff'
+      },
+      textColor: {
+        type: String,
+        default: '#bebec0'
+      },
+      selectLineColor: {
+        type: String,
+        default: '#3E84E9'
+      },
+      selectBackgroundColor: {
+        type: String,
+        default: '#454E57'
+      },
+      createButtonTitle: {
+        type: String,
+        default: ''
+      },
+      createButtonBackgroundColor: {
+        type: String,
+        default: '#3E84E9'
+      },
+      createButtonIcon: {
+        type: String,
+        default: 'el-icon-arrow-right'
+      }
+    },
+    data() {
+      return {
+        collapse: false, // 菜单开关
+        buttonNameCollapse: false,
+      }
+    },
+    computed: {
+      ...mapGetters(['activeIndex',
+        'sidebar'])
+    },
+    watch: {
+      // collapse: function(val) {
+      //   if (val) {
+      //     this.buttonNameCollapse = val
+      //   } else {
+      //     setTimeout(() => {
+      //       this.buttonNameCollapse = val
+      //     }, 300)
+      //   }
+      // }
+      '$route': function(){
+        // this.reload();
+      }
+
+    },
+    mounted() {
+    },
+    methods: {
+      variables() {
+        return variables
+      },
+      isCollapse() {
+        return !this.sidebar.opened
+      },
+      showLogo() {
+        return this.$store.state.settings.sidebarLogo
+      },
+      toggleSideBarClick() {
+        this.$store.dispatch('toggleSideBar')
+      },
+
+      // 快速创建
+      quicklyCreate() {
+        this.$emit('quicklyCreate')
+      },
+
+      getFullPath(path) {
+        return `/${this.mainRouter}/${path}`
+      },
+
+      getShowMenu(array) {
+        return array.filter(item => {
+          return !item.hidden
+        })
+      },
+      handleselect: function (a, b) {
+        this.reload()  // 点击侧边栏重新载入页面
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .container {
+    position: relative;
+    height: 100%;
+  }
+
+  .el-menu-vertical:not(.el-menu--collapse) {
+    width: 200px;
+    min-height: 200px;
+  }
+
+  .el-menu-vertical {
+    height: 100%;
+    overflow: auto;
+    padding-bottom: 48px;
+    .el-submenu.is-active {
+      .el-submenu__title {
+        .wukong {
+          color: white;
+        }
+        span {
+          color: white;
+        }
+      }
+    }
+  }
+
+  .menu-item-icon-container {
+    display: inline-block;
+    margin-right: 10px;
+    .menu-item-icon-flex {
+      width: 22px;
+      height: 22px;
+      position: relative;
+      .menu-item-icon {
+        display: block;
+      }
+    }
+  }
+
+  .menu-item-defalt {
+    border-left: 2px solid transparent;
+    height: 46px;
+    line-height: 46px;
+  }
+
+  .menu-item-select {
+    border-left: 2px solid #3e84e9;
+    background-color: #454e57 !important;
+  }
+
+  .create-button-container {
+    padding: 15px 12px 15px 12px;
+    color: white;
+    font-size: 14px;
+    cursor: pointer;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 2;
+
+    .create-button {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      box-sizing: border-box;
+      padding: 0 15px;
+      height: 36px;
+      border-radius: 4px;
+
+      .button-name {
+        flex: 1;
+      }
+
+      .button-line {
+        height: 10px;
+        background-color: white;
+        width: 1px;
+        margin: 0 20px 0 10px;
+        opacity: 0.3;
+      }
+
+      .button-mark {
+        width: 12px;
+      }
+    }
+  }
+
+  .side-bar {
+    height: 32px;
+    padding: 0 16px 16px;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: #eee;
+  }
+
+  .sidebar-bottom {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 48px;
+
+    .sidebar-container {
+      position: relative;
+      height: 48px;
+      /*display: none;*/
+    }
+  }
+
+  .collapse-button {
+    position: absolute;
+    top: 0;
+    padding: 18px 20px;
+  }
+
+  .wukong {
+    margin-right: 8px;
+  }
+
+  // 消息数
+  .el-badge {
+    position: absolute;
+    right: 15px;
+    top: 5px;
+    /deep/ .el-badge__content {
+      border-width: 0;
+    }
+  }
+</style>
diff --git a/code/WebApp/vue/src/layout/components/Sidebar/SidebarItem.vue b/code/WebApp/vue/src/layout/components/Sidebar/SidebarItem.vue
index f6b5dbc6..f87b70b1 100644
--- a/code/WebApp/vue/src/layout/components/Sidebar/SidebarItem.vue
+++ b/code/WebApp/vue/src/layout/components/Sidebar/SidebarItem.vue
@@ -1,37 +1,16 @@
 <template>
   <div v-if="!item.hidden">
-    <template
-      v-if="
-        hasOneShowingChild(item.children, item) &&
-        (!onlyOneChild.children || onlyOneChild.noShowingChildren) &&
-        !item.alwaysShow
-      "
-    >
+    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
-        <el-menu-item
-          :index="resolvePath(onlyOneChild.path)"
-          :class="{ 'submenu-title-noDropdown': !isNest }"
-        >
-          <item
-            :icon="onlyOneChild.meta.icon || (item.meta && item.meta.icon)"
-            :title="generateTitle(onlyOneChild.meta.title)"
-          />
+        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
+          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="generateTitle(onlyOneChild.meta.title)" />
         </el-menu-item>
       </app-link>
     </template>
 
-    <el-submenu
-      v-else
-      ref="subMenu"
-      :index="resolvePath(item.path)"
-      popper-append-to-body
-    >
+    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
       <template slot="title">
-        <item
-          v-if="item.meta"
-          :icon="item.meta && item.meta.icon"
-          :title="generateTitle(item.meta.title)"
-        />
+        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="generateTitle(item.meta.title)" />
       </template>
       <sidebar-item
         v-for="child in item.children"
@@ -42,84 +21,78 @@
         class="nest-menu"
       />
     </el-submenu>
-    <!-- <el-badge
-      v-if="item.meta.num && item.meta.num > 0"
-      :max="99"
-      :value="item.meta.num"
-    />
-    <el-badge v-if="item.meta.title == '系统内通知'" :max="99" value="7" /> -->
   </div>
 </template>
 
 <script>
-import path from "path";
-import { generateTitle } from "@/utils/i18n";
-import { isExternal } from "@/utils/validate";
-import Item from "./Item";
-import AppLink from "./Link";
-import FixiOSBug from "./FixiOSBug";
+import path from 'path'
+import { generateTitle } from '@/utils/i18n'
+import { isExternal } from '@/utils/validate'
+import Item from './Item'
+import AppLink from './Link'
+import FixiOSBug from './FixiOSBug'
 
 export default {
-  name: "SidebarItem",
+  name: 'SidebarItem',
   components: { Item, AppLink },
   mixins: [FixiOSBug],
   props: {
     // route object
     item: {
       type: Object,
-      required: true,
+      required: true
     },
     isNest: {
       type: Boolean,
-      default: false,
+      default: false
     },
     basePath: {
       type: String,
-      default: "",
-    },
+      default: ''
+    }
   },
   data() {
     // To fix https://github.com/PanJiaChen/vue-admin-template/issues/237
     // TODO: refactor with render function
-    this.onlyOneChild = null;
-    return {};
+    this.onlyOneChild = null
+    return {}
   },
   methods: {
     hasOneShowingChild(children = [], parent) {
-      const showingChildren = children.filter((item) => {
+      const showingChildren = children.filter(item => {
         if (item.hidden) {
-          return false;
+          return false
         } else {
           // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item;
-          return true;
+          this.onlyOneChild = item
+          return true
         }
-      });
+      })
 
       // When there is only one child router, the child router is displayed by default
       if (showingChildren.length === 1) {
-        return true;
+        return true
       }
 
       // Show parent if there are no child router to display
       if (showingChildren.length === 0) {
-        this.onlyOneChild = { ...parent, path: "", noShowingChildren: true };
-        return true;
+        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
+        return true
       }
 
-      return false;
+      return false
     },
     resolvePath(routePath) {
       if (isExternal(routePath)) {
-        return routePath;
+        return routePath
       }
       if (isExternal(this.basePath)) {
-        return this.basePath;
+        return this.basePath
       }
-      return path.resolve(this.basePath, routePath);
+      return path.resolve(this.basePath, routePath)
     },
 
-    generateTitle,
-  },
-};
+    generateTitle
+  }
+}
 </script>
diff --git a/code/WebApp/vue/src/layout/firstLayout.vue b/code/WebApp/vue/src/layout/firstLayout.vue
new file mode 100644
index 00000000..88858b80
--- /dev/null
+++ b/code/WebApp/vue/src/layout/firstLayout.vue
@@ -0,0 +1,154 @@
+<template>
+  <el-container>
+    <el-header class="nav-container">
+      <navbar :nav-index="0" @nav-items-click="navClick" />
+    </el-header>
+    <el-container>
+      <el-aside width="auto" class="aside-container">
+        <sidebar :items="sidebarItems" main-router="first"> </sidebar>
+      </el-aside>
+      <el-main id="workbench-main-container">
+        <div :class="{ 'fixed-header': fixedHeader }">
+          <tags-view v-if="needTagsView" />
+        </div>
+        <app-main />
+      </el-main>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import { mapGetters, mapState } from "vuex";
+import { Navbar, Sidebar, AppMain, TagsView } from "./components";
+import { vueTestRouterMenu } from "@/router/modules/first";
+import Lockr from "lockr";
+
+export default {
+  name: "Layout",
+  components: {
+    Navbar,
+    Sidebar,
+    AppMain,
+    TagsView,
+  },
+  data() {
+    return {
+      addDialog: false,
+      list: [
+        {
+          label: "日志",
+          icon: "log",
+        },
+        {
+          label: "审批",
+          icon: "examine",
+        },
+        {
+          label: "任务",
+          icon: "task",
+        },
+        {
+          label: "日程",
+          icon: "schedule",
+        },
+        {
+          label: "公告",
+          icon: "notice",
+        },
+      ],
+      // 新建
+      showCategorySelect: false,
+      isCreate: false, // 是创建
+      createInfo: {}, // 创建所需要的id 标题名信息
+    };
+  },
+
+  computed: {
+    ...mapGetters(["first", "firstRouters", "roles"]),
+    ...mapState({
+      sidebar: (state) => state.app.sidebar,
+      device: (state) => state.app.device,
+      showSettings: (state) => state.settings.showSettings,
+      needTagsView: (state) => state.settings.tagsView,
+      fixedHeader: (state) => state.settings.fixedHeader,
+    }),
+    sidebarItems() {
+      // const workbenchMenus = this.firstRouters.children
+      // console.log(this.firstRouters)
+      // return workbenchMenus
+      let currentUserRoles = Lockr.get("userRoles");
+      for (let index = 0; index < vueTestRouterMenu.length; index++) {
+        const routerMenuItem = vueTestRouterMenu[index];
+        for (let j = 0; j < routerMenuItem.children.length; j++) {
+          if (routerMenuItem.children[j].meta.roles)
+            routerMenuItem.children[j].hidden = !this.in_array(
+              routerMenuItem.children[j].meta.roles,
+              this.roles
+            );
+        }
+      }
+      return vueTestRouterMenu;
+    },
+  },
+
+  created() {},
+
+  methods: {
+    navClick(index) {},
+    // 新增跳转
+    addSkip(val) {
+      switch (val.label) {
+        case "日志":
+          // this.$router.push({ path: 'journal', query: { routerKey: 1 }})
+          break;
+        case "审批":
+          this.showCategorySelect = true;
+          break;
+        case "任务":
+          // this.$router.push({ path: 'task', query: { routerKey: 1 }})
+          break;
+        case "日程":
+          //this.$router.push({ path: 'schedule-new', query: { routerKey: 1 }})
+          break;
+        case "公告":
+          //this.$router.push({ path: 'notice-new', query: { routerKey: 1 }})
+          break;
+      }
+    },
+    in_array(stringToSearch, arrayToSearch) {
+      for (let s = 0; s < arrayToSearch.length; s++) {
+        const thisEntry = arrayToSearch[s].toString();
+        if (thisEntry == stringToSearch) {
+          return true;
+        }
+      }
+      return false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "./styles/common.scss";
+.el-container {
+  min-height: 0;
+}
+.aside-container {
+  position: relative;
+  background-color: #2d3037;
+  box-sizing: border-box;
+  border-right: solid 1px #e6e6e6;
+  overflow: visible;
+}
+
+.nav-container {
+  padding: 0;
+  /*box-shadow: 0px 1px 2px #dbdbdb;*/
+  z-index: 100;
+  min-width: 1200px;
+  height: 45px !important;
+}
+.quick-add {
+  height: 178px;
+}
+</style>
diff --git a/code/WebApp/vue/src/main.js b/code/WebApp/vue/src/main.js
index d90c1a6e..d9a83596 100644
--- a/code/WebApp/vue/src/main.js
+++ b/code/WebApp/vue/src/main.js
@@ -10,9 +10,6 @@ import './styles/element-variables.scss'
 
 import '@/styles/index.scss' // global css
 
-import elTableTransfer from 'el-table-transfer'
-Vue.use(elTableTransfer)
-
 import App from './App'
 import store from './store'
 import router from './router'
@@ -54,10 +51,10 @@ import 'vue-happy-scroll/docs/happy-scroll.css'
  * Currently MockJs will be used in the production environment,
  * please remove it before going online ! ! !
  */
-if (process.env.NODE_ENV === 'production') {
-  const { mockXHR } = require('../mock')
-  mockXHR()
-}
+// if (process.env.NODE_ENV === 'production') {
+//   const { mockXHR } = require('../mock')
+//   mockXHR()
+// }
 
 Vue.use(Element, {
   size: Cookies.get('size') || 'medium', // set element-ui default size
@@ -98,16 +95,6 @@ import clickoutside from './directive'
 
 Vue.directive('clickoutside', clickoutside)
 
-// 注册一个全局自定义指令 `v-focus`
-Vue.directive('focus', {
-  // 当被绑定的元素插入到 DOM 中时……
-  inserted: function (el) {
-    // 聚焦元素
-    el.focus()
-    el.querySelector('input').focus()
-  }
-})
-
 //自定义指令
 import empty from './directive/empty'
 
diff --git a/code/WebApp/vue/src/permission.js b/code/WebApp/vue/src/permission.js
index 56dc5795..348e69aa 100644
--- a/code/WebApp/vue/src/permission.js
+++ b/code/WebApp/vue/src/permission.js
@@ -1,16 +1,17 @@
 import router from './router'
 import store from './store'
-import { Message } from 'element-ui'
+import {Message} from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
-import { getToken } from '@/utils/auth' // get token from cookie
+import {getToken} from '@/utils/auth' // get token from cookie
 import getPageTitle from '@/utils/get-page-title'
+import Lockr from "lockr";
 
-NProgress.configure({ showSpinner: false }) // NProgress Configuration
+NProgress.configure({showSpinner: false}) // NProgress Configuration
 
 const whiteList = ['/login', '/auth-redirect'] // no redirect whitelist
 
-router.beforeEach(async(to, from, next) => {
+router.beforeEach(async (to, from, next) => {
   // start progress bar
   NProgress.start()
 
@@ -23,28 +24,27 @@ router.beforeEach(async(to, from, next) => {
   if (hasToken) {
     if (to.path === '/login') {
       // if is logged in, redirect to the home page
-      next({ path: '/' })
+      next({path: '/'})
+      //next({path: '/first/dashboard'})
       NProgress.done()
     } else {
       // determine whether the user has obtained his permission roles through getInfo
       const hasRoles = store.getters.roles && store.getters.roles.length > 0
+      //获取当前组织ID
+      const hasOrg = Lockr.get("currentorgID")
       if (hasRoles) {
         next()
       } else {
         try {
-          // get user info
-          // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
-          const { roles } = await store.dispatch('user/getPermissions')
+            let {roles} = await store.dispatch('user/getPermissions') 
+            // generate accessible routes map based on roles
+            const accessRoutes = await store.dispatch('permission/generateRoutes', roles)
+            // dynamically add accessible routes
+            router.addRoutes(accessRoutes)
+            // hack method to ensure that addRoutes is complete
+            // set the replace: true, so the navigation will not leave a history record
+            next({...to, replace: true})
 
-          // generate accessible routes map based on roles
-          const accessRoutes = await store.dispatch('permission/generateRoutes', roles)
-
-          // dynamically add accessible routes,动态挂载路由
-          router.addRoutes(accessRoutes)
-
-          // hack method to ensure that addRoutes is complete
-          // set the replace: true, so the navigation will not leave a history record
-          next({ ...to, replace: true })
         } catch (error) {
           // remove token and go to login page to re-login
           await store.dispatch('user/resetToken')
@@ -62,7 +62,7 @@ router.beforeEach(async(to, from, next) => {
       next()
     } else {
       // other pages that do not have permission to access are redirected to the login page.
-			next(`/login?redirect=${to.path}`)
+      next(`/login?redirect=${to.path}`)
       NProgress.done()
     }
   }
diff --git a/code/WebApp/vue/src/router/index.js b/code/WebApp/vue/src/router/index.js
index 43e8fecf..f6552678 100644
--- a/code/WebApp/vue/src/router/index.js
+++ b/code/WebApp/vue/src/router/index.js
@@ -10,20 +10,17 @@ import Layout from '@/layout'
 import { managerRouter } from './modules/manager'
 import personRouter from './modules/person'
 import basedataRouter from './modules/basedata'
-import billdataRouter from './modules/vwKBdata'
-//import businessdataRouter from './modules/businessdata'
-import vwFisDataRouter from './modules/vwFisData'
+import BTOutDataRouter from './modules/benteng-out-data'
+import bentengdataRouter from './modules/bentengdata'
+import businessdataRouter from './modules/businessdata'
+import JFOutDataRouter from './modules/jf-out-data'
+import JFdataRouter from './modules/jfdata'
+import vwdataRouter from './modules/vwdata'
+import vwoutdataRouter from './modules/vw-out-data'
 import wheeldataRouter from './modules/wheeldata'
-import vwNoBarcodeRouter from './modules/vwKBNoBarcodedata'
+import HQdataRouter from './modules/hqdata'
+import HQOutDataRouter from './modules/hq-out-data'
 import JobTimeDataRouter from './modules/jobtimedata'
-import vwMenudataRouter from './modules/vw_menu'
-import hqMenudataRouter from './modules/hq_menu'
-import btcarDataRouter from './modules/bt_menu'
-import vwOutOrderDataRouter from './modules/vw_out_order'
-//import newjitRouter from './modules/newjit-basedata'
-import pgfis from './modules/fis'
-import pgfisPrint from './modules/fisprint'
-
 /**
  * Note: sub-menu only appear when route children.length >= 1
  * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
@@ -65,8 +62,6 @@ export const constantRoutes = [
   {
     path: '/login',
     component: () => import('@/views/login/index'),
-		//component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
-		//component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
     hidden: true
   },
   {
@@ -92,8 +87,7 @@ export const constantRoutes = [
     children: [
       {
         path: 'dashboard',
-        component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),//fis
-        //component: () => import('@/views/ux/backGroundWork'),
+        component: () => import('@/views/dashboard/admin/index'),
         name: 'Dashboard',
         meta: {
           title: '系统首页',
@@ -174,21 +168,20 @@ export const asyncRoutes = [
     ]
   },
   /** when your routing map is too long, you can split it into small modules **/
-  managerRouter,//系统首页
-  personRouter,//系统管理
- // basedataRouter,//基础数据维护
-  //vwMenudataRouter,//大众
-  //hqMenudataRouter,//红旗
-  //vwOutOrderDataRouter,
-  //btcarDataRouter,//一汽轿车
-  //vwFisDataRouter,//结算与开票数据导入
-  //billdataRouter,//销售结算与开票报表
-  //businessdataRouter,
-  //wheeldataRouter,//大众看板和备件
-    pgfisPrint,//排序单打印
-    pgfis,//派格fis
-  JobTimeDataRouter,//后台作业监控
-
+  managerRouter,
+  personRouter,
+  basedataRouter,
+  businessdataRouter,
+  wheeldataRouter,
+  vwdataRouter,
+  vwoutdataRouter,
+  bentengdataRouter,
+  BTOutDataRouter,
+  JFdataRouter,
+  JFOutDataRouter,
+  HQdataRouter,
+  HQOutDataRouter,
+  JobTimeDataRouter,
   // 404 page must be placed at the end !!!
   { path: '*', redirect: '/404', hidden: true }
 
diff --git a/code/WebApp/vue/src/router/modules/basedata.js b/code/WebApp/vue/src/router/modules/basedata.js
index 7709d2af..f081072d 100644
--- a/code/WebApp/vue/src/router/modules/basedata.js
+++ b/code/WebApp/vue/src/router/modules/basedata.js
@@ -1,23 +1,23 @@
-/** 车轮数据比对路由 */
+/** 客户管理路由 */
+//import Layout from '@/layout/firstLayout'
 import Layout from '@/layout'
-
 const basedataRouter = {
-  path: '/cpat/base',
+  path: '/basedata',
   component: Layout,
   redirect: 'basedata',
-  name: '基础数据维护',
-  //hidden: true,
+  name: 'BaseData',
+  //hidden: false,
   meta: {
-    //requiresAuth: true,
-    title: '基础数据维护',
+    //requiresAuth: false,
+    title: '基础数据',
     index: 0,
-    type: 'crm',
+    //type: 'crm',
     icon: '基础数据',
-    keepAlive: false,
+    //keepAlive: false,
   },
   children: [
     {
-      path: 'date-control',
+      path: '/centralizedControl',
       component: () => import('@/views/ux/basedata/centralizedControl/index'),
       name: 'CentralizedControl',//命名路由
       meta: {
@@ -27,59 +27,161 @@ const basedataRouter = {
       }
     },
     {
-      path: 'material',
-      component: () => import('@/views/ux/basedata/material/index'),
-      name: 'material',//命名路由
-      meta: { title: '物料主数据', roles: ['SettleAccount.Materials'], icon: '物料' }
+      path: '/factory',
+      component: () => import('@/views/ux/basedata/factory/index'),
+      name: 'Factory',//命名路由
+      meta: { title: '工厂设置', roles: ['SettleAccount.Factorys'], icon: '工厂' }
     },
     {
-      path: 'code-setting',
+      path: '/codeSetting',
       component: () => import('@/views/ux/basedata/codeSetting/index'),
       name: 'codeSetting',//命名路由
       meta: { title: '通用代码设置', roles: ['SettleAccount.CodeSettings'], icon: '通用' }
     },
     {
-      path: 'part-settlement',
-      component: () => import('@/views/ux/basedata/partsSettlement/index'),
-      name: 'partsSettlement',//命名路由
-      meta: {
-        title: '总成与结算件关系',
-        roles: ['SettleAccount.MaterialRelationships'],
-        icon: '零件'
-      }
+      path: '/material',
+      component: () => import('@/views/ux/basedata/material/index'),
+      name: 'material',//命名路由
+      meta: { title: '物料主数据', roles: ['SettleAccount.Materials'], icon: '物料' }
     },
     {
-      path: 'priceList',
-      component: () => import('@/views/ux/basedata/priceList/index'),
-      name: 'PriceList',//命名路由
+      path: '/customerStorageLocation',
+      component: () => import('@/views/ux/basedata/customerStorageLocation/index'),
+      name: 'customerStorageLocation',
       meta: {
-        title: '标准价格单',
-        roles: ['SettleAccount.PriceLists'],
-        icon: '结算'
+        title: '客户存储地点',
+        roles: ['SettleAccount.CustomerStorageLocations'],
+        icon: '客户'
       }
     },
     {
-      path: 'wms-kanban',
-      component: () => import('@/views/ux/vw/dataInput/wmsKanban'),
-      name: 'WMSVWKanBan',
+      path: '/partsSettlement',
+      component: () => import('@/views/ux/basedata/partsSettlement/index'),
+      name: 'partsSettlement',//命名路由
+      meta: { title: '零件匹配关系', roles: ['SettleAccount.MaterialRelationships'], icon: '零件' }
+    },
+
+    {
+      path: '/materialRelationSupplier',
+      component: () => import('@/views/ux/basedata/materialRelationSupplier/index'),
+      name: 'materialRelationSupplier',//命名路由
       meta: {
-          title: '大众看板发货明细',
-          roles: ['SettleAccount.Reports'],
-          icon: '供货'
+        title: '供应商零件设置',
+        roles: ['SettleAccount.SupplierItemSetUps'],//控制页面角色（可以设置多个角色）
+        icon: '供应商'
       }
-  },
-  {
-      path: 'wms-sparepart',
-      component: () => import('@/views/ux/vw/dataInput/wmsSparePart'),
-      name: 'WMSSparePart',//命名路由
+    },
+    {
+      path: '/carMaterialConfig',
+      component: () => import('@/views/ux/basedata/carMaterialConfig/index'),
+      name: 'CarMaterialConfig',//命名路由
       meta: {
-          title: '大众备件发货明细',
-          roles: ['SettleAccount.Reports'],
-          icon: '客户零件'
+        title: '车型代码与零件匹配',
+        roles: ['SettleAccount.CarMaterialConfigs'],//控制页面角色（可以设置多个角色）
+        icon: '车型'
       }
-  }
+    },
+    // {
+    //   path: '/modulesManager',
+    //   component: () => import('@/views/ux/basedata/modulesManager/index'),
+    //   name: 'ModulesManager',//命名路由
+    //   meta: {
+    //     title: '模板管理',
+    //     roles: ['SettleAccount.StockUnsettledDiffReports'],//控制页面角色（可以设置多个角色）
+    //     icon: '客户'
+    //   }
+    // }
   ]
 }
 
 export default basedataRouter
 
+
+// /** 客户管理路由 */
+// //import Layout from '@/layout/firstLayout'
+// import Layout from '@/layout'
+// const basedataRouter = {
+//   path: '/centralizedControl',
+//   component: Layout,
+//   redirect: '/centralizedControl',
+//   name: 'basedata',
+//   //hidden: false,
+//   meta: {
+//     //requiresAuth: false,
+//     title: '基础数据',
+//     index: 0,
+//     //type: 'crm',
+//     icon: '基础数据',
+//     //keepAlive: false,
+//   },
+//   children: [
+//     {
+//       path: 'centralizedControl',
+//       component: () => import('@/views/ux/basedata/centralizedControl/index'),
+//       name: 'CentralizedControl',//命名路由
+//       meta: {
+//         title: '期间设置',
+//         roles: ['SettleAccount.CentralizedControls'],
+//         icon: '期间'
+//       }
+//     },
+//     {
+//       path: 'factory',
+//       component: () => import('@/views/ux/basedata/factory/index'),
+//       name: 'Factory',//命名路由
+//       meta: { title: '工厂设置', roles: ['SettleAccount.Factorys'], icon: '工厂' }
+//     },
+//     {
+//       path: 'codeSetting',
+//       component: () => import('@/views/ux/basedata/codeSetting/index'),
+//       name: 'codeSetting',//命名路由
+//       meta: { title: '通用代码设置', roles: ['SettleAccount.CodeSettings'], icon: '通用' }
+//     },
+//     {
+//       path: 'material',
+//       component: () => import('@/views/ux/basedata/material/index'),
+//       name: 'material',//命名路由
+//       meta: { title: '物料主数据', roles: ['SettleAccount.Materials'], icon: '物料' }
+//     },
+//     {
+//       path: 'customerStorageLocation',
+//       component: () => import('@/views/ux/basedata/customerStorageLocation/index'),
+//       name: 'customerStorageLocation',
+//       meta: {
+//         title: '客户存储地点',
+//         roles: ['SettleAccount.CustomerStorageLocations'],
+//         icon: '客户'
+//       }
+//     },
+//     {
+//       path: 'partsSettlement',
+//       component: () => import('@/views/ux/basedata/partsSettlement/index'),
+//       name: 'partsSettlement',//命名路由
+//       meta: { title: '零件匹配关系', roles: ['SettleAccount.MaterialRelationships'], icon: '零件' }
+//     },
+
+//     {
+//       path: 'materialRelationSupplier',
+//       component: () => import('@/views/ux/basedata/materialRelationSupplier/index'),
+//       name: 'materialRelationSupplier',//命名路由
+//       meta: {
+//         title: '供应商零件设置',
+//         roles: ['SettleAccount.SupplierItemSetUps'],//控制页面角色（可以设置多个角色）
+//         icon: '供应商'
+//       }
+//     },
+//     {
+//       path: 'carMaterialConfig',
+//       component: () => import('@/views/ux/basedata/carMaterialConfig/index'),
+//       name: 'CarMaterialConfig',//命名路由
+//       meta: {
+//         title: '车型代码与零件匹配',
+//         roles: ['SettleAccount.CarMaterialConfigs'],//控制页面角色（可以设置多个角色）
+//         icon: '车型'
+//       }
+//     }
+//   ]
+// }
+
+// export default basedataRouter
+
diff --git a/code/WebApp/vue/src/router/modules/benteng-out-data.js b/code/WebApp/vue/src/router/modules/benteng-out-data.js
new file mode 100644
index 00000000..2d400f78
--- /dev/null
+++ b/code/WebApp/vue/src/router/modules/benteng-out-data.js
@@ -0,0 +1,173 @@
+/** 车轮数据比对路由 */
+//import Layout from '@/layout/firstLayout'
+import Layout from '@/layout'
+
+const BTOutDataRouter = {
+    path: '/bt',
+    component: Layout,
+    redirect: 'bt',
+    name: '奔腾-数据输出',
+    meta: {
+        requiresAuth: true,
+        title: '奔腾-数据输出',
+        index: 0,
+        type: 'crm',
+        icon: '奔腾',
+        keepAlive: false,
+    },
+    children: [
+        {
+            path: '/bt-stockUnsettledDiffReport',
+            component: () => import('@/views/ux/benteng-out-data/stockUnsettledDiffReport'),
+            name: 'stockUnsettledDiffReport',//命名路由
+            meta: {
+                title: '看板未结数与期末库存差异',
+                roles: ['SettleAccount.StockUnsettledDiffReports'],
+                icon: '调整'
+            }
+        },
+        {
+            path: '/bt-stockSettledDiffReport',
+            component: () => import('@/views/ux/benteng-out-data/stockSettledDiffReport'),
+            name: 'stockSettledDiffReport',
+            meta: {
+                title: '结算数据对比',
+                roles: ['SettleAccount.StockSettledDiffReports'],
+                icon: '结算对比'
+            }
+        },
+        {
+            path: '/bt-kb-not-consign',
+            component: () => import('@/views/ux/benteng-out-data/btNotConsignReport'),
+            name: 'btkbnotconsign',
+            meta: {
+
+                title: '发出未结算',
+                roles: ['SettleAccount.BTNotConsignReports'],
+                icon: '未结算'
+            }
+        },
+        {
+            path: '/bt-stockFisDiffReport',
+            component: () => import('@/views/ux/benteng-out-data/stockFisDiffReport'),
+            name: 'stockFisDiffReport',
+            meta: {
+
+                title: '看板发运对比',
+                roles: ['SettleAccount.StockFisDiffReports'],
+                icon: '库存对比'
+            }
+        },
+        {
+            path: '/bt-seq-kb-diff',
+            component: () => import('@/views/ux/benteng-out-data/btSeqKBDiffReport'),
+            name: 'btseqkbdiff',
+            meta: {
+                title: '车序与看板差异',
+                roles: ['SettleAccount.BTNotConsignReports'],
+                icon: '发运对比'
+            }
+        }
+        ,
+        {
+            path: '/bt-secondaryActuralDiffReport',
+            component: () => import('@/views/ux/benteng-out-data/secondaryActuralDiffReport'),
+            name: 'btsecondaryActuralDiffReport',
+            meta: {
+                title: '轿车二配相关',
+                roles: ['SettleAccount.SecondaryReports'],
+                icon: '二配'
+            }
+        }
+    ]
+}
+
+export default BTOutDataRouter
+
+
+// /** 车轮数据比对路由 */
+// //import Layout from '@/layout/firstLayout'
+// import Layout from '@/layout'
+
+// const BTOutDataRouter = {
+//     path: '/bt-stockUnsettledDiffReport',
+//     component: Layout,
+//     redirect: '/bt-stockUnsettledDiffReport',
+//     name: '奔腾-数据输出',
+//     meta: {
+//         requiresAuth: true,
+//         title: '奔腾-数据输出',
+//         index: 0,
+//         type: 'crm',
+//         icon: '奔腾',
+//         keepAlive: false,
+//     },
+//     children: [
+//         {
+//             path: 'bt-stockUnsettledDiffReport',
+//             component: () => import('@/views/ux/benteng-out-data/stockUnsettledDiffReport'),
+//             name: 'stockUnsettledDiffReport',//命名路由
+//             meta: {
+//                 title: '看板未结数与期末库存差异',
+//                 roles: ['SettleAccount.StockUnsettledDiffReports'],
+//                 icon: '调整'
+//             }
+//         },
+//         {
+//             path: 'bt-stockSettledDiffReport',
+//             component: () => import('@/views/ux/benteng-out-data/stockSettledDiffReport'),
+//             name: 'stockSettledDiffReport',
+//             meta: {
+//                 title: '结算数据对比',
+//                 roles: ['SettleAccount.StockSettledDiffReports'],
+//                 icon: '结算对比'
+//             }
+//         },
+//         {
+//             path: 'bt-kb-not-consign',
+//             component: () => import('@/views/ux/benteng-out-data/btNotConsignReport'),
+//             name: 'btkbnotconsign',
+//             meta: {
+
+//                 title: '发出未结算',
+//                 roles: ['SettleAccount.BTNotConsignReports'],
+//                 icon: '未结算'
+//             }
+//         },
+//         {
+//             path: 'bt-stockFisDiffReport',
+//             component: () => import('@/views/ux/benteng-out-data/stockFisDiffReport'),
+//             name: 'stockFisDiffReport',
+//             meta: {
+
+//                 title: '看板发运对比',
+//                 roles: ['SettleAccount.StockFisDiffReports'],
+//                 icon: '库存对比'
+//             }
+//         },
+//         {
+//             path: 'bt-seq-kb-diff',
+//             component: () => import('@/views/ux/benteng-out-data/btSeqKBDiffReport'),
+//             name: 'btseqkbdiff',
+//             meta: {
+//                 title: '车序与看板差异',
+//                 roles: ['SettleAccount.BTNotConsignReports'],
+//                 icon: '发运对比'
+//             }
+//         }
+//         ,
+//         {
+//             path: 'bt-secondaryActuralDiffReport',
+//             component: () => import('@/views/ux/benteng-out-data/secondaryActuralDiffReport'),
+//             name: 'btsecondaryActuralDiffReport',
+//             meta: {
+//                 title: '轿车二配相关',
+//                 roles: ['SettleAccount.SecondaryReports'],
+//                 icon: '二配'
+//             }
+//         }
+//     ]
+// }
+
+// export default BTOutDataRouter
+
diff --git a/code/WebApp/vue/src/router/modules/bentengdata.js b/code/WebApp/vue/src/router/modules/bentengdata.js
new file mode 100644
index 00000000..a9a23426
--- /dev/null
+++ b/code/WebApp/vue/src/router/modules/bentengdata.js
@@ -0,0 +1,63 @@
+/** 车轮数据比对路由 */
+//import Layout from '@/layout/firstLayout'
+import Layout from '@/layout'
+
+const bentengdataRouter = {
+    path: '/bt-car-seq',
+    component: Layout,
+    redirect: 'bt-car-seq',
+    name: '奔腾-数据输入',
+    meta: {
+        //requiresAuth: true,
+        title: '奔腾-数据输入',
+        index: 0,
+        type: 'crm',
+        icon: '奔腾',
+        keepAlive: false,
+    },
+    children: [
+        {
+            path: '/bt-car-seq',
+            component: () => import('@/views/ux/benteng/BTCarSeq'),
+            name: 'btcarseq',//命名路由
+            meta: {
+                title: '轿车车序',
+                roles: ['SettleAccount.BTCarSeqFirsts'],
+                icon: '轿车车序'
+            }
+        },
+        {
+            path: '/bt-car-kb',
+            component: () => import('@/views/ux/benteng/BTCarKB'),
+            name: 'BTCarKB',
+            meta: {
+                title: '轿车看板',
+                roles: ['SettleAccount.BTCarKBFirsts'],
+                icon: '看板'
+            }
+        },
+        {
+            path: '/bt-car-consign',
+            component: () => import('@/views/ux/benteng/BTCarConsign'),
+            name: 'BTCarConsign',
+            meta: {
+                title: '轿车结算数据',
+                roles: ['SettleAccount.BTCarConsigns'],
+                icon: '轿车结算数据'
+            }
+        },
+        {
+            path: '/secondaryAdjustmentBT',
+            component: () => import('@/views/ux/benteng/secondaryAdjustment'),
+            name: 'SecondaryAdjustmentBT',//命名路由
+            meta: {
+              title: '奔腾-二配数量调整',
+              roles: ['SettleAccount.BTCarConsigns'],
+              icon: '二配'
+            }
+          }
+    ]
+}
+
+export default bentengdataRouter
+
diff --git a/code/WebApp/vue/src/router/modules/bt_menu.js b/code/WebApp/vue/src/router/modules/bt_menu.js
deleted file mode 100644
index b20b3408..00000000
--- a/code/WebApp/vue/src/router/modules/bt_menu.js
+++ /dev/null
@@ -1,44 +0,0 @@
-//大众-FIS结算-路由
-import Layout from '@/layout'
-
-const btcarDataRouter = {
-  path: '/cpat',
-  component: Layout,
-  redirect: 'pg',
-  name: 'btcar',
-  //hidden: true,
-  meta: {
-    //requiresAuth: true,
-    title: '一轿奔腾',
-    index: 0,
-    type: 'crm',
-    icon: '单据导入',
-    keepAlive: false,
-  },
-  children: [
-    {
-      path: 'hq-car-platform',
-      component: () => import('@/views/ux/vw/dataInput/hq_bt'),
-      name: 'ERPEI',//命名路由
-      meta: {
-        title: '一轿奔腾导入',
-        roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色）
-        icon: '结算'
-      }
-    },
-    {
-      path: 'hq-car-platform-export',
-      component: () => import('@/views/ux/vw/dataInput/hq_m'),
-      name: 'ERPEI',//命名路由
-      meta: {
-        title: '一轿奔腾结算核对输出',
-        //roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色）
-        icon: '结算'
-      }
-    },
-
-  ]
-}
-
-export default btcarDataRouter
-
diff --git a/code/WebApp/vue/src/router/modules/businessdata.js b/code/WebApp/vue/src/router/modules/businessdata.js
index 74bedc2a..42b6c05f 100644
--- a/code/WebApp/vue/src/router/modules/businessdata.js
+++ b/code/WebApp/vue/src/router/modules/businessdata.js
@@ -1,62 +1,73 @@
-/** 数据比对路由 */
+/** 业务数据路由 */
 //import Layout from '@/layout/firstLayout'
 import Layout from '@/layout'
 
 const businessdataRouter = {
-    path: '/wms-js',
-    component: Layout,
-    redirect: 'wms-js',
-    name: '大众备件结算',
-    meta: {
-        //requiresAuth: true,
-        title: '大众看板备件发货',
-        index: 0,
-        type: 'crm',
-        icon: '业务',
-        keepAlive: false,
+  path: '/bomdatabase',
+  component: Layout,
+  redirect: 'bomdatabase',
+  name: 'BomdataBase',
+  meta: {
+    //requiresAuth: true,
+    title: '数据输入',
+    index: 0,
+    type: 'crm',
+    icon: '输入',
+    keepAlive: false,
+  },
+  children: [
+    {
+      path: '/bomdatabase',
+      component: () => import('@/views/ux/basedata/bomdatabase/index'),
+      name: 'Bomdatabase',//命名路由
+      meta: {
+        title: '产品结构',
+        roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色）
+        icon: '产品'
+      }
     },
-    children: [
-        // {
-        //     path: '/yu-fahuo-kb',
-        //     component: () => import('@/views/ux/businessdata/deliverGoodsDrag'),
-        //     name: 'jfcarkb',//命名路由
-        //     meta: {
-        //         title: '结算与开票数据对比',
-        //         roles: ['SettleAccount.Reports'],
-        //         icon: '发货'
-        //     }
-        // },
-        // {
-        //     path: '/jf-car-kb',
-        //     component: () => import('@/views/ux/businessdata/deliverGoods'),
-        //     name: 'jfcarkb',//命名路由
-        //     meta: {
-        //         title: '备件发出未结算数据',
-        //         roles: ['SettleAccount.Reports'],
-        //         icon: '发货'
-        //     }
-        // },
-        {
-            path: '/wms-kanban',
-            component: () => import('@/views/ux/vw/dataInput/wmsKanban'),
-            name: 'WMSVWKanBan',
-            meta: {
-                title: '大众看板发货明细',
-                roles: ['SettleAccount.Reports'],
-                icon: '供货'
-            }
-        },
-        {
-            path: '/wms-sparepart',
-            component: () => import('@/views/ux/vw/dataInput/wmsSparePart'),
-            name: 'WMSSparePart',//命名路由
-            meta: {
-                title: '大众备件发货明细',
-                roles: ['SettleAccount.Reports'],
-                icon: '客户零件'
-            }
-        }
-    ]
+    {
+      path: '/inventoryDetail',
+      component: () => import('@/views/ux/basedata/inventoryDetail/index'),
+      name: 'inventoryDetail',
+      meta: {
+        title: '库存明细',
+        roles: ['SettleAccount.InventoryDetails'],
+        icon: '库存'
+      }
+    },
+    {
+      path: '/estimatedSum',
+      component: () => import('@/views/ux/basedata/estimatedSum/index'),
+      name: 'estimatedSum',
+      meta: {
+        title: '应付暂估汇总',
+        roles: ['SettleAccount.EstimatedSums'],
+        icon: '应付暂估汇总'
+      }
+    },
+    {
+      path: '/estimatedInventoryDetail',
+      component: () => import('@/views/ux/basedata/estimatedInventoryDetail/index'),
+      name: 'estimatedInventoryDetail',
+      meta: {
+        title: '应付暂估收货明细',
+        roles: ['SettleAccount.EstimatedInventoryDetails'],
+        icon: '应付暂估收货明细'
+      }
+    },
+    {
+      path: '/secondaryPriceRatio',
+      component: () => import('@/views/ux/basedata/secondaryPriceRatio/index'),
+      name: 'secondaryPriceRatio',
+      meta: {
+        title: '产品结算价格',
+        roles: ['SettleAccount.SecondaryPriceRatios'],
+        icon: '结算'
+      }
+    }
+
+  ]
 }
 
 export default businessdataRouter
diff --git a/code/WebApp/vue/src/router/modules/first.js b/code/WebApp/vue/src/router/modules/first.js
index 11dff51a..19a84a41 100644
--- a/code/WebApp/vue/src/router/modules/first.js
+++ b/code/WebApp/vue/src/router/modules/first.js
@@ -1,5 +1,5 @@
 /** 项目管理路由 */
-import Layout from '@/layout/firstLayout'
+//import Layout from '@/layout/firstLayout'
 import basedataRouter from './basedata'
 import businessdataRouter from './businessdata'
 import wheeldataRouter from './wheeldata'
@@ -63,7 +63,7 @@ const customerRouter = {
 
 const fistRouter = {
   path: '/first',
-  component: Layout,
+  //component: Layout,
   redirect: '/first/dashboard',
   name: 'first',
   hidden: false,
diff --git a/code/WebApp/vue/src/router/modules/fis.js b/code/WebApp/vue/src/router/modules/fis.js
deleted file mode 100644
index 49233f81..00000000
--- a/code/WebApp/vue/src/router/modules/fis.js
+++ /dev/null
@@ -1,153 +0,0 @@
-/** 派格fis路由 */
-//import Layout from '@/layout/firstLayout'
-import Layout from '@/layout'
-
-const pgfis = {
-    path: '/pg-fis',
-    component: Layout,
-    redirect: 'fis',
-    name: 'pgfis',
-    meta: {
-        //requiresAuth: true,
-        title: 'JIT数据管理',
-        index: 0,
-        type: 'crm',
-        icon: '业务',
-        keepAlive: false,
-    },
-    children: [
-        {
-            path: '/customerPartCfg',
-            component: () => import('@/views/pg-fis/basedate/customerPartCfg'),
-            name: 'customerPartCfg',//命名路由
-            meta: {
-                title: '客户零件管理',
-                roles: ['SettleAccount.Reports'],
-                icon: '发货'
-            }
-        },
-        {
-            path: '/pg-assemblyCfg',
-            component: () => import('@/views/pg-fis/basedate/assemblyCfg'),
-            name: 'pg-assemblyCfg',//命名路由
-            meta: {
-                title: '总成模块管理',
-                roles: ['SettleAccount.Reports'],
-                icon: '发货'
-            }
-        },
-				{
-						path: '/pg-partSwitch',
-						component: () => import('@/views/pg-fis/basedate/partSwitch'),
-						name: 'pg-partSwitch',//命名路由
-						meta: {
-								title: '零件切换管理',
-								roles: ['SettleAccount.Reports'],
-								icon: '发货'
-						}
-				},
-        {
-            path: '/pg-unknownAssembly',
-            component: () => import('@/views/pg-fis/basedate/unknownAssembly'),
-            name: 'pg-unknownAssembly',//命名路由
-            meta: {
-                title: '未知总成模块管理',
-                roles: ['SettleAccount.Reports'],
-                icon: '发货'
-            }
-        },
-        {
-            path: '/pg-workLine',
-            component: () => import('@/views/pg-fis/basedate/productLine'),
-            name: 'pg-workLine',
-            meta: {
-                title: '生产线权限',
-                roles: ['SettleAccount.Reports'],
-                icon: '供货'
-            }
-        },
-        {
-            path: '/pg-M100BIll',
-            component: () => import('@/views/pg-fis/basedate/m100BIll'),
-            name: 'pg-M100BIll',//命名路由
-            meta: {
-                title: 'M100单据信息维护',
-                roles: ['SettleAccount.Reports'],
-                icon: '客户零件'
-            }
-        },
-        // {
-        //     path: '/pg-M100Online',
-        //     component: () => import('@/views/pg-fis/basedate/m100Online'),
-        //     name: 'pg-M100Online',//命名路由
-        //     meta: {
-        //         title: 'M100上线信息',
-        //         roles: ['SettleAccount.Reports'],
-        //         icon: '客户零件'
-        //     }
-        // },
-        // {
-        //     path: '/pg-m100normal-print',
-        //     component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
-        //     name: 'pg-M100Online',//命名路由
-        //     meta: {
-        //         title: '日常打印M100信息',
-        //         //roles: ['SettleAccount.Reports'],
-        //         icon: '客户零件'
-        //     }
-        // },
-        // {
-        //     path: '/select',
-        //     component: () => import('@/views/pg-fis/basedate/select'),
-        //     name: 'select',//命名路由
-        //     meta: {
-        //         title: 'M100查询',
-        //         roles: ['SettleAccount.Reports'],
-        //         icon: '客户零件'
-        //     }
-        // },
-        {
-            path: '/pg-R100Online',
-            component: () => import('@/views/pg-fis/basedate/r100Online'),
-            name: 'pg-R100Online',//命名路由
-            meta: {
-                title: 'R100上线信息',
-                roles: ['SettleAccount.Reports'],
-                icon: '客户零件'
-            }
-        },
-        {
-            path: '/pg-weldingAssembly',
-            component: () => import('@/views/pg-fis/basedate/weldingAssembly'),
-            name: 'pg-weldingAssembly',//命名路由
-            meta: {
-                title: '焊装总装对比',
-                roles: ['SettleAccount.Reports'],
-                icon: '客户零件'
-            }
-        },
-        {
-            path: '/pg-logRemind',
-            component: () => import('@/views/pg-fis/basedate/logRemind'),
-            name: 'pg-logRemind',//命名路由
-            meta: {
-                title: '系统内通知',
-                roles: ['SettleAccount.Reports'],
-                icon: '客户零件'
-            }
-        },
-        {
-            path: '/pg-repeatR100',
-            component: () => import('@/views/pg-fis/basedate/repeatR100'),
-            name: 'pg-repeatR100',//命名路由
-            meta: {
-                title: '重复报文',
-                roles: ['SettleAccount.Reports'],
-                icon: '客户零件'
-            }
-        }
-    ]
-}
-
-export default pgfis
-
diff --git a/code/WebApp/vue/src/router/modules/fisprint.js b/code/WebApp/vue/src/router/modules/fisprint.js
deleted file mode 100644
index ea3309a8..00000000
--- a/code/WebApp/vue/src/router/modules/fisprint.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/** 派格fis路由 */
-//import Layout from '@/layout/firstLayout'
-import Layout from '@/layout'
-
-const pgfisPrint = {
-    path: '/pg-fis-print',
-    component: Layout,
-    redirect: 'fisprint',
-    name: 'pgfis',
-    meta: {
-        //requiresAuth: true,
-        title: '排序单打印',
-        index: 0,
-        type: 'crm',
-        icon: '业务',
-        keepAlive: false,
-    },
-    children: [
-        {
-            path: '/pg-m100normal-print',
-            component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
-            name: 'pg-M100Online',//命名路由
-            meta: {
-                title: '日常打印M100信息',
-                //roles: ['SettleAccount.Reports'],
-                icon: '客户零件'
-            }
-        },
-        {
-            path: '/select',
-            component: () => import('@/views/pg-fis/basedate/select'),
-            name: 'select',//命名路由
-            meta: {
-                title: 'M100查询',
-                //roles: ['SettleAccount.Reports'],
-                icon: '结算对比'
-            }
-        }
-        
-    ]
-}
-
-export default pgfisPrint
-
diff --git a/code/WebApp/vue/src/router/modules/hq-out-data.js b/code/WebApp/vue/src/router/modules/hq-out-data.js
new file mode 100644
index 00000000..80e29b85
--- /dev/null
+++ b/code/WebApp/vue/src/router/modules/hq-out-data.js
@@ -0,0 +1,88 @@
+/** 车轮数据比对路由 */
+//import Layout from '@/layout/firstLayout'
+import Layout from '@/layout'
+
+const HQOutDataRouter = {
+    path: '/hq',
+    component: Layout,
+    redirect: 'hq',
+    name: 'HQ',
+    meta: {
+        //requiresAuth: true,
+        title: '红旗-数据输出',
+        index: 0,
+        type: 'crm',
+        icon: '红旗',
+        keepAlive: false,
+    },
+    children: [
+        {
+            path: '/hq-standardUnConsign',
+            component: () => import('@/views/ux/hq-out-data/standardUnConsign'),
+            name: 'StandardUnConsign',//命名路由
+            meta: {
+          
+                title: '标准看板发出未结算',
+                roles: ['SettleAccount.HQNotConsignReports'],
+                icon: '未结算'
+            }
+        },
+        {
+            path: '/hq-specialUnConsign',
+            component: () => import('@/views/ux/hq-out-data/specialUnConsign'),
+            name: 'SpecialUnConsign',
+            meta: {
+              
+                title: '特殊看板发出未结算',
+                roles: ['SettleAccount.HQSPNotConsignReports'],
+                icon: '结算对比'
+            }
+        },
+        {
+            path: '/hq-stockFisDiffReport',
+            component: () => import('@/views/ux/hq-out-data/stockFisDiffReport'),
+            name: 'StockFisDiffReport',
+            meta: {
+              
+                title: '看板发运对比',
+                roles: ['SettleAccount.HQNotConsignReports'],
+                icon: '发运对比'
+            }
+        },
+        {
+            path: '/hq-stockSettledDiffReport',
+            component: () => import('@/views/ux/hq-out-data/stockSettledDiffReport'),
+            name: 'StockFisDiffReport',
+            meta: {
+              
+                title: '结算数据对比',
+                roles: ['SettleAccount.HQSPNotConsignReports'],
+                icon: '结算对比'
+            }
+        },
+        {
+            path: '/hq-stockUnsettledDiffReport',
+            component: () => import('@/views/ux/hq-out-data/stockUnsettledDiffReport'),
+            name: 'stockUnsettledDiffReport',//命名路由
+            meta: {
+                title: '看板未结数与期末库存差异',
+                roles: ['SettleAccount.HQSPNotConsignReports'],
+                icon: '调整'
+            }
+        }
+        ,
+        {
+            path: '/bt-secondaryActuralDiffReportHQ',
+            component: () => import('@/views/ux/hq-out-data/secondaryActuralDiffReport'),
+            name: 'SecondaryActuralDiffReportHQ',
+            meta: {
+                title: '红旗二配相关',
+                roles: ['SettleAccount.HQSPNotConsignReports'],
+                icon: '二配'
+            }
+        }
+    ]
+}
+
+export default HQOutDataRouter
+
diff --git a/code/WebApp/vue/src/router/modules/hq_menu.js b/code/WebApp/vue/src/router/modules/hq_menu.js
deleted file mode 100644
index be030aad..00000000
--- a/code/WebApp/vue/src/router/modules/hq_menu.js
+++ /dev/null
@@ -1,125 +0,0 @@
-
-import Layout from '@/layout'
-
-const hqMenudataRouter = {
-    path: '/capt-hq',
-    component: Layout,
-    redirect: 'ux/vw/dataInput/hq_h',
-    name: 'HQData',
-    meta: {
-        title: '红旗工厂',
-        icon: '红旗',
-        //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns', 'SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'],
-        keepAlive: false,
-    },
-    children: [
-        {
-            path: '/import-h-data',
-            name: 'import-h-data',//命名路由-二级
-            component: () => import('@/views/ux/vw/dataInput/hq_h'),
-            redirect: 'ux/vw/dataInput/hq_h',
-            meta: {
-                title: 'H平台',
-                // roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'],
-                icon: '看板'
-            },
-            children: [
-                {
-                    path: 'hq-H-platform',
-                    component: () => import('@/views/ux/vw/dataInput/hq_h'),
-                    name: 'ERPEI',//命名路由
-                    meta: {
-                        title: '红旗H平台导入',
-                        roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色）
-                        icon: '结算'
-                    }
-                },
-                {
-                    path: 'hq-H-platform-export',
-                    component: () => import('@/views/ux/vw/dataInput/ScrapClaims'),
-                    name: 'ScrapClaims',
-                    meta: {
-                        title: 'H平台结算差异输出',
-                        roles: ['SettleAccount.FISs'],
-                        icon: '文件'
-                    }
-                }
-            ]
-        },
-        {
-            path: '/export-m-data',
-            component: () => import('@/views/ux/vw/dataInput/hq_m'),
-            name: 'export-m-data',//命名路由
-            redirect: '/ux/vw/dataInput/hq_m',
-            meta: {
-                title: 'M平台',
-                //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'],
-                icon: '结算'
-            },
-            children: [
-                {
-                    path: 'hq-M-platform',
-                    component: () => import('@/views/ux/vw/dataInput/hq_m'),
-                    name: 'ERPEI',//命名路由
-                    meta: {
-                      title: '红旗M平台导入',
-                      //roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色）
-                      icon: '结算'
-                    }
-                  },
-
-                {
-                    path: 'hq-M-platform-export',
-                    component: () => import('@/views/ux/billManage/sparePart'),
-                    name: 'SparePartReport',//命名路由
-                    meta: {
-                        title: 'H平台结算差异输出',
-                        //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色）
-                        icon: '二配'
-                    }
-                }
-            ]
-        },
-        {
-            path: '/export-f-data',
-            component: () => import('@/views/ux/vw/dataInput/hq_f'),
-            name: 'export-f-data',//命名路由
-            redirect: '/ux/vw/dataInput/hq_f',
-            meta: {
-                title: 'F平台',
-                //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'],
-                icon: '结算'
-            },
-            children: [
-                {
-                    path: 'hq-F-platform',
-                    component: () => import('@/views/ux/vw/dataInput/hq_f'),
-                    name: 'ERPEI',//命名路由
-                    meta: {
-                      title: '红旗F平台导入',
-                      //roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色）
-                      icon: '结算'
-                    }
-                  },
-
-                {
-                    path: 'hq-F-platform-export',
-                    component: () => import('@/views/ux/billManage/sparePart'),
-                    name: 'SparePartReport',//命名路由
-                    meta: {
-                        title: 'F平台结算差异输出',
-                        //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色）
-                        icon: '二配'
-                    }
-                }
-            ]
-        }
-    ]
-}
-
-export default hqMenudataRouter
-
-
-
-
-
diff --git a/code/WebApp/vue/src/router/modules/hq_out_order.js b/code/WebApp/vue/src/router/modules/hq_out_order.js
deleted file mode 100644
index efa9f133..00000000
--- a/code/WebApp/vue/src/router/modules/hq_out_order.js
+++ /dev/null
@@ -1,64 +0,0 @@
-//大众-FIS结算-路由
-import Layout from '@/layout'
-
-const hqOutOrderDataRouter = {
-  path: '/cpat-order',
-  component: Layout,
-  redirect: 'pg',
-  name: '业务数据',
-  //hidden: true,
-  meta: {
-    //requiresAuth: true,
-    title: '红旗出库单管理',
-    index: 0,
-    type: 'crm',
-    icon: '单据导入',
-    keepAlive: false,
-  },
-  children: [
-    {
-      path: 'hq-h-outorder',
-      component: () => import('@/views/ux/billManage/vwOutOrder/index'),
-      name: 'SettleAccount',//命名路由
-      meta: {
-        title: '大众准时化出库单',
-        roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-        icon: '结算'
-      }
-    },
-    {
-      path: 'hq-m-outorder',
-      component: () => import('@/views/ux/billManage/kanbanOutOrder/index'),
-      name: 'SettleAccount',//命名路由
-      meta: {
-        title: '大众看板出库单',
-        roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-        icon: '结算'
-      }
-    },
-    {
-      path: 'hq-f-withoutorder',
-      component: () => import('@/views/ux/billManage/kanbanWithOutOrder/index'),
-      name: 'SettleAccount',//命名路由
-      meta: {
-        title: '大众无条码看板出库单',
-        roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-        icon: '结算'
-      }
-    },
-    {
-      path: 'hq-car-outorder',
-      component: () => import('@/views/ux/billManage/sparepartOutOrder/index'),
-      name: 'Invoices',//命名路由
-      meta: {
-        title: '大众备件出库单',
-        roles: ['SettleAccount.Invoices'],
-        icon: '对比'
-      }
-    },
-
-  ]
-}
-
-export default hqOutOrderDataRouter
-
diff --git a/code/WebApp/vue/src/router/modules/hqdata.js b/code/WebApp/vue/src/router/modules/hqdata.js
new file mode 100644
index 00000000..13cb3535
--- /dev/null
+++ b/code/WebApp/vue/src/router/modules/hqdata.js
@@ -0,0 +1,286 @@
+// /** 车轮数据比对路由 */
+// //import Layout from '@/layout/firstLayout'
+// import Layout from '@/layout'
+
+// const HQdataRouter = {
+//     path: '/qh-car',
+//     component: Layout,
+//     redirect: 'hq-car',
+//     name: '红旗-数据输入',
+//     meta: {
+//         //requiresAuth: true,
+//         title: '红旗-数据输入',
+//         // index: 0,
+//         // type: 'crm',
+//         icon: '红旗',
+//         keepAlive: false,
+//     },
+//     children: [
+//         {
+//             path: 'kanban',
+//             name: 'hqcarkb',//命名路由
+//             component: () => import('@/views/ux/hqdata/index'),
+//             redirect: 'kanban',
+//             meta: {
+//                 title: '看板输入表',
+//                 icon: '看板'
+//             },
+//             children: [
+//                 {
+//                     path: 'standardKanban',
+//                     component: () => import('@/views/ux/hqdata/standardKanban'),
+//                     name: 'StandardKanban',
+//                     meta: {
+//                         title: '标准看板',
+//                         roles: ['SettleAccount.HQKBs'],
+//                         icon: '标准看板'
+//                     }
+//                 },
+//                 {
+//                     path: 'specialKanban',
+//                     component: () => import('@/views/ux/hqdata/specialKanban'),
+//                     name: 'SpecialKanban',
+//                     meta: {
+//                         title: '特殊看板',
+//                         roles: ['SettleAccount.HQSpecKBs'],
+//                         icon: '特殊看板'
+//                     }
+//                 }
+//             ]
+//         },
+//         {
+//             path: 'jiesuan',
+//             component: () => import('@/views/ux/hqdata/index'),
+//             name: 'hqcarjs',//命名路由
+//             redirect: 'jiesuan',
+//             meta: {
+//                 title: '结算输入表',
+//                 icon: '结算'
+//             },
+//             children: [
+//                 {
+//                     path: 'consign',
+//                     component: () => import('@/views/ux/hqdata/standardConsign'),
+//                     name: 'StandardConsign',
+//                     meta: {
+//                         title: '标准结算数据',
+//                         roles: ['SettleAccount.HQConsigns'],
+//                         icon: '标准看板'
+//                     }
+//                 },
+//                 {
+//                     path: 'spec-consign',
+//                     component: () => import('@/views/ux/hqdata/specialConsign'),
+//                     name: 'SpecialConsign',
+//                     meta: {
+//                         title: '特殊结算数据',
+//                         roles: ['SettleAccount.HQSpecConsigns'],
+//                         icon: '特殊看板'
+//                     }
+//                 }
+//             ]
+//         }
+//     ]
+// }
+
+// export default HQdataRouter
+
+import Layout from '@/layout'
+// 嵌套路由的使用：第一层
+import FirstIndex from '@/views/ux/hqdata/index'
+// 嵌套路由的使用：第二层
+import SecondJSIndex from '@/views/ux/hqdata/jiesuan/index'
+import SecondKBIndex from '@/views/ux/hqdata/kanban/index'
+
+
+const HQdataRouter = {
+    path: '/ux/hqdata',
+    component: Layout,
+    redirect: 'ux/hqdata/kanban/standardKanban',
+    name: 'HQData',
+    meta: {
+        //requiresAuth: true,
+        title: '红旗-数据输入',
+        //index: 0,
+        // type: 'crm',
+        icon: '红旗',
+        roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns', 'SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'],
+        keepAlive: false,
+    },
+    children: [
+        {
+            path: '/kanban',
+            name: 'Kanban',//命名路由-二级
+            component: () => import('@/views/ux/hqdata/index'),
+            redirect: 'ux/hqdata/kanban/standardKanban',
+            meta: {
+                title: '看板输入表',
+                roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'],
+                icon: '看板'
+            },
+            children: [
+                {
+                    path: '/standardKanban',
+                    component: () => import('@/views/ux/hqdata/kanban/standardKanban'),
+                    name: 'StandardKanban',
+                    meta: {
+                        title: '标准看板',
+                        roles: ['SettleAccount.HQKBs'],
+                        icon: '标准看板'
+                    }
+                },
+                {
+                    path: '/specialKanban',
+                    component: () => import('@/views/ux/hqdata/kanban/specialKanban'),
+                    name: 'SpecialKanban',
+                    meta: {
+                        title: '特殊看板',
+                        roles: ['SettleAccount.HQSpecKBs'],
+                        icon: '特殊看板'
+                    }
+                }
+            ]
+        },
+        {
+            path: '/jiesuan',
+            component: () => import('@/views/ux/hqdata/index'),
+            name: 'Jiesuan',//命名路由
+            redirect: '/ux/hqdata/jiesuan/standardConsign',
+            meta: {
+                title: '结算输入表',
+                roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'],
+                icon: '结算'
+            },
+            children: [
+                {
+                    path: '/standardConsign',
+                    component: () => import('@/views/ux/hqdata/jiesuan/standardConsign'),
+                    name: 'StandardConsign',
+                    meta: {
+                        title: '标准结算数据',
+                        roles: ['SettleAccount.HQConsigns'],
+                        icon: '标准看板'
+                    }
+                },
+                {
+                    path: '/specialConsign',
+                    component: () => import('@/views/ux/hqdata/jiesuan/specialConsign'),
+                    name: 'SpecialConsign',
+                    meta: {
+                        title: '特殊结算数据',
+                        roles: ['SettleAccount.HQSpecConsigns'],
+                        icon: '特殊看板'
+                    }
+                }
+            ]
+        },
+        {
+            path: '/secondaryAdjustmentHQ',
+            component: () => import('@/views/ux/hqdata/secondaryAdjustment'),
+            name: 'SecondaryAdjustmentHQ',//命名路由
+            meta: {
+                title: '红旗-二配数量调整',
+                roles: ['SettleAccount.HQSpecKBs'],
+                icon: '二配'
+            }
+        }
+    ]
+}
+
+export default HQdataRouter
+
+
+
+
+
+
+// /** 车轮数据比对路由 */
+// //import Layout from '@/layout/firstLayout'
+// import Layout from '@/layout'
+
+
+// const HQdataRouter = {
+//     path: '/hqdata',
+//     component: Layout,
+//     redirect: 'qh-car',
+//     name: 'qh-car',
+//     meta: {
+//         //requiresAuth: true,
+//         title: '红旗-数据输入',
+//         //index: 0,
+//         // type: 'crm',
+//         icon: '红旗',
+//         keepAlive: false,
+//     },
+//     children: [
+//         {
+//             path: '/qh-car/kanban',
+//             name: 'hqcarKB',//命名路由
+//             component: () => import('@/views/ux/hqdata/kanban/index'),
+//             redirect: 'kanban',
+//             meta: {
+//                 title: '看板输入表',
+//                 icon: '看板'
+//             },
+//             children: [
+//                 {
+//                     path: '/standardKanban',
+//                     component: () => import('@/views/ux/hqdata/kanban/standardKanban'),
+//                     name: 'StandardKanban',
+//                     meta: {
+//                         title: '标准看板',
+//                         roles: ['SettleAccount.HQKBs'],
+//                         icon: '标准看板'
+//                     }
+//                 },
+//                 {
+//                     path: '/specialKanban',
+//                     component: () => import('@/views/ux/hqdata/kanban/specialKanban'),
+//                     name: '/SpecialKanban',
+//                     meta: {
+//                         title: '特殊看板',
+//                         roles: ['SettleAccount.HQSpecKBs'],
+//                         icon: '特殊看板'
+//                     }
+//                 }
+//             ]
+//         },
+//         {
+//             path: '/qh-car/jiesuan',
+//             component: () => import('@/views/ux/hqdata/jiesuan/index'),
+//             name: 'hqcarjs',//命名路由
+//             redirect: 'jiesuan',
+//             meta: {
+//                 title: '结算输入表',
+//                 icon: '结算'
+//             },
+//             children: [
+//                 {
+//                     path: '/consign',
+//                     component: () => import('@/views/ux/hqdata/jiesuan/standardConsign'),
+//                     name: 'StandardConsign',
+//                     meta: {
+//                         title: '标准结算数据',
+//                         roles: ['SettleAccount.HQConsigns'],
+//                         icon: '标准看板'
+//                     }
+//                 },
+//                 {
+//                     path: '/spec-consign',
+//                     component: () => import('@/views/ux/hqdata/jiesuan/specialConsign'),
+//                     name: 'SpecialConsign',
+//                     meta: {
+//                         title: '特殊结算数据',
+//                         roles: ['SettleAccount.HQSpecConsigns'],
+//                         icon: '特殊看板'
+//                     }
+//                 }
+//             ]
+//         }
+//     ]
+// }
+
+// export default HQdataRouter
+
+
+
diff --git a/code/WebApp/vue/src/router/modules/jf-out-data.js b/code/WebApp/vue/src/router/modules/jf-out-data.js
new file mode 100644
index 00000000..b02c5886
--- /dev/null
+++ b/code/WebApp/vue/src/router/modules/jf-out-data.js
@@ -0,0 +1,133 @@
+// /** 车轮数据比对路由 */
+// //import Layout from '@/layout/firstLayout'
+// import Layout from '@/layout'
+
+// const JFOutDataRouter = {
+//     path: '/jf-out',
+//     component: Layout,
+//     redirect: '/jf-out',
+//     name: '解放-数据输出',
+//     meta: {
+//         //requiresAuth: true,
+//         title: '解放-数据输出',
+//         index: 0,
+//         type: 'crm',
+//         icon: '一汽',
+//         keepAlive: false,
+//     },
+//     children: [
+//         {
+//             path: 'jf-stockUnsettledDiffReport',
+//             component: () => import('@/views/ux/faw-out-data/stockUnsettledDiffReport'),
+//             name: 'stockUnsettledDiffReport',//命名路由
+//             meta: {
+          
+//                 title: '未结与期末库存对比',
+//                 roles: ['SettleAccount.StockUnsettledDiffReports'],
+//                 icon: '库存对比'
+//             }
+//         },
+//         {
+//             path: 'jf-stockSettledDiffReport',
+//             component: () => import('@/views/ux/faw-out-data/stockSettledDiffReport'),
+//             name: 'stockSettledDiffReport',
+//             meta: {
+              
+//                 title: '结算数据对比',
+//                 roles: ['SettleAccount.StockSettledDiffReports'],
+//                 icon: '结算对比'
+//             }
+//         },
+//         {
+//             path: 'jf-stockFisDiffReport',
+//             component: () => import('@/views/ux/faw-out-data/stockFisDiffReport'),
+//             name: 'stockFisDiffReport',
+//             meta: {
+         
+//                 title: '发运数据对比',
+//                 roles: ['SettleAccount.StockFisDiffReports'],
+//                 icon: '发运对比'
+//             }
+//         },
+//         {
+//             path: 'jf-kb-not-consign',
+//             component: () => import('@/views/ux/faw-out-data/jfNotConsignReport'),
+//             name: 'jfkbnotconsign',
+//             meta: {
+//                 title: '看板发出未结算',
+//                 roles: ['SettleAccount.JFNotConsignReports'],
+//                 icon: '未结算'
+//             }
+//         }
+//     ]
+// }
+
+// export default JFOutDataRouter
+
+/** 车轮数据比对路由 */
+//import Layout from '@/layout/firstLayout'
+import Layout from '@/layout'
+
+const JFOutDataRouter = {
+    path: '/jf-out',
+    component: Layout,
+    redirect: 'jf-out',
+    name: '解放-数据输出',
+    meta: {
+        //requiresAuth: true,
+        title: '解放-数据输出',
+        index: 0,
+        type: 'crm',
+        icon: '一汽',
+        keepAlive: false,
+    },
+    children: [
+        {
+            path: '/jf-stockUnsettledDiffReport',
+            component: () => import('@/views/ux/faw-out-data/stockUnsettledDiffReport'),
+            name: 'stockUnsettledDiffReport',//命名路由
+            meta: {
+          
+                title: '未结与期末库存对比',
+                roles: ['SettleAccount.StockUnsettledDiffReports'],
+                icon: '库存对比'
+            }
+        },
+        {
+            path: '/jf-stockSettledDiffReport',
+            component: () => import('@/views/ux/faw-out-data/stockSettledDiffReport'),
+            name: 'stockSettledDiffReport',
+            meta: {
+              
+                title: '结算数据对比',
+                roles: ['SettleAccount.StockSettledDiffReports'],
+                icon: '结算对比'
+            }
+        },
+        {
+            path: '/jf-stockFisDiffReport',
+            component: () => import('@/views/ux/faw-out-data/stockFisDiffReport'),
+            name: 'stockFisDiffReport',
+            meta: {
+         
+                title: '发运数据对比',
+                roles: ['SettleAccount.StockFisDiffReports'],
+                icon: '发运对比'
+            }
+        },
+        {
+            path: '/jf-kb-not-consign',
+            component: () => import('@/views/ux/faw-out-data/jfNotConsignReport'),
+            name: 'jfkbnotconsign',
+            meta: {
+                title: '看板发出未结算',
+                roles: ['SettleAccount.JFNotConsignReports'],
+                icon: '未结算'
+            }
+        }
+    ]
+}
+
+export default JFOutDataRouter
+
+
diff --git a/code/WebApp/vue/src/router/modules/jfdata.js b/code/WebApp/vue/src/router/modules/jfdata.js
new file mode 100644
index 00000000..306b9965
--- /dev/null
+++ b/code/WebApp/vue/src/router/modules/jfdata.js
@@ -0,0 +1,43 @@
+/** 车轮数据比对路由 */
+//import Layout from '@/layout/firstLayout'
+import Layout from '@/layout'
+
+const JFdataRouter = {
+    path: '/jf-in',
+    component: Layout,
+    redirect: 'jf-in',
+    name: '解放-数据输入',
+    meta: {
+        //requiresAuth: true,
+        title: '解放-数据输入',
+        index: 0,
+        type: 'crm',
+        icon: '一汽',
+        keepAlive: false,
+    },
+    children: [
+        {
+            path: '/jf-car-kb',
+            component: () => import('@/views/ux/fawdata/JFCarKB'),
+            name: 'jfcarkb',//命名路由
+            meta: {
+                title: '解放看板',
+                roles: ['SettleAccount.JFCarKBs'],
+                icon: '看板'
+            }
+        },
+        {
+            path: '/jf-car-consign',
+            component: () => import('@/views/ux/fawdata/JFCarConsign'),
+            name: 'JFCarConsign',
+            meta: {
+                title: '解放结算数据',
+                roles: ['SettleAccount.JFCarConsigns'],
+                icon: '结算'
+            }
+        }
+    ]
+}
+
+export default JFdataRouter
+
diff --git a/code/WebApp/vue/src/router/modules/jobtimedata.js b/code/WebApp/vue/src/router/modules/jobtimedata.js
index 8d246fff..d8d4214d 100644
--- a/code/WebApp/vue/src/router/modules/jobtimedata.js
+++ b/code/WebApp/vue/src/router/modules/jobtimedata.js
@@ -19,13 +19,23 @@ const JobTimeDataRouter = {
         {
             path: '/backGroundWork',
             component: () => import('@/views/ux/backGroundWork'),
-            name: 'BackGroundWork',
+            name: 'StockFisDiffReport',
             meta: {
               
                 title: '后台作业监控',
                 //roles: ['SettleAccount.HQSPNotConsignReports'],
                 icon: '结算对比'
             }
+        },
+        {
+            path: '/druid',
+            //component: () => import('@/views/ux/hq-out-data/stockUnsettledDiffReport'),
+            name: 'stockUnsettledDiffReport',//命名路由
+            meta: {
+                title: '服务监控',
+                //roles: ['SettleAccount.HQSPNotConsignReports'],
+                icon: '调整'
+            }
         }
     ]
 }
diff --git a/code/WebApp/vue/src/router/modules/newjit-basedata.js b/code/WebApp/vue/src/router/modules/newjit-basedata.js
deleted file mode 100644
index e494d753..00000000
--- a/code/WebApp/vue/src/router/modules/newjit-basedata.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/** jit路由 */
-import Layout from '@/layout'
-
-const newjitRouter = {
-  path: '/newjit-basedata',
-  component: Layout,
-  redirect: 'newjit-basedata',
-  name: 'Newjit',
-  //hidden: true,
-  meta: {
-    //requiresAuth: true,
-    title: 'FIS数据管理',
-    index: 0,
-    type: 'crm',
-    icon: '基础数据',
-    keepAlive: false,
-  },
-  children: [
-    // {
-    //   path: '/excludePartCfgs',
-    //   component: () => import('@/views/newJit/baseData/excludePartCfgs/index'),
-    //   name: 'ExcludePartCfgs',//命名路由
-    //   meta: {
-    //     title: '排除零件配置',
-    //     //roles: [], 
-    //     icon: '客户零件'
-    //   }
-    // },
-    {
-      path: '/repeatM100',
-      component: () => import('@/views/newJit/baseData/repeatR100/index'),
-      name: 'RepeatM100',//命名路由 
-      meta: {
-        title: '重复报文查询',
-        //roles: [], 
-        icon: '期间'
-      }
-    },
-    {
-      path: '/billM100',
-      component: () => import('@/views/newJit/baseData/billM100/index'),
-      name: 'BillM100',//命名路由
-      meta: {
-        title: 'M100上线信息',
-        //roles: [], 
-        icon: '工厂'
-      }
-    },
-    // {
-    //   path: '/billM100Manager',
-    //   component: () => import('@/views/newJit/baseData/billM100Manager/index'),
-    //   name: 'BillM100Manager',//命名路由
-    //   meta: {
-    //     title: 'M100信息管理',
-    //     //roles: [], 
-    //     icon: '输入'
-    //   }
-    // },
-    {
-      path: '/assemblyCfg',
-      component: () => import('@/views/newJit/baseData/assemblyCfg/index'),
-      name: 'AssemblyCfg',//命名路由
-      meta: {
-        title: '总成模块管理',
-        //roles: [], 
-        icon: '批量'
-      }
-    },
-    {
-      path: '/unknownAssembly',
-      component: () => import('@/views/newJit/baseData/unknownAssembly/index'),
-      name: 'UnknownAssembly',//命名路由
-      meta: {
-        title: '未知总成管理',
-        //roles: [], 
-        icon: '未结算'
-      }
-    }
-    ,
-    {
-      path: '/logRemind',
-      component: () => import('@/views/newJit/baseData/logRemind/index'),
-      name: 'LogRemind',//命名路由
-      meta: {
-        title: '系统内通知',
-        //roles: [], 
-        icon: 'log',
-        num: 0
-      }
-    }
-  ]
-}
-
-export default newjitRouter
-
diff --git a/code/WebApp/vue/src/router/modules/vw-out-data.js b/code/WebApp/vue/src/router/modules/vw-out-data.js
new file mode 100644
index 00000000..66ed5216
--- /dev/null
+++ b/code/WebApp/vue/src/router/modules/vw-out-data.js
@@ -0,0 +1,72 @@
+/** 大众-数据输出-路由 */
+//import Layout from '@/layout/firstLayout'
+import Layout from '@/layout'
+
+const vwoutdataRouter = {
+  path: '/vwout',
+  component: Layout,
+  redirect: 'vwout',
+  name: 'vw-out',
+  meta: {
+    title: '大众-数据输出',
+    index: 0,
+    icon: '大众'
+  },
+  children: [
+    {
+      path: '/sendUnsettledDiffReport',
+      component: () => import('@/views/ux/vw/dataOut/sendUnsettledDiffReport'),
+      name: 'sendUnsettledDiffReport',//命名路由
+      meta: { title: 'FIS发出未结算', roles: ['SettleAccount.SendUnsettledDiffReports'], icon: '未结算' }
+    },
+    {
+      path: '/stockFisDiffReport',
+      component: () => import('@/views/ux/vw/dataOut/stockFisDiffReport'),
+      name: 'stockFisDiffReport',//命名路由
+      meta: { title: 'FIS发运数据对比', roles: ['SettleAccount.StockFisDiffReports'], icon: '发运对比' }
+    },
+    {
+      path: '/stockUnsettledDiffReport',
+      component: () => import('@/views/ux/vw/dataOut/stockUnsettledDiffReport'),
+      name: 'stockUnsettledDiffReport',//命名路由
+      meta: { title: 'FIS未结数量与期末对比', roles: ['SettleAccount.StockUnsettledDiffReports'], icon: '库存对比' }
+    },
+    {
+      path: '/stockSettledDiffReport',
+      component: () => import('@/views/ux/vw/dataOut/stockSettledDiffReport'),
+      name: 'stockSettledDiffReport',//命名路由
+      meta: { title: 'R3结算数据对比', roles: ['SettleAccount.StockSettledDiffReports'], icon: '结算对比' }
+    },
+    {
+      path: '/secondaryActuralAdjustmentReport',
+      component: () => import('@/views/ux/vw/dataOut/secondaryActuralAdjustmentReport'),
+      hidden: false,
+      name: 'secondaryActuralAdjustmentReport',
+      meta: {
+        title: '实际二配调整后',
+        roles: ['SettleAccount.SecondaryReports'],
+        type: 'crm', icon: '调整'
+      }
+    },
+    {
+      path: '/secondaryActuralDiffReport',
+      component: () => import('@/views/ux/vw/dataOut/secondaryActuralDiffReport'),
+      hidden: false,
+      name: 'secondaryActuralDiffReport',
+      meta: {
+        title: '二配对比',
+        roles: ['SettleAccount.SecondaryReports'],
+        type: 'crm',icon:'二配对比'
+      }
+    },
+    // {
+    //   path: 'r32',
+    //   component: () => import('@/views/ux/vw/dataOut/fis'),
+    //   name: 'R3',//命名路由
+    //   meta: { title: '二配对比输出表', icon: 'gongyingshang' }
+    // }
+  ]
+}
+
+export default vwoutdataRouter
+
diff --git a/code/WebApp/vue/src/router/modules/vwFisData.js b/code/WebApp/vue/src/router/modules/vwFisData.js
deleted file mode 100644
index e52fc1d1..00000000
--- a/code/WebApp/vue/src/router/modules/vwFisData.js
+++ /dev/null
@@ -1,106 +0,0 @@
-//大众-FIS结算-路由
-import Layout from '@/layout'
-
-const vwFisDataRouter = {
-  path: '/cpat',
-  component: Layout,
-  redirect: 'pg',
-  name: '业务数据',
-  //hidden: true,
-  meta: {
-    //requiresAuth: true,
-    title: '大众结算与开票导入',
-    index: 0,
-    type: 'crm',
-    icon: '单据导入',
-    keepAlive: false,
-  },
-  children: [
-    {
-      path: 'unsettle-account',
-      component: () => import('@/views/ux/vw/dataInput/r3-open'),
-      name: 'SettleAccount',//命名路由
-      meta: {
-        title: 'FIS未结算数据导入',
-        roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-        icon: '结算'
-      }
-    },
-    {
-      path: 'settle-account-finish',
-      component: () => import('@/views/ux/vw/dataInput/r3'),
-      name: 'SettleAccount',//命名路由
-      meta: {
-        title: 'FIS已结算数据导入',
-        roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-        icon: '结算'
-      }
-    },
-    {
-      path: 'invoice',
-      component: () => import('@/views/ux/basedata/Invoice/index'),
-      name: 'Invoices',//命名路由
-      meta: {
-        title: '大众发票汇总导入',
-        roles: ['SettleAccount.Invoices'],
-        icon: '对比'
-      }
-    },
-    {
-      path: 'kan-ban',
-      component: () => import('@/views/ux/vw/dataInput/vwKanBan/index'),
-      name: 'VWKanBan',//命名路由
-      meta: {
-        title: '看板结算明细导入',
-        //roles: ['SettleAccount.ItemInvoicePrices'],
-        icon: '发运'
-      }
-    },
-    {
-      path: 'scrap-claims',
-      component: () => import('@/views/ux/vw/dataInput/ScrapClaims'),
-      name: 'ScrapClaims',
-      meta: {
-        title: 'CP7报废和索赔导入',
-        roles: ['SettleAccount.FISs'],
-        icon: '文件'
-      }
-    },
-    
-    {
-      path: 'spare-part',
-      component: () => import('@/views/ux/vw/dataInput/SparePart'),
-      name: 'SparePart',//命名路由
-      meta: {
-        title: '大众备件结算明细导入',
-        roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色）
-        icon: '结算'
-      }
-    },
-    
-    {
-      path: 'hq-H-platform',
-      component: () => import('@/views/ux/vw/dataInput/hq_h'),
-      name: 'ERPEI',//命名路由
-      meta: {
-        title: '红旗H平台导入',
-        roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色）
-        icon: '结算'
-      }
-    },
-    {
-      path: 'hq-M-platform',
-      component: () => import('@/views/ux/vw/dataInput/hq_m'),
-      name: 'ERPEI',//命名路由
-      meta: {
-        title: '红旗M平台导入',
-        //roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色）
-        icon: '结算'
-      }
-    },
-
-  ]
-}
-
-export default vwFisDataRouter
-
diff --git a/code/WebApp/vue/src/router/modules/vwKBNoBarcodedata.js b/code/WebApp/vue/src/router/modules/vwKBNoBarcodedata.js
deleted file mode 100644
index aaf0ceb7..00000000
--- a/code/WebApp/vue/src/router/modules/vwKBNoBarcodedata.js
+++ /dev/null
@@ -1,56 +0,0 @@
-//FIS结算
-import Layout from '@/layout'
-
-const vwNoBarcodeRouter = {
-  path: '/vwnobarcodedata',
-  component: Layout,
-  redirect: 'vwnobarcodedata',
-  name: 'basedata',
-  //hidden: true,
-  meta: {
-    //requiresAuth: true,
-    title: '大众看板结算(无条码)',
-    index: 0,
-    type: 'crm',
-    icon:'单据导入',
-    keepAlive: false,
-  },
-  children: [
-    {
-      path: '/vwr3-js',
-      component: () => import('@/views/ux/billManage/FisUnSettledDiff'),
-      name: 'R3js',//命名路由
-      meta: { title: '发出未结算数据',
-        //roles: ['abpvnext_master.Customer'],//控制页面角色（可以设置多个角色）
-        icon: '销售' }
-    },
-    {
-      path: '/settlement',
-      component: () => import('@/views/ux/billManage/FisUnSettledDiff'),
-      name: 'FisUnSettledDiff',//命名路由
-      meta: { title: '定价与结算单价对比',
-        //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色）
-        icon: '客户零件' }
-    },
-    {
-      path: '/claimDemage',
-      component: () => import('@/views/ux/billManage/claimDemage'),
-      name: 'ClaimDemage',
-      meta: {
-        title: '库存与开票数据比对',
-        icon: '索赔授权'
-      }
-    },
-    {
-      path: '/settlement',
-      component: () => import('@/views/ux/billManage/FisUnSettledDiff'),
-      name: 'FisUnSettledDiff',//命名路由
-      meta: { title: '开票汇总数据',
-        //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色）
-        icon: '客户零件' }
-    },
-  ]
-}
-
-export default vwNoBarcodeRouter
-
diff --git a/code/WebApp/vue/src/router/modules/vwKBdata.js b/code/WebApp/vue/src/router/modules/vwKBdata.js
deleted file mode 100644
index 3443ebb0..00000000
--- a/code/WebApp/vue/src/router/modules/vwKBdata.js
+++ /dev/null
@@ -1,104 +0,0 @@
-//FIS结算
-import Layout from '@/layout'
-
-const billdataRouter = {
-  path: '/cpat-report',
-  component: Layout,
-  redirect: 'vw-car-kb',
-  name: 'basedata',
-  //hidden: true,
-  meta: {
-    //requiresAuth: true,
-    title: '大众结算与开票报表',
-    index: 0,
-    type: 'crm',
-    icon: '销售',
-    keepAlive: false,
-  },
-  children: [
-    {
-      path: 'unsettled-detail',//大众准时化未结明细表（包含漏结，漏结要有标识）
-      component: () => import('@/views/ux/billManage/IssuedUnsettled/index'),
-      name: 'UnsettledDetail',//命名路由
-      meta: {
-        title: '大众准时化未结明细',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-        icon: '报表'
-      }
-    },
-    {
-      path: 'unsettled-diff',
-      component: () => import('@/views/ux/billManage/UnSettledDiff/index'),
-      name: 'UnSettledDiff',//命名路由
-      meta: {
-        title: '大众准时化未结比对',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-        icon: '结算'
-      }
-    },
-    {
-      path: 'unsettle-diff/export',
-      component: () => import('@/views/ux/billManage/UnSettleDiffExport'),
-      name: 'UnSettleDiffExport',//命名路由
-      meta: {
-        title: '准时化未结差异比对',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-        icon: '售后'
-      }
-    },
-    {
-      path: 'invoice-settled/diff',
-      component: () => import('@/views/ux/billManage/InvoiceSettledDiff'),
-      name: 'InvoiceSettledDiff',//命名路由
-      meta: {
-        title: '发票与结算核对汇总',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-        icon: '结算对比'
-      }
-    },
-    {
-      path: 'invoice-settled/detaildiff',
-      component: () => import('@/views/ux/billManage/InvoiceSettledDetailDiff'),
-      name: 'InvoiceSettledDetailDiff',//命名路由
-      meta: {
-        title: '发票与结算核对明细',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-        icon: '结算对比'
-      }
-    },
-    // {
-    //   path: 'FisUnSettledDiff',
-    //   component: () => import('@/views/ux/billManage/FisUnSettledDiff'),
-    //   name: 'FisUnSettledDiff',//命名路由
-    //   meta: {
-    //     title: '准时化交货与结算核对',
-    //     roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-    //     icon: '看板'
-    //   }
-    // },
-    {
-      path: 'unInvoice-settled/detailDiff',
-      component: () => import('@/views/ux/billManage/UnInvoiceSettledDetailDiff'),
-      name: 'UnInvoiceSettledDetailDiff',//命名路由
-      meta: {
-        title: '准时化结算数量差异比对',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-        icon: '售后'
-      }
-    },
-    {
-      path: 'settle-doorPanel',
-      component: () => import('@/views/ux/billManage/SettleDoorPanel'),
-      name: 'SettleDoorPanel',//命名路由
-      meta: {
-        title: '准时化结算门板价格差异',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-        icon: '售后'
-      }
-    },
-   
-  ]
-}
-
-export default billdataRouter
-
diff --git a/code/WebApp/vue/src/router/modules/vw_menu.js b/code/WebApp/vue/src/router/modules/vw_menu.js
deleted file mode 100644
index 5d8e00ed..00000000
--- a/code/WebApp/vue/src/router/modules/vw_menu.js
+++ /dev/null
@@ -1,181 +0,0 @@
-
-import Layout from '@/layout'
-
-const vwMenudataRouter = {
-    path: '/capt-vw',
-    component: Layout,
-    redirect: 'ux/basedata/Invoice/index',
-    name: 'HQData',
-    meta: {
-        title: '大众工厂',
-        icon: 'vw',
-        //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns', 'SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'],
-        keepAlive: false,
-    },
-    children: [
-        {
-            path: '/import-data',
-            name: 'import-data',//命名路由-二级
-            component: () => import('@/views/ux/billManage/index'),
-            redirect: 'ux/basedata/Invoice/index',
-            meta: {
-                title: '数据导入',
-                // roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'],
-                icon: '看板'
-            },
-            children: [
-                {
-                    path: 'invoice',
-                    component: () => import('@/views/ux/basedata/Invoice/index'),
-                    name: 'Invoices',
-                    meta: {
-                        title: '发票汇总',
-                        roles: ['SettleAccount.Invoices'],
-                        icon: '对比'
-                    }
-                },
-                {
-                    path: 'settle-account-finish',
-                    component: () => import('@/views/ux/vw/dataInput/r3'),
-                    name: 'SettleAccount',
-                    meta: {
-                        title: 'FIS结算明细',
-                        roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-                        icon: '库存'
-                    }
-                },
-                {
-                    path: 'unsettle-account',
-                    component: () => import('@/views/ux/vw/dataInput/r3'),
-                    name: 'SettleAccount',
-                    meta: {
-                        title: 'FIS未结明细',
-                        roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-                        icon: '结算'
-                    }
-                },
-                {
-                    path: 'kan-ban',
-                    component: () => import('@/views/ux/vw/dataInput/vwKanBan/index'),
-                    name: 'VWKanBan',//命名路由
-                    meta: {
-                        title: '大众看板结算导入',
-                        roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-                        icon: '看板'
-                    }
-                },
-                {
-                    path: 'spare-part',
-                    component: () => import('@/views/ux/vw/dataInput/SparePart'),
-                    name: 'SparePart',//命名路由
-                    meta: {
-                        title: '大众备件结算导入',
-                        roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色）
-                        icon: '工厂'
-                    }
-                },
-                {
-                    path: 'scrap-claims',
-                    component: () => import('@/views/ux/vw/dataInput/ScrapClaims'),
-                    name: 'ScrapClaims',
-                    meta: {
-                        title: 'CP7报废和索赔导入',
-                        roles: ['SettleAccount.FISs'],
-                        icon: '文件'
-                    }
-                },
-            ]
-        },
-        {
-            path: '/export-data',
-            component: () => import('@/views/ux/billManage/index'),
-            name: 'export-data',//命名路由
-            redirect: 'export-data',
-            meta: {
-                title: '数据输出',
-                //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'],
-                icon: '结算'
-            },
-            children: [
-                {
-                    path: '/invoice-settled/diff',
-                    component: () => import('@/views/ux/billManage/InvoiceSettledDiff'),
-                    name: 'InvoiceSettledDiff',//命名路由
-                    meta: {
-                        title: '发票与结算核对汇总',
-                        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-                        icon: '结算'
-                    }
-                },
-                {
-                    path: '/invoice-settled/detaildiff',
-                    component: () => import('@/views/ux/billManage/InvoiceSettledDetailDiff'),
-                    name: 'InvoiceSettledDetailDiff',//命名路由
-                    meta: {
-                        title: '准时化结算核对明细',
-                        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-                        icon: '结算对比'
-                    }
-                },
-                {
-                    path: '/unInvoice-settled/detailDiff',
-                    component: () => import('@/views/ux/billManage/UnInvoiceSettledDetailDiff'),
-                    name: 'UnInvoiceSettledDetailDiff',//命名路由
-                    meta: {
-                        title: '准时化量差价差输出',
-                        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-                        icon: '售后'
-                    }
-                },
-                {
-                    path: '/unsettle-diff/export',
-                    component: () => import('@/views/ux/billManage/UnSettleDiffExport'),
-                    name: 'UnSettleDiffExport',//命名路由
-                    meta: {
-                        title: '准时化未结核对',
-                        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-                        icon: '器具'
-                    }
-                },
-                {
-                    path: '/unsettled-detail',//大众准时化未结明细表（包含漏结，漏结要有标识）
-                    component: () => import('@/views/ux/billManage/IssuedUnsettled/index'),
-                    name: 'UnsettledDetail',//命名路由
-                    meta: {
-                      title: '准时化未结明细',
-                      roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-                      icon: '报表'
-                    }
-                  },
-                {
-                    path: '/kbwithcode',
-                    component: () => import('@/views/ux/billManage/kanBanWithCode'),
-                    name: 'KanBanWithCode',//命名路由
-                    meta: {
-                        title: '看板结算输出',
-                        //roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色（可以设置多个角色）
-                        icon: '看板'
-                    }
-                },
-
-                {
-                    path: '/vwsparepart',
-                    component: () => import('@/views/ux/billManage/sparePart'),
-                    name: 'SparePartReport',//命名路由
-                    meta: {
-                        title: '备件结算输出',
-                        //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色）
-                        icon: '供货'
-                    }
-                }
-            ]
-        }
-    ]
-}
-
-export default vwMenudataRouter
-
-
-
-
-
diff --git a/code/WebApp/vue/src/router/modules/vw_out_order.js b/code/WebApp/vue/src/router/modules/vw_out_order.js
deleted file mode 100644
index cba355fb..00000000
--- a/code/WebApp/vue/src/router/modules/vw_out_order.js
+++ /dev/null
@@ -1,54 +0,0 @@
-//大众-FIS结算-路由
-import Layout from '@/layout'
-
-const vwOutOrderDataRouter = {
-  path: '/cpat-order',
-  component: Layout,
-  redirect: 'pg',
-  name: '业务数据',
-  //hidden: true,
-  meta: {
-    //requiresAuth: true,
-    title: '大众出库单管理',
-    index: 0,
-    type: 'crm',
-    icon: '单据导入',
-    keepAlive: false,
-  },
-  children: [
-    {
-      path: 'vw-out-order',
-      component: () => import('@/views/ux/billManage/vwOutOrder/index'),
-      name: 'SettleAccount',//命名路由
-      meta: {
-        title: '大众准时化出库单',
-        roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-        icon: '结算'
-      }
-    },
-    {
-      path: 'kanban-out-order',
-      component: () => import('@/views/ux/billManage/kanbanOutOrder/index'),
-      name: 'SettleAccount',//命名路由
-      meta: {
-        title: '大众看板出库单',
-        roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-        icon: '结算'
-      }
-    },
-    // {
-    //   path: 'invoice',
-    //   component: () => import('@/views/ux/basedata/Invoice/index'),
-    //   name: 'Invoices',//命名路由
-    //   meta: {
-    //     title: '大众发票汇总导入',
-    //     roles: ['SettleAccount.Invoices'],
-    //     icon: '对比'
-    //   }
-    // },
-
-  ]
-}
-
-export default vwOutOrderDataRouter
-
diff --git a/code/WebApp/vue/src/router/modules/vwdata.js b/code/WebApp/vue/src/router/modules/vwdata.js
new file mode 100644
index 00000000..59b62c05
--- /dev/null
+++ b/code/WebApp/vue/src/router/modules/vwdata.js
@@ -0,0 +1,74 @@
+//import Layout from '@/layout/firstLayout'
+import Layout from '@/layout'
+
+const vwdataRouter = {
+  path: '/vw-in',
+  component: Layout,
+  redirect: 'vw-in',
+  name: '大众-数据输入',
+  meta: {
+    //requiresAuth: true,
+    title: '大众-数据输入',
+    index: 0,
+    type: 'crm',
+    icon: '大众',
+    keepAlive: false,
+  },
+  children: [
+    {
+      path: '/prebatch',
+      component: () => import('@/views/ux/vw/dataInput/prebatch'),
+      name: 'Prebatch',
+      meta: {
+        title: '预批量输入表',//名称显示 在侧边栏
+        roles: ['SettleAccount.Prebatchs'],//控制页面角色（可以设置多个角色）
+        icon: '批量'//图标显示在侧边栏
+      }
+    },
+    {
+      path: '/fis',
+      component: () => import('@/views/ux/vw/dataInput/fis'),
+      name: 'FIS',
+      meta: {
+        title: 'FIS文件输入表',
+        roles: ['SettleAccount.FISs'],
+        icon: '文件'
+      }
+    },
+    {
+      path: '/r3',
+      component: () => import('@/views/ux/vw/dataInput/r3'),
+      name: 'R3',//命名路由
+      meta: {
+        title: 'R3文件输入表',
+        roles: ['SettleAccount.SettleAccounts'],
+        icon: 'R3'
+      }
+    },
+    {
+      path: '/secondaryAdjustment',
+      component: () => import('@/views/ux/vw/dataInput/secondaryAdjustment'),
+      name: 'SecondaryAdjustment',//命名路由
+      meta: {
+        title: '二配数量调整',
+        roles: ['SettleAccount.SecondaryAdjustments'],
+        icon: '二配'
+      }
+    },
+    {
+      path: '/secondaryDiscount',
+      component: () => import('@/views/ux/vw/dataInput/secondaryDiscount'),
+      name: 'SecondaryDiscount',//命名路由
+      meta: {
+        title: '二配折扣调整',
+        roles: ['SettleAccount.SecondaryAdjustments'],
+        icon: '折扣'
+      }
+    },
+  ]
+}
+
+export default vwdataRouter
+
+
+
diff --git a/code/WebApp/vue/src/router/modules/wheeldata.js b/code/WebApp/vue/src/router/modules/wheeldata.js
index 24f7591e..77f744eb 100644
--- a/code/WebApp/vue/src/router/modules/wheeldata.js
+++ b/code/WebApp/vue/src/router/modules/wheeldata.js
@@ -1,15 +1,15 @@
-/**大众看板、备件数据比对路由 */
+/** 车轮数据比对路由 */
 //import Layout from '@/layout/firstLayout'
 import Layout from '@/layout'
 
 const wheeldataRouter = {
-  path: '/cpat/report/',
+  path: '/wheeldata',
   component: Layout,
-  redirect: 'cpat',//重定向
+  redirect: 'wheeldata',//重定向
   name: 'WheelData',
   meta: {
     // requiresAuth: true,
-    title: '大众看板、备件报表',
+    title: '数据输出',
     //index: 0,
     // type: 'crm',
     icon: '对比',
@@ -18,26 +18,15 @@ const wheeldataRouter = {
   },
   children: [
     {
-      path: 'kbwithcode',
-      component: () => import('@/views/ux/billManage/kanBanWithCode'),
-      name: 'KanBanWithCode',//命名路由
+      path: '/estimatedStockDiffReport',
+      component: () => import('@/views/ux/vw/dataOut/estimatedStockDiffReport'),
+      name: 'estimatedStockDiffReport',//命名路由
       meta: {
-        title: '大众看板结算与交货核对',
-        //roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色（可以设置多个角色）
+        title: '暂估对比表',
+        roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色（可以设置多个角色）
         icon: '对比'
       }
     },
-    
-    {
-      path: 'vwsparepart',
-      component: () => import('@/views/ux/billManage/sparePart'),
-      name: 'SparePartReport',//命名路由
-      meta: {
-        title: '大众备件结算核对',
-        //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色）
-        icon: '二配'
-      }
-    }
   ]
 }
 
diff --git a/code/WebApp/vue/src/settings.js b/code/WebApp/vue/src/settings.js
index e7015144..cbd70fa4 100644
--- a/code/WebApp/vue/src/settings.js
+++ b/code/WebApp/vue/src/settings.js
@@ -1,5 +1,5 @@
 module.exports = {
-  title: '长春派格汽车塑料技术有限公司结算管理系统',
+  title: 'ERP结算分析系统',
 
   /**
    * @type {boolean} true | false
diff --git a/code/WebApp/vue/src/store/getters.js b/code/WebApp/vue/src/store/getters.js
index 5e741c7a..58499983 100644
--- a/code/WebApp/vue/src/store/getters.js
+++ b/code/WebApp/vue/src/store/getters.js
@@ -30,7 +30,6 @@ const getters = {
   userInfo: state => state.user.userInfo,
   manage: state => state.user.manage,
   manageRouters: state => state.permission.manageRouters,
-  isLoading:state=>state.app.isLoading,
-  messageNum: state => state.customer.messageNum,
+  isLoading:state=>state.app.isLoading
 }
 export default getters
diff --git a/code/WebApp/vue/src/store/modules/app.js b/code/WebApp/vue/src/store/modules/app.js
index f9a708f6..d6274419 100644
--- a/code/WebApp/vue/src/store/modules/app.js
+++ b/code/WebApp/vue/src/store/modules/app.js
@@ -152,3 +152,158 @@ export default {
   actions
 }
 //export default app
+
+// import Cookies from 'js-cookie'
+// import { getLanguage } from '@/lang/index'
+
+// const state = {
+//   sidebar: {
+//     opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
+//     withoutAnimation: false,
+//     activeIndex: ''
+//   },
+//   device: 'desktop',
+//   language: getLanguage(),
+//   size: Cookies.get('size') || 'medium',
+//   navbar: {
+//     activeIndex: '' // 导航目前是第几个 个人中心需要
+//   },
+//   logo: '',
+//   isLoading:null
+// }
+// const mutations = {
+//   TOGGLE_SIDEBAR: state => {
+
+//     state.sidebar.opened = !state.sidebar.opened
+//     state.sidebar.withoutAnimation = false
+//     if (state.sidebar.opened) {
+//       Cookies.set('sidebarStatus', 1)
+//     } else {
+//       Cookies.set('sidebarStatus', 0)
+//     }
+//   },
+//   CLOSE_SIDEBAR: (state, withoutAnimation) => {
+//     Cookies.set('sidebarStatus', 0)
+//     state.sidebar.opened = false
+//     state.sidebar.withoutAnimation = withoutAnimation
+//   },
+//   TOGGLE_DEVICE: (state, device) => {
+//     state.device = device
+//   },
+//   SET_LANGUAGE: (state, language) => {
+//     state.language = language
+//     Cookies.set('language', language)
+//   },
+//   SET_SIZE: (state, size) => {
+//     state.size = size
+//     Cookies.set('size', size)
+//   },
+//   SET_ACTIVEINDEX: (state, path) => {
+//     state.sidebar.activeIndex = path
+//   },
+//   SET_NAVACTIVEINDEX: (state, path) => {
+//     state.navbar.activeIndex = path
+//   },
+
+// }
+// const actions = {
+//   toggleSideBar({ commit }) {
+//     commit('TOGGLE_SIDEBAR')
+//   },
+//   closeSideBar({ commit }, { withoutAnimation }) {
+//     commit('CLOSE_SIDEBAR', withoutAnimation)
+//   },
+//   toggleDevice({ commit }, device) {
+//     commit('TOGGLE_DEVICE', device)
+//   },
+//   setLanguage({ commit }, language) {
+//     commit('SET_LANGUAGE', language)
+//   },
+//   setSize({ commit }, size) {
+//     commit('SET_SIZE', size)
+//   }
+// }
+// const app = {
+//   // namespaced: true,
+//   state: {
+//     sidebar: {
+//       opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
+//       withoutAnimation: false,
+//       activeIndex: ''
+//     },
+//     device: 'desktop',
+//     language: getLanguage(),
+//     size: Cookies.get('size') || 'medium',
+//     navbar: {
+//       activeIndex: '' // 导航目前是第几个 个人中心需要
+//     },
+//     logo: '',
+//     isLoading:null
+//   },
+
+//   mutations: {
+//     TOGGLE_SIDEBAR: state => {
+//       state.sidebar.opened = !state.sidebar.opened
+//       state.sidebar.withoutAnimation = false
+//       if (state.sidebar.opened) {
+//         Cookies.set('sidebarStatus', 1)
+//       } else {
+//         Cookies.set('sidebarStatus', 0)
+//       }
+//     },
+//     CLOSE_SIDEBAR: (state, withoutAnimation) => {
+//       Cookies.set('sidebarStatus', 0)
+//       state.sidebar.opened = false
+//       state.sidebar.withoutAnimation = withoutAnimation
+//     },
+//     TOGGLE_DEVICE: (state, device) => {
+//       state.device = device
+//     },
+//     SET_LANGUAGE: (state, language) => {
+//       state.language = language
+//       Cookies.set('language', language)
+//     },
+//     SET_SIZE: (state, size) => {
+//       state.size = size
+//       Cookies.set('size', size)
+//     },
+//     SET_ACTIVEINDEX: (state, path) => {
+//       state.sidebar.activeIndex = path
+//     },
+//     SET_NAVACTIVEINDEX: (state, path) => {
+//       state.navbar.activeIndex = path
+//     },
+//     setLoading(state, isLoading) {
+//       // console.log(isLoading);
+//       state.isLoading = isLoading;
+//     }
+//   },
+
+//   actions: {
+//     toggleSideBar({ commit }) {
+//       commit('TOGGLE_SIDEBAR')
+//     },
+//     closeSideBar({ commit }, { withoutAnimation }) {
+//       commit('CLOSE_SIDEBAR', withoutAnimation)
+//     },
+//     toggleDevice({ commit }, device) {
+//       commit('TOGGLE_DEVICE', device)
+//     },
+//     setLanguage({ commit }, language) {
+//       commit('SET_LANGUAGE', language)
+//     },
+//     setSize({ commit }, size) {
+//       commit('SET_SIZE', size)
+//     },
+//     onLoading(state, isLoading) {
+//       state.commit('setLoading', isLoading);
+//     }
+//   }
+// }
+// // export default {
+// //   namespaced: true,
+// //   state,
+// //   mutations,
+// //   actions
+// // }
+// export default app
diff --git a/code/WebApp/vue/src/store/modules/customer.js b/code/WebApp/vue/src/store/modules/customer.js
deleted file mode 100644
index fed58ae9..00000000
--- a/code/WebApp/vue/src/store/modules/customer.js
+++ /dev/null
@@ -1,59 +0,0 @@
-
-import axiosMethods from '../../axios/index.js'
-
-/**
- * 消息记录
- */
-const app = {
-  state: {
-    // 待办事项消息
-    messageNum: {
-      todayCustomer: 0,
-      followLeads: 0,
-      followCustomer: 0,
-      checkContract: 0,
-      checkReceivables: 0,
-      remindReceivablesPlan: 0,
-      endContract: 0,
-      totalCount: 0
-    }
-  },
-
-  mutations: {
-    /**
-     * 更改待办事项
-     */
-    SET_MESSAGENUM: (state, messageNum) => {
-      let totalCount = 0
-      for (const key in messageNum) {
-        if (key != 'totalCount') {
-          totalCount += (messageNum[key] || 0)
-        }
-      }
-      messageNum.totalCount = totalCount
-      state.messageNum = messageNum
-    }
-  },
-
-  actions: {
-    // 登录
-    GetMessageNum({
-      commit
-    }) {
-      return new Promise((resolve, reject) => {
-        axiosMethods.gets("/api/newjit/log-remind/getlist")
-          .then(response => {
-            commit('SET_MESSAGENUM', response.totalCount)
-            //commit('SET_CRMROUTERSNUM', response.totalCount)
-            resolve(response)
-          })
-          .catch(error => {
-            reject(error)
-          })
-      })
-    }
-
-  }
-}
-
-export default app
diff --git a/code/WebApp/vue/src/store/modules/permission.js b/code/WebApp/vue/src/store/modules/permission.js
index 024873ab..2bcb5e10 100644
--- a/code/WebApp/vue/src/store/modules/permission.js
+++ b/code/WebApp/vue/src/store/modules/permission.js
@@ -1,7 +1,7 @@
-import { asyncRoutes, constantRoutes } from '@/router'
+import {asyncRoutes, constantRoutes} from '@/router'
 import Layout from "@/layout/index";
 import axiosMethods from "../../axios";
-import router, { resetRouter } from '@/router'
+import router, {resetRouter} from '@/router'
 
 /**
  *
@@ -45,7 +45,7 @@ function checkAuth(router, authInfo) {
  * @param {*} routers
  * @param {*} authInfo
  */
-const filterAsyncRouter = function (routers, authInfo) {
+const filterAsyncRouter = function(routers, authInfo) {
   const res = []
   routers.forEach(router => {
     const tmp = {
@@ -83,7 +83,7 @@ function hasPermission(roles, route) {
 export function filterAsyncRoutes(routes, roles) {
   const res = []
   routes.forEach(route => {
-    const tmp = { ...route }
+    const tmp = {...route}
     if (hasPermission(roles, tmp)) {
       if (tmp.children) {
         tmp.children = filterAsyncRoutes(tmp.children, roles)
@@ -120,24 +120,15 @@ const mutations = {
       const element = routes[index]
       if (element.name == 'first') {
         state.firstRouters = element
-      } else if (element.name == 'manager') {
+      }else if (element.name == 'manager') {
         state.manageRouters = element
       }
     }
-  },
-  /**
-    * 客户管理待办消息数
-    */
-  // SET_CRMROUTERSNUM: (state, num) => {
-  //   const messageItem = state.routes.children[1]
-  //   alert(messageItem)
-  //   messageItem.meta.num = num
-  //   Vue.set(state.routes.children, 1, messageItem)
-  // }
+  }
 }
 
 const actions = {
-  generateRoutes({ commit }, roles) {
+  generateRoutes({commit}, roles) {
     return new Promise(resolve => {
       let accessedRoutes
       if (roles.includes('admin')) {
diff --git a/code/WebApp/vue/src/store/modules/user.js b/code/WebApp/vue/src/store/modules/user.js
index 44b0df1c..22af89e3 100644
--- a/code/WebApp/vue/src/store/modules/user.js
+++ b/code/WebApp/vue/src/store/modules/user.js
@@ -77,7 +77,7 @@ const actions = {
 
   userLogin({commit}, data) { // 用户登录
     return new Promise((resolve, reject) => {
-      axiosMethods.instancePosts('/connect/token', data)
+      axiosMethods.instancePosts('/api/connect-token', data)
         .then(response => {
           commit('SET_TOKEN', response.access_token)
           //token存缓存中
@@ -122,6 +122,55 @@ const actions = {
       })
     })
   },
+
+
+  // userLogin({commit}, data) { // 用户登录
+  //   return new Promise((resolve, reject) => {
+  //     axiosMethods.instancePosts('/connect/token', data)
+  //       .then(response => {
+  //         commit('SET_TOKEN', response.access_token)
+  //         //token存缓存中
+  //         Lockr.set('Admin-Token', response.access_token)
+  //         let userInfoCurrent = {
+  //           "deptName": "",
+  //           "img": "",
+  //           "createTime": "",
+  //           "lastLoginTime": "",
+  //           "num": "",
+  //           "sex": null,
+  //           "mobile": "",
+  //           "realname": "",
+  //           "parentName": null,
+  //           "post": "",
+  //           "userId": 3,
+  //           "parentId": 0,
+  //           "lastLoginIp": "",
+  //           "deptId": '',
+  //           "email": null,
+  //           "username": "",
+  //           "status": ''
+  //         }
+  //         //获取登录人信息
+  //         axiosMethods.gets('/api/base/user/current').then(response => {
+  //           userInfoCurrent['username']=response.userName
+  //           userInfoCurrent['realname']=response.userName
+  //           userInfoCurrent['email']=response.email
+  //           userInfoCurrent['mobile']=response.phoneNumber
+  //           userInfoCurrent['userId']=response.id
+  //           //userInfo 前端写在vuex中
+  //           commit('SET_USERINFO', userInfoCurrent)
+  //            //userInfo 存缓存中
+  //            Lockr.set('loginUserInfo', userInfoCurrent)
+  //            //alert(JSON.stringify(Lockr.get("loginUserInfo").userId))
+  //         })
+  //         setToken(response.access_token)
+          
+  //         resolve()
+  //       }).catch((error) => {
+  //       reject(error)
+  //     })
+  //   })
+  // },
   // get user info
   getInfo({commit}) {
     return new Promise((resolve, reject) => {
diff --git a/code/WebApp/vue/src/styles/sidebar.scss b/code/WebApp/vue/src/styles/sidebar.scss
index 3dad4c39..63ed0c93 100644
--- a/code/WebApp/vue/src/styles/sidebar.scss
+++ b/code/WebApp/vue/src/styles/sidebar.scss
@@ -54,7 +54,7 @@
     }
 
     .svg-icon {
-      margin-right: 16px;
+      margin-right: 5px;
     }
 
     .el-menu {
diff --git a/code/WebApp/vue/src/utils/crmindex.js b/code/WebApp/vue/src/utils/crmindex.js
index d98729b3..06579b7b 100644
--- a/code/WebApp/vue/src/utils/crmindex.js
+++ b/code/WebApp/vue/src/utils/crmindex.js
@@ -443,7 +443,6 @@ export function downloadFile(res, fileName) {
       });
 }
 
-
 export function downloadFileV1(res, fileName) {
     if (!res) {
       return
diff --git a/code/WebApp/vue/src/utils/dom.js b/code/WebApp/vue/src/utils/dom.js
deleted file mode 100644
index 1fd9a948..00000000
--- a/code/WebApp/vue/src/utils/dom.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * 功能：dom绑定事件
- * 参数：element(dom节点)
- *      event(事件名称)
- *      handler(回调)
- *返回：无
- * */
-export const on = (function() {
-  if (document.addEventListener) {
-    return function(element, event, handler) {
-      if (element && event && handler) {
-        element.addEventListener(event, handler, false)
-      }
-    }
-  } else {
-    return function(element, event, handler) {
-      if (element && event && handler) {
-        element.attachEvent('on' + event, handler)
-      }
-    }
-  }
-})()
-
-/**
- * 功能：移除dom绑定的事件
- * 参数：element(dom节点)
- *      event(事件名称)
- *      handler(回调函数)
- * 返回：无
- * */
-export const off = (function() {
-  if (document.removeEventListener) {
-    return function(element, event, handler) {
-      if (element && event) {
-        element.removeEventListener(event, handler, false)
-      }
-    }
-  } else {
-    return function(element, event, handler) {
-      if (element && event) {
-        element.detachEvent('on' + event, handler)
-      }
-    }
-  }
-})()
diff --git a/code/WebApp/vue/src/views/PersonCenter/components/EditPassword.vue b/code/WebApp/vue/src/views/PersonCenter/components/EditPassword.vue
index 73eef39c..84a3de85 100644
--- a/code/WebApp/vue/src/views/PersonCenter/components/EditPassword.vue
+++ b/code/WebApp/vue/src/views/PersonCenter/components/EditPassword.vue
@@ -5,65 +5,62 @@
     :visible.sync="showDialog"
     :before-close="hiddenView"
     title="编辑密码"
-    width="500px">
+    width="500px"
+  >
     <el-form
-      ref="ruleForm"
-      :model="ruleForm"
+      ref="form"
+      :model="form"
       :rules="rules"
       label-width="80px"
-      label-position="top">
-      <el-form-item
-        label="原密码"
-        prop="oldPwd">
-        <el-input v-model="ruleForm.currentPassword"/>
+      label-position="top"
+    >
+      <el-form-item label="原密码" prop="currentPassword">
+        <el-input v-model="form.currentPassword" />
       </el-form-item>
-      <el-form-item
-        label="新密码"
-        prop="password">
-        <el-input v-model="ruleForm.newPassword" />
+      <el-form-item label="新密码" prop="newPassword">
+        <el-input v-model="form.newPassword" />
       </el-form-item>
     </el-form>
-    <span
-      slot="footer"
-      class="dialog-footer">
-      <el-button
-        type="primary"
-        @click="save">保 存</el-button>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="save">保 存</el-button>
       <el-button @click="hiddenView">取 消</el-button>
     </span>
   </el-dialog>
 </template>
 <script type="text/javascript">
-import { mapGetters } from 'vuex'
-import { adminUsersResetPassword } from '@/api/personCenter/personCenter'
-import { removeAuth } from '@/utils/auth'
+import { mapGetters } from "vuex";
+import { adminUsersResetPassword } from "@/api/personCenter/personCenter";
+import { removeAuth } from "@/utils/auth";
 import permission from "@/directive/permission/index.js";
 function validCase(str) {
-  var   re =/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{6,}$/;
-  return   re.test(str);
+  var re = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{6,}$/;
+  return re.test(str);
 }
 
-
 const validateNameInput = (rule, value, callback) => {
   if (!value || value <= 0) {
-    return callback(new Error('此项必填！'))
+    return callback(new Error("此项必填！"));
   }
   // else if (!validCase(value)) {
   //   callback(new Error("密码至少包含一位非字母数字字符., 密码至少包含一位小写字母 ('a'-'z')., 密码至少包含一位大写字母 ('A'-'Z')."));
   // }
   else {
-    callback()
+    callback();
   }
-}
+};
+const ruleForm = {
+  currentPassword: "",
+  newPassword: "",
+};
 export default {
-  name: 'EditPassword', // 编辑个人密码
+  name: "EditPassword", // 编辑个人密码
   components: {},
   directives: { permission },
   props: {
     show: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
     return {
@@ -71,71 +68,69 @@ export default {
       showDialog: false,
       rules: {
         currentPassword: [
-          { required: true, message: '请输入原密码', trigger: 'blur' },
-          { min: 6, max: 12, message: '长度在 6 到 12 个字符', trigger: 'blur' }
+          { required: true, message: "请输入原密码", trigger: "blur" },
+          {
+            min: 6,
+            max: 12,
+            message: "长度在 6 到 12 个字符",
+            trigger: "blur",
+          },
         ],
         newPassword: [
-          { required: true, trigger: 'blur' ,validator: validateNameInput },
-          { min: 6, max: 12, message: '长度在 6 到 12 个字符', trigger: 'blur' }
-        ]
+          { required: true, trigger: "blur", validator: validateNameInput },
+          {
+            min: 6,
+            max: 12,
+            message: "长度在 6 到 12 个字符",
+            trigger: "blur",
+          },
+        ],
       },
-      ruleForm: {
-        "currentPassword": "",
-        "newPassword": ""
-      }
-    }
+      form: Object.assign({}, ruleForm),
+    };
   },
   computed: {
-    ...mapGetters(['userInfo'])
+    ...mapGetters(["userInfo"]),
   },
   watch: {
     show: {
       handler(val) {
-        this.showDialog = val
-        //this.ruleForm.id = this.userInfo.id
+        this.$nextTick(() => {
+          this.$refs["form"].resetFields();
+        });
+        this.showDialog = val;
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {},
   methods: {
     hiddenView() {
-      this.$emit('close')
+      this.$emit("close");
     },
     save() {
-      this.$refs.ruleForm.validate(valid => {
+      this.$refs.form.validate((valid) => {
         if (valid) {
-          this.loading = true
-          //this.ruleForm['userName']=this.userInfo.username
-          //this.ruleForm['email']=this.userInfo.email
-          // adminUsersResetPassword(this.userInfo.userId,this.ruleForm)
-          //   .then(res => {
-          //     this.loading = false
-          //     this.$emit('close')
-          //   })
-          //   .catch(() => {
-          //     this.loading = false
-          //   })
-          adminUsersResetPassword(this.ruleForm)
-            .then(res => {
-              this.loading = false
+          this.loading = true;
+          adminUsersResetPassword(this.form)
+            .then((res) => {
+              this.loading = false;
               setTimeout(() => {
-                this.$message.success('修改成功')
-                this.$emit('close')
-              }, 200)
+                this.$message.success("修改成功");
+                this.$emit("close");
+              }, 200);
             })
             .catch(() => {
-              this.loading = false
-            })
-
+              this.loading = false;
+            });
         } else {
-          return false
+          return false;
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 </style>
diff --git a/code/WebApp/vue/src/views/PersonCenter/index.vue b/code/WebApp/vue/src/views/PersonCenter/index.vue
index 8e31c99f..765aab51 100644
--- a/code/WebApp/vue/src/views/PersonCenter/index.vue
+++ b/code/WebApp/vue/src/views/PersonCenter/index.vue
@@ -101,11 +101,11 @@ export default {
       showEditPassword: false,
       list: [
         { name: '姓名', props: 'realname' },
-        { name: '性别', props: 'sex' },
+        { name: '电话', props: 'phonenumber' },
         { name: '登录名', props: 'username' },
         { name: '邮箱', props: 'email' },
-        { name: '部门', props: 'deptName' },
-        { name: '岗位', props: 'post' },
+        // { name: '部门', props: 'deptName' },
+        // { name: '岗位', props: 'post' },
         // { name: '直属上级', props: 'parentName' }
       ]
     }
diff --git a/code/WebApp/vue/src/views/SystemOrgUserRole/index.vue b/code/WebApp/vue/src/views/SystemOrgUserRole/index.vue
index 37eade5b..e644cb57 100644
--- a/code/WebApp/vue/src/views/SystemOrgUserRole/index.vue
+++ b/code/WebApp/vue/src/views/SystemOrgUserRole/index.vue
@@ -246,9 +246,14 @@
       this.getList();
     },
     methods: {
-      getList() {
+      getList(data) {
         this.listLoading = true;
-        this.listQuery.SkipCount = (this.page - 1) * 10;
+       // this.listQuery.SkipCount = (this.page - 1) * 10;
+        if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
         this.$axios
           .gets("/api/base/userOrgRole/all", this.listQuery)
           .then(response => {
diff --git a/code/WebApp/vue/src/views/SystemOrgUserRole/model/CrmRelativeProduct.vue b/code/WebApp/vue/src/views/SystemOrgUserRole/model/CrmRelativeProduct.vue
index 685860f1..09a758b1 100644
--- a/code/WebApp/vue/src/views/SystemOrgUserRole/model/CrmRelativeProduct.vue
+++ b/code/WebApp/vue/src/views/SystemOrgUserRole/model/CrmRelativeProduct.vue
@@ -6,11 +6,13 @@
         v-model="listQuery.Filter"
         placeholder="按名称搜索..."
         @keyup.enter.native="handleFilter"
-        class="search-container">
+        class="search-container"
+      >
         <el-button
           slot="append"
           icon="el-icon-search"
-          @click.native="handleFilter"/>
+          @click.native="handleFilter"
+        />
       </el-input>
     </flexbox>
     <el-table
@@ -25,12 +27,14 @@
       style="width: 100%"
       @select-all="selectAll"
       @selection-change="handleSelectionChange"
-      @row-click="handleRowClick">
+      @row-click="handleRowClick"
+    >
       <el-table-column
         show-overflow-tooltip
         type="selection"
         align="center"
-        width="55"/>
+        width="55"
+      />
       <el-table-column
         v-for="(item, index) in fieldList"
         :key="index"
@@ -38,353 +42,361 @@
         :label="item.name"
         :width="150"
         :formatter="fieldFormatter"
-        show-overflow-tooltip/>
-      <el-table-column/>
+        show-overflow-tooltip
+      />
+      <el-table-column />
     </el-table>
     <div class="table-footer">
-      <el-button
-        :disabled="currentPage <= 1"
-        @click.native="changePage('up')">上一页
+      <el-button :disabled="currentPage <= 1" @click.native="changePage('up')"
+        >上一页
       </el-button>
       <el-button
         :disabled="currentPage >= totalPage"
-        @click.native="changePage('down')">下一页
+        @click.native="changePage('down')"
+        >下一页
       </el-button>
     </div>
     <div class="handle-bar">
       <el-button @click.native="closeView">取消</el-button>
-      <el-button
-        type="primary"
-        @click.native="confirmClick">确定
-      </el-button>
+      <el-button type="primary" @click.native="confirmClick">确定 </el-button>
     </div>
   </div>
 </template>
 <script type="text/javascript">
+//单位
+const projectTypeOptions = [
+  { key: 0, display_name: "个" },
+  { key: 1, display_name: "套" },
+  { key: 2, display_name: "次" },
+  { key: 3, display_name: "人天" },
+];
+const projectTypeKeyValue = projectTypeOptions.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
 
-  //单位
-  const projectTypeOptions = [
-    {key: 0, display_name: '个'},
-    {key: 1, display_name: '套'},
-    {key: 2, display_name: '次'},
-    {key: 3, display_name: '人天'}
-  ]
-  const projectTypeKeyValue = projectTypeOptions.reduce((acc, cur) => {
-    acc[cur.key] = cur.display_name
-    return acc
-  }, {})
-
-  export default {
-    name: 'CrmRelativeProduct', // 相关模块CRMCell
-    props: {
-      /** 多选框 只能选一个 */
-      radio: {
-        type: Boolean,
-        default: true
+export default {
+  name: "CrmRelativeProduct", // 相关模块CRMCell
+  props: {
+    /** 多选框 只能选一个 */
+    radio: {
+      type: Boolean,
+      default: true,
+    },
+    /** 已选信息 */
+    selectedData: {
+      type: Object,
+      default: () => {
+        return {};
       },
-      /** 已选信息 */
-      selectedData: {
-        type: Object,
-        default: () => {
-          return {}
-        }
+    },
+    /** 已选信息 */
+    filedString: {
+      type: String,
+      default: () => {
+        return "";
       },
-      /** 已选信息 */
-      filedString: {
-        type: String,
-        default: () => {
-          return ''
-        }
-      }
     },
-    data() {
-      return {
-        loading: false, // 加载进度
-        isCreate: false, // 控制新建
-        list: [], // 表数据
-        fieldList: [], // 表头数据
-        currentPage: 1, // 当前页数
-        totalPage: 1, // 总页数
-        otherItems: [],
-        page: 1,
-        listQuery: {
-          Filter: "",
-          Sorting: "",
-          SkipCount: 0,
-          MaxResultCount: 10
-        },
-        selectedItem: [] // 勾选的数据 点击确定 传递给父组件
-
+  },
+  data() {
+    return {
+      loading: false, // 加载进度
+      isCreate: false, // 控制新建
+      list: [], // 表数据
+      fieldList: [], // 表头数据
+      currentPage: 1, // 当前页数
+      totalPage: 1, // 总页数
+      otherItems: [],
+      page: 1,
+      listQuery: {
+        Filter: "",
+        Sorting: "",
+        SkipCount: 0,
+        MaxResultCount: 10,
+      },
+      selectedItem: [], // 勾选的数据 点击确定 传递给父组件
+    };
+  },
+  computed: {},
+  watch: {
+    // 选择
+    selectedData: function () {
+      this.checkItemsWithSelectedData();
+    },
+  },
+  mounted() {
+    //生命周期的钩子函数
+    this.getFieldList();
+  },
+  created() {},
+  methods: {
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      // 如果需要格式化
+      if (column.property === "unit") {
+        return this.typeFilter(row[column.property]);
       }
+      return row[column.property] || "--";
+    },
+    typeFilter(type) {
+      return projectTypeKeyValue[type];
+    },
+    /**
+     * 刷新列表
+     */
+    refreshList() {
+      this.currentPage = 1;
+      this.getList();
     },
-    computed: {},
-    watch: {
-      // 选择
-      selectedData: function () {
-        this.checkItemsWithSelectedData()
+    /** 获取字段 */
+    getFieldList() {
+      if (this.fieldList.length == 0) {
+        this.fieldList = this.getDefaultField();
       }
+      if (this.filedString == "user") {
+        this.fieldList = this.getUserField();
+      } else if (this.filedString == "org") {
+        this.fieldList = this.getOrgField();
+      }
+      // 获取好字段开始请求数据
+      this.getList();
     },
-    mounted() {//生命周期的钩子函数
-      this.getFieldList();
+    /** 获取列表请求 */
+    getDefaultField() {
+      return [
+        { name: "产品编码", field: "code", formType: "text" },
+        { name: "产品名称", field: "name", formType: "text" },
+        { name: "规格", field: "model", formType: "text" },
+        { name: "单位", field: "unit", formType: "text" },
+        { name: "单价（元）", field: "price", formType: "text" },
+      ];
     },
-    created() {
+    getUserField() {
+      return [
+        { name: "用户名", field: "userName", formType: "text" },
+        { name: "所属机构", field: "orgIdToName", formType: "text" },
+        { name: "邮箱", field: "email", formType: "text" },
+        { name: "电话", field: "phoneNumber", formType: "text" },
+      ];
     },
-    methods: {
-      /** 格式化字段 */
-      fieldFormatter(row, column) {
-        // 如果需要格式化
-        if (column.property === 'unit') {
-          return this.typeFilter(row[column.property])
-        }
-        return row[column.property] || '--'
-      },
-      typeFilter(type) {
-        return projectTypeKeyValue[type]
-      },
-      /**
-       * 刷新列表
-       */
-      refreshList() {
-        this.currentPage = 1
-        this.getList()
-      },
-      /** 获取字段 */
-      getFieldList() {
-        if (this.fieldList.length == 0) {
-          this.fieldList = this.getDefaultField();
-        }
-        if (this.filedString == 'user') {
-          this.fieldList = this.getUserField();
-        } else if (this.filedString == 'org') {
-          this.fieldList = this.getOrgField();
-        }
-        // 获取好字段开始请求数据
-        this.getList();
-      },
-      /** 获取列表请求 */
-      getDefaultField() {
-        return [
-          {name: '产品编码', field: 'code', formType: 'text'},
-          {name: '产品名称', field: 'name', formType: 'text'},
-          {name: '规格', field: 'model', formType: 'text'},
-          {name: '单位', field: 'unit', formType: 'text'},
-          {name: '单价（元）', field: 'price', formType: 'text'}
-        ]
-      },
-      getUserField() {
-        return [
-          {name: '用户名', field: 'userName', formType: 'text'},
-          {name: '所属机构', field: 'orgIdToName', formType: 'text'},
-          {name: '邮箱', field: 'email', formType: 'text'},
-          {name: '电话', field: 'phoneNumber', formType: 'text'}
-        ]
-      },
-      getOrgField() {
-        return [
-          {name: '机构名称', field: 'name', formType: 'text'},
-          {name: '全称', field: 'fullName', formType: 'text'},
-          {name: '排序', field: 'sort', formType: 'text'},
-          {name: '机构类型', field: 'categoryId', formType: 'text'},
-        ]
-      },
-      /** 获取列表数据 */
-      getList() {
-        this.loading = true
-        this.listQuery.SkipCount = (this.page - 1) * 10;
-        this.list = [];
-        if (this.filedString == 'user') {
-          this.$axios.gets("/api/base/user", this.listQuery).then(response => {
+    getOrgField() {
+      return [
+        { name: "机构名称", field: "name", formType: "text" },
+        { name: "全称", field: "fullName", formType: "text" },
+        { name: "排序", field: "sort", formType: "text" },
+        { name: "机构类型", field: "categoryId", formType: "text" },
+      ];
+    },
+    /** 获取列表数据 */
+    getList(data) {
+      this.loading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.list = [];
+      if (this.filedString == "user") {
+        this.$axios
+          .gets("/api/base/user", this.listQuery)
+          .then((response) => {
             this.list = response.items;
             this.totalPage = response.totalCount;
             this.loading = false;
           })
-            .catch(() => {
-              this.loading = false
-            });
-        } else if (this.filedString == 'org') {
-          this.$axios.gets("/api/base/branch/paged", this.listQuery).then(response => {
+          .catch(() => {
+            this.loading = false;
+          });
+      } else if (this.filedString == "org") {
+        this.$axios
+          .gets("/api/base/branch/paged", this.listQuery)
+          .then((response) => {
             this.list = response.items;
             this.totalPage = response.totalCount;
             this.loading = false;
           })
-            .catch(() => {
-              this.loading = false
-            });
-        }
-
-      },
-      /** 获取列表数据 */
-      getOrgList() {
-        this.loading = true
-        this.listQuery.SkipCount = (this.page - 1) * 10;
-        this.list = [];
-        this.$axios.gets("/api/base/branch/paged", this.listQuery).then(response => {
+          .catch(() => {
+            this.loading = false;
+          });
+      }
+    },
+    /** 获取列表数据 */
+    getOrgList(data) {
+      this.loading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.list = [];
+      this.$axios
+        .gets("/api/base/branch/paged", this.listQuery)
+        .then((response) => {
           this.list = response.items;
           this.totalPage = response.totalCount;
           this.loading = false;
         })
-          .catch(() => {
-            this.loading = false
-          });
-      },
-      // 标记选择数据
-      checkItemsWithSelectedData() {
-        const selectedArray = this.selectedData.map(item => {
-          item.has = false
-          return item
-        })
-
-        const selectedRows = []
-        this.otherItems = []
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    // 标记选择数据
+    checkItemsWithSelectedData() {
+      const selectedArray = this.selectedData.map((item) => {
+        item.has = false;
+        return item;
+      });
 
-        this.list.forEach((item, index) => {
-          selectedArray.forEach((selectedItem, selectedIndex) => {
-            if (item['Id'] == selectedItem['Id']) {
-              selectedItem.has = true
-              selectedRows.push(item)
-            }
-          })
-        })
+      const selectedRows = [];
+      this.otherItems = [];
 
+      this.list.forEach((item, index) => {
         selectedArray.forEach((selectedItem, selectedIndex) => {
-          if (!selectedItem.has) {
-            this.otherItems.push(selectedItem)
+          if (item["Id"] == selectedItem["Id"]) {
+            selectedItem.has = true;
+            selectedRows.push(item);
           }
-        })
+        });
+      });
 
-        this.$nextTick(() => {
-          this.$refs.relativeTable.clearSelection()
-          selectedRows.forEach(row => {
-            this.$refs.relativeTable.toggleRowSelection(row, true)
-          })
-        })
-      },
-      /** 列表操作 */
-      // 当某一行被点击时会触发该事件
-      handleRowClick(row, column, event) {
-      },
-      // 当选择项发生变化时会触发该事件
-      handleSelectionChange(val) {
-        /** 单选逻辑 */
-        if (this.radio) {
-          // this.$refs.relativeTable.clearSelection();
-          val.forEach((row, index) => {
-            if (index === val.length - 1) return
-            this.$refs.relativeTable.toggleRowSelection(row, false)
-          })
-          if (val.length === 0) {
-            this.selectedItem = []
-          } else {
-            this.selectedItem = val.length === 1 ? val : [val[val.length - 1]]
-          }
-        } else {
-          this.selectedItem = this.otherItems.concat(val)
+      selectedArray.forEach((selectedItem, selectedIndex) => {
+        if (!selectedItem.has) {
+          this.otherItems.push(selectedItem);
         }
+      });
 
-        // this.$emit('changeCheckout', {
-        //   data: this.selectedItem
-        //})
-      },
-      clearAll() {
-        this.$refs.relativeTable.clearSelection()
-      },
-      // 	当用户手动勾选全选 Checkbox 时触发的事件
-      selectAll() {
-      },
-      // 进行搜索操作
-      searchInput() {
-        this.currentPage = 1
-        this.totalPage = 1
-        this.getList()
-      },
-      changePage(type) {
-        if (type == 'up') {
-          this.currentPage = this.currentPage - 1
-        } else if (type == 'down') {
-          this.currentPage = this.currentPage + 1
-        }
-        if (this.currentPage <= this.totalPage && this.currentPage >= 1) {
-          this.getList()
+      this.$nextTick(() => {
+        this.$refs.relativeTable.clearSelection();
+        selectedRows.forEach((row) => {
+          this.$refs.relativeTable.toggleRowSelection(row, true);
+        });
+      });
+    },
+    /** 列表操作 */
+    // 当某一行被点击时会触发该事件
+    handleRowClick(row, column, event) {},
+    // 当选择项发生变化时会触发该事件
+    handleSelectionChange(val) {
+      /** 单选逻辑 */
+      if (this.radio) {
+        // this.$refs.relativeTable.clearSelection();
+        val.forEach((row, index) => {
+          if (index === val.length - 1) return;
+          this.$refs.relativeTable.toggleRowSelection(row, false);
+        });
+        if (val.length === 0) {
+          this.selectedItem = [];
+        } else {
+          this.selectedItem = val.length === 1 ? val : [val[val.length - 1]];
         }
-      },
-      // 关闭操作
-      closeView() {
-        this.$emit('close')
-      },
-      // 确定选择
-      confirmClick() {
-        this.$emit('changeCheckout', {data: this.selectedItem})
-        this.$emit('close')
-      },
-      handleFilter() {
-        this.page = 1;
+      } else {
+        this.selectedItem = this.otherItems.concat(val);
+      }
+
+      // this.$emit('changeCheckout', {
+      //   data: this.selectedItem
+      //})
+    },
+    clearAll() {
+      this.$refs.relativeTable.clearSelection();
+    },
+    // 	当用户手动勾选全选 Checkbox 时触发的事件
+    selectAll() {},
+    // 进行搜索操作
+    searchInput() {
+      this.currentPage = 1;
+      this.totalPage = 1;
+      this.getList();
+    },
+    changePage(type) {
+      if (type == "up") {
+        this.currentPage = this.currentPage - 1;
+      } else if (type == "down") {
+        this.currentPage = this.currentPage + 1;
+      }
+      if (this.currentPage <= this.totalPage && this.currentPage >= 1) {
         this.getList();
-      },
-    }
-  }
+      }
+    },
+    // 关闭操作
+    closeView() {
+      this.$emit("close");
+    },
+    // 确定选择
+    confirmClick() {
+      this.$emit("changeCheckout", { data: this.selectedItem });
+      this.$emit("close");
+    },
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-  .cr-body-content {
-    position: relative;
-    background-color: white;
-    border-bottom: 1px solid #e6e6e6;
-  }
+.cr-body-content {
+  position: relative;
+  background-color: white;
+  border-bottom: 1px solid #e6e6e6;
+}
 
-  .content-header {
-    position: relative;
-    padding: 10px 0px;
+.content-header {
+  position: relative;
+  padding: 10px 0px;
 
-    .search-container {
-      margin: 0 20px;
-      width: 200px;
-    }
-
-    .create-button {
-      position: absolute;
-      right: 10px;
-      top: 15px;
-    }
+  .search-container {
+    margin: 0 20px;
+    width: 200px;
   }
 
-  //表尾 上一页按钮
-  .table-footer {
-    padding: 8px 20px;
+  .create-button {
+    position: absolute;
+    right: 10px;
+    top: 15px;
   }
+}
 
-  .el-table /deep/ thead th {
-    font-weight: 400;
-    font-size: 12px;
-  }
+//表尾 上一页按钮
+.table-footer {
+  padding: 8px 20px;
+}
 
-  .el-table /deep/ tbody tr td {
-    font-size: 12px;
-  }
+.el-table /deep/ thead th {
+  font-weight: 400;
+  font-size: 12px;
+}
 
-  .el-table /deep/ thead .el-checkbox {
-    display: none;
-  }
+.el-table /deep/ tbody tr td {
+  font-size: 12px;
+}
 
-  body .el-table th.gutter {
-    display: table-cell !important;
-  }
+.el-table /deep/ thead .el-checkbox {
+  display: none;
+}
 
-  .el-table /deep/ .el-table__body-wrapper {
-    height: calc(100% - 48px) !important;
-  }
+body .el-table th.gutter {
+  display: table-cell !important;
+}
 
+.el-table /deep/ .el-table__body-wrapper {
+  height: calc(100% - 48px) !important;
+}
 
-  .handle-bar {
-    height: 50px;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    z-index: 2;
+.handle-bar {
+  height: 50px;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 2;
 
-    button {
-      float: right;
-      margin-top: 10px;
-      margin-right: 10px;
-    }
+  button {
+    float: right;
+    margin-top: 10px;
+    margin-right: 10px;
   }
+}
 </style>
diff --git a/code/WebApp/vue/src/views/dashboard/admin/components/PanelGroup.vue b/code/WebApp/vue/src/views/dashboard/admin/components/PanelGroup.vue
index eac5562b..b4962f4e 100644
--- a/code/WebApp/vue/src/views/dashboard/admin/components/PanelGroup.vue
+++ b/code/WebApp/vue/src/views/dashboard/admin/components/PanelGroup.vue
@@ -6,10 +6,13 @@
           <svg-icon icon-class="peoples" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
-          <div class="card-panel-text">
-            库存总数
-          </div>
-          <count-to :start-val="0" :end-val="totalCount" :duration="2600" class="card-panel-num" />
+          <div class="card-panel-text">库存总数</div>
+          <count-to
+            :start-val="0"
+            :end-val="totalCount"
+            :duration="2600"
+            class="card-panel-num"
+          />
           <span class="card-panel-text">个</span>
         </div>
       </div>
@@ -20,10 +23,13 @@
           <svg-icon icon-class="shopping" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
-          <div class="card-panel-text">
-            暂估汇总
-          </div>
-          <count-to :start-val="0" :end-val="totalCountContract" :duration="2600" class="card-panel-num" />
+          <div class="card-panel-text">暂估汇总</div>
+          <count-to
+            :start-val="0"
+            :end-val="totalCountContract"
+            :duration="2600"
+            class="card-panel-num"
+          />
           <span class="card-panel-text">份</span>
         </div>
       </div>
@@ -37,10 +43,13 @@
           <svg-icon icon-class="money" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
-          <div class="card-panel-text">
-            合同金额/元
-          </div>
-          <count-to :start-val="0" :end-val="totalAmount" :duration="3000" class="card-panel-num" />
+          <div class="card-panel-text">合同金额/元</div>
+          <count-to
+            :start-val="0"
+            :end-val="totalAmount"
+            :duration="3000"
+            class="card-panel-num"
+          />
         </div>
       </div>
     </el-col>
@@ -50,10 +59,13 @@
           <svg-icon icon-class="job" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
-          <div class="card-panel-text">
-            待开票/元
-          </div>
-          <count-to :start-val="0" :end-val="totalInvoicedAmountAmount" :duration="3200" class="card-panel-num" />
+          <div class="card-panel-text">待开票/元</div>
+          <count-to
+            :start-val="0"
+            :end-val="totalInvoicedAmountAmount"
+            :duration="3200"
+            class="card-panel-num"
+          />
         </div>
       </div>
     </el-col>
@@ -66,10 +78,13 @@
           <svg-icon icon-class="org" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
-          <div class="card-panel-text">
-            待回款/元
-          </div>
-          <count-to :start-val="0" :end-val="totalhuikuanAmount" :duration="3600" class="card-panel-num" />
+          <div class="card-panel-text">待回款/元</div>
+          <count-to
+            :start-val="0"
+            :end-val="totalhuikuanAmount"
+            :duration="3600"
+            class="card-panel-num"
+          />
         </div>
       </div>
     </el-col>
@@ -77,271 +92,288 @@
 </template>
 
 <script>
-  import CountTo from 'vue-count-to'
+import CountTo from "vue-count-to";
 
-  export default {
-    components: {
-      CountTo
-    },
-    data() {
-      return {
-        listCards3: [
-          {
-            image: require('@/assets/customer_images/Money_icon.png'),
-            title: '合同总额',
-            description: '描述',
-            price:'300'
-          }
-        ],
-        listCards4: [
-          {
-            image: require('@/assets/customer_images/kaipiaoxinxi.png'),
-            title: '待开票总额',
-            price:'400'
-          }
-        ],
-        listCards5: [
-          {
-            image: require('@/assets/customer_images/huikuan.png'),
-            title: '待回款总额',
-            price:'400'
-          }
-        ],
-        listCards1: [
-          {
-            image: require('@/assets/customer_images/leijixiangmushu.png'),//将图片作为模块加载进去
-            title: '项目数',
-            description: '描述'
-          }
-        ],
-        listCards2: [
-          {
-            image: require('@/assets/customer_images/hetong.png'),
-            title: '合同数',
-            description: '描述'
-          }
-        ],
-        elementLoadingText: "正在加载...",
-        options: [
-          {
-            value: "0",
-            label: "项目列表日志",
-          },
-          {
-            value: "1",
-            label: "附件列表日志",
-          },
-        ],
-        value:"0",
-        newsList: [],
-        paginationLog: {
-          total: 0,
-          page: 1,
-          pageSize: 10,
+export default {
+  components: {
+    CountTo,
+  },
+  data() {
+    return {
+      listCards3: [
+        {
+          image: require("@/assets/customer_images/Money_icon.png"),
+          title: "合同总额",
+          description: "描述",
+          price: "300",
+        },
+      ],
+      listCards4: [
+        {
+          image: require("@/assets/customer_images/kaipiaoxinxi.png"),
+          title: "待开票总额",
+          price: "400",
+        },
+      ],
+      listCards5: [
+        {
+          image: require("@/assets/customer_images/huikuan.png"),
+          title: "待回款总额",
+          price: "400",
+        },
+      ],
+      listCards1: [
+        {
+          image: require("@/assets/customer_images/leijixiangmushu.png"), //将图片作为模块加载进去
+          title: "项目数",
+          description: "描述",
         },
-        form: {},
-        activeName: 'first',
-        list: null,
-        // headDetails: [
-        //   { title: '客户编码', value: '' },
-        //   { title: '客户名称', value: '' },
-        //   { title: '客户全称', value: '' }
-        // ],
-        listContracts:null,
-        listPaymentAmount:null,
-        paymentAmout1:[],
-        paymentAmout2:[],
-        paymentAmout3:[],
-        fileList:[],
-        checkCustomer:[],
-        customerList:[],
-        totalCount: 0,
-        totalCountContract:0,
-        totalFileCount: 0,
-        listLoading: true,
-        formLoading: false,
-        propsCustomerId:"",
-        listQuery: {
-          Sorting: "",
-          SkipCount: 0,
-          MaxResultCount: 10
+      ],
+      listCards2: [
+        {
+          image: require("@/assets/customer_images/hetong.png"),
+          title: "合同数",
+          description: "描述",
         },
-        listQueryImg: {
-          CustomerId: "",
-          Sorting: "",
-          SkipCount: 0,
-          MaxResultCount: 10
+      ],
+      elementLoadingText: "正在加载...",
+      options: [
+        {
+          value: "0",
+          label: "项目列表日志",
         },
+        {
+          value: "1",
+          label: "附件列表日志",
+        },
+      ],
+      value: "0",
+      newsList: [],
+      paginationLog: {
+        total: 0,
         page: 1,
-        pageFiles: 1,
-        pageImg: 1,
-        multipleSelection: [],
-        formTitle: "",
-        isEdit: false,
-        activeNames: ['1']
-      };
-    },
-    created() {
-      this.getList();
-      this.getContractList();
-      this.getAmount();
-    },
-    computed:{
-      totalAmount(){//合同总额
-        let totalAmountAll=0;
-        this.paymentAmout3.map((item)=>{totalAmountAll+=item.totalAmount})
-        return totalAmountAll;
+        pageSize: 10,
       },
-      totalInvoicedAmountAmount(){//待开票金额
-        let invoAmount=0;
-        this.paymentAmout1.map((item)=>{invoAmount+=item.invoicedAmount})
-        return invoAmount;
+      form: {},
+      activeName: "first",
+      list: null,
+      // headDetails: [
+      //   { title: '客户编码', value: '' },
+      //   { title: '客户名称', value: '' },
+      //   { title: '客户全称', value: '' }
+      // ],
+      listContracts: null,
+      listPaymentAmount: null,
+      paymentAmout1: [],
+      paymentAmout2: [],
+      paymentAmout3: [],
+      fileList: [],
+      checkCustomer: [],
+      customerList: [],
+      totalCount: 0,
+      totalCountContract: 0,
+      totalFileCount: 0,
+      listLoading: true,
+      formLoading: false,
+      propsCustomerId: "",
+      listQuery: {
+        Sorting: "",
+        SkipCount: 0,
+        MaxResultCount: 10,
       },
-      totalhuikuanAmount(){//待回款金额
-        let hkAmount=0;
-        this.paymentAmout1.map((item)=>{hkAmount+=item.huikuanAmount})
-        return hkAmount;
+      listQueryImg: {
+        CustomerId: "",
+        Sorting: "",
+        SkipCount: 0,
+        MaxResultCount: 10,
+      },
+      page: 1,
+      pageFiles: 1,
+      pageImg: 1,
+      multipleSelection: [],
+      formTitle: "",
+      isEdit: false,
+      activeNames: ["1"],
+    };
+  },
+  created() {
+    this.getList();
+    this.getContractList();
+    this.getAmount();
+  },
+  computed: {
+    totalAmount() {
+      //合同总额
+      let totalAmountAll = 0;
+      this.paymentAmout3.map((item) => {
+        totalAmountAll += item.totalAmount;
+      });
+      return totalAmountAll;
+    },
+    totalInvoicedAmountAmount() {
+      //待开票金额
+      let invoAmount = 0;
+      this.paymentAmout1.map((item) => {
+        invoAmount += item.invoicedAmount;
+      });
+      return invoAmount;
+    },
+    totalhuikuanAmount() {
+      //待回款金额
+      let hkAmount = 0;
+      this.paymentAmout1.map((item) => {
+        hkAmount += item.huikuanAmount;
+      });
+      return hkAmount;
+    },
+  },
+  methods: {
+    handleSetLineChartData(type) {
+      this.$emit("handleSetLineChartData", type);
+    },
+    getList(data) {
+      //项目总个数
+      this.listLoading = true;
+  
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
       }
+      // this.$axios.gets("/api/abpvnext_master/project/all", this.listQuery).then(response => {
+      //   this.totalCount = response.totalCount;
+      // });
     },
-    methods: {
-      handleSetLineChartData(type) {
-        this.$emit('handleSetLineChartData', type)
-      },
-      getList() {//项目总个数
-        this.listLoading = true;
-        this.listQuery.SkipCount = (this.page - 1) * 10;
-        // this.$axios.gets("/api/abpvnext_master/project/all", this.listQuery).then(response => {
-        //   this.totalCount = response.totalCount;
-        // });
-      },
-      getContractList() {//合同列表
-        this.listLoading = true;
-        this.listQuery.SkipCount = (this.page - 1) * 10;
-        // this.$axios.gets("/api/abpvnext_master/contract/all", this.listQuery).then(response => {
-        //   this.listContracts = response.items;
-        //   this.totalCountContract = response.totalCount;//合同总个数
-        //   this.paymentAmout3=[];
-        //   this.paymentAmout3=this.listContracts;//合同总金额
-        // });
-      },
-      getAmount() {//金额列表
-        this.listLoading = true;
-        this.listQuery.SkipCount = (this.page - 1) * 10;
-        // this.$axios.gets("/api/abpvnext_master/customer/GetAmount", this.listQuery).then(response => {
-        //   this.paymentAmout1=[];
-        //   this.paymentAmout1=response.items;
-        // });
-      },
-    }
-  }
+    getContractList() {
+      //合同列表
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 10;
+      // this.$axios.gets("/api/abpvnext_master/contract/all", this.listQuery).then(response => {
+      //   this.listContracts = response.items;
+      //   this.totalCountContract = response.totalCount;//合同总个数
+      //   this.paymentAmout3=[];
+      //   this.paymentAmout3=this.listContracts;//合同总金额
+      // });
+    },
+    getAmount() {
+      //金额列表
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 10;
+      // this.$axios.gets("/api/abpvnext_master/customer/GetAmount", this.listQuery).then(response => {
+      //   this.paymentAmout1=[];
+      //   this.paymentAmout1=response.items;
+      // });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .panel-group {
-    margin-top: 18px;
+.panel-group {
+  margin-top: 18px;
 
-    .card-panel-col {
-      margin-bottom: 32px;
-    }
-
-    .card-panel {
-      height: 108px;
-      cursor: pointer;
-      font-size: 12px;
-      position: relative;
-      overflow: hidden;
-      color: #666;
-      background: #fff;
-      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-      border-color: rgba(0, 0, 0, .05);
-
-      &:hover {
-        .card-panel-icon-wrapper {
-          color: #fff;
-        }
-
-        .icon-people {
-          background: #40c9c6;
-        }
-
-        .icon-message {
-          background: #36a3f7;
-        }
+  .card-panel-col {
+    margin-bottom: 32px;
+  }
 
-        .icon-money {
-          background: #f4516c;
-        }
+  .card-panel {
+    height: 108px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #666;
+    background: #fff;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, 0.05);
+    border-color: rgba(0, 0, 0, 0.05);
 
-        .icon-shopping {
-          background: #34bfa3
-        }
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
       }
 
       .icon-people {
-        color: #40c9c6;
+        background: #40c9c6;
       }
 
       .icon-message {
-        color: #36a3f7;
+        background: #36a3f7;
       }
 
       .icon-money {
-        color: #f4516c;
+        background: #f4516c;
       }
 
       .icon-shopping {
-        color: #34bfa3
+        background: #34bfa3;
       }
+    }
 
-      .card-panel-icon-wrapper {
-        float: left;
-        margin: 14px 0 0 14px;
-        padding: 16px;
-        transition: all 0.38s ease-out;
-        border-radius: 6px;
-      }
+    .icon-people {
+      color: #40c9c6;
+    }
 
-      .card-panel-icon {
-        float: left;
-        font-size: 48px;
-      }
+    .icon-message {
+      color: #36a3f7;
+    }
 
-      .card-panel-description {
-        float: center;
-        font-weight: bold;
-        margin: 26px;
-        margin-left: 0px;
+    .icon-money {
+      color: #f4516c;
+    }
 
-        .card-panel-text {
-          line-height: 18px;
-          color: rgba(0, 0, 0, 0.45);
-          font-size: 16px;
-          margin-bottom: 12px;
-        }
+    .icon-shopping {
+      color: #34bfa3;
+    }
 
-        .card-panel-num {
-          font-size: 20px;
-        }
-      }
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
     }
-  }
 
-  @media (max-width:550px) {
-    .card-panel-description {
-      display: none;
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
     }
 
-    .card-panel-icon-wrapper {
-      float: none !important;
-      width: 100%;
-      height: 100%;
-      margin: 0 !important;
+    .card-panel-description {
+      float: center;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 0px;
 
-      .svg-icon {
-        display: block;
-        margin: 14px auto !important;
-        float: none !important;
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
       }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+}
+
+@media (max-width: 550px) {
+  .card-panel-description {
+    display: none;
+  }
+
+  .card-panel-icon-wrapper {
+    float: none !important;
+    width: 100%;
+    height: 100%;
+    margin: 0 !important;
+
+    .svg-icon {
+      display: block;
+      margin: 14px auto !important;
+      float: none !important;
     }
   }
+}
 </style>
diff --git a/code/WebApp/vue/src/views/employee/index.vue b/code/WebApp/vue/src/views/employee/index.vue
index 5d081c8c..3f85c08b 100644
--- a/code/WebApp/vue/src/views/employee/index.vue
+++ b/code/WebApp/vue/src/views/employee/index.vue
@@ -21,7 +21,7 @@
           :expand-on-click-node="false"
           lazy
           @node-click="handleNodeClick"
-          style="margin-top:15px"
+          style="margin-top: 15px"
         />
       </el-col>
       <el-col :xs="15" :sm="18" :md="19" :lg="20" :xl="20">
@@ -32,7 +32,7 @@
             clearable
             size="small"
             placeholder="搜索..."
-            style="width: 200px;"
+            style="width: 200px"
             class="filter-item"
             @keyup.enter.native="handleFilter"
           />
@@ -42,8 +42,9 @@
             type="success"
             icon="el-icon-search"
             @click="handleFilter"
-          >搜索</el-button>
-          <div style="padding: 6px 0;">
+            >搜索</el-button
+          >
+          <div style="padding: 6px 0">
             <el-button
               class="filter-item"
               size="mini"
@@ -51,7 +52,8 @@
               icon="el-icon-plus"
               @click="handleCreate"
               v-permission="['AbpIdentity.Users.Create']"
-            >新增</el-button>
+              >新增</el-button
+            >
             <el-button
               class="filter-item"
               size="mini"
@@ -59,7 +61,8 @@
               icon="el-icon-edit"
               v-permission="['AbpIdentity.Users.Update']"
               @click="handleUpdate()"
-            >修改</el-button>
+              >修改</el-button
+            >
             <el-button
               slot="reference"
               class="filter-item"
@@ -68,7 +71,8 @@
               size="mini"
               v-permission="['AbpIdentity.Users.Delete']"
               @click="handleDelete()"
-            >删除</el-button>
+              >删除</el-button
+            >
           </div>
         </div>
         <el-dialog
@@ -100,7 +104,7 @@
                 v-model="form.orgId"
                 :load-options="loadOrgs"
                 :options="orgs"
-                style="width: 184px;"
+                style="width: 184px"
                 placeholder="选择所属机构"
               />
             </el-form-item>
@@ -113,7 +117,12 @@
                 v-model="form.jobs"
                 placeholder="选择岗位"
               >
-              <el-option v-for="item in jobData" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option
+                  v-for="item in jobData"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
               </el-select>
             </el-form-item>
             <el-form-item label="关联用户" prop="userId">
@@ -121,9 +130,13 @@
                 v-model="form.userIdToName"
                 readonly
                 placeholder="请选择"
-                style="width: 184px;"
+                style="width: 184px"
               >
-                <el-button slot="append" icon="el-icon-search" @click="handleSelectUser()"></el-button>
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="handleSelectUser()"
+                ></el-button>
               </el-input>
             </el-form-item>
             <el-form-item label="性别" prop="gender">
@@ -132,7 +145,7 @@
                 <el-radio :label="0">女</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="状态" style="margin:left" prop="enabled">
+            <el-form-item label="状态" style="margin: left" prop="enabled">
               <el-radio-group v-model="form.enabled" style="width: 140px">
                 <el-radio :label="true">启用</el-radio>
                 <el-radio :label="false">禁用</el-radio>
@@ -141,7 +154,13 @@
           </el-form>
           <div slot="footer" class="dialog-footer">
             <el-button size="small" type="text" @click="cancel">取消</el-button>
-            <el-button size="small" v-loading="formLoading" type="primary" @click="save">确认</el-button>
+            <el-button
+              size="small"
+              v-loading="formLoading"
+              type="primary"
+              @click="save"
+              >确认</el-button
+            >
           </div>
         </el-dialog>
 
@@ -157,7 +176,7 @@
               size="small"
               v-model="listQuery.Filter"
               placeholder="搜索..."
-              style="width: 200px;"
+              style="width: 200px"
               class="filter-item"
               @keyup.enter.native="userHandleFilter"
             />
@@ -167,7 +186,8 @@
               type="primary"
               icon="el-icon-search"
               @click="userHandleFilter"
-            >搜索</el-button>
+              >搜索</el-button
+            >
           </div>
 
           <el-table
@@ -176,19 +196,24 @@
             height="300"
             @row-click="userHandleRowClick"
           >
-            <el-table-column label="用户名" prop="userName" align="center" width="150px">
-              <template slot-scope="{row}">
-                <span class="link-type">{{row.userName}}</span>
+            <el-table-column
+              label="用户名"
+              prop="userName"
+              align="center"
+              width="150px"
+            >
+              <template slot-scope="{ row }">
+                <span class="link-type">{{ row.userName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="邮箱" align="center" width="200px">
               <template slot-scope="scope">
-                <span>{{scope.row.email}}</span>
+                <span>{{ scope.row.email }}</span>
               </template>
             </el-table-column>
             <el-table-column label="电话" align="center" width="200px">
               <template slot-scope="scope">
-                <span>{{scope.row.phoneNumber}}</span>
+                <span>{{ scope.row.phoneNumber }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -206,35 +231,43 @@
           v-loading="listLoading"
           :data="list"
           size="small"
-          style="width: 90%;"
+          style="width: 90%"
           @sort-change="sortChange"
           @selection-change="handleSelectionChange"
           @row-click="handleRowClick"
         >
           <el-table-column type="selection" width="44px"></el-table-column>
-          <el-table-column label="岗位名称" prop="name" sortable="custom" align="center" width="150px">
-            <template slot-scope="{row}">
-              <span class="link-type" @click="handleUpdate(row)">{{row.name}}</span>
+          <el-table-column
+            label="岗位名称"
+            prop="name"
+            sortable="custom"
+            align="center"
+            width="150px"
+          >
+            <template slot-scope="{ row }">
+              <span class="link-type" @click="handleUpdate(row)">{{
+                row.name
+              }}</span>
             </template>
           </el-table-column>
           <el-table-column label="性别" prop="gender" align="center">
             <template slot-scope="scope">
-              <span>{{scope.row.gender | displayGender}}</span>
+              <span>{{ scope.row.gender | displayGender }}</span>
             </template>
           </el-table-column>
           <el-table-column label="电话" prop="phone" align="center">
             <template slot-scope="scope">
-              <span>{{scope.row.phone}}</span>
+              <span>{{ scope.row.phone }}</span>
             </template>
           </el-table-column>
           <el-table-column label="邮箱" prop="email" align="center">
             <template slot-scope="scope">
-              <span>{{scope.row.email}}</span>
+              <span>{{ scope.row.email }}</span>
             </template>
           </el-table-column>
           <el-table-column label="所属机构" prop="orgIdToName" align="center">
             <template slot-scope="scope">
-              <span>{{scope.row.orgIdToName}}</span>
+              <span>{{ scope.row.orgIdToName }}</span>
             </template>
           </el-table-column>
           <!-- <el-table-column label="关联用户" prop="userId" align="center">
@@ -248,12 +281,12 @@
                 v-model="scope.row.enabled"
                 active-color="#409EFF"
                 inactive-color="#F56C6C"
-                @change="changeEnabled(scope.row, scope.row.enabled,)"
+                @change="changeEnabled(scope.row, scope.row.enabled)"
               />
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="125">
-            <template slot-scope="{row}">
+            <template slot-scope="{ row }">
               <el-button
                 type="primary"
                 size="mini"
@@ -265,7 +298,7 @@
                 type="danger"
                 size="mini"
                 @click="handleDelete(row)"
-                :disabled="row.userName==='admin'"
+                :disabled="row.userName === 'admin'"
                 v-permission="['AbpIdentity.Users.Delete']"
                 icon="el-icon-delete"
               />
@@ -274,7 +307,7 @@
         </el-table>
 
         <pagination
-          v-show="totalCount>0"
+          v-show="totalCount > 0"
           :total="totalCount"
           :page.sync="page"
           :limit.sync="listQuery.MaxResultCount"
@@ -344,7 +377,7 @@ export default {
       orgName: "",
       orgs: [],
       orgData: [],
-      jobData:[],
+      jobData: [],
       userList: null,
       totalCount: 0,
       listLoading: true,
@@ -380,20 +413,22 @@ export default {
       }
       //TODO:仅获取启用机构
       setTimeout(() => {
-        this.$axios
-          .gets("/api/base/branch/all", params)
-          .then((response) => {
-            if (resolve) {
-              resolve(response.items);
-            } else {
-              this.orgData = response.items;
-            }
-          });
+        this.$axios.gets("/api/base/branch/all", params).then((response) => {
+          if (resolve) {
+            resolve(response.items);
+          } else {
+            this.orgData = response.items;
+          }
+        });
       }, 100);
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .gets("/api/base/employee/all", this.listQuery)
         .then((response) => {
@@ -479,9 +514,13 @@ export default {
           });
         });
     },
-    getUserList() {
+    getUserList(data) {
       this.userListLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .gets("/api/identity/users", this.listQuery)
         .then((response) => {
diff --git a/code/WebApp/vue/src/views/job/index.vue b/code/WebApp/vue/src/views/job/index.vue
index 5948ad81..e6c036bb 100644
--- a/code/WebApp/vue/src/views/job/index.vue
+++ b/code/WebApp/vue/src/views/job/index.vue
@@ -197,9 +197,14 @@ export default {
     this.getList();
   },
   methods: {
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .gets("/api/base/job/all", this.listQuery)
         .then(response => {
diff --git a/code/WebApp/vue/src/views/log/index.vue b/code/WebApp/vue/src/views/log/index.vue
index 67597e7f..5a3264b9 100644
--- a/code/WebApp/vue/src/views/log/index.vue
+++ b/code/WebApp/vue/src/views/log/index.vue
@@ -103,9 +103,14 @@ export default {
     this.getList();
   },
   methods:{
-      getList() {
+      getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .gets("/api/base/auditLogging/all", this.listQuery)
         .then(response => {
diff --git a/code/WebApp/vue/src/views/login/index.vue b/code/WebApp/vue/src/views/login/index.vue
index bcf29743..dab7f3dd 100644
--- a/code/WebApp/vue/src/views/login/index.vue
+++ b/code/WebApp/vue/src/views/login/index.vue
@@ -1,18 +1,14 @@
 <template>
   <div class="wrapper">
     <div class="left">
-
-      <div class="container"><span class="one">SAS/JIT-长春派格汽车塑料技术有限公司结算管理系统</span><span class="two"></span></div>
-
-      <!-- <div class="container"><span class="one">闻荫科技-长春派格结算管理系统</span><span class="two"></span></div> -->
-
+      <div class="container"><span class="one">闻荫科技-ERP结算分析系统</span><span class="two"></span></div>
       <div class="left-pic"/>
       <div class="">
         <div class="copyright">
           长春市闻荫科技
           <a
             target="_blank"
-            href="http://www.ccwin-in.com">©2021 闻荫科技-长春派格结算管理系统</a>
+            href="http://www.ccwin-in.com">©2021 闻荫科技-ERP结算分析系统</a>
         </div>
       </div>
     </div>
@@ -26,7 +22,7 @@
         label-position="left"
       >
         <div class="title-container">
-          <h3 class="title"><span style="color:#f98a05">用户</span><span style="color:#555555">{{ $t('login.title') }}</span></h3>
+          <h3 class="title"><span style="color:#f98a05">会员</span><span style="color:#555555">{{ $t('login.title') }}</span></h3>
           <lang-select class="set-language" />
         </div>
 
@@ -119,7 +115,7 @@ export default {
         tenant: undefined,
         username: "",
         password: "",
-        //org:'',
+        org:'',
         client_id: config.client.client_id,
         client_secret: config.client.client_secret,
         grant_type: config.client.grant_type,
@@ -227,7 +223,7 @@ export default {
 
 <style lang="scss">
 $dark_gray: #ccc;
-$light_gray: rgb(15, 13, 13);
+$light_gray: #333;
 $login_theme: #00aaee;
 
 $bg:#283443;
diff --git a/code/WebApp/vue/src/views/newJit/baseData/assemblyCfg/index.vue b/code/WebApp/vue/src/views/newJit/baseData/assemblyCfg/index.vue
deleted file mode 100644
index 7849b30c..00000000
--- a/code/WebApp/vue/src/views/newJit/baseData/assemblyCfg/index.vue
+++ /dev/null
@@ -1,642 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <el-form
-        :model="listQuery"
-        ref="queryForm"
-        v-show="showSearch"
-        :inline="true"
-      >
-        <!-- <el-form-item>
-          <el-button
-            class="filter-item"
-            size="mini"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleCreate"
-            >新增
-          </el-button>
-        </el-form-item> -->
-
-        <el-form-item label="总成名称" prop="ErpAssemblyName ">
-          <el-input
-            v-model="listQuery.ErpAssemblyName"
-            placeholder="请输入总成名称"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="总成编码" prop="ErpAssemblyCode ">
-          <el-input
-            v-model="listQuery.ErpAssemblyCode"
-            placeholder="请输入总成编码"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleFilter"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="resetQuery('queryForm')"
-            >重置</el-button
-          >
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            style="margin-left: 15px"
-            @click="handleDownload()"
-            >导出(Excel)
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </flexbox>
-    <div class="l-table">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <!-- <el-table-column
-          label="ERP总成名称"
-          prop="erpAssemblyName"
-          sortable="custom"
-          align="center"
-          width="420px"
-        >
-          <template slot-scope="scope">
-              <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-                scope.row.erpAssemblyName
-              }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="ERP总成编码"
-          prop="erpAssemblyCode "
-          sortable="custom"
-          align="center"
-        >
-          <template slot-scope="scope">
-              <span>{{ scope.row.erpAssemblyCode }}</span>
-          </template>
-        </el-table-column> -->
-
-        <el-table-column
-          label="ERP总成编码"
-          prop="erpAssemblyCode"
-          sortable="custom"
-          align="center"
-          width="420px"
-        >
-          <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.erpAssemblyCode
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="ERP总成名称"
-          prop="erpAssemblyName "
-          sortable="custom"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.erpAssemblyName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="ERP总成版本"
-          prop="erpAssemblyVersion "
-          sortable="custom"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.erpAssemblyVersion }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!--表单渲染-->
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        :title="formTitle"
-        width="700px"
-      >
-        <el-form
-          ref="form"
-          :inline="true"
-          :model="form"
-          :rules="rules"
-          size="small"
-          label-width="120px"
-        >
-          <el-row>
-            <el-col :md="4" :xs="24">
-              <el-form-item label="ERP总成名称" required />
-            </el-col>
-            <el-col :md="8" :xs="24">
-              <el-form-item prop="erpAssemblyName ">
-                <el-input
-                  style="width: 150px"
-                  v-model="form.erpAssemblyName"
-                  :disabled="isEdit"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :md="4" :xs="24">
-              <el-form-item
-                style="width: 150px"
-                label="是否覆盖原版本"
-                required
-              />
-            </el-col>
-            <el-col :md="8" :xs="24">
-              <el-form-item prop="isCover ">
-                <el-switch
-                  v-model="form.isCover"
-                  active-color="#409EFF"
-                  inactive-color="#F56C6C"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="dialogFormVisible = false"
-            >取消</el-button
-          >
-          <el-button v-loading="formLoading" type="primary" @click="save"
-            >确认</el-button
-          >
-        </div>
-      </el-dialog>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-        <div>
-          <Detail
-            v-bind:customerInfos="customerInfos"
-            style="margin-top: -35px"
-          ></Detail>
-        </div>
-      </el-drawer>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "AssemblyCfg",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "bomdatabase",
-      rules: {
-        erpAssemblyName: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        ErpAssemblyName: undefined,
-        ErpAssemblyCode: undefined,
-      },
-      listExportQuery: {
-        erpAssemblyCode: undefined,
-        erpAssemblyName: undefined,
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      multipleSelection: [],
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      dialogFormVisible: false,
-      tableHeight: document.documentElement.clientHeight - 280,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      // tempsTabs.push({
-      //   label: "ERP总成名称",
-      //   prop: "erpAssemblyName ",
-      //   width: 220,
-      // });
-      tempsTabs.push({
-        label: "ERP总成版本",
-        prop: "erpAssemblyVersion ",
-        width: 100,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      var parentId = param.id; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    save() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          console.log("保存参数:" + JSON.stringify(this.form));
-          this.formLoading = true;
-          if (this.isEdit) {
-            this.$axios
-              .puts("/api/newjit/assembly-cfg-erp/" + this.form.id, this.form)
-              .then((response) => {
-                this.formLoading = false;
-                this.$notify({
-                  title: "成功",
-                  message: "更新成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.dialogFormVisible = false;
-                this.getList();
-              })
-              .catch(() => {
-                this.formLoading = false;
-              });
-          } else {
-            //insert添加
-            console.log(JSON.stringify(this.form));
-            this.$axios
-              .posts("/api/newjit/assembly-cfg-erp", this.form)
-              .then((response) => {
-                this.formLoading = false;
-                this.$notify({
-                  title: "成功",
-                  message: "新增成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.dialogFormVisible = false;
-                this.getList();
-              })
-              .catch(() => {
-                this.formLoading = false;
-              });
-          }
-        }
-      });
-    },
-    /** 新增 */
-    handleCreate() {
-      this.$nextTick(() => {
-        this.$refs["form"].resetFields();
-      });
-      this.formTitle = "新增";
-      this.isEdit = false;
-      this.form = {};
-      this.dialogFormVisible = true;
-    },
-    /** 修改 */
-    handleUpdate(row) {
-      this.formTitle = "修改";
-      this.isEdit = true;
-      if (row) {
-        this.fetchData(row.id);
-        this.dialogFormVisible = true;
-      } else {
-        if (this.multipleSelection.length != 1) {
-          this.$message({
-            message: "编辑必须选择单行",
-            type: "warning",
-          });
-          return;
-        } else {
-          this.fetchData(this.multipleSelection[0].id);
-          this.dialogFormVisible = true;
-        }
-      }
-    },
-    /** 删除 */
-    handleDelete(row) {
-      if (row) {
-        this.$confirm("是否删除" + row.name + "?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.$axios
-              .deletes("/api/newjit/assembly-cfg-erp/" + row.id)
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.list.splice(index, 1);
-                this.$notify({
-                  title: "成功",
-                  message: "删除成功",
-                  type: "success",
-                  duration: 2000,
-                });
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消删除",
-            });
-          });
-      } else {
-        this.$alert("暂时不支持批量删除", "提示", {
-          confirmButtonText: "确定",
-          callback: (action) => {
-            //
-          },
-        });
-      }
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-        });
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
-      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
-      console.log(JSON.stringify(this.listExportQuery));
-      this.$axios
-        .posts("/api/newjit/assembly-cfg-erp/export", this.listExportQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-      this.listLoading = false;
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      //this.$refs[refName].resetFields();
-      this.listQuery.ErpAssemblyName = "";
-      this.listQuery.ErpAssemblyCode = "";
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 0: "未生效", 2: "已生效", 3: "已发布" }[row[column.property]];
-      }
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/newJit/baseData/billM100/detail.vue b/code/WebApp/vue/src/views/newJit/baseData/billM100/detail.vue
deleted file mode 100644
index 25108fdd..00000000
--- a/code/WebApp/vue/src/views/newJit/baseData/billM100/detail.vue
+++ /dev/null
@@ -1,354 +0,0 @@
-<!--M100上线信息-明细数据-->
-<template>
-  <div class="cr-body-content">
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-      :row-key="getRowKeys"
-      :expand-row-keys="expands"
-      @expand-change="exChange"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <!-- <el-table-column
-        prop="总成名称"
-        label="erpAssemblyName"
-        sortable
-        width="180"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="erpAssemblyVersion"
-        label="总成版本号"
-        sortable
-        width="180"
-      >
-              style="width: calc(100% - 47px)"
-            class="two-list"
-      </el-table-column> -->
-
-      <el-table-column type="expand" prop="details">
-        <template slot-scope="scope">
-          <el-table :data="scope.row.details">
-            <el-table-column
-              prop="partCode"
-              label="客户零件代码"
-            ></el-table-column>
-            <el-table-column
-              prop="partNum"
-              label="客户零件数量"
-            ></el-table-column>
-            <el-table-column prop="description" label="描述"></el-table-column>
-            <el-table-column prop="isKey" label="是否Key件">
-              <template slot-scope="scope">
-                <span v-if="scope.row.isKey == true">
-                  <span style="color: #00b46d">是</span>
-                </span>
-                <span v-else>
-                  <span style="color: #d75c89">否</span>
-                </span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="erpAssemblyVersion"
-        label="总成版本号"
-        sortable
-        width="360"
-      >
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import { downloadFile } from "@/utils/crmindex.js";
-import Detail from "./detail";
-
-export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "stockFisDiffReport",
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      expands: [], //只展开一行放入当前行id
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        parentId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        SkipCount: 0,
-        MaxResultCount: 15,
-        id: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfos: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.parentId = element.ParentId;
-          });
-          if (this.customerInfo.parentId != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "总成编号",
-        prop: "erpAssemblyCode",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "总成名称",
-        prop: "erpAssemblyName",
-        width: 160,
-      });
-      // tempsTabs.push({
-      //   label: "总成版本号",
-      //   prop: "erpAssemblyName",
-      //   width: 160,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    exChange(row, rowList) {
-      this.loading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList() {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      //alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "partCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 6,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    resetQuery() {},
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/newJit/baseData/billM100/index.vue b/code/WebApp/vue/src/views/newJit/baseData/billM100/index.vue
deleted file mode 100644
index d193b0ba..00000000
--- a/code/WebApp/vue/src/views/newJit/baseData/billM100/index.vue
+++ /dev/null
@@ -1,571 +0,0 @@
-<!--M100上线信息页-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <el-form
-        :model="listQuery"
-        ref="queryForm"
-        v-show="showSearch"
-        :inline="true"
-      >
-        <el-form-item label="起始顺序号" prop="HostSNBegin">
-          <el-input
-            v-model="listQuery.HostSNBegin"
-            placeholder="起始顺序号"
-            clearable
-            size="small"
-            style="width: 120px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="结束顺序号" prop="HostSNEnd">
-          <el-input
-            v-model="listQuery.HostSNEnd"
-            placeholder="结束顺序号"
-            clearable
-            size="small"
-            style="width: 120px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="KNR" prop="KNR">
-          <el-input
-            v-model="listQuery.KNR"
-            placeholder="请输入KNR号"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="底盘号" prop="VIN">
-          <el-input
-            v-model="listQuery.VIN"
-            placeholder="请输入底盘号"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="车型代码" prop="VehicleModelCode">
-          <el-input
-            v-model="listQuery.VehicleModelCode"
-            placeholder="请输入车型代码"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="版本" prop="Version">
-          <el-input
-            v-model="listQuery.Version"
-            placeholder="请输入版本"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="上线日期">
-          <el-date-picker
-            v-model="OnlineTimeVale"
-            size="small"
-            style="width: 380px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="接收日期">
-          <el-date-picker
-            v-model="ReceiveTimeVale"
-            size="small"
-            style="width: 380px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-
-        <!-- <el-form-item label="单据状态" prop="BillStatus">
-          <el-select
-            v-model="listQuery.BillStatus"
-            placeholder="请选择"
-            style="width: 200px"
-          >
-            <el-option label="未领取生产任务" :value="1"></el-option>
-            <el-option label="已领取生产任务" :value="2"></el-option>
-            <el-option label="完成生产任务" :value="3"></el-option>
-          </el-select>
-        </el-form-item> -->
-
-        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleFilter"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="resetQuery('queryForm')"
-            >重置</el-button
-          >
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            style="margin-left: 15px"
-            @click="handleDownload()"
-            >导出(Excel)查询信息
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </flexbox>
-    <div class="l-table">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <el-table-column
-          label="底盘号"
-          prop="vin "
-          sortable="custom"
-          align="center"
-          fixed
-          width="180px"
-        >
-          <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.vin
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-        <div>
-          <Detail
-            v-bind:customerInfos="customerInfos"
-            style="margin-top: -35px"
-          ></Detail>
-        </div>
-      </el-drawer>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "BillM100",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    return {
-      crmType: "bomdatabase",
-      OnlineTimeVale: [],
-      ReceiveTimeVale: [],
-      customerInfos: [],
-      versionValue: "",
-      versionList: [], //版本列表
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        HostSNBegin: undefined,
-        HostSNEnd: undefined,
-        VIN: undefined,
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-        ReceiveTimeBegin: undefined,
-        ReceiveTimeEnd: undefined,
-        VehicleModelCode: undefined,
-        Version: undefined,
-        KNR: undefined,
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      multipleSelection: [],
-      drawer: false,
-      tableHeight: document.documentElement.clientHeight - 280,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 280;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 120,
-      });
-      // tempsTabs.push({
-      //   label: "底盘号",
-      //   prop: "vin",
-      //   width: 130,
-      // });
-      tempsTabs.push({
-        label: "上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "接收时间",
-        prop: "receiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({ label: "单据状态", prop: "billStatus", width: 120 });
-      tempsTabs.push({
-        label: "车型名称",
-        prop: "vehicleModelName",
-        width: 120,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      var parentId = param.assemblyID; //传入的是总成id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      // if (this.OnlineTimeVale != []) {
-      //   this.listQuery.OnlineTimeBegin = this.OnlineTimeVale
-      //     ? this.OnlineTimeVale[0] || ""
-      //     : "";
-      //   this.listQuery.OnlineTimeEnd = this.OnlineTimeVale
-      //     ? this.OnlineTimeVale[1] || ""
-      //     : "";
-      // }
-      // if (this.ReceiveTimeVale != []) {
-      //   this.listQuery.ReceiveTimeBegin = this.ReceiveTimeVale[0];
-      //   this.listQuery.ReceiveTimeEnd = this.ReceiveTimeVale[1];
-      // }
-      if (this.OnlineTimeVale != []) {
-        this.listQuery.OnlineTimeBegin = this.OnlineTimeVale
-          ? this.OnlineTimeVale[0] || undefined
-          : undefined
-        this.listQuery.OnlineTimeEnd = this.OnlineTimeVale
-          ? this.OnlineTimeVale[1] || undefined
-          : undefined
-      }
-      if (this.ReceiveTimeVale != []) {
-        this.listQuery.ReceiveTimeBegin = this.ReceiveTimeVale
-          ? this.ReceiveTimeVale[0] || undefined
-          : undefined
-
-        this.listQuery.ReceiveTimeEnd = this.ReceiveTimeVale
-          ? this.ReceiveTimeVale[1] || undefined
-          : undefined
-      }
-      console.log("M100上线信息导出条件："+JSON.stringify(this.listQuery))
-      this.$axios
-        .posts("/api/newjit/bill-m100/export", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.OnlineTimeVale = [];
-      this.ReceiveTimeVale = [];
-      this.$refs[refName].resetFields();
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 0: "未生效", 2: "已生效", 3: "已发布" }[row[column.property]];
-      }
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 15;
-      if (this.OnlineTimeVale != []) {
-        this.listQuery.OnlineTimeBegin = this.OnlineTimeVale
-          ? this.OnlineTimeVale[0] || ""
-          : "";
-        this.listQuery.OnlineTimeEnd = this.OnlineTimeVale
-          ? this.OnlineTimeVale[1] || ""
-          : "";
-      }
-      if (this.ReceiveTimeVale != []) {
-        this.listQuery.ReceiveTimeBegin = this.ReceiveTimeVale
-          ? this.ReceiveTimeVale[0] || ""
-          : "";
-
-        this.listQuery.ReceiveTimeEnd = this.ReceiveTimeVale
-          ? this.ReceiveTimeVale[1] || ""
-          : "";
-      }
-      console.log("billM100查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .gets("/api/newjit/bill-m100/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/newJit/baseData/billM100Manager/detail.vue b/code/WebApp/vue/src/views/newJit/baseData/billM100Manager/detail.vue
deleted file mode 100644
index 5ba51a93..00000000
--- a/code/WebApp/vue/src/views/newJit/baseData/billM100Manager/detail.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<!--M100上线信息-明细数据-->
-<template>
-  <div class="cr-body-content">
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-      :row-key="getRowKeys"
-      :expand-row-keys="expands"
-      @expand-change="exChange"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <!-- <el-table-column
-        prop="总成名称"
-        label="erpAssemblyName"
-        sortable
-        width="180"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="erpAssemblyVersion"
-        label="总成版本号"
-        sortable
-        width="180"
-      >
-              style="width: calc(100% - 47px)"
-            class="two-list"
-      </el-table-column> -->
-
-      <el-table-column type="expand" prop="details">
-        <template slot-scope="scope">
-          <el-table :data="scope.row.details">
-            <el-table-column
-              prop="partCode"
-              label="客户零件代码"
-            ></el-table-column>
-            <el-table-column
-              prop="partNum"
-              label="客户零件数量"
-            ></el-table-column>
-            <el-table-column prop="description" label="描述"></el-table-column>
-            <el-table-column prop="isKey" label="是否Key件">
-              <template slot-scope="scope">
-                <span v-if="scope.row.isKey == true">
-                  <span style="color: #00b46d">是</span>
-                </span>
-                <span v-else>
-                  <span style="color: #d75c89">否</span>
-                </span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="erpAssemblyVersion"
-        label="总成版本号"
-        sortable
-        width="360"
-      >
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import { downloadFile } from "@/utils/crmindex.js";
-import Detail from "./detail";
-
-export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "stockFisDiffReport",
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      expands: [], //只展开一行放入当前行id
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        parentId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        SkipCount: 0,
-        MaxResultCount: 15,
-        id: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfos: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.parentId = element.ParentId;
-          });
-          if (this.customerInfo.parentId != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "总成名称",
-        prop: "erpAssemblyName",
-        width: 160,
-      });
-      // tempsTabs.push({
-      //   label: "总成版本号",
-      //   prop: "erpAssemblyName",
-      //   width: 160,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    exChange(row, rowList) {
-      this.loading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList() {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      this.$axios
-        .gets("/api/newjit/bill-m100/"+ this.customerInfo.parentId)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "partCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 6,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    resetQuery() {},
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/newJit/baseData/billM100Manager/index.vue b/code/WebApp/vue/src/views/newJit/baseData/billM100Manager/index.vue
deleted file mode 100644
index 38d2bbe7..00000000
--- a/code/WebApp/vue/src/views/newJit/baseData/billM100Manager/index.vue
+++ /dev/null
@@ -1,818 +0,0 @@
-<!--M100上线信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <el-form
-        :model="listQuery"
-        ref="queryForm"
-        v-show="showSearch"
-        :inline="true"
-      >
-        <!-- <el-form-item>
-          <el-button
-            class="filter-item"
-            size="mini"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleCreate"
-            >新增
-          </el-button>
-        </el-form-item> -->
-
-        <el-form-item prop="Version">
-          <el-input
-            v-model="listQuery.Version"
-            placeholder="请输入版本"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleFilter"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="resetQuery('queryForm')"
-            >重置</el-button
-          >
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            style="margin-left: 15px"
-            @click="handleDownload()"
-            >导出(Excel)
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </flexbox>
-    <div class="l-table">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <el-table-column
-          label="底盘号"
-          prop="vin "
-          sortable="custom"
-          align="center"
-          fixed
-          width="180px"
-        >
-          <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.vin
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="操作" align="center" width="128px">
-          <template slot-scope="{ row }">
-            <el-button
-              type="primary"
-              size="mini"
-              @click="handleUpdate(row)"
-              icon="el-icon-edit"
-            />
-            <el-button
-              type="danger"
-              size="mini"
-              @click="handleDelete(row)"
-              icon="el-icon-delete"
-            />
-          </template>
-        </el-table-column> -->
-      </el-table>
-
-      <!--表单渲染-->
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        :title="formTitle"
-        width="700px"
-      >
-        <el-form
-          ref="form"
-          :inline="true"
-          :model="form"
-          :rules="rules"
-          size="small"
-          label-width="120px"
-        >
-          <el-row>
-            <el-col :md="4" :xs="24">
-              <el-form-item label="大众顺序号" required />
-            </el-col>
-            <el-col :md="8" :xs="24">
-              <el-form-item prop="hostSN">
-                <el-input
-                  style="width: 150px"
-                  v-model="form.hostSN"
-                  :disabled="isEdit"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :md="4" :xs="24">
-              <el-form-item style="width: 150px" label="KNR号" required />
-            </el-col>
-            <el-col :md="8" :xs="24">
-              <el-form-item prop="knr">
-                <el-input style="width: 150px" v-model="form.knr" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :md="4" :xs="24">
-              <el-form-item label="上线日期" />
-            </el-col>
-            <el-col :md="8" :xs="24">
-              <el-form-item prop="onlineTime">
-                <el-date-picker
-                  v-model="form.onlineTime"
-                  :picker-options="pickerOptions"
-                  type="datetime"
-                  placeholder="请选择"
-                  style="width: 200px"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :md="4" :xs="24">
-              <el-form-item label="底盘号" required />
-            </el-col>
-            <el-col :md="8" :xs="24">
-              <el-form-item prop="vin">
-                <el-input style="width: 150px" v-model="form.vin" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :md="4" :xs="24">
-              <el-form-item label="选择车型" required />
-            </el-col>
-            <el-col :md="20" :xs="24">
-              <el-form-item prop="form.vehicleModelCode">
-                <el-select
-                  v-model="form.vehicleModelCode"
-                  :clearable="false"
-                  placeholder="请选择"
-                >
-                  <el-option
-                    v-for="item in vehicleOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :md="4" :xs="24">
-              <el-form-item label="描述" />
-            </el-col>
-            <el-col :md="20" :xs="24">
-              <el-form-item prop="description">
-                <el-input
-                  type="textarea"
-                  v-model="form.description"
-                  maxlength="4000"
-                  show-word-limit
-                  style="width: 455px"
-                  placeholder="最多输入4000个字符"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="dialogFormVisible = false"
-            >取消</el-button
-          >
-          <el-button v-loading="formLoading" type="primary" @click="save"
-            >确认</el-button
-          >
-        </div>
-      </el-dialog>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-    <!-- 抽屉控件 -->
-    <el-drawer
-      title="信息详细页"
-      size="75%"
-      direction="rtl"
-      :visible.sync="drawer"
-      :before-close="handleDrawerClose"
-    >
-      <div>
-        <Detail
-          v-bind:customerInfos="customerInfos"
-          style="margin-top: -35px"
-        ></Detail>
-      </div>
-    </el-drawer>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "BillM100Manager",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  watch: {
-    "form.onlineTime": {
-      handler(newValue, oldValue) {
-        if (newValue) {
-          let date = new Date();
-          let min = date.getMinutes();
-          date.setMinutes(min + 1); //这里加1分钟，是为了解决值改变后，系统秒数就过期限制了，无法点击“此刻”按钮， 如果监听 “系统时间”的改变，则会影响性能。
-          let nowDate = moment(date).format("HH:mm:ss");
-          let st = "";
-          if (
-            moment(date).format("yyyy-MM-DD") ===
-            moment(newValue).format("yyyy-MM-DD")
-          ) {
-            let hh1 = moment(newValue).format("HH:mm:ss");
-            if (hh1 > nowDate) {
-              this.detailData.monitorTime = new Date();
-            }
-            st = nowDate;
-          } else {
-            st = "23:59:59";
-          }
-          this.pickerOptions.selectableRange = "00:00:00 - " + st;
-          this.pickerOptions = this.pickerOptions;
-        }
-      },
-      deep: true,
-      immediate: true,
-    },
-  },
-
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "bomdatabase",
-      pickerOptions: {
-        disabledDate(time) {
-          return time.getTime() > Date.now();
-        },
-        selectableRange: "00:00:00 - 23:59:59",
-      },
-      rules: {
-        hostSN: [{ required: true, message: "必须输入！", trigger: "blur" }],
-        serialNum: [{ required: true, message: "必须输入！", trigger: "blur" }],
-        knr: [{ required: true, message: "必须输入！", trigger: "blur" }],
-        vin: [{ required: true, message: "必须输入！", trigger: "blur" }],
-        vehicleModelCode: [
-          { required: true, message: "请选择车型", trigger: "change" },
-        ],
-        onlineTime: [
-          {
-            required: true,
-            message: "请选择日期",
-            trigger: "change",
-          },
-        ],
-        receiveTime: [
-          {
-            required: true,
-            message: "请选择时间",
-            trigger: "change",
-          },
-        ],
-        version: [
-          {
-            required: true,
-            validator: validVersion,
-            trigger: "blur",
-          },
-        ],
-      },
-      valueSelect: "",
-      vehicleOptions: [],
-      OnlineTimeVale: [],
-      ReceiveTimeVale: [],
-      customerInfos: [],
-      versionValue: "",
-      versionList: [], //版本列表
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: { receiveTime: null, billStatus: 2 },
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        HostSNBegin: undefined,
-        HostSNEnd: undefined,
-        VIN: undefined,
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-        ReceiveTimeBegin: undefined,
-        ReceiveTimeEnd: undefined,
-        VehicleModelCode: undefined,
-        Version: undefined,
-        KNR: undefined,
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      multipleSelection: [],
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      dialogFormVisible: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 100 });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 120,
-      });
-      // tempsTabs.push({
-      //   label: "底盘号",
-      //   prop: "vin",
-      //   width: 220,
-      // });
-      tempsTabs.push({
-        label: "上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "接收时间",
-        prop: "receiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({ label: "单据状态", prop: "billStatus", width: 120 });
-      tempsTabs.push({
-        label: "车型名称",
-        prop: "vehicleModelName",
-        width: 120,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      var parentId = param.id; //传入的是总成id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    getVehicleInfo() {
-      let dicTypeName = { dicTypeName: "车型" };
-      this.$axios
-        .gets("/api/newjit/dic/list", dicTypeName)
-        .then((response) => {
-          this.vehicleOptions = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.dicItemCode;
-            options.label = element.dicItemName;
-            this.vehicleOptions.push(options);
-          });
-          console.log("下拉列表：" + JSON.stringify(this.vehicleOptions));
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    save() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          let nowdate = moment(new Date()).format("YYYY-MM-DD HH:mm:ss");
-          this.form.receiveTime = nowdate;
-          console.log("保存或修改条件：" + JSON.stringify(this.form));
-          this.form.billStatus = 2;
-          if (this.isEdit) {
-            this.$axios
-              .puts("/api/newjit/bill-m100/" + this.form.id, this.form)
-              .then((response) => {
-                this.formLoading = false;
-                this.$notify({
-                  title: "成功",
-                  message: "更新成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.dialogFormVisible = false;
-                this.getList();
-              })
-              .catch(() => {
-                this.formLoading = false;
-              });
-          } else {
-            //insert添加
-            console.log("M100添加条件：" + JSON.stringify(this.form));
-            this.$axios
-              .posts("/api/newjit/bill-m100", this.form)
-              .then((response) => {
-                this.formLoading = false;
-                this.$notify({
-                  title: "成功",
-                  message: "新增成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.dialogFormVisible = false;
-                this.getList();
-              })
-              .catch(() => {
-                this.formLoading = false;
-              });
-          }
-        }
-      });
-    },
-    /** 新增 */
-    handleCreate() {
-      this.$nextTick(() => {
-        this.$refs["form"].resetFields();
-      });
-      this.formTitle = "新增";
-      this.isEdit = false;
-      this.form = {};
-      this.dialogFormVisible = true;
-      this.getVehicleInfo();
-    },
-    /** 修改 */
-    handleUpdate(row) {
-      this.$nextTick(() => {
-        this.$refs["form"].resetFields();
-      });
-      this.formTitle = "修改通用代码设置";
-      this.isEdit = true;
-      if (row) {
-        this.fetchData(row.id);
-        this.dialogFormVisible = true;
-      } else {
-        if (this.multipleSelection.length != 1) {
-          this.$message({
-            message: "编辑必须选择单行",
-            type: "warning",
-          });
-          return;
-        } else {
-          this.fetchData(this.multipleSelection[0].id);
-          this.dialogFormVisible = true;
-        }
-      }
-      this.getVehicleInfo();
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios.gets("/api/newjit/bill-m100/" + id).then((response) => {
-        this.form = response.item;
-      });
-    },
-    /** 删除 */
-    handleDelete(row) {
-      if (row) {
-        this.$confirm("是否删除" + row.name + "?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.$axios
-              .deletes("/api/newjit/bill-m100/" + row.id)
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.list.splice(index, 1);
-                this.$notify({
-                  title: "成功",
-                  message: "删除成功",
-                  type: "success",
-                  duration: 2000,
-                });
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消删除",
-            });
-          });
-      } else {
-        this.$alert("暂时不支持批量删除", "提示", {
-          confirmButtonText: "确定",
-          callback: (action) => {
-            //
-          },
-        });
-      }
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      if (this.OnlineTimeVale != []) {
-        this.listQuery.OnlineTimeBegin = this.OnlineTimeVale[0];
-        this.listQuery.OnlineTimeEnd = this.OnlineTimeVale[1];
-      }
-      if (this.ReceiveTimeVale != []) {
-        this.listQuery.ReceiveTimeBegin = this.ReceiveTimeVale[0];
-        this.listQuery.ReceiveTimeEnd = this.ReceiveTimeVale[1];
-      }
-      this.$axios
-        .gets("/api/newjit/bill-m100/export", this.listQuery)
-        .then((res) => {
-          let filename = res;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      // this.OnlineTimeVale = [];
-      // this.ReceiveTimeVale = [];
-      this.$refs[refName].resetFields();
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 0: "未生效", 2: "已生效", 3: "已发布" }[row[column.property]];
-      }
-      if (column.property === "vehicleModelCode") {
-        return { "01": "红旗", "02": "大众" }[row[column.property]];
-      }
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList() {
-      this.listLoading = true;
-      // this.listQuery.SkipCount = (this.page - 1) * 10;
-      // if (this.OnlineTimeVale != []) {
-      //   this.listQuery.OnlineTimeBegin = this.OnlineTimeVale[0];
-      //   this.listQuery.OnlineTimeEnd = this.OnlineTimeVale[1];
-      // }
-      // if (this.ReceiveTimeVale != []) {
-      //   this.listQuery.ReceiveTimeBegin = this.ReceiveTimeVale[0];
-      //   this.listQuery.ReceiveTimeEnd = this.ReceiveTimeVale[1];
-      // }
-      console.log("billM100查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .gets("/api/newjit/bill-m100/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/newJit/baseData/excludePartCfgs/dlgExcludePartEdit.vue b/code/WebApp/vue/src/views/newJit/baseData/excludePartCfgs/dlgExcludePartEdit.vue
deleted file mode 100644
index 8a10add9..00000000
--- a/code/WebApp/vue/src/views/newJit/baseData/excludePartCfgs/dlgExcludePartEdit.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-	<div class="root">
-		<el-dialog :visible.sync="propObj.isShow" :close-on-click-modal="false" :title="propObj.title" width="700px">
-		  <el-form ref="elForm" :model="formModel" :rules="rules" size="small" label-width="120px" :inline="false" >
-
-				<el-form-item label="车型代码" prop="vehicleModelCode">
-					<el-input v-model="formModel.vehicleModelCode" :disabled="propObj.isEdit"  maxlength="20" placeholder="最多输入20个字符"/>
-				</el-form-item>
-		
-				<el-form-item label="客户零件号" prop="partCode">
-					<el-input v-model="formModel.partCode"  maxlength="100" placeholder="最多输入100个字符"/>
-				</el-form-item>
-
-				<el-form-item label="排除原因" prop="excludeReason">
-					<el-input type="textarea" v-model="formModel.excludeReason" maxlength="200" placeholder="最多输入200个字符"/>
-				</el-form-item>
-
-		  </el-form>
-		  <div slot="footer" class="dialog-footer">
-		    <el-button type="text" @click="handleClose">取消</el-button>
-		    <el-button type="primary" v-loading="isLoading" @click="handleSave">确认</el-button>
-		  </div>
-		</el-dialog>
-	</div>
-</template>
-
-<script>
-
-import permission from "@/directive/permission/index.js";
-
-
-export default {
-  name: "dlgExcludePartEdit",
-	
-	props: {
-		/**
-		 * 控件输入参数
-		 * isShow 为真时显示弹窗
-		 * title 弹窗标题名称
-		 * isEdit 是否编辑操作，为假时是添加操作
-		 * id 主键
-		 */
-		propObj: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	
-  components: {
-	},
-	
-  directives: { 
-		permission 
-	},
-
-  data() {
-    return {
-			formModel : {
-				vehicleModelCode: '', //车型代码
-				partCode: '',         //客户零件号
-				excludeReason: '',    //排除原因
-			},
-			
-      rules: {
-        vehicleModelCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-        partCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-        excludeReason: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-			
-			isLoading: false, //是否显示正在加载遮罩
-    }; //return
-  },
-	
-	created() {
-	},
-	mounted() {
-	},
-	updated() {
-	},
-  computed: {
-	},
-	
-	watch:{
-		'propObj.isShow': {
-			handler(newVal) {
-				if (newVal == true && this.propObj.isEdit)
-				{
-					this.$nextTick(() => {
-					  this.loadData(this.propObj.id)
-					});
-				}
-			},
-			deep: true,
-			immediate: true,
-		},				
-	},
-	
-  methods: {
-		/**加载数据
-		 * @param {Object} id
-		 */
-		loadData(id)
-		{
-			this.$axios
-			  .gets("/api/newjit/exclude-part-cfg/get/" + id)
-			  .then((response) => {
-					
-			    this.formModel = response.item;
-			  });
-		},
-		
-		/**
-		 * 保存数据
-		 */
-    handleSave() {
-			this.$refs.elForm.validate((valid) => {
-			  if (valid) {
-					
-			    this.isLoading = true;
-			    if (this.propObj.isEdit) {
-			      console.log(JSON.stringify(this.formModel));
-			      this.$axios
-			        .puts(
-			          "/api/newjit/exclude-part-cfg/update/" + this.formModel.id,
-			          this.formModel
-			        )
-			        .then((response) => {
-			          this.isLoading = false;
-								if (response.status)
-								{
-									this.$notify({ 
-										title: "成功", 
-										message: "更新成功", 
-										type: "success", 
-										duration: 2000 ,
-									});
-									this.$emit('onDlgClose', true);
-								}
-								else
-								{
-									this.$notify.error({
-										title: '错误',
-										message: response.message
-									});
-								}
-			        })
-			        .catch(() => {
-			          this.isLoading = false;
-			        });
-			    } else {
-			      //insert添加
-			      console.log(JSON.stringify(this.formModel));
-			      this.$axios
-			        .posts("/api/newjit/exclude-part-cfg/create/", this.formModel)
-			        .then((response) => {
-			          this.isLoading = false;
-								if (response.status)
-								{
-									this.$notify({ 
-										title: "成功", 
-										message: "新增成功", 
-										type: "success", 
-										duration: 2000 ,
-									});
-									this.$emit('onDlgClose',true);
-								}
-								else
-								{
-									this.$notify.error({
-										title: '错误',
-										message: response.message
-									});
-								}
-			        })
-			        .catch(() => {
-			          this.isLoading = false;
-			        });
-			    }
-			  }
-			});
-    },
-		
-		handleClose() {
-			this.$emit('onDlgClose', false);
-		}
-	} //methods
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/baseData/excludePartCfgs/index.vue b/code/WebApp/vue/src/views/newJit/baseData/excludePartCfgs/index.vue
deleted file mode 100644
index eb0ff3aa..00000000
--- a/code/WebApp/vue/src/views/newJit/baseData/excludePartCfgs/index.vue
+++ /dev/null
@@ -1,484 +0,0 @@
-<!--零件匹配关系页-->
-<template>
-  <div class="cr-body-content" style="padding: 5px;">
-		<div class="row-container" style="margin: 5px 0">
-			<div class="label">车型代码</div>
-			<div class="value">
-				<el-input v-model="inputParam.VehicleModelCode" maxlength="20" placeholder="最多输入20个字符"/>
-			</div>
-			<div class="label">客户零件号</div>
-			<div class="value">
-				<el-input v-model="inputParam.PartCode"  maxlength="100" placeholder="最多输入100个字符"/>
-			</div>
-			<el-button class="label" size="medium" type="success" icon="el-icon-search" @click="handleSearch">搜索</el-button>
-			<el-button class="label" size="medium"  icon="el-icon-brush" @click="handleReset">重置</el-button>
-		</div>
-		<el-divider></el-divider>
-    <flexbox class="content-header" style="margin: 5px 0">
-      <el-button class="filter-item" size="small" type="primary" icon="el-icon-plus" 
-				v-permission="[]" @click="handleCreate">新增</el-button>
-			
-      <el-button class="filter-item" size="small" type="success" icon="el-icon-edit"
-        v-permission="[]" @click="handleUpdate">修改</el-button>
-				
-      <el-button class="filter-item" size="small" type="danger" icon="el-icon-delete"
-        v-permission="[]" @click="handleDelete">批量删除</el-button>
-				
-      <el-button class="filter-item" size="small" type="info" icon="el-icon-download"
-				@click="handleExport">导出</el-button>
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="elTable"
-      v-loading="isLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="dataList"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-			<el-pagination
-				background
-				layout="total, sizes, prev, pager, next, jumper"
-				:page-sizes="[5, 200, 300, 400]"
-				:page-size="inputParam.MaxResultCount"
-				@size-change="handleSizeChange"
-				@current-change="handleCurrentChange"
-				:current-page="curPageIndex"
-				:total="totalCount">
-			</el-pagination>
-			<!--      
-			<pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      /> -->
-      <!-- 导入Excel组件 -->
-			<!--<importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      /> -->
-    </div>
-		<!--isLoading-->
-		<dlgExcludePartEdit :propObj="propObj"  @onDlgClose="handleDlgClose"></dlgExcludePartEdit>
-	</div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-vw";
-import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import dlgExcludePartEdit from "./dlgExcludePartEdit.vue"; //编辑子窗体
-
-export default {
-  name: "ExcludePartCfgs",
-  components: { Pagination, importExcel, CRMTableHead, dlgExcludePartEdit },
-  directives: { permission },
-
-  data() {
-    return {
-      //crmType: "materialRelation",
-			//showExcelImport: false,
-			//检索输入参数
-			inputParam: {
-				VehicleModelCode: '',
-				PartCode: '',
-				SkipCount: 0,
-				MaxResultCount: 5, //100
-				Sorting: '',
-			},		
-
-			//是否正在加载
-      isLoading: true,
-			//记录总数
-			totalCount: 0,
-			//页码控件当前页索引
-			curPageIndex: 0,
-			//elTable数据列表
-			dataList: [],
-			//数据表高度
-			tableHeight: document.documentElement.clientHeight - 260,
-			//子窗体
-			propObj : {
-				isShow: false, //为真时显示弹窗
-				title: '',     //弹窗标题名称
-				isEdit: false, //是否编辑操作，为假时是添加操作
-				id: '',        //主键
-			},
-			//elTable多选中项
-			multipleSelection: [],
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-  },
-  created() {
-		debugger
-		console.log("进入excludePartCfgs模块");
-
-    this.getList();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-     
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "车型名称",
-        prop: "vehicleModelName",
-        width: 100,
-      });
-      tempsTabs.push({
-        label: "客户零件号",
-        prop: "partCode",
-        width: 120,
-      });
-       tempsTabs.push({
-        label: "客户零件名称",
-        prop: "partName",
-        width: 100,
-      });
-      tempsTabs.push({
-        label: "排除原因",
-        prop: "excludeReason",
-        width: 100,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    getList() {
-			//debugger
-      this.isLoading = true;
-			console.log(JSON.stringify(this.inputParam))
-			debugger
-      this.$axios
-				.gets("/api/newjit/exclude-part-cfg/getlist", this.inputParam)
-				//.posts("/api/newjit/exclude-part-cfg/get-list", this.inputParam) 
-        .then((response) => {
-					
-          this.dataList = response.items;
-          console.log(JSON.stringify(response.items));
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.isLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.isLoading = false;
-        });
-    },
-		/**
-		 * 查询按钮单击事件
-		 */
-		handleSearch()
-		{
-			this.inputParam.SkipCount = 0;
-			this.getList();
-		},
-		/**
-		 * 重置按钮单击事件
-		 */
-		handleReset()
-		{
-			//清空检索输入参数值
-			this.inputParam.VehicleModelCode = "";
-			this.inputParam.PartCode = "";	
-		},
-		/**页码控件页索引改变事件
-		 * @param {Object} val
-		 */
-		handleCurrentChange(val) {
-			
-			this.inputParam.SkipCount = (val-1) * this.inputParam.MaxResultCount;
-			this.getList();
-		},
-		/**页码控件页尺寸改变事件
-		 * @param {Object} val
-		 */
-		handleSizeChange(val) {
-			
-			this.inputParam.MaxResultCount = val;
-			this.inputParam.SkipCount = 0;
-			this.getList();
-		},
-		/**
-		 * 新增
-		 */
-		handleCreate() {
-			this.propObj.title = '新增排除零件配置';
-			this.propObj.isEdit = false;
-			this.propObj.id = '';
-			this.propObj.isShow = true;
-		},
-		/**修改
-		 * @param {Object} row
-		 */
-		handleUpdate(row) {
-			
-			if (row && row.id) {
-				this.propObj.id = row.id;
-			} else {
-			  if (this.multipleSelection.length == 1) {
-					this.propObj.id = this.multipleSelection[0].id;
-			  } else {
-					this.$message({
-					  message: "编辑必须选择单行",
-					  type: "warning",
-					});
-					return;
-			  }
-			}
-			this.propObj.title = '修改排除零件配置';
-			this.propObj.isEdit = true;
-			this.propObj.isShow = true;
-		},
-		/**删除
-		 * @param {Object} row
-		 */
-    handleDelete(row) {
-      //批量删除
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row && row.id) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-					debugger
-					var arrStr = params.join();
-							this.$axios
-									  .deletes("/api/newjit/exclude-part-cfg/delete/" + arrStr)
-									  .then((response) => {
-											debugger
-									    if (response.status)
-											{
-												this.$notify({
-												  title: "成功",message: "删除成功", type: "success",duration: 2000,
-												});
-											}
-											else
-											{
-												this.$notify.error({
-														title: '错误',
-														message: response.message
-													});
-											}
-
-									    this.getList();
-									  });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-		/**
-		 * 导出
-		 */
-    async handleExport() {
-      this.isLoading = true;
-			debugger
-			this.$axios
-				.BolbGets("/api/newjit/exclude-part-cfg/export", this.inputParam)
-			  .then((res) => {
-						let fileName = res.item;
-						//下载文件
-						this.$axios
-							.BolbGets(
-								"/api/newjit/exclude-part-cfg/download/" + fileName
-							)
-							.then((response) => {
-								downloadFile(response, fileName);
-								this.$notify({
-									title: "成功",	 message: "数据-导出成功！",
-									type: "success", duration: 2000,
-								});
-								this.listLoading = false;
-							});
-			  })
-			  .catch(() => {
-			    this.isLoading = false;
-			  });
-    },
-		/**单击子窗口确认按钮触发的事件，用于刷新数据
-		 * @param {Object} data
-		 */
-		handleDlgClose(data)
-		{
-			if (data)
-			{
-				this.getList();
-			}
-			this.propObj.isShow = false;
-		},
-		/**字段排序事件
-		 * @param {Object} data
-		 */
-    sortChange(data) {
-			
-      const { prop, order } = data;
-      if (prop != null && order != null) {
-				this.inputParam.Sorting = `${prop} ${order}`;
-        this.getList();
-      }
-			else
-			{
-				this.inputParam.Sorting = "";
-				this.getList();
-			}
-    },
-		/**table多选事件: 当选择项发生变化时会触发该事件
-		 * @param {Object} val
-		 */
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-		/**table行单击事件: 单击行时选中复选框
-		 * @param {Object} row
-		 * @param {Object} column
-		 * @param {Object} event
-		 */
-    handleRowClick(row, column, event) {
-      this.$refs.elTable.clearSelection();
-      this.$refs.elTable.toggleRowSelection(row);
-    },
-		/**
-		 * elTable事件：通过回调控制style
-		 */
-		cellStyle({ row, column, rowIndex, columnIndex }) {
-		  // if (column.property === 'parentItemCode'
-		  return { textAlign: "left" };
-		},
-		/**elColumn事件：格式化elTable字段值
-		 * @param {Object} row
-		 * @param {Object} column
-		 */
-		fieldFormatter(row, column) {
-		  // if (column.property === 'projectRole') {
-		  //   return { 0: '是', 1: '否' }[row[column.property]]
-		  // }
-		  return row[column.property];
-		},
-		
-  },//methods
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-
-	/*表单列布局容器*/
-	.col-container {
-		display: flex;
-		/*布局方向*/
-		flex-direction: column;
-		/*是否换行*/
-		flex-wrap: nowrap;
-	}
-
-	/*表单行布局容器*/
-	.row-container {
-		display: flex;
-		/*布局方向*/
-		flex-direction: row;
-		/*是否换行*/
-		flex-wrap: nowrap;
-		/*侧轴方向对齐方式:默认值stretch,高度不写死情况下，把所有元素伸展开，和最高的元素一样高*/
-		align-items: stretch;
-	}
-	
-	/*表单标题*/
-	.label {
-		display: inline-block;
-		align-self: center;
-		margin: 5px;
-		text-align: right;
-		white-space: nowrap;
-	}
-
-	/*表单文本*/
-	.value {
-		align-self: center;
-		margin: 5px;
-		flex: 1;
-	}
-
-	.label-auto-width {
-		display: inline-block;
-		align-self: center;
-		margin: 5px;
-		width: auto;
-		text-align: left;
-		white-space: nowrap;
-	}
-	.el-divider--horizontal {
-	    display: block;
-	    height: 1px;
-	    width: 100%;
-	    margin: 0px 0px;
-	}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/baseData/logRemind/index.vue b/code/WebApp/vue/src/views/newJit/baseData/logRemind/index.vue
deleted file mode 100644
index 34d45e27..00000000
--- a/code/WebApp/vue/src/views/newJit/baseData/logRemind/index.vue
+++ /dev/null
@@ -1,481 +0,0 @@
-<!--系统日志信息页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-    <flexbox class="content-header">
-      <el-form
-        :model="listQuery"
-        ref="queryForm"
-        v-show="showSearch"
-        :inline="true"
-      >
-        <el-form-item label="日志标题" prop="LogTitle">
-          <el-input
-            v-model="listQuery.LogTitle"
-            placeholder="请输入日志标题"
-            clearable
-            size="small"
-            style="width: 150px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="日志类别" prop="LogType">
-          <el-select
-            v-model="listQuery.LogType"
-            placeholder="请选择"
-            style="width: 200px"
-          >
-            <el-option label="报文传输异常" :value="1"></el-option>
-            <el-option label="报文转换异常" :value="2"></el-option>
-            <el-option label="报文解析、校验异常" :value="3"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="严重程度" prop="SeriousLevel">
-          <el-select
-            v-model="listQuery.SeriousLevel"
-            placeholder="请选择"
-            style="width: 200px"
-          >
-            <el-option label="轻微" :value="1"></el-option>
-            <el-option label="一般" :value="2"></el-option>
-            <el-option label="严重" :value="3"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleFilter"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="resetQuery('queryForm')"
-            >重置</el-button
-          >
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            style="margin-left: 15px"
-            @click="handleDownload()"
-            >导出(Excel)查询信息
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </flexbox>
-    </div>
-    <div class="l-table">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column >
-        <el-table-column
-            label="操作"
-            width="150">
-            <template slot-scope="scope">
-              <el-button @click="handleEdit(scope.row)" type="primary" size="small">处理</el-button><!-- type="text" -->
-              <el-button @click="handleIgnore(scope.row)" type="primary" size="small">忽略</el-button>
-            </template>
-      </el-table-column>
-      </el-table>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import moment from "moment";
-import { mapGetters } from "vuex";
-import { downloadFile } from "@/utils/crmindex.js";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "BillM100",
-  components: { Pagination, CRMTableHead, importExcel },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "bomdatabase",
-      versionValue: "",
-      versionList: [], //版本列表
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        LogTitle: undefined,
-        LogType: undefined,
-        SeriousLevel: undefined,
-      },
-      operationQuery:{
-        id:undefined,
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      multipleSelection: [],
-      drawer: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => { 
-        var offsetHei = document.documentElement.clientHeight;
-        //console.log(offsetHei);
-        let boxH = this.$refs.box.offsetHeight;
-        this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
-    });
-  },
-  created() {
-    this.getList();
-  },
-  computed: {
-    ...mapGetters(["messageNum"]),
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "日志类别", prop: "logType", width: 120 });
-      tempsTabs.push({ label: "日志标题", prop: "logTitle", width: 150 });
-      tempsTabs.push({
-        label: "严重程度",
-        prop: "seriousLevel",
-        width: 100,
-      });
-      tempsTabs.push({ label: "创建日期", prop: "creationTime", width: 120 });
-      tempsTabs.push({
-        label: "日志描述",
-        prop: "logDesc",
-        width: 400,
-      });
-
-      return tempsTabs;
-    },
-  },
-  methods: {
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      console.log("系统日志导出条件："+JSON.stringify(this.listQuery))
-      this.$axios
-        .posts("/api/newjit/log-remind/export", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "seriousLevel") {
-        return { 1: "轻微", 2: "一般", 3: "严重" }[row[column.property]];
-      }
-      if (column.property === "logType") {
-        return {
-          1: "报文传输异常",
-          2: "报文转换异常",
-          3: "报文解析、校验异常",
-        }[row[column.property]];
-      }
-      if (column.property == "creationTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      this.$axios
-        .gets("/api/newjit/log-remind/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          this.$store.commit("SET_MESSAGENUM", this.totalCount);
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    handleEdit(row)
-    {
-      this.operationQuery.id = row.id;
-      this.$axios
-        .posts("/api/newjit/log-remind/do-process", this.operationQuery)
-        .then((response) => {
-          if(response.status === "true")
-          {
-            this.$notify({
-                  title: "成功",
-                  message: "处理成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-          }
-          else
-          {
-            this.$notify({
-                  title: "失败",
-                  message: "处理失败！",
-                  type: "success",
-                  duration: 2000,
-                });
-          }
-                
-        })
-        .catch(() => {
-                this.$notify({
-                  title: "失败",
-                  message: "处理失败！",
-                  type: "warning",
-                  duration: 2000,
-                });
-        });
-    },
-    handleIgnore(row)
-    {
-      this.operationQuery.id = row.id;
-      this.$axios
-        .posts("/api/newjit/log-remind/do-ignore", this.operationQuery)
-        .then((response) => {
-          if(response.status === "true")
-          {
-            this.$notify({
-                  title: "成功",
-                  message: "忽略成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-          }
-          else
-          {
-            this.$notify({
-                  title: "失败",
-                  message: "忽略失败！",
-                  type: "success",
-                  duration: 2000,
-                });
-          }
-        })
-        .catch(() => {
-                this.$notify({
-                  title: "失败",
-                  message: "忽略失败！",
-                  type: "warning",
-                  duration: 2000,
-                });
-        });
-    }
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/newJit/baseData/repeatR100/detail.vue b/code/WebApp/vue/src/views/newJit/baseData/repeatR100/detail.vue
deleted file mode 100644
index 893c888b..00000000
--- a/code/WebApp/vue/src/views/newJit/baseData/repeatR100/detail.vue
+++ /dev/null
@@ -1,285 +0,0 @@
-<!--重复报文查询-明细数据-->
-<template>
-  <div class="cr-body-content">
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-      :row-key="getRowKeys"
-      :expand-row-keys="expands"
-      @expand-change="exChange"
-    >
-      <el-table-column prop="partCode" label="客户零件代码"></el-table-column>
-      <el-table-column prop="partNum" label="客户零件数量"></el-table-column>
-      <el-table-column prop="description" label="描述"></el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import { downloadFile } from "@/utils/crmindex.js";
-import Detail from "./detail";
-
-export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "stockFisDiffReport",
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      expands: [], //只展开一行放入当前行id
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        parentId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        SkipCount: 0,
-        MaxResultCount: 15,
-        id: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfos: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.parentId = element.ParentId;
-          });
-          if (this.customerInfo.parentId != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "总成名称",
-        prop: "erpAssemblyName",
-        width: 160,
-      });
-      // tempsTabs.push({
-      //   label: "总成版本号",
-      //   prop: "erpAssemblyName",
-      //   width: 160,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    exChange(row, rowList) {
-      this.loading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList() {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      this.$axios
-        .gets("/api/newjit/repeat-m100/" + this.customerInfo.parentId)
-        .then((response) => {
-          this.list = response.item.m100RepeatParts;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "partCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 6,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    resetQuery() {},
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/newJit/baseData/repeatR100/index.vue b/code/WebApp/vue/src/views/newJit/baseData/repeatR100/index.vue
deleted file mode 100644
index c03d3fc8..00000000
--- a/code/WebApp/vue/src/views/newJit/baseData/repeatR100/index.vue
+++ /dev/null
@@ -1,569 +0,0 @@
-<!--重复报文信息页-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <el-form
-        :model="listQuery"
-        ref="queryForm"
-        v-show="showSearch"
-        :inline="true"
-      >
-        <el-form-item label="起始顺序号" prop="HostSNBegin">
-          <el-input
-            v-model="listQuery.HostSNBegin"
-            placeholder="起始顺序号"
-            clearable
-            size="small"
-            style="width: 120px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="结束顺序号" prop="HostSNEnd">
-          <el-input
-            v-model="listQuery.HostSNEnd"
-            placeholder="结束顺序号"
-            clearable
-            size="small"
-            style="width: 120px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="KNR" prop="KNR">
-          <el-input
-            v-model="listQuery.KNR"
-            placeholder="请输入KNR号"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="底盘号" prop="VIN">
-          <el-input
-            v-model="listQuery.VIN"
-            placeholder="请输入底盘号"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="车型代码" prop="VehicleModelCode">
-          <el-input
-            v-model="listQuery.VehicleModelCode"
-            placeholder="请输入总成名称"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="版本" prop="Version">
-          <el-input
-            v-model="listQuery.Version"
-            placeholder="请输入总成名称"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="上线日期">
-          <el-date-picker
-            v-model="OnlineTimeVale"
-            size="small"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="接收日期">
-          <el-date-picker
-            v-model="ReceiveTimeVale"
-            size="small"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-
-        <!-- <el-form-item label="单据状态" prop="BillStatus">
-          <el-select
-            v-model="listQuery.BillStatus"
-            placeholder="请选择"
-            style="width: 200px"
-          >
-            <el-option label="未领取生产任务" :value="1"></el-option>
-            <el-option label="已领取生产任务" :value="2"></el-option>
-            <el-option label="完成生产任务" :value="3"></el-option>
-          </el-select>
-        </el-form-item> -->
-
-        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleFilter"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="resetQuery('queryForm')"
-            >重置</el-button
-          >
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            style="margin-left: 15px"
-            @click="handleDownload()"
-            >导出(Excel)查询信息
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </flexbox>
-    <div class="l-table">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <el-table-column
-          label="底盘号"
-          prop="vin "
-          sortable="custom"
-          align="center"
-          fixed
-          width="180px"
-        >
-          <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.vin
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-    <!-- 抽屉控件 -->
-    <el-drawer
-      title="信息详细页"
-      size="75%"
-      direction="rtl"
-      :visible.sync="drawer"
-      :before-close="handleDrawerClose"
-    >
-      <div>
-        <Detail
-          v-bind:customerInfos="customerInfos"
-          style="margin-top: -35px"
-        ></Detail>
-      </div>
-    </el-drawer>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import moment from "moment";
-import message_table from "../../components/mixins/message_table";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "RepeatM100",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  mixins: [message_table],
-  data() {
-    return {
-      crmType: "bomdatabase",
-      customerInfos: [],
-      OnlineTimeVale: [],
-      ReceiveTimeVale: [],
-      versionValue: "",
-      versionList: [], //版本列表
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        HostSNBegin: undefined,
-        HostSNEnd: undefined,
-        VIN: undefined,
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-        ReceiveTimeBegin: undefined,
-        ReceiveTimeEnd: undefined,
-        VehicleModelCode: undefined,
-        Version: undefined,
-        KNR: undefined,
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      multipleSelection: [],
-      drawer: false,
-      //tableHeight: document.documentElement.clientHeight - 260,
-    };
-  },
-  mounted() {
-    var self = this;
-    // window.onresize = function () {
-    //   var offsetHei = document.documentElement.clientHeight;
-    //   self.tableHeight = offsetHei - 190;
-    // };
-    /** 控制table的高度 */
-    window.onresize = () => {
-      var offsetHei = document.documentElement.clientHeight;
-      this.$bus.emit("message-scroll", offsetHei - 300);
-    };
-  },
-  created() {
-    this.getList();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 120,
-      });
-      // tempsTabs.push({
-      //   label: "底盘号",
-      //   prop: "vin",
-      //   width: 130,
-      // });
-      tempsTabs.push({
-        label: "上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "接收时间",
-        prop: "receiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({ label: "单据状态", prop: "billStatus", width: 120 });
-      tempsTabs.push({
-        label: "车型名称",
-        prop: "vehicleModelName",
-        width: 120,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      var parentId = param.id; //传入的是总成id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      // if (this.OnlineTimeVale != []) {
-      //   this.listQuery.OnlineTimeBegin = this.OnlineTimeVale[0];
-      //   this.listQuery.OnlineTimeEnd = this.OnlineTimeVale[1];
-      // }
-      // if (this.ReceiveTimeVale != []) {
-      //   this.listQuery.ReceiveTimeBegin = this.ReceiveTimeVale[0];
-      //   this.listQuery.ReceiveTimeEnd = this.ReceiveTimeVale[1];
-      // }
-      if (this.OnlineTimeVale != []) {
-        this.listQuery.OnlineTimeBegin = this.OnlineTimeVale
-          ? this.OnlineTimeVale[0] || undefined
-          : undefined;
-        this.listQuery.OnlineTimeEnd = this.OnlineTimeVale
-          ? this.OnlineTimeVale[1] || undefined
-          : undefined;
-      }
-      if (this.ReceiveTimeVale != []) {
-        this.listQuery.ReceiveTimeBegin = this.ReceiveTimeVale
-          ? this.ReceiveTimeVale[0] || undefined
-          : undefined;
-
-        this.listQuery.ReceiveTimeEnd = this.ReceiveTimeVale
-          ? this.ReceiveTimeVale[1] || undefined
-          : undefined;
-      }
-      console.log("重复报文导出条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/newjit/repeat-m100/export", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            })
-            .catch(() => {
-              this.listLoading = false;
-            });
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.OnlineTimeVale = [];
-      this.ReceiveTimeVale = [];
-      this.$refs[refName].resetFields();
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未领取生产任务", 2: "已领取生产任务", 3: "完成生产任务" }[
-          row[column.property]
-        ];
-      }
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.OnlineTimeVale != []) {
-        this.listQuery.OnlineTimeBegin = this.OnlineTimeVale[0];
-        this.listQuery.OnlineTimeEnd = this.OnlineTimeVale[1];
-      }
-      if (this.ReceiveTimeVale != []) {
-        this.listQuery.ReceiveTimeBegin = this.ReceiveTimeVale[0];
-        this.listQuery.ReceiveTimeEnd = this.ReceiveTimeVale[1];
-      }
-      this.$axios
-        .gets("/api/newjit/repeat-m100/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/newJit/baseData/unknownAssembly/detail.vue b/code/WebApp/vue/src/views/newJit/baseData/unknownAssembly/detail.vue
deleted file mode 100644
index e5bc3487..00000000
--- a/code/WebApp/vue/src/views/newJit/baseData/unknownAssembly/detail.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<!--未知总成-明细数据-->
-<template>
-  <div class="cr-body-content">
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="客户零件代码"
-        prop="partCode "
-        sortable="custom"
-        align="center"
-        width="220px"
-      >
-        <template slot-scope="scope">
-            <span>{{ scope.row.partCode }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import { downloadFile } from "@/utils/crmindex.js";
-import Detail from "./detail";
-
-export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "stockFisDiffReport",
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        parentId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        SkipCount: 0,
-        MaxResultCount: 15,
-        id: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfos: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.parentId = element.ParentId;
-          });
-          if (this.customerInfo.parentId != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      //tempsTabs.push({ label: "客户零件代码", prop: "partCode ", width: 120 });
-      tempsTabs.push({ label: "客户零件数量", prop: "partNum", width: 95 });
-      tempsTabs.push({ label: "描述", prop: "description", width: 280 });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    // fieldFormatter(row, column) {
-    //   return row[column.property] || "--";
-    // },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList() {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      this.$axios
-        .gets("/api/newjit/unknown-assembly/" + this.customerInfo.parentId)
-        .then((response) => {
-          this.list = response.item.unknownAssemblyParts;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "partCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 6,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    resetQuery() {},
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left", background: "#FAFAFA" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-</style>
-
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
diff --git a/code/WebApp/vue/src/views/newJit/baseData/unknownAssembly/index.vue b/code/WebApp/vue/src/views/newJit/baseData/unknownAssembly/index.vue
deleted file mode 100644
index 17f4a86a..00000000
--- a/code/WebApp/vue/src/views/newJit/baseData/unknownAssembly/index.vue
+++ /dev/null
@@ -1,1474 +0,0 @@
-<!--未知总成管理页-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <el-form
-        :model="listQuery"
-        ref="queryForm"
-        v-show="showSearch"
-        :inline="true"
-      >
-        <el-form-item label="KNR" prop="KNR">
-          <el-input
-            v-model="listQuery.KNR"
-            placeholder="请输入KNR号"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="底盘号" prop="VIN">
-          <el-input
-            v-model="listQuery.VIN"
-            placeholder="请输入底盘号"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="车型代码" prop="VehicleModelCode">
-          <el-input
-            v-model="listQuery.VehicleModelCode"
-            placeholder="请输入车型代码"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="版本" prop="Version">
-          <el-input
-            v-model="listQuery.Version"
-            placeholder="请输入版本"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="上线日期">
-          <el-date-picker
-            v-model="OnlineTimeVale"
-            size="small"
-            style="width: 380px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-
-        <el-form-item>
-          <el-button
-            class="filter-item"
-            size="mini"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleUpdate()"
-            >重新解析(批量操作)
-          </el-button>
-        </el-form-item>
-        
-        <el-form-item>
-          <el-button
-            class="addAssy"
-            size="mini"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleCreate"
-            >添加总成
-          </el-button>
-        </el-form-item>
-
-        <el-form-item label="扫描点" prop="ScanPoint">
-          <el-input
-            v-model="listQuery.ScanPoint"
-            placeholder="请输入扫描点"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleFilter"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="resetQuery('queryForm')"
-            >重置</el-button
-          >
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            style="margin-left: 15px"
-            @click="handleDownload()"
-            >导出(Excel)
-          </el-button>
-
-          <el-button
-            class="filter-item"
-            plain
-            size="mini"
-            type="success"
-            icon="el-icon-check"
-            @click="handleUpdateAll()"
-            >重新解析(执行全部)
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </flexbox>
-    <div class="l-table">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column
-          label="底盘号"
-          prop="vin"
-          sortable
-          align="center"
-          fixed
-          width="180px"
-        >
-          <template slot-scope="scope">
-              <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-                scope.row.vin
-              }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="操作" align="center" width="128px">
-          <template slot-scope="{ row }">
-            <el-button
-              type="primary"
-              size="mini"
-              @click="handleUpdate(row)"
-              icon="el-icon-edit"
-            />
-          </template>
-        </el-table-column> -->
-      </el-table>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-        <div>
-          <Detail
-            v-bind:customerInfos="customerInfos"
-            style="margin-top: -35px"
-          ></Detail>
-        </div>
-      </el-drawer>
-      
-      <!--添加总成-->
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        :title="formTitle"
-        append-to-body
-        width="1000px"
-      >
-        <div style="width:980px;height:600px">
-          <el-row>
-            <el-col :span="8">
-              <div style="border:1px;width:280px">
-                <el-row>
-                  <div class="app">
-                      <!-- handleCurrentChange -->
-                    <el-table border style="margin:0px;width:280px;" height="260px" ref="asTable" :data="erpAssemblyCfgList" highlight-current-row @row-click="rowClickass" @select="selectAss">
-                        <el-table-column type="selection" width="40px"></el-table-column>
-                        <el-table-column prop="erpAssemblyCode" label="总成编号" align="center" width="178px"></el-table-column>
-                        <!-- 添加删除按钮 -->
-                        <el-table-column align="center" width="61px">
-                          <!-- type="button" :render-header="renderHeader" -->
-                          <!-- <template slot="header" slot-scope="scope">
-                            <el-button @click="addzc(scope.$index,scope.row)" icon="el-icon-plus">
-                            </el-button>
-                          </template> -->
-                          <template slot-scope="scope">
-                            <el-button @click="delzc(scope.$index,scope.row)" icon="el-icon-minus" size="mini" align="left">
-                            </el-button>
-                          </template>
-                        </el-table-column>
-                    </el-table>
-                  </div>
-                </el-row>
-                <el-row>
-                  <div style="width:280px;border:1px" >
-                    <el-divider content-position="center">添加Erp总成</el-divider>
-                    <el-form style="border:1px" :label-position="labelPosition" label-width="100px" :model="assly" ref="assly" border>
-                      <el-form-item label="Erp总成编码" style="height:40px;width:280px">
-                        <el-input v-model="assly.erpAssemblyCode" clearable placeholder="请输入Erp总成编码"></el-input>
-                      </el-form-item>
-                      <el-form-item label="Erp总成名称" style="height:40px;width:280px">
-                        <el-input v-model="assly.erpAssemblyName" clearable placeholder="请输入Erp总成名称"></el-input>
-                      </el-form-item>
-                      <el-form-item label="车型" style="height:40px;">
-                        <!-- <el-input v-model="assly.carModel" clearable></el-input> -->
-                        <el-select v-model="assly.carModel" clearable placeholder="请选择车型">
-                          <el-option
-                            v-for="item in carModels"
-                            :key="item.dicItemCode"
-                            :label="item.dicItemName"
-                            :value="item.dicItemCode">
-                          </el-option>
-                        </el-select>
-                      </el-form-item>
-                      <el-form-item>
-                        <el-button type="primary" @click="submitAssyForm('assly')">添加</el-button>
-                      </el-form-item>
-                    </el-form>
-                  </div>
-                </el-row>
-              </div>
-            </el-col>
-            <el-col :span="7">
-              <div style="border:1px;height:570px;width:270px">
-                <el-table :data="tempdetails" ref="leftTable" height="550" stripe border highlight-current-row @row-click="rowClickLeft" @select="selectLeft">
-                  <el-table-column type="selection" width="40px"></el-table-column>
-                  <el-table-column prop="partCode" label="结算件代码" width="150px" align="center"></el-table-column>
-                  <el-table-column prop="partNum" label="数量" width="78px" align="center"></el-table-column>
-                </el-table>
-              </div>
-            </el-col>
-            <el-col :span="2">
-              <!-- 左右穿梭按钮 -->
-              <div align="center" style="height:570px;width:70px">
-                <el-row style="line-height: 300px;">
-                  <el-button @click="btnleftclick()" icon="el-icon-caret-left"></el-button>
-                </el-row>
-                <el-row>
-                  <el-button @click="btnrightclick()" icon="el-icon-caret-right"></el-button>
-                </el-row>
-              </div>
-            </el-col>
-            <el-col :span="7">
-              <div style="border:1px;height:570px;width:270px">
-                <el-table :data="data2" ref="rightTable" height="550" stripe border highlight-current-row @row-click="rowClickRight" @select="selectRight">
-                  <el-table-column type="selection" width="40px"></el-table-column>
-                  <el-table-column prop="partCode" label="结算件代码" width="150px" align="center"></el-table-column>
-                  <el-table-column prop="partNum" label="数量" width="78px" align="center"></el-table-column>
-                </el-table>
-              </div>
-            </el-col>
-                <!-- <el-table-transfer
-                    leftTitle="结算件"
-                    rightTitle="未知总成"
-                    :columns='columns'
-                    :dataLeft="data1"
-                    :dataRight="data2"
-                >
-                    <template v-slot:default="{scope}">
-                        <div>
-                          {{scope.row[scope.col.value]}}
-                        </div>
-                    </template>
-                </el-table-transfer> -->
-                <!-- 可以使用插槽获取到列信息和行信息，从而进行数据的处理 -->
-              <!-- <el-col :span="17"></el-col> -->
-          </el-row>
-          
-          <div slot="footer" class="dialog-footer" align="right" style="width:950px">
-            <el-button v-loading="formLoading" type="primary" @click="save">确认</el-button>
-          </div>
-        </div>
-        
-      </el-dialog>
-
-      <!-- 移动数量窗体 -->
-      <el-dialog 
-        :visible.sync="dialogNumVisible"
-        :close-on-click-modal="false"
-        :title="numTitle"
-        append-to-body
-        width="570px"
-      >
-        <div>
-          <el-form :model="numFormData" ref="numFormData" label-width="100px" class="num-ruleForm">
-            <el-form-item
-              label="数量"
-              prop="num"
-              :rules="[
-                { required: true, message: '数量不能为空且至少为1'},
-              ]"
-            >
-              <el-input type="text" v-model="numFormData.num"></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div slot="footer" class="dialog-footer">
-          <el-button v-loading="formLoading" type="primary" @click="saveNum()">确认</el-button>
-          <el-button type="text" @click="dialogNumVisible = false">取消</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import moment from "moment";
-import Detail from "./detail.vue";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "UnknownAssembly",
-  components: { Pagination, CRMTableHead, importExcel, Detail},
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "bomdatabase",
-      rules: {
-        erpAssemblyName: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      valueSelect: "",
-      OnlineTimeVale: [],//上线时间
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      asTemp:[],//总成编号点击缓存
-      rightRowTemp: [],//右侧移动点击缓存
-      leftRowTemp: [],//左侧移动点击缓存
-      selectioned:'',//单选中的值
-      carModels:[],//车型下拉框数据源
-      currentRow: "",
-      versionList: [], //版本列表
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-        KNR: undefined,
-        VIN: undefined,
-        ScanPoint: undefined,
-      },
-      listUnknownAssemblyQuery: {
-        billId:'',
-        //apply:"",
-        vin:'',
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      multipleSelection: [],
-      drawer: false,
-      dialogFormVisible: false,
-      dialogNumVisible: false,
-      formTitle: "",
-      numTitle: "",
-      isEdit: false,
-      formLoading: false,
-      //dialogFormVisible: false,
-      tableHeight: document.documentElement.clientHeight - 220,
-      //columns: [
-      //          {name: '结算件代码', value: 'partCode', width: '180px'},
-      //          {name: '数量', value: 'partNum',},
-      //      ],
-      // data1: [
-      // ],
-      
-      numFormData:{
-        num: 1
-      },
-      zcCode:[],
-      /*最终提交缓存*/
-      tempAssCfgList: [
-      ],
-      /*右侧数据源*/
-      data2: [],
-      /*中间数据源*/
-      tempdetails:[
-            //{
-              // partCode: "1",
-              // partNum: 0,
-              // isKey: true
-            //}
-      ],
-      /*左侧总成数据源*/
-      erpAssemblyCfgList: [],
-        // {
-        //   erpAssemblyCode: "string",
-        //   erpAssemblyName: "string",
-        //   isCover: true,
-        //   carModel: "",
-        //   previousVersionId: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-        //   details: [
-        //     {
-        //       partCode: "string",
-        //       partNum: 0,
-        //       description: "string",
-        //       isKey: true
-        //     }
-        //   ]
-        // }
-      labelPosition: 'left',
-      assly: {
-        erpAssemblyCode: '',
-        erpAssemblyName: '',
-        carModel: ''
-      }
-      };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 220;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "大众顺序号",
-        prop: "hostSN",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "扫描点",
-        prop: "scanPoint",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "车型名称",
-        prop: "vehicleModelName",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({ label: "客户零件数量", prop: "partNum", width: 135 });
-      tempsTabs.push({
-        label: "文件名",
-        prop: "fileName",
-        width: 180,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      var parentId = param.id; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    handleUpdateAll() {
-      var params = {
-        isSelectAll: true,
-        unknownAssemblyIdList: [],
-      };
-      this.$confirm("是否要全部进行解析?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/newjit/unknown-assembly/to-parse", params)
-            .then((response) => {
-              if (response.status == true) {
-                this.$notify({
-                  title: "成功",
-                  message: "操作成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  type: "warning",
-                  message: response.message,
-                });
-              }
-            });
-        })
-        .catch(() => {});
-    },
-    /** 重新计算总成 */
-    handleUpdate(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "必须选择一行",
-          type: "warning",
-        });
-        return;
-      } else {
-        //批量操作
-        var params = {
-          isSelectAll: false,
-          unknownAssemblyIdList: [],
-        };
-        if (row) {
-          //单行
-          params.unknownAssemblyIdList.push(row.id);
-        } else {
-          //多选
-          this.multipleSelection.forEach((element) => {
-            let id = element.id;
-            params.unknownAssemblyIdList.push(id);
-          });
-        }
-        console.log("未知总成详表条件：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/unknown-assembly/to-parse", params)
-          .then((response) => {
-            if (response.status == true) {
-              this.$notify({
-                title: "成功",
-                message: "操作成功！",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            } else {
-              this.$message({
-                type: "warning",
-                message: response.message,
-              });
-            }
-          });
-      }
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/unknown-assembly/" + id)
-        .then((response) => {
-          this.form = response.item;
-        });
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      this.$axios
-        .gets("/api/newjit/unknown-assembly/export", this.listQuery)
-        .then((res) => {
-          let filename = res;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.OnlineTimeVale = [];
-      this.$refs[refName].resetFields();
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-    /* 主页面添加总成按钮事件 */
-    handleCreate() {
-      // this.$nextTick(() => {
-      //   this.$refs["formCount"].resetFields();
-      // });
-      if (this.multipleSelection.length !== 1) {
-        this.$message({
-          message: "必须选择一行",
-          type: "warning",
-        });
-        return;
-      } else {
-        console.log(this.multipleSelection[0].id);
-        console.log(this.multipleSelection[0].vin);
-        this.formTitle = "添加总成";
-        this.isEdit = false;
-        this.form = {};
-        this.getUnknownAssemblyList();
-        this.getZcCode();
-        this.getCarModel();
-        this.dialogFormVisible = true;
-      }
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 0: "未生效", 2: "已生效", 3: "已发布" }[row[column.property]];
-      }
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.OnlineTimeVale != []) {
-        this.listQuery.OnlineTimeBegin = this.OnlineTimeVale[0]//this.OnlineTimeVale
-          // ? this.OnlineTimeVale[0] || ""
-          // : "";
-        this.listQuery.OnlineTimeEnd = this.OnlineTimeVale[1]//this.OnlineTimeVale
-          // ? this.OnlineTimeVale[1] || ""
-          // : "";
-      }
-      this.$axios
-        .gets("/api/newjit/unknown-assembly/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    /* 获取车型数据源 */
-    getCarModel(){
-      this.$axios
-        .gets("/api/newjit/dic/list"+"?dicTypeName=车型")
-        .then((response) => {
-          console.log("this is response.items",response.item);
-          this.carModels = response.item;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-        //console.log("this is carModels",this.carModels);
-    },
-    /* 加号按钮添加事件 */
-    addzc()
-    {
-      //todo 添加总成左侧的 加号按钮 待做
-      alert("1")
-    },
-    /* 减号按钮删除事件 */
-    delzc(index)
-    {
-      this.erpAssemblyCfgList.splice(index, 1);
-      console.log(this.erpAssemblyCfgList);
-    },
-    /* 添加总成最终提交的数据事件*/
-    save() {
-      //if(this.data2.length ===0){
-        var lastSubmit = {
-            billId:this.listUnknownAssemblyQuery.billId,
-            scanPoint: "M100",
-            erpAssemblyCfgList:[]
-        };
-        lastSubmit.erpAssemblyCfgList = this.tempAssCfgList;
-
-        // var lastSubmitt = [];
-        // console.log("flag")
-        // this.tempAssCfgList.forEach(element => {
-        //   element.details.forEach(element1 => {
-        //     lastSubmitt.push({
-        //       erpAssemblyCode: element.erpAssemblyCode,
-        //       erpAssemblyName: element.erpAssemblyName,
-        //       isCover: false,
-        //       previousVersionId:"f7d45dba-3164-4a91-b477-3c568c81e6a0",
-        //       vehicleModel: element.vehicleModel,
-        //       details:{
-        //         partCode:element1.partCode,
-        //         partNum:element1.partNum,
-        //         description:element1.description,
-        //         isKey: true,
-        //       }
-        //     })
-        //   });
-        // });
-        // console.log("this is lastSubmitt:",lastSubmitt)
-        // var lastSubmit = [];
-        // lastSubmitt.forEach(element => {
-        //   lastSubmit.push({
-        //     billID:this.listUnknownAssemblyQuery.billId,
-        //     scanPoint: "M100",
-        //     erpAssemblyCfgList:[{
-        //       erpAssemblyCode: element.erpAssemblyCode,
-        //       erpAssemblyName: element.erpAssemblyName,
-        //       isCover: false,
-        //       previousVersionId: null,
-        //       vehicleModel: element.vehicleModel,
-        //       details:element.details
-        //     }]
-        //   })
-        // });
-        // console.log("this is lastSubmit:",lastSubmit)
-
-        this.$axios
-          .posts(
-            "/api/newjit/unknown-assembly/add-assembly",
-            lastSubmit
-          )
-          .then((response) => {
-            if(response.status === true){
-              this.$notify({
-                    title: "成功",
-                    message: "数据导入成功！",
-                    type: "success",
-                    duration: 2000,
-                  });
-            }
-          })
-          .catch(() => {
-            //this.listLoading = false;
-          });
-
-        this.leftRowTemp = [];
-        this.rightRowTemp = [];
-        this.tempAssCfgList = [];
-        this.tempdetails = [];
-        this.erpAssemblyCfgList =[];
-        this.asTemp = [];
-        this.dialogFormVisible = false;
-      // }
-      // else{
-      //   alert("未知零件未分配完，请确认！")
-      // }
-    },
-    /* 获取未知总成零件数据源 */
-    getUnknownAssemblyList(){
-      this.listUnknownAssemblyQuery.billId=this.multipleSelection[0].id;
-      //console.log(this.listUnknownAssemblyQuery);
-      this.$axios
-          .gets(
-            "/api/newjit/unknown-assembly/"+this.listUnknownAssemblyQuery.billId
-          ).then((response) => {
-          this.data2 = response.item.unknownAssemblyParts;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        })
-    },
-    /* 获取总成零件数据源*/
-    getZcCode(){
-      this.zcCode = [];
-      this.listUnknownAssemblyQuery.vin=this.multipleSelection[0].vin;
-      //console.log(this.listUnknownAssemblyQuery.vin);
-      this.$axios
-        .gets(
-          "/api/newjit/unknown-assembly/get-erp-assembly-code"+"?vin="+this.listUnknownAssemblyQuery.vin
-        ).then((response) => {
-          console.log(response.item);
-          if(response.item.length !== 0){
-            console.log("has no ASSCode");
-          }
-          else{
-            response.item.forEach((zccode) => {
-              this.erpAssemblyCfgList.push({
-                erpAssemblyCode: zccode,
-                erpAssemblyName: [],
-                isCover: false,
-                carModel: "",
-                previousVersionId: null,
-                details: [
-                  {
-                    partCode: "",
-                    partNum: 0,
-                    description: "",
-                    isKey: true
-                  }
-                ]
-              })
-            });
-          }
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-    },
-    /* 添加总成提交方法 */
-    submitAssyForm(formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            if(this.assly.erpAssemblyCode !== ""){
-              this.erpAssemblyCfgList.push({
-                erpAssemblyCode: this.assly.erpAssemblyCode,
-                erpAssemblyName: this.assly.erpAssemblyName,
-                carModel: this.assly.carModel,
-                isCover: false,
-                previousVersionId: null,
-                details: []
-              })
-              console.log(this.erpAssemblyCfgList);
-              this.assly.erpAssemblyCode = '';
-              this.assly.erpAssemblyName = '';
-              this.assly.carModel = '';
-            }
-            else{
-              alert("请先填写Erp总成信息！")
-            }
-          } 
-          else {
-            console.log('error submit!!');
-            return false;
-          }
-        });
-      },
-    btnleftclick(){
-      if(this.asTemp.length === 0){
-        alert("请先选择总成编号！")
-      }
-      else{
-        if(this.rightRowTemp.length === 0){
-          alert("请先选择需移动的零件")
-        }
-        else if(this.rightRowTemp.length !== 0 && parseInt(this.rightRowTemp[0].partNum) !== 1){
-          this.numFormData.num = parseInt(this.rightRowTemp[0].partNum);
-          this.dialogNumVisible = true;
-          this.numTitle = "输入移动结算件数量"
-        }
-        else{
-          console.log("R->F");
-            this.numFormData.num = 1;
-            if(this.numFormData.num <= this.rightRowTemp[0].partNum && this.numFormData.num > 0){
-
-              //数据插入最终缓存
-              if(this.tempAssCfgList.length !== 0){
-                console.log("second")
-                var rfMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
-                if(rfMove.length !== 0){
-                  var sameDetail = rfMove[0].details.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
-                  if(sameDetail.length !== 0){
-                    sameDetail[0].partNum =  parseInt(sameDetail[0].partNum) + parseInt(this.numFormData.num);
-                  }
-                  else{
-                    rfMove[0].details.push({
-                      description: this.rightRowTemp[0].description,
-                      isKey: true,
-                      partCode: this.rightRowTemp[0].partCode,
-                      partNum: this.numFormData.num,//移动框输入的数量
-                    })
-                  }
-                }
-                else{
-                  console.log("加进去了")
-                  this.tempAssCfgList.push({
-                  erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
-                  erpAssemblyName: this.asTemp[0].erpAssemblyName,
-                  isCover: false,
-                  previousVersionId: this.asTemp[0].previousVersionId,
-                  vehicleModel: this.asTemp[0].carModel,
-                  details:[{
-                    description: this.rightRowTemp[0].description,
-                    isKey: true,
-                    partCode: this.rightRowTemp[0].partCode,
-                    partNum: this.numFormData.num,//移动框输入的数量
-                  }]
-                })
-                }
-              }
-              else{
-                console.log("first")
-                this.tempAssCfgList.push({
-                  erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
-                  erpAssemblyName: this.asTemp[0].erpAssemblyName,
-                  isCover: false,
-                  previousVersionId: this.asTemp[0].previousVersionId,
-                  details:[{
-                    description: this.rightRowTemp[0].description,
-                    isKey: true,
-                    partCode: this.rightRowTemp[0].partCode,
-                    partNum: this.numFormData.num,//移动框输入的数量
-                  }]
-                })
-              }
-
-              console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
-              //数据插入中间数据源
-              var judge = this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
-              if(judge.length === 1){
-                var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-                this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode)[0].partNum = t;
-              }
-              else{
-                this.tempdetails.push({
-                  description: this.rightRowTemp[0].description,
-                  isKey: true,
-                  partCode: this.rightRowTemp[0].partCode,
-                  partNum: parseInt(this.numFormData.num),//移动框输入的数量
-                })
-              }
-              /* 右侧数据移动 */
-              var delid = this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0]
-              var n1 = parseInt(this.numFormData.num);
-              var n2 = parseInt(delid.partNum);
-              if(n1 === n2){
-                this.data2 = this.data2.filter(u=>u.id !== this.rightRowTemp[0].id);
-                this.rightRowTemp = [];
-              }
-              else{
-                this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0].partNum =  delid.partNum - this.numFormData.num;
-                this.rightRowTemp[0].partNum = n2 - n1;
-              }
-            }
-        }
-      }
-    },
-    btnrightclick(){
-      if(this.asTemp.length === 0){
-        alert("请先选择总成编号！")
-      }
-      else{
-        if(this.leftRowTemp.length === 0){
-        alert("请先选择需移动的零件")
-        }
-        else if(this.leftRowTemp.length !== 0 && parseInt(this.leftRowTemp[0].partNum) !== 1){
-          this.numFormData.num = parseInt(this.leftRowTempnpm[0].partNum);
-          this.dialogNumVisible = true;
-          this.numTitle = "输入移动结算件数量"
-        }
-        else{
-          console.log("F->R");
-          this.numFormData.num = 1;
-            if(this.numFormData.num <= this.leftRowTemp[0].partNum && this.numFormData.num > 0){
-              
-              //数据插入最终缓存
-              console.log("移除或删除")
-              var frMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
-              var samedetail = frMove[0].details.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
-              if(samedetail.length !== 0){
-                if(parseInt(samedetail[0].partNum) === parseInt(this.numFormData.num)){
-                  frMove[0].details = frMove[0].details.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
-                }
-                else{
-                  samedetail[0].partNum =  parseInt(samedetail[0].partNum) - parseInt(this.numFormData.num);
-                }
-              }
-              else if(samedetail.length !== 0){
-                alert("没有数据!");
-              }
-
-              console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
-              
-              //数据插入右侧数据源
-              var judge = this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
-              if(judge.length === 1){
-                var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-                this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum = t;
-              }
-              else{
-                  this.data2.push({
-                    description: this.leftRowTemp[0].description,
-                    isKey: true,
-                    partCode: this.leftRowTemp[0].partCode,
-                    partNum: parseInt(this.numFormData.num),//移动框输入的数量
-                })
-              }
-              /* 中间数据移动 */
-              var delid = this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0]
-              var n1 = parseInt(this.numFormData.num);
-              var n2 = parseInt(delid.partNum);
-              if(n1 === n2){
-                this.tempdetails = this.tempdetails.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
-                this.leftRowTemp = [];
-              }
-              else{
-                this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum =  parseInt(delid.partNum) - parseInt(this.numFormData.num);
-                this.leftRowTemp[0].partNum = n2 - n1;
-              }
-            }
-        }
-      }
-    },
-    /* 保存数量事件 */
-    saveNum(){
-      if(this.asTemp.length !== 0){
-        //判断中间选中移动还是右侧选中移动
-        /*   左侧移动到右侧   */
-        if(this.leftRowTemp.length !== 0){
-          console.log("F->R");
-          if(this.numFormData.num <= this.leftRowTemp[0].partNum && this.numFormData.num > 0){
-            
-            //数据插入最终缓存
-            console.log("移除或删除")
-            var frMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
-            var samedetail = frMove[0].details.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
-            if(samedetail.length !== 0){
-              if(parseInt(samedetail[0].partNum) === parseInt(this.numFormData.num)){
-                frMove[0].details = frMove[0].details.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
-              }
-              else{
-                samedetail[0].partNum =  parseInt(samedetail[0].partNum) - parseInt(this.numFormData.num);
-              }
-            }
-            else if(samedetail.length !== 0){
-              alert("没有数据!");
-            }
-
-            console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
-            
-            //数据插入右侧数据源
-            var judge = this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
-            if(judge.length === 1){
-              var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-              this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum = t;
-            }
-            else{
-                this.data2.push({
-                  description: this.leftRowTemp[0].description,
-                  isKey: true,
-                  partCode: this.leftRowTemp[0].partCode,
-                  partNum: parseInt(this.numFormData.num),//移动框输入的数量
-              })
-            }
-            /* 中间数据移动 */
-            var delid = this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0]
-            var n1 = parseInt(this.numFormData.num);
-            var n2 = parseInt(delid.partNum);
-            if(n1 === n2){
-              this.tempdetails = this.tempdetails.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
-              this.leftRowTemp = [];
-            }
-            else{
-              this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum =  parseInt(delid.partNum) - parseInt(this.numFormData.num);
-              this.leftRowTemp[0].partNum = n2 - n1;
-            }
-          }
-          else if(this.numFormData.num == 0){
-            alert("输入数字不能为0！");
-          }
-          else{
-            alert("输入不正确,请确认！");
-          }
-        }
-        /*   右侧移动到左侧   */
-        else if(this.rightRowTemp.length !== 0){
-          console.log("R->F");
-          if(this.numFormData.num <= this.rightRowTemp[0].partNum && this.numFormData.num > 0){
-
-            //数据插入最终缓存
-            if(this.tempAssCfgList.length !== 0){
-              console.log("second")
-              var rfMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
-              if(rfMove.length !== 0){
-                var sameDetail = rfMove[0].details.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
-                if(sameDetail.length !== 0){
-                  sameDetail[0].partNum =  parseInt(sameDetail[0].partNum) + parseInt(this.numFormData.num);
-                }
-                else{
-                  rfMove[0].details.push({
-                    description: this.rightRowTemp[0].description,
-                    isKey: true,
-                    partCode: this.rightRowTemp[0].partCode,
-                    partNum: this.numFormData.num,//移动框输入的数量
-                  })
-                }
-              }
-              else{
-                console.log("加进去了")
-                this.tempAssCfgList.push({
-                erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
-                erpAssemblyName: this.asTemp[0].erpAssemblyName,
-                vehicleModel: this.asTemp[0].carModel,
-                isCover: false,
-                previousVersionId: this.asTemp[0].previousVersionId,
-                details:[{
-                  description: this.rightRowTemp[0].description,
-                  isKey: true,
-                  partCode: this.rightRowTemp[0].partCode,
-                  partNum: this.numFormData.num,//移动框输入的数量
-                }]
-              })
-              }
-            }
-            else{
-              console.log("first")
-              this.tempAssCfgList.push({
-                erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
-                erpAssemblyName: this.asTemp[0].erpAssemblyName,
-                isCover: false,
-                previousVersionId: this.asTemp[0].previousVersionId,
-                vehicleModel: this.asTemp[0].carModel,
-                details:[{
-                  description: this.rightRowTemp[0].description,
-                  isKey: true,
-                  partCode: this.rightRowTemp[0].partCode,
-                  partNum: this.numFormData.num,//移动框输入的数量
-                }]
-              })
-            }
-
-            console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
-            //数据插入中间数据源
-            var judge = this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
-            if(judge.length === 1){
-              var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-              this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode)[0].partNum = t;
-            }
-            else{
-              this.tempdetails.push({
-                description: this.rightRowTemp[0].description,
-                isKey: true,
-                partCode: this.rightRowTemp[0].partCode,
-                partNum: parseInt(this.numFormData.num),//移动框输入的数量
-              })
-            }
-            /* 右侧数据移动 */
-            var delid = this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0]
-            var n1 = parseInt(this.numFormData.num);
-            var n2 = parseInt(delid.partNum);
-            if(n1 === n2){
-              this.data2 = this.data2.filter(u=>u.id !== this.rightRowTemp[0].id);
-              this.rightRowTemp = [];
-            }
-            else{
-              this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0].partNum =  delid.partNum - this.numFormData.num;
-              this.rightRowTemp[0].partNum = n2 - n1;
-            }
-          }
-          else if(this.numFormData.num == 0){
-            alert("输入数字不能为0！");
-          }
-          else{
-            alert("输入不正确,请确认！");
-          }
-        }
-        this.dialogNumVisible = false;
-      }
-      else{
-        alert("请先选择总成编号！")
-      }
-      this.dialogNumVisible = false;
-    },
-    /* 总成编号选中事件 */
-    rowClickass(row) {
-      this.asTemp=[];
-      this.tempdetails=[];
-      this.$refs.asTable.clearSelection();
-      this.$refs.asTable.toggleRowSelection(row);
-      this.asTemp.push(row);
-      
-      if(this.asTemp[0].details.length !== 0){
-        //选中插入中间数据源
-        this.tempdetails.push({
-          isKey: true,
-          partCode: this.asTemp[0].details[0].partCode,
-          partNum: this.asTemp[0].details[0].partNum,
-          vehicleModel:this.asTemp[0].details[0].carModel,
-        })
-      }
-      //二次选中插入最终提交中的details
-      var judgeSec = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode)
-      console.log("this is judgeSec:",judgeSec);
-      if(judgeSec.length !== 0){
-        console.log("this is judgeSec[0].details:",judgeSec[0].details);
-        judgeSec[0].details.forEach(element => {
-            this.tempdetails.push(element)
-        });
-      }
-      console.log("this is this.tempdetails",this.tempdetails);
-      console.log("this is asTemp",this.asTemp);
-    },
-    /* 总成编号复选框单选事件 */
-    selectAss(selection, row) {
-      this.asTemp=[]; //清空已选
-      this.tempdetails = [];
-      console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
-      // 选择项大于1时
-      if (selection.length > 1) {
-      let del_row = selection.shift();
-      // console.log('把数组的第一个元素从其中删除后', selection);
-      this.$refs.asTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
-      }
-      this.asTemp.push(selection[0])
-      console.log('当用户手动勾选数据行', this.asTemp)
-
-      if(this.asTemp[0].details.length !== 0){
-        //选中插入中间数据源
-        this.tempdetails.push({
-          isKey: true,
-          partCode: this.asTemp[0].details[0].partCode,
-          partNum: this.asTemp[0].details[0].partNum,
-          vehicleModel:this.asTemp[0].details[0].carModel,
-        })
-      }
-
-      //二次选中插入最终提交中的details
-      var judgeSec = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode)
-      console.log("this is judgeSec:",judgeSec);
-      if(judgeSec.length !== 0){
-        console.log("this is judgeSec[0].details:",judgeSec[0].details);
-        judgeSec[0].details.forEach(element => {
-            this.tempdetails.push(element)
-        });
-      }
-      console.log("this is this.tempdetails",this.tempdetails);
-      console.log("this is asTemp",this.asTemp);
-    },
-    /* 右侧数据选中事件 */
-    rowClickRight(row) {
-      this.rightRowTemp = [];
-      this.$refs.rightTable.clearSelection();
-      this.$refs.rightTable.toggleRowSelection(row);
-      this.rightRowTemp.push(row);
-    },
-    /* 左侧数据选中事件 */
-    rowClickLeft(row) {
-      this.leftRowTemp = [];
-      this.$refs.leftTable.clearSelection();
-      this.$refs.leftTable.toggleRowSelection(row);
-      this.leftRowTemp.push(row);
-    },
-    /* 右侧复选框单选事件 */
-    selectRight(selection, row) {
-      this.rightRowTemp=[]; //清空已选
-      console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
-      // 选择项大于1时
-      if (selection.length > 1) {
-      let del_row = selection.shift();
-      // console.log('把数组的第一个元素从其中删除后', selection);
-      this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
-      }
-      this.rightRowTemp.push(selection[0])
-      console.log('当用户手动勾选数据行', this.rightRowTemp)
-    },
-    /* 左侧复选框单选事件 */
-    selectLeft(selection, row) {
-      this.leftRowTemp=[]; //清空已选
-      console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
-      // 选择项大于1时
-      if (selection.length > 1) {
-      let del_row = selection.shift();
-      // console.log('把数组的第一个元素从其中删除后', selection);
-      this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
-      }
-      this.leftRowTemp.push(selection[0])
-      console.log('当用户手动勾选数据行', this.leftRowTemp)
-    },
-  },
-};
-
-</script>
-
-<style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/newJit/components/CRMCreateView.vue b/code/WebApp/vue/src/views/newJit/components/CRMCreateView.vue
deleted file mode 100644
index e4acf007..00000000
--- a/code/WebApp/vue/src/views/newJit/components/CRMCreateView.vue
+++ /dev/null
@@ -1,2674 +0,0 @@
-<template>
-  <create-view
-    :loading="loading"
-    :body-style="{ height: '100%' }"
-    :width="width"
-  >
-    <flexbox direction="column" align="stretch" class="crm-create-container">
-      <flexbox class="crm-create-header">
-        <div style="flex: 1; font-size: 17px; color: #333">{{ title }}</div>
-        <img
-          class="close"
-          src="@/assets/img/task_close.png"
-          @click="hidenView"
-        />
-      </flexbox>
-      <div class="crm-create-flex">
-        <create-sections title="基本信息">
-          <flexbox direction="column" align="stretch">
-            <div class="crm-create-body">
-              <el-form
-                ref="crmForm"
-                :model="crmForm"
-                label-position="top"
-                class="crm-create-box"
-              >
-              <!-- :prop="'crmFields.' + index + '.value'" -->
-                <el-form-item
-                  v-for="(item, index) in crmForm.crmFields"
-                  :key="item.key"
-                  :prop="'crmFields.' + index + '.value'"
-                  :class="{
-                    'crm-create-block-item': item.showblock,
-                    'crm-create-item': !item.showblock,
-                  }"
-                  :rules="crmRules[item.key]"
-                  :style="{
-                    'padding-left': getPaddingLeft(item, index),
-                    'padding-right': getPaddingRight(item, index),
-                  }"
-                >
-                  <div slot="label" style="display: inline-block">
-                    <div
-                      style="
-                        margin: 5px 0;
-                        font-size: 12px;
-                        word-wrap: break-word;
-                        word-break: break-all;
-                      "
-                    >
-                      {{ item.data.name }} 
-                      <span style="color: #999">
-                        {{
-                          item.data.inputTips
-                            ? "（" + item.data.inputTips + "）"
-                            : ""
-                        }}
-                      </span>
-                    </div>
-                  </div>
-                  <component
-                    :is="item.data.formType | typeToComponentName"
-                    :value="item.value"
-                    :index="index"
-                    :item="item"
-                    :relation="item.relation"
-                    :radio="false"
-                    :disabled="item.disabled"
-                    @value-change="fieldValueChange"
-                  />
-                </el-form-item>
-              </el-form>
-            </div>
-          </flexbox>
-        </create-sections>
-      </div>
-<!-- 
-      <DialogTable
-        ref="formDialog"
-        :logMessage="{}"
-        v-if="crmType == 'dicts' && action.type != 'update'"
-      ></DialogTable> -->
-
-      <div class="handle-bar">
-        <el-button class="handle-button" @click.native="hidenView"
-          >取消</el-button
-        >
-        <el-button
-          class="handle-button"
-          type="primary"
-          :disabled="saveDisabled"
-          @click.native="saveField(false)"
-          >保存</el-button
-        >
-      </div>
-    </flexbox>
-  </create-view>
-</template>
-<script type="text/javascript">
-import crmTypeModel from "@/views/ux/model/crmTypeModel";
-import CreateView from "@/components/CreateView";
-import CreateSections from "@/components/CreateSections";
-import DialogTable from "../dict/components/DialogTable";
-import { crmLeadsSave, crmLeadsRead, crmLeadsUpdate } from "@/api/ux/clue";
-import {
-  crmDictsSave,
-  crmDictsRead,
-  crmDictsUpdate,
-  crmDictsItemDetailRead,
-  crmDictsItemIndex,
-  crmDictsItemAdd,
-  crmDictsItemUpdate,
-} from "@/api/dict/dict";
-import {
-  crmTransactionSave,
-  crmTransactionRead,
-  crmTransactionUpdate,
-} from "@/api/transaction/transaction";
-import {
-  crmStrategySave,
-  crmStrategyRead,
-  crmStrategyUpdate,
-} from "@/api/strategy/strategy";
-import { crmRuleSave, crmRuleRead, crmRuleUpdate } from "@/api/rule/rule";
-import {
-  crmStrategyRulesSave,
-  crmStrategyRulesRead,
-  crmStrategyRulesUpdate,
-} from "@/api/strategyRules/strategyRules";
-import {
-  crmVerificationSave,
-  crmVerificationRead,
-  crmVerificationUpdate,
-} from "@/api/verification/verification";
-import { crmStageSave, crmStageRead, crmStageUpdate } from "@/api/stage/stage";
-import {
-  crmCustomerSave,
-  crmCustomerRead,
-  crmCustomerUpdate,
-} from "@/api/customer/customer";
-import {
-  crmSlgItemSave,
-  crmSlgItemRead,
-  crmSlgItemUpdate,
-} from "@/api/slgItem/slgItem";
-//add-fdw-引入bom-保存、读取、更新
-import { crmBomSave, crmBomRead, crmBomUpdate } from "@/api/bom/bom";
-//add-fdw-引主uomgroup-保存、读取、更新
-import {
-  crmUomGroupSave,
-  crmUomGroupRead,
-  crmUomGroupUpdate,
-} from "@/api/uomGroup/uomGroup";
-import { crmUomSave, crmUomRead, crmUomUpdate } from "@/api/uom/uom";
-import {
-  crmInterfaceCalendarSave,
-  crmInterfaceCalendarRead,
-  crmInterfaceCalendarUpdate,
-} from "@/api/interfaceCalendar/interfaceCalendar";
-import {
-  crmVerificationStagesSave,
-  crmVerificationStagesRead,
-  crmVerificationStagesUpdate,
-} from "@/api/verificationStages/verificationStages";
-import { crmAreaSave, crmAreaRead, crmAreaUpdate } from "@/api/area/area"; // 区域
-import {
-  crmAreaItemSave,
-  crmAreaItemRead,
-  crmAreaItemUpdate,
-} from "@/api/areaItem/areaItem"; // 区域-物品
-import {
-  crmCurrencySave,
-  crmCurrencyRead,
-  crmCurrencyUpdate,
-} from "@/api/currency/currency"; // 货币
-import {
-  crmCurrencyExchangeSave,
-  crmCurrencyExchangeRead,
-  crmCurrencyExchangeUpdate,
-} from "@/api/currencyExchange/currencyExchange"; // 货币换算
-import {
-  crmCustomerBomSave,
-  crmCustomerBomRead,
-  crmCustomerBomUpdate,
-} from "@/api/customerBom/customerBom"; // 客户物品产品结构
-import {
-  crmCustomerItemSave,
-  crmCustomerItemRead,
-  crmCustomerItemUpdate,
-} from "@/api/customerItem/customerItem"; // 客户物品
-import {
-  crmEqptTypeSave,
-  crmEqptTypeRead,
-  crmEqptTypeUpdate,
-} from "@/api/eqptType/eqptType"; // 器具类型
-import {
-  crmEqptTypeItemSave,
-  crmEqptTypeItemRead,
-  crmEqptTypeItemUpdate,
-} from "@/api/eqptTypeItem/eqptTypeItem"; // 器具类型-物品
-import { crmItemSave, crmItemRead, crmItemUpdate } from "@/api/item/item"; // 物品
-import {
-  crmItemTransTypeInventoryRouteSave,
-  crmItemTransTypeInventoryRouteRead,
-  crmItemTransTypeInventoryRouteUpdate,
-} from "@/api/itemTransTypeInventoryRoute/itemTransTypeInventoryRoute"; // 物品-事务类型-物流路线分配
-import {
-  crmItemTransTypeOpStrategySave,
-  crmItemTransTypeOpStrategyRead,
-  crmItemTransTypeOpStrategyUpdate,
-} from "@/api/itemTransTypeOpStrategy/itemTransTypeOpStrategy"; // 物品-事务类型-工序-策略分配
-import { crmLocSave, crmLocRead, crmLocUpdate } from "@/api/loc/loc"; // 库位
-import {
-  crmMachineSave,
-  crmMachineRead,
-  crmMachineUpdate,
-} from "@/api/machine/machine"; // 机器
-import { crmParamSave, crmParamRead, crmParamUpdate } from "@/api/param/param"; // 参数
-import { crmPortSave, crmPortRead, crmPortUpdate } from "@/api/port/port"; // 收货口
-import {
-  crmProdLineSave,
-  crmProdLineRead,
-  crmProdLineUpdate,
-} from "@/api/prodLine/prodLine"; // 生产线
-import {
-  crmProdLineItemSave,
-  crmProdLineItemRead,
-  crmProdLineItemUpdate,
-} from "@/api/prodLineItem/prodLineItem"; // 生产线-物品
-import {
-  crmProjectSave,
-  crmProjectRead,
-  crmProjectUpdate,
-} from "@/api/project/project"; // 项目
-import { crmShiftSave, crmShiftRead, crmShiftUpdate } from "@/api/shift/shift"; // 班次
-import { crmSlgSave, crmSlgRead, crmSlgUpdate } from "@/api/slg/slg"; // 库位组
-import {
-  crmSupplierSave,
-  crmSupplierRead,
-  crmSupplierUpdate,
-} from "@/api/supplier/supplier"; // 供应商
-import {
-  crmSupplierItemSave,
-  crmSupplierItemRead,
-  crmSupplierItemUpdate,
-} from "@/api/supplierItem/supplierItem"; // 供应商物品
-import { crmTeamSave, crmTeamRead, crmTeamUpdate } from "@/api/team/team"; // 班组
-import {
-  crmUomConversionSave,
-  crmUomConversionRead,
-  crmUomConversionUpdate,
-} from "@/api/uomConversion/uomConversion"; // 计量单位转换
-import { crmWlgSave, crmWlgRead, crmWlgUpdate } from "@/api/wlg/wlg"; // 工作组
-import {
-  crmWlgItemSave,
-  crmWlgItemRead,
-  crmWlgItemUpdate,
-} from "@/api/wlgItem/wlgItem"; // 工作组-物品
-import {
-  crmWorkCalendarSave,
-  crmWorkCalendarRead,
-  crmWorkCalendarUpdate,
-} from "@/api/workCalendar/workCalendar"; // 工作日历
-import {
-  crmWorkCenterSave,
-  crmWorkCenterRead,
-  crmWorkCenterUpdate,
-} from "@/api/workCenter/workCenter"; // 工作中心
-import {
-  crmInventoryRouteSave,
-  crmInventoryRouteRead,
-  crmInventoryRouteUpdate,
-  crmInventoryRouteDetailRead,
-  crmInventoryRouteDetailIndex,
-  crmInventoryRouteDetailAdd,
-  crmInventoryRouteDetailUpdate,
-} from "@/api/inventoryRoute/inventoryRoute"; //物流路线
-import {
-  crmPurchasePriceSheetSave,
-  crmPurchasePriceSheetRead,
-  crmPurchasePriceSheetUpdate,
-  crmPurchasePriceDetailRead,
-  crmPurchasePriceDetailIndex,
-  crmPurchasePriceDetailAdd,
-  crmPurchasePriceDetailUpdate,
-} from "@/api/purchasePriceSheet/purchasePriceSheet"; //采购价格单
-import {
-  crmRouteSave,
-  crmRouteRead,
-  crmRouteUpdate,
-  crmRouteDetailRead,
-  crmRouteDetailIndex,
-  crmRouteDetailAdd,
-  crmRouteDetailUpdate,
-} from "@/api/route/route"; //工艺路线
-
-import {
-  crmSalePriceSheetSave,
-  crmSalePriceSheetRead,
-  crmSalePriceSheetUpdate,
-  crmSalePriceDetailRead,
-  crmSalePriceDetailIndex,
-  crmSalePriceDetailAdd,
-  crmSalePriceDetailUpdate,
-} from "@/api/salePriceSheet/salePriceSheet"; //销售价格单
-
-import {
-  crmStdCostPriceSheetSave,
-  crmStdCostPriceSheetRead,
-  crmStdCostPriceSheetUpdate,
-  crmStdCostPriceDetailRead,
-  crmStdCostPriceDetailIndex,
-  crmStdCostPriceDetailAdd,
-  crmStdCostPriceDetailUpdate,
-} from "@/api/stdCostPriceSheet/stdCostPriceSheet"; //标准成本价格单
-
-import { crmOrgRead } from "@/api/org/org";
-//import {crmUomRead} from '@/api/uom/uom'
-//新增业务的创建、修改引入的两个json文件
-import data from "../../../../static/createField";
-import dataupdate from "../../../../static/updateField";
-import crmtypes from "../../../../static/crmTypes";
-
-import {
-  regexIsInt,
-  regexIsNumber,
-  regexIsCRMNumber,
-  regexIsCRMNumber2,
-  regexIsCRMNumber4,
-  regexIsCRMMoneyNumber,
-  regexIsCRMMobile,
-  regexIsCRMEmail,
-  regexIsCRMRate,
-  objDeepCopy,
-} from "@/utils";
-
-import { isArray } from "@/utils/types";
-
-import Lockr from "lockr";
-
-import {
-  XhInput,
-  XhTextarea,
-  XhSelect,
-  XhSwitch,
-  XhMultipleSelect,
-  XhDate,
-  XhDateTime,
-  XhUserCell,
-  XhStructureCell,
-  XhFiles,
-  CrmRelativeCell,
-  XhProuctCate,
-  XhProduct,
-  XhBusinessStatus,
-  XhCustomerAddress,
-  XhReceivablesPlan, // 回款计划期数
-} from "@/components/CreateCom";
-
-export default {
-  name: "CrmCreateView", // 所有新建效果的view
-  components: {
-    CreateView,
-    CreateSections,
-    XhInput,
-    XhTextarea,
-    XhSelect,
-    XhSwitch,
-    XhMultipleSelect,
-    XhDate,
-    XhDateTime,
-    XhUserCell,
-    XhStructureCell,
-    XhFiles,
-    CrmRelativeCell,
-    XhProuctCate,
-    XhProduct,
-    XhBusinessStatus,
-    XhCustomerAddress,
-    XhReceivablesPlan,
-    DialogTable, //子表表格组件
-  },
-  filters: {
-    /** 根据type 找到组件 */
-    typeToComponentName(formType) {
-      // if (
-      //   formType == "text" ||
-      //   formType == "number" ||
-      //   formType == "floatnumber" ||
-      //   formType == "mobile" ||
-      //   formType == "email"
-      // ) 
-      
-      if(formType == "text" || 
-         formType== "int" || 
-         formType == "number" ||
-         formType == "number2" || 
-         formType == "number4" ||  
-         formType == "moneynumber" || 
-         formType == "mobile" ||  
-         formType == "email" ||
-         formType == "rate" )
-      {
-        return "XhInput";
-      } else if (formType == "textarea") {
-        return "XhTextarea";
-      } else if (formType == "select" || formType == "business_status") {
-        return "XhSelect";
-      } else if (formType == "switch") {
-        return "XhSwitch";
-      } else if (formType == "checkbox") {
-        return "XhMultipleSelect";
-      } else if (formType == "date") {
-        return "XhDate";
-      } else if (formType == "datetime") {
-        return "XhDateTime";
-      } else if (formType == "user") {
-        return "XhUserCell";
-      } else if (formType == "structure") {
-        return "XhStructureCell";
-      } else if (formType == "file") {
-        return "XhFiles";
-      } else if (
-        //add-fdw-自定义弹出框
-        formType == "contacts" ||
-        formType == "customer" ||
-        formType == "contract" ||
-        formType == "business" ||
-        formType == "strategy" ||
-        formType == "rule" ||
-        formType == "route" ||
-        formType == "org" ||
-        formType == "slg" ||
-        formType == "item" ||
-        formType == "bom" ||
-        formType == "uom" ||
-        formType == "uomGroup" ||
-        formType == "verification" ||
-        formType == "stage" ||
-        formType == "area" ||
-        formType == "areaItem" ||
-        formType == "currency" ||
-        formType == "currencyExchange" ||
-        formType == "customerBom" ||
-        formType == "customerItem" ||
-        formType == "eqptType" ||
-        formType == "eqptTypeItem" ||
-        formType == "itemTransTypeInventoryRoute" ||
-        formType == "itemTransTypeOpStrategy" ||
-        formType == "loc" ||
-        formType == "machine" ||
-        formType == "param" ||
-        formType == "port" ||
-        formType == "prodLine" ||
-        formType == "prodLineItem" ||
-        formType == "project" ||
-        formType == "shift" ||
-        formType == "slg" ||
-        formType == "supplier" ||
-        formType == "supplierItem" ||
-        formType == "team" ||
-        formType == "uomConversion" ||
-        formType == "wlg" ||
-        formType == "wlgItem" ||
-        formType == "workCalendar" ||
-        formType == "workCenter" ||
-        formType == "inventoryRoute" ||
-        formType == "purchaseUomConversion" ||
-        formType == "stockUomConversion" ||
-        formType == "productionUomConversion" ||
-        formType == "sellUomConversion" ||
-        formType == "allocation"
-      ) {
-        return "CrmRelativeCell";
-      } else if (formType == "category") {
-        // 产品类别
-        return "XhProuctCate";
-      } else if (formType == "business_type") {
-        // 商机类别
-        return "XhBusinessStatus";
-      } else if (formType == "product") {
-        return "XhProduct";
-      } else if (formType == "map_address") {
-        return "XhCustomerAddress";
-      } else if (formType == "receivables_plan") {
-        return "XhReceivablesPlan";
-      }
-    },
-  },
-  props: {
-    // CRM类型
-    crmType: {
-      type: String,
-      default: "",
-    },
-    action: {
-      type: Object,//updata:更新 create:新建 detail:详细信息
-      default: () => {
-        return {
-          type: "save",
-          id: "",
-          subid: "",
-          data: {}, // 编辑所需信息
-        };
-      },
-    },
-    width: {
-      type: String,
-      default: "700px",
-    },
-    formTitle:''
-  },
-  data() {
-    return {
-      // 标题展示名称
-      title: "",
-      loading: false,
-      saveAndCreate: false, // 保存并新建
-      // 自定义字段验证规则
-      crmRules: {},
-      // 自定义字段信息表单
-      crmForm: {
-        crmFields: [],
-      },
-      // 审批信息
-      examineInfo: {},
-      formLabelWidth: "80px",
-      limitNum: 1,
-      dialogImageUrl: "",
-      //表单信息
-      crmData: {},
-      //子表信息
-      subtableData: [],
-      crmTypes:{},
-      saveDisabled:false
-    };
-  },
-  computed: {
-    
-  },
-  watch: {
-    crmType: function (value) {
-      this.title = this.getTitle();
-      this.crmRules = {};
-      this.crmForm = {
-        crmFields: [],
-      };
-      this.examineInfo = {};
-      this.getField();
-    },
-  },
-  mounted() {
-    // 获取title展示名称
-    document.body.appendChild(this.$el);
-    this.crmTypes=crmtypes;
-    if(this.action.type == "detail")
-    {
-      this.saveDisabled=true;
-    }
-    else {
-      this.saveDisabled=false;
-    }
-    this.title = this.getTitle();
-    this.getField();
-
-    // 注册子表组件传来的数据方法
-    this.$bus.$on("updateData", (content) => {
-      this.subtableData = content;
-      console.log(JSON.stringify(this.subtableData));
-    });
-  },
-  destroyed() {
-    // remove DOM node after destroy
-    if (this.$el && this.$el.parentNode) {
-      this.$el.parentNode.removeChild(this.$el);
-    }
-    this.crmData = {};
-    // this.bus.$off('updateData',(content)=>{
-    // });
-  },
-  methods: {
-    // 审批信息值更新
-    examineValueChange(data) {
-      this.examineInfo = data;
-    },
-    // 字段的值更新
-    fieldValueChange(data) {
-      var item = this.crmForm.crmFields[data.index];
-      item.value = data.value;
-
-      // 无事件的处理 后期可换成input实现
-      if (
-        item.data.formType == "user" ||
-        item.data.formType == "structure" ||
-        item.data.formType == "file" ||
-        item.data.formType == "category" ||
-        item.data.formType == "customer" ||
-        item.data.formType == "business" ||
-        item.data.formType == "contract" ||
-        item.data.formType == "strategy" ||
-        item.data.formType == "rule" ||
-        item.data.formType == "org" ||
-        item.data.formType == "slg" ||
-        item.data.formType == "item" ||
-        item.data.formType == "bom" ||
-        item.data.formType == "uom" ||
-        item.data.formType == "uomGroup" ||
-        item.data.formType == "verification" ||
-        item.data.formType == "stage" ||
-        item.data.formType == "area" ||
-        item.data.formType == "areaItem" ||
-        item.data.formType == "currency" ||
-        item.data.formType == "currencyExchange" ||
-        item.data.formType == "customerBom" ||
-        item.data.formType == "customerItem" ||
-        item.data.formType == "eqptType" ||
-        item.data.formType == "eqptTypeItem" ||
-        item.data.formType == "itemTransTypeInventoryRoute" ||
-        item.data.formType == "itemTransTypeOpStrategy" ||
-        item.data.formType == "loc" ||
-        item.data.formType == "machine" ||
-        item.data.formType == "param" ||
-        item.data.formType == "port" ||
-        item.data.formType == "prodLine" ||
-        item.data.formType == "prodLineItem" ||
-        item.data.formType == "project" ||
-        item.data.formType == "shift" ||
-        item.data.formType == "slg" ||
-        item.data.formType == "supplier" ||
-        item.data.formType == "supplierItem" ||
-        item.data.formType == "team" ||
-        item.data.formType == "uomConversion" ||
-        item.data.formType == "wlg" ||
-        item.data.formType == "wlgItem" ||
-        item.data.formType == "workCalendar" ||
-        item.data.formType == "workCenter"|| 
-        item.data.formType == "route"
-      ) {
-        this.$refs.crmForm.validateField("crmFields." + data.index + ".value");
-      }
-    },
-
-    getField() {
-      this.loading = true;
-       // 进行编辑操作
-      if (this.action.type == "update" || this.action.type == "detail") {
-        this.getUpdateField();
-      } else {
-        console.log("----- 添加 -----");
-        const filedList = data[this.crmType].data;
-        this.getcrmRulesAndModel(filedList);
-      }
-      this.loading = false;
-    },
-
-    getUpdateField() {
-      this.loading = true;
-      const filedListEdit = dataupdate[this.crmType].data;
-      // 获取自定义字段的更新时间
-      var params = {
-        label: crmTypeModel[this.crmType],
-      };
-
-      params.id = this.action.id;
-      params.subid = this.action.subid; //子表Id
-
-      //1.查询要编辑表的详细信息
-      let crmRequest = this.getReadRequest();
-      crmRequest(params.id, params.subid)
-        .then((res) => {
-          this.crmData = res;
-          console.log(JSON.stringify(res));
-          //2.遍历UpdateJson中的属性
-          filedListEdit.map((item) => {
-            //3.遍历从接口获取的返回值‘res’的属性
-            Object.keys(res).forEach((key) => {
-              if (key == item.fieldName) {
-                //3.1如果字段的值来自关联表
-                if (key.endsWith("ID") && item.formType != "text") {
-                  //3.1.1获取关联表的请求
-                  let relationReadRequest = this.getReadRequest(item.formType);
-                  if (
-                    relationReadRequest == undefined ||
-                    relationReadRequest == ""
-                  ) {
-                    console.log(
-                      "------ update没有找到 " +
-                        item.formType +
-                        " 的 crmXXXXRead -----"
-                    );
-                  } else {
-                    relationReadRequest(res[key]).then((resRelation) => {
-                      let _json = {};
-                      _json["Id"] = res[key];
-                      _json[key] = res[key];
-
-                      if (key === "OrgID") {
-                        _json["branchName"] = resRelation.name;
-                      }
-                      else
-                      { 
-                        _json["Code"] = resRelation.Code;
-                        _json["Name"] = resRelation.Name;
-                      }
-                  
-                      var _array = [_json];
-                      item.value = _array;
-                    }) .catch((error) => {
-                      this.loading = false;
-                    });;
-                  }
-                }
-                //3.2 直接
-                else {
-                  item.value = res[key];
-                }
-              }
-              this.loading = false;
-            });
-          });
-          //4.根据filedListEdit渲染界面
-          setTimeout((item) => {
-            this.getcrmRulesAndModel(filedListEdit);
-          }, 500);
-        })
-        .catch(() => {
-          this.loading = false;
-        });
-    },
-
-    // 根据自定义字段获取自定义字段规则及Model
-    getcrmRulesAndModel(list) {
-      console.log("----- 根据自定义字段获取自定义字段规则 -----");
-      let showStyleIndex = -1;
-      for (let index = 0; index < list.length; index++) {
-        const item = list[index];
-        showStyleIndex += 1;
-
-        //规则
-        this.crmRules[item.fieldName] = this.getItemRulesArrayFromItem(item);
-        // let otherRules=this.getOtherRulesArrayFromItem(item,this.crmForm.crmFields);
-        var params = {};
-        if (this.action.type == "update") //编辑
-        {
-          params["value"] = item.value; //  
-          params["disabled"]=item.disabled ||false; //控件是否可用
-        } else if(this.action.type == "detail") //详细信息
-        {
-          params["value"] = item.value;
-          params["disabled"]=true; //控件不可用
-        }
-        else //新增
-         {
-          //赋初始值
-          if (item.formType === "text") {
-            params["value"] = item.defaultValue || "";
-           } else if(item.formType === "int" || 
-            item.formType === "number"  || 
-            item.formType === "number2" || 
-            item.formType === "number4" || 
-            item.formType === "moneynumber" || 
-            item.formType === "rate")
-          {
-            //params["value"] =item.isNull===1? 0:null; 
-            params["value"] =0; 
-          } else if (item.formType === "switch") {
-            params["value"] = true;
-          } else if (item.formType === "datetime") {
-            //params["value"] =item.isNull===1? this.getNowDate():null; 
-            params["value"] =this.getNowDate()
-          }else {
-            params["value"] = item.defaultValue;
-          }
-          params["disabled"]=false; //新增控件可用
-        }
-        params["key"] = item.fieldName;
-        params["data"] = item;
-        params["styleIndex"] = showStyleIndex;
-        this.crmForm.crmFields.push(params);
-      }
-    },
-
-    // 保存数据
-    saveField(saveAndCreate, isDraft = false) {
-      console.log("-------- 保存 --------");
-      this.saveAndCreate = saveAndCreate;
-      this.$refs.crmForm.validate((valid) => {
-        if (valid) {
-          //其他校验
-          var otherValid=this.getCrmFormOtherValidate()
-          if(otherValid)
-          {
-            var params = this.getSubmiteParams(this.crmForm.crmFields);
-            //获取其他参数
-            this.getOtherParams(params);
-           
-            console.log("params" + JSON.stringify(params));
-            this.submiteParams(params);
-          }
-        } else {
-          this.$message.error('表单校验未通过,请查看表单信息');
-          return false;
-        }
-      });
-    }, 
-    //获取其他校验规则
-    getCrmFormOtherValidate()
-    {
-      if(this.crmType==='strategyRules' ||
-         this.crmType==='uom' ||
-         this.crmType==='uomConversion'  
-      )
-      {
-        var EffectiveTimeValue= this.crmForm.crmFields.find(item=>{return item.key==='EffectiveTime'}).value;
-        var ExpireTimeValue= this.crmForm.crmFields.find(item=>{return item.key==='ExpireTime'}).value;
-
-         if(EffectiveTimeValue >= ExpireTimeValue){
-            this.$message.error('生效时间不能大于等于失效时间');
-            return false;
-         } 
-      }
-      else if( 
-              this.crmType==='project' ||
-              this.crmType==='workCalendar' ||
-              this.crmType==='shift' ||
-              this.crmType==='interfaceCalendar' ||
-              this.crmType==='purchasePriceDetail' ||
-              this.crmType == "salePriceDetail" ||
-              this.crmType == "stdCostPriceDetail"   )
-      {
-        var BeginTimeValue= this.crmForm.crmFields.find(item=>{return item.key==='BeginTime'}).value;
-        var EndTimeValue= this.crmForm.crmFields.find(item=>{return item.key==='EndTime'}).value;
-
-         if(BeginTimeValue >= EndTimeValue){
-            this.$message.error('开始时间不能大于等于结束时间');
-            return false;
-         } 
-      }
-      else if(this.crmType==='customerBom' ||  this.crmType==='bom' )
-      {
-         var ParentItemCodeValue= this.crmForm.crmFields.find(item=>{return item.key==='ParentItemID'}).value;
-         var ChildItemCodeValue= this.crmForm.crmFields.find(item=>{return item.key==='ChildItemID'}).value;
-           if(ParentItemCodeValue!=null && ChildItemCodeValue!=null &&   ParentItemCodeValue[0].Id === ChildItemCodeValue[0].Id){
-            this.$message.error('主物品不能等于子物品');
-            return false;
-         } 
-
-        var failureTime='FailureTime';
-        if(this.crmType==='bom' )
-        {
-          failureTime='ExpireTime'
-        }
-         var EffectiveTimeValue= this.crmForm.crmFields.find(item=>{return item.key==='EffectiveTime'}).value;
-         var FailureTimeValue= this.crmForm.crmFields.find(item=>{return item.key===failureTime}).value;
-
-         if(EffectiveTimeValue >= FailureTimeValue){
-            this.$message.error('生效时间不能大于等于失效时间');
-            return false;
-         } 
-
-      }
-      return true;    
-    },
-
-    /* 提交 */
-    submiteParams(params) {
-      this.loading = true;
-      if (this.action.type == "update") {
-        this.submiteUpdateRequest(params);
-      }
-      //新增
-      else {
-        this.submiteAddRequest(params);
-      }
-    },
-
-    submiteAddRequest(params) {
-      let crmRequest = this.getSubmiteRequest();
-      console.log("ID:" +this.action.id);
-      //子主表保存的参数类型是数组
-      if (
-        this.crmType == "dictssub" ||
-        this.crmType == "stdCostPriceDetail" ||
-        this.crmType == "inventoryRouteDetail" ||
-        this.crmType == "purchasePriceDetail" ||
-        this.crmType == "routeDetail" ||
-        this.crmType == "salePriceDetail"
-      ) {
-        let newParams = [];
-        newParams.push(params);
-        crmRequest(this.action.id, newParams)
-          .then((res) => {
-            this.submiteParamsCallBack(res);
-          })
-          .catch((error) => {
-            this.loading = false;
-            // this.$message.error(error.message); 系统已经默认弹出提示
-            console.log(error.details);
-          });
-      } //其他表保存的参数类型是单独Dto
-      else {
-        crmRequest(params)
-          .then((res) => {
-            this.submiteParamsCallBack(res);
-          })
-          .catch((err) => {
-            //唯一索引重复
-            if(err.message==='An error occurred while updating the entries. See the inner exception for details.')
-            {
-              //SqlException 返回的异常消息 ,包括唯一索引重复
-              if(err.details.indexOf('SqlException: '))
-              {
-                let beginindex= err.details.indexOf('SqlException: ')
-                let endindex= err.details.indexOf('语句已终止。')
-                //语句已终止。
-                let message=  err.details.substring(beginindex, endindex);
-                this.$message.error(message);
-              }
-              
-            }
-            else
-            {
-              //this.$message.error(err.message); 系统已经默认弹出提示
-            }
-            console.log(err.details);
-            this.loading = false;
-          });
-      }
-    },
-
-    submiteUpdateRequest(params) {
-      console.log("ID:" +this.action.id);
-      console.log("ID:" +params);
-
-      let crmRequest = this.getSubmiteUpdateRequest();
-      if (
-        this.crmType == "dictssub" ||
-        this.crmType == "stdCostPriceDetail" ||
-        this.crmType == "inventoryRouteDetail" ||
-        this.crmType == "purchasePriceDetail" ||
-        this.crmType == "routeDetail" ||
-        this.crmType == "salePriceDetail"
-      ) {
-        let newParams = [];
-        newParams.push(params);
-        console.log("parentID:" +this.action.id);
-        crmRequest(this.action.id, newParams)
-          .then((res) => {
-            this.submiteParamsCallBack(res);
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      } else {
-        crmRequest(this.action.id, params)
-          .then((res) => {
-            this.submiteParamsCallBack(res);
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      }
-    },
-
-    submiteParamsCallBack(res) {
-      this.loading = false;
-      this.hidenView();
-      this.$message.success(
-        this.action.type == "update" ? "编辑成功" : "添加成功"
-      );
-      // 回到保存成功
-      this.$emit("save-success", {
-        type: this.crmType,
-        data: res.data || {},
-        saveAndCreate: this.saveAndCreate,
-      });
-    },
-
-    /**获取详情url**/
-    getReadRequest(crmTypes = this.crmType) {
-      console.log(
-        "----- 方法 : 获取详情url getReadRequest(crmTypes = " + crmTypes + ")"
-      );
-      if (crmTypes == "leads") {
-        return crmLeadsRead;
-      } else if (crmTypes == "dicts") {
-        return crmDictsRead;
-      } else if (crmTypes == "dictssub") {
-        return crmDictsItemDetailRead;
-      } else if (crmTypes == "transaction") {
-        return crmTransactionRead;
-      } else if (crmTypes == "strategy") {
-        return crmStrategyRead;
-      } else if (crmTypes == "rule") {
-        return crmRuleRead;
-      } else if (crmTypes == "strategyRules") {
-        return crmStrategyRulesRead;
-      } else if (crmTypes == "verification") {
-        return crmVerificationRead;
-      } else if (crmTypes == "stage") {
-        return crmStageRead;
-      } else if (crmTypes == "customer") {
-        return crmCustomerRead;
-      } else if (crmTypes == "slgItem") {
-        return crmSlgItemRead;
-      } else if (crmTypes == "bom") {
-        return crmBomRead;
-      } else if (crmTypes == "uomGroup") {
-        //add-fdw
-        return crmUomGroupRead;
-      } else if (crmTypes == "uom") {
-        //add-fdw
-        return crmUomRead;
-      } else if (crmTypes == "interfaceCalendar") {
-        return crmInterfaceCalendarRead;
-      } else if (crmTypes == "verificationStages") {
-        return crmVerificationStagesRead;
-      } else if (crmTypes == "area") {
-        // 区域
-        return crmAreaRead;
-      } else if (crmTypes == "areaItem") {
-        // 区域-物品
-        return crmAreaItemRead;
-      } else if (crmTypes == "currency") {
-        // 货币
-        return crmCurrencyRead;
-      } else if (crmTypes == "currencyExchange") {
-        // 货币换算
-        return crmCurrencyExchangeRead;
-      } else if (crmTypes == "customerBom") {
-        // 客户物品产品结构
-        return crmCustomerBomRead;
-      } else if (crmTypes == "customerItem") {
-        // 客户物品
-        return crmCustomerItemRead;
-      } else if (crmTypes == "eqptType") {
-        // 器具类型
-        return crmEqptTypeRead;
-      } else if (crmTypes == "eqptTypeItem") {
-        // 器具类型-物品
-        return crmEqptTypeItemRead;
-      } else if (crmTypes == "item") {
-        // 物品
-        return crmItemRead;
-      } else if (crmTypes == "itemTransTypeInventoryRoute") {
-        // 物品-事务类型-物流路线分配
-        return crmItemTransTypeInventoryRouteRead;
-      } else if (crmTypes == "itemTransTypeOpStrategy") {
-        // 物品-事务类型-工序-策略分配
-        return crmItemTransTypeOpStrategyRead;
-      } else if (crmTypes == "loc") {
-        // 库位
-        return crmLocRead;
-      } else if (crmTypes == "machine") {
-        // 机器
-        return crmMachineRead;
-      } else if (crmTypes == "param") {
-        // 参数
-        return crmParamRead;
-      } else if (crmTypes == "port") {
-        // 收货口
-        return crmPortRead;
-      } else if (crmTypes == "prodLine") {
-        // 生产线
-        return crmProdLineRead;
-      } else if (crmTypes == "prodLineItem") {
-        // 生产线-物品
-        return crmProdLineItemRead;
-      } else if (crmTypes == "project") {
-        // 项目
-        return crmProjectRead;
-      } else if (crmTypes == "shift") {
-        // 班次
-        return crmShiftRead;
-      } else if (crmTypes == "slg") {
-        // 库位组
-        return crmSlgRead;
-      } else if (crmTypes == "supplier") {
-        // 供应商
-        return crmSupplierRead;
-      } else if (crmTypes == "supplierItem") {
-        // 供应商物品
-        return crmSupplierItemRead;
-      } else if (crmTypes == "team") {
-        // 班组
-        return crmTeamRead;
-      } else if (crmTypes == "uomConversion") {
-        // 计量单位转换
-        return crmUomConversionRead;
-      } else if (crmTypes == "wlg") {
-        // 工作组
-        return crmWlgRead;
-      } else if (crmTypes == "wlgItem") {
-        // 工作组-物品
-        return crmWlgItemRead;
-      } else if (crmTypes == "workCalendar") {
-        // 工作日历
-        return crmWorkCalendarRead;
-      } else if (crmTypes == "workCenter") {
-        // 工作中心
-        return crmWorkCenterRead;
-      } else if (crmTypes == "inventoryRoute") {
-        // 物流路线
-        return crmInventoryRouteRead;
-      } else if (crmTypes == "inventoryRouteDetail") {
-        // 物流路线明细
-        return crmInventoryRouteDetailRead;
-      } else if (crmTypes == "purchasePriceDetail") {
-        // 采购价格单明细
-        return crmPurchasePriceDetailRead;
-      } else if (crmTypes == "purchasePriceSheet") {
-        // 采购价格单
-        return crmPurchasePriceSheetRead;
-      } else if (crmTypes == "route") {
-        // 工艺路线
-        return crmRouteRead;
-      } else if (crmTypes == "routeDetail") {
-        // 工艺路线明细
-        return crmRouteDetailRead;
-      } else if (crmTypes == "salePriceDetail") {
-        // 销售价格单明细
-        return crmSalePriceDetailRead;
-      } else if (crmTypes == "salePriceSheet") {
-        // 销售价格单
-        return crmSalePriceSheetRead;
-      } else if (crmTypes == "stdCostPriceDetail") {
-        // 标准成本价格明细
-        return crmStdCostPriceDetailRead;
-      } else if (crmTypes == "stdCostPriceSheet") {
-        // 标准成本价格单
-        return crmStdCostPriceSheetRead;
-      } else if (
-        crmTypes == "purchaseUomConversion" ||
-        crmTypes == "stockUomConversion" ||
-        crmTypes == "productionUomConversion" ||
-        crmTypes == "sellUomConversion"
-      ) {
-        // 采购计量单位转换等
-        return crmUomConversionRead;
-      }
-    },
-    /** 获取上传url */
-    getSubmiteUpdateRequest() {
-      if (this.crmType == "leads") {
-        return crmLeadsUpdate;
-      } else if (this.crmType == "dicts") {
-        return crmDictsUpdate;
-      } else if (this.crmType == "dictssub") {
-        return crmDictsItemUpdate;
-      } else if (this.crmType == "transaction") {
-        return crmTransactionUpdate;
-      } else if (this.crmType == "strategy") {
-        return crmStrategyUpdate;
-      } else if (this.crmType == "rule") {
-        return crmRuleUpdate;
-      } else if (this.crmType == "strategyRules") {
-        return crmStrategyRulesUpdate;
-      } else if (this.crmType == "verification") {
-        return crmVerificationUpdate;
-      } else if (this.crmType == "stage") {
-        return crmStageUpdate;
-      } else if (this.crmType == "customer") {
-        return crmCustomerUpdate;
-      } else if (this.crmType == "slgItem") {
-        return crmSlgItemUpdate;
-      } else if (this.crmType == "bom") {
-        return crmBomUpdate;
-      } else if (this.crmType == "uomGroup") {
-        //add-fdw
-        return crmUomGroupUpdate;
-      } else if (this.crmType == "uom") {
-        //add-fdw
-        return crmUomUpdate;
-      } else if (this.crmType == "interfaceCalendar") {
-        return crmInterfaceCalendarUpdate;
-      } else if (this.crmType == "verificationStages") {
-        return crmVerificationStagesUpdate;
-      } else if (this.crmType == "area") {
-        // 区域
-        return crmAreaUpdate;
-      } else if (this.crmType == "areaItem") {
-        // 区域-物品
-        return crmAreaItemUpdate;
-      } else if (this.crmType == "currency") {
-        // 货币
-        return crmCurrencyUpdate;
-      } else if (this.crmType == "currencyExchange") {
-        // 货币换算
-        return crmCurrencyExchangeUpdate;
-      } else if (this.crmType == "customerBom") {
-        // 客户物品产品结构
-        return crmCustomerBomUpdate;
-      } else if (this.crmType == "customerItem") {
-        // 客户物品
-        return crmCustomerItemUpdate;
-      } else if (this.crmType == "eqptType") {
-        // 器具类型
-        return crmEqptTypeUpdate;
-      } else if (this.crmType == "eqptTypeItem") {
-        // 器具类型-物品
-        return crmEqptTypeItemUpdate;
-      } else if (this.crmType == "item") {
-        // 物品
-        return crmItemUpdate;
-      } else if (this.crmType == "itemTransTypeInventoryRoute") {
-        // 物品-事务类型-物流路线分配
-        return crmItemTransTypeInventoryRouteUpdate;
-      } else if (this.crmType == "itemTransTypeOpStrategy") {
-        // 物品-事务类型-工序-策略分配
-        return crmItemTransTypeOpStrategyUpdate;
-      } else if (this.crmType == "loc") {
-        // 库位
-        return crmLocUpdate;
-      } else if (this.crmType == "machine") {
-        // 机器
-        return crmMachineUpdate;
-      } else if (this.crmType == "param") {
-        // 参数
-        return crmParamUpdate;
-      } else if (this.crmType == "port") {
-        // 收货口
-        return crmPortUpdate;
-      } else if (this.crmType == "prodLine") {
-        // 生产线
-        return crmProdLineUpdate;
-      } else if (this.crmType == "prodLineItem") {
-        // 生产线-物品
-        return crmProdLineItemUpdate;
-      } else if (this.crmType == "project") {
-        // 项目
-        return crmProjectUpdate;
-      } else if (this.crmType == "shift") {
-        // 班次
-        return crmShiftUpdate;
-      } else if (this.crmType == "slg") {
-        // 库位组
-        return crmSlgUpdate;
-      } else if (this.crmType == "supplier") {
-        // 供应商
-        return crmSupplierUpdate;
-      } else if (this.crmType == "supplierItem") {
-        // 供应商物品
-        return crmSupplierItemUpdate;
-      } else if (this.crmType == "team") {
-        // 班组
-        return crmTeamUpdate;
-      } else if (this.crmType == "uomConversion") {
-        // 计量单位转换
-        return crmUomConversionUpdate;
-      } else if (this.crmType == "wlg") {
-        // 工作组
-        return crmWlgUpdate;
-      } else if (this.crmType == "wlgItem") {
-        // 工作组-物品
-        return crmWlgItemUpdate;
-      } else if (this.crmType == "workCalendar") {
-        // 工作日历
-        return crmWorkCalendarUpdate;
-      } else if (this.crmType == "workCenter") {
-        // 工作中心
-        return crmWorkCenterUpdate;
-      } else if (this.crmType == "inventoryRoute") {
-        // 物流路线
-        return crmInventoryRouteUpdate;
-      } else if (this.crmType == "inventoryRouteDetail") {
-        // 物流路线明细
-        return crmInventoryRouteDetailUpdate;
-      } else if (this.crmType == "purchasePriceDetail") {
-        // 采购价格单明细
-        return crmPurchasePriceDetailUpdate;
-      } else if (this.crmType == "purchasePriceSheet") {
-        // 采购价格单
-        return crmPurchasePriceSheetUpdate;
-      } else if (this.crmType == "route") {
-        // 工艺路线
-        return crmRouteUpdate;
-      } else if (this.crmType == "routeDetail") {
-        // 工艺路线明细
-        return crmRouteDetailUpdate;
-      } else if (this.crmType == "salePriceDetail") {
-        // 销售价格单明细
-        return crmSalePriceDetailUpdate;
-      } else if (this.crmType == "salePriceSheet") {
-        // 销售价格单
-        return crmSalePriceSheetUpdate;
-      } else if (this.crmType == "stdCostPriceDetail") {
-        // 标准成本价格明细
-        return crmStdCostPriceDetailUpdate;
-      } else if (this.crmType == "stdCostPriceSheet") {
-        // 标准成本价格单
-        return crmStdCostPriceSheetUpdate;
-      }
-    },
-    /** 获取创建方法 */
-    getSubmiteRequest() {
-      if (this.crmType == "leads") {
-        return crmLeadsSave;
-      } else if (this.crmType == "dicts") {
-        return crmDictsSave;
-      } else if (this.crmType == "dictssub") {
-        return crmDictsItemAdd;
-      } else if (this.crmType == "transaction") {
-        return crmTransactionSave;
-      } else if (this.crmType == "strategy") {
-        return crmStrategySave;
-      } else if (this.crmType == "rule") {
-        return crmRuleSave;
-      } else if (this.crmType == "strategyRules") {
-        return crmStrategyRulesSave;
-      } else if (this.crmType == "verification") {
-        return crmVerificationSave;
-      } else if (this.crmType == "stage") {
-        return crmStageSave;
-      } else if (this.crmType == "customer") {
-        return crmCustomerSave;
-      } else if (this.crmType == "slgItem") {
-        return crmSlgItemSave;
-      } else if (this.crmType == "bom") {
-        //add-引入bom
-        return crmBomSave;
-      } else if (this.crmType == "uomGroup") {
-        //add-引入uomgroup
-        return crmUomGroupSave;
-      } else if (this.crmType == "uom") {
-        //add-引入uomgroup
-        return crmUomSave;
-      } else if (this.crmType == "interfaceCalendar") {
-        return crmInterfaceCalendarSave;
-      } else if (this.crmType == "verificationStages") {
-        return crmVerificationStagesSave;
-      } else if (this.crmType == "area") {
-        // 区域
-        return crmAreaSave;
-      } else if (this.crmType == "areaItem") {
-        // 区域-物品
-        return crmAreaItemSave;
-      } else if (this.crmType == "currency") {
-        // 货币
-        return crmCurrencySave;
-      } else if (this.crmType == "currencyExchange") {
-        // 货币换算
-        return crmCurrencyExchangeSave;
-      } else if (this.crmType == "customerBom") {
-        // 客户物品产品结构
-        return crmCustomerBomSave;
-      } else if (this.crmType == "customerItem") {
-        // 客户物品
-        return crmCustomerItemSave;
-      } else if (this.crmType == "eqptType") {
-        // 器具类型
-        return crmEqptTypeSave;
-      } else if (this.crmType == "eqptTypeItem") {
-        // 器具类型-物品
-        return crmEqptTypeItemSave;
-      } else if (this.crmType == "item") {
-        // 物品
-        return crmItemSave;
-      } else if (this.crmType == "itemTransTypeInventoryRoute") {
-        // 物品-事务类型-物流路线分配
-        return crmItemTransTypeInventoryRouteSave;
-      } else if (this.crmType == "itemTransTypeOpStrategy") {
-        // 物品-事务类型-工序-策略分配
-        return crmItemTransTypeOpStrategySave;
-      } else if (this.crmType == "loc") {
-        // 库位
-        return crmLocSave;
-      } else if (this.crmType == "machine") {
-        // 机器
-        return crmMachineSave;
-      } else if (this.crmType == "param") {
-        // 参数
-        return crmParamSave;
-      } else if (this.crmType == "port") {
-        // 收货口
-        return crmPortSave;
-      } else if (this.crmType == "prodLine") {
-        // 生产线
-        return crmProdLineSave;
-      } else if (this.crmType == "prodLineItem") {
-        // 生产线-物品
-        return crmProdLineItemSave;
-      } else if (this.crmType == "project") {
-        // 项目
-        return crmProjectSave;
-      } else if (this.crmType == "shift") {
-        // 班次
-        return crmShiftSave;
-      } else if (this.crmType == "slg") {
-        // 库位组
-        return crmSlgSave;
-      } else if (this.crmType == "supplier") {
-        // 供应商
-        return crmSupplierSave;
-      } else if (this.crmType == "supplierItem") {
-        // 供应商物品
-        return crmSupplierItemSave;
-      } else if (this.crmType == "team") {
-        // 班组
-        return crmTeamSave;
-      } else if (this.crmType == "uomConversion") {
-        // 计量单位转换
-        return crmUomConversionSave;
-      } else if (this.crmType == "wlg") {
-        // 工作组
-        return crmWlgSave;
-      } else if (this.crmType == "wlgItem") {
-        // 工作组-物品
-        return crmWlgItemSave;
-      } else if (this.crmType == "workCalendar") {
-        // 工作日历
-        return crmWorkCalendarSave;
-      } else if (this.crmType == "workCenter") {
-        // 工作中心
-        return crmWorkCenterSave;
-      } else if (this.crmType == "inventoryRoute") {
-        // 物流路线
-        return crmInventoryRouteSave;
-      } else if (this.crmType == "inventoryRouteDetail") {
-        // 物流路线明细
-        return crmInventoryRouteDetailAdd;
-      } else if (this.crmType == "purchasePriceSheet") {
-        // 采购价格单
-        return crmPurchasePriceSheetSave;
-      } else if (this.crmType == "purchasePriceDetail") {
-        // 采购价格单明细
-        return crmPurchasePriceDetailAdd;
-      } else if (this.crmType == "route") {
-        // 工艺路线
-        return crmRouteSave;
-      } else if (this.crmType == "routeDetail") {
-        // 工艺路线明细
-        return crmRouteDetailAdd;
-      } else if (this.crmType == "salePriceSheet") {
-        // 销售价格单
-        return crmSalePriceSheetSave;
-      } else if (this.crmType == "salePriceDetail") {
-        // 销售价格单明细
-        return crmSalePriceDetailAdd;
-      } else if (this.crmType == "stdCostPriceSheet") {
-        // 标准成本价格单
-        return crmStdCostPriceSheetSave;
-      } else if (this.crmType == "stdCostPriceDetail") {
-        // 标准成本价格明细
-        return crmStdCostPriceDetailAdd;
-      }
-    },
-    /** 拼接上传传输 */
-    getSubmiteParams(array) {
-      console.log(array)
-      var params = { entity: {}, field: [] };
-      for (let index = 0; index < array.length; index++) {
-        const element = array[index];
-
-        if (element.data.fieldType == 1) {
-          params.entity[element.key] = this.getRealParams(element);
-          //params.entity[element.key] = this.getRealParams(element) || ''
-        } else {
-          //枚举列表的fieldType==0
-          element.data.value = this.getRealParams(element);
-          params.field.push(element.data);
-        }
-      }
-      return params.entity;
-    },
-    /** 获取其他参数 nxt */
-    getOtherParams(params) {
-      console.log("this.crmType : " + this.crmType);
-      //新增
-      if (this.action.type != "update") {
-        // if (this.crmType == "dicts") {
-        //   params["DictionaryItems"] = this.subtableData;
-        // } else 
-        //增加组织ID参数
-        if (
-          this.crmType === "area" ||
-          this.crmType === "team" ||
-          this.crmType === "port" ||
-          this.crmType === "project" ||
-          this.crmType === "wlg" ||
-          this.crmType === "param" ||
-          this.crmType === "stdCostPriceSheet" ||
-          this.crmType === "inventoryRoute" ||
-          this.crmType === "purchasePriceSheet" ||
-          this.crmType === "route" ||
-          this.crmType === "salePriceSheet" ||
-          this.crmType === "stdCostPriceDetail" ||
-          this.crmType === "inventoryRouteDetail" ||
-          this.crmType === "purchasePriceDetail" ||
-          this.crmType === "routeDetail" ||
-          this.crmType === "salePriceDetail" ||
-          this.crmType == "areaItem" ||
-          this.crmType == "customer" ||
-          this.crmType == "customerBom" ||
-          this.crmType == "customerItem" ||
-          this.crmType == "eqptTypeItem" ||
-          this.crmType == "item" ||
-          this.crmType == "itemTransTypeInventoryRoute" ||
-          this.crmType == "itemTransTypeOpStrategy" ||
-          this.crmType == "loc" ||
-          this.crmType == "machine" ||
-          this.crmType == "prodLineItem" ||
-          this.crmType == "slg" ||
-          this.crmType == "supplier" ||
-          this.crmType == "supplierItem" ||
-          this.crmType == "wlgItem" ||
-          this.crmType == "workCenter" ||
-          this.crmType == "bom" ||
-          this.crmType == "prodLine" ||
-          this.crmType == "slgItem"||
-          this.crmType == "interfaceCalendar"||
-          this.crmType == "workCalendar"||
-          this.crmType == "shift"
-        ) {
-          //获取当前登录用户的组织ID
-          console.log('Lockr.get("currentorgID")' + Lockr.get("currentorgID"));
-          params["OrgID"] = Lockr.get("currentorgID");
-
-        }
-      } //修改
-      else {
-        params["Id"] = this.action.subid;
-        //子表修改时要有Id
-
-        if (this.crmType == "dictssub") {
-          params["ItemName"] = this.crmData["ItemName"];
-        } else if (this.crmType === "inventoryRouteDetail") {
-          params["AreaID"] = this.crmData["AreaID"];
-          params["TaskType"] = this.crmData["TaskType"];
-        } else if (this.crmType === "purchasePriceDetail") {
-          params["ItemID"] = this.crmData["ItemID"];
-          params["BeginTime"] = this.crmData["BeginTime"];
-        } else if (this.crmType === "stdCostPriceDetail") {
-          params["ItemID"] = this.crmData["ItemID"];
-          params["BeginTime"] = this.crmData["BeginTime"];
-        } else if (this.crmType === "routeDetail") {
-          params["ItemID"] = this.crmData["ItemID"];
-          params["OperateProcess"] = this.crmData["OperateProcess"];
-        } else if (this.crmType === "salePriceDetail") {
-          params["ItemID"] = this.crmData["ItemID"];
-          params["BeginTime"] = this.crmData["BeginTime"];
-        }
-      }
-    },
-
-    // 获取控件值
-    getRealParams(element) {
-      if (element.key == "OrgID") {
-        return Lockr.get("currentorgID");
-      }
-      //关联表
-      else if (element.key.endsWith("ID") && element.data.formType !== "text") {
-        if (element.value && element.value.length) {
-          return element.value[0].Id;
-        } else {
-          return null;
-        }
-      } else if (element.data.formType == "select") {
-        //element.data.value的值应该从element.data.Setting中取
-        if (element.value == "是") {
-          element.value = true;
-        } else if (element.value == "否") {
-          element.value = false;
-        }
-      } else if (element.data.formType == "switch") {
-        //如果不设置defaultValue element.value为""
-        if (element.value == true || element.value === "" || element.value === null) {
-          element.value = true;
-        } else if (element.value == false) {
-          element.value = false;
-        }
-      } else if(element.data.formType == "int" || element.data.formType == "number" || element.data.formType == "number2" || 
-                element.data.formType == "number4" || element.data.formType == "moneynumber" || 
-                element.data.formType == "mobile" || element.data.formType == "email" || element.data.formType == "rate" )
-      {
-        if(element.value === "" || element.value === null )     
-        {
-          element.value =0;
-          //element.value =element.data.isNull===1? 0:null;
-        }
-      }else if(element.data.formType == "datetime")
-      {
-        if(element.value === "" || element.value === null)     
-        {
-          element.value = this.getNowDate();
-        }
-      }
-      return element.value;
-    },
-    hidenView() {
-      this.$emit("hiden-view");
-    },
-    // 根据类型获取标题展示名称
-    getTitle() {
-      let type=this.crmTypes[this.crmType];
-      if(type===undefined)
-      { 
-        return ''
-      }
-      else
-      {
-        let name= type.name
-        if(this.action.type == "create" || this.action.type == "save")
-        {
-          return '新增'+name;
-        }
-        else if(this.action.type == "update")
-        {
-          return '编辑'+name;
-
-        }
-        else if(this.action.type == "detail")
-        {
-          return name+'详细信息';
-        }   
-      }   
-    },
-    // 获取左边padding
-    getPaddingLeft(item, index) {
-      if (item.showblock && item.showblock == true) {
-        return "0";
-      }
-      return item.styleIndex % 2 == 0 ? "0" : "25px";
-    },
-    // 获取左边padding
-    getPaddingRight(item, index) {
-      if (item.showblock && item.showblock == true) {
-        return "0";
-      }
-      return item.styleIndex % 2 == 0 ? "25px" : "0";
-    },
-    // 上传之前的格式设置
-    beforeAvatarUpload(file) {
-      const isJPG =
-        file.type === "image/png" ||
-        file.type === "image/gif" ||
-        file.type === "image/jpg" ||
-        file.type === "image/jpeg";
-      const isLt2M = file.size / 1024 / 1024 < 2;
-      if (!isJPG) {
-        this.$message.error("上传头像图片只能是 JPG,PNG,GIF,JPEG 格式!");
-      }
-      if (!isLt2M) {
-        this.$message.error("上传头像图片大小不能超过 2MB!");
-      }
-      this.multfileImg = file;
-      return isJPG && isLt2M;
-    },
-    httpRequest(data) {
-      let _this = this;
-      let rd = new FileReader(); // 创建文件读取对象
-      let file = data.file;
-      rd.readAsDataURL(file); // 文件读取装换为base64类型
-      rd.onloadend = function (e) {
-        _this.dialogImageUrl = this.result; // this指向当前方法onloadend的作用域
-      };
-    },
-    // 上传文件个数超过定义的数量
-    handleExceed(files, fileList) {
-      //this.$message.warning(`当前限制选择 1 个文件`)
-    },
-
-    getNowDate() {
-      var nowDate = new Date();
-      var date = {
-        year: nowDate.getFullYear(),
-        month: nowDate.getMonth() + 1,
-        day: nowDate.getDate()
-        // hour: nowDate.getHours(),
-        // minute: nowDate.getMinutes(),
-        // second: nowDate.getSeconds(),
-      };
-
-      var year = date.year;
-      var month = date.month >= 10 ? date.month : "0" + date.month;
-      var date = date.day >= 10 ? date.day : "0" + date.day;
-      // var hour = date.hour >=10 ? date.hour: '0' +date.hour;
-      // var minute = date.minute >=10 ? date.minute: '0' +date.minute;
-      // var second = date.second >=10 ? date.second: '0' +date.second;
-
-      // var systemDate =date.year + "-" + month + "-" + date +' ' + hour + ':' + minute + ':' + second;
-
-      var systemDate = year + "-" + month + "-" + date + " 00:00:00";
-      return systemDate;
-    },
-
-    //2021年1月15日前代码
-    // 获取自定义字段
-    getField_Old() {
-      console.log("");
-      console.log("");
-      this.loading = true;
-      console.log("----- 获取自定义字段 data -----");
-      console.log(data);
-      console.log("this.crmType : " + this.crmType);
-      const filedList = data[this.crmType].data;
-      console.log("----- filedList -----");
-      console.log(filedList);
-      const filedListEdit = dataupdate[this.crmType].data;
-
-      // 获取自定义字段的更新时间
-      var params = {
-        label: crmTypeModel[this.crmType],
-      };
-      // 进行编辑操作
-      if (this.action.type == "update") {
-        console.log("----- 进行编辑操作 -----");
-        console.log("this.action.type : " + this.action.type);
-        params.id = this.action.id;
-        params.subid = this.action.subid;
-        let crmRequest = this.getReadRequest();
-        console.log(crmRequest);
-        crmRequest(params.id, params.subid)
-          .then((res) => {
-            console.log("----- 循环字段开始 -----");
-            filedListEdit.map((item) => {
-              //获取JSON的KEY和value
-              Object.keys(res).forEach((key) => {
-                if (
-                  key == item.fieldName &&
-                  key.includes("ID") &&
-                  item.formType != "text"
-                ) {
-                  console.log("----- 字段特殊判断 : 显示字段不是Name的 -----");
-                  // 字段特殊判断
-                  // if(item.formType == 'item'){
-                  //   console.log('----- 字段特殊处理 : item-----')
-                  //   crmItemRead(res[key]).then(resinner => {
-                  //     let _json = {};
-                  //     _json["Name"] = resinner.Code;
-                  //     _json['Id'] = res[key]
-                  //     var _array = [_json]
-                  //     item.value = _array
-                  //   })
-                  // } else {
-                  console.log("----- 准备获取对应列表接口 -----");
-                  let ReadRequest = this.getReadRequest(item.formType);
-                  console.log(ReadRequest);
-                  if (ReadRequest == undefined || ReadRequest == "") {
-                    console.log(
-                      "------ 没有找到 " +
-                        item.formType +
-                        " 的 crmXXXXRead -----"
-                    );
-                  } else {
-                    ReadRequest(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                  //}
-                } else if (
-                  key !== "OrgID" &&
-                  key !== "ItemID" &&
-                  key !== "SlgID" &&
-                  key !== "UomID" &&
-                  key !== "UomGroupID" &&
-                  key !== "BasicUomID" &&
-                  key !== "PurchaseUomConversionID" &&
-                  key !== "StockUomConversionID" &&
-                  key !== "ProductionUomConversionID" &&
-                  key !== "SellUomConversionID" &&
-                  key !== "ProjectID" &&
-                  key !== "InventoryRouteID" &&
-                  key !== "AllocationID"
-                ) {
-                  if (key == item.fieldName) {
-                    item.value = res[key];
-                    //  if(item.value==true){
-                    //    item.value='是'
-                    //  }else if(item.value==false){
-                    //    item.value='否'
-                    //  }
-                  }
-                } else if (key === "OrgID") {
-                  if (key == item.fieldName) {
-                    crmOrgRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["branchName"] = resinner.name;
-                      _json[key] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "ItemID") {
-                  if (key == item.fieldName) {
-                    console.log("ItemID" + res[key]);
-                    crmItemRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "SlgID") {
-                  if (key == item.fieldName) {
-                    console.log("SlgID" + res[key]);
-                    crmSlgRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "UomID") {
-                  if (key == item.fieldName) {
-                    console.log("UomID" + res[key]);
-                    crmUomRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "UomGroupID") {
-                  if (key == item.fieldName) {
-                    console.log("UomGroupID" + res[key]);
-                    crmUomGroupRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "BasicUomID") {
-                  if (key == item.fieldName) {
-                    console.log("BasicUomID" + res[key]);
-                    crmUomGroupRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "PurchaseUomConversionID") {
-                  if (key == item.fieldName) {
-                    crmUomConversionRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "StockUomConversionID") {
-                  if (key == item.fieldName) {
-                    crmUomConversionRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "ProductionUomConversionID") {
-                  if (key == item.fieldName) {
-                    crmUomConversionRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "SellUomConversionID") {
-                  if (key == item.fieldName) {
-                    crmUomConversionRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "ProjectID") {
-                  if (key == item.fieldName) {
-                    crmProjectRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "InventoryRouteID") {
-                  if (key == item.fieldName) {
-                    crmInventoryRouteRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "AllocationID") {
-                  if (key == item.fieldName) {
-                    crmInventoryRouteRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                }
-              });
-            });
-            console.log("----- 循环字段结束 -----");
-            this.loading = false;
-
-            setTimeout((item) => {
-              this.getcrmRulesAndModel(filedListEdit);
-            }, 500);
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      } else {
-        console.log("----- 添加 -----");
-        this.getcrmRulesAndModel(filedList);
-      }
-      this.loading = false;
-    },
-
-    getRealParams_Old(element) {
-      if (
-        element.key == "customer_id" ||
-        element.key == "contacts_id" ||
-        element.key == "business_id" ||
-        element.key == "leads_id" ||
-        element.key == "contract_id"
-      ) {
-        if (element.value && element.value.length) {
-          const key = element.key.replace("_id", "Id");
-          return element.value[0][key];
-        } else {
-          return "";
-        }
-      } else if (element.key == "OrgID") {
-        return Lockr.get("currentorgID");
-        // if (element.value && element.value.length) {
-        //   //return element.value[0].OrgID
-        //   return Lockr.get("currentorgID")
-        // } else {
-        //   return ''
-        // }
-      } else if (
-        element.key == "UomID" ||
-        element.key == "SlgID" ||
-        element.key == "ItemID" ||
-        element.key == "RuleID" ||
-        element.key == "StrategyID" ||
-        element.key == "UomGroupID" ||
-        element.key == "BasicUomID" ||
-        element.key == "PurchaseUomConversionID" ||
-        element.key == "StockUomConversionID" ||
-        element.key == "ProductionUomConversionID" ||
-        element.key == "SellUomConversionID" ||
-        element.key == "ProjectID" ||
-        element.key == "InventoryRouteID" ||
-        element.key == "VerificationID" ||
-        element.key == "StageID" ||
-        element.key.includes("ID") ||
-        element.key.includes("Id")
-      ) {
-        if (element.value && element.value.length) {
-          return element.value[0].Id;
-        } else {
-          return "";
-        }
-      } else if (element.data.formType == "select") {
-        if (element.value == "是") {
-          element.value = true;
-        } else if (element.value == "否") {
-          element.value = false;
-        }
-      } else if (element.data.formType == "switch") {
-        //如果不设置defaultValue element.value为""
-        if (element.value === "" || element.value == true) {
-          element.value = true;
-        } else if (element.value == false) {
-          element.value = false;
-        }
-      } else if (
-        element.data.formType == "user" ||
-        element.data.formType == "structure"
-      ) {
-        return element.value
-          .map(function (item, index, array) {
-            return element.data.formType == "user" ? item.userId : item.id;
-          })
-          .join(",");
-      } else if (element.data.formType == "file") {
-        if (element.value && element.value.length > 0) {
-          return element.value[0].batchId;
-        }
-        return "";
-      } else if (element.key == "category_id") {
-        if (element.value && element.value.length > 0) {
-          return element.value[element.value.length - 1];
-        }
-        return "";
-      } else if (element.data.formType == "checkbox") {
-        if (element.value && element.value.length > 0) {
-          return element.value.join(",");
-        }
-        return "";
-      }
-      // //将bool转成string类型
-      // switch(element.value){
-      //   case true:
-      //     element.value = 'true'
-      //     break;
-      //   case false:
-      //     element.value = 'false'
-      //     break;
-      // }
-      return element.value;
-    },
-    // 根据自定义字段获取自定义字段规则
-    getcrmRulesAndModel_Old(list) {
-      console.log("----- 根据自定义字段获取自定义字段规则 -----");
-      let showStyleIndex = -1;
-      for (let index = 0; index < list.length; index++) {
-        const item = list[index];
-        showStyleIndex += 1;
-        /**
-         * 规则数据
-         */
-        this.crmRules[item.fieldName] = this.getItemRulesArrayFromItem(item);
-
-        console.log("----- this.crmRules[item.fieldName] -----");
-        console.log(this.crmRules[item.fieldName]);
-        /**
-         * 表单数据
-         */
-        if (
-          // crm相关信息特殊处理
-         
-          item.formType == "contacts" ||
-          item.formType == "customer" ||
-          item.formType == "contract" ||
-          item.formType == "business" ||
-          item.formType == "receivables_plan" ||
-          item.formType == "rule" ||
-          item.formType == "org" ||
-          item.formType == "slg" ||
-          item.formType == "item" ||
-          item.formType == "uom" ||
-          item.formType == "uomGroup" ||
-          item.formType == "interfaceCalendar" ||
-          item.formType == "verificationStages" ||
-          item.formType == "verification" ||
-          item.formType == "stage" ||
-          item.formType == "area" ||
-          item.formType == "areaItem" ||
-          item.formType == "currency" ||
-          item.formType == "currencyExchange" ||
-          item.formType == "customerBom" ||
-          item.formType == "customerItem" ||
-          item.formType == "eqptType" ||
-          item.formType == "eqptTypeItem" ||
-          item.formType == "itemTransTypeInventoryRoute" ||
-          item.formType == "itemTransTypeOpStrategy" ||
-          item.formType == "loc" ||
-          item.formType == "machine" ||
-          item.formType == "param" ||
-          item.formType == "port" ||
-          item.formType == "prodLine" ||
-          item.formType == "prodLineItem" ||
-          item.formType == "project" ||
-          item.formType == "shift" ||
-          item.formType == "slg" ||
-          item.formType == "supplier" ||
-          item.formType == "supplierItem" ||
-          item.formType == "team" ||
-          item.formType == "uomConversion" ||
-          item.formType == "wlg" ||
-          item.formType == "wlgItem" ||
-          item.formType == "workCalendar" ||
-          item.formType == "workCenter" ||
-          item.formType == "dicts" ||
-          item.formType == "inventoryRoute" ||
-          item.formType == "stdCostPriceSheet" ||
-          item.formType == "purchasePriceSheet" ||
-          item.formType == "route" ||
-          item.formType == "salePriceSheet"
-        ) {
-          var params = {};
-          params["key"] = item.fieldName;
-          params["data"] = item;
-
-          // 获取 value relative 信息
-          this.getParamsValueAndRelativeInfo(params, item, list);
-          params["disabled"] = this.getItemDisabledFromItem(item);
-          params["styleIndex"] = showStyleIndex;
-          console.log("---------->" + JSON.stringify(params));
-          this.crmForm.crmFields.push(params);
-        } else {
-          var params = {};
-          if (
-            item.formType == "user" ||
-            item.formType == "structure" ||
-            item.formType == "file" ||
-            item.formType == "category" ||
-            item.formType == "customer" ||
-            item.formType == "business" ||
-            item.formType == "contract"
-          ) {
-            //if (this.action.type == 'update'&& item.value)
-            if (this.action.type == "update") {
-              params["value"] = item.value ? objDeepCopy(item.value) : [];
-            } else {
-              params["value"] = item.defaultValue
-                ? objDeepCopy(item.defaultValue)
-                : [];
-            }
-          } else {
-            if (this.action.type == "update") {
-              params["value"] = item.value; // 编辑的值 在value∂ç字段
-            } else {
-              //params['value'] = item.defaultValue || ''
-            }
-          }
-          params["key"] = item.fieldName;
-          params["data"] = item;
-          params["disabled"] = false; // 是否可交互
-          params["styleIndex"] = showStyleIndex;
-          this.crmForm.crmFields.push(params);
-        }
-      }
-    },
-    /**
-     * 获取关联项的值 和 关联信息
-     */
-    getParamsValueAndRelativeInfo(params, item, list) {
-      if (this.action.type == "relative") {
-        const relativeData = this.action.data[item.formType];
-        if (item.formType == "receivables_plan") {
-          params["value"] = "";
-        } else {
-          params["value"] = relativeData ? [relativeData] : [];
-        }
-      } else {
-        if (item.formType == "receivables_plan") {
-          params["value"] = item.value || "";
-        } else {
-          params["value"] = item.value || [];
-        }
-      }
-    },
-    /**
-     * 获取相关联item
-     */
-    getItemRelatveInfo(item, list, fromType) {
-      let crmItem = null;
-      if (this.action.type == "relative") {
-        crmItem = this.action.data[fromType];
-      } else {
-        const crmObj = list.find((listItem) => {
-          return listItem.formType === fromType;
-        });
-        if (crmObj && crmObj.value && crmObj.value.length > 0) {
-          crmItem = crmObj.value[0];
-        }
-      }
-      return crmItem;
-    },
-    /**
-     * 获取关联项是否可操作
-     */
-    getItemDisabledFromItem(item) {
-      // 相关添加
-      if (this.action.type == "relative") {
-        const relativeDisInfos = {
-          business: {
-            customer: { customer: true },
-            contacts: { customer: true },
-          },
-          contacts: {
-            customer: { customer: true },
-            business: { customer: true },
-          },
-          contract: {
-            customer: { customer: true },
-            business: { customer: true, business: true },
-          },
-          receivables_plan: {
-            contract: { customer: true, contract: true },
-            customer: { customer: true },
-          },
-          receivables: {
-            contract: { customer: true, contract: true },
-            customer: { customer: true },
-          },
-        };
-        // 添加类型
-        const crmTypeDisInfos = relativeDisInfos[this.crmType];
-        if (crmTypeDisInfos) {
-          // 在哪个类型下添加
-          const relativeTypeDisInfos = crmTypeDisInfos[this.action.crmType];
-          if (relativeTypeDisInfos) {
-            // 包含的字段值
-            return relativeTypeDisInfos[item.formType] || false;
-          }
-        }
-        return false;
-      } else if (this.action.type != "update") {
-        // 新建
-        if (this.crmType === "contract" && item.formType === "business") {
-          return true;
-          // 回款下 新建 合同 和 回款计划 默认不能操作
-        } else if (this.crmType === "receivables") {
-          if (item.formType === "contract") {
-            return true;
-          } else if (item.formType === "receivables_plan") {
-            return true;
-          }
-        }
-      }
-      return false;
-    },
-    /**
-     * item 当行数据源
-     */
-    getItemRulesArrayFromItem(item) {
-      var tempList = [];
-      // 验证必填
-      if (item.isNull == 1) {
-
-        if(item.formType!=='switch')
-          {
-            tempList.push({
-              required: true,
-              message: item.name + "不能为空",
-              trigger: ["blur"]
-              // trigger: ["blur", "change"],
-            });
-          }
-         
-      }
-
-      if(item.formType==='text') //增加长度校验
-      {     
-        tempList.push({
-          min:0,
-          max:36,
-          message: "长度在1到36个字符",
-          trigger: ["blur", "change"],
-        });
-      }
-       
-
-  
-      // // 验证唯一
-      // if (item.isUnique == 1) {
-      //   var validateUnique = (rule, value, callback) => {
-      //     if ((isArray(value) && value.length == 0) || !value) {
-      //       callback();
-      //     } else {
-      //       var validatesParams = {};
-      //       validatesParams.fieldId = item.fieldId;
-      //       if (isArray(value)) {
-      //         let postValue = "";
-      //         if (value.length > 0) {
-      //           if (
-      //             rule.item.formType == "user" ||
-      //             rule.item.formType == "structure"
-      //           ) {
-      //             postValue = value
-      //               .map((valueItem) => {
-      //                 return rule.item.formType == "user"
-      //                   ? valueItem.userId
-      //                   : valueItem.id;
-      //               })
-      //               .join(",");
-      //           } else if (rule.item.fieldName == "categoryId") {
-      //             if (value && value.length) {
-      //               postValue = value[value.length - 1];
-      //             } else {
-      //               postValue = "";
-      //             }
-      //           } else if (rule.item.formType == "checkbox") {
-      //             postValue = value.join(",");
-      //           }
-      //         }
-      //         validatesParams.value = postValue;
-      //       } else {
-      //         validatesParams.value = value;
-      //       }
-      //       if (this.action.type == "update") {
-      //         validatesParams.batchId = this.action.batchId;
-      //       }
-      //       //filedValidates(validatesParams)
-      //       //   .then(res => {
-      //       callback();
-      //       // })
-      //       // .catch(error => {
-      //       //   callback(new Error(error.msg ? error.msg : '验证出错'))
-      //       // })
-      //     }
-      //   };
-      //   tempList.push({
-      //     validator: validateUnique,
-      //     item: item,
-      //     trigger:
-      //       item.formType == "checkbox" || item.formType == "select"
-      //         ? ["change"]
-      //         : ["blur"],
-      //   });
-      // }
-      // 其他字符
-      let validItem={item:item,trigger: ["blur"] };
-      if (item.formType == "int") {
-        var validateInt = (rule, value, callback) => {
-          if (!value || value == "" || regexIsInt(value)) {
-            callback();
-          } else {
-            callback(new Error("整数类型长度必须是小于12位的数字"));
-          }
-        };
-        validItem.validator= validateInt;
-        tempList.push(validItem);
-      }
-      else if (item.formType == "number") {
-        var validateNumber = (rule, value, callback) => {
-          if ( value == "" || regexIsNumber(value)) {
-            callback();
-          } else {
-            callback(new Error("数字的整数部及小数部分须是整数"));
-          }
-        };
-        validItem.validator= validateNumber;
-        tempList.push(validItem);
-      } 
-      else if (item.formType == "number2") {
-        var validateCRMNumber2 = (rule, value, callback) => {
-          if (value == "" || regexIsCRMNumber2(value)) {
-            callback();
-          } else {
-            callback(new Error("数字的整数部分须少于12位，小数部分须少于2位"));
-          }
-        };
-        validItem.validator= validateCRMNumber2;
-      } else if (item.formType == "number4") {
-        var validateCRMNumber4 = (rule, value, callback) => {
-          if (value == "" || regexIsCRMNumber4(value)) {
-            callback();
-          } else {
-            callback(new Error("数字的整数部分须少于12位，小数部分须少于4位"));
-          }
-        };
-        validItem.validator= validateCRMNumber4;
-        tempList.push(validItem);
-      } 
-      else if (item.formType == "moneynumber") {
-        var validateCRMMoneyNumber = (rule, value, callback) => {
-          if (value == "" || regexIsCRMMoneyNumber(value)) {
-            callback();
-          } else {
-            callback(new Error("货币的整数部分须少于10位，小数部分须少于4位"));
-          }
-        };
-        validItem.validator= validateCRMMoneyNumber;
-        tempList.push(validItem);
-      } else if (item.formType == "mobile") {
-        var validateCRMMobile = (rule, value, callback) => {
-          if (value == "" || regexIsCRMMobile(value)) {
-            callback();
-          } else {
-            callback(new Error("手机格式有误"));
-          }
-        };
-        validItem.validator= validateCRMMobile;
-        tempList.push(validItem);
-      } else if (item.formType == "email") {
-        var validateCRMEmail = (rule, value, callback) => {
-          if (value == "" || regexIsCRMEmail(value)) {
-            callback();
-          } else {
-            callback(new Error("邮箱格式有误"));
-          }
-        };
-       validItem.validator= validateCRMEmail;
-       tempList.push(validItem);
-      }
-      else if (item.formType == "rate") {
-        var validateCRMRate = (rule, value, callback) => {
-          if (value == "" || regexIsCRMRate(value)) {
-            callback();
-          } else {
-             callback(new Error("税率/百分比应小于1，小数部分须少于6位"));
-          }
-        };
-       validItem.validator= validateCRMRate;
-       tempList.push(validItem);
-      }
-
-      //获取其他校验规则
-      let otherRules= this.getOtherRulesArrayFromItem(item);
-      if(otherRules.length>0)
-      { 
-        otherRules.forEach(item=>tempList.push(item));
-      }
-      return tempList;
-    },
-    /**
-     * item 其他校验规则  getItemRulesArrayFromItem
-     */
-    getOtherRulesArrayFromItem(item)
-    {
-      var tempList = [];
-      if(this.crmType==='interfaceCalendar')
-      { 
-        let InterfaceCalendarRules=this.getInterfaceCalendarRules(item);
-   
-        if(InterfaceCalendarRules.length>0){
-            InterfaceCalendarRules.forEach(rule => {
-            (tempList.push(rule));
-          });
-        }
-      }
-
-      
-      // if(this.crmType==='strategyRules')
-      // { 
-      //   let strategyRules=this.getStrategyrules(item,list);
-      //   strategyRules.forEach(item=>tempList.push(item));
-      // }
-
-      return tempList;
-    },
-    getProductParams(params, element) {
-      if (element.value) {
-        params["product"] = element.value.product ? element.value.product : [];
-        params.entity["totalPrice"] = element.value.totalPrice
-          ? element.value.totalPrice
-          : 0;
-        params.entity["discountRate"] = element.value.discountRate
-          ? element.value.discountRate
-          : 0;
-      } else {
-        params["product"] = [];
-        params.entity["totalPrice"] = "";
-        params.entity["discountRate"] = "";
-      }
-    },
-    // 获取客户位置参数
-    getCustomerAddressParams(params, element) {
-      params["address"] = element.value.address
-        ? element.value.address.join(",")
-        : "";
-      params["detailAddress"] = element.value.detailAddress;
-      params["location"] = element.value.location;
-      params["lng"] = element.value.lng;
-      params["lat"] = element.value.lat;
-    },
-    getStrategyrules(item)
-    {
-      let list=this.crmForm.crmFields
-      var tempList = [];
-      let validItem={item:item,trigger: ["blur"] };
-      if(item.fieldName==='EffectiveTime')
-      {
-        var validateEffectiveTime = (rule, value, callback) => {
-          const ExpireTimeItem = list.find((listItem) => {
-            return listItem.key === 'ExpireTime'; });
-
-          const ExpireTimeValue=ExpireTimeItem.value;
-
-          if(ExpireTimeValue!=null && value>= ExpireTimeValue )
-          {
-            callback(new Error("生效时间不能大于等于失效时间"));
-          } else {
-
-            //this.$refs.crmForm.validateField("crmFields." + ExpireTimeItem.styleIndex + ".value");
-            callback();
-          }
-        }
-        validItem.validator= validateEffectiveTime;
-        tempList.push(validItem);
-      }
-      else if(item.fieldName==='ExpireTime')
-      {
-        var validateExpireTime = (rule, value, callback) => {
-          const EffectiveItem = list.find((listItem) => {
-            return listItem.key === 'EffectiveTime'; }).value;
-            
-          const EffectiveValue =EffectiveItem.value;
-
-          if(EffectiveValue!=null && EffectiveValue>= value )
-          {
-            callback(new Error("失效时间时间不能小于等于生效时间"));
-          } else {
-            //this.$refs.crmForm.validateField("EffectiveItem." + ExpireTimeItem.styleIndex + ".value");
-            callback();
-          }
-        }
-        validItem.validator= validateExpireTime;
-        tempList.push(validItem);
-      }
-      return tempList;
-    },
-    getInterfaceCalendarRules(item)
-    {
-      var tempList = [];
-      let validItem={item:item,trigger: ["blur"] };
-      if(item.fieldName==='Year') //
-      {
-        var validateYear = (rule, value, callback) => {
-          if ( value>=2000 && value<=3000) {
-            callback();
-          } else {
-            callback(new Error("年份应该在2000-3000之间"));
-          }
-        };
-        validItem.validator= validateYear;
-        tempList.push(validItem);
-      }
-      else if(item.fieldName==='Month') //
-      {
-        var validateEffectiveTime = (rule, value, callback) => {
-           if ( value >=1 && value<=12) {
-            callback();
-          } else {
-            callback(new Error("月份应该在1-12之间"));
-          }
-        }
-        validItem.validator= validateEffectiveTime;
-        tempList.push(validItem);
-      }
-      return tempList;
-    }
-  },
-};
-</script>
-<style lang="scss" scoped>
-.crm-create-container {
-  position: relative;
-  height: 100%;
-}
-
-.crm-create-flex {
-  position: relative;
-  overflow-x: hidden;
-  overflow-y: auto;
-  flex: 1;
-}
-
-.crm-create-header {
-  height: 40px;
-  margin-bottom: 20px;
-  padding: 0 10px;
-  flex-shrink: 0;
-  .close {
-    display: block;
-    width: 40px;
-    height: 40px;
-    margin-right: -10px;
-    padding: 10px;
-    cursor: pointer;
-  }
-}
-
-.crm-create-body {
-  // flex: 1;
-  overflow-x: hidden;
-  // overflow-y: scroll;
-  border-right: 1px;
-  min-height: 350px;
-  max-height: 550px;
-  overflow-y: auto;
-  padding: 20px;
-}
-
-/** 将其改变为flex布局 */
-.crm-create-box {
-  display: flex;
-  flex-wrap: wrap;
-  padding: 0 10px;
-}
-
-.crm-create-item {
-  flex: 0 0 50%;
-  flex-shrink: 0;
-  // overflow: hidden;
-  padding-bottom: 10px;
-}
-
-// 占用一整行
-.crm-create-block-item {
-  flex: 0 0 100%;
-  flex-shrink: 0;
-  padding-bottom: 10px;
-}
-
-.el-form-item /deep/ .el-form-item__label {
-  line-height: normal;
-  font-size: 13px;
-  color: #333333;
-  position: relative;
-  padding-left: 8px;
-  padding-bottom: 0;
-}
-
-.el-form /deep/ .el-form-item {
-  margin-bottom: 0px;
-}
-
-.el-form /deep/ .el-form-item.is-required .el-form-item__label:before {
-  content: "*";
-  color: #f56c6c;
-  margin-right: 4px;
-  position: absolute;
-  left: 0;
-  top: 5px;
-}
-
-.handle-bar {
-  position: relative;
-  .handle-button {
-    float: right;
-    margin-top: 5px;
-    margin-right: 20px;
-  }
-}
-
-.el-button + .el-button {
-  margin-left: 0;
-}
-
-// 审核信息 里的审核类型
-.examine-type {
-  font-size: 12px;
-  color: white;
-  background-color: #fd715a;
-  padding: 0 8px;
-  margin-left: 5px;
-  height: 16px;
-  line-height: 16px;
-  border-radius: 8px;
-  transform: scale(0.8, 0.8);
-}
-
-.avatar-uploader {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-.avatar-uploader .el-upload:hover {
-  border-color: #409eff;
-}
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/CRMDetailHead.vue b/code/WebApp/vue/src/views/newJit/components/CRMDetailHead.vue
deleted file mode 100644
index 70c4b905..00000000
--- a/code/WebApp/vue/src/views/newJit/components/CRMDetailHead.vue
+++ /dev/null
@@ -1,337 +0,0 @@
-<template>
-  <div style="position: relative;">
-    <flexbox class="t-section">
-      <img
-        :src="crmIcon"
-        class="t-img" >
-      <div class="t-name">{{ name }}</div>
-      <el-button
-        class="head-handle-button"
-        type="primary"
-        @click.native="handleTypeClick('edit')">编辑</el-button>
-<!--      <img-->
-<!--        class="t-close"-->
-<!--        src="@/assets/img/task_close.png"-->
-<!--        @click="hideView" >-->
-    </flexbox>
-    <flexbox
-      class="h-section"
-      align="stretch">
-      <flexbox-item
-        v-for="(item, index) in headDetails"
-        :key="index"
-        class="h-item"
-        span="200">
-        <div class="h-title">{{ item.name }}</div>
-        <div class="h-value text-one-line">{{ item.value}}</div>
-      </flexbox-item>
-    </flexbox>
-    <slot/>
-  </div>
-</template>
-<script type="text/javascript">
-import tableFields from "../../../../static/tableField";
-
-export default {
-  name: 'CRMDetailHead',
-  components: {
-    // TransferHandle,
-    // AllocHandle,
-    // DealStatusHandle
-  },
-  props: {
-    /** 模块ID */
-    id: [String, Number],
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: ''
-    },
-    // 辅助 使用
-    isSeas: {
-      type: Boolean,
-      default: false
-    },
-    /** 详细信息 */
-    detail: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      moreTypes: [], // 更多操作
-      fieldInfoList: [],
-      headDetails: {
-      type: Array,
-      default: () => {
-        return []
-      }
-     }
-    }
-  },
-  computed: {
-    // ...mapGetters(['crm', 'CRMConfig']),
-    crmIcon() {
-      if (this.crmType === 'transaction') {
-        return require('@/assets/img/customer_detail.png')
-      } else if (this.crmType === 'leads') {
-        return require('@/assets/img/clue_detail.png')
-      } else if (this.crmType === 'strategy') {
-        return require('@/assets/img/business_detail.png')
-      } else if (this.crmType === 'rule') {
-        return require('@/assets/img/contacts_detail.png')
-      } else if (this.crmType === 'customer') {
-        return require('@/assets/img/contract_detail.png')
-      } else if (this.crmType === 'slgItem') {
-        return require('@/assets/img/money_detail.png')
-      } else if (this.crmType === 'dicts') {
-        return require('@/assets/img/product_detail.png')
-      } else if (this.crmType === 'bom') {
-        return require('@/assets/img/product_detail.png')
-      } else if (this.crmType === 'uomGroup') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'uom') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'area') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'areaItem') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'currency') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'currencyExchange') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'customerBom') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'customerItem') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'eqptType') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'eqptTypeItem') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'item') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'itemTransTypeInventoryRoute') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'itemTransTypeOpStrategy') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'loc') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'machine') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'param') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'port') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'prodLine') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'prodLineItem') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'project') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'shift') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'slg') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'supplier') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'supplierItem') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'team') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'uomConversion') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'wlg') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'wlgItem') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'workCalendar') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'workCenter') {
-        return require('@/assets/img/product_detail.png')
-      } else if (this.crmType === 'inventoryRoute') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'inventoryRouteDetail') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'purchasePriceDetail') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'purchasePriceSheet') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'route') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'routeDetail') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'salePriceDetail') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'salePriceSheet') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'stdCostPriceDetail') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'stdCostPriceSheet') {
-        return require('@/assets/img/product_detail.png')
-      }else {
-        return require('@/assets/img/product_detail.png')
-      }
-      return ''
-    },
-    name() {
-      return this.detail.name
-    },
-    showEdit() {
-      return this.crm[this.crmType].update
-    },
-  },
-  watch: {
-    detail:function(val)
-    {
-     this. GetBaseInfoValue(val);
-    }
-  },
-  mounted() {
-    //this.moreTypes = this.getSelectionHandleItemsInfo()
-  },
-  methods: {
-    GetBaseInfoValue(res)
-    {
-      this.headDetails=[];
-      this.list=[]
-      let filedList = tableFields[this.crmType].data;
-      let resKeys= Object.keys(res);
-      filedList.map((item) => {
-      let key= resKeys.find(r=>{return r == item.fieldName && r!='Description'}); //不显示描述
-      if(key!=null)
-      {
-         let resValue=this.valueConverter(res[key],item);
-            let filedJSON={ 
-                "formType": key.includes('TIME')?"datetime":"text",
-                "name":item.name,
-                "value":resValue,
-                "data":item
-              }
-            this.headDetails.push(filedJSON);
-      }
-    });
-      
-
-    //  Object.keys(res).forEach((key)=>{
-    //       if (key == item.fieldName && key!='Description') //不显示描述
-    //       {
-    //         let resValue=this.valueConverter(res[key],item);
-    //         let filedJSON={ 
-    //             "formType": key.includes('TIME')?"datetime":"text",
-    //             "name":item.name,
-    //             "value":resValue,
-    //             "data":item
-    //           }
-    //         this.headDetails.push(filedJSON);
-    //       }
-    //     });
-    //   });
-    },
-
-    valueConverter(value,item) {
-  
-      if(item.formType==='switch')
-      {
-        if(value===true)
-        {
-          return '是'
-        }
-        else if(value===false)
-        {
-          return '否'
-        }
-        else
-        {
-          return ''
-        }
-      }
-      else if(item.formType==='select')
-      {
-        //取select的值
-        return value
-      }
-      else
-      {
-        return value
-      }
-    },
-
-    /** 更多操作 */
-    handleTypeClick(type) {
-      if (type == 'edit') {
-        // 编辑
-        this.$emit('handle', { type: 'edit' })
-      } 
-    },
-    hideView() {
-      this.$emit('close')
-    },
-    // 子组件 回调的 结果
-    handleCallBack(data) {
-      this.$emit('handle', { type: data.type })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.t-section {
-  position: relative;
-  padding: 10px 17px;
-  min-height: 60px;
-  .t-img {
-    display: block;
-    width: 35px;
-    height: 35px;
-    margin-right: 10px;
-  }
-  .t-name {
-    font-size: 14px;
-    color: #333333;
-    flex: 1;
-  }
-  .t-more {
-    border: 1px solid #dcdfe6;
-    font-size: 12px;
-    color: #606266;
-    padding: 0 10px 0 12px;
-    border-radius: 2px;
-    font-weight: 500;
-    height: 25px;
-    cursor: pointer;
-  }
-  .t-close {
-    display: block;
-    width: 40px;
-    height: 40px;
-    margin-left: 20px;
-    padding: 10px;
-    cursor: pointer;
-  }
-}
-
-.h-section {
-  position: relative;
-  padding: 8px 17px 15px 17px;
-  min-height: 58px;
-  overflow-x: auto;
-  .h-item {
-    .h-title {
-      font-size: 12px;
-      color: #777;
-    }
-    .h-value {
-      min-height: 14px;
-      margin-top: 8px;
-      font-size: 13px;
-      color: #333333;
-    }
-  }
-}
-.head-handle-button {
-  padding: 5px 15px;
-  margin-right: 10px;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/CRMExport-old.vue b/code/WebApp/vue/src/views/newJit/components/CRMExport-old.vue
deleted file mode 100644
index 4d5039cf..00000000
--- a/code/WebApp/vue/src/views/newJit/components/CRMExport-old.vue
+++ /dev/null
@@ -1,327 +0,0 @@
-<template>
-  <el-dialog
-    :visible.sync="showDialog"
-    :title="'导出'+crmTypeName"
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    :before-close="beforeClose"
-    :close-on-press-escape="false"
-    width="550px"
-    @close="closeView"
-  >
-    <div class="dialog-body">
-      <p
-        v-if="error"
-        class="error"
-        v-text="error" />
-      <p
-        v-if="done"
-        class="done">
-        <i class="el-icon-success"/>
-        导出已完成
-      </p>
-      <p
-        v-else-if="cancel"
-        class="cancel">
-        <i class="el-icon-warning"/>
-        导出已取消
-      </p>
-      <div v-else>
-        <i class="el-icon-loading" />
-        导出中...
-        {{ progress }}
-      </div>
-    </div>
-    <span slot="footer" class="dialog-footer" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-// import {
-//   crmCustomerExcelExport,
-//   crmCustomerExcelAllExport,
-//   crmCustomerPoolExcelExportAPI
-// } from '@/api/customermanagement/customer'
-// import { crmLeadsExcelExport, crmLeadsExcelAllExport } from '@/api/customermanagement/clue'
-// import { crmContactsExcelExport, crmContactsExcelAllExport } from '@/api/customermanagement/contacts'
-// import { crmProductExcelExport, crmProductExcelAllExport } from '@/api/customermanagement/product'
-// import { crmBusinessExcelExport, crmBusinessExcelAllExport } from '@/api/customermanagement/business'
-// import { crmContractExcelExport, crmContractExcelAllExport } from '@/api/customermanagement/contract'
-// import { crmReceivablesExcelExport, crmReceivablesExcelAllExport } from '@/api/customermanagement/money'
-
-export default {
-  name: 'CRMExport', // 文件导出
-  components: {},
-
-  props: {
-    show: {
-      type: Boolean,
-      default: false
-    },
-    // CRM类型
-    crmType: {
-      type: String,
-      default: ''
-    },
-    /** 是公海 */
-    isSeas: {
-      type: Boolean,
-      default: false
-    },
-    // 搜索条件
-    search: {
-      type: String,
-      default: ''
-    },
-    // 场景
-    scene_id: {
-      type: [Number, String],
-      default: ''
-    },
-    // 高级搜索
-    filterObj: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    exportParams: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      showDialog: false,
-      progress: '',
-      error: '',
-      // 导出已完成
-      done: false,
-      // 取消导出
-      cancel: false,
-      // 队列标识
-      exportQueueIndex: '',
-      // 临时数据
-      tempData: {
-        temp_file: ''
-      },
-      // 排序
-      sortData: {}
-    }
-  },
-  computed: {
-    ...mapGetters(['userInfo']),
-    crmTypeName() {
-      return (
-        {
-          customer: '客户',
-          leads: '线索',
-          contacts: '联系人',
-          product: '产品'
-        }[this.crmType] || ''
-      )
-    }
-  },
-  watch: {
-    show(val) {
-      this.showDialog = val
-      if (val) {
-        this.cancel = false
-        this.exportInfos()
-        window.onbeforeunload = (event) => {
-          this.exportInfos({
-            page: -1,
-            temp_file: this.tempData.temp_file
-          })
-          return event
-        }
-      } else {
-        window.onbeforeunload = null
-      }
-    }
-  },
-  mounted() {
-    this.$bus.off('getSortData')
-    this.$bus.on('getSortData', (sortData) => {
-      this.sortData = sortData
-    })
-  },
-  methods: {
-    // 关闭操作
-    closeView() {
-      this.error = ''
-      this.done = false
-      this.exportQueueIndex = ''
-      this.progress = ''
-      this.$emit('close')
-    },
-    // 点叉
-    beforeClose(done) {
-      if (this.error || this.done) {
-        done()
-        return
-      }
-      this.$confirm('此操作将终止导出, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.cancel = true
-          done()
-        })
-        .catch(() => {
-        })
-    },
-    // 导出操作
-    exportInfos(data = {}) {
-      var params = {
-        export_queue_index: this.exportQueueIndex,
-        search: this.search,
-        ...this.exportParams,
-        ...this.sortData,
-        ...data
-      }
-      if (this.scene_id) {
-        params.scene_id = this.scene_id
-      }
-      for (var key in this.filterObj) {
-        params[key] = this.filterObj[key]
-      }
-
-      let exportAll = 'All'
-      if (params['ids']) {
-        exportAll = ''
-      }
-
-      let request
-      // 公海的请求
-      if (this.isSeas) {
-        request = crmCustomerPoolExcelExportAPI
-      } else {
-        request = {
-          customer: crmCustomerExcelExport,
-          customerAll: crmCustomerExcelAllExport,
-          leads: crmLeadsExcelExport,
-          leadsAll: crmLeadsExcelAllExport,
-          contacts: crmContactsExcelExport,
-          contactsAll: crmContactsExcelAllExport,
-          product: crmProductExcelExport,
-          productAll: crmProductExcelAllExport,
-          business: crmBusinessExcelExport,
-          businessAll: crmBusinessExcelAllExport,
-          contract: crmContractExcelExport,
-          contractAll: crmContractExcelAllExport,
-          receivables: crmReceivablesExcelExport,
-          receivablesAll: crmReceivablesExcelAllExport
-        }[this.crmType + exportAll]
-      }
-      request(params)
-        .then(res => {
-          if (res.data.type.indexOf('json') !== -1) {
-            var blob = new Blob([res.data], {
-              type: 'application/json'
-            })
-            var reader = new FileReader()
-            reader.readAsText(blob, 'utf-8')
-            reader.onload = () => {
-              var temp = JSON.parse(reader.result)
-              this.tempData = temp.data
-              if (temp.error) {
-                this.error = temp.error
-                return
-              }
-              this.exportQueueIndex = temp.data.export_queue_index
-              if (this.cancel) {
-                if (temp.data.page !== -1) {
-                  this.exportInfos({
-                    page: -1,
-                    temp_file: temp.data.temp_file
-                  })
-                }
-              } else if (temp.data.page === -2) {
-                setTimeout(() => {
-                  this.exportInfos({
-                    page: 1,
-                    temp_file: temp.data.temp_file
-                  })
-                }, 1000)
-              } else if (temp.data.page > 0) {
-                this.exportInfos({
-                  page: temp.data.page,
-                  temp_file: temp.data.temp_file
-                })
-                this.progress = String(temp.data.done) + ' / ' + String(temp.data.total)
-              }
-            }
-          } else {
-            this.exportQueueIndex = ''
-            this.done = true
-            var blob = new Blob([res.data], {
-              type: 'application/vnd.ms-excel;charset=utf-8'
-            })
-            var downloadElement = document.createElement('a')
-            var href = window.URL.createObjectURL(blob) // 创建下载的链接
-            downloadElement.href = href
-            downloadElement.download =
-              decodeURI(
-                res.headers['content-disposition'].split('filename=')[1]
-              ) || '' // 下载后文件名
-            document.body.appendChild(downloadElement)
-            downloadElement.click() // 点击下载
-            document.body.removeChild(downloadElement) // 下载完成移除元素
-            window.URL.revokeObjectURL(href) // 释放掉blob对象
-          }
-        })
-        .catch(() => {
-        })
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-
-.dialog-body {
-  height: 150px;
-  text-align: center;
-  padding-top: 40px;
-  color: #659DED;
-  .el-icon-loading {
-    margin-bottom: 10px;
-    display: block;
-  }
-  p.error {
-    color: #E6A23C;
-  }
-  p.done {
-    color: #67C23A;
-    .el-icon-success {
-      font-size: 30px;
-      display: block;
-    }
-  }
-}
-
-.cancel {
-  color: #E6A23C;
-  .el-icon-warning {
-    font-size: 30px;
-    display: block;
-  }
-}
-
-.el-dialog__wrapper {
-  /deep/ .el-icon-loading {
-    font-size: 30px;
-  }
-
-  /deep/ .el-loading-text {
-    font-size: 18px;
-    margin-top: 10px;
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/CRMExport.vue b/code/WebApp/vue/src/views/newJit/components/CRMExport.vue
deleted file mode 100644
index 16b4076f..00000000
--- a/code/WebApp/vue/src/views/newJit/components/CRMExport.vue
+++ /dev/null
@@ -1,257 +0,0 @@
-<template>
-  <el-dialog
-    :visible.sync="showDialog"
-    :title="'导出'+crmTypeName"
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    :before-close="beforeClose"
-    :close-on-press-escape="false"
-    width="550px"
-    @close="closeView"
-  >
-    <div class="dialog-body">
-      <p
-        v-if="error"
-        class="error"
-        v-text="error" />
-      <p
-        v-if="done"
-        class="done">
-        <i class="el-icon-success"/>
-        导出已完成
-      </p>
-      <p
-        v-else-if="cancel"
-        class="cancel">
-        <i class="el-icon-warning"/>
-        导出已取消
-      </p>
-      <div v-else>
-        <i class="el-icon-loading" />
-        导出中...
-        {{ progress }}
-      </div>
-    </div>
-    <span slot="footer" class="dialog-footer" />
-  </el-dialog>
-</template>
-
-<script>
-import { winUomGroupExcelAllExport } from '@/api/uomGroup/uomGroup'
-import { downloadFile } from '@/utils/crmindex.js'
-
-
-
-export default {
-  name: 'CRMExport', // 文件导出 
-  components: {},
-
-  props: {
-    show: {
-      type: Boolean,
-      default: false
-    },
-    // CRM类型
-    crmType: {
-      type: String,
-      default: ''
-    },
-    /** 是公海 */
-    isSeas: {
-      type: Boolean,
-      default: false
-    },
-    // 搜索条件
-    search: {
-      type: String,
-      default: ''
-    },
-    // 高级搜索
-    filterObj: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    exportParams: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      showDialog: false,
-      progress: '',
-      error: '',
-      // 导出已完成
-      done: false,
-      // 取消导出
-      cancel: false,
-      // 队列标识
-      exportQueueIndex: '',
-      // 临时数据
-      tempData: {
-        temp_file: ''
-      },
-      // 排序
-      sortData: {}
-    }
-  },
-  computed: {
-    crmTypeName() {
-      return (
-        {
-          uomGroup: '计量单位组'
-        }[this.crmType] || ''
-      )
-    }
-  },
-  watch: {
-    show(val) {
-      this.showDialog = val
-      if (val) {
-        this.cancel = false
-        this.exportInfos()
-        window.onbeforeunload = (event) => {
-          this.exportInfos({
-            page: -1,
-            temp_file: this.tempData.temp_file
-          })
-          return event
-        }
-      } else {
-        window.onbeforeunload = null
-      }
-    }
-  },
-  mounted() {
-    this.$bus.off('getSortData')
-    this.$bus.on('getSortData', (sortData) => {
-      this.sortData = sortData
-    })
-  },
-  methods: {
-    // 关闭操作
-    closeView() {
-      this.error = ''
-      this.done = false
-      this.exportQueueIndex = ''
-      this.progress = ''
-      this.$emit('close')
-    },
-    // 点叉
-    beforeClose(done) {
-      if (this.error || this.done) {
-        done()
-        return
-      }
-      this.$confirm('此操作将终止导出, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.cancel = true
-          done()
-        })
-        .catch(() => {
-        })
-    },
-    // 导出操作
-    exportInfos(data = {}) {
-      // var params = {
-      //   export_queue_index: this.exportQueueIndex,
-      //   search: this.search,
-      //   ...this.exportParams,
-      //   ...this.sortData,
-      //   ...data
-      // }
-      var params = { 
-        //有组织ID传入
-      }
-      // for (var key in this.filterObj) {
-      //   params[key] = this.filterObj[key]
-      // }
-
-      let exportAll = 'All'
-      if (params['ids']) {
-        exportAll = ''
-      }
-
-      // let request = {
-      //     uomGroup: crmReceivablesExcelAllExport
-      //   }[this.crmType + exportAll]
-      let request = {
-          uomGroup: winUomGroupExcelAllExport
-        }[this.crmType]
-      request(params)
-        .then(res => {
-          var downExportExcelName=res;//获取生成到服务器上的导出excel文件名称
-          this.$axios
-          .BolbGets('/api/basedataservice/exceltemplate/downloadExcelFiles/' + downExportExcelName)
-          .then((response) => {
-            downloadFile(response, this.crmTypeName+'导出数据.xlsx')
-            this.error = ''
-            this.done = false
-            this.exportQueueIndex = ''
-            this.progress = ''
-            this.$emit('close')
-            this.$notify({
-              title: '成功',
-              message: '数据导出成功！',
-              type: 'success',
-              duration: 2000
-            })
-          })
-        })
-        .catch(() => {
-        })
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-
-.dialog-body {
-  height: 150px;
-  text-align: center;
-  padding-top: 40px;
-  color: #659DED;
-  .el-icon-loading {
-    margin-bottom: 10px;
-    display: block;
-  }
-  p.error {
-    color: #E6A23C;
-  }
-  p.done {
-    color: #67C23A;
-    .el-icon-success {
-      font-size: 30px;
-      display: block;
-    }
-  }
-}
-
-.cancel {
-  color: #E6A23C;
-  .el-icon-warning {
-    font-size: 30px;
-    display: block;
-  }
-}
-
-.el-dialog__wrapper {
-  /deep/ .el-icon-loading {
-    font-size: 30px;
-  }
-
-  /deep/ .el-loading-text {
-    font-size: 18px;
-    margin-top: 10px;
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/CRMImport-old.vue b/code/WebApp/vue/src/views/newJit/components/CRMImport-old.vue
deleted file mode 100644
index bcc4d040..00000000
--- a/code/WebApp/vue/src/views/newJit/components/CRMImport-old.vue
+++ /dev/null
@@ -1,668 +0,0 @@
-<template>
-  <el-dialog
-    :visible="show"
-    :title="'导入'+crmTypeName"
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    width="600px"
-    @close="closeView">
-    <div class="dialog-body">
-      <!-- <el-steps
-        :active="stepsActive"
-        simple>
-        <el-step
-          v-for="(item, index) in stepList"
-          :key="index"
-          :title="item.title"
-          :icon="item.icon"
-          :status="item.status" />
-      </el-steps> -->
-
-      <div v-if="stepsActive == 1" class="step-section">
-        <div class="sections">
-          <div class="sections__title">一、请按照数据模板的格式准备要导入的数据。<span
-            class="download"
-            @click="download">点击下载《{{ crmTypeName }}导入模板》</span></div>
-          <div class="sections__tips">导入文件请勿超过2MB（约10,000条数据）</div>
-        </div>
-        <div class="sections">
-          <div class="sections__title">二、请选择数据重复时的处理方式（查重规则：【{{ fieldUniqueInfo }}】）</div>
-          <div class="sections__tips">查重规则为：添加{{ crmTypeName }}时所需填写的所有唯一字段，当前设置唯一字段为：{{ fieldUniqueInfo }}</div>
-          <div class="content">
-            <el-select
-              v-model="config"
-              placeholder="请选择">
-              <el-option
-                v-for="(item, index) in [{name: '覆盖系统原有数据',value: 1},{name: '跳过',value: 2}]"
-                :key="index"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </div>
-        </div>
-        <div class="sections">
-          <div class="sections__title">三、请选择需要导入的文件</div>
-          <div class="content">
-            <flexbox class="file-select">
-              <el-input
-                v-model="file.name"
-                :disabled="true"/>
-              <el-button
-                type="primary"
-                @click="selectFile">选择文件</el-button>
-            </flexbox>
-          </div>
-        </div>
-        <div class="sections">
-          <div class="sections__title">四、请选择负责人（{{ crmType == 'customer' ? '如不选择，导入的客户将进入公海' : '必选' }}）</div>
-          <div class="content">
-            <div class="user-cell">
-              <xh-user-cell
-                :value="user"
-                @value-change="userSelect"/>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div
-        v-loading="loading"
-        v-else-if="stepsActive == 2"
-        element-loading-text="数据导入中"
-        element-loading-spinner="el-icon-loading"
-        class="step-section" />
-
-      <div
-        v-loading="loading"
-        v-else-if="stepsActive == 3"
-        class="step-section">
-        <div class="result-info">
-          <i class="wk wk-success result-info__icon" />
-          <p class="result-info__des">数据导入完成</p>
-          <p class="result-info__detail">导入总数据<span class="result-info__detail--all">{{ resultData.totalSize }}</span>条，导入成功<span class="result-info__detail--suc">{{ resultData.totalSize - resultData.errSize }}</span>条，导入失败<span class="result-info__detail--err">{{ resultData.errSize }}</span>条</p>
-          <el-button
-            v-if="resultData && resultData.errSize > 0"
-            class="result-info__btn--err"
-            type="text"
-            @click="downloadErrData">下载错误数据</el-button>
-        </div>
-      </div>
-
-      <input
-        id="importInputFile"
-        type="file"
-        accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-        @change="uploadFile">
-    </div>
-    <span
-      slot="footer"
-      class="dialog-footer">
-      <el-popover
-        v-model="historyPopoverShow"
-        placement="top"
-        width="800"
-        popper-class="no-padding-popover"
-        trigger="click">
-        <!-- <c-r-m-import-history
-          :show="historyPopoverShow"
-          :crm-type="crmType"
-          @close="historyPopoverShow = false" />
-        <el-button
-          slot="reference"
-          class="history-btn"
-          type="text">查看历史导入记录</el-button> -->
-      </el-popover>
-
-
-
-      <el-button
-        :class="{ 'is-hidden': !showCancel }"
-        @click="closeView">取消</el-button>
-      <el-button
-        v-if="sureTitle"
-        type="primary"
-        @click="sureClick">{{ sureTitle }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-// import {
-//   crmQueryImportNumAPI,
-//   crmQueryImportInfoAPI,
-//   crmDownImportErrorAPI,
-//   filedGetField
-// } from '@/api/customermanagement/common'
-// import {
-//   crmCustomerExcelImport,
-//   crmCustomerDownloadExcelAPI
-// } from '@/api/customermanagement/customer'
-// import {
-//   crmLeadsExcelImport,
-//   crmLeadsDownloadExcelAPI
-// } from '@/api/customermanagement/clue'
-// import {
-//   crmContactsExcelImport,
-//   crmContactsDownloadExcelAPI
-// } from '@/api/customermanagement/contacts'
-// import {
-//   crmProductExcelImport,
-//   crmProductDownloadExcelAPI
-// } from '@/api/customermanagement/product'
-
-import { XhUserCell } from '@/components/CreateCom'
-// import CRMImportHistory from './CRMImportHistory'
-
-import { mapGetters } from 'vuex'
-import crmTypeModel from '@/views/ux/model/crmTypeModel'
-import { downloadExcelWithResData } from '@/utils/index'
-
-export default {
-  name: 'CRMImport', // 文件导入
-  components: {
-    XhUserCell
-  },
-  props: {
-    show: {
-      type: Boolean,
-      default: false
-    },
-    // CRM类型
-    crmType: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      fieldList: [],
-      config: 1, // 	1 覆盖，2跳过
-      file: { name: '' },
-      user: [],
-
-      stepsActive: 1,
-      stepList: [
-        {
-          icon: 'wk wk-upload',
-          title: '上传文件',
-          status: 'wait'
-        },
-        {
-          icon: 'wk wk-data-import',
-          title: '导入数据',
-          status: 'wait'
-        },
-        {
-          icon: 'wk wk-success',
-          title: '导入完成',
-          status: 'wait'
-        }
-      ],
-      resultData: null,
-      processData: {
-        count: 0,
-        status: ''
-      },
-      messageId: null,
-      intervalTimer: null,
-
-      historyPopoverShow: false
-    }
-  },
-  computed: {
-    ...mapGetters(['userInfo']),
-
-    crmTypeName() {
-      return (
-        {
-          customer: '客户',
-          leads: '线索',
-          contacts: '联系人',
-          product: '产品'
-        }[this.crmType] || ''
-      )
-    },
-
-    sureTitle() {
-      return {
-        1: '立即导入',
-        2: '最小化',
-        3: '确定'
-      }[this.stepsActive]
-    },
-
-    showCancel() {
-      return this.stepsActive != 2
-    },
-
-    fieldUniqueInfo() {
-      const uniqueList = this.fieldList.filter(item => {
-        return item.isUnique == 1
-      })
-
-      return uniqueList.map(item => {
-        return item.name
-      }).join('/') || '无'
-    }
-  },
-  watch: {
-    show: function(val) {
-      if (val) {
-        if (this.stepsActive == 1) {
-          if (this.userInfo) {
-            this.user = [this.userInfo]
-          }
-        }
-
-        this.getField()
-      } else {
-        if (this.stepsActive == 3) {
-          this.resetData()
-        }
-
-        this.fieldList = []
-      }
-    },
-
-    stepsActive() {
-      this.$emit('status', {
-        1: 'wait',
-        2: 'process',
-        3: 'finish'
-      }[this.stepsActive])
-    }
-
-    // file() {
-    //   this.getFirstStepStatus()
-    // },
-
-    // user() {
-    //   this.getFirstStepStatus()
-    // }
-
-  },
-  mounted() {
-  },
-  methods: {
-    sureClick() {
-      if (this.stepsActive == 1) {
-        if (this.stepList[0].status == 'finish') {
-          this.stepList[1].status = 'process'
-          this.stepsActive = 2
-          this.firstUpdateFile(res => {
-            this.messageId = res.data
-            this.secondQueryNum()
-            this.intervalTimer = setInterval(() => {
-              if (this.processData.status == 'end') {
-                clearInterval(this.intervalTimer)
-                this.intervalTimer = null
-                this.thirdQueryResult()
-              } else {
-                this.secondQueryNum()
-              }
-            }, 2000)
-          })
-        } else {
-          if (!this.file.name) {
-            this.$message.error('请选择导入文件')
-          } else if (
-            this.crmType != 'customer' &&
-            (!this.user || this.user.length == 0)
-          ) {
-            this.$message.error('请选择负责人')
-          }
-        }
-      } else {
-        this.closeView()
-      }
-    },
-
-
-    /**
-     * 第一步上传
-     */
-    firstUpdateFile(result) {
-      var params = {}
-      params.repeatHandling = this.config
-      params.file = this.file
-      params.ownerUserId = this.user.length > 0 ? this.user[0].userId : ''
-      var request = {
-        customer: crmCustomerExcelImport,
-        leads: crmLeadsExcelImport,
-        contacts: crmContactsExcelImport,
-        product: crmProductExcelImport
-      }[this.crmType]
-      this.loading = true
-      request(params)
-        .then(res => {
-          if (result) {
-            result(res)
-          }
-        })
-        .catch(() => {
-          if (result) {
-            result(false)
-          }
-          this.loading = false
-        })
-    },
-
-    /**
-     * 第二步查询数量
-     */
-    secondQueryNum() {
-      crmQueryImportNumAPI({ messageId: this.messageId })
-        .then(res => {
-          if (res.data === null) {
-            this.processData.status = 'end'
-          } else {
-            this.processData.status = ''
-            this.processData.count = res.data
-          }
-        })
-        .catch(() => {
-          // this.processData.status = 'err'
-        })
-    },
-
-    /**
-     * 第三部 查询结果
-     */
-    thirdQueryResult() {
-      crmQueryImportInfoAPI({ messageId: this.messageId })
-        .then(res => {
-          this.loading = false
-          this.stepList[1].status = 'finish'
-          this.stepsActive = 3
-          this.$emit('status', 'finish')
-          if (res) {
-            this.resultData = res
-            if (res.errSize > 0) {
-              this.stepList[2].status = 'error'
-            } else {
-              this.stepList[2].status = 'finish'
-            }
-          }
-        })
-        .catch(() => {})
-    },
-
-    /**
-     * 下载错误模板
-     */
-    downloadErrData() {
-      this.loading = true
-      crmDownImportErrorAPI({ messageId: this.messageId })
-        .then(res => {
-          downloadExcelWithResData(res)
-          this.loading = false
-        })
-        .catch(() => {
-          this.loading = false
-        })
-    },
-
-    // 下载模板操作
-    download() {
-      const request = {
-        customer: crmCustomerDownloadExcelAPI,
-        leads: crmLeadsDownloadExcelAPI,
-        contacts: crmContactsDownloadExcelAPI,
-        product: crmProductDownloadExcelAPI
-      }[this.crmType]
-      request()
-        .then(res => {
-          var blob = new Blob([res.data], {
-            type: 'application/vnd.ms-excel;charset=utf-8'
-          })
-          var downloadElement = document.createElement('a')
-          var href = window.URL.createObjectURL(blob) // 创建下载的链接
-          downloadElement.href = href
-          downloadElement.download =
-            decodeURI(
-              res.headers['content-disposition'].split('filename=')[1]
-            ) || '' // 下载后文件名
-          document.body.appendChild(downloadElement)
-          downloadElement.click() // 点击下载
-          document.body.removeChild(downloadElement) // 下载完成移除元素
-          window.URL.revokeObjectURL(href) // 释放掉blob对象
-        })
-        .catch(() => {})
-    },
-    // 选择文件
-    selectFile() {
-      document.getElementById('importInputFile').click()
-    },
-    /** 图片选择出发 */
-    uploadFile(event) {
-      var files = event.target.files
-      const file = files[0]
-      this.file = file
-      event.target.value = ''
-
-      // 阶段一状态
-      this.getFirstStepStatus()
-    },
-    // 用户选择
-    userSelect(data) {
-      if (data.value && data.value.length > 0) {
-        this.user = data.value
-      } else {
-        this.user = []
-      }
-
-      // 阶段一状态
-      this.getFirstStepStatus()
-    },
-
-    getFirstStepStatus() {
-      // 阶段一状态
-      const hasFile = this.file && this.file.size
-      const hasUser = this.user && this.user.length > 0
-
-      if (this.crmType === 'customer') {
-        this.stepList[0].status = hasFile ? 'finish' : 'wait'
-      } else {
-        this.stepList[0].status = hasFile && hasUser ? 'finish' : 'wait'
-      }
-    },
-
-    // 关闭操作
-    closeView() {
-      this.$emit('update:show', false)
-      this.$emit('close', this.stepsActive == 3 ? 'finish' : '')
-    },
-
-    /**
-     * 重置页面数据
-     */
-    resetData() {
-      this.config = 1
-      this.file = { name: '' }
-      this.user = []
-
-      this.stepsActive = 1
-      this.stepList = [
-        {
-          icon: 'wk wk-upload',
-          title: '上传文件',
-          status: 'wait'
-        },
-        {
-          icon: 'wk wk-data-import',
-          title: '导入数据',
-          status: 'wait'
-        },
-        {
-          icon: 'wk wk-success',
-          title: '导入完成',
-          status: 'wait'
-        }
-      ]
-      this.resultData = null
-      this.processData = {
-        count: 0,
-        status: ''
-      }
-      this.messageId = null
-    },
-
-    /**
-     * 获取验证字段
-     */
-    getField() {
-      var params = {
-        label: crmTypeModel[this.crmType]
-      }
-
-      filedGetField(params)
-        .then(res => {
-          this.fieldList = res.data
-        })
-        .catch(() => {
-        })
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.el-steps {
-  margin-bottom: 15px;
-
-  /deep/ .el-step__title {
-    font-size: 14px;
-  }
-
-  /deep/ .el-step.is-simple .el-step__arrow::before,
-  /deep/ .el-step.is-simple .el-step__arrow::after {
-    height: 10px;
-    width: 2px;
-  }
-
-  /deep/ .el-step.is-simple .el-step__arrow::after {
-    transform: rotate(45deg) translateY(3px);
-  }
-  /deep/ .el-step.is-simple .el-step__arrow::before {
-    transform: rotate(-45deg) translateY(-2px);
-  }
-}
-
-.step-section {
-  min-height: 300px;
-
-  /deep/ .el-loading-spinner {
-    top: 45%;
-    .el-icon-loading {
-      font-size: 40px;
-      color: #999;
-    }
-
-    .el-loading-text {
-      color: #333;
-    }
-  }
-}
-
-.sections {
-  font-size: 14px;
-  color: #333;
-
-  &__title {
-    font-weight: 600;
-  }
-
-  &__tips {
-    padding-left: 30px;
-    margin: 8px 0 15px;
-    color: #999;
-    font-size: 12px;
-    line-height: 1.4;
-  }
-
-  .download {
-    cursor: pointer;
-    color: #2362FB;
-  }
-
-}
-
-.sections__tips + .content {
-  padding-top: 0;
-}
-
-.content {
-  padding: 10px 10px 10px 30px;
-  .el-select {
-    width: 400px;
-  }
-  .user-cell {
-    width: 400px;
-  }
-}
-
-#importInputFile {
-  display: none;
-}
-
-.file-select {
-  .el-input {
-    width: 400px;
-  }
-  button {
-    margin-left: 20px;
-  }
-}
-
-.is-hidden {
-  visibility: hidden;
-}
-
-.history-btn {
-  float: left;
-  margin-left: 15px;
-}
-
-
-// 结果信息
-.result-info {
-  text-align: center;
-  padding-top: 80px;
-
-  &__icon {
-    font-size: 40px;
-    color: #3E84E9;
-  }
-
-  &__des {
-    margin-top: 15px;
-    color: #333;
-    font-size: 14px;
-  }
-
-  &__detail {
-    margin-top: 15px;
-    font-size: 12px;
-    color: #666;
-    &--all {
-      color: #333;
-      font-weight: 600;
-    }
-
-    &--suc {
-      color: #3E84E9;
-      font-weight: 600;
-    }
-
-    &--err {
-      color: #f94e4e;
-      font-weight: 600;
-    }
-  }
-
-  &__btn--err {
-    margin-top: 10px;
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/CRMImport.vue b/code/WebApp/vue/src/views/newJit/components/CRMImport.vue
deleted file mode 100644
index 0ccf73ac..00000000
--- a/code/WebApp/vue/src/views/newJit/components/CRMImport.vue
+++ /dev/null
@@ -1,591 +0,0 @@
-<template>
-  <el-dialog
-    :visible="show"
-    :title="'导入'+crmTypeName"
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    width="600px" 
-    @close="closeView">
-   <div class="dialog-body">
-      <div v-if="stepsActive == 1" class="step-section">
-       
-         <div class="sections">
-          <div class="sections__title" v-loading="loading">
-            一、初始生成模板：
-            <span class="download" @click="createTemplate">点击生成《{{ crmTypeName }}导入模板》</span>
-           <div class="sections__tips">通过值映射，可保持生成的模板最新，例如自动生成下拉列表项！</div>
-          </div>
-        </div>
-        <div class="sections">
-          <div class="sections__title">
-            二、请按照数据模板的格式准备要导入的数据。
-            <span class="download" @click="download">点击下载《{{ crmTypeName }}导入模板》</span>
-          </div>
-          <div class="sections__tips">1、模板名称可以进行修改，但不要删除模板中设置的字段！</div>
-          <div class="sections__tips" style="margin-top:-10px;">2、必填项列头会标红标*！</div>
-           <div class="sections__tips" style="margin-top:-10px;">3、导入文件请勿超过2MB！且只能上传Excel，但不支持“.xls”文件，即不支持Excel97-2003!</div>
-        </div>
-        <div class="sections">
-          <div class="sections__title">三、请选择需要导入的文件</div>
-          <div class="content">
-            <flexbox class="file-select">
-               <el-upload
-                  ref="upload"
-                    class="avatar-uploader"
-                    drag
-                    action="#"
-                    :http-request="httpRequestfiles"
-                    :headers="httpHeader"
-                    :file-list="fileuploadList"
-                    :before-upload="beforeAvatarUpload"
-                    :before-remove="beforeRemove"
-                    :on-remove="handleRemove"
-                    multiple
-                    :limit="1">
-                    <i class="el-icon-upload" ></i>
-                      <div class="el-upload__text">
-                          将文件拖到此处，或
-                          <em>点击上传</em>
-                      </div>
-              </el-upload>
-            </flexbox>
-          </div>
-        </div>
-       
-      </div>
-
-      <div
-        v-loading="loading"
-        v-else-if="stepsActive == 2"
-        element-loading-text="数据导入中,请耐心等待..."
-        element-loading-spinner="el-icon-loading"
-        class="step-section"
-      />
-
-        <div
-        v-loading="loading"
-        v-else-if="stepsActive == 3"
-        class="step-section">
-        <div class="result-info">
-        <el-card style="height:300px;margin-top:-20px" shadow="always">
-          <i class="wk wk-success result-info__icon" />
-          <p class="result-info__des">数据导入结果：</p>
-          <!-- <p class="result-info__detail">导入总数据<span class="result-info__detail--all">{{ this.resultData.totalSize }}</span>条，导入成功<span class="result-info__detail--suc">{{ this.resultData.totalSize - this.resultData.errSize }}</span>条，导入失败<span class="result-info__detail--err">{{ this.resultData.errSize }}</span>条</p> -->
-          <p class="result-info__detail">导入总数据<span class="result-info__detail--all">{{ this.resultData.totalSize }}</span>条，导入成功<span class="result-info__detail--suc">{{ this.resultData.succeessSize }}</span>条，导入失败<span class="result-info__detail--err">{{ this.resultData.errSize }}</span>条</p>
-          <el-button
-            v-if="this.resultData && this.resultData.errSize > 0"
-            class="result-info__btn--err"
-            type="text"
-            @click="downloadErrData">下载错误数据</el-button>
-          </el-card>
-        </div>
-      </div>
-
-      <div
-        v-loading="loading"
-        v-else-if="stepsActive ==4"
-        class="step-section">
-        <div class="result-info">
-          <el-card style="height:300px" shadow="always">
-          <i class="wk wk-success result-info__icon" />
-          <p class="result-info__des">数据导入结果：</p>
-          <!-- <p class="result-info__detail">导入总数据<span class="result-info__detail--all">{{ this.resultData.totalSize }}</span>条，导入成功<span class="result-info__detail--suc">{{ this.resultData.totalSize - this.resultData.errSize }}</span>条，导入失败<span class="result-info__detail--err">{{ this.resultData.errSize }}</span>条</p> -->
-          <p class="result-info__detail">导入总数据<span class="result-info__detail--all">{{ this.resultData.totalSize }}</span>条，导入成功<span class="result-info__detail--suc">{{ this.resultData.succeessSize }}</span>条，当前失败<span class="result-info__detail--err">{{ this.resultData.errSize }}</span>条</p>
-           <p class="result-info__detail--err" >数据错误信息：</p>
-          <p class="result-info__detail">{{this.resultData.errMessage}}</p>
-           </el-card>
-        </div>      
-      </div>
-     
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-popover
-        v-model="historyPopoverShow"
-        placement="top"
-        width="800"
-        popper-class="no-padding-popover"
-        trigger="click"
-      >
-        
-      </el-popover>
-
-      <!-- <el-button  @click="closeView">取消</el-button> -->
-      <el-button
-        :class="{ 'is-hidden': !showCancel }"
-        @click="closeView">取消</el-button>
-       <el-button
-        v-if="sureTitle"
-        type="primary"
-        @click="sureClick">{{ sureTitle }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-
-import {downloadFile} from '@/utils/crmindex.js'
-import { getToken } from '@/utils/auth' // get token from cookie
-//业务--生成模板接口
-import { winUomGroupExcelImportTemplate,winUomGroupExcelImport} from '@/api/uomGroup/uomGroup'
-
-
-
-export default {
-  name: "CRMImport", // 文件导入
-  props: {
-    show: {
-      type: Boolean,
-      default: false,
-    },
-    // CRM类型
-    crmType: {
-      type: String,
-      default: "",
-    },
-  },
-  data() {
-    return {
-      loading: false,
-      fieldList: [],
-      config: 1, // 	1 覆盖，2跳过
-      //file: { name: "" },
-      user: [],
-
-      stepsActive: 1,
-      stepList: [
-        {
-          icon: "wk wk-upload",
-          title: "上传文件",
-          status: "wait",
-        },
-        {
-          icon: "wk wk-data-import",
-          title: "导入数据",
-          status: "wait",
-        },
-        {
-          icon: "wk wk-success",
-          title: "导入完成",
-          status: "wait",
-        },
-      ],
-      //resultData: null,
-      resultData:{
-        totalSize:0,
-        errSize:0,
-        errTemplate:"",
-        errMessage:""
-      },
-      processData: {
-        count: 0,
-        status: "",
-      },
-      messageId: null,
-      intervalTimer: null,
-      fileuploadList:[],
-      isLt2M:"",
-      isFileType:"",
-      historyPopoverShow: false,
-    };
-  },
-   computed: {
-    sureTitle() {
-      return {
-        1: '立即导入',
-        2: '最小化',
-        3: '确定'
-      }[this.stepsActive]
-    },
-    showCancel() {
-      return this.stepsActive != 2
-    },
-    crmTypeName() {//根据传入的crmType进行翻译
-      return (
-        {
-          uomGroup: "计量单位组",
-        }[this.crmType] || ""
-      );
-    },
-    getImportTemplate() {//模板名称
-      return (
-        {
-          uomGroup: '计量单位组信息导入模板.xlsx',
-        }[this.crmType] || ""
-      );
-    },
-     httpHeader() {
-      return {
-        'Authorization':'Bearer ' + getToken()
-      }
-    }
-  },
-  watch: {
-    show: function (val) {
-       if (val) {
-        this.stepsActive = 1
-      } else {
-        if (this.stepsActive == 3) {
-          //以下是重置数据
-          this.stepsActive = 1
-          this.stepList = [
-            {
-              icon: 'wk wk-upload',
-              title: '上传文件',
-              status: 'wait'
-            },
-            {
-              icon: 'wk wk-data-import',
-              title: '导入数据',
-              status: 'wait'
-            },
-            {
-              icon: 'wk wk-success',
-              title: '导入完成',
-              status: 'wait'
-            }
-          ]
-          this.resultData = null
-        }
-      }
-    },
-
-    stepsActive() {
-      this.$emit(
-        "status",
-        {
-          1: "wait",
-          2: "process",
-          3: "finish",
-        }[this.stepsActive]
-      );
-    },
-  },
-  mounted() {},
-  methods: {
-    handleImportExcelClick() {//父组件中，初始化此子组件时调用
-      this.fileuploadList = [];
-      //this.$refs.upload.clearFiles();
-    },
-    httpRequestfiles(data) {
-      let _this = this;
-      let rd = new FileReader(); // 创建文件读取对象
-      let file = data.file;
-      this.fileuploadList.push(file);
-      rd.readAsDataURL(file); // 文件读取装换为base64类型
-    },
-     beforeAvatarUpload(file) {
-      var FileExt = file.name.replace(/.+\./, "");       
-        if (['xlsx'].indexOf(FileExt.toLowerCase()) === -1){            
-            this.$message({ 
-                type: 'warning', 
-                message: '只支持xlsx类型文件！' 
-            });   
-            this.isFileType="0"             
-            return false;       
-        } 
-        else{
-            this.isFileType="1"
-        } 
-      this.isLt2M = file.size / 1024 / 1024 < 2?'1':'0'; 
-      if (this.isLt2M==="0") {
-        this.$message.error("上传文件大小不能超过 2MB!");
-      }
-      return this.isLt2M==='1'?true: false;
-    },
-    beforeRemove(file, fileList) {
-        if (this.isLt2M==="1" && this.isFileType==="1") {
-         return this.$confirm(`确定移除 ${ file.name }？`);
-        }
-    },
-    handleRemove(file, fileList) {//附件列表删除操作
-      const index=this.fileuploadList.indexOf(file.originFileObj)
-      const newFileList=this.fileuploadList.slice()
-      newFileList.splice(index,1)
-      this.fileuploadList = newFileList;
-    },
-    //执行按钮
-    sureClick() {
-      if (this.fileuploadList===[] || JSON.stringify(this.fileuploadList) === "[]") {
-        this.$message.error("请选择导入文件");
-        return false;
-      }
-      if (this.stepsActive == 1) {
-        if (this.stepList[0].status == "wait") {
-           this.stepsActive = 2;
-           this.loading = true; 
-           setTimeout(() => {
-             this.saveTemplateData();
-            }, 2000)
-           if( this.stepList[1].status == 'finish')
-           {
-
-           }
-        } else {
-          if (this.fileuploadList === "[]") {
-            this.$message.error("请选择导入文件");
-          } 
-        }
-      } else {
-        this.closeView();
-      }
-    },
-    
-    saveTemplateData() {//保存项目、合同管理、客户等信息的共用方法
-      //--上传附件，批量或拖拽
-      if (JSON.stringify(this.fileuploadList) != "[]") {
-        let fd = new FormData();
-        const{fileuploadList}=this;
-        fileuploadList.forEach(file=>{
-            fd.append("files", file); // 添加文件
-        })
-        console.log("fd:"+JSON.stringify(fd))
-        var request = {
-            uomGroup: winUomGroupExcelImport
-        }[this.crmType]
-         request(fd)
-            .then((res) => {//此处，导出模板上设置的错误
-              this.loading = false;
-              this.resultData = res;
-              if(res.errSize>0 && res.errMessage==="RowErrors"){//上传有错误数据 && res.errMessage.length <= 0
-                this.stepList[0].status = 'wait';
-                this.resultData.errSize=res.errSize;//错误数据个数
-                this.resultData.errTemplate=res.errTemplate;//指定错误模板名称，作为参数，用于错误模板下载
-                this.stepsActive = 3;
-              }
-              else{
-                if(res.errMessage.length > 0 && res.errMessage !="SccessData"){//此处，是判断数据库中是否匹配
-                  this.stepsActive = 4;
-                }
-                else {
-                  this.stepList[1].status = 'finish'
-                  this.resultData.totalSize=res.totalSize;//返回导入成功的数据总数
-                  if (this.isLt2M==="1" 
-                    && this.isFileType==="1"
-                    && res.errMessage ==="SccessData"
-                    && res.totalSize>0) {
-                    this.$notify({
-                      title: "成功",
-                      message: "数据导入成功！",
-                      type: "success",
-                      duration: 2000,
-                    });
-                  }
-                  this.stepsActive = 3;
-                }
-              }
-              this.$emit("save-success", {
-                type: this.crmType
-              });
-              this.$emit('status', 'finish');
-            })
-            .catch(() => {this.loading = false;});
-          } else {
-            this.loading = false;
-            this.$message({
-                message: "未上传任何附件，请查检！",
-                type: "warning",
-              });
-            }
-    },
-
-     /**
-     * 下载错误模板数据等（统一接口） 
-     */
-    downloadErrData() {
-      var fileName=this.getImportTemplate;
-      this.$axios
-        .BolbGets("/api/basedataservice/exceltemplate/downloadExcelFiles/" + this.resultData.errTemplate)
-        .then((response) => {
-            downloadFile(response,fileName);
-       });
-    },
-    /**
-     * 生成模板，引入相关业务接口 
-     */
-    createTemplate(){
-    var request = {
-        uomGroup: winUomGroupExcelImportTemplate
-      }[this.crmType]
-      //this.loading = true
-      request()
-        .then(res => {
-            result(res)
-            this.loading = false
-            this.$notify({
-                    title: "成功",
-                    message: "模板生成成功！",
-                    type: "success",
-                    duration: 2000,
-                });
-        })
-        .catch(() => {
-          this.loading = false
-        })
-    },
-    // 下载模板操作)(统一接口)
-    download() {
-       var fileName=this.getImportTemplate;
-       this.loading = true
-       this.$axios
-        .BolbGets("/api/basedataservice/exceltemplate/downloadExcelTemplate/" + fileName)
-        .then((response) => {
-          downloadFile(response,fileName);
-          this.loading = false
-      })
-      .catch(() => {
-          this.loading = false
-        });
-    },
-    // 关闭操作
-    closeView() {
-      this.$emit("update:show", false);
-      this.$emit("close", this.stepsActive == 3 ? "finish" : "");
-    }
-
-  },
-};
-</script>
-<style scoped lang="scss">
-@import '@/styles/xr-theme.scss';
-.el-steps {
-  margin-bottom: 15px;
-
-  /deep/ .el-step__title {
-    font-size: 14px;
-  }
-
-  /deep/ .el-step.is-simple .el-step__arrow::before,
-  /deep/ .el-step.is-simple .el-step__arrow::after {
-    height: 10px;
-    width: 2px;
-  }
-
-  /deep/ .el-step.is-simple .el-step__arrow::after {
-    transform: rotate(45deg) translateY(3px);
-  }
-  /deep/ .el-step.is-simple .el-step__arrow::before {
-    transform: rotate(-45deg) translateY(-2px);
-  }
-}
-
-.step-section {
-  min-height: 300px;
-
-  /deep/ .el-loading-spinner {
-    top: 45%;
-    .el-icon-loading {
-      font-size: 40px;
-      color: #999;
-    }
-
-    .el-loading-text {
-      color: #333;
-    }
-  }
-}
-
-.sections {
-  font-size: 14px;
-  color: #333;
-
-  &__title {
-    font-weight: 600;
-  }
-
-  &__tips {
-    padding-left: 30px;
-    margin: 8px 0 15px;
-    color: #999;
-    font-size: 12px;
-    line-height: 1.4;
-  }
-
-  .download {
-    cursor: pointer;
-    color: #2362fb;
-  }
-}
-
-.sections__tips + .content {
-  padding-top: 0;
-  
-}
-
-.content {
-  padding: 10px 10px 10px 30px;
-  .el-select {
-    width: 400px;
-  }
-  .user-cell {
-    width: 400px;
-  }
-}
-
-#importInputFile {
-  display: none;
-}
-
-.file-select {
-  .el-input {
-    width: 400px;
-  }
-  button {
-    margin-left: 20px;
-  }
-}
-
-.is-hidden {
-  visibility: hidden;
-}
-
-.history-btn {
-  float: left;
-  margin-left: 15px;
-}
-
-// 结果信息
-.result-info {
-  text-align: center;
-  padding-top: 50px;
-
-  &__icon {
-    font-size: 40px;
-    color: $xr-color-primary;
-  }
-
-  &__des {
-    margin-top: -15px;
-    color: #333;
-    font-size: 30px;
-  }
-
-  &__detail {
-    margin-top: 35px;
-    font-size: 20px;
-    color: #666;
-    &--all {
-      color: #333;
-      font-weight: 600;
-    }
-
-    &--suc {
-      color: $xr-color-primary;
-      font-weight: 600;
-    }
-
-    &--err {
-      margin-top: 25px;
-      color: #f94e4e;
-      font-weight: 600;
-    }
-  }
-
-  &__btn--err {
-    margin-top: 10px;
-    font-size: 20px;
-  }
-}
-</style>
-
-
-
diff --git a/code/WebApp/vue/src/views/newJit/components/CRMListHead.vue b/code/WebApp/vue/src/views/newJit/components/CRMListHead.vue
deleted file mode 100644
index 9e103975..00000000
--- a/code/WebApp/vue/src/views/newJit/components/CRMListHead.vue
+++ /dev/null
@@ -1,266 +0,0 @@
-<template>
-  <div class="c-container">
-    <div class="title">{{ title }}</div>
-    <!-- <el-input
-      :placeholder="placeholder"
-      v-model="inputContent"
-      class="sc-container"
-      @input="inputChange"
-      @keyup.enter.native="searchInput" v-show="showSearch">
-      <el-button
-        slot="append"
-        icon="el-icon-search"
-        @click.native="searchInput"/>
-    </el-input> -->
-    <div class="right-container">
-      <el-button
-        size="small"
-        type="primary"
-        @click="createClick">{{ createTitle }}</el-button>
-      <el-dropdown
-        v-if="moreTypes.length > 0"
-        trigger="click"
-        @command="handleTypeDrop">
-        <flexbox class="right-more-item">
-          <div>更多</div>
-          <i
-            class="el-icon-arrow-down el-icon--right"
-            style="color:#777;"/>
-        </flexbox>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item
-            v-for="(item, index) in moreTypes"
-            :key="index"
-            :command="item.type">{{ item.name }}</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-    <c-r-m-create-view
-      v-if="isCreate"
-      :crm-type="createCRMType"
-      :action="createActionInfo"
-      @save-success="createSaveSuccess"
-      @hiden-view="hideView"
-      width='700px'
-    />
-    <c-r-m-import
-      :show="showCRMImport"
-      :crm-type="crmType"
-      @save-success="createSaveSuccess"
-      @close="showCRMImport=false"/>
-    <c-r-m-export
-      :show="showCRMExport"
-      :crm-type="crmType"
-      :search="search"
-      :scene_id="scene_id"
-      :filter-obj="filterObj"
-      :export-params="exportParams"
-      @close="showCRMExport=false"/>
-  </div>
-</template>
-
-<script type="text/javascript">
-import { mapGetters } from 'vuex'
-import CRMCreateView from './CRMCreateView'
-import CRMImport from './CRMImport'
-import CRMExport from './CRMExport'
-import crmTypes from "../../../../static/crmTypes";
-
-export default {
-  name: 'CRMListHead', // 客户管理下 重要提醒 回款计划提醒
-  components: {
-    CRMCreateView,
-    CRMImport,
-    CRMExport
-  },
-  props: {
-    showSearch:{
-      type: Boolean,
-      default: true
-    },
-
-    // CRM类型
-    crmType: {
-      type: String,
-      default: ''
-    },
-    search: String,
-    scene_id: {
-      type: [Number, String],
-      default: ''
-    },
-    filterObj: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-    title: {
-      type: String,
-      default: ''
-    },
-    placeholder: {
-      type: String,
-      default: '请输入内容'
-    },
-    createTitle: {
-      type: String,
-      default: ''
-    },
-    inputContent: '',
-    /** 更多操作 */
-    moreTypes: [],
-    // 创建的相关信息
-    createActionInfo: { type: 'create' },
-    createCRMType: '',
-    isCreate: false, // 是创建
-    // 导入
-    showCRMImport: false,
-    // 导出
-    showCRMExport: false,
-    // 导出选中参数
-    exportParams: {}
-    }
-  },
-  computed: {
-    // ...mapGetters(['crm']),
-    // canSave() {
-    //   if (this.isSeas) {
-    //     return false
-    //   }
-    //   return this.crm[this.crmType].save
-    // }
-  },
-  mounted() {
-    // 线索和客户判断更多操作
-    
-    this.getTitle();
-    if (!this.isSeas) {
-      //if (this.crm[this.crmType].excelimport) {
-        this.moreTypes.push({ type: 'enter', name: '导入' })
-      //}
-      //if (this.crm[this.crmType].excelexport) {
-        this.moreTypes.push({ type: 'out', name: '导出全部' })
-     // }
-    } else {
-      // 客户池的导出关键字不同
-      //if (this.crm.pool.excelexport) {
-        this.moreTypes.push({ type: 'out', name: '导出全部' })
-     // }
-    }
-  },
-  methods: {
-    getTitle() {
-      let type=crmTypes[this.crmType];
-      if(type===undefined)
-      { 
-        this.title=this.crmType+'管理';
-        this.createTitle='新增'+this.crmType;
-      }
-      else
-      {
-        this.title= type.name+'管理'
-        this.createTitle='新增'+type.name;
-      }   
-    },
-
-    handleTypeDrop(command, params = {}) {
-      if (command == 'out') {
-        let paramsData = {}
-        if (params.__export) {
-          paramsData = params
-          delete paramsData.__export
-        } else {
-          paramsData = {}
-        }
-        this.exportParams = paramsData
-        this.showCRMExport = true
-      } else if (command == 'enter') {
-        this.showCRMImport = true
-      }
-    },
-    createClick() {
-
-      this.createCRMType = this.crmType
-      this.createActionInfo = { type: 'save' }
-      this.isCreate = !this.isCreate
-    },
-    inputChange() {
-      this.$emit('update:search', this.inputContent)
-    },
-    // 进行搜索操作
-    searchInput() {
-      this.$emit('on-search', this.inputContent)
-    },
-    // 创建数据页面 保存成功
-    createSaveSuccess(data) {
-      if (data && data.saveAndCreate) {
-        if (data.type == 'customer') {
-          this.createCRMType = 'contacts'
-          this.createActionInfo = {
-            type: 'relative',
-            crmType: 'customer',
-            data: {}
-          }
-          this.createActionInfo.data['customer'] = data.data
-          this.isCreate = true
-        }
-      } else {
-        // 回到保存成功
-        this.$emit('on-handle', { type: 'save-success' })
-      }
-    },
-    hideView() {
-      this.isCreate = false
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.c-container {
-  height: 60px;
-  position: relative;
-  z-index: 100;
-  .title {
-    float: left;
-    padding: 0 20px;
-    font-size: 18px;
-    line-height: 60px;
-  }
-  .sc-container {
-    width: 300px;
-    margin: -18px 0 0 -150px;
-    position: absolute;
-    left: 50%;
-    top: 50%;
-  }
-
-  .right-container {
-    margin-right: -10px;
-    float: right;
-    margin: 12px 20px 0 0;
-    position: relative;
-    .right-item {
-      float: left;
-      margin-right: 10px;
-      padding: 8px 10px;
-      font-size: 13px;
-      border-radius: 2px;
-    }
-
-    .right-more-item {
-      cursor: pointer;
-      border: 1px solid #dcdfe6;
-      background-color: white;
-      font-size: 13px;
-      color: #777;
-      padding: 0 12px;
-      border-radius: 2px;
-      height: 31px;
-    }
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/CRMTableHead.vue b/code/WebApp/vue/src/views/newJit/components/CRMTableHead.vue
deleted file mode 100644
index 3ff145da..00000000
--- a/code/WebApp/vue/src/views/newJit/components/CRMTableHead.vue
+++ /dev/null
@@ -1,399 +0,0 @@
-<template>
-  <div>
-    <flexbox v-show="selectionList.length == 0" class="th-container">
-      <!-- <div v-if="!isSeas">场景：</div>
-      <div @click="getAllClick" class="condition_title">
-        {{ sceneData.name || getDefaultSceneName() }}
-      </div> -->
-      <img
-        :style="{ 'margin-left': isSeas ? 0 : '30px' }"
-        class="c-filtrate"
-        src="@/assets/img/c_filtrate.png"
-        @click="showFilterClick"
-      />
-      <div class="condition_title" @click="showFilterClick">高级筛选</div>
-      <filter-form
-        :field-list="fieldList"
-        :dialog-visible.sync="showFilter"
-        :obj="filterObj"
-        :crm-type="crmType"
-        :is-seas="isSeas"
-        @filter="handleFilter"
-      />
-    </flexbox>
-
-    <scene-set
-      :dialog-visible.sync="showSceneSet"
-      :crm-type="crmType"
-      @save-success="updateSceneList"
-    />
-    <scene-create
-      :field-list="fieldList"
-      :crm-type="crmType"
-      :dialog-visible.sync="showSceneCreate"
-      :obj="sceneFilterObj"
-      @saveSuccess="updateSceneList"
-    />
-  </div>
-</template>
-
-<script type="text/javascript">
-import { mapGetters } from "vuex";
-import crmTypeModel from "@/views/ux/model/crmTypeModel";
-//获取表格列
-import {
-  filterIndexfields,
-  // crmSceneSave
-} from "@/api/ux/common";
-
-import filterForm from "./filterForm";
-import filterContent from "./filterForm/filterContent";
-import SceneSet from "./sceneForm/SceneSet"; // 场景设置
-import SceneCreate from "./sceneForm/SceneCreate";
-import data from "../../../../static/tableFieldForSearch";
-import crmtypes from "../../../../static/crmTypes";
-
-export default {
-  name: "CRMTableHead", // 客户管理下 重要提醒 回款计划提醒
-  components: {
-    filterForm,
-    filterContent,
-    SceneCreate,
-    SceneSet,
-  },
-  props: {
-    title: {
-      type: String,
-      default: "",
-    },
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: "",
-    },
-    // 辅助 使用 公海没有场景
-    isSeas: {
-      type: Boolean,
-      default: false,
-    },
-    //父ID,主要用于批量删除
-    parentID: {
-      type: String,
-      default: "",
-    },
-  },
-  data() {
-    return {
-      sceneTypes: [
-        { type: "enter", name: "我负责的" },
-        { type: "out", name: "我" },
-      ],
-      sceneType: null,
-      showScene: false, // 场景操作
-      showFilter: false, // 控制筛选框
-      fieldList: [],
-      filterObj: { form: [] }, // 筛选确定数据
-
-      sceneData: { id: "", bydata: "", name: "" },
-      showSceneSet: false, // 展示场景设置
-      showSceneCreate: false, // 展示场景添加
-      sceneFilterObj: { form: [] }, // 筛选确定数据
-
-      /** 勾选操作数据 */
-      selectionList: [],
-      transferDialogShow: false,
-      teamsDialogShow: false, // 团队操作提示框
-      teamsTitle: "", // 团队操作标题名
-      allocDialogShow: false, // 公海分配操作提示框
-      dealStatusShow: false, // 成交状态修改框
-      crmTypes: {},
-    };
-  },
-  computed: {},
-  watch: {},
-  mounted() {},
-  methods: {
-    /** 发布 时候的类型选择 */
-    handleTypeDrop(command) {
-      this.sceneType = command;
-    },
-    /** 搜索全部 */
-    getAllClick() {
-      //清空搜索条件
-      this.filterObj = { form: [] };
-      this.$emit("filter", null);
-    },
-    /** 展示高级筛选 */
-    showFilterClick() {
-      this.getFilterFieldInfo();
-    },
-    // 获取高级筛选字段数据
-    getFilterFieldInfo() {
-      this.fieldList = data[this.crmType].data;
-      this.showFilter = true;
-    },
-    handleFilter(form) {
-      this.showFilter = false;
-      if (form === null) {
-        this.$emit("filter", null);
-      } else {
-        this.filterObj = form;
-        this.showFilter = false;
-        if (form.saveChecked) {
-          crmSceneSave({
-            type: crmTypeModel[this.crmType],
-            isDefault: form.saveDefault ? 1 : 0,
-            name: form.saveName,
-            data: JSON.stringify(form.obj),
-          })
-            .then((res) => {
-              this.updateSceneList();
-            })
-            .catch(() => {});
-        }
-        this.$emit("filter", form.obj);
-        //this.$emit('filter', form.form)
-      }
-    },
-    //清空条件
-    handleClearField() {
-      this.filterObj = data.obj;
-    },
-    // 场景操作
-    /** 选择了场景 */
-    sceneSelect(data) {
-      this.sceneData = data;
-      this.$emit("scene", data);
-    },
-    sceneHandle(data) {
-      if (data.type == "set") {
-        this.showSceneSet = true;
-      } else if (data.type == "add") {
-        filterIndexfields({
-          label: crmTypeModel[this.crmType],
-        })
-          .then((res) => {
-            this.fieldList = res.data;
-            this.showSceneCreate = true;
-          })
-          .catch(() => {});
-      }
-    },
-    /**  创建保存成功 */
-    updateSceneList() {
-      this.$refs.sceneList.getSceneList();
-    },
-    /** 勾选后的表头操作 */
-    headSelectionChange(array) {
-      this.selectionList = array;
-    },
-    /** 操作 */
-    selectionBarClick(type) {
-      var message = "";
-      if (type == "export") {
-        message = "确定要导出这些数据嘛?";
-      } else if (type == "delete") {
-        message = "确定要删除这些数据嘛?";
-      }
-      this.$confirm(message, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.confirmHandle(type);
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-
-    confirmHandle(type) {
-      if (type === "export") {
-        this.handleExport();
-      }
-    },
-    handleExport() {
-      const params = {};
-      params["ids"] = this.selectionList
-        .map((item) => {
-          return item[this.crmType + "Id"];
-        })
-        .join(",");
-      params.__export = true;
-      this.$emit("exportData", params);
-    },
-
-    deleteItemsCallBack() {
-      this.$message({
-        type: "success",
-        message: "删除成功",
-      });
-      this.$emit("handle", { type: "delete" });
-    },
-    /** 获取展示items */
-    getSelectionHandleItemsInfo() {
-      const handleInfos = {
-        export: {
-          name: "导出选中",
-          type: "export",
-          icon: require("@/assets/img/selection_export.png"),
-        },
-        delete: {
-          name: "批量删除",
-          type: "delete",
-          icon: require("@/assets/img/selection_delete.png"),
-        },
-      };
-
-      return this.forSelectionHandleItems(handleInfos, ["export", "delete"]);
-    },
-    forSelectionHandleItems(handleInfos, array) {
-      var tempsHandles = [];
-      for (let index = 0; index < array.length; index++) {
-        tempsHandles.push(handleInfos[array[index]]);
-      }
-      return tempsHandles;
-    },
-    // 判断是否展示
-    whetherTypeShowByPermision: function (type) {
-      if (type == "transfer") {
-        return this.sceneData.bydata == "transform"
-          ? false
-          : this.crm[this.crmType].transfer;
-      } else if (type == "transform") {
-        return this.sceneData.bydata == "transform"
-          ? false
-          : this.crm[this.crmType].transform;
-      } else if (type == "export") {
-        if (this.isSeas) {
-          return this.crm.pool.excelexport;
-        }
-        return this.crm[this.crmType].excelexport;
-      } else if (type == "delete") {
-        return this.crm[this.crmType].delete;
-      } else if (type == "put_seas") {
-        // 放入公海(客户)
-        return this.crm[this.crmType].putinpool;
-      } else if (type == "lock" || type == "unlock") {
-        // 锁定解锁(客户)
-        return (
-          this.crm[this.crmType].lock && this.CRMConfig.customerConfig == 1
-        );
-      } else if (type == "add_user" || type == "delete_user") {
-        // 添加 移除团队成员
-        return this.crm[this.crmType].teamsave;
-      } else if (type == "alloc") {
-        // 分配(公海)
-        return this.crm.pool.distribute;
-      } else if (type == "get") {
-        // 领取(公海)
-        return this.crm.pool.receive;
-      } else if (type == "start") {
-        // 上架 下架(产品)
-        for (let index = 0; index < this.selectionList.length; index++) {
-          const element = this.selectionList[index];
-          if (element.是否上下架 == "上架") {
-            return false;
-          }
-        }
-        return this.crm[this.crmType].status;
-      } else if (type == "disable") {
-        // 上架 下架(产品)
-        for (let index = 0; index < this.selectionList.length; index++) {
-          const element = this.selectionList[index];
-          if (element.是否上下架 == "下架") {
-            return false;
-          }
-        }
-        return this.crm[this.crmType].status;
-      } else if (type == "deal_status") {
-        // 客户状态修改
-        return this.crm[this.crmType].dealStatus;
-      }
-      return true;
-    },
-    // 子组件 回调的 结果
-    handleCallBack(data) {
-      this.$emit("handle", { type: data.type });
-    },
-    // 获取默认场景名字
-    getDefaultSceneName() {
-      //add-场景
-      this.crmTypes = crmtypes;
-      let type = this.crmTypes[this.crmType];
-      if (type === undefined) {
-        return "全部" + this.crmType;
-      } else {
-        return "全部" + type.name;
-      }
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-@import "../../../styles/xr-theme";
-.th-container {
-  font-size: 13px;
-  height: 50px;
-  padding: 0 20px;
-}
-/** 场景和筛选 */
-.condition_title {
-  cursor: pointer;
-}
-.condition_title:hover {
-  color: $xr-color-primary;
-}
-
-.m-arrow {
-  margin: 0 8px;
-}
-.c-filtrate {
-  margin: 0 10px 0 30px;
-  width: 12px;
-}
-
-/** 勾选操作 */
-.selection-bar {
-  font-size: 12px;
-  height: 50px;
-  padding: 0 20px;
-  color: #777;
-
-  .selected—title {
-    flex-shrink: 0;
-    padding-right: 20px;
-    border-right: 1px solid $--table-border-color;
-    .selected—count {
-      color: $xr-color-primary;
-    }
-  }
-}
-
-.selection-items-box {
-  overflow-x: auto;
-  overflow-y: hidden;
-  .selection-item {
-    width: auto;
-    padding: 15px;
-    flex-shrink: 0;
-    .selection-item-icon {
-      display: block;
-      margin-right: 5px;
-      width: 15px;
-      height: 15px;
-    }
-    .selection-item-name {
-      cursor: pointer;
-      color: #777;
-    }
-    .selection-item-name:hover {
-      color: $xr-color-primary;
-    }
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/MixAdd.vue b/code/WebApp/vue/src/views/newJit/components/MixAdd.vue
deleted file mode 100644
index 6083d3c4..00000000
--- a/code/WebApp/vue/src/views/newJit/components/MixAdd.vue
+++ /dev/null
@@ -1,601 +0,0 @@
-<template>
-  <div class="mix-container">
-    <div class="i-cont">
-      <el-input
-        ref="textarea"
-        v-model="content"
-        :autosize="inputAutosize"
-        type="textarea"
-        clearable
-        resize="none"
-        placeholder="请输入内容"
-        @focus="inputFocus"/>
-    </div>
-    <section
-      v-if="imgFiles.length > 0"
-      class="img-cont">
-      <flexbox wrap="wrap">
-        <div
-          v-for="(item, index) in imgFiles"
-          :key="index"
-          :style="{ 'background-image': 'url('+item.url+')' }"
-          class="img-item"
-          @mouseover="mouseImgOver(item, index)"
-          @mouseleave="mouseImgLeave(item, index)">
-          <div
-            v-if="item.showDelete"
-            class="img-delete"
-            @click="deleteImgOrFile('image', item, index)">×</div>
-        </div>
-        <div class="img-item-add">
-          <input
-            type="file"
-            class="img-item-iput"
-            accept="image/*"
-            multiple
-            @change="uploadFile">
-        </div>
-      </flexbox>
-      <div
-        class="img-bar"
-        @click="deleteAllImg">全部删除</div>
-    </section>
-    <section
-      v-if="files.length > 0"
-      class="file-cont">
-      <flexbox class="f-header">
-        <img
-          class="f-logo"
-          src="@/assets/img/send_file.png">
-        <div class="f-name">附件</div>
-      </flexbox>
-      <div class="f-body">
-        <flexbox
-          v-for="(item, index) in files"
-          :key="index"
-          class="f-item">
-          <img
-            :src="item.icon"
-            class="f-img">
-          <div class="f-name">{{ item.name+'('+item.size+')' }}</div>
-          <div
-            class="close-button"
-            @click="deleteImgOrFile('file', item, index)">×</div>
-        </flexbox>
-      </div>
-      <div
-        class="img-bar"
-        @click="files=[]">全部删除</div>
-    </section>
-    <section
-      v-if="business.length > 0"
-      class="c-cont">
-      <flexbox class="c-header">
-        <img
-          class="c-logo"
-          src="@/assets/img/send_business.png">
-        <div class="c-name">商机</div>
-      </flexbox>
-      <div class="c-body">
-        <flexbox wrap="wrap">
-          <flexbox
-            v-for="(item, index) in business"
-            :key="index"
-            class="c-item">
-            <div class="c-item-name">{{ item.businessName }}</div>
-            <div
-              class="c-item-close"
-              @click="business.splice(index, 1)">×</div>
-          </flexbox>
-        </flexbox>
-      </div>
-    </section>
-    <section
-      v-if="contacts.length > 0"
-      class="c-cont">
-      <flexbox class="c-header">
-        <img
-          class="c-logo"
-          src="@/assets/img/send_contacts.png">
-        <div class="c-name">联系人</div>
-      </flexbox>
-      <div class="c-body">
-        <flexbox wrap="wrap">
-          <flexbox
-            v-for="(item, index) in contacts"
-            :key="index"
-            class="c-item">
-            <div class="c-item-name">{{ item.name }}</div>
-            <div
-              class="c-item-close"
-              @click="contacts.splice(index, 1)">×</div>
-          </flexbox>
-        </flexbox>
-      </div>
-    </section>
-    <flexbox class="bar-cont">
-      <template v-for="(item, index) in barItems">
-        <flexbox
-          v-if="item.type=='img'||item.type=='file'"
-          :key="index"
-          class="bar-item"
-          @click.native="barClick(item)">
-          <input
-            :accept="item.data"
-            type="file"
-            class="bar-input"
-            multiple
-            @change="uploadFile">
-          <img
-            :src="item.img"
-            class="bar-img">
-          <div class="bar-title">{{ item.title }}</div>
-        </flexbox>
-        <el-popover
-          v-else
-          :key="index"
-          v-model="item.show"
-          placement="bottom"
-          width="700"
-          popper-class="no-padding-popover"
-          trigger="click">
-<!--          <crm-relative-->
-<!--            ref="crmrelative"-->
-<!--            :show="item.show"-->
-<!--            :radio="false"-->
-<!--            :action="{ type: 'condition', data: { moduleType: crmType, customerId: id } }"-->
-<!--            :selected-data="item.type == 'business' ? { 'business': business } : { 'contacts': contacts }"-->
-<!--            :crm-type="item.type"-->
-<!--            @close="item.show=false"-->
-<!--            @changeCheckout="checkRelativeInfos"/>-->
-          <flexbox
-            slot="reference"
-            class="bar-item"
-            @click.native="barClick(item)">
-            <img
-              :src="item.img"
-              class="bar-img">
-            <div class="bar-title">{{ item.title }}</div>
-          </flexbox>
-        </el-popover>
-      </template>
-    </flexbox>
-  </div>
-</template>
-
-<script>
-// import { fileSize, getFileTypeIcon } from '@/utils/index'
-// import { crmFileSave, crmFileDelete } from '@/api/common'
-// import CrmRelative from '@/components/CreateCom/CrmRelative'
-
-export default {
-  /** 跟进记录 下的 添加 有添加框的都需要*/
-  name: 'MixAdd',
-  components: {
-    // CrmRelative
-  },
-  props: {
-    /** 展示相关商机关联 */
-    showRelativeBusiness: {
-      type: Boolean,
-      default: false
-    },
-    /** 展示相关商机关联 */
-    showRelativeContacts: {
-      type: Boolean,
-      default: false
-    },
-    /** 模块ID */
-    id: [String, Number],
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      /** 输入法 */
-      content: '',
-      inputAutosize: { minRows: 1, maxRows: 6 }, // 默认1 聚焦是 变成3
-      /** 快捷添加 */
-      barItems: [
-        {
-          img: require('@/assets/img/send_img.png'),
-          title: '图片',
-          type: 'img',
-          data: 'image/*'
-        },
-        {
-          img: require('@/assets/img/send_file.png'),
-          title: '附件',
-          type: 'file',
-          data: '*.*'
-        }
-      ],
-      /** 图片信息 */
-      imgFiles: [],
-      /** 图片信息 */
-      files: [],
-      /** 关联商机信息 */
-      business: [],
-      /** 关联联系人信息 */
-      contacts: [],
-      /** 展示关联弹窗 */
-      showRelativeType: '',
-      batchId: '' // 批次ID
-    }
-  },
-  computed: {},
-  mounted() {
-    /** 控制展示关联商机 和 联系人 */
-    if (this.showRelativeBusiness) {
-      this.barItems.push({
-        img: require('@/assets/img/send_business.png'),
-        title: '关联商机',
-        type: 'business',
-        show: false
-      })
-    }
-
-    if (this.showRelativeContacts) {
-      this.barItems.push({
-        img: require('@/assets/img/send_contacts.png'),
-        title: '关联联系人',
-        type: 'contacts',
-        show: false
-      })
-    }
-    /** 父组件通知子组件提交数据 */
-    /** 将拼接好的数据回调父组件 this.$refs.child.$emit('submit-info');  调用*/
-    this.$on('submit-info', function() {
-      this.$emit('mixadd-info', {
-        content: this.content,
-        files: this.files,
-        images: this.imgFiles,
-        business: this.business,
-        contacts: this.contacts,
-        batchId: this.batchId
-      })
-    })
-  },
-
-  beforeDestroy() {
-    this.$off('submit-info')
-  },
-  methods: {
-    resetInfo() {
-      /** 输入法 */
-      this.content = ''
-      /** 图片信息 */
-      this.imgFiles = []
-      /** 图片信息 */
-      this.files = []
-      /** 关联商机信息 */
-      this.business = []
-      /** 关联联系人信息 */
-      this.contacts = []
-      /** 展示关联弹窗 */
-      this.showRelativeType = ''
-      this.batchId = ''
-    },
-    /** 快捷添加按钮 */
-    checkRelativeInfos(data) {
-      if (this.showRelativeType == 'business') {
-        this.business = data.data
-      } else if (this.showRelativeType == 'contacts') {
-        this.contacts = data.data
-      }
-    },
-    barClick(item) {
-      this.showRelativeType = item.type
-      if (item.type == 'business') {
-        item.show = true
-      } else if (item.type == 'contacts') {
-        item.show = true
-      }
-    },
-    /** 图片选择出发 */
-    uploadFile(event) {
-      var files = event.target.files
-      if (files.length) {
-        for (let index = 0; index < files.length; index++) {
-          const file = files[index]
-          if (
-            file.type.indexOf('image') == -1 &&
-            this.showRelativeType == 'img'
-          ) {
-            this.$message.error('请上传正确的文件类型')
-            return
-          }
-        }
-
-        var type = event.target.accept == 'image/*' ? 'img' : 'file'
-        var firstFile = files[0]
-        this.sendFileRequest(firstFile, type, () => {
-          for (let index = 1; index < files.length; index++) {
-            const file = files[index]
-            this.sendFileRequest(file, type)
-          }
-          event.target.value = ''
-        })
-      }
-    },
-    // 发送请求
-    sendFileRequest(file, type, result) {
-      var params = { file: file, type: type }
-      if (this.batchId) {
-        params.batchId = this.batchId
-      }
-      crmFileSave(params)
-        .then(res => {
-          if (this.batchId == '') {
-            this.batchId = res.batchId
-          }
-          res.size = fileSize(file.size)
-          if (type == 'img') {
-            this.imgFiles.push(res)
-          } else {
-            res['icon'] = getFileTypeIcon(file)
-            this.files.push(res)
-          }
-          if (result) {
-            result()
-          }
-        })
-        .catch(() => {})
-    },
-    /** 删除全部图片 */
-    deleteAllImg() {
-      this.imgFiles = []
-    },
-    deleteImgOrFile(type, item, index) {
-      crmFileDelete({
-        id: item.fileId
-      })
-        .then(res => {
-          if (type == 'image') {
-            this.imgFiles.splice(index, 1)
-          } else {
-            this.files.splice(index, 1)
-          }
-          this.$message.success('操作成功')
-        })
-        .catch(() => {})
-    },
-    /** 鼠标移入和移除 图片区域 */
-    mouseImgOver(item, index) {
-      item.showDelete = true
-      this.$set(this.imgFiles, index, item)
-    },
-    mouseImgLeave(item, index) {
-      item.showDelete = false
-      this.$set(this.imgFiles, index, item)
-    },
-    inputFocus() {
-      this.inputAutosize = { minRows: 3, maxRows: 6 }
-      this.$nextTick(() => {
-        this.$refs.textarea.resizeTextarea()
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.mix-container {
-  position: relative;
-  border: 1px solid #e6e6e6;
-  border-radius: 3px;
-  .i-cont {
-    padding: 8px 10px;
-  }
-}
-
-.i-cont /deep/ .el-textarea__inner {
-  border: none;
-  padding: 0;
-}
-/** 图片  */
-.img-cont {
-  padding: 0 10px;
-  margin-bottom: 15px;
-  .img-item {
-    width: 98px;
-    height: 98px;
-    border: 1px solid #ccc;
-    display: inline-block;
-    margin: 0 4px 4px 0;
-    background-size: contain;
-    background-repeat: no-repeat;
-    background-position: center;
-    position: relative;
-    .img-delete {
-      position: absolute;
-      cursor: pointer;
-      top: 0;
-      right: 0;
-      width: 20px;
-      height: 20px;
-      line-height: 20px;
-      text-align: center;
-      font-size: 17px;
-      background-color: #666;
-      color: white;
-    }
-  }
-  .img-item-add {
-    width: 98px;
-    height: 98px;
-    line-height: 98px;
-    font-size: 60px;
-    color: #ccc;
-    text-align: center;
-    margin: 0 4px 4px 0;
-    cursor: pointer;
-    display: inline-block;
-    border-width: 1px;
-    border-style: dashed;
-    border-color: #ddd;
-    position: relative;
-    font-weight: 100;
-    .img-item-iput {
-      position: absolute;
-      top: 0;
-      right: 0;
-      height: 98px;
-      width: 98px;
-      opacity: 0;
-      cursor: pointer;
-    }
-  }
-  .img-item-add:before {
-    width: 2px;
-    height: 39.5px;
-    content: ' ';
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    background-color: #2888e4;
-  }
-  .img-item-add:after {
-    width: 39.5px;
-    height: 2px;
-    content: ' ';
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    background-color: #2888e4;
-  }
-  .img-bar {
-    color: #5a8ae2;
-    font-size: 12px;
-    padding: 5px 0;
-    cursor: pointer;
-  }
-}
-/** 附件  */
-.file-cont {
-  padding: 0 10px;
-  margin: 0 10px 15px;
-  border: 1px dashed #dfdfdf;
-  .f-header {
-    padding: 8px 0 15px;
-    .f-logo {
-      position: block;
-      width: 15px;
-      height: 15px;
-      margin-right: 8px;
-    }
-    .f-name {
-      color: #777;
-      font-size: 12px;
-    }
-  }
-
-  .f-body {
-    .f-item {
-      padding: 3px 0;
-      height: 25px;
-      .f-img {
-        position: block;
-        width: 15px;
-        height: 15px;
-        margin-right: 8px;
-      }
-      .f-name {
-        color: #666;
-        font-size: 12px;
-      }
-    }
-  }
-
-  .img-bar {
-    color: #5a8ae2;
-    font-size: 12px;
-    padding: 5px 0;
-  }
-}
-/** CRM  */
-.c-cont {
-  padding: 0 10px;
-  margin: 0 10px 15px;
-  border: 1px dashed #dfdfdf;
-  .c-header {
-    padding: 8px 0 15px;
-    .c-logo {
-      position: block;
-      width: 15px;
-      height: 15px;
-      margin-right: 8px;
-    }
-    .c-name {
-      color: #777;
-      font-size: 12px;
-    }
-  }
-
-  .c-body {
-    margin-bottom: 10px;
-    .c-item {
-      height: 24px;
-      border-radius: 12px;
-      padding: 0 8px;
-      margin: 0 5px 5px 0;
-      background-color: #3487e2;
-      color: white;
-      width: auto;
-      .c-item-name {
-        font-size: 12px;
-      }
-      .c-item-close {
-        padding-left: 5px;
-        font-size: 17px;
-      }
-    }
-  }
-}
-/** 底部bar  */
-.bar-cont {
-  background-color: #f9f9f9;
-  padding: 8px 15px;
-  .bar-item {
-    width: auto;
-    padding-right: 20px;
-    position: relative;
-    cursor: pointer;
-    .bar-input {
-      position: absolute;
-      top: 0;
-      right: 0;
-      height: 15px;
-      width: 68px;
-      opacity: 0;
-      font-size: 0;
-      cursor: pointer;
-    }
-    .bar-img {
-      display: block;
-      width: 15px;
-      height: 15px;
-      margin-right: 8px;
-    }
-    .bar-title {
-      color: #777;
-      font-size: 12px;
-    }
-  }
-}
-/** 关闭按钮  */
-.close-button {
-  width: 30px;
-  line-height: 16px;
-  cursor: pointer;
-  color: #ccc;
-  height: 16px;
-  font-size: 17px;
-  text-align: center;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/RelativeFiles.vue b/code/WebApp/vue/src/views/newJit/components/RelativeFiles.vue
deleted file mode 100644
index be963624..00000000
--- a/code/WebApp/vue/src/views/newJit/components/RelativeFiles.vue
+++ /dev/null
@@ -1,1228 +0,0 @@
-<template>
-  <div class="f-container">
-    <flexbox
-      direction="column"
-      align="stretch"
-      class="d-container">
-       <div class="crm-create-flex">
-      <!--表单渲染-->
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        width="580px"
-        append-to-body>
-        <div class="crm-create-body" v-if="stepsActive == 1">
-          <el-form
-            ref="form"
-            :inline="true"
-            size="small"
-            label-width="80px">
-            <el-row>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="上传附件" />
-              </el-col>
-              <el-col :md="20" :xs="24">
-                <el-form-item>
-                  <el-upload
-                    ref="upload"
-                    class="avatar-uploader"
-                    drag
-                    action="#"
-                    :http-request="httpRequestfiles"
-                    :on-change="handleChangefiles"
-                    :headers="httpHeader"
-                    :file-list="fileuploadList"
-                    :before-upload="beforeAvatarUpload"
-                    :before-remove="beforeRemove"
-                    :on-remove="handleRemove"
-                     multiple
-                    :limit="5"
-                    :on-exceed="handleExceedfiles" >
-                    <i class="el-icon-upload" ></i>
-                    <div class="el-upload__text">
-                      将文件拖到此处，或
-                      <em>点击上传</em>
-                    </div>
-                  </el-upload>
-                </el-form-item>
-                <el-form-item>
-                   <div style="margin: 10px;margin-top: 1px;" >
-                  <span style="color: #ccc;font-size:13px;">说明：单个附件大小不能超过2M，单次最多一起上传5个，请上传后缀名为jpg、png、gif、jpeg、txt、pdf、doc、docx、xlsx、zip或rar的附件！!</span>
-                </div>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-        <div
-        v-loading="formLoading"
-        v-else-if="stepsActive == 2"
-        element-loading-text="数据上传中,请耐心等待..."
-        element-loading-spinner="el-icon-loading"
-        class="step-section"
-      />
-        <div slot="footer" class="dialog-footer">
-          <el-button
-          v-if="stepsActive == 1"
-          type="text"
-          @click="dialogFormVisible = false">取消</el-button>
-           <!-- <el-button  type="primary" @click="LoadSave">确认</el-button> -->
-           <el-button
-            v-if="sureTitle"
-            type="primary"
-            @click="sureClick">{{ sureTitle }}</el-button>
-
-        </div>
-      </el-dialog>
-    </div>
-
-      <div class="tabs">
-              <el-row >
-                <div style="margin: 10px;margin-top: 1px;" >
-                  <el-button
-                    class="filter-item"
-                    size="mini"
-                    type="primary"
-                    icon="el-icon-plus"
-                    @click="handleCreate()"
-                  >上传附件</el-button>
-                </div>
-              </el-row>
-                 <el-row >
-                <div style="margin: 10px;margin-top: 1px;" >
-                  <span style="color: #ccc;font-size:13px;">说明：单个附件大小不能超过2M,单次最多一起上传5个，请上传后缀名为jpg、png、gif、jpeg、txt、pdf、doc、docx、xlsx、zip或rar的附件!</span>
-                </div>
-              </el-row>
-              <el-row >
-              <el-card  shadow="always" >
-              <!-- <div style="margin-top: -25px;" >  -->
-                <div  v-loading="listLoading"
-                  element-loading-text="数据加载中,请耐心等待..."
-                  element-loading-spinner="el-icon-loading"
-                  class="step-section">
-                <flexbox
-                  :gutter="0"
-                  wrap="wrap"
-                  style="padding: 10px 8px 0;">
-                  <flexbox-item
-                    v-for="(item, index) in fileList"
-                    :span="0.5"
-                    :key="index"
-                    class="b-cell">
-                   <flexbox
-                      v-if="item.fileType === 'png'"
-                      align="stretch"
-                      class="b-cell-b">
-                      <div class="b-cell-name">PNG文件</div>
-                      <div class="b-cell-value">
-                        <flexbox  class="f-item">
-                          <img
-                            class="f-img"
-                            src="@/assets/img/relevance_file.png" >
-                           <div class="f-name">{{  item | getfilesize1 }}<span style="color: #ccc;">{{ item | getfilesize2}}</span></div>
-                           <img
-                                 src="@/assets/img/chakan.png"
-                                @click="handleFile('preview', item, index)" />
-                          <img
-                                 src="@/assets/img/xiazai.png"
-                                @click="handleImgFile(item, index)" />
-                          <img
-                                src="@/assets/img/shanchu.png"
-                                @click="handleFile('delete', item, index)" />
-                        </flexbox>
-                      </div>
-                    </flexbox>
-                    <flexbox
-                      v-else-if="item.fileType === 'jpg'"
-                      align="stretch"
-                      class="b-cell-b">
-                      <div class="b-cell-name">JPG文件</div>
-                      <div class="b-cell-value">
-                        <flexbox  class="f-item">
-                          <img
-                            class="f-img"
-                            src="@/assets/img/relevance_file.png" >
-                          <div class="f-name">{{  item | getfilesize1 }}<span style="color: #ccc;">{{ item | getfilesize2}}</span></div>
-                          <img
-                                 src="@/assets/img/chakan.png"
-                                @click="handleFile('preview', item, index)" />
-                          <img
-                                 src="@/assets/img/xiazai.png"
-                                @click="handleImgFile(item, index)" />
-                          <img
-                                src="@/assets/img/shanchu.png"
-                                @click="handleFile('delete', item, index)" />
-                        </flexbox>
-                      </div>
-                    </flexbox>
-                     <flexbox
-                      v-else-if="item.fileType === 'gif'"
-                      align="stretch"
-                      class="b-cell-b">
-                      <div class="b-cell-name">GIF文件</div>
-                      <div class="b-cell-value">
-                        <flexbox  class="f-item">
-                          <img
-                            class="f-img"
-                            src="@/assets/img/relevance_file.png" >
-                          <div class="f-name">{{  item | getfilesize1 }}<span style="color: #ccc;">{{ item | getfilesize2}}</span></div>
-                          <img
-                                 src="@/assets/img/chakan.png"
-                                @click="handleFile('preview', item, index)" />
-                          <img
-                                 src="@/assets/img/xiazai.png"
-                                @click="handleImgFile(item, index)" />
-                          <img
-                                src="@/assets/img/shanchu.png"
-                                @click="handleFile('delete', item, index)" />
-                        </flexbox>
-                      </div>
-                    </flexbox>
-                     <flexbox
-                      v-else-if="item.fileType === 'jpeg'"
-                      align="stretch"
-                      class="b-cell-b">
-                      <div class="b-cell-name">JPEG文件</div>
-                      <div class="b-cell-value">
-                        <flexbox  class="f-item">
-                          <img
-                            class="f-img"
-                            src="@/assets/img/relevance_file.png" >
-                          <div class="f-name">{{  item | getfilesize1 }}<span style="color: #ccc;">{{ item | getfilesize2}}</span></div>
-                          <img
-                                 src="@/assets/img/chakan.png"
-                                @click="handleFile('preview', item, index)" />
-                          <img
-                                 src="@/assets/img/xiazai.png"
-                                @click="handleImgFile(item, index)" />
-                          <img
-                                src="@/assets/img/shanchu.png"
-                                @click="handleFile('delete', item, index)" />
-                        </flexbox>
-                      </div>
-                    </flexbox>
-                    <flexbox
-                      v-else
-                      align="stretch"
-                      class="b-cell-b">
-                      <div class="b-cell-name">{{item.fileType}}文件</div>
-                      <div class="b-cell-value">
-                        <flexbox  class="f-item">
-                          <img
-                            class="f-img"
-                            src="@/assets/img/relevance_file.png" >
-                          <div class="f-name">{{  item | getfilesize1 }}<span style="color: #ccc;">{{ item | getfilesize2}}</span></div>
-                        <img
-                                 src="@/assets/img/xiazai.png"
-                                @click="handleFile('download',item, index)" />
-                          <img
-                                src="@/assets/img/shanchu.png"
-                                @click="handleFile('delete', item, index)" />
-                        </flexbox>
-                      </div>
-                    </flexbox>
-                  </flexbox-item>
-                </flexbox>
-
-                 <pagination
-                     v-show="totalFileCount>0"
-                     :total="totalFileCount"
-                     :page.sync="pageFiles"
-                     :limit.sync="listQuery.MaxResultCount"
-                      style="margin-top: -25px;margin-bottom:-18px;float:right;"
-                      @pagination="getFileList"
-                   />
-
-                    </div>
-                    </el-card>
-                </el-row>
-      </div>
-    </flexbox>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import {downloadImage, downloadFile, fileSize,downloadFileHttpRequest,getFileTypeIcon} from '@/utils/crmindex.js'
-import { getToken } from '@/utils/auth' // get token from cookie
-
-
-export default {
-  name: "project",
-  components: { Pagination},
-  directives: { permission },
-  props: {
-    /** 模块ID：客户模块、项目模块、合同模块 */
-    modid: [String, Number]
-  },
-  filters: {
-    getfilesize1(file) {
-      const name = file.fileName && file.fileName.length > 5 ? (file.fileName.substring(0, 5) + '...') : file.fileName
-      return name
-    },
-    getfilesize2(file) {
-      return '(' + fileSize(file.fileLength) + ')'
-    }
-  },
-  data() {
-    return {
-      elementLoadingText: "正在加载...",
-      value:"0",
-      newsList: [],
-      paginationLog: {
-        total: 0,
-        page: 1,
-        pageSize: 10,
-      },
-      form: {},
-      list: null,
-      fileList:[],
-      fileuploadList:[],
-      fileFormData: null, // 将要上传的formdata数据
-      customerList:[],
-      totalCount: 0,
-      dialogFormVisible: false,
-      totalFileCount: 0,
-      listLoading: false,
-      formLoading: false,
-      propsCustomerId:"",
-      listQuery: {
-        CustomerId: "",
-        Sorting: "",
-        SkipCount: 0,
-        MaxResultCount: 10
-      },
-      page: 1,
-      pageFiles: 1,
-      pageImg: 1,
-      multipleSelection: [],
-      customerInfo:{
-        customerID:"",
-        code:"",
-        name:"",
-        fullname:"",
-        remark:""
-      },
-      isLt2M:"",
-      isFileType:"",
-      stepsActive: 1,
-      tableHeight: document.documentElement.clientHeight -350
-    };
-  },
-  watch: {
-       modid: {
-          handler(newVal) {
-          if(newVal=="" || newVal=="undefined")
-          {
-            this.fileList =[];
-          }
-          else{
-            this.getFileList()
-          }
-      },
-      immediate: true
-    }
-  },
-
-  mounted() {
-     var self = this
-    /** 控制table的高度 */
-    window.onresize = function() {
-      var offsetHei = document.documentElement.clientHeight
-      self.tableHeight = offsetHei - 350
-    }
-   },
-  computed: {
-     sureTitle() {
-      return {
-        1: '立即上传',
-        2: '上传中...'
-      }[this.stepsActive]
-    },
-     httpHeader() {//文件上传时，带token认证信息，提高安全性
-      return {
-        'Authorization':'Bearer ' + getToken()
-      }
-    }
-  },
-  created() {
-     this.fileuploadList=[];
-     this.fileFormData = new FormData();
-
-  },
-  methods: {
-    handleCreate() {
-      this.stepsActive = 1;
-      this.fileuploadList=[];
-      this.dialogFormVisible = true;
-      this.$refs.upload.clearFiles();
-    },
-    getFileList() {//附件列表
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.pageFiles - 1) * 10;
-      this.listQuery.CustomerId=this.modid;
-      this.$axios.gets("/api/abpvnext_master/uploadfile/allofcustomers", this.listQuery).then(response => {
-        this.fileList =[];
-        this.fileList = response.items;
-        this.totalFileCount = response.totalCount;
-        this.listLoading = false;
-        // setTimeout(() => {
-        //     //大数据量加载时
-        //     this.listLoading = false;
-        //   }, 1000);
-      });
-    },
-    httpRequestfiles(data) {
-     // this.fileuploadList=[]
-      let _this = this;
-      let rd = new FileReader(); // 创建文件读取对象
-      let file = data.file;
-      this.fileuploadList.push(file);
-      //this.fileFormData.append("files", file);
-      rd.readAsDataURL(file); // 文件读取装换为base64类型
-    },
-     handleChangefiles(file, fileList) {//上传时解发
-    //   this.fileuploadList=[]
-    //   this.fileuploadList = fileList;
-    },
-    // 上传之前的格式设置
-    beforeAvatarUpload(file) {
-      var FileExt = file.name.replace(/.+\./, "");
-        if (['jpg','png','png','jpeg','txt','zip', 'rar','pdf','docx','doc','xlsx','xls'].indexOf(FileExt.toLowerCase()) === -1){
-            this.$message({
-                type: 'warning',
-                message: '请上传后缀名为jpg、png、gif、jpeg、txt、pdf、doc、docx、xlsx、xls、zip或rar的附件！'
-            });
-            this.isFileType="0"
-            return false;
-        }
-        else{
-            this.isFileType="1"
-        }
-      this.isLt2M = file.size / 1024 / 1024 < 2?'1':'0';
-      if (this.isLt2M==="0") {
-        this.$message.error("上传文件大小不能超过 2MB!");
-      }
-      return this.isLt2M==='1'?true: false;
-    },
-    beforeRemove(file, fileList) {
-        if (this.isLt2M==="1" && this.isFileType==="1") {
-         return this.$confirm(`确定移除 ${ file.name }？`);
-        }
-      },
-    handleRemove(file, fileList) {//附件列表删除操作
-      const index=this.fileuploadList.indexOf(file.originFileObj)
-      const newFileList=this.fileuploadList.slice()
-      newFileList.splice(index,1)
-      this.fileuploadList = newFileList;
-    },
-    handleExceedfiles(files, fileList) {
-      this.$message.warning(
-        `当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
-          files.length + fileList.length
-        } 个文件`
-      );
-    },
-    showCancel() {
-      return this.stepsActive != 2
-    },
-    sureClick(){
-        if (this.fileuploadList===[] || JSON.stringify(this.fileuploadList) === "[]") {
-           this.$message.error("请选择上传文件");
-        return false;
-      }
-      if (this.stepsActive == 1) {
-        this.stepsActive = 2;
-        this.formLoading = true;
-        setTimeout(() => {
-             this.save();
-        }, 2000)
-      }
-    },
-     save() {
-      //this.formLoading = true;
-      //--上传附件，批量或拖拽
-      if (JSON.stringify(this.fileuploadList) != "[]") {
-          let fd = new FormData();
-        //   var outfd = this.fileFormData.getAll("files");
-        //   alert("outfd"+outfd)
-        //   for (let i = 0; i < outfd.length; i++) {
-        //     fd.append("files", outfd[i]); // 添加文件
-        //   }
-        const{fileuploadList}=this;
-        fileuploadList.forEach(file=>{
-            fd.append("files", file); // 添加文件
-        })
-          fd.append("customerId",this.modid);//模块ID
-          this.$axios
-            .posts(
-              "/api/abpvnext_master/getblobfile/UploadFilesPost",
-                fd
-              )
-            .then((response) => {
-             this.formLoading = false;
-              this.getFileList();
-              if (this.isLt2M==="1" && this.isFileType==="1") {
-                    this.$notify({
-                    title: "成功",
-                    message: "附件上传成功！",
-                    type: "success",
-                    duration: 2000,
-                });
-              }
-
-            })
-            .catch(() => {this.formLoading = false;});
-          } else {
-            this.formLoading = false;
-            this.$message({
-                message: "未上传任何附件，请查检！",
-                type: "warning",
-              });
-            }
-            //-end-上传附件完成
-
-          this.dialogFormVisible = false;
-    },
-    /**
-     * 附件查看
-     */
-    handleFile(type, item, index) {
-      if (type === 'preview') {
-          var down_fileName=item.fileName+"."+item.fileType;//下载时附件名
-          var previewList =[]
-          previewList.push({
-              url: item.fileUrl,
-              id:item.id,
-              fileType:item.fileType,
-              name:down_fileName
-            })
-          this.$bus.emit('preview-image-bus', {
-            index: 0,
-            data: previewList
-          })
-      } else if (type === 'download') {
-          var param_fileName=item.id+"."+item.fileType;//传入的参数（后端接口接收）
-          var down_fileName=item.fileName+"."+item.fileType || '文件';//下载时附件名
-          this.$axios
-            .BolbGets("/api/abpvnext_master/getblobfile/download/" + param_fileName)
-            .then((response) => {
-                //方法一(插件下载)
-                downloadFile(response,down_fileName);
-                //方法二（a标签下载）
-                //  var blob = new Blob([response], {
-                //    type: 'application/octet-stream'
-                // })
-                // if (window.navigator.msSaveBlob) {  // IE 10+以及IE内核的浏览器
-                //   try {
-                //     window.navigator.msSaveOrOpenBlob(blob,down_fileName );
-                //   } catch (e) {
-                //     console.log(e)
-                //   }
-                // } else {//chrome/firefox浏览器
-                //   //alert("chrome/firefox浏览器")
-                //   let url = window.URL.createObjectURL(blob)
-                //   let link = document.createElement('a')
-                //   link.style.display = 'none'
-                //   link.href = url
-                //   link.setAttribute('download', down_fileName)// 文件名
-                //   document.body.appendChild(link)
-                //   link.click()
-                //   document.body.removeChild(link) // 下载完成移除元素
-                //   window.URL.revokeObjectURL(url) // 释放掉blob对象
-                // }
-          });
-      }
-      else if(type === 'delete'){
-        var params = [];
-        let myalert=""//声明变量，其变量必须在此声明后使用
-        params.push(item.id);
-        myalert=item.fileName
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          this.$axios.posts("/api/abpvnext_master/uploadfile/DeleteFile",params).then(response => {
-            this.$notify({
-              title: "成功",
-              message: "删除成功",
-              type: "success",
-              duration: 2000
-            });
-            this.getFileList();
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除"
-          });
-        });
-      }
-    },
-    // 下载图片
-    handleImgFile(item,index) {
-        var param_fileName=item.id+"."+item.fileType;//传入的参数（后端接口接收）
-        var down_fileName=item.fileName+"."+item.fileType;//下载时附件名
-        this.$axios
-            .BolbGets("/api/abpvnext_master/getblobfile/downloadImg/" + param_fileName)
-            .then((response) => {
-                downloadFile(response,down_fileName);
-        });
-    },
-    getStatusStyle(status) {
-      if (status == 0) {
-        return {
-          'border-color': '#E6A23C',
-          'background-color': '#FDF6EC',
-          'color': '#E6A23C'
-        }
-      } else if (status == 1) {
-        return {
-          'border-color': '#409EFF',
-          'background-color': '#ECF5FF',
-          'color': '#409EFF'
-        }
-      } else if (status == 3) {
-        return {
-          'border-color': '#67C23A',
-          'background-color': '#F0F9EB',
-          'color': '#67C23A'
-        }
-      } else if (status == 2) {
-        return {
-          'border-color': '#F56C6B',
-          'background-color': '#FEF0F0',
-          'color': '#F56C6B'
-        }
-      } else if (status == 4) {
-        return {
-          'background-color': '#E4E7ED'
-        }
-      }
-    },
-    getHTStatusStyle(status) {
-      if (status == 0) {//新增
-        return {
-          'border-color': '#E6A23C',
-          'background-color': '#FDF6EC',
-          'color': '#E6A23C'
-        }
-      }else if (status == 1 || status == 2) {//审核中
-         return {
-          'border-color': '#409EFF',
-          'background-color': '#ECF5FF',
-          'color': '#409EFF'
-
-        }
-      }else if (status == 3 || status == 6) {//已签定和完成
-        return {
-          'border-color': '#67C23A',
-          'background-color': '#F0F9EB',
-          'color': '#67C23A'
-        }
-      } else if (status == 4) {
-        return {
-          'border-color': '#E9E9EB',
-          'background-color': '#F4F4F5',
-          'color': '#909399'
-        }
-       } else if (status == 5) {//执行
-        return {
-          'border-color': '#F56C6B',
-          'background-color': '#FEF0F0',
-          'color': '#F56C6B'
-        }
-      } else if (status == 7) {//中止
-        return {
-          'border-color': '#E9E9EB',
-          'background-color': '#F4F4F5',
-          'color': '#909399'
-        }
-
-      }
-    },
-    handleFilter() {
-      this.page = 1;
-      this.pageFiles=1;
-      this.pageImg=1;
-      this.getFileList();
-    },
-    resetQuery() {},
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    handleCollapseChange(val) {
-
-    },
-    handleLogChange(val) {
-      this.value = val;
-      this.paginationLog.total = 0;
-      this.paginationLog.page = 1;
-      this.paginationLog.pageSize = 2;
-      //this.fetchData();
-    },
-    handleSizeChange(val) {
-      this.paginationLog.pageSize = val;
-      this.fetchData();
-    },
-    handleCurrentChange(val) {
-      this.paginationLog.page = val;
-      this.fetchData();
-    }
-  }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.is-hidden {
-  visibility: hidden;
-}
-.opts {
-  padding: 6px 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-.el-timeline {
-      margin-top: 20px;
-
-      &-item {
-        padding-bottom: 1px;
-      }
-  }
-.el-drawer{
-    overflow: scroll
-    }
-.box{
-  height: 100%;//如高度等于网页高度
-  overflow: auto;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-around;
- }
-
- .goods-list-container {
-  .goods-list-card-body {
-    position: relative;
-    text-align: center;
-    vertical-align:middle;
-    cursor: pointer;
-
-    .goods-list-tag-group {
-      position: absolute;
-      top: 10px;
-      right: 5px;
-      z-index: 9;
-    }
-
-    .goods-list-image-group {
-      height: 80px;
-      overflow: hidden;
-
-      .goods-list-image {
-        width: 80px;
-        height: 80px;
-        transition: all ease-in-out 0.3s;
-
-        &:hover {
-          transform: scale(1.1);
-        }
-      }
-    }
-
-    .goods-list-title {
-      margin: 8px 0;
-      font-size: 14px;
-      font-weight: bold;
-    }
-
-    .goods-list-description {
-      font-size: 14px;
-      color: #808695;
-    }
-
-    .goods-list-price {
-      margin: 8px 0;
-      font-size: 14px;
-      color: #ff6700;
-      s {
-        color: #c5c8ce;
-      }
-    }
-  }
-
-
-}
-</style>
-
-<style>
-.clearfix:before,
-  .clearfix:after {
-    display: table;
-    content: "";
-  }
-  .clearfix:after {
-    clear: both
-  }
-  .el-col {
-    border-radius: 2px;
-  }
-  .bg-purple-dark {
-    background: #99a9bf;
-  }
-  .bg-purple {
-    background: #d3dce6;
-  }
-  .bg-purple-light {
-    background: hsl(221, 31%, 14%);
-  }
-  .grid-content {
-    border-radius: 2px;
-    min-height: 30px;
-  }
-  .status_button {
-  padding: 1px 6px;
-  border: 1px solid #e6e6e6;
-  border-radius: 4px;
-  display: inline-block;
-  font-size: 12px;
-  margin: 0 auto;
-}
-</style>
-
-
-<style type="text/css">
-*{margin: 0;padding: 0;}
-.div11{
-width:150px;
-height: 100px;
-display: table-cell;
-vertical-align: middle;
-text-align: center;
-border:1px solid #000;
-}
-.img11 {
-width: 50px;
-height: 50px;
-}
-</style>
-
-
-
-<style lang="scss" scoped>
-//客户相关详情 头部类似布局
-.el-tabs /deep/ .el-tabs__nav-wrap::after {
-  display: none !important;
-}
-
-.el-tabs /deep/ .el-tabs__header {
-  background-color: #F5F6F9;
-  padding: 0 17px;
-  margin: 0 0 15px !important;
-}
-
-.el-tabs /deep/ .el-tabs__item {
-  font-size: 13px !important;
-  height: 40px !important;
-  line-height: 40px !important;
-}
-
-.d-container {
-  position: relative;
-  height: 100%;
-}
-
-/** 让element 查询到的标签 */
-.t-loading-content {
-  position: relative;
-  overflow-y: scroll;
-  flex: 1;
-}
-
-/** 审核信息 */
-.examine-info {
-  padding: 0 17px 17px 17px;
-
-  .examine-info-border {
-    border: 1px solid #e6e6e6;
-    border-radius: 3px;
-    padding: 17px;
-  }
-}
-.t-section {
-  position: relative;
-  padding: 10px 17px;
-  min-height: 60px;
-  .t-img {
-    display: block;
-    width: 45px;
-    height: 45px;
-    margin-right: 10px;
-  }
-  .t-name {
-    font-size: 14px;
-    color: #333333;
-    flex: 1;
-  }
-  .t-more {
-    border: 1px solid #dcdfe6;
-    font-size: 12px;
-    color: #606266;
-    padding: 0 10px 0 12px;
-    border-radius: 2px;
-    font-weight: 500;
-    height: 25px;
-    cursor: pointer;
-  }
-  .t-close {
-    display: block;
-    width: 40px;
-    height: 40px;
-    margin-left: 20px;
-    padding: 10px;
-    cursor: pointer;
-  }
-}
-
-.h-section {
-  position: relative;
-  padding: 8px 17px 15px 17px;
-  min-height: 58px;
-  .h-item {
-    .h-title {
-      font-size: 12px;
-      color: #777;
-    }
-    .h-value {
-      min-height: 14px;
-      margin-top: 8px;
-      font-size: 13px;
-      color: #333333;
-    }
-  }
-}
-.head-handle-button {
-  padding: 5px 15px;
-  margin-right: 10px;
-}
-</style>
-
-<style scoped>
-
-.business-list {
-  margin-bottom: 15px;
-}
-.business-label {
-  display: inline-block;
-  width: 100px;
-}
-.business-des {
-  display: inline-block;
-  color: #999;
-  font-size: 12px;
-  width: 60px;
-}
-.business-setting-content {
-  border: 1px solid #e6e6e6;
-  margin-top: 10px;
-}
-.business-setting-table-header {
-  background: #f5f5f5;
-}
-.business-setting-table,
-.business-setting-table-header {
-  display: flex;
-  text-align: center;
-  height: 50px;
-  line-height: 50px;
-}
-.business-setting-table-body {
-  height: 250px;
-  overflow-y: auto;
-}
-.business-setting-table > span,
-.business-setting-table-header > span,
-.business-setting-table > .el-input {
-  flex: 1;
-}
-.business-setting-table > span > .el-input {
-  width: 70%;
-}
-.business-setting-table > .icon-span > .el-input {
-  width: 50%;
-}
-.business-setting-table > span .el-icon-circle-plus {
-  color: #3e84e9;
-  width: 20px;
-  height: 20px;
-  cursor: pointer;
-}
-.business-setting-table > span .el-icon-remove {
-  color: #ff6767;
-  width: 20px;
-  height: 20px;
-  cursor: pointer;
-}
-.business-setting-table:nth-child(2n + 1) {
-  background: #f7f8fa;
-}
-.icon-box {
-  width: 50px;
-  display: inline-block;
-  text-align: left;
-  margin-left: 10px;
-}
-
-
-</style>
-
-<style lang="scss" scoped>
-@import '../styles/file.scss';
-
-.step-section {
-  min-height: 300px;
-
-  /deep/ .el-loading-spinner {
-    top: 45%;
-    .el-icon-loading {
-      font-size: 40px;
-      color: #999;
-    }
-
-    .el-loading-text {
-      color: #333;
-    }
-  }
-}
-.busi-line {
-  position: absolute;
-  bottom: 0;
-  left: 17px;
-  right: 17px;
-  height: 1px;
-  background-color: #e6e6e6;
-}
-
-.busi-state {
-  position: relative;
-  padding-left: 20px;
-  overflow-x: auto;
-  overflow-y: hidden;
-  a {
-    flex-shrink: 0;
-  }
-}
-
-.busi-state-item {
-  padding: 10px 30px;
-  margin: 5px 0;
-  height: 38px;
-  position: relative;
-  margin-right: 5px;
-  border-top: 2px solid #ebebeb;
-  border-bottom: 2px solid #ebebeb;
-  .state-circle {
-    width: 38px;
-    height: 38px;
-    border-radius: 19px;
-    background-color: white;
-    transform: rotate(45deg);
-    position: absolute;
-    z-index: -1;
-  }
-  .state-arrow {
-    width: 38px;
-    height: 38px;
-    transform: scale(0.707) rotate(45deg);
-    border-top: 2px solid #ebebeb;
-    border-right: 2px solid #ebebeb;
-    background-color: white;
-    position: absolute;
-  }
-}
-
-.state-undo {
-  border-top: 2px solid #ebebeb;
-  border-bottom: 2px solid #ebebeb;
-  background-color: white;
-  color: #666;
-  .state-circle {
-    border-color: #ebebeb;
-    background-color: white;
-  }
-  .state-arrow {
-    border-color: #ebebeb;
-    background-color: white;
-  }
-}
-
-.state-doing {
-  border-top: 2px solid #34cecf;
-  border-bottom: 2px solid #34cecf;
-  background-color: white;
-  color: #34cecf;
-  .circle-left {
-    border-color: #34cecf;
-    background-color: white;
-  }
-  .circle-right {
-    border-color: #34cecf;
-    background-color: white;
-  }
-  .arrow-left {
-    border-color: #34cecf;
-    background-color: white;
-  }
-  .arrow-right {
-    border-color: #34cecf;
-    background-color: white;
-  }
-}
-
-.state-suc {
-  border-top: 2px solid #34cecf;
-  border-bottom: 2px solid #34cecf;
-  background-color: #34cecf;
-  color: white;
-  .circle-left {
-    border-color: #a07988;
-    background-color: #34cecf;
-  }
-  .circle-right {
-    border-color: #34cecf;
-    background-color: #34cecf;
-  }
-  .arrow-left {
-    border-color: #34cecf;
-    background-color: white;
-  }
-  .arrow-right {
-    border-color: #34cecf;
-    background-color: #34cecf;
-  }
-}
-
-.state-fail {
-  border-top: 2px solid #ff6767;
-  border-bottom: 2px solid #ff6767;
-  background-color: #ff6767;
-  color: white;
-  .circle-left {
-    border-color: #ff6767;
-    background-color: #ff6767;
-  }
-  .circle-right {
-    border-color: #ff6767;
-    background-color: #ff6767;
-  }
-  .arrow-left {
-    border-color: #ff6767;
-    background-color: white;
-  }
-  .arrow-right {
-    border-color: #ff6767;
-    background-color: #ff6767;
-  }
-}
-
-.state-invalid {
-  border-top: 2px solid #ebebeb;
-  border-bottom: 2px solid #ebebeb;
-  background-color: #ebebeb;
-  color: #666;
-  .state-circle {
-    border-color: #ebebeb;
-    background-color: #ebebeb;
-  }
-  .state-arrow {
-    border-color: #ebebeb;
-    background-color: #ebebeb;
-  }
-
-  .circle-left {
-    border-color: #ebebeb;
-    background-color: #ebebeb;
-  }
-  .circle-right {
-    border-color: #ebebeb;
-    background-color: #ebebeb;
-  }
-  .arrow-left {
-    border-color: #ebebeb;
-    background-color: white;
-  }
-  .arrow-right {
-    border-color: #ebebeb;
-    background-color: #807676;
-  }
-}
-
-.arrow-right {
-  z-index: 1;
-  top: -2px;
-  right: -19px;
-}
-.arrow-left {
-  top: -2px;
-  left: -18px;
-}
-.circle-right {
-  border-top: 2px solid #ebebeb;
-  border-right: 2px solid #ebebeb;
-  z-index: 1;
-  top: -2px;
-  right: -15.5px;
-}
-.circle-left {
-  border-left: 2px solid #ebebeb;
-  border-bottom: 2px solid #ebebeb;
-  top: -2px;
-  left: -17px;
-}
-
-/** 状态操作布局 */
-.state-handel-cont {
-  font-size: 13px;
-  color: #333;
-  .state-handel-item {
-    padding: 10px 0;
-    cursor: pointer;
-    .state-handel-item-img {
-      width: 16px;
-      height: 16px;
-      border-radius: 8px;
-      margin-right: 8px;
-      flex-shrink: 0;
-      display: block;
-    }
-    .state-handel-item-name {
-      flex: 1;
-    }
-    .state-handel-item-value {
-      flex-shrink: 0;
-    }
-  }
-  .state-handel-item:hover {
-    background-color: #f7f8fa;
-  }
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/newJit/components/Sections.vue b/code/WebApp/vue/src/views/newJit/components/Sections.vue
deleted file mode 100644
index 8a7dc21f..00000000
--- a/code/WebApp/vue/src/views/newJit/components/Sections.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<template>
-  <div class="section">
-    <div
-      v-if="title && title.length > 0"
-      class="section-header">
-      <div
-        :style="{ 'border-left-color': mColor }"
-        class="section-mark"/>
-      <div class="section-title">{{ title }}</div>
-      <flexbox
-        v-if="showF"
-        class="f-container">
-        <div
-          v-for="(item, index) in fItems"
-          :key="index"
-          :class="{ 'f-item-select':fIndex==item.type }"
-          class="f-item"
-          @click="fClick(item)">{{ item.title }}</div>
-      </flexbox>
-    </div>
-    <div
-      :style="{ 'height': contentHeight }"
-      class="content">
-      <div
-        v-if="showNoData"
-        class="no-data-container">
-        <img
-          class="no-data"
-          src="@/assets/img/no_data.png" >
-        <div class="no-data-name">暂无数据</div>
-      </div>
-      <slot/>
-    </div>
-  </div>
-</template>
-<script type="text/javascript">
-export default {
-  name: 'Sections',
-  components: {},
-  props: {
-    title: {
-      type: String,
-      default: ''
-    },
-    mColor: {
-      type: String,
-      default: '#FF6767'
-    },
-    /** 内容区域固定高度 */
-    contentHeight: {
-      type: String,
-      default: '327px'
-    },
-    /** 展示客户工作台  重要提醒 时间筛选 */
-    showF: {
-      type: Boolean,
-      default: false
-    },
-    fItems: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    /** 展示无数据 */
-    showNoData: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      fIndex: -1
-    }
-  },
-  computed: {},
-  mounted() {},
-  methods: {
-    fClick(item) {
-      this.fIndex = item.type
-      this.$emit('f-click', 'val')
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.section {
-  position: relative;
-  background-color: white;
-  margin-top: 8px;
-}
-.section:first-child {
-  margin-top: 0;
-}
-
-.section-mark {
-  border-left-width: 3px;
-  border-left-style: solid;
-  height: 10px;
-}
-
-.section-header {
-  display: flex;
-  align-items: center;
-  padding: 5px 15px;
-}
-.section-title {
-  font-size: 13px;
-  color: #333;
-  margin-left: 8px;
-  flex-shrink: 0;
-}
-
-.f-container {
-  width: auto;
-  margin-left: 40px;
-  .f-item {
-    padding: 2px 4px;
-    font-size: 12px;
-    margin-right: 10px;
-    color: #666;
-  }
-  .f-item-select {
-    border-radius: 2px;
-    background-color: #ff6767;
-    color: white;
-  }
-}
-
-.content {
-  overflow: auto;
-  .no-data-container {
-    text-align: center;
-    .no-data {
-      margin-top: 30px;
-    }
-    .no-data-name {
-      font-size: 12px;
-      margin-top: 8px;
-      color: #666;
-    }
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/filterForm/filterContent.vue b/code/WebApp/vue/src/views/newJit/components/filterForm/filterContent.vue
deleted file mode 100644
index 4fb37590..00000000
--- a/code/WebApp/vue/src/views/newJit/components/filterForm/filterContent.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <div class="wrapper">
-    <ul class="list">
-      <li
-        v-for="(item, index) in showObj.form"
-        :key="index"
-        class="list-item">
-        <span v-if="item.formType == 'date'">{{ item.name +'&nbsp;“' + item.value[0] + '-' + item.value[1] + '”' }}</span>
-        <span v-else-if="item.formType === 'datetime'">{{ item.name +'&nbsp;“' + item.value[0] + '-' + item.value[1] + '”' }}</span>
-        <!-- <span v-else-if="item.formType === 'business_type'">{{ item.name +'&nbsp;“' + getTypesName(item) + getStatusName(item) + '”' }}</span>
-        <span v-else-if="item.formType === 'map_address'">{{ `${item.name} ${item.address.state} ${item.address.city} ${item.address.area}` }}</span>
-        <span v-else-if="item.formType === 'checkStatus'">{{ item.name +'&nbsp;“' + optionsNames[item.condition]+ '”'+'&nbsp;'+ getCheckName(item) }}</span>
-        <span v-else-if="item.formType === 'user'">{{ item.name +'&nbsp;' + optionsNames[item.condition] + '“' + item.value[0].realname + '”' }}</span>
-        <span v-else-if="item.formType === 'category' && item.value.length > 0">{{ item.name +'&nbsp;“' + item.valueContent + '”' }}</span> -->
-        <span v-else-if="item.formType === 'select' && item.value.length > 0">{{ item.name + '&nbsp;' + optionsNames[item.condition] + '“' + getSelectName(item) + '”' }}</span>
-        <span v-else-if="item.formType === 'switch'">{{ item.name + '&nbsp;' + optionsNames[item.condition] + '“' + getSwitchName(item) + '”' }}</span>
-        <span v-else-if="item.formType != 'text' && item.fieldName.endsWith('ID')">{{ item.name + '&nbsp;' + optionsNames[item.condition] + '“' + getRelativeName(item) + '”' }}</span>
-        <span v-else>{{ item.name + '&nbsp;' + optionsNames[item.condition] + '“' + item.value + '”' }}</span>
-        <i
-          class="el-icon-close icon"
-          @click="handleDelete(item, index)"/>
-      </li>
-    </ul>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'FilterContent',
-  props: {
-    obj: {
-      type: Object,
-      required: true,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      // 获取条件名称
-      optionsNames: {
-        is: '等于',
-        isNot: '不等于',
-        contains: '包含',
-        notContains: '不包含',
-        startWith: '开始于',
-        endWith: '结束于',
-        isNull: '为空',
-        isNotNull: '不为空',
-        eq: '等于',
-        neq: '不等于',
-        gt: '大于',
-        egt: '大于等于',
-        lt: '小于',
-        elt: '小于等于'
-      },
-      // 展示信息
-      showObj: {}
-    }
-  },
-  computed: {},
-  watch: {
-    obj: function(val) {
-      this.showObj = val
-    }
-  },
-  mounted() {
-    this.showObj = this.obj
-  },
-  methods: {
-    /**
-     * 删除高级筛选条件
-     * @param index
-     */
-    handleDelete(item, index) {
-      this.$delete(this.showObj.obj, item.fieldName)
-      this.showObj.form.splice(index, 1)
-      this.$emit('delete', { item: item, index: index, obj: this.showObj })
-    },
-    // 商机组展示名称
-    getTypesName(data) {
-      if (data.typeId) {
-        const obj = data.typeOption.find(item => {
-          return item.typeId === data.typeId
-        })
-        return obj.name || ''
-      }
-      return ''
-    },
-    getCheckName(data) {
-      let value = ''
-      data.setting.forEach(item => {
-        if (item.value === data.value) {
-          value = item.name
-          return
-        }
-      })
-      return value
-    },
-    // 商机阶段展示名称
-    getStatusName(data) {
-      if (data.statusId) {
-        const obj = data.statusOption.find(item => {
-          return item.statusId === data.statusId
-        })
-        if (obj.name) {
-          return '-' + obj.name
-        }
-        return ''
-      }
-      return ''
-    },
-    getSelectName(data) {
-      let value = ''
-      data.setting.forEach(item => {
-        if (item.split(",")[1] === data.value) {
-          value = item.split(",")[0]
-          return
-        }
-      })
-      return value
-    },
-    getSwitchName(data) {
-       return  data.value===false? '否':'是';
-    } ,
-    getRelativeName(data)
-    {
-        return data.displadValue;
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-@mixin left() {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-}
-@mixin center() {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.wrapper {
-  width: 100%;
-  min-height: 50px;
-  background: white;
-  border-top: 1px solid #e1e1e1;
-  font-size: 13px;
-  overflow-x: scroll;
-  color: #aaa;
-  @include left;
-  .list {
-    width: 100%;
-    padding: 0 20px;
-    margin-bottom: 10px;
-    flex-shrink: 0;
-    @include left;
-    .list-item {
-      height: 30px;
-      padding: 0 10px;
-      margin: 10px 15px 0 0;
-      border: 1px solid #e1e1e1;
-      border-radius: 3px;
-      flex-shrink: 0;
-      @include center;
-      .icon {
-        margin-left: 20px;
-        cursor: pointer;
-      }
-    }
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/filterForm/index.vue b/code/WebApp/vue/src/views/newJit/components/filterForm/index.vue
deleted file mode 100644
index 692d056c..00000000
--- a/code/WebApp/vue/src/views/newJit/components/filterForm/index.vue
+++ /dev/null
@@ -1,757 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :visible.sync="visible"
-    :close-on-click-modal="false"
-    title="高级筛选"
-    width="900px"
-    :append-to-body="true"
-    @close="handleCancel"
-  >
-    <div style="margin-bottom: 10px">筛选条件</div>
-    <el-form id="filter-container" class="filter-container">
-      <el-form-item>
-        <template v-for="(formItem, index) in form">
-          <el-row :key="index">
-            <el-col :span="8">
-              <el-select
-                v-model="formItem.fieldName"
-                placeholder="请选择要筛选的字段名"
-                @change="fieldChange(formItem)"
-              >
-                <el-option
-                  v-for="item in fieldList"
-                  :key="item.fieldName"
-                  :label="item.name"
-                  :value="item.fieldName"
-                />
-              </el-select>
-            </el-col>
-
-            <el-col v-if="showCalCondition(formItem.formType)" :span="1"
-              >&nbsp;</el-col
-            >
-            <el-col v-if="showCalCondition(formItem.formType)" :span="4">
-              <el-select
-                v-model="formItem.condition"
-                placeholder="请选择筛选方法"
-                @change="actionChange(formItem)"
-              >
-                <el-option
-                  v-for="item in calConditionOptions(
-                    formItem.formType,
-                    formItem
-                  )"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-col>
-
-            <!-- 商机组 -->
-            <el-col v-if="formItem.formType == 'business_type'" :span="1"
-              >&nbsp;</el-col
-            >
-            <el-col v-if="formItem.formType == 'business_type'" :span="4">
-              <el-select
-                v-model="formItem.typeId"
-                placeholder="请选择"
-                @change="typeOptionsChange(formItem)"
-              >
-                <el-option
-                  v-for="item in formItem.typeOption"
-                  :key="item.typeId"
-                  :label="item.name"
-                  :value="item.typeId"
-                />
-              </el-select>
-            </el-col>
-
-            <el-col :span="1">&nbsp;</el-col>
-            <el-col
-              :span="
-                formItem.formType === 'datetime' ||
-                formItem.formType === 'date' ||
-                formItem.formType === 'map_address'
-                  ? 13
-                  : 8
-              "
-            >
-              <el-switch
-                v-if="formItem.formType === 'switch'"
-                v-model="formItem.value"
-                :value="formItem.value"
-              >
-              </el-switch>
-              <el-select
-                v-else-if="formItem.formType === 'select'"
-                clearable
-                v-model="formItem.value"
-                placeholder="请选择筛选条件"
-              >
-                <el-option
-                  v-for="item in formItem.setting"
-                  :key="item.split(',')[1]"
-                  :label="item.split(',')[0]"
-                  :value="item.split(',')[1]"
-                />
-              </el-select>
-              <el-select
-                v-else-if="formItem.formType === 'checkStatus'"
-                v-model="formItem.value"
-                placeholder="请选择筛选条件"
-              >
-                <el-option
-                  v-for="item in formItem.setting"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-              <el-date-picker
-                v-else-if="
-                  formItem.formType === 'date' ||
-                  formItem.formType === 'datetime'
-                "
-                v-model="formItem.value"
-                :value-format="
-                  formItem.formType === 'date'
-                    ? 'yyyy-MM-dd'
-                    : 'yyyy-MM-dd HH:mm:ss'
-                "
-                :type="
-                  formItem.formType === 'date' ? 'daterange' : 'datetimerange'
-                "
-                style="padding: 0px 10px"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              />
-              <el-select
-                v-else-if="formItem.formType === 'business_type'"
-                v-model="formItem.statusId"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in formItem.statusOption"
-                  :key="item.statusId"
-                  :label="item.name"
-                  :value="item.statusId"
-                />
-              </el-select>
-
-              <crm-relative-cell
-                ref="CrmRelativeCell"
-                v-else-if="
-                  formItem.formType != 'text' &&
-                  formItem.fieldName.endsWith('ID')
-                "
-                :item="formItem"
-                :relation="{ type: formItem.formType }"
-                :radio="false"
-                :disabled="formItem.disabled"
-                @value-change="valueChange"
-              />
-
-              <el-input
-                v-else
-                v-model="formItem.value"
-                placeholder="请输入筛选条件"
-              />
-
-              <!-- <el-input
-                v-else-if="formItem.formType === 'text'"
-                v-model="formItem.value"
-                placeholder="请输入筛选条件"/> -->
-              <!-- <xh-user-cell
-                v-else-if="formItem.formType === 'user'"
-                :item="formItem"
-                :info-params="{m	:'crm',c: crmType,a: 'index' }"
-                @value-change="arrayValueChange"/>
-              <xh-prouct-cate
-                v-else-if="formItem.formType === 'category'"
-                :item="formItem"
-                @value-change="arrayValueChange"/>
-              <v-distpicker
-                v-else-if="formItem.formType === 'map_address'"
-                :province="formItem.address.state"
-                :city="formItem.address.city"
-                :area="formItem.address.area"
-                @province="selectProvince($event,formItem)"
-                @city="selectCity($event,formItem)"
-                @area="selectArea($event,formItem)"/> -->
-            </el-col>
-            <el-col :span="1" class="delete">
-              <i
-                class="el-icon-error delete-btn"
-                @click="handleDelete(index)"
-              />
-            </el-col>
-          </el-row>
-        </template>
-      </el-form-item>
-    </el-form>
-    <p v-show="showErrors" class="el-icon-warning warning-info">
-      <span class="desc">筛选条件中有重复项！</span>
-    </p>
-    <el-button type="text" @click="handleAdd">+ 添加筛选条件</el-button>
-    <!-- <div
-      v-if="!isSeas"
-      class="save">
-      <el-checkbox v-model="saveChecked">保存为场景</el-checkbox>
-      <el-input
-        v-show="saveChecked"
-        v-model.trim="saveName"
-        :maxlength="10"
-        class="name"
-        placeholder="请输入场景名称，最多10个字符"/>
-      <div
-        v-show="saveChecked"
-        class="save-setting">
-        <el-checkbox v-model="saveDefault">设置为默认</el-checkbox>
-      </div>
-    </div> -->
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="handleCancel">取 消</el-button>
-      <el-button type="primary" @click="handleConfirm">确 定</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { objDeepCopy } from "@/utils";
-import { CrmRelativeCell } from "@/components/CreateCom";
-// import { XhUserCell, XhProuctCate } from '@/components/CreateCom'
-// import VDistpicker from 'v-distpicker'
-/**
- * fieldList: 高级筛选的字段
- *     type:  date || datetime || select || 其他 input
- */
-export default {
-  name: "Index",
-  components: {
-    "crm-relative-cell": CrmRelativeCell,
-    // XhUserCell,
-    // XhProuctCate,
-    // VDistpicker
-  },
-  props: {
-    dialogVisible: {
-      type: Boolean,
-      required: true,
-      default: false,
-    },
-    fieldList: {
-      type: Array,
-      required: true,
-      default: () => {
-        return [];
-      },
-    },
-    obj: {
-      type: Object,
-      required: true,
-      default: () => {
-        return {};
-      },
-    },
-    /** 获取客户管理下列表权限内的员工列表 针对 usersList */
-    crmType: {
-      type: String,
-      default: "",
-    },
-    // 辅助 使用 公海没有场景
-    isSeas: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {
-      form: [],
-      visible: false,
-      showErrors: false,
-      saveChecked: false, // 展示场景
-      saveDefault: false, // 设置为默认场景
-      saveName: null, // 场景名称
-    };
-  },
-  watch: {
-    dialogVisible: {
-      handler(val) {
-        if (val) {
-          this.form = objDeepCopy(this.obj.form);
-          if (this.form.length == 0) {
-            this.form.push({
-              fieldName: "",
-              name: "",
-              formType: "text",
-              condition: "is",
-              action: 0,
-              value: "",
-              displadValue: "",
-              typeOption: [],
-              statusOption: [],
-              typeId: "",
-              statusId: "",
-              address: {
-                state: "",
-                city: "",
-                area: "",
-              },
-            });
-          }
-          this.saveChecked = false;
-          this.saveDefault = false;
-          this.saveName = null;
-        }
-        this.visible = this.dialogVisible;
-      },
-      deep: true,
-      immediate: true,
-    },
-
-    form() {
-      this.$nextTick(() => {
-        var container = document.getElementById("filter-container");
-        container.scrollTop = container.scrollHeight;
-      });
-    },
-  },
-  methods: {
-    /**
-     * 位置更改
-     */
-    selectProvince(data, formItem) {
-      formItem.address.state = data.value;
-    },
-    selectCity(data, formItem) {
-      formItem.address.city = data.value;
-    },
-    selectArea(data, formItem) {
-      formItem.address.area = data.value;
-    },
-
-    /**
-     * 商机组状态
-     */
-    typeOptionsChange(formItem) {
-      if (formItem.typeId) {
-        const obj = formItem.typeOption.find((item) => {
-          return item.typeId === formItem.typeId;
-        });
-        formItem.statusOption = obj.statusList || [];
-      } else {
-        formItem.statusOption = [];
-      }
-      formItem.statusId = "";
-    },
-    /**
-     * 用户创建人
-     * 产品类别
-     */
-    arrayValueChange(data) {
-      if (data.value.length > 0) {
-        data.item.value = data.value;
-        data.item.valueContent = data.valueContent;
-      } else {
-        data.item.value = [];
-      }
-    },
-
-    /**
-     * 是否展示条件
-     */
-    showCalCondition(formType) {
-      if (
-        formType == "date" ||
-        formType == "datetime" ||
-        formType == "business_type" ||
-        formType == "category" ||
-        formType == "map_address"
-      ) {
-        return false;
-      }
-      return true;
-    },
-    /** 条件数据源 */
-    calConditionOptions(formType, item) {
-      //bool 或者 枚举类型
-      if (
-        formType == "select" ||
-        formType == "switch" ||
-        formType == "checkbox"
-        // ||formType == 'user' ||
-        // formType == 'checkStatus'
-      ) {
-        return [
-          { action: 0, value: "is", label: "等于", disabled: false },
-          { action: 1, value: "isNot", label: "不等于", disabled: false },
-        ];
-      }
-      //字符串类型
-      else if (
-        formType == "module" ||
-        formType == "text" ||
-        formType == "textarea"
-      ) {
-        return [
-          { action: 0, value: "is", label: "等于", disabled: false },
-          { action: 1, value: "isNot", label: "不等于", disabled: false },
-          { value: "contains", label: "包含", disabled: false },
-          { value: "notContains", label: "不包含", disabled: false },
-        ];
-      }
-      //数值类型
-      else if (formType == "floatnumber" || formType == "number") {
-        return [
-          { value: "is", label: "等于", disabled: false },
-          { value: "isNot", label: "不等于", disabled: false },
-          // { value: 'contains', label: '包含', disabled: false },
-          // { value: 'notContains', label: '不包含', disabled: false },
-          // { value: 'isNull', label: '为空', disabled: false },
-          // { value: 'isNotNull', label: '不为空', disabled: false },
-          { value: "gt", label: "大于", disabled: false },
-          { value: "egt", label: "大于等于", disabled: false },
-          { value: "lt", label: "小于", disabled: false },
-          { value: "elt", label: "小于等于", disabled: false },
-        ];
-      } else if (formType == "datetime") {
-        return [
-          { value: "startWith", label: "开始于", disabled: false },
-          { value: "endWith", label: "结束于", disabled: false },
-        ];
-      }
-      // else if (formType == 'category') {
-      //   return [
-      //     { value: 'is', label: '等于', disabled: false },
-      //     { value: 'isnot', label: '不等于', disabled: false },
-      //     { value: 'contains', label: '包含', disabled: false },
-      //     { value: 'not_contain', label: '不包含', disabled: false }
-      //   ]
-      // }
-      else {
-        //默认查询条件
-        return [
-          { value: "is", label: "等于", disabled: false },
-          { value: "isNot", label: "不等于", disabled: false },
-          // { value: 'contains', label: '包含', disabled: false },
-          // { value: 'notContains', label: '不包含', disabled: false },
-          // { value: 'startWith', label: '开始于', disabled: false },
-          // { value: 'endWith', label: '结束于', disabled: false },
-          // { value: 'isNull', label: '为空', disabled: false },
-          // { value: 'isNotNull', label: '不为空', disabled: false },
-          // { value: 'gt', label: '大于', disabled: false },
-          // { value: 'egt', label: '大于等于', disabled: false },
-          // { value: 'lt', label: '小于', disabled: false },
-          // { value: 'elt', label: '小于等于', disabled: false }
-        ];
-      }
-    },
-    /**
-     * 当前选择的字段名改变，判断是否有重复
-     * @param formItem
-     */
-    fieldChange(formItem) {
-      const obj = this.fieldList.find((item) => {
-        return item.fieldName === formItem.fieldName;
-      });
-      if (obj) {
-        formItem.formType = obj.formType;
-        formItem.name = obj.name;
-        if (formItem.formType === "date" || formItem.formType === "datetime") {
-          formItem.value = [];
-        } else if (formItem.formType == "select") {
-          formItem.setting = obj.setting || [];
-          formItem.value = "";
-        }
-        //关联表
-        else if (
-          formItem.formType != "text" &&
-          formItem.fieldName.endsWith("ID")
-        ) {
-          //清空内容
-          formItem.value = "";
-        }
-      }
-
-      const arr = this.form.filter((item) => {
-        return item.fieldName === formItem.fieldName;
-      });
-      if (arr.length > 1) this.showErrors = true;
-      else this.showErrors = false;
-    },
-    actionChange(formItem) {
-      switch (formItem.condition) {
-        case "is": // 等于
-          formItem.action = 0;
-          break;
-        case "isNot": // 不等于
-          formItem.action = 1;
-          break;
-        case "gt": //大于
-          formItem.action = 2;
-          break;
-        case "lt": //小于
-          formItem.action = 3;
-          break;
-        case ("egt", "startWith"): //大于等于
-          formItem.action = 4;
-          break;
-        case ("elt", "endWith"): //小于等于
-          formItem.action = 5;
-          break;
-        case "contains": // 类似于
-          formItem.action = 6;
-          break;
-        case "notContains": //不类似于
-          formItem.action = 7;
-          break;
-        default:
-          return 0;
-      }
-    },
-    valueChange(data) {
-      var type = data.type;
-      var formItem = this.form.find((item) => {
-        return item.formType === type;
-      });
-      if (
-        formItem != null &&
-        data.value[0] != null &&
-        data.value[0]["Id"] != null
-      ) {
-        formItem.value = data.value[0]["Id"];
-        formItem.displadValue = data.value[0]["Name"];
-      }
-    },
-    /**
-     * 取消选择
-     */
-    handleCancel() {
-      this.$emit("update:dialogVisible", false);
-    },
-    /**
-     * 确定选择
-     */
-    handleConfirm() {
-      if (this.showErrors) {
-        this.$message.error("筛选条件中有重复项！");
-        return;
-      }
-      if (this.saveChecked) {
-        if (!this.saveName || this.saveName === "") {
-          this.$message.error("场景名称不能为空！");
-          return;
-        }
-      }
-      for (let i = 0; i < this.form.length; i++) {
-        const o = this.form[i];
-        if (!o.fieldName || o.fieldName === "") {
-          this.$emit("filter", null);
-          return;
-        } else {
-          if (o.formType == "date" || o.formType == "datetime") {
-            if (!o.value || o.value.length === 0) {
-              this.$message.error("请选择筛选条件的值！");
-              return;
-            }
-          } else if (o.formType == "text") {
-            if (!o.value && o.value !== 0) {
-              this.$message.error("请输入筛选条件的值！");
-              return;
-            }
-          }
-          //关联表
-          else if (o.formType != "text" && o.fieldName.endsWith("ID")) {
-            if (!o.value && o.value !== 0) {
-              this.$message.error("请选择筛选条件的值！");
-              return;
-            }
-          }
-        }
-      }
-
-      let items = [];
-      this.form.forEach((o) => {
-        let obj = {};
-        if (o.formType == "text") {
-          obj = {
-            condition: o.condition,
-            action: o.action,
-            value: o.value,
-            formType: o.formType,
-            fieldName: o.fieldName,
-          };
-        } else if (o.formType == "datetime" || o.formType == "date") {
-          obj = {
-            condition: o.condition,
-            action: o.action,
-            start: o.value[0],
-            end: o.value[1],
-            formType: o.formType,
-            fieldName: o.fieldName,
-          };
-        } else if (o.formType == "select") {
-          obj = {
-            condition: o.condition,
-            action: o.action,
-            value: o.value,
-            formType: o.formType,
-            fieldName: o.fieldName,
-          };
-        } else if (o.formType == "switch") {
-          let value = o.value === false ? "false" : "true"; //o.value默认等于''
-          obj = {
-            condition: o.condition,
-            action: o.action,
-            value: value,
-            formType: o.formType,
-            fieldName: o.fieldName,
-          };
-        }
-        //关联表
-        else {
-          obj = {
-            condition: o.condition,
-            action: o.action,
-            value: o.value,
-            formType: o.formType,
-            fieldName: o.fieldName,
-            displadValue: o.displadValue,
-          };
-        }
-        items.push(obj);
-      });
-      const data = {
-        obj: items,
-        form: this.form,
-        saveChecked: this.saveChecked,
-        saveDefault: this.saveDefault,
-        saveName: this.saveName,
-      };
-      data.obj = items;
-      this.$emit("filter", data);
-    },
-    /**
-     * 添加筛选条件
-     */
-    handleAdd() {
-      this.form.push(
-        {
-          fieldName: "",
-          formType: "text",
-          condition: "is",
-          action: 0,
-          value: "",
-          displadValue: "",
-          formType: "",
-          setting: [],
-          typeOption: [],
-          statusOption: [],
-          typeId: "",
-          statusId: "",
-          data: [],
-        }
-      );
-    },
-    /**
-     * 删除筛选条件
-     * @param index
-     */
-    handleDelete(index) {
-      this.$confirm("您确定要删除这一条数据吗?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.form.splice(index, 1);
-          this.form.forEach((itemForm) => {
-            //用于判断是否有重复项
-            //this.fieldChange(item);
-            const arr = this.form.filter((item) => {
-              return item.fieldName === itemForm.fieldName;
-            });
-            if (arr.length > 1) this.showErrors = true;
-            else this.showErrors = false;
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-/deep/ .el-dialog__body {
-  padding: 10px 20px;
-}
-
-/deep/ .el-form-item__label {
-  width: 100%;
-  text-align: left;
-}
-.filter-container {
-  max-height: 300px;
-  overflow-y: auto;
-}
-
-.save {
-  margin-top: 10px;
-  .name {
-    width: 300px;
-    margin-left: 10px;
-    /deep/ .el-input__inner {
-      height: 32px;
-    }
-  }
-  .save-setting {
-    margin-top: 20px;
-  }
-}
-
-.el-form-item {
-  margin-bottom: 0;
-}
-
-.el-row {
-  margin-bottom: 20px;
-  .delete-btn {
-    margin-left: 15px;
-    color: #bbb;
-    cursor: pointer;
-  }
-  .el-select,
-  .el-date-editor {
-    width: 100%;
-  }
-}
-
-.warning-info {
-  width: 100%;
-  font-size: 14px;
-  color: #f56c6c;
-  margin-top: 10px;
-  .desc {
-    padding-left: 8px;
-  }
-}
-
-.distpicker-address-wrapper /deep/ select {
-  border-radius: 2px;
-  font-size: 13px;
-  height: 34px;
-  -webkit-appearance: none;
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAWCAYAAAAW5GZjAAAMHmlDQ1BEaXNwbGF5AABIx62Xd1RTyRrA55YkJCS0QASkhN4E6VV6jVSpgo2QBBJKDAlBxI4uKrgWVCxYkVUR21oAWWzYlUWw90URFGVdLNhAeZME0NXz/njnvDln7v3lm2++lrlzZgBQjWGLRNmoGgA5wjxxbGgAc2JyCpP0BBCBGiADXaDK5khE/jExEQC24fe/2/tbAJG9r9vKbIH/ralzeRIOAEgM5DSuhJMD+QgAuCtHJM4DgNAD5SYz8kSQiTBKoCmGAUI2lXGGgt1lnKbgCLlOfGwg5FQAlKhstjgDABVZXMx8Tga0o7IMsr2QKxBCboTsw+GzuZAHII/JyZkOWdUSsmXad3Yy/mUzbcQmm50xwopc5E0pSCARZbNngv93y8mWDvswgZ3KF4fFynKW1S1reriMqZAvCtOioiFrQL4h4Mr1ZdzFl4YlDOl/5EgCYc0AAwCUymUHhUPWg2wszI6KGJL7pAtCWJBh7dF4QR4rXjEX5Yqnxw7ZRwt4kuC4YWaL5b5kOiXSrAT/IZtb+DzWsM2GQn58kiJOtDVfkBgFWQXyA0lWXPiQzotCfmDUsI5YGiuLGf7nGEgXh8QqdDDTHMlwXpgnX8CKGuKIPH58mGIuNpXDlsemDTmTJ5kYMRwnlxcUrMgLK+IJE4bix8pEeQGxQ/pVouyYIX2skZcdKpMbQ26R5McNz+3Ng4tNkS8ORHkx8YrYcM1M9vgYRQy4NYgAgSAIMIEU9jQwHWQCQUtPXQ/8pRgJAWwgBhmAB2yHJMMzkuQjQviMA4Xgb0g8IBmZFyAf5YF8KP8yIlU8bUG6fDRfPiMLdEHOAeEgG/6WymcJR7wlgqdQIvjJOwfGmg27bOwnGVN1WEYMJgYRw4ghRCtcF/fBvfAI+PSD3RF3xz2G4/qmT+gitBGeEG4S2gl3pwmKxD9EzgSRoB3GGDKUXdr32eHm0KoLHoB7Q/vQNs7AdYEt7gw9+eO+0LcLlH4fq3Qk42+1HLJFtiej5FFkP7LljxGoWKu4jFiRVer7WijiShupVuDIyI95BH5XPy58h/+oiS3BDmMXsNPYJawRqwNM7CRWjzVjx2U8sjaeytfGsLdYeTxZ0I7gJ3/sIZ+yqknsa+y77QeGxkAeryBP9rEEThfNFAsy+HlMf7hb85gsIcduDNPR3gHuorK9X7G1vGXI93SEcfmbLPcUAB4lUJjxTcaGe9CxLgDo77/JTN7AZb8SgOOtHKk4XyHDZQ8CoABV+KXoAAO4d1nCjByBK/ACfiAYjAfRIB4kg6mwzny4TsVgBpgNFoBiUApWgrVgI9gKdoDdYB84BOpAIzgNzoMroBXcBPfhWukEL0EveA/6EQQhITSEjugghogZYoM4Iu6IDxKMRCCxSDKSimQgQkSKzEYWIqVIGbIR2Y5UI78jx5DTyCWkDbmLPEa6kTfIZxRDqagmqo+ao2NRd9QfDUfj0SloBpqLFqKL0OXoerQS3YvWoqfRK+hNtB19ifZhAFPGGJgRZou5Y4FYNJaCpWNibC5WgpVjldh+rAH+09exdqwH+4QTcTrOxG3heg3DE3AOnovPxZfhG/HdeC1+Fr+OP8Z78a8EGkGPYEPwJLAIEwkZhBmEYkI5YSfhKOEc/HY6Ce+JRCKDaEF0g99eMjGTOIu4jLiZeIB4ithG7CD2kUgkHZINyZsUTWKT8kjFpA2kvaSTpGukTtJHJWUlQyVHpRClFCWhUpFSudIepRNK15SeKfWT1chmZE9yNJlLnkleQa4iN5CvkjvJ/RR1igXFmxJPyaQsoKyn7KecozygvFVWVjZW9lCeoCxQnq+8Xvmg8kXlx8qfqBpUa2ogdTJVSl1O3UU9Rb1LfUuj0cxpfrQUWh5tOa2adob2iPZRha5ip8JS4arMU6lQqVW5pvJKlaxqpuqvOlW1ULVc9bDqVdUeNbKauVqgGlttrlqF2jG122p96nR1B/Vo9Rz1Zep71C+pP9cgaZhrBGtwNRZp7NA4o9FBx+gm9EA6h76QXkU/R+/UJGpaaLI0MzVLNfdptmj2amloOWslahVoVWgd12pnYAxzBouRzVjBOMS4xfg8Sn+U/yjeqKWj9o+6NuqD9mhtP22edon2Ae2b2p91mDrBOlk6q3TqdB7q4rrWuhN0Z+hu0T2n2zNac7TXaM7oktGHRt/TQ/Ws9WL1Zunt0GvW69M30A/VF+lv0D+j32PAMPAzyDRYY3DCoNuQbuhjKDBcY3jS8AVTi+nPzGauZ55l9hrpGYUZSY22G7UY9RtbGCcYFxkfMH5oQjFxN0k3WWPSZNJramgaaTrbtMb0nhnZzN2Mb7bO7ILZB3ML8yTzxeZ15s8ttC1YFoUWNRYPLGmWvpa5lpWWN6yIVu5WWVabrVqtUWsXa751hfVVG9TG1UZgs9mmbQxhjMcY4ZjKMbdtqbb+tvm2NbaP7Rh2EXZFdnV2r8aajk0Zu2rshbFf7V3ss+2r7O87aDiMdyhyaHB442jtyHGscLzhRHMKcZrnVO/02tnGmee8xfmOC90l0mWxS5PLF1c3V7HrftduN1O3VLdNbrfdNd1j3Je5X/QgeAR4zPNo9Pjk6eqZ53nI8x8vW68srz1ez8dZjOONqxrX4W3szfbe7t3uw/RJ9dnm0+5r5Mv2rfR94mfix/Xb6ffM38o/03+v/6sA+wBxwNGAD4GegXMCTwVhQaFBJUEtwRrBCcEbgx+FGIdkhNSE9Ia6hM4KPRVGCAsPWxV2m6XP4rCqWb3j3cbPGX82nBoeF74x/EmEdYQ4oiESjRwfuTryQZRZlDCqLhpEs6JXRz+MsYjJjfljAnFCzISKCV2xDrGzYy/E0eOmxe2Jex8fEL8i/n6CZYI0oSlRNXFyYnXih6SgpLKk9oljJ86ZeCVZN1mQXJ9CSklM2ZnSNyl40tpJnZNdJhdPvjXFYkrBlEtTdadmTz0+TXUae9rhVEJqUuqe1AF2NLuS3ZfGStuU1ssJ5KzjvOT6cddwu3nevDLes3Tv9LL05xneGaszuvm+/HJ+jyBQsFHwOjMsc2vmh6zorF1Zg9lJ2QdylHJSc44JNYRZwrPTDaYXTG8T2YiKRe25nrlrc3vF4eKdEkQyRVKfpwkP2c1SS+kv0sf5PvkV+R9nJM44XKBeICxonmk9c+nMZ4Uhhb/NwmdxZjXNNpq9YPbjOf5zts9F5qbNbZpnMm/RvM75ofN3L6AsyFrwZ5F9UVnRu4VJCxsW6S+av6jjl9BfaopVisXFtxd7Ld66BF8iWNKy1GnphqVfS7gll0vtS8tLB5Zxll3+1eHX9b8OLk9f3rLCdcWWlcSVwpW3Vvmu2l2mXlZY1rE6cnXtGuaakjXv1k5be6ncuXzrOso66br29RHr6zeYbli5YWAjf+PNioCKA5v0Ni3d9GEzd/O1LX5b9m/V31q69fM2wbY720O311aaV5bvIO7I39FVlVh14Tf336p36u4s3flll3BX++7Y3Wer3aqr9+jtWVGD1khruvdO3tu6L2hf/X7b/dsPMA6UHgQHpQdf/J76+61D4YeaDrsf3n/E7Mimo/SjJbVI7cza3jp+XXt9cn3bsfHHmhq8Go7+YffHrkajxorjWsdXnKCcWHRi8GThyb5TolM9pzNOdzRNa7p/ZuKZG2cnnG05F37u4vmQ82cu+F84edH7YuMlz0vHLrtfrrvieqW22aX56J8ufx5tcW2pvep2tb7Vo7WhbVzbiWu+105fD7p+/gbrxpWbUTfbbiXcunN78u32O9w7z+9m3319L/9e//35DwgPSh6qPSx/pPeo8i+rvw60u7Yffxz0uPlJ3JP7HZyOl08lTwc6F3XRusqfGT6rfu74vLE7pLv1xaQXnS9FL/t7iv9W/3vTK8tXR/7x+6e5d2Jv52vx68E3y97qvN31zvldU19M36P3Oe/7P5R81Pm4+5P7pwufkz4/658xQBpY/8XqS8PX8K8PBnMGB0VsMVt+FMBgR9PTAXizCwBaMjw7tAJAmaS4m8kborhPygn8N1bc3+TNFYBdfgAkzAcgAp5RtsBuBpkK37IjeLwfQJ2cRvpQk6Q7OSpsUeGNhfBxcPCtPgCkBgC+iAcH+zcPDn6pgsHeBeBUruJOKGuyO+g2Oxm1dr766W72H1oCcSjh6sMlAAAACXBIWXMAABYlAAAWJQFJUiTwAAAF9mlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDAgNzkuMTYwNDUxLCAyMDE3LzA1LzA2LTAxOjA4OjIxICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoTWFjaW50b3NoKSIgeG1wOkNyZWF0ZURhdGU9IjIwMTgtMDctMjdUMDc6NTY6NDctMDc6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDE4LTA3LTI3VDA3OjU5OjA4LTA3OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDE4LTA3LTI3VDA3OjU5OjA4LTA3OjAwIiBkYzpmb3JtYXQ9ImltYWdlL3BuZyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgcGhvdG9zaG9wOklDQ1Byb2ZpbGU9IkRpc3BsYXkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OWVmMTg3ZTUtMWVmNy00NzlhLWE1Y2QtMmVkMTE5NjQ2Y2ZmIiB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6MTRmNTk5YTMtYTc1Zi05NDQxLTk3ZDQtMmY3OTNjNWQ3NTI3IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6M2FmYmY3ZWYtNWFiOS00MTk4LWFjODUtNzY2NzE2NDk2ODM1Ij4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDozYWZiZjdlZi01YWI5LTQxOTgtYWM4NS03NjY3MTY0OTY4MzUiIHN0RXZ0OndoZW49IjIwMTgtMDctMjdUMDc6NTY6NDctMDc6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChNYWNpbnRvc2gpIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo5ZWYxODdlNS0xZWY3LTQ3OWEtYTVjZC0yZWQxMTk2NDZjZmYiIHN0RXZ0OndoZW49IjIwMTgtMDctMjdUMDc6NTk6MDgtMDc6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChNYWNpbnRvc2gpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDwvcmRmOlNlcT4gPC94bXBNTTpIaXN0b3J5PiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pr46tjAAAACBSURBVCjPY/j//z8DOgaCVVjFsSgMB2IQIxuvYiBgBuJHUMXfgVgCn+I+qEIYXoxVMRBYoymEYX9sio/hUHz79+/fCMVAUIxDIQy3Q9UxyAPxPwKKQdgEHKZAfI4IvJ8BW+DjwoNFMUkeJCnoSIoUkqOb5IREUhIlOfGTlK0IZVgAkODRpD7i30MAAAAASUVORK5CYII=);
-  background-position: calc(100% - 4px) 50%;
-  background-repeat: no-repeat;
-  background-size: 5px 11px;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/followLog/RecordLog.vue b/code/WebApp/vue/src/views/newJit/components/followLog/RecordLog.vue
deleted file mode 100644
index bb6e2c5b..00000000
--- a/code/WebApp/vue/src/views/newJit/components/followLog/RecordLog.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-  <div v-loading="loading">
-    <div v-empty="list.length === 0">
-      <div class="log-items">
-        <follow-record-cell
-          v-for="(item, index) in list"
-          :item="item"
-          :index="index"
-          :crm-type="crmType"
-          :key="index"
-          @on-handle="cellHandle"/>
-        <div class="load">
-          <el-button
-            :loading="loadMoreLoading"
-            type="text">{{ loadMoreLoading ? '加载更多' : '没有更多了' }}</el-button>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import FollowRecordCell from './components/FollowRecordCell' // 跟进记录
-import { crmLeadsRecordIndex } from '@/api/ux/clue'
-// import { crmCustomerRecordIndex } from '@/api/customermanagement/customer'
-// import { crmContactsRecordIndex } from '@/api/customermanagement/contacts'
-// import { crmBusinessRecordIndex } from '@/api/customermanagement/business'
-// import { crmContractRecordIndex } from '@/api/customermanagement/contract'
-
-export default {
-  /** 线索管理 的 线索详情 的 跟进记录*/
-  name: 'RecordLog',
-  components: {
-    FollowRecordCell
-  },
-  props: {
-    /** 模块ID */
-    id: [String, Number],
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      loadMoreLoading: true,
-      isPost: false,
-      page: 1,
-      list: [] // 跟进记录列表
-    }
-  },
-  computed: {},
-  watch: {
-    id: function(val) {
-      this.refreshList()
-    }
-  },
-  mounted() {
-    this.$bus.on('follow-log-refresh', data => {
-      if (data.type == 'record-log') {
-        this.refreshList()
-      }
-    })
-
-    // 分批次加载
-    const dom = document.getElementById('follow-log-content')
-    dom.onscroll = () => {
-      const scrollOff = dom.scrollTop + dom.clientHeight - dom.scrollHeight
-      // 滚动条到底部的条件
-      if (Math.abs(scrollOff) < 10 && this.loadMoreLoading == true) {
-        if (!this.isPost) {
-          this.isPost = true
-          this.page++
-          this.getList()
-        } else {
-          this.loadMoreLoading = false
-        }
-      }
-    }
-
-   this.getList()
-  },
-  activated: function() {},
-  deactivated: function() {},
-
-  beforeDestroy() {
-    this.$bus.off('follow-log-refresh')
-  },
-  methods: {
-    getList() {
-      this.loading = true
-      const request = {
-        // customer: crmCustomerRecordIndex,
-        leads: crmLeadsRecordIndex,
-        // contacts: crmContactsRecordIndex,
-        // business: crmBusinessRecordIndex,
-        // contract: crmContractRecordIndex
-      }[this.crmType]
-      const params = {
-        page: this.page,
-        limit: 10
-      }
-      params[this.crmType + 'Id'] = this.id
-      request(params)
-        .then(res => {
-          this.list = this.list.concat(res.data)
-          if (res.data.length < 10) {
-            this.loadMoreLoading = false
-          } else {
-            this.loadMoreLoading = true
-          }
-          this.loading = false
-          this.isPost = false
-        })
-        .catch(() => {
-          this.isPost = false
-          this.loading = false
-        })
-    },
-    refreshList() {
-      this.page = 1
-      this.list = []
-      this.getList()
-    },
-    /**
-     * 行布局删除
-     */
-    cellHandle(data) {
-      if (data.type == 'delete') {
-        this.list.splice(data.data.index, 1)
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.log-items {
-  min-height: 400px;
-  position: relative;
-}
-
-.load {
-  color: #999;
-  font-size: 13px;
-  margin: 0 auto 15px;
-  text-align: center;
-  .el-button,
-  .el-button:focus {
-    color: #ccc;
-    cursor: auto;
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/followLog/components/FollowRecordCell.vue b/code/WebApp/vue/src/views/newJit/components/followLog/components/FollowRecordCell.vue
deleted file mode 100644
index 20b3ab08..00000000
--- a/code/WebApp/vue/src/views/newJit/components/followLog/components/FollowRecordCell.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-<template>
-  <div class="fl-c">
-    <flexbox class="fl-h">
-      <div
-        v-photo="{img: item.userImg, realname: item.realname}"
-        v-lazy:background-image="$options.filters.filterUserLazyImg(item.userImg)"
-        class="div-photo fl-h-img"/>
-      <div class="fl-h-b">
-        <div class="fl-h-name">{{ item.realname }}</div>
-        <div class="fl-h-time">{{ item.createTime }}</div>
-      </div>
-      <flexbox class="fl-h-mark">
-        <img
-          class="fl-h-mark-img"
-          src="@/assets/img/follow_record.png" >
-        <div class="fl-h-mark-name">跟进记录</div>
-      </flexbox>
-      <el-dropdown
-        trigger="click"
-        @command="handleCommand">
-        <i
-          style="color:#CDCDCD;margin-left: 8px;"
-          class="el-icon-arrow-down el-icon-more"/>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="delete">删除</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-    </flexbox>
-    <div class="fl-b">
-      <div class="fl-b-content">{{ item.content }}</div>
-      <flexbox
-        v-if="item.img && item.img.length > 0"
-        class="fl-b-images"
-        wrap="wrap">
-        <div
-          v-lazy:background-image="file.filePath"
-          v-for="(file, index) in item.img"
-          :key="file.filePath"
-          class="fl-b-img-item"
-          @click="previewImg(item.img, index)"/>
-      </flexbox>
-      <div
-        v-if="item.file && item.file.length > 0"
-        class="fl-b-files">
-        <flexbox
-          v-for="(file, index) in item.file"
-          :key="index"
-          class="cell">
-          <img
-            class="cell-head"
-            src="@/assets/img/relevance_file.png" >
-          <div class="cell-body">{{ file.name }}<span style="color: #ccc;">（{{ file.size }}）</span></div>
-          <el-button
-            type="primary"
-            icon="el-icon-download"
-            @click="downloadFile(file)">下载</el-button>
-        </flexbox>
-      </div>
-      <div
-        v-if="item.category || item.nextTime"
-        class="follow">
-        <span
-          v-if="item.category"
-          class="follow-info">{{ item.category }}</span>
-        <span
-          v-if="item.nextTime"
-          class="follow-info">{{ item.nextTime }}</span>
-      </div>
-      <div
-        v-if="item.contactsList && item.contactsList.length > 0"
-        class="fl-b-other">
-        <div class="fl-b-other-name">关联联系人</div>
-        <div>
-          <flexbox
-            v-for="(item, index) in item.contactsList"
-            :key="index"
-            class="cell"
-            @click.native="checkRelationDetail('contacts', item.contactsId)">
-            <i
-              :style="{'opacity': index == 0 ? 1 : 0}"
-              class="wukong wukong-contacts cell-head crm-type"/>
-            <div
-              class="cell-body"
-              style="color: #6394E5;cursor: pointer;">{{ item.name }}</div>
-          </flexbox>
-        </div>
-      </div>
-      <div
-        v-if="item.businessList && item.businessList.length > 0"
-        class="fl-b-other">
-        <div class="fl-b-other-name">关联商机</div>
-        <div>
-          <flexbox
-            v-for="(item, index) in item.businessList"
-            :key="index"
-            class="cell"
-            @click.native="checkRelationDetail('business', item.businessId)">
-            <i
-              :style="{'opacity': index == 0 ? 1 : 0}"
-              class="wukong wukong-business cell-head crm-type"/>
-            <div
-              class="cell-body"
-              style="color: #6394E5;cursor: pointer;">{{ item.businessName }}</div>
-          </flexbox>
-        </div>
-      </div>
-      <slot/>
-    </div>
-<!--    <c-r-m-full-screen-detail-->
-<!--      :visible.sync="showFullDetail"-->
-<!--      :crm-type="relationCrmType"-->
-<!--      :id="relationID"/>-->
-  </div>
-</template>
-
-<script>
-// import { downloadFile } from '@/utils'
-// import { crmRecordDelete } from '@/api/customermanagement/common'
-
-export default {
-  /** 客户管理 的 客户详情 的 跟进记录cell*/
-  name: 'FollowRecordCell',
-  components: {
-    // CRMFullScreenDetail: () =>
-    //   import('@/views/customermanagement/components/CRMFullScreenDetail.vue')
-  },
-  props: {
-    item: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: ''
-    },
-    index: [String, Number]
-  },
-  data() {
-    return {
-      showFullDetail: false, // 查看相关客户管理详情
-      relationID: '', // 相关ID参数
-      relationCrmType: '' // 相关类型
-    }
-  },
-  computed: {},
-  mounted() {},
-  methods: {
-    previewImg(list, index) {
-      this.$bus.emit('preview-image-bus', {
-        index: index,
-        data: list.map(function(item, index, array) {
-          item.url = item.filePath
-          return item
-        })
-      })
-    },
-    downloadFile(file) {
-      // downloadFile({ path: file.filePath, name: file.name })
-    },
-    /**
-     * 删除跟进记录
-     */
-    handleCommand(command) {
-      // this.$confirm('确定删除?', '提示', {
-      //   confirmButtonText: '确定',
-      //   cancelButtonText: '取消',
-      //   type: 'warning'
-      // })
-      //   .then(() => {
-      //     crmRecordDelete({
-      //       recordId: this.item.recordId
-      //     })
-      //       .then(res => {
-      //         this.$emit('on-handle', {
-      //           type: command,
-      //           data: { item: this.item, index: this.index }
-      //         })
-      //         this.$message.success('操作成功')
-      //       })
-      //       .catch(() => {})
-      //   })
-      //   .catch(() => {
-      //     this.$message({
-      //       type: 'info',
-      //       message: '已取消操作'
-      //     })
-      //   })
-    },
-    /**
-     * 查看相关客户管理详情
-     */
-    checkRelationDetail(type, id) {
-      this.relationID = id
-      this.relationCrmType = type
-      this.showFullDetail = true
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import '../styles/followcell.scss';
-.follow {
-  .follow-info {
-    padding: 5px 10px;
-    background-color: #f5f7fa;
-    color: #999;
-    height: 40px;
-    line-height: 40px;
-    border-radius: 28px;
-    font-size: 12px;
-    margin-right: 10px;
-  }
-}
-
-.crm-type {
-  color: rgb(99, 148, 229);
-  font-size: 14px;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/followLog/styles/followcell.scss b/code/WebApp/vue/src/views/newJit/components/followLog/styles/followcell.scss
deleted file mode 100644
index 3645f72c..00000000
--- a/code/WebApp/vue/src/views/newJit/components/followLog/styles/followcell.scss
+++ /dev/null
@@ -1,174 +0,0 @@
-/** 跟进记录相关的 日志 审批任务 日程 项目 公共css */
-.fl-c {
-  background-color: white;
-  padding: 10px 20px;
-  position: relative;
-}
-
-/** 头部布局 名字 头像 */
-.fl-h {
-  .fl-h-img {
-    display: block;
-    width: 34px;
-    height: 34px;
-    border-radius: 17px;
-    margin-right: 8px;
-  }
-
-  .fl-h-b {
-    flex: 1;
-
-    .fl-h-name {
-      font-size: 13px;
-      color: #333;
-    }
-
-    .fl-h-time {
-      font-size: 12px;
-      color: #999;
-      margin-top: 3px;
-    }
-  }
-}
-
-/** 头部 右侧 布局*/
-.fl-h-handle {
-  width: auto;
-
-  .fl-h-handle-name {
-    font-size: 13px;
-    color: #333;
-    margin-right: 6px;
-  }
-}
-
-.fl-h-mark {
-  width: auto;
-
-  .fl-h-mark-img {
-    display: block;
-    width: 20px;
-    height: 20px;
-    margin-right: 8px;
-  }
-
-  .fl-h-mark-name {
-    font-size: 13px;
-    color: #333;
-  }
-}
-
-/** 内容区域 */
-.fl-b {
-  margin: 20px 0 0 40px;
-
-  .fl-b-content {
-    font-size: 13px;
-    color: #333;
-    margin-bottom: 10px;
-    white-space: pre-wrap;
-    word-wrap: break-word;
-    letter-spacing: 0.5px;
-    line-height: 18px;
-  }
-
-  .fl-b-images {
-    margin-top: 5px;
-    width: 310px;
-
-    .fl-b-img-item {
-      width: 98px;
-      height: 98px;
-      display: inline-block;
-      margin: 0 4px 4px 0;
-      background-size: contain;
-      background-repeat: no-repeat;
-      background-position: center;
-      position: relative;
-      cursor: pointer;
-    }
-  }
-
-  .fl-b-other {
-    margin: 8px 0;
-
-    .fl-b-other-name {
-      margin: 10px 0;
-      color: #666;
-      font-size: 13px;
-    }
-  }
-}
-
-.fl-c:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #e5e5e5;
-  color: #e5e5e5;
-  -webkit-transform-origin: 0 0;
-  transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-  transform: scaleY(0.5);
-  left: 15px;
-  z-index: 2;
-}
-
-.fl-c:first-child:before {
-  display: none;
-}
-
-/** 附件 */
-.fl-b-files {
-  margin-top: 10px;
-}
-
-/** 关联附件 联系人 客户 行布局 */
-.cell {
-  padding: 8px;
-  background-color: #F5F7FA;
-  border-radius: 2px;
-  position: relative;
-
-  .cell-head {
-    display: block;
-    width: 15px;
-    height: 15px;
-    margin-right: 8px;
-  }
-
-  .cell-body {
-    flex: 1;
-    color: #333;
-    font-size: 12px;
-  }
-
-  .cell-foot {
-    display: block;
-    width: 20px;
-    padding: 0 4px;
-    margin-right: 8px;
-  }
-}
-
-.cell:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #e5e5e5;
-  color: #e5e5e5;
-  -webkit-transform-origin: 0 0;
-  transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-  transform: scaleY(0.5);
-  left: 30px;
-  z-index: 2;
-}
-
-.cell:first-child:before {
-  display: none;
-}
diff --git a/code/WebApp/vue/src/views/newJit/components/mixins/message_table.js b/code/WebApp/vue/src/views/newJit/components/mixins/message_table.js
deleted file mode 100644
index b1025c84..00000000
--- a/code/WebApp/vue/src/views/newJit/components/mixins/message_table.js
+++ /dev/null
@@ -1,57 +0,0 @@
-
-export default {
-  components: {},
-  data() {
-    return {
-      loading: false, // 加载动画
-      tableHeight: document.documentElement.clientHeight - 300, // 表的高度
-      total: 0
-    }
-  },
-
-  computed: {
-    // 展示options下拉选择
-    showOptions() {
-      if (this.infoType == 'putInPoolRemind') {
-        return false
-      }
-      return true
-    }
-  },
-
-  mounted() {
-    this.$bus.on('message-scroll', tableHeight => {
-      this.tableHeight = tableHeight
-    })
-
-    this.$bus.on('examine-handle-bus', () => {
-    })
-
-    /** 控制table的高度 */
-    window.onresize = () => {
-      this.updateTableHeight()
-    }
-  },
-
-  beforeDestroy() {
-    this.$bus.off('message-scroll')
-    this.$bus.off('examine-handle-bus')
-
-    if (document.getElementById('crm-table')) {
-      document.getElementById('crm-table').removeEventListener('click', e => {
-        e.stopPropagation()
-      })
-    }
-  },
-
-  methods: {
-    /**
-     * 更新表高
-     */
-    updateTableHeight() {
-      var offsetHei = document.documentElement.clientHeight
-      var removeHeight = Object.keys(this.filterObj).length > 0 ? 360 : 300
-      this.tableHeight = offsetHei - removeHeight
-    }
-  }
-}
diff --git a/code/WebApp/vue/src/views/newJit/components/sceneForm/SceneCreate.vue b/code/WebApp/vue/src/views/newJit/components/sceneForm/SceneCreate.vue
deleted file mode 100644
index 1b326600..00000000
--- a/code/WebApp/vue/src/views/newJit/components/sceneForm/SceneCreate.vue
+++ /dev/null
@@ -1,640 +0,0 @@
-<template>
-  <el-dialog
-    :title="edit_id ? '编辑场景' : '新建场景'"
-    :visible.sync="visible"
-    :append-to-body="true"
-    width="800px"
-    @close="handleCancel">
-    <div class="scene-name-container">
-      <div class="scene-name">场景名称</div>
-      <el-input
-        v-model.trim="saveName"
-        :maxlength="10"
-        class="scene-input"
-        placeholder="请输入场景名称，最多10个字符"/>
-    </div>
-    <div class="scene-name">筛选条件</div>
-    <el-form
-      id="scene-filter-container"
-      class="filter-container">
-      <el-form-item>
-        <template v-for="(formItem, index) in form">
-          <el-row :key="index">
-            <el-col :span="8">
-              <el-select
-                v-model="formItem.fieldName"
-                placeholder="请选择要筛选的字段名"
-                @change="fieldChange(formItem)">
-                <el-option
-                  v-for="item in fieldList"
-                  :key="item.fieldName"
-                  :label="item.name"
-                  :value="item.fieldName"/>
-              </el-select>
-            </el-col>
-
-            <el-col
-              v-if="formItem.formType !== 'date' && formItem.formType !== 'datetime' && formItem.formType !== 'business_type'"
-              :span="1">&nbsp;</el-col>
-            <el-col
-              v-if="formItem.formType !== 'date' && formItem.formType !== 'datetime' && formItem.formType !== 'business_type'"
-              :span="4">
-              <el-select
-                v-model="formItem.condition"
-                placeholder="请选择范围">
-                <el-option
-                  v-for="item in calConditionOptions(formItem.formType, formItem)"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-col>
-
-            <!-- 商机组 -->
-            <el-col
-              v-if="formItem.formType == 'business_type'"
-              :span="1">&nbsp;</el-col>
-            <el-col
-              v-if="formItem.formType == 'business_type'"
-              :span="4">
-              <el-select
-                v-model="formItem.typeId"
-                placeholder="请选择"
-                @change="typeOptionsChange(formItem)">
-                <el-option
-                  v-for="item in formItem.typeOption"
-                  :key="item.typeId"
-                  :label="item.name"
-                  :value="item.typeId"/>
-              </el-select>
-            </el-col>
-
-            <el-col :span="1">&nbsp;</el-col>
-            <el-col :span="formItem.formType === 'datetime' || formItem.formType === 'date' ? 13 : 8">
-              <el-select
-                v-if="formItem.formType === 'select'"
-                v-model="formItem.value"
-                placeholder="请选择筛选条件">
-                <el-option
-                  v-for="item in formItem.setting"
-                  :key="item"
-                  :label="item"
-                  :value="item"/>
-              </el-select>
-              <el-select
-                v-else-if="formItem.formType === 'checkStatus'"
-                v-model="formItem.value"
-                placeholder="请选择筛选条件">
-                <el-option
-                  v-for="item in formItem.setting"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"/>
-              </el-select>
-              <el-date-picker
-                v-else-if="formItem.formType === 'date' || formItem.formType === 'datetime'"
-                v-model="formItem.value"
-                :value-format="formItem.formType === 'date' ? 'yyyy-MM-dd' : 'yyyy-MM-dd HH:mm:ss'"
-                :type="formItem.formType === 'date' ? 'daterange' : 'datetimerange'"
-                style="padding: 0px 10px;"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"/>
-              <el-select
-                v-else-if="formItem.formType === 'business_type'"
-                v-model="formItem.statusId"
-                placeholder="请选择">
-                <el-option
-                  v-for="item in formItem.statusOption"
-                  :key="item.statusId"
-                  :label="item.name"
-                  :value="item.statusId"/>
-              </el-select>
-<!--              <xh-user-cell-->
-<!--                v-else-if="formItem.formType === 'user'"-->
-<!--                :item="formItem"-->
-<!--                :value="formItem.value"-->
-<!--                @value-change="userValueChange"/>-->
-              <el-input
-                v-else
-                v-model="formItem.value"
-                placeholder="请输入筛选条件"/>
-            </el-col>
-            <el-col
-              :span="1"
-              class="delete">
-              <i
-                class="el-icon-error delete-btn"
-                @click="handleDelete(index)"/>
-            </el-col>
-          </el-row>
-        </template>
-      </el-form-item>
-    </el-form>
-    <p
-      v-show="showErrors"
-      class="el-icon-warning warning-info">
-      <span class="desc">筛选条件中有重复项！</span>
-    </p>
-    <el-button
-      type="text"
-      @click="handleAdd">+ 添加筛选条件</el-button>
-    <div class="save">
-      <div class="save-setting">
-        <el-checkbox v-model="saveDefault">设置为默认</el-checkbox>
-      </div>
-    </div>
-    <div
-      slot="footer"
-      class="dialog-footer">
-      <el-button @click="handleCancel">取 消</el-button>
-      <el-button
-        type="primary"
-        @click="handleConfirm">确 定</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-// import crmTypeModel from '@/views/ux/model/crmTypeModel'
-// import { crmSceneSave, crmSceneUpdate } from '@/api/customermanagement/common'
-import {
-  objDeepCopy
-} from '@/utils'
-// import { XhUserCell } from '@/components/CreateCom'
-
-/**
- * fieldList: 高级筛选的字段
- *     type:  date || datetime || select || 其他 input
- */
-export default {
-  name: 'SceneCreate', // 新建场景
-  components: {
-    // XhUserCell
-  },
-  props: {
-    dialogVisible: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
-    fieldList: {
-      type: Array,
-      required: true,
-      default: () => {
-        return []
-      }
-    },
-    obj: {
-      type: Object,
-      default: () => {
-        return {}
-      },
-      required: true
-    },
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: ''
-    },
-    /** 名字和 默认 id 编辑的时候需要 */
-    name: {
-      type: String,
-      default: ''
-    },
-    isDefault: {
-      type: Boolean,
-      default: false
-    },
-    edit_id: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      form: [],
-      visible: false, // 控制展示
-      showErrors: false,
-      saveDefault: false, // 设置为默认场景
-      saveName: null // 场景名称
-    }
-  },
-  watch: {
-    dialogVisible: {
-      handler(val) {
-        if (val) {
-          // 处理编辑数据
-          if (this.edit_id) {
-            this.form = []
-            for (const field in this.obj.obj) {
-              const element = this.obj.obj[field]
-              const item = this.getItem()
-              item.fieldName = element.name
-              item.condition = element.condition
-              item.formType = element.formType
-              if (element.formType == 'date') {
-                item.value = [element.start_date, element.end_date]
-              } else if (element.formType == 'datetime') {
-                item.value = [element.start, element.end]
-              } else if (element.formType == 'business_type') {
-                item.typeId = element.typeId
-                item.statusId = element.statusId
-                item.typeOption = element.setting
-                if (element.typeId) {
-                  const obj = element.setting.find(typeItem => {
-                    return typeItem.typeId === element.typeId
-                  })
-                  if (obj) {
-                    item.statusOption = obj.statusList
-                  } else {
-                    item.statusOption = []
-                  }
-                }
-              } else if (element.formType == 'user') {
-                item.value = element.setting ? [element.setting] : []
-              } else {
-                item.setting = element.setting
-                item.value = element.value
-              }
-              this.form.push(item)
-            }
-          } else {
-            this.form = objDeepCopy(this.obj.form)
-            if (this.form.length == 0) {
-              this.form.push(this.getItem())
-            }
-          }
-
-          /** 只有编辑会牵扯到这两个字段赋值 */
-          if (this.name) {
-            this.saveName = this.name
-          } else {
-            this.saveName = ''
-          }
-          if (this.isDefault) {
-            this.saveDefault = this.isDefault
-          } else {
-            this.saveDefault = false
-          }
-        }
-        this.visible = this.dialogVisible
-      },
-      deep: true,
-      immediate: true
-    },
-
-    form() {
-      this.$nextTick(() => {
-        var container = document.getElementById('scene-filter-container')
-        container.scrollTop = container.scrollHeight
-      })
-    }
-  },
-  methods: {
-    getItem() {
-      return {
-        fieldName: '',
-        name: '',
-        formType: '',
-        condition: 'is',
-        value: '',
-        typeOption: [],
-        statusOption: [],
-        typeId: '',
-        statusId: ''
-      }
-    },
-    /**
-     * 商机组状态
-     */
-    typeOptionsChange(formItem) {
-      if (formItem.typeId) {
-        const obj = formItem.typeOption.find(item => {
-          return item.typeId === formItem.typeId
-        })
-        formItem.statusOption = obj.statusList || []
-      } else {
-        formItem.statusOption = []
-      }
-      formItem.statusId = ''
-    },
-    /**
-     * 用户创建人
-     */
-    userValueChange(data) {
-      if (data.value.length > 0) {
-        data.item.value = data.value
-      } else {
-        data.item.value = []
-      }
-    },
-    /** 条件数据源 */
-    calConditionOptions(formType, item) {
-      if (
-        formType == 'select' ||
-        formType == 'checkbox' ||
-        formType == 'user' ||
-        formType == 'checkStatus'
-      ) {
-        return [
-          { value: 'is', label: '等于', disabled: false },
-          { value: 'isNot', label: '不等于', disabled: false }
-        ]
-      } else if (
-        formType == 'module' ||
-        formType == 'text' ||
-        formType == 'textarea'
-      ) {
-        return [
-          { value: 'is', label: '等于', disabled: false },
-          { value: 'isNot', label: '不等于', disabled: false },
-          { value: 'contains', label: '包含', disabled: false },
-          { value: 'notContains', label: '不包含', disabled: false }
-        ]
-      } else if (formType == 'floatnumber' || formType == 'number') {
-        return [
-          { value: 'is', label: '等于', disabled: false },
-          { value: 'isNot', label: '不等于', disabled: false },
-          { value: 'contains', label: '包含', disabled: false },
-          { value: 'notContains', label: '不包含', disabled: false },
-          { value: 'isNull', label: '为空', disabled: false },
-          { value: 'isNotNull', label: '不为空', disabled: false },
-          { value: 'gt', label: '大于', disabled: false },
-          { value: 'egt', label: '大于等于', disabled: false },
-          { value: 'lt', label: '小于', disabled: false },
-          { value: 'elt', label: '小于等于', disabled: false }
-        ]
-      } else {
-        return [
-          { value: 'is', label: '等于', disabled: false },
-          { value: 'isNot', label: '不等于', disabled: false },
-          { value: 'contains', label: '包含', disabled: false },
-          { value: 'notContains', label: '不包含', disabled: false },
-          { value: 'startWith', label: '开始于', disabled: false },
-          { value: 'endWith', label: '结束于', disabled: false },
-          { value: 'isNull', label: '为空', disabled: false },
-          { value: 'isNotNull', label: '不为空', disabled: false },
-          { value: 'gt', label: '大于', disabled: false },
-          { value: 'egt', label: '大于等于', disabled: false },
-          { value: 'lt', label: '小于', disabled: false },
-          { value: 'elt', label: '小于等于', disabled: false }
-        ]
-      }
-    },
-    /**
-     * 当前选择的字段名改变，判断是否有重复
-     * @param formItem
-     */
-    fieldChange(formItem) {
-      const obj = this.fieldList.find(item => {
-        return item.fieldName === formItem.fieldName
-      })
-      if (obj) {
-        formItem.formType = obj.formType
-        formItem.name = obj.name
-        if (formItem.formType == 'business_type') {
-          formItem.typeOption = obj.setting
-          formItem.statusOption = []
-          formItem.typeId = ''
-          formItem.statusId = ''
-        } else if (
-          formItem.formType == 'select' ||
-          formItem.formType == 'checkStatus'
-        ) {
-          formItem.setting = obj.setting || []
-        } else if (
-          formItem.formType === 'date' ||
-          formItem.formType === 'datetime' ||
-          formItem.formType === 'user'
-        ) {
-          formItem.value = []
-        }
-      }
-
-      const arr = this.form.filter(item => {
-        return item.fieldName === formItem.fieldName
-      })
-      if (arr.length > 1) this.showErrors = true
-      else this.showErrors = false
-    },
-    /**
-     * 取消选择
-     */
-    handleCancel() {
-      this.visible = false
-      this.$emit('update:dialogVisible', false)
-    },
-    /**
-     * 确定选择
-     */
-    handleConfirm() {
-      if (this.showErrors) {
-        this.$message.error('筛选条件中有重复项！')
-        return
-      }
-      if (!this.saveName || this.saveName === '') {
-        this.$message.error('场景名称不能为空！')
-        return
-      }
-      for (let i = 0; i < this.form.length; i++) {
-        const o = this.form[i]
-        if (!o.fieldName || o.fieldName === '') {
-          this.$message.error('要筛选的字段名称不能为空！')
-          return
-        }
-
-        if (o.formType == 'business_type') {
-          if (!o.typeId && !o.statusId) {
-            this.$message.error('请输入筛选条件的值！')
-            return
-          }
-        } else if (
-          o.formType == 'date' ||
-          o.formType == 'datetime' ||
-          o.formType == 'user'
-        ) {
-          if (!o.value || o.value.length === 0) {
-            this.$message.error('请输入筛选条件的值！')
-            return
-          }
-        } else if (!o.value) {
-          this.$message.error('请输入筛选条件的值！')
-          return
-        }
-      }
-      const obj = {}
-      this.form.forEach(o => {
-        if (o.formType == 'datetime' || o.formType == 'date') {
-          obj[o.fieldName] = {
-            start: o.value[0],
-            end: o.value[1],
-            formType: o.formType,
-            name: o.fieldName
-          }
-        } else if (o.formType == 'business_type') {
-          obj[o.fieldName] = {
-            typeId: o.typeId,
-            statusId: o.statusId,
-            formType: o.formType,
-            name: o.fieldName
-          }
-        } else if (o.formType == 'user') {
-          obj[o.fieldName] = {
-            condition: o.condition,
-            value: o.value[0].userId,
-            formType: o.formType,
-            setting: o.value[0],
-            name: o.fieldName
-          }
-        } else {
-          obj[o.fieldName] = {
-            condition: o.condition,
-            value: o.value,
-            formType: o.formType,
-            name: o.fieldName
-          }
-        }
-      })
-      const data = {
-        obj: obj,
-        form: this.form,
-        saveDefault: this.saveDefault,
-        saveName: this.saveName
-      }
-      this.requestCreateScene(data)
-    },
-    // 创建场景
-    requestCreateScene(data) {
-      /** 编辑操作 */
-      if (this.edit_id) {
-        // crmSceneUpdate({
-        //   isDefault: data.saveDefault ? 1 : 0,
-        //   name: data.saveName,
-        //   sceneId: this.edit_id,
-        //   data: JSON.stringify(data.obj)
-        // })
-        //   .then(res => {
-        //     this.$message({
-        //       type: 'success',
-        //       message: '编辑成功'
-        //     })
-        //     // 新建成功
-        //     this.$emit('saveSuccess')
-        //     this.handleCancel()
-        //   })
-        //   .catch(() => {})
-      } else {
-        // crmSceneSave({
-        //   type: crmTypeModel[this.crmType],
-        //   isDefault: data.saveDefault ? 1 : 0,
-        //   name: data.saveName,
-        //   data: JSON.stringify(data.obj)
-        // })
-        //   .then(res => {
-        //     this.$message({
-        //       type: 'success',
-        //       message: '创建成功'
-        //     })
-        //     // 新建成功
-        //     this.$emit('saveSuccess')
-        //     this.handleCancel()
-        //   })
-        //   .catch(() => {})
-      }
-    },
-    /**
-     * 添加筛选条件
-     */
-    handleAdd() {
-      this.form.push(this.getItem())
-    },
-    /**
-     * 删除筛选条件
-     * @param index
-     */
-    handleDelete(index) {
-      this.$confirm('您确定要删除这一条数据吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.form.splice(index, 1)
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  /deep/ .el-dialog__body {
-    padding: 10px 20px;
-  }
-
-  /deep/ .el-form-item__label {
-    width: 100%;
-    text-align: left;
-  }
-  .filter-container {
-    max-height: 200px;
-    overflow-y: auto;
-  }
-
-  .save {
-    margin-top: 10px;
-    .name {
-      width: 300px;
-      margin-left: 10px;
-      /deep/ .el-input__inner {
-        height: 32px;
-      }
-    }
-    .save-setting {
-      margin-top: 20px;
-    }
-  }
-
-  .el-form-item {
-    margin-bottom: 0;
-  }
-
-  .el-row {
-    margin-bottom: 20px;
-    .delete-btn {
-      margin-left: 15px;
-      color: #bbb;
-      cursor: pointer;
-    }
-    .el-select,
-    .el-date-editor {
-      width: 100%;
-    }
-  }
-
-  .warning-info {
-    width: 100%;
-    font-size: 14px;
-    color: #f56c6c;
-    margin-top: 10px;
-    .desc {
-      padding-left: 8px;
-    }
-  }
-
-  .scene-name-container {
-    padding-bottom: 15px;
-    .scene-input {
-      width: 300px;
-    }
-  }
-  .scene-name {
-    margin-bottom: 10px;
-  }
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/sceneForm/SceneList.vue b/code/WebApp/vue/src/views/newJit/components/sceneForm/SceneList.vue
deleted file mode 100644
index 569143d1..00000000
--- a/code/WebApp/vue/src/views/newJit/components/sceneForm/SceneList.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-  <div class="scene-container">
-    <div class="scene-list">
-      <div
-        v-for="(item, index) in sceneList"
-        :key="index"
-        :class="{'scene-list-item-select':item.sceneId == sceneSelectId}"
-        class="scene-list-item"
-        @click="selectScene(item, index)">
-        {{ item.name }}
-      </div>
-    </div>
-    <div>
-      <flexbox
-        class="handle-button"
-        @click.native="addScene">
-        <img
-          class="handle-button-icon"
-          src="@/assets/img/scene_add.png" >
-        <div class="handle-button-name">新建场景</div>
-      </flexbox>
-      <flexbox
-        class="handle-button"
-        @click.native="setScene">
-        <img
-          class="handle-button-icon"
-          src="@/assets/img/scene_set.png" >
-        <div class="handle-button-name">管理</div>
-      </flexbox>
-    </div>
-
-  </div>
-</template>
-
-<script type="text/javascript">
-// import crmTypeModel from '@/views/ux/model/crmTypeModel'
-import { mapGetters } from 'vuex'
-import { crmSceneIndex } from '@/api/ux/common'
-
-export default {
-  name: 'SceneList', // 客户管理下 重要提醒 回款计划提醒
-  components: {},
-  props: {
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      // 场景列表
-      sceneSelectId: -1,
-      sceneList: []
-    }
-  },
-  computed: {
-    // ...mapGetters(['crm'])
-  },
-  watch: {},
-  mounted() {
-      this.getSceneList()
-  },
-  methods: {
-    getSceneList() {
-      crmSceneIndex()
-        .then(res => {
-          const defaultScenes = res.data.filter(function(item, index) {
-            return item.isDefault === 1
-          })
-
-          if (defaultScenes && defaultScenes.length > 0) {
-            const defaultScene = defaultScenes[0]
-            this.sceneSelectId = defaultScene.sceneId
-            this.$emit('scene', {
-              id: defaultScene.sceneId,
-              name: defaultScene.name,
-              bydata: defaultScene.bydata || ''
-            })
-          } else {
-            this.sceneSelectId = ''
-            this.$emit('scene', { id: '', name: '', bydata: '' })
-          }
-
-          this.sceneList = res.data
-        })
-        .catch(() => {
-          this.$emit('scene', { id: '', name: '', bydata: '' })
-        })
-    },
-
-    // 选择场景、
-    selectScene(item, index) {
-      this.sceneSelectId = item.sceneId
-      this.$emit('scene', {
-        id: item.sceneId,
-        name: item.name,
-        bydata: item.bydata
-      })
-      this.$emit('hidden-scene')
-    },
-    // 添加场景
-    addScene() {
-      this.$emit('scene-handle', { type: 'add' })
-    },
-    // 设置场景
-    setScene() {
-      this.$emit('scene-handle', { type: 'set' })
-    }
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.scene-container {
-  position: relative;
-  width: 150px;
-}
-
-.scene-list {
-  max-height: 240px;
-  overflow-y: auto;
-  font-size: 12px;
-  .scene-list-item {
-    color: #333;
-    padding: 10px 15px;
-    cursor: pointer;
-    background-color: white;
-  }
-  .scene-list-item:hover {
-    background-color: #1682e6;
-    color:#f7f8fa;
-  }
-
-  .scene-list-item-select {
-    color: #f7f8fa;
-    background-color: #1682e6;
-  }
-}
-
-.handle-button {
-  padding: 10px 20px;
-  cursor: pointer;
-  .handle-button-icon {
-    display: block;
-    width: 15px;
-    height: 15px;
-    margin-right: 8px;
-  }
-  .handle-button-name {
-    font-size: 12px;
-  }
-}
-.handle-button:hover {
-  color: #3E84E9;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/sceneForm/SceneSet.vue b/code/WebApp/vue/src/views/newJit/components/sceneForm/SceneSet.vue
deleted file mode 100644
index aea9a02a..00000000
--- a/code/WebApp/vue/src/views/newJit/components/sceneForm/SceneSet.vue
+++ /dev/null
@@ -1,648 +0,0 @@
-<template>
-  <el-dialog
-    :visible.sync="visible"
-    :append-to-body="true"
-    title="场景管理"
-    width="700px"
-    @close="handleCancel">
-    <div class="scene-name">您可通过拖拽管理标签</div>
-    <flexbox class="scene-list">
-      <div class="scene-list-box">
-        <flexbox class="scene-list-head">
-          <el-checkbox
-            :indeterminate="isleftIndeterminate"
-            v-model="checkleftAll"
-            @change="handleleftCheckAllChange"/>
-          <div class="scene-list-head-name">显示的标签</div>
-          <div class="scene-list-head-detail">{{ leftCheckItems.length + '/' + checkedLeftData.length }}</div>
-        </flexbox>
-        <div class="scene-list-body">
-          <flexbox
-            v-for="(item, index) in checkedLeftData"
-            v-if="item.isSystem == 1"
-            :key="index"
-            class="list-item">
-            <div
-              :class="{'default-mark-active': item.sceneId == defaultId}"
-              class="default-mark"/>
-            <el-checkbox
-              v-model="item.check"
-              :disabled="true"
-              class="list-item-check"
-              @change="leftCheckItemChange"/>
-            <div class="list-item-name">{{ item.name }}</div>
-            <div class="list-item-handle">
-              <el-dropdown
-                trigger="click"
-                @command="defaultHandle">
-                <i
-                  class="el-icon-arrow-down"
-                  @click="itemHandle('default', item, index)"/>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item>设置为默认标签</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </div>
-          </flexbox>
-          <draggable
-            v-model="checkedLeftData"
-            :move="leftMove"
-            :options="{group: 'list',forceFallback:false, fallbackClass:'draggingStyle'}"
-            style="min-height: 100px;"
-            @end="leftMoveEnd">
-            <flexbox
-              v-for="(item, index) in checkedLeftData"
-              v-if="item.isSystem != 1"
-              :key="index"
-              class="list-item">
-              <div
-                :class="{'default-mark-active': item.sceneId == defaultId}"
-                class="default-mark"/>
-              <el-checkbox
-                v-model="item.check"
-                class="list-item-check"
-                @change="leftCheckItemChange"/>
-              <div class="list-item-name">{{ item.name }}</div>
-              <div class="list-item-handle">
-                <i
-                  class="el-icon-edit"
-                  @click="itemHandle('edit', item, index)"/>
-                <i
-                  class="el-icon-delete"
-                  @click="itemHandle('delete', item, index)"/>
-                <el-dropdown @command="defaultHandle">
-                  <i
-                    class="el-icon-arrow-down"
-                    @click="itemHandle('default', item, index)"/>
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item>设置为默认标签</el-dropdown-item>
-                  </el-dropdown-menu>
-                </el-dropdown>
-              </div>
-            </flexbox>
-          </draggable>
-
-        </div>
-      </div>
-      <div class="scene-middle-list">
-        <el-button
-          :class="{'scene-middle-button-select':rightCheckItems.length > 0}"
-          :disabled="rightCheckItems.length == 0"
-          class="scene-middle-left-button"
-          @click="changePositon('left')">
-          <i class="el-icon-arrow-left scene-middle-icon"/>
-        </el-button>
-        <el-button
-          :class="{'scene-middle-button-select':leftCheckItems.length > 0}"
-          :disabled="leftCheckItems.length == 0"
-          class="scene-middle-right-button"
-          @click="changePositon('right')">
-          <i class="el-icon-arrow-right scene-middle-icon"/>
-        </el-button>
-      </div>
-      <div class="scene-list-box">
-        <flexbox class="scene-list-head">
-          <el-checkbox
-            :indeterminate="isrightIndeterminate"
-            v-model="checkrightAll"
-            @change="handlerightCheckAllChange"/>
-          <div class="scene-list-head-name">隐藏的标签</div>
-          <div class="scene-list-head-detail">{{ rightCheckItems.length + '/' + checkedRightData.length }}</div>
-        </flexbox>
-        <div class="scene-list-body">
-          <draggable
-            v-model="checkedRightData"
-            :move="rightMove"
-            :options="{group: 'list',forceFallback:false, fallbackClass:'draggingStyle'}"
-            style="min-height: 100px;"
-            @end="rightMoveEnd">
-            <flexbox
-              v-for="(item, index) in checkedRightData"
-              :key="index"
-              class="list-item">
-              <el-checkbox
-                v-model="item.check"
-                style="margin-left:9px;"
-                class="list-item-check"
-                @change="rightCheckItemChange"/>
-              <div class="list-item-name">{{ item.name }}</div>
-            </flexbox>
-          </draggable>
-        </div>
-      </div>
-    </flexbox>
-    <div class="handle-bar">
-      <div
-        class="handle-bar-add"
-        @click="addAndEditScene('add',{})">+ 新建场景</div>
-      <div class="handle-bar-save">
-        <el-button @click.native="handleCancel">取消</el-button>
-        <el-button
-          type="primary"
-          @click.native="handleConfirm">保存</el-button>
-      </div>
-    </div>
-    <scene-create
-      :field-list="fieldList"
-      :crm-type="crmType"
-      :dialog-visible.sync="showCreateScene"
-      :obj="filterObj"
-      :name="filterName"
-      :edit_id="filterEditId"
-      :is-default="filterDefault"
-      @saveSuccess="getSceneList"/>
-  </el-dialog>
-</template>
-
-<script type="text/javascript">
-// import crmTypeModel from '@/views/ux/model/crmTypeModel'
-// import {
-//   crmSceneSetIndex,
-//   crmSceneSort,
-//   crmSceneDefaults,
-//   crmSceneDelete,
-//   filterIndexfields
-// } from '@/api/customermanagement/common'
-import draggable from 'vuedraggable'
-import SceneCreate from './SceneCreate' // 新建编辑场景
-
-export default {
-  name: 'SceneSet', // 场景 设置
-  components: {
-    draggable,
-    SceneCreate
-  },
-  props: {
-    dialogVisible: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      defaultId: '', // 默认场景id
-      visible: false, // 控制展示
-      isleftIndeterminate: false, // 标注头部是多选框效果
-      checkleftAll: false, // 关联全选操作多选框
-
-      checkedLeftData: [], // 数据源
-      leftCheckItems: [], // 选择的数据源
-
-      isrightIndeterminate: false,
-      checkrightAll: false,
-
-      checkedRightData: [],
-      rightCheckItems: [],
-
-      moveItem: {}, // 移动中的item
-      handlDefaultItem: {}, // 设置默认的中间item
-
-      /** 添加 编辑 场景 */
-      showCreateScene: false, // 展示场景添加
-      fieldList: [],
-      filterObj: { form: [] }, // 筛选确定数据
-      filterName: '',
-      filterDefault: false,
-      filterEditId: '' // 编辑id
-    }
-  },
-  computed: {},
-  watch: {
-    dialogVisible: {
-      handler(val) {
-        this.visible = val
-        if (val) {
-          this.getSceneList()
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  mounted() {},
-  methods: {
-    getSceneList() {
-      // crmSceneSetIndex({
-      //   type: crmTypeModel[this.crmType]
-      // })
-      //   .then(res => {
-      //     this.checkedLeftData = res.data.value.map(function(item, index) {
-      //       item.check = false
-      //       return item
-      //     })
-      //     this.checkedRightData = res.data.hide_value.map(function(
-      //       item,
-      //       index
-      //     ) {
-      //       item.check = false
-      //       return item
-      //     })
-      //     var defaultScene = this.checkedLeftData.filter(function(item, index) {
-      //       return item.isDefault == 1
-      //     })
-      //     // 如果有默认场景
-      //     if (defaultScene && defaultScene.length > 0) {
-      //       this.defaultId = defaultScene[0].sceneId
-      //     } else {
-      //       this.defaultId = ''
-      //     }
-      //   })
-      //   .catch(() => {})
-    },
-    /**
-     * 确定选择
-     */
-    handleConfirm() {
-      // 如果选择默认的 不包含在左侧列表 重置为没有默认
-      var self = this
-      var leftTemps = this.checkedLeftData.filter(function(item, index) {
-        return item.sceneId == self.defaultId
-      })
-      if (leftTemps.length == 0) {
-        this.defaultId = ''
-      }
-      // crmSceneSort({
-      //   type: crmTypeModel[this.crmType],
-      //   noHideIds: this.checkedLeftData
-      //     .map(function(item, index, array) {
-      //       return item.sceneId
-      //     })
-      //     .join(','),
-      //   hideIds: this.checkedRightData
-      //     .map(function(item, index, array) {
-      //       return item.sceneId
-      //     })
-      //     .join(',')
-      // })
-      //   .then(res => {
-      //     this.$message({
-      //       type: 'success',
-      //       message: '操作成功'
-      //     })
-      //     this.handleCancel()
-      //     this.$emit('save-success')
-      //   })
-      //   .catch(() => {})
-    },
-    /** 事项操作 */
-    itemHandle(type, item, index) {
-      if (type == 'edit') {
-        this.addAndEditScene('edit', item)
-      } else if (type == 'delete') {
-        this.$confirm('您确定要删除这一条数据吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            crmSceneDelete({
-              sceneId: item.sceneId
-            })
-              .then(res => {
-                this.$message({
-                  type: 'success',
-                  message: '删除成功'
-                })
-                this.checkedLeftData.splice(index, 1)
-                this.leftCheckItemChange()
-                this.$emit('save-success')
-              })
-              .catch(() => {})
-          })
-          .catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消删除'
-            })
-          })
-      } else if (type == 'default') {
-        this.handlDefaultItem = item
-      }
-    },
-    /** 操作默认 */
-    defaultHandle() {
-      crmSceneDefaults({
-        sceneId: this.handlDefaultItem.sceneId
-      })
-        .then(res => {
-          this.$message({
-            type: 'success',
-            message: '操作成功'
-          })
-          this.defaultId = this.handlDefaultItem.sceneId
-        })
-        .catch(() => {})
-    },
-    /** 添加编辑场景 */
-    addAndEditScene(type, data) {
-      // filterIndexfields({
-      //   label: crmTypeModel[this.crmType]
-      // })
-      //   .then(res => {
-      //     this.fieldList = res.data
-      //     if (type == 'edit') {
-      //       this.filterObj = { form: [], obj: data.data }
-      //       this.filterName = data.name
-      //       this.filterDefault = data.isDefault == 1
-      //       this.filterEditId = data.sceneId.toString()
-      //     } else {
-      //       this.filterObj = { form: [] }
-      //       this.filterEditId = ''
-      //       this.filterName = ''
-      //       this.filterDefault = false
-      //     }
-      //     this.showCreateScene = true
-      //   })
-      //   .catch(() => {})
-    },
-    /**
-     * 取消选择
-     */
-    handleCancel() {
-      this.visible = false
-      this.$emit('update:dialogVisible', false)
-    },
-    /** 拖拽操作 */
-    rightMoveEnd(evt) {
-      this.moveItem.check = false
-      this.leftCheckItemChange()
-      this.rightCheckItemChange()
-    },
-    rightMove(obj) {
-      this.moveItem = obj.draggedContext.element
-    },
-    leftMoveEnd(evt) {
-      this.moveItem.check = false
-      this.leftCheckItemChange()
-      this.rightCheckItemChange()
-    },
-    leftMove(obj) {
-      this.moveItem = obj.draggedContext.element
-    },
-    // 选择全部
-    handleleftCheckAllChange(value) {
-      if (value) {
-        this.isleftIndeterminate = false
-      }
-      this.checkedLeftData = this.checkedLeftData.filter(function(
-        item,
-        index,
-        array
-      ) {
-        item.check = value
-        return item
-      })
-      this.leftCheckItems = value ? this.checkedLeftData : []
-    },
-    leftCheckItemChange() {
-      this.leftCheckItems = this.checkedLeftData.filter(function(
-        item,
-        index,
-        array
-      ) {
-        return item.check == true
-      })
-      if (this.leftCheckItems.length > 0) {
-        if (this.leftCheckItems.length == this.checkedLeftData.length) {
-          this.checkleftAll = true
-          this.isleftIndeterminate = false
-        } else {
-          this.checkleftAll = false
-          this.isleftIndeterminate = true
-        }
-      } else {
-        this.checkleftAll = false
-        this.isleftIndeterminate = false
-      }
-    },
-    // 选择全部
-    handlerightCheckAllChange(value) {
-      if (value) {
-        this.isrightIndeterminate = false
-      }
-      this.checkedRightData = this.checkedRightData.filter(function(
-        item,
-        index,
-        array
-      ) {
-        item.check = value
-        return item
-      })
-      this.rightCheckItems = value ? this.checkedRightData : []
-    },
-    rightCheckItemChange() {
-      this.rightCheckItems = this.checkedRightData.filter(function(
-        item,
-        index,
-        array
-      ) {
-        return item.check == true
-      })
-      if (this.rightCheckItems.length > 0) {
-        if (this.rightCheckItems.length == this.checkedRightData.length) {
-          this.checkrightAll = true
-          this.isrightIndeterminate = false
-        } else {
-          this.checkrightAll = false
-          this.isrightIndeterminate = true
-        }
-      } else {
-        this.checkrightAll = false
-        this.isrightIndeterminate = false
-      }
-    },
-    // 按钮操作
-    changePositon(type) {
-      var self = this
-      // 从右往左
-      if (type == 'left') {
-        this.checkedRightData = this.checkedRightData.filter(function(
-          item,
-          index,
-          array
-        ) {
-          var remove = false
-          self.rightCheckItems.forEach(function(element, index) {
-            if (item.sceneId == element.sceneId) {
-              remove = true
-            }
-          })
-          return !remove
-        })
-
-        this.rightCheckItems.forEach(function(element, index) {
-          element.check = false
-          self.checkedLeftData.push(element)
-        })
-
-        this.rightCheckItems = []
-        this.isrightIndeterminate = false
-        this.checkrightAll = false
-
-        // 刷新左侧效果
-        this.leftCheckItemChange()
-        this.rightCheckItemChange()
-      } else {
-        this.checkedLeftData = this.checkedLeftData.filter(function(
-          item,
-          index,
-          array
-        ) {
-          var remove = false
-          self.leftCheckItems.forEach(function(element, index) {
-            if (item.sceneId == element.sceneId) {
-              remove = true
-            }
-          })
-          return !remove
-        })
-
-        this.leftCheckItems.forEach(function(element, index) {
-          element.check = false
-          self.checkedRightData.push(element)
-        })
-
-        this.leftCheckItems = []
-        this.isleftIndeterminate = false
-        this.checkleftAll = false
-
-        // 刷新右侧效果
-        this.leftCheckItemChange()
-        this.rightCheckItemChange()
-      }
-    }
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.scene-name {
-  font-size: 12px;
-  padding-bottom: 5px;
-  color: #aaa;
-}
-
-.default-mark {
-  width: 4px;
-  height: 4px;
-  border-radius: 2px;
-  margin-right: 5px;
-}
-.default-mark-active {
-  background-color:#3E84E9;
-}
-
-.scene-list {
-  .scene-list-box {
-    flex: 1;
-    border: 1px solid #3E84E9;
-    border-radius: 2px;
-    height: 300px;
-    position: relative;
-    padding: 15px;
-  }
-  .scene-middle-list {
-    width: 50px;
-    text-align: center;
-    button {
-      border: 1px solid #cccccc;
-      width: 34px;
-      height: 34px;
-      border-radius: 17px;
-      background-color: #f5f7fa;
-    }
-    .scene-middle-icon {
-      color: #cccccc;
-      font-size: 14px;
-    }
-    .scene-middle-left-button {
-    }
-    .scene-middle-right-button {
-      margin-top: 15px;
-      margin-left: 0;
-    }
-
-    .scene-middle-button-select {
-      border: 1px solid #3E84E9 !important;
-      background-color: #3E84E9 !important;
-      .scene-middle-icon {
-        color: white !important;
-      }
-    }
-  }
-  .scene-list-head {
-    padding-bottom: 15px;
-    padding-left: 9px;
-    border-bottom: 1px dashed #3E84E9;
-    font-size: 13px;
-    .scene-list-head-name {
-      color: #333;
-      flex: 1;
-      margin: 0 8px;
-    }
-
-    .scene-list-head-detail {
-      color: #aaa;
-    }
-  }
-  .scene-list-body {
-    padding: 5px 0;
-    height: 240px;
-    position: relative;
-    overflow-y: auto;
-  }
-
-  .list-item {
-    padding: 5px 0;
-    cursor: pointer;
-    .list-item-check {
-      margin-right: 8px;
-    }
-    .list-item-name {
-      font-size: 13px;
-      color: #333;
-      flex: 1;
-    }
-    .list-item-handle {
-      flex-shrink: 0;
-      display: none;
-      i {
-        color: #aaa;
-        font-size: 12px;
-        margin-right: 5px;
-      }
-      i:hover {
-        color: #3E84E9;
-      }
-    }
-  }
-
-  .list-item:hover {
-    .list-item-handle {
-      display: block;
-    }
-  }
-}
-
-.handle-bar {
-  font-size: 12px;
-  .handle-bar-add {
-    cursor: pointer;
-    color: #3e84e9;
-    padding: 20px 10px;
-  }
-  .handle-bar-save {
-    position: relative;
-    height: 30px;
-    button {
-      float: right;
-      margin-right: 10px;
-    }
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/components/tableDetail/index.vue b/code/WebApp/vue/src/views/newJit/components/tableDetail/index.vue
deleted file mode 100644
index fef42597..00000000
--- a/code/WebApp/vue/src/views/newJit/components/tableDetail/index.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag 
-    :visible.sync="visible"
-    :close-on-click-modal="false"
-    title="详细信息"
-    width="900px"
-    height="300px"
-    :append-to-body="true">  
-    <div
-      slot="footer"
-      class="dialog-footer">
-       <crm-base-info
-        :is="tabName"
-        :detail="data"
-        :id="id"
-        :crm-type="crmType">
-        </crm-base-info>
-      <el-button >取 消</el-button>
-      <el-button
-        type="primary"
-        >确 定</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import CRMBaseInfo from '../CRMBaseInfo' // 基本信息
- 
-export default {
-  name: 'Index',
-  components: {
-    CRMBaseInfo
-  },
-  props: {
-    dialogVisible: {
-    type: Boolean,
-    required: true,
-    default: false
-    },
-    detailData: {},    
-  },
-  data() {
-    return{
-        visible: false, 
-        data:{},
-        tabName:'',
-        id: [String, Number],
-    }
-  },
-   watch: {
-    dialogVisible: {
-      handler(val) {
-        if (val) {
-        
-        }
-        this.visible = this.dialogVisible
-      },
-    },
-    detailData:{
-        handler(val) {
-            this.data=this.detailData;
-        }
-    }
-  },
-  methods: {
-  }
-}
-</script>
-
-<style lang="scss">
- 
-</style>
diff --git a/code/WebApp/vue/src/views/newJit/styles/crmdetail.scss b/code/WebApp/vue/src/views/newJit/styles/crmdetail.scss
deleted file mode 100644
index 23885c79..00000000
--- a/code/WebApp/vue/src/views/newJit/styles/crmdetail.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-//客户相关详情 头部类似布局
-.el-tabs /deep/ .el-tabs__nav-wrap::after {
-  display: none !important;
-}
-
-.el-tabs /deep/ .el-tabs__header {
-  background-color: #F5F6F9;
-  padding: 0 17px;
-  margin: 0 0 15px !important;
-}
-
-.el-tabs /deep/ .el-tabs__item {
-  font-size: 13px !important;
-  height: 40px !important;
-  line-height: 40px !important;
-}
-
-.d-container {
-  position: relative;
-  height: 100%;
-}
-
-/** 让element 查询到的标签 */
-.t-loading-content {
-  position: relative;
-  overflow-y: scroll;
-  flex: 1;
-}
-
-/** 审核信息 */
-.examine-info {
-  padding: 0 17px 17px 17px;
-
-  .examine-info-border {
-    border: 1px solid #e6e6e6;
-    border-radius: 3px;
-    padding: 17px;
-  }
-}
diff --git a/code/WebApp/vue/src/views/newJit/styles/crmtable.scss b/code/WebApp/vue/src/views/newJit/styles/crmtable.scss
deleted file mode 100644
index d0dd421f..00000000
--- a/code/WebApp/vue/src/views/newJit/styles/crmtable.scss
+++ /dev/null
@@ -1,111 +0,0 @@
-.cr-body-content {
-  margin: 2px ;
-  position: relative;
-  background-color: white;
-  overflow-x: auto;
-  //border-bottom: 1px solid $xr-border-line-color;
-}
-.el-table .cell {
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-.content-header {
-  position: relative;
-  padding: 10px 20px;
-  .search-container {
-    margin: 0 20px;
-    width: 200px;
-  }
-  .create-button {
-    position: absolute;
-    right: 10px;
-    top: 15px;
-  }
-}
-
-.right-container {
-  margin-right: -10px;
-  float: right;
-  margin: 2px;
-  position: relative;
-  .right-item {
-    float: left;
-    margin-right: 10px;
-    padding: 8px 10px;
-    font-size: 13px;
-    border-radius: 2px;
-  }
-
-  .right-more-item {
-    cursor: pointer;
-    border: 1px solid #dcdfe6;
-    background-color: white;
-    font-size: 13px;
-    color: #777;
-    padding: 0 12px;
-    border-radius: 2px;
-    height: 31px;
-  }
-}
-
-.el-input {
-  display: inline-block;
-  
-  width: 50%;
-
-  input {
-    background: transparent;
-    border: 0px;
-    -webkit-appearance: none;
-    border-radius: 0px;
-    padding: 12px;
-    height: 47px;
-    caret-color: #1a1818;
-
-    &:-webkit-autofill {
-      box-shadow: 0 0 0px 1000px #e5e5e5 inset !important;
-      -webkit-text-fill-color: #454545 !important;
-      color:#454545 !important;
-    }
-  }
-}
-
-//表尾 上一页按钮
-.table-footer {
-  padding: 1px 20px;
-}
-
-.el-table /deep/ thead th {
-  font-weight: 400;
-  font-size: 12px;
-}
-
-.el-table /deep/ tbody tr td {
-  font-size: 12px;
-}
-
-.el-table /deep/ thead .el-checkbox {
-  display: inline;
-}
-
-body .el-table th.gutter {
-  display: table-cell !important;
-}
-
-.el-table /deep/ .el-table__body-wrapper {
-  height: calc(100% - 58px) !important;
-}
-
-.el-dropdown-link {
-  cursor: pointer;
-  color: #409EFF;
-}
-.el-icon-arrow-down {
-  font-size: 12px;
-}
-.demonstration {
-  display: block;
-  color: #8492a6;
-  font-size: 14px;
-  margin-bottom: 20px;
-}
\ No newline at end of file
diff --git a/code/WebApp/vue/src/views/newJit/styles/detailview.scss b/code/WebApp/vue/src/views/newJit/styles/detailview.scss
deleted file mode 100644
index c08cb019..00000000
--- a/code/WebApp/vue/src/views/newJit/styles/detailview.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  /** 客户管理详情页面的 css 侧滑进入的详情 */
-  .d-view {
-    position: fixed;
-    width: 60%;
-    top: 45px;
-    bottom: 0px;
-    right: 0px;
-  }
diff --git a/code/WebApp/vue/src/views/newJit/styles/file.scss b/code/WebApp/vue/src/views/newJit/styles/file.scss
deleted file mode 100644
index a4539c9d..00000000
--- a/code/WebApp/vue/src/views/newJit/styles/file.scss
+++ /dev/null
@@ -1,131 +0,0 @@
-/** 附件  */
-.f-container {
-  padding: 0 17px;
-}
-.f-item {
-  padding: 3px 0;
-  height: 35px;
-  .f-img {
-    position: block;
-    width: 30px;
-    height: 30px;
-    padding: 0 1px;
-    margin-right: 8px;
-  }
-  .f-name {
-    color: #666;
-    font-size: 12px;
-    margin-right: 10px;
-  }
-}
-.xh-files-cont {
-    position: relative;
-    display: inline-block;
-    border-radius: 3px;
-    width: 100%;
-    border: 1px solid #ddd;
-    padding: 3.5px 5px;
-    margin: 3px;
-    line-height: 15px;
-  }
-
-  .xh-files-cont.is_disabled {
-    background-color: #f5f7fa;
-    border-color: #e4e7ed;
-    cursor: not-allowed;
-    .f-name {
-      background-color: #f0f4f8ea;
-      color: #c0c4cc;
-      cursor: not-allowed;
-    }
-  }
-
-  .xh-files-cont.is_valid:hover {
-    border-color: #c0c4cc;
-  }
-
-  .f-header {
-    cursor: pointer;
-    padding: 5px 0 5px;
-    .f-logo {
-      position: block;
-      width: 15px;
-      height: 15px;
-      margin-right: 8px;
-    }
-    .f-name {
-      color: #3e84e9;
-      font-size: 12px;
-    }
-  }
-  .f-header.is_disabled {
-    cursor: not-allowed;
-  }
-
-  .f-body {
-    .f-item {
-      padding: 3px 0;
-      height: 25px;
-      .f-img {
-        position: block;
-        width: 15px;
-        height: 15px;
-        padding: 0 1px;
-        margin-right: 8px;
-      }
-      .f-name {
-        color: #666;
-        font-size: 12px;
-      }
-      .close-button {
-        cursor: pointer;
-      }
-    }
-  }
-
-  .bar-iput {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 0;
-    width: 0;
-    opacity: 0;
-  }
-
-  .b-cont {
-    position: relative;
-    padding: 0 50px 20px 20px;
-  }
-
-  .b-cells {
-    margin-top: 25px;
-  }
-
-  .b-cell {
-    padding: 0 10px;
-    .b-cell-b {
-      width: auto;
-      padding: 8px;
-      .b-cell-name {
-        width: 100px;
-        margin-top: 13px;
-        margin-right: -5px;
-        font-size: 13px;
-        flex-shrink: 0;
-        color: #777;
-      }
-      .b-cell-value {
-        font-size: 13px;
-        color: #333;
-        white-space: pre-wrap;
-        word-wrap: break-word;
-      }
-      .b-cell-foot {
-        flex-shrink: 0;
-        display: block;
-        width: 15px;
-        height: 15px;
-        margin-left: 8px;
-      }
-    }
-  }
diff --git a/code/WebApp/vue/src/views/newJit/styles/followcell.scss b/code/WebApp/vue/src/views/newJit/styles/followcell.scss
deleted file mode 100644
index ddcfd42a..00000000
--- a/code/WebApp/vue/src/views/newJit/styles/followcell.scss
+++ /dev/null
@@ -1,170 +0,0 @@
-/** 跟进记录相关的 日志 审批任务 日程 项目 公共css */
-.fl-c {
-  background-color: white;
-  padding: 10px 20px;
-  position: relative;
-}
-
-/** 头部布局 名字 头像 */
-.fl-h {
-  .fl-h-img {
-    display: block;
-    width: 34px;
-    height: 34px;
-    border-radius: 17px;
-    margin-right: 8px;
-  }
-
-  .fl-h-b {
-    flex: 1;
-
-    .fl-h-name {
-      font-size: 13px;
-      color: #333;
-    }
-
-    .fl-h-time {
-      font-size: 12px;
-      color: #999;
-      margin-top: 3px;
-    }
-  }
-}
-
-/** 头部 右侧 布局*/
-.fl-h-handle {
-  width: auto;
-
-  .fl-h-handle-name {
-    font-size: 13px;
-    color: #333;
-    margin-right: 6px;
-  }
-}
-
-.fl-h-mark {
-  width: auto;
-
-  .fl-h-mark-img {
-    display: block;
-    width: 20px;
-    height: 20px;
-    margin-right: 8px;
-  }
-
-  .fl-h-mark-name {
-    font-size: 13px;
-    color: #333;
-  }
-}
-
-/** 内容区域 */
-.fl-b {
-  margin: 20px 0 0 40px;
-
-  .fl-b-content {
-    font-size: 13px;
-    color: #333;
-    margin-bottom: 10px;
-  }
-
-  .fl-b-images {
-    margin-top: 5px;
-    width: 310px;
-
-    .fl-b-img-item {
-      width: 98px;
-      height: 98px;
-      display: inline-block;
-      margin: 0 4px 4px 0;
-      background-size: contain;
-      background-repeat: no-repeat;
-      background-position: center;
-      position: relative;
-      cursor: pointer;
-    }
-  }
-
-  .fl-b-other {
-    margin: 8px 0;
-
-    .fl-b-other-name {
-      margin: 10px 0;
-      color: #666;
-      font-size: 13px;
-    }
-  }
-}
-
-.fl-c:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #e5e5e5;
-  color: #e5e5e5;
-  -webkit-transform-origin: 0 0;
-  transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-  transform: scaleY(0.5);
-  left: 15px;
-  z-index: 2;
-}
-
-.fl-c:first-child:before {
-  display: none;
-}
-
-/** 附件 */
-.fl-b-files {
-  margin-top: 10px;
-}
-
-/** 关联附件 联系人 客户 行布局 */
-.cell {
-  padding: 8px;
-  background-color: #F5F7FA;
-  border-radius: 2px;
-  position: relative;
-
-  .cell-head {
-    display: block;
-    width: 15px;
-    height: 15px;
-    margin-right: 8px;
-  }
-
-  .cell-body {
-    flex: 1;
-    color: #333;
-    font-size: 12px;
-  }
-
-  .cell-foot {
-    display: block;
-    width: 20px;
-    padding: 0 4px;
-    margin-right: 8px;
-  }
-}
-
-.cell:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #e5e5e5;
-  color: #e5e5e5;
-  -webkit-transform-origin: 0 0;
-  transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-  transform: scaleY(0.5);
-  left: 30px;
-  z-index: 2;
-}
-
-.cell:first-child:before {
-  display: none;
-}
diff --git a/code/WebApp/vue/src/views/newJit/styles/followlog.scss b/code/WebApp/vue/src/views/newJit/styles/followlog.scss
deleted file mode 100644
index 7fa5f031..00000000
--- a/code/WebApp/vue/src/views/newJit/styles/followlog.scss
+++ /dev/null
@@ -1,86 +0,0 @@
-// 跟进记录效果
-.f-container {
-  padding: 0 17px;
-}
-
-/** 发布行css  */
-.se-section {
-  position: relative;
-  margin: 5px 0;
-  height: 40px;
-  line-height: 40px;
-
-  .se-name {
-    font-size: 12px;
-    color: #333333;
-    margin-right: 5px;
-  }
-
-  .se-select {
-    border: 1px solid #dcdfe6;
-    font-size: 12px;
-    color: #606266;
-    padding: 0 8px;
-    border-radius: 2px;
-    font-weight: 500;
-    height: 25px;
-
-    .se-select-name {
-      margin-right: 20px;
-    }
-  }
-
-  .se-datepicker {
-    font-size: 12px;
-    width: 200px;
-    margin-right: 20px;
-  }
-
-  .se-send {
-    position: absolute;
-    right: 0;
-    padding: 5px 15px;
-  }
-}
-
-.el-date-editor /deep/ .el-input__inner {
-  height: 25px;
-  line-height: 25px;
-}
-
-.el-date-editor /deep/ .el-input__icon {
-  height: 25px;
-  line-height: 25px;
-}
-
-.el-checkbox /deep/ .el-checkbox__label {
-  font-size: 12px;
-  color: #333333;
-}
-
-.log-cont {
-  margin: 0px 0;
-  border: 1px solid #e6e6e6;
-  border-radius: 2px;
-
-  .log-tabs-item {
-    font-size: 13px;
-    padding: 8px 15px;
-    cursor: pointer;
-  }
-
-  .log-tabs-item:hover {
-    color: #F18C70 !important;
-  }
-
-  .log-tabs-line {
-    height: 10px;
-    background-color: #e6e6e6;
-    width: 2px;
-  }
-}
-
-.log-items {
-  min-height: 400px;
-  position: relative;
-}
diff --git a/code/WebApp/vue/src/views/newJit/styles/relativecrm.scss b/code/WebApp/vue/src/views/newJit/styles/relativecrm.scss
deleted file mode 100644
index 0d90ab64..00000000
--- a/code/WebApp/vue/src/views/newJit/styles/relativecrm.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-/**客户下相关信息 table 效果 */
-.rc-cont {
-    position: relative;
-    padding: 0 20px 20px 20px;
-    .rc-head {
-        margin-bottom: 15px;
-        position: relative;
-        .rc-head-item {
-            font-size: 12px;
-            padding: 8px 5px;
-            border-radius: 2px;
-            margin-right: 20px;
-            margin-left: 0px;
-        }
-        .rc-head-item:first-child {
-            margin-right: 0;
-        }
-    }
-}
-
-.el-table /deep/ thead th{
-    background-color: #F5F5F5;
-    font-weight: 400;
-    font-size: 12px;
-}
-
-.el-table /deep/ tbody{
-    font-size: 13px;
-}
diff --git a/code/WebApp/vue/src/views/newJit/styles/table.scss b/code/WebApp/vue/src/views/newJit/styles/table.scss
deleted file mode 100644
index 4c513cbe..00000000
--- a/code/WebApp/vue/src/views/newJit/styles/table.scss
+++ /dev/null
@@ -1,129 +0,0 @@
-@import './detailview.scss';
-
-.crm-container {
-  background-color: white;
-  border: 1px solid #E6E6E6;
-  border-radius: 2px;
-}
-
-/**
-  .el-table /deep/ thead th {
-    border-right: 1px solid #ebeef5;
-  }
-
-  .el-table /deep/ tbody tr td:nth-child(2){
-    border-right: 1px solid #ebeef5;
-  }
-
-  .b-bottom {
-    border-bottom: 1px solid #ebeef5;
-  }
-  */
-
-.el-table /deep/ thead th {
-  //background-color: #fafdff;
-  //font-weight: 400;
-  //border-color: #E6E6E6;
-  //color: #475059;
-    background-color: #61687a;
-    font-weight: 400;
-    border-color: #fff;
-    color: #fff;
-  font-size: 12px;
-}
-
-.table-set {
-  width: 15px;
-  margin-top: 5px;
-  cursor: pointer;
-}
-
-.table-head-name {
-  font-size: 14px;
-  color: #475059;
-  line-height: 23px;
-  padding: 0;
-}
-
-.el-table /deep/ thead .cell {
-  height: 23px;
-}
-
-.el-table /deep/ .el-table__row.current-row {
-  td:first-child::before {
-    content: ' ';
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    width: 2px;
-    background-color: #5383ED;
-  }
-}
-
-.el-table /deep/ tbody tr td {
-  border-top-color: transparent;
-  border-left-color: transparent;
-  border-right-color: transparent;
-  border-bottom-color: #E6E6E6;
-  font-size: 13px;
-}
-
-.el-table /deep/ tbody tr td:nth-child(2) {
-  border-right: 1px solid #E6E6E6;
-}
-
-.n-table--border {
-  border-color: #E6E6E6;
-  border-left-color: transparent;
-  border-right-color: transparent;
-}
-
-.n-table--border::after {
-  display: none;
-}
-
-.p-contianer {
-  position: relative;
-  background-color: white;
-  height: 44px;
-
-  .p-bar {
-    float: right;
-    margin: 5px 100px 0 0;
-    font-size: 14px !important;
-  }
-}
-
-// 列表状态
-.status_button {
-  padding: 1px 6px;
-  border: 1px solid #e6e6e6;
-  border-radius: 4px;
-  display: inline-block;
-  font-size: 12px;
-  margin: 0 auto;
-}
-
-.el-table /deep/ .sort-caret.ascending {
-  top: 0px;
-}
-.el-table /deep/ .sort-caret.descending{
-  bottom: 2px;
-}
-.el-table /deep/ .caret-wrapper {
-  height: 24px;
-}
-
-.el-table /deep/ .warning-row {
-  background: #e3ecf3;
-}
-.el-table /deep/ .success-row {
-  background: #f4f8fd;
-}
-.el-table /deep/ thead {
-   background: #61687a;
-}
-.el-table /deep/ th.gutter {
-  display: table-cell!important;
-}
diff --git a/code/WebApp/vue/src/views/org/index.vue b/code/WebApp/vue/src/views/org/index.vue
index 1eebf640..3e167e7d 100644
--- a/code/WebApp/vue/src/views/org/index.vue
+++ b/code/WebApp/vue/src/views/org/index.vue
@@ -409,9 +409,14 @@
           this.loadTree(response);
         });
       },
-      getList() {
+      getList(data) {
         this.listLoading = true;
-        this.listQuery.SkipCount = (this.page - 1) * 10;
+        //this.listQuery.SkipCount = (this.page - 1) * 10;
+         if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
         this.list = [];
         this.$axios
           .gets("/api/base/branch/paged", this.listQuery)
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate.zip b/code/WebApp/vue/src/views/pg-fis/basedate.zip
deleted file mode 100644
index 1e3ef45f..00000000
Binary files a/code/WebApp/vue/src/views/pg-fis/basedate.zip and /dev/null differ
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/assemblyCfg/detail.vue b/code/WebApp/vue/src/views/pg-fis/basedate/assemblyCfg/detail.vue
deleted file mode 100644
index 0aafcee6..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/assemblyCfg/detail.vue
+++ /dev/null
@@ -1,312 +0,0 @@
-<!--FIS发运数据对比输出表-明细数据-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <!-- <el-button
-        class="filter-item"
-        size="mini"
-        type="info"
-        icon="el-icon-download"
-        @click="handleDownload()"
-        >导出全部
-      </el-button>
-      <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="支持模糊搜索..."
-        style="width: 230px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button> -->
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column prop="partCode" label="客户零件代码"> </el-table-column>
-      <el-table-column prop="description" label="客户零件名称"> </el-table-column>
-      <el-table-column prop="partNum" label="客户零件数量"> </el-table-column>
-      <el-table-column prop="isKey" label="是否Key件">
-        <template slot-scope="scope">
-          <span v-if="scope.row.isKey == true">
-            <span style="color: #00b46d">是</span>
-          </span>
-          <span v-else>
-            <span style="color: #d75c89">否</span>
-          </span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import { downloadFile } from "@/utils/crmindex.js";
-import Detail from "./detail";
-
-export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "stockFisDiffReport",
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        parentId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        assemblyProductID: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 30,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 30;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfos: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.parentId = element.ParentId;
-          });
-          if (this.customerInfo.parentId != "") {
-            this.getList(this.searchContent);
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "客户零件代码", prop: "partCode ", width: 120 });
-      tempsTabs.push({ label: "客户零件数量", prop: "partNum", width: 160 });
-      tempsTabs.push({ label: "是否Key件", prop: "isKey", width: 95 });
-      tempsTabs.push({ label: "描述", prop: "description", width: 280 });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "isKey") {
-        return { 0: "未生效", 1: "已生效" }[row[column.property]];
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList(partCode) {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
-        .then((response) => {
-          console.log(partCode)
-          if(partCode !== "" && partCode !== undefined)
-          {
-            //console.log(partCode)
-            this.list = response.item.details.filter(u => u.partCode === partCode);
-          }
-          else
-          {
-            this.list = response.item.details;
-          }
-          //alert(JSON.stringify(response.Items))
-          //this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "partCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 6,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      //console.log(this.searchContent)
-      this.getList(this.searchContent);
-    },
-    resetQuery() {},
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue b/code/WebApp/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
deleted file mode 100644
index 3cb0c2a6..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
+++ /dev/null
@@ -1,784 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-	<div class="cr-body-content">
-		<div ref="box">
-			<flexbox class="content-header">
-				<el-form :model="listQuery" ref="queryForm" v-show="showSearch" :inline="true">
-					<el-form-item label="总成编码" prop="erpAssemblyCode" class="forimitem">
-						<el-input v-model="listQuery.erpAssemblyCode" placeholder="请输入总成编码" clearable size="small" style="width: 240px"
-						 @keyup.enter.native="handleQuery" />
-					</el-form-item>
-
-					<el-form-item label="总成名称" prop="erpAssemblyName" class="forimitem">
-						<el-input v-model="listQuery.erpAssemblyName" placeholder="请输入总成名称" clearable size="small" style="width: 240px"
-						 @keyup.enter.native="handleQuery" />
-					</el-form-item>
-					
-					<el-form-item label="长描述" prop="groupCode" class="forimitem">
-						<el-input v-model="listQuery.groupCode" placeholder="请输入长描述" clearable size="small" style="width: 240px"
-						 @keyup.enter.native="handleQuery" />
-					</el-form-item>
-
-					<el-form-item label="车型：" prop="vehicleModelCode" class="forimitem">
-						<el-select v-model="listQuery.vehicleModelCode" clearable placeholder="请选择" size="medium" style="margin-right: 15px"
-						 @change="valueselectChange">
-							<el-option v-for="item in vehicleModelList" :key="item.id" :label="item.dicItemName" :value="item.dicItemCode" />
-						</el-select>
-					</el-form-item>
-
-					<el-form-item label="创建时间">
-						<el-date-picker v-model="listQuery.createTimeValue" size="small" style="width: 380px" value-format="yyyy-MM-dd HH:mm:ss"
-						 type="datetimerange" :default-time="['00:00:00', '23:59:59']" range-separator="-" start-placeholder="开始日期"
-						 end-placeholder="结束日期"></el-date-picker>
-					</el-form-item>
-
-					<el-form-item class="formitem">
-						<el-button type="primary" icon="el-icon-search" size="mini" @click="handleFilter">搜索</el-button>
-						<el-button icon="el-icon-refresh" size="mini" @click="resetQuery('queryForm')">重置</el-button>
-						<el-button type="warning" plain icon="el-icon-download" size="mini" style="margin-left: 15px" @click="handleDownload()">导出(Excel)
-						</el-button>
-					</el-form-item>
-					<!-- <el-divider class="divider1" ></el-divider> -->
-					<el-form-item style="margin-bottom: 0px; ">
-						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleCreate" disabled>新增
-						</el-button>
-						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate" disabled>修改
-						</el-button>
-						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-delete" @click="handleDelete" disabled>删除
-						</el-button>
-						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleImportSAP" disabled>导入（SAP对接）
-						</el-button>
-					</el-form-item>
-				</el-form>
-			</flexbox>
-		</div>
-		<div class="l-table">
-			<!--表格渲染-->
-			<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
-			 class="cr-table" :data="list" :height="tableHeight" :cell-style="cellStyle" :header-cell-style="headerRowStyle"
-			 size="small" stripe border highlight-current-row style="width: 100%" @sort-change="sortChange" @selection-change="handleSelectionChange"
-			 @row-click="handleRowClick">
-				<el-table-column type="selection" width="44px"></el-table-column>
-
-				<el-table-column label="ERP总成编码" prop="erpAssemblyCode" sortable="custom" align="center" width="180px">
-					<template slot-scope="scope">
-						<span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.erpAssemblyCode
-            }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
-				 :min-width="item.width" :formatter="fieldFormatter" sortable="custom" show-overflow-tooltip :gutter="0">
-					<template slot="header" slot-scope="scope">
-						{{ scope.column.label }}
-					</template>
-				</el-table-column>
-			</el-table>
-
-			<!--表单渲染-->
-			<el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" :title="formTitle" width="700px" @close="closeDialog">
-				<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="120px">
-					<el-row>
-						<el-col :span="4">
-							<el-form-item label="总成编码：" required />
-						</el-col>
-						<el-col :span="20">
-							<el-form-item prop="erpAssemblyCode">
-								<el-input style="width: 400px" v-model="form.erpAssemblyCode" :disabled="isEdit" />
-							</el-form-item>
-						</el-col>
-					</el-row>
-
-					<el-row>
-						<el-col :span="4">
-							<el-form-item label="总成名称：" required />
-						</el-col>
-						<el-col :span="20">
-							<el-form-item prop="erpAssemblyName">
-								<el-input style="width: 400px" v-model="form.erpAssemblyName" :disabled="isEdit" />
-							</el-form-item>
-						</el-col>
-					</el-row>
-
-					<!-- <el-row>
-            <el-col :span="4">
-              <el-form-item label="总成类型：" required />
-            </el-col>
-            <el-col :span="20">
-              <el-form-item prop="erpAssemblyType">
-                <el-input
-                  style="width: 200px"
-                  v-model="form.erpAssemblyType"
-                  :disabled="isEdit"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row> -->
-
-					<el-row>
-						<el-col :span="4">
-							<el-form-item label="车型：" required />
-						</el-col>
-						<el-col :span="20">
-							<el-form-item prop="vehicleModel">
-								<el-select style="width: 200px" v-model="form.vehicleModel" :disabled="isEdit">
-									<el-option v-for="item in vehicleModelList" :key="item.id" :label="item.dicItemName" :value="item.dicItemCode" />
-								</el-select>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-row>
-						<el-table ref="DetialTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
-						 class="cr-table" :data="form.details" :height="detailTableHeight" :cell-style="cellStyle" :header-cell-style="headerRowStyle"
-						 size="small" stripe border highlight-current-row style="width: 100%" @row-click="handleRowClick">
-							<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-							<el-table-column prop="partCode" label="客户零件代码" width="150px">
-								<template slot-scope="scope">
-									<el-input v-model="scope.row.partCode" size="mini" style="width: 135px"></el-input>
-								</template>
-							</el-table-column>
-							<el-table-column prop="description" label="客户零件名称">
-								<template slot-scope="scope">
-									<el-input v-model="scope.row.description" size="mini"></el-input>
-								</template>
-							</el-table-column>
-							<el-table-column prop="partNum" label="客户零件数量" width="120px">
-								<template slot-scope="scope">
-									<el-input-number v-model="scope.row.partNum" :min="1" size="mini" style="width: 100px"></el-input-number>
-								</template>
-							</el-table-column>
-							<el-table-column prop="isKey" label="是否Key件" align="center" width="80px">
-								<!-- label-class-name="DisabledSelection" 去除列头全选-->
-								<template slot-scope="scope">
-									<el-checkbox v-model="scope.row.isKey"></el-checkbox>
-								</template>
-							</el-table-column>
-							<!-- <el-table-column prop="description" label="描述">
-               <template slot-scope="scope">
-                  <el-input v-model="scope.row.disdescriptionKey"></el-input>
-                </template>
-              </el-table-column> -->
-							<el-table-column prop="description" width="35px">
-								<template slot="header">
-									<el-button @click="handleAddDetails" icon="el-icon-plus" type="text"></el-button>
-								</template>
-								<template slot-scope="scope">
-									<el-button @click="handleDeleteDetails(scope.$index, scope.row)" icon="el-icon-minus" type="text"></el-button>
-								</template>
-							</el-table-column>
-						</el-table>
-					</el-row>
-				</el-form>
-				<!--表格渲染-->
-				<div slot="footer" class="dialog-footer">
-					<el-button type="text" @click="dialogFormVisible = false">取消</el-button>
-					<el-button v-loading="formLoading" type="primary" @click="save()">确认</el-button>
-				</div>
-			</el-dialog>
-		</div>
-
-		<div class="table-footer">
-			<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-			<pagination v-show="totalCount > 0" :total="totalCount" :page.sync="page" :limit.sync="listQuery.maxResultCount"
-			 @pagination="getList" />
-			<!-- 导入Excel组件 -->
-			<importExcel ref="importexcel" :show="showExcelImport" :crmType="crmType" @close="importExcelData" />
-		</div>
-		<!-- 抽屉控件 -->
-		<el-drawer title="信息详细页" size="75%" direction="rtl" :visible.sync="drawer" :before-close="handleDrawerClose">
-			<div>
-				<Detail v-bind:customerInfos="customerInfos" style="margin-top: -35px"></Detail>
-			</div>
-		</el-drawer>
-	</div>
-</template>
-
-<script>
-	import Pagination from "@/components/Pagination";
-	import permission from "@/directive/permission/index.js";
-	import CRMTableHead from "../../components/CRMTableHead";
-	import importExcel from "@/components/ImportTxt";
-	import Lockr from "lockr";
-	import moment from "moment";
-	import Detail from "./detail.vue";
-	import {
-		downloadFile
-	} from "@/utils/crmindex.js";
-
-	//组件计量单位
-	const bomUnit = [{
-			key: 0,
-			display_name: "PC"
-		},
-		{
-			key: 1,
-			display_name: "TON"
-		},
-		{
-			key: 2,
-			display_name: "Other"
-		},
-	];
-	const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-		acc[cur.key] = cur.display_name;
-		return acc;
-	}, {});
-
-	export default {
-		name: "AssemblyCfgERP",
-		components: {
-			Pagination,
-			CRMTableHead,
-			importExcel,
-			Detail
-		},
-		directives: {
-			permission
-		},
-		filters: {
-			IsCustomerSignFilter(status) {
-				//翻译是否签字
-				const statusMap = {
-					true: "是",
-					false: "否",
-				};
-				return statusMap[status];
-			},
-		},
-		data() {
-			const validVersion = (rule, value, callback) => {
-				let numberReg = /^\d{6}$/;
-				if (!numberReg.test(value)) {
-					callback(new Error("只能为6位数字！"));
-				} else {
-					callback();
-				}
-			};
-			return {
-				crmType: "AssemblyCfgERP",
-				rules: {
-					erpAssemblyName: [{
-						required: true,
-						message: "必须输入！",
-						trigger: "blur"
-					}, ],
-				},
-				valueSelect: "",
-				customerInfos: [],
-				dialogOptions: [],
-				versionValue: "",
-				searchContent: "", // 输入内容
-				showExcelImport: false,
-				drawer: false,
-				list: null,
-				totalCount: 0,
-				listLoading: true,
-				customerInfo: {
-					bomId: "",
-				},
-				// 高级搜索
-				filterObj: {
-					type: Object,
-					default: () => {
-						return {};
-					},
-				},
-				listQuery: {
-					createTimeValue: [],
-					beginCreateTime: undefined,
-					endCreateTime: undefined,
-					skipCount: 0,
-					maxResultCount: 15,
-					erpAssemblyName: undefined,
-					erpAssemblyCode: undefined,
-					vehicleModel: undefined,
-				},
-
-				vehicleModelQuery: {
-					dicTypeName: "派格车型",
-				},
-				form: {
-					details: [],
-				},
-				page: 1,
-				// 显示搜索条件
-				showSearch: true,
-				bomUnit,
-
-				multipleSelection: [],
-
-				dialogFormVisible: false,
-				formTitle: "",
-				isEdit: false,
-				formLoading: false,
-
-				tableHeight: document.documentElement.clientHeight - 280,
-				detailTableHeight: 250,
-				details: [], //修改子表数据源
-				vehicleModelList: [], //车型list
-			};
-		},
-		mounted() {
-			this.$nextTick(() => {
-				var offsetHei = document.documentElement.clientHeight;
-				//console.log(offsetHei);
-				let boxH = this.$refs.box.offsetHeight;
-				this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-				//this.$refs.form.rendered=true;
-				//console.log(boxH);
-				//console.log(this.tableHeight);
-			});
-		},
-		created() {
-			this.getvehicleModel();
-			this.getList();
-		},
-		computed: {
-			getDefaultField() {
-				var tempsTabs = [];
-				tempsTabs.push({
-					label: "总成名称",
-					prop: "erpAssemblyName",
-					width: 180,
-				});
-				tempsTabs.push({
-					label: "长描述",
-					prop: "groupCode",
-					width: 240,
-				});
-				tempsTabs.push({
-					label: "车型代码",
-					prop: "vehicleModel",
-					width: 120,
-				});
-				tempsTabs.push({
-					label: "创建时间",
-					prop: "creationTime",
-					width: 100,
-				});
-
-				return tempsTabs;
-			},
-		},
-		methods: {
-			//抽屉
-			handleDrawerOpen(param) {
-				this.drawer = true;
-				var parentId = param.id; //主键id
-				this.customerInfos = [{
-					ParentId: parentId,
-				}, ];
-			},
-			handleDrawerClose(done) {
-				done();
-			},
-			save() {
-				//console.log(this.$refs.form);
-				this.$refs.form.validate((valid) => {
-					if (valid) {
-						console.log("保存参数:" + JSON.stringify(this.form));
-						this.formLoading = true;
-						if (this.isEdit) {
-							//修改
-							this.$axios
-								.puts("/api/newjit/assembly-cfg-erp/" + this.form.id, this.form)
-								.then((response) => {
-									this.formLoading = false;
-									this.$notify({
-										title: "成功",
-										message: "更新成功",
-										type: "success",
-										duration: 2000,
-									});
-									this.dialogFormVisible = false;
-									this.getList();
-								})
-								.catch(() => {
-									this.formLoading = false;
-								});
-						} else {
-							//insert添加
-							console.log(JSON.stringify(this.form));
-							this.$axios
-								.posts("/api/newjit/assembly-cfg-erp", this.form)
-								.then((response) => {
-									this.formLoading = false;
-									this.$notify({
-										title: "成功",
-										message: "新增成功",
-										type: "success",
-										duration: 2000,
-									});
-									this.dialogFormVisible = false;
-									this.getList();
-								})
-								.catch(() => {
-									this.formLoading = false;
-								});
-						}
-					}
-				});
-			},
-			/** 新增 */
-			handleCreate() {
-				if (this.$refs["form"] !== undefined) {
-					this.$nextTick(() => {
-						//this.$refs["form"] = [];
-						this.$refs["form"].resetFields();
-					});
-				}
-				this.formTitle = "新增";
-				this.isEdit = false;
-				this.form = {};
-				this.details = [];
-				//this.getvehicleModel();
-				this.dialogFormVisible = true;
-			},
-			/** 修改 */
-			handleUpdate(row) {
-				this.formTitle = "修改";
-				this.isEdit = true;
-				this.details = [];
-				//this.getvehicleModel();
-				if (this.multipleSelection.length != 1) {
-					this.$message({
-						message: "编辑必须选择单行",
-						type: "warning",
-					});
-					return;
-				} else {
-					this.fetchData(this.multipleSelection[0].id);
-					this.dialogFormVisible = true;
-				}
-			},
-			/** 删除 */
-			handleDelete(row) {
-				if (this.multipleSelection.length != 1) {
-					this.$message({
-						message: "编辑必须选择单行",
-						type: "warning",
-					});
-					return;
-				}
-				// this.$alert("暂时不支持批量删除", "提示", {
-				//   confirmButtonText: "确定",
-				//   callback: (action) => {
-				//     //
-				//   },
-				// });
-				this.$confirm(
-						"是否删除总成" + this.multipleSelection[0].erpAssemblyCode + "?",
-						"提示", {
-							confirmButtonText: "确定",
-							cancelButtonText: "取消",
-							type: "warning",
-						}
-					)
-					.then(() => {
-						this.$axios
-							.deletes(
-								"/api/newjit/assembly-cfg-erp/" + this.multipleSelection[0].id
-							)
-							.then((response) => {
-								const index = this.list.indexOf(this.multipleSelection[0]);
-								this.$notify({
-									title: "成功",
-									message: "删除成功",
-									type: "success",
-									duration: 2000,
-								});
-								this.getList();
-							});
-					})
-					.catch(() => {
-						this.$message({
-							type: "info",
-							message: "已取消删除",
-						});
-					});
-			},
-			fetchData(id) {
-				//循环动态
-				this.$axios
-					.gets("/api/newjit/assembly-cfg-erp/" + id)
-					.then((response) => {
-						this.form = response.item;
-						//this.details = response.item.details;
-						//console.log(this.details);
-					});
-			},
-			/** 导出功能 */
-			handleDownload() {
-				this.listLoading = true;
-
-				console.log(JSON.stringify(this.listQuery));
-				this.$axios
-					.posts("/api/newjit/assembly-cfg-erp/export", this.listQuery)
-					.then((res) => {
-						let filename = res.item;
-						this.$axios
-							.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-							.then((response) => {
-								if (filename.indexOf("_") != -1) {
-									let downName =
-										filename.slice(0, filename.lastIndexOf("_")) +
-										filename.slice(filename.lastIndexOf("."));
-									downloadFile(response, downName);
-									this.$notify({
-										title: "成功",
-										message: "数据-导出成功！",
-										type: "success",
-										duration: 2000,
-									});
-								} else {
-									downloadFile(response, filename);
-									this.$notify({
-										title: "成功",
-										message: "数据-导出成功！",
-										type: "success",
-										duration: 2000,
-									});
-								}
-								this.listLoading = false;
-							});
-					});
-				this.listLoading = false;
-			},
-			/** 重置按钮操作 */
-			resetQuery(refName) {
-				this.$refs[refName].resetFields();
-				this.getvehicleModel();
-				this.handleQuery();
-				this.listQuery.createTimeValue = [];
-			},
-			/** 搜索按钮操作 */
-			handleQuery() {
-				this.listQuery.skipCount = 1;
-				this.getList();
-			},
-			selectValue(params) {
-				//版本下拉选择
-				this.versionValue = params.value;
-				this.getList();
-			},
-
-			selectOptionsChange(item) {
-				this.getList();
-			},
-			importExcelData() {
-				//关闭导入窗体时调用
-				this.listLoading = false;
-				this.showExcelImport = false;
-				this.getList();
-			},
-
-			/** 刷新列表 */
-			handleHandle(data) {
-				if (data.type !== "edit") {
-					this.getList();
-				}
-			},
-
-			/*添加明细空行*/
-			handleAddDetails() {
-				this.$forceUpdate();
-				if (this.form.details === undefined) {
-					this.form.details = [];
-					//console.log(679);
-				}
-				let obj = {};
-				obj.partCode = "";
-				obj.description = "";
-				obj.partNum = "";
-				obj.isKey = false;
-				obj.description = "";
-
-				//console.log(this.form.details);
-				this.form.details.push(obj);
-				//console.log(688);
-			},
-			handleDeleteDetails(index) {
-				this.form.details.splice(index, 1);
-				//console.log(693);
-			},
-
-			/** 格式化字段 */
-			fieldFormatter(row, column) {
-				if (column.property === "billStatus") {
-					return {
-						0: "未生效",
-						2: "已生效",
-						3: "已发布"
-					} [row[column.property]];
-				}
-				if (column.property == "onlineTime" || column.property == "receiveTime") {
-					var date = row[column.property];
-					if (date == undefined) {
-						return "";
-					}
-					return moment(date).format("YYYY-MM-DD HH:mm:ss");
-				}
-				return row[column.property] || "--";
-			},
-			roleFilter(type) {
-				return projectTypeKeyValue[type];
-			},
-			getList() {
-				this.listLoading = true;
-				console.log("创建时间：" + JSON.stringify(this.listQuery));
-				this.listQuery.skipCount = (this.page - 1) * 10;
-				if (this.listQuery.createTimeValue !== undefined) {
-					this.listQuery.beginCreateTime = this.listQuery.createTimeValue[0];
-					this.listQuery.endCreateTime = this.listQuery.createTimeValue[1];
-				}
-				this.$axios
-					.gets("/api/newjit/assembly-cfg-erp/list", this.listQuery)
-					.then((response) => {
-						this.list = response.items;
-						this.totalCount = response.totalCount;
-						setTimeout(() => {
-							//大数据量加载时
-							this.listLoading = false;
-						}, 500);
-					})
-					.catch(() => {
-						this.listLoading = false;
-					});
-
-			},
-
-			getDetialList(partCode) {
-				this.listLoading = true;
-				console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-				this.$axios
-					.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
-					.then((response) => {
-						console.log(partCode);
-						if (partCode !== "" && partCode !== undefined) {
-							//console.log(partCode)
-							this.list = response.item.details.filter(
-								(u) => u.partCode === partCode
-							);
-						} else {
-							this.list = response.item.details;
-						}
-						//alert(JSON.stringify(response.Items))
-						//this.totalCount = response.totalCount;
-						setTimeout(() => {
-							//大数据量加载时
-							this.listLoading = false;
-						}, 500);
-					})
-					.catch(() => {
-						this.listLoading = false;
-					});
-			},
-
-			valueselectChange() {},
-			handleImportSAP() {
-				//导入
-				this.showExcelImport = true;
-				this.$refs.importexcel.handleImportExcelClick();
-			},
-
-			handleFilter() {
-				this.page = 1;
-				this.getList();
-			},
-
-			sortChange(data) {
-				const {
-					prop,
-					order
-				} = data;
-				if (!prop || !order) {
-					this.handleFilter();
-					return;
-				}
-				this.listQuery.Sorting = prop + " " + order;
-				this.handleFilter();
-			},
-			handleSelectionChange(val) {
-				this.multipleSelection = val;
-			},
-			/** 通过回调控制style */
-			cellStyle({
-				row,
-				column,
-				rowIndex,
-				columnIndex
-			}) {
-				if (column.property === "qty") {
-					return {
-						textAlign: "right"
-					};
-				} else {
-					return {
-						textAlign: "left"
-					};
-				}
-			},
-			/** 通过回调控制表头style */
-			headerRowStyle({
-				row,
-				column,
-				rowIndex,
-				columnIndex
-			}) {
-				if (column.property === "qty") {
-					return {
-						textAlign: "right",
-						background: "#FAFAFA"
-					};
-				} else {
-					return {
-						textAlign: "left",
-						background: "#FAFAFA"
-					};
-				}
-			},
-			handleRowClick(row, column, event) {
-				this.$refs.multipleTable.clearSelection();
-				this.$refs.multipleTable.toggleRowSelection(row);
-			},
-			getvehicleModel() {
-				this.$axios
-					.gets("/api/newjit/dic/list", this.vehicleModelQuery)
-					.then((response) => {
-						//console.log(response);
-						this.vehicleModelList = response.item;
-						//console.log()
-					})
-					.catch(() => {});
-			},
-			closeDialog() {
-				//this.multipleSelection = [];//清空数据
-			},
-		},
-	};
-</script>
-
-
-<style lang="scss" scoped>
-	@import "../../../pg-fis/styles/crmtable.scss";
-
-	// /*表格全选框去除空框*/
-	// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
-	//   display: none;
-	//   position: relative;
-	// }
-	// /*表格全选框改为：选择*/
-	// .el-table >>> .DisabledSelection .cell:before {
-	//   content: "是否Key件";
-	//   position: absolute;
-	//   left: 7px;
-	// }
-	.divider1 {
-		margin: 0;
-		//width: 100%;
-	}
-
-	.formitem {
-		margin-bottom: 0;
-	}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue b/code/WebApp/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
deleted file mode 100644
index 99b5e6ff..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
+++ /dev/null
@@ -1,770 +0,0 @@
-<!--零件匹配关系页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-    <flexbox class="content-header">
-
-      <el-form
-        :model="listQuery"
-        ref="queryForm"
-        v-show="showSearch"
-        :inline="true"
-      >
-      <!-- <span>版本:</span>
-
-      <XhJSSelect
-        :options="versionList"
-        style="width: 200px"
-        class="search-container"
-        @value-change="selectValue"
-      ></XhJSSelect> -->
-
-      
-      <el-form-item label="零件代码：" prop="partCode">
-        <el-input
-          v-model="listQuery.partCode"
-          clearable
-          size="small"
-          placeholder=""
-          style="width: 200px"
-          class="search-container"
-          @keyup.enter.native="handleFilter"
-        />
-      </el-form-item>
-      
-      <el-form-item label="零件名称：" prop="partName">
-        <el-input
-          v-model="listQuery.partName"
-          clearable
-          size="small"
-          placeholder=""
-          style="width: 200px"
-          class="search-container"
-          @keyup.enter.native="handleFilter"
-        />
-      </el-form-item>
-
-      <el-form-item label="零件类型：" prop="partType">
-        <el-select
-          v-model="listQuery.partType"
-          clearable
-          placeholder="请选择"
-          size="medium"
-          style="margin-right: 15px"
-        >
-          <!-- @change="valueselectChange" -->
-          <el-option
-            v-for="item in partType1List"
-            :key="item.id"
-            :label="item.dicItemName"
-            :value="item.dicItemCode"/>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="零件子类型：" prop="partType2">
-        <el-select
-          v-model="listQuery.partType2"
-          clearable
-          placeholder="请选择"
-          size="medium"
-          style="margin-right: 15px"
-        >
-          <!-- @change="valueselectChange" -->
-          <el-option
-            v-for="item in partType2List"
-            :key="item.id"
-            :label="item.dicItemName"
-            :value="item.dicItemCode"/>
-        </el-select>
-      </el-form-item>
-
-      <!-- <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照结算件基本信息搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      /> -->
-      <el-form-item>
-        <el-button
-          size="mini"
-          type="success"
-          icon="el-icon-search"
-          @click="handleFilter"
-          >搜索
-        </el-button>
-      </el-form-item>
-
-      <el-form-item>
-        <el-button
-          icon="el-icon-refresh"
-          size="mini"
-          @click="resetQuery('queryForm')"
-          >重置
-        </el-button>
-      </el-form-item>
-
-      <el-form-item>
-        <el-button
-          class="filter-item"
-          plain
-          size="mini"
-          type="warning"
-          icon="el-icon-bottom"
-          @click="handleDownload()"
-          >导出Excel
-        </el-button>
-      </el-form-item>
-      <!--表格头组件，filter查询-->
-      <!-- <c-r-m-table-head
-        ref="crmTableHead"
-        :crm-type="crmType"
-        @handle="handleHandle"
-        @filter="handleFilters"
-      >
-      </c-r-m-table-head> -->
-      </el-form>
-    </flexbox>
-    </div>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <!-- <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-      >fixed 默认固定在左边
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column> -->
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-invoice";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import Lockr from "lockr";
-import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
-
-export default {
-  name: "CustomerPartCfg",
-  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "customerPartCfg",
-      versionValue: "",
-      //valueSelect: "R0003",
-      versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        //site: "TH",
-        customerCode: undefined,
-        //userId: "00000000-0000-0000-0000-000000000000",
-        partCode:"",//零件编码
-        partName:"",//零件名称
-        partType:"",//零件类型
-        partType2:"",//零件子类型
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        fileType: 0,
-        userId: "",
-      },
-      showSearch: true,
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      sortState:false, //标记刷新是否是排序调用
-
-
-      
-      partType1Query:{
-        dicTypeName:"客户零件类型1",
-      },
-      partType2Query:{
-        dicTypeName:"客户零件类型2",
-      },
-
-      partType1List:[],
-      partType2List:[],
-      
-    };
-  },
-  mounted() {
-    this.$nextTick(() => { 
-        var offsetHei = document.documentElement.clientHeight;
-        //console.log(offsetHei);
-        let boxH = this.$refs.box.offsetHeight;
-        this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
-        //console.log(this.$refs.box.offsetHeight);
-        //console.log(this.tableHeight);
-    });
-  },
-  created() {
-    //this.getVersionInfo();
-    //if (this.versionList == []) {
-      this.getPartType();
-      this.getList();
-    //}
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-
-      tempsTabs.push({
-        label: "零件代码",
-        prop: "partCode",
-        width: 100,
-      });
-      tempsTabs.push({
-        label: "零件名称",
-        prop: "partName",
-        width: 150,
-      });
-      tempsTabs.push({ 
-        label: "零件类型", 
-        prop: "partType", 
-        width: 120
-      });
-      tempsTabs.push({
-        label: "零件子类型",
-        prop: "partType2",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "零件描述",
-        prop: "Description",
-        width: 150,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    valueselectChange(data) {
-      //alert(data);
-      //版本下拉选择
-      this.valueSelect = data;
-      this.getList();
-    },
-    handleTypeDrop(command, params = {}) {
-      if (command == "updateFis") {
-        this.listLoading = true;
-        //this.listQuery.SkipCount = (this.page - 1) * 10000;
-        this.$axios
-          .posts("/api/settleaccount/SettlementPart/updateFis")
-          .then((res) => {
-            if (res == true) {
-              this.$notify({
-                title: "成功",
-                message: "FIS数据-更新成功！",
-                type: "success",
-                duration: 2000,
-              });
-            } else {
-              this.$message({
-                type: "warning",
-                message: "FIS数据-更新失败！",
-              });
-            }
-            this.listLoading = false;
-          });
-      } else if (command == "enter") {
-      }
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    getVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listVersionQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts(
-          "/api/settleaccount/SettlementPart/versionlist",
-          this.listVersionQuery
-        )
-        .then((response) => {
-          this.versionList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.id;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-          const res = new Map()
-          this.versionList = this.versionList.filter((item) => !res.has(item.label) && res.set(item.label, 1))
-          if (JSON.stringify(this.versionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      /* if (column.property === "state") {
-        return { 0: "其他", 2: "已结" }[row[column.property]];
-      }
-      if (column.property == "accountDate" || column.property == "date") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        //return moment(date).format("YYYY-MM-DD HH:mm:ss");
-        return moment(date).format("YYYY-MM-DD");
-      } */
-      if(column.property === "partType")
-      {
-        var pl = this.partType1List.filter(u => u.dicItemCode === row[column.property]);
-        if(pl.length !== 0)
-        {
-          var vname = pl[0].dicItemName;
-          return vname;
-        }
-        else
-        {
-          return row[column.property];
-        }
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-    //导出功能
-    async handleDownload() {
-      this.listLoading = true;
-      // if (this.versionValue === "") {
-      //   this.$message.error("必需选择版本！");
-      //   this.listLoading = false;
-      //   return;
-      // }
-      // if (this.versionValue != "") {
-      //   this.listQuery.version = this.versionValue;
-      // }
-      console.log("发票导出：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/part-cfg/export",
-          this.listQuery
-        )
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      if (this.valueSelect != "") {
-        this.listQuery.customerCode = this.valueSelect;
-      } else {
-        this.listQuery.customerCode = "";
-      }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .gets(
-          "/api/newjit/part-cfg/list",
-          this.listQuery
-        )
-        .then((response) => {
-          this.list = response.items;
-          // this.list.forEach(item => {
-          //   if(item.customerCode === 'R0001')
-          //   {
-          //     item.customerCode = '二配';
-          //   }
-          //   else if(item.customerCode === 'R0003')
-          //   {
-          //     item.customerCode = '结算';
-          //   }
-          // });
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/settleaccount/SettlementPart/" + id)
-        .then((response) => {
-          this.form = response;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      //#region 
-      /*
-      this.listQuery.Filters = [];
-      if (this.partCode != "") {
-        var column = "partCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.partCode,
-        };
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "partCode")
-        this.listQuery.Filters.push(filter);
-      }
-
-      if (this.partName != "") {
-        var column = "partName";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.partName,
-        };
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "partName")
-        this.listQuery.Filters.push(filter);
-      }
-
-      if (this.partType != "") {
-        var column = "partType";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.partType,
-        };
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "partType")
-        this.listQuery.Filters.push(filter);
-      }
-
-      if (this.partType2 != "") {
-        var column = "partType2";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.partType2,
-        };
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "partType2")
-        this.listQuery.Filters.push(filter);
-      }
-      */
-     //#endregion
-      this.getList();
-    },
-    /** 多项筛选操作 */
-    /** 筛选操作 */
-    handleFilters(data) {
-      if (data === null) {
-        this.listQuery.Filters = [];
-        this.getList(); //查询所有
-      } else {
-        console.log(data)
-        this.filterObj = data;
-        console.log("筛选" + JSON.stringify(data));
-        var offsetHei = document.documentElement.clientHeight;
-        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
-        this.tableHeight = offsetHei - removeHeight;
-        this.currentPage = 1;
-        let Filter = [];
-        data.forEach((item) => {
-          let filter = {};
-          if (item.formType === "datetime" || item.formType === "datetime") {
-            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
-
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
-            }
-          } else {
-            filter["Column"] = item.fieldName;
-            filter["Value"] = item.value;
-            filter["Logic"] = 0;
-            filter["Action"] = item.action;
-            Filter.push(filter);
-          }
-        });
-        console.log("筛选条件" + JSON.stringify(Filter));
-        this.listQuery.Filters = Filter;
-        this.getList();
-      }
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.getPartType()
-      this.handleFilter();
-    },
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
-      if(this.listQuery.Filters.length>0 && this.listQuery.Filters[0].column === "Enabled")
-      {
-        this.sortState = false;
-      }
-      else
-      {
-        this.sortState = true;
-      }
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    //获取零件类型
-    getPartType()
-    {
-      this.$axios
-          .gets(
-            "/api/newjit/dic/list",this.partType1Query
-          )
-          .then((response) => {
-            console.log(response);
-            this.partType1List = response.item;
-            //console.log()
-          })
-          .catch(() => {
-          });
-      this.$axios
-          .gets(
-            "/api/newjit/dic/list",this.partType2Query
-          )
-          .then((response) => {
-            console.log(response);
-            this.partType2List = response.item;
-            //console.log()
-          })
-          .catch(() => {
-          });
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/logRemind/index.vue b/code/WebApp/vue/src/views/pg-fis/basedate/logRemind/index.vue
deleted file mode 100644
index 9a16bb8c..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/logRemind/index.vue
+++ /dev/null
@@ -1,484 +0,0 @@
-<!--系统日志信息页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-    <flexbox class="content-header">
-      <el-form
-        :model="listQuery"
-        ref="queryForm"
-        v-show="showSearch"
-        :inline="true"
-      >
-        <el-form-item label="日志标题" prop="LogTitle">
-          <el-input
-            v-model="listQuery.LogTitle"
-            placeholder="请输入日志标题"
-            clearable
-            size="small"
-            style="width: 150px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="日志类别" prop="LogType">
-          <el-select
-            v-model="listQuery.LogType"
-            placeholder="请选择"
-            style="width: 200px"
-          >
-            <el-option label=" " :value="0"></el-option>
-            <el-option label="R100" :value="1"></el-option>
-            <el-option label="M100" :value="2"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="严重程度" prop="SeriousLevel">
-          <el-select
-            v-model="listQuery.SeriousLevel"
-            placeholder="请选择"
-            style="width: 200px"
-          >
-            <el-option label="轻微" :value="1"></el-option>
-            <el-option label="一般" :value="2"></el-option>
-            <el-option label="严重" :value="3"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleFilter"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="resetQuery('queryForm')"
-            >重置</el-button
-          >
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            style="margin-left: 15px"
-            @click="handleDownload()"
-            >导出(Excel)查询信息
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </flexbox>
-    </div>
-    <div class="l-table">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column >
-        <el-table-column
-            label="操作"
-            width="150">
-            <template slot-scope="scope">
-              <el-button @click="handleEdit(scope.row)" type="primary" size="small">处理</el-button><!-- type="text" -->
-              <el-button @click="handleIgnore(scope.row)" type="primary" size="small">忽略</el-button>
-            </template>
-      </el-table-column>
-      </el-table>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import moment from "moment";
-import { mapGetters } from "vuex";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from 'qs';
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "BillM100",
-  components: { Pagination, CRMTableHead, importExcel },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "bomdatabase",
-      versionValue: "",
-      versionList: [], //版本列表
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        LogTitle: undefined,
-        LogType: undefined,
-        SeriousLevel: undefined,
-      },
-      operationQuery:{
-        id:undefined,
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      multipleSelection: [],
-      drawer: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => { 
-        var offsetHei = document.documentElement.clientHeight;
-        //console.log(offsetHei);
-        let boxH = this.$refs.box.offsetHeight;
-        this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
-    });
-  },
-  created() {
-    this.getList();
-  },
-  computed: {
-    ...mapGetters(["messageNum"]),
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "日志类别", prop: "logType", width: 120 });
-      tempsTabs.push({ label: "日志标题", prop: "logTitle", width: 150 });
-      tempsTabs.push({
-        label: "严重程度",
-        prop: "seriousLevel",
-        width: 100,
-      });
-      tempsTabs.push({ label: "创建日期", prop: "creationTime", width: 120 });
-      tempsTabs.push({
-        label: "日志描述",
-        prop: "logDesc",
-        width: 400,
-      });
-
-      return tempsTabs;
-    },
-  },
-  methods: {
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      console.log("系统日志导出条件："+JSON.stringify(this.listQuery))
-      this.$axios
-        .posts("/api/newjit/log-remind/export", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "seriousLevel") {
-        return { 1: "轻微", 2: "一般", 3: "严重" }[row[column.property]];
-      }
-      if (column.property === "logType") {
-        return {
-          0: "",
-          1: "R100",
-          2: "M100",
-        }[row[column.property]];
-      }
-      if (column.property == "creationTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      this.listQuery.LogStatus = 0;//不要状态为已忽略和已处理的数据
-      //this.listQuery.LogType = 1;//1: R100 2: M100）
-      this.$axios
-        .gets("/api/newjit/log-remind/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          this.$store.commit("SET_MESSAGENUM", this.totalCount);
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    handleEdit(row)
-    {
-      this.operationQuery.id = row.id;
-      this.$axios
-        .posts("/api/newjit/log-remind/do-process",qs.stringify(this.operationQuery))
-        .then((response) => {
-          if(response.status === true)
-          {
-            this.$notify({
-                  title: "成功",
-                  message: "处理成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-          }
-          else
-          {
-            this.$notify({
-                  title: "失败",
-                  message: "处理失败！",
-                  type: "warning",
-                  duration: 2000,
-                });
-          }
-                
-        })
-        .catch(() => {
-                this.$notify({
-                  title: "失败",
-                  message: "处理失败！",
-                  type: "warning",
-                  duration: 2000,
-                });
-        });
-    },
-    handleIgnore(row)
-    {
-      this.operationQuery.id = row.id;
-      this.$axios
-        .posts("/api/newjit/log-remind/do-ignore",qs.stringify(this.operationQuery))
-        .then((response) => {
-          if(response.status === true)
-          {
-            this.$notify({
-                  title: "成功",
-                  message: "忽略成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-          }
-          else
-          {
-            this.$notify({
-                  title: "失败",
-                  message: "忽略失败！",
-                  type: "warning",
-                  duration: 2000,
-                });
-          }
-        })
-        .catch(() => {
-                this.$notify({
-                  title: "失败",
-                  message: "忽略失败！",
-                  type: "warning",
-                  duration: 2000,
-                });
-        });
-    }
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/m100BIll/detail.vue b/code/WebApp/vue/src/views/pg-fis/basedate/m100BIll/detail.vue
deleted file mode 100644
index 607b4791..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/m100BIll/detail.vue
+++ /dev/null
@@ -1,354 +0,0 @@
-<!--M100上线信息-明细数据-->
-<template>
-  <div class="cr-body-content">
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-      :row-key="getRowKeys"
-      :expand-row-keys="expands"
-      @expand-change="exChange"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <!-- <el-table-column
-        prop="总成名称"
-        label="erpAssemblyName"
-        sortable
-        width="180"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="erpAssemblyVersion"
-        label="总成版本号"
-        sortable
-        width="180"
-      >
-              style="width: calc(100% - 47px)"
-            class="two-list"
-      </el-table-column> -->
-
-      <el-table-column type="expand" prop="details">
-        <template slot-scope="scope">
-          <el-table :data="scope.row.details">
-            <el-table-column
-              prop="partCode"
-              label="客户零件代码"
-            ></el-table-column>
-            <el-table-column
-              prop="partNum"
-              label="客户零件数量"
-            ></el-table-column>
-            <el-table-column prop="description" label="描述"></el-table-column>
-            <el-table-column prop="isKey" label="是否Key件">
-              <template slot-scope="scope">
-                <span v-if="scope.row.isKey == true">
-                  <span style="color: #00b46d">是</span>
-                </span>
-                <span v-else>
-                  <span style="color: #d75c89">否</span>
-                </span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="erpAssemblyVersion"
-        label="总成版本号"
-        sortable
-        width="360"
-      >
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import { downloadFile } from "@/utils/crmindex.js";
-import Detail from "./detail";
-
-export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "stockFisDiffReport",
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      expands: [], //只展开一行放入当前行id
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        parentId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        SkipCount: 0,
-        MaxResultCount: 15,
-        id: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight -30 ,
-      isEdit: false
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 30;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfos: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.parentId = element.ParentId;
-          });
-          if (this.customerInfo.parentId != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "总成编号",
-        prop: "erpAssemblyCode",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "总成名称",
-        prop: "erpAssemblyName",
-        width: 160,
-      });
-      // tempsTabs.push({
-      //   label: "总成版本号",
-      //   prop: "erpAssemblyName",
-      //   width: 160,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    exChange(row, rowList) {
-      this.loading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList() {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      //alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "partCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 6,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    resetQuery() {},
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/m100BIll/index.vue b/code/WebApp/vue/src/views/pg-fis/basedate/m100BIll/index.vue
deleted file mode 100644
index f3d83dfa..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/m100BIll/index.vue
+++ /dev/null
@@ -1,1505 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-    <flexbox class="content-header" >
-      <el-form
-        :model="listQuery"
-        ref="queryForm"
-        v-show="showSearch"
-        :inline="true"
-      >
-      <!-- <el-row> -->
-        <el-form-item label="生产线:" prop="productType">
-          <el-select
-            v-model="listQuery.productType"
-            clearable
-            placeholder="请选择"
-            size="medium"
-            style="margin-right: 15px"
-            @change="ptypeselectChange"
-          >
-            <el-option
-                v-for="item in productTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id" />  
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="productLine">
-          <el-select
-            v-model="listQuery.productLine"
-            clearable
-            placeholder="请选择"
-            size="medium"
-            style="margin-right: 15px"
-            @change="valueselectChange"
-          >
-          <el-option
-            v-for="item in PLChildList"
-            :key="item.id"
-            :label="item.productLineName"
-            :value="item.productLineCode"/>
-          </el-select>
-        </el-form-item>
-
-          <el-form-item label="版本:" prop="Version">
-            <el-input
-              v-model="listQuery.Version"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-      <!-- </el-row> -->
-      <!-- <el-row> -->
-        <el-form-item label="大众顺序号:" prop="HostSNBegin">
-          <el-input
-            v-model="listQuery.HostSNBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="HostSNEnd">
-          <el-input
-            v-model="listQuery.HostSNEnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="KNR:" prop="KNRBegin" >
-          <el-input
-            v-model="listQuery.KNRBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="KNREnd">
-          <el-input
-            v-model="listQuery.KNREnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-      <!-- </el-row> -->
-      <!-- <el-row> -->
-        <el-form-item label="底盘号:" prop="VINBegin">
-          <el-input
-            v-model="listQuery.VINBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="VINEnd">
-          <el-input
-            v-model="listQuery.VINEnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="上线日期">
-          <el-date-picker
-            v-model="listQuery.OnlineTimeValue"
-            size="small"
-            style="width: 380px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange" :default-time="['00:00:00','23:59:59']"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-      <!-- </el-row> -->
-      <!-- <el-row> -->
-        <el-form-item label="接收日期" >
-          <el-date-picker
-            v-model="listQuery.ReceiveTimeValue"
-            size="small"
-            style="width: 380px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange" :default-time="['00:00:00','23:59:59']"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-
-        <el-form-item >
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleFilter"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="resetQuery('queryForm')"
-            >重置</el-button
-          >
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            style="margin-left: 15px"
-            @click="handleDownload()"
-            >导出(Excel)
-          </el-button>
-        </el-form-item>
-      <!-- </el-row> -->
-        <!-- <el-divider class="divider1" ></el-divider> -->
-        <el-form-item style="margin-bottom: 0px;margin-top: -1px">
-          <el-button
-            class="filter-item"
-            size="mini"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleCreate"
-            >新增
-          </el-button>
-          <el-button
-            class="filter-item"
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            @click="handleUpdate"
-            >修改
-          </el-button>
-          <el-button
-            class="filter-item"
-            size="mini"
-            type="primary"
-            icon="el-icon-delete"
-            @click="handleDelete"
-            >删除
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </flexbox>
-    </div>
-    <div class="l-table" style="margin-top: -9px">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        
-        <el-table-column
-          label="底盘号"
-          prop="vin "
-          sortable="custom"
-          align="center"
-          
-          width="180px"
-        >
-          <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.vin
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!--表单渲染-->
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        :title="formTitle"
-        width="1000px"
-      >
-        <el-form
-          ref="form"
-          :inline="true"
-          :model="form"
-          :rules="rules"
-          size="small"
-          label-width="120px"
-        >
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="KNR:" prop="knr" required >
-                <el-select
-                  style="width: 350px"
-                  v-model="form.knr"
-                  placeholder="请选择添加M100信息对应的KNR号"
-                  filterable
-                  :disabled="false"
-                  @change="getVModel"
-                >
-                  <el-option
-                    v-for="item in KNRlist"
-                    :key="item.knr"
-                    :label="item.knr"
-                    :value="item.knr"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="车型:" prop="vehicleModelCode" required >
-                <el-select
-                  style="width: 350px"
-                  v-model="form.vehicleModelCode"
-                  :disabled="false"
-                  @change="vMchange"
-                >
-                  <el-option
-                    v-for="item in vehicleModelList"
-                    :key="item.id"
-                    :label="item.dicItemName"
-                    :value="item.dicItemCode"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="底盘号:"  prop="vin" required >
-                <el-input
-                  style="width: 350px"
-                  v-model="form.vin"
-                  :disabled="false"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="大众顺序号:"  prop="hostSN" required >
-                <el-input
-                  style="width: 350px"
-                  v-model="form.hostSN"
-                  :disabled="false"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="上线日期:" prop="onlineTime" required>
-              <el-date-picker
-                v-model="form.onlineTime"
-                style="width: 350px"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="选择时间"
-                :disabled="false"
-              >
-              </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
-              <div style="border:1px solid #E4E4E4;width:94%">
-                <el-row>
-                  <div style="background:#F1F1F1;width:100%;height:30px;line-height:31px;">
-                    <label style="margin-left:15px">ERP总成</label>
-                  </div>
-                </el-row>
-                <el-row>
-                  <el-table
-                    ref="LeftDetialTable"
-                    v-loading="listLoading"
-                    element-loading-text="拼命加载中..."
-                    element-loading-spinner="el-icon-loading"
-                    class="cr-table"
-                    :data="form.leftdetails"
-                    :height="detailTableHeight"
-                    :cell-style="cellStyle"
-                    :header-cell-style="headerRowStyle"
-                    size="small"
-                    stripe
-                    border
-                    highlight-current-row
-                    style="width: 95%;margin:10px"
-                    @row-click="handleLeftRowClick"
-                    @selection-change="handleLeftSelectionChange"
-                  >
-                    <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-                    <el-table-column prop="erpAssemblyCode" label="ERP总成编号" width="150px" > 
-                      <template slot-scope="scope">
-                        <el-input v-model="scope.row.erpAssemblyCode" size="mini" style="width:135px"></el-input>
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="erpAssemblyName" label="ERP总成名称">
-                      <template slot-scope="scope">
-                        <el-input v-model="scope.row.erpAssemblyName" size="mini"></el-input>
-                      </template> 
-                    </el-table-column>
-                    <el-table-column  width="35px"> 
-                      <template slot="header">
-                        <el-button @click="handleAddLeftDetails" icon="el-icon-plus" type="text"></el-button>
-                      </template>
-                      <template slot-scope="scope">
-                        <el-button @click="handleLeftDeleteDetails(scope.$index, scope.row)" icon="el-icon-minus" type="text"></el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </el-row>
-                <!-- <el-divider class="divider2"  content-position="left">添加ERP总成</el-divider>
-                <el-row>
-                  <el-form-item label="ERP总成编码:" prop="erpAssemblyCode"  >
-                    <el-input
-                      style="width: 315px"
-                      v-model="form.erpAssemblyCode"
-                      :disabled="isEdit"
-                      placeholder="请输入总成编码"
-                    />
-                  </el-form-item>
-                </el-row>
-                <el-row>
-                  <el-form-item label="ERP总成名称:" prop="erpAssemblyName"  >
-                    <el-input
-                      style="width: 315px"
-                      v-model="form.erpAssemblyName"
-                      :disabled="isEdit"
-                      placeholder="请输入总成名称"
-                    />
-                  </el-form-item>
-                </el-row>
-                <el-row>
-                  <el-form-item label="车型:" prop="vehicleModel"  >
-                    <el-select
-                      style="width: 315px"
-                      v-model="form.vehicleModel"
-                      :disabled="isEdit"
-                      placeholder="请输入总成名称"
-                    >
-                      <el-option
-                        v-for="item in vehicleModelList"
-                        :key="item.id"
-                        :label="item.dicItemName"
-                        :value="item.dicItemCode"/>
-                    </el-select>
-                  </el-form-item>
-                </el-row>
-                <div style="text-align:center;margin: 0px;margin-bottom: 15px;">
-                  <el-button type="primary" @click="leftclick">添加总成</el-button>
-                </div> -->
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div style="border:1px solid #E4E4E4;width:94%">
-                <el-row>
-                  <div style="background:#F1F1F1;width:100%;height:30px;line-height:31px;">
-                    <label style="margin-left:15px">ERP结算件</label>
-                  </div>
-                </el-row>
-                <el-row>
-                  <el-table
-                    ref="DetialTable"
-                    v-loading="listLoading"
-                    element-loading-text="拼命加载中..."
-                    element-loading-spinner="el-icon-loading"
-                    class="cr-table"
-                    :data="form.rightdetails"
-                    :height="detailTableHeight"
-                    :cell-style="cellStyle"
-                    :header-cell-style="headerRowStyle"
-                    size="small"
-                    stripe
-                    border
-                    highlight-current-row
-                    style="width: 95%;margin:10px"
-                  >
-                    <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-                    <el-table-column prop="partCode" label="客户零件代码" width="150px" > 
-                      <template slot-scope="scope">
-                        <el-input v-model="scope.row.partCode" size="mini" style="width:135px"></el-input>
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="description" label="客户零件名称">
-                      <template slot-scope="scope">
-                        <el-input v-model="scope.row.description" size="mini"></el-input>
-                      </template> 
-                    </el-table-column>
-                    <el-table-column prop="partNum" label="客户零件数量" width="120px" >
-                      <template slot-scope="scope">
-                        <el-input-number v-model="scope.row.partNum" :min="1"  size="mini" style="width:100px"></el-input-number>
-                      </template>
-                    </el-table-column>
-                    <el-table-column width="35px"> 
-                      <template slot="header">
-                        <el-button @click="handleAddRightDetails" icon="el-icon-plus" type="text"></el-button>
-                      </template>
-                      <template slot-scope="scope">
-                        <el-button @click="handleRightDeleteDetails(scope.$index, scope.row)" icon="el-icon-minus" type="text"></el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </el-row>
-                <!-- <el-divider class="divider2"  content-position="left">添加ERP结算件</el-divider>
-                <el-row>
-                  <el-form-item label="客户零件代码:" prop="customerPartCode"  >
-                    <el-input
-                      style="width: 315px"
-                      v-model="form.customerPartCode"
-                      :disabled="isEdit"
-                      placeholder="请输入客户零件代码"
-                    />
-                  </el-form-item>
-                </el-row>
-                <el-row>
-                  <el-form-item label="客户零件名称:" prop="customerPartName"  >
-                    <el-input
-                      style="width: 315px"
-                      v-model="form.customerPartName"
-                      :disabled="isEdit"
-                      placeholder="请输入总成名称"
-                    />
-                  </el-form-item>
-                </el-row>
-                <el-row>
-                  <el-form-item label="数量:" prop="partQty"  >
-                    <el-input-number
-                      style="width: 315px"
-                      v-model="form.partQty"
-                      :disabled="isEdit"
-                      :min="1"
-                    />
-                  </el-form-item>
-                </el-row>
-                <div style="text-align:center;margin: 0px;margin-bottom: 15px;">
-                  <el-button type="primary">添加零件</el-button>
-                </div> -->
-              </div>
-            </el-col>
-          </el-row>
-        </el-form>
-        <!--表格渲染-->
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="dialogFormVisible = false"
-            >取消</el-button
-          >
-          <el-button v-loading="formLoading" type="primary" @click="save"
-            >确认</el-button
-          >
-        </div>
-      </el-dialog>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-        <div>
-          <Detail
-            v-bind:customerInfos="customerInfos"
-            style="margin-top: -35px"
-          ></Detail>
-        </div>
-      </el-drawer>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import moment from "moment";
-import { mapGetters } from 'vuex';
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "m100Bill",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "m100Bill",
-      rules: {
-        erpAssemblyName: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        productType: 1,
-        ProductLine: undefined,
-        version:undefined,
-        HostSNBegin:undefined,
-        HostSNEnd:undefined,
-        KNRBegin:undefined,
-        KNREnd:undefined,
-        VINBegin:undefined,
-        VINEnd:undefined,
-        OnlineTimeValue:undefined,
-        OnlineTimeBegin:undefined,
-        OnlineTimeEnd:undefined,
-        ReceiveTimeValue:undefined,
-        ReceiveTimeBegin:undefined,
-        ReceiveTimeEnd:undefined,
-
-      },
-      listExportQuery: {
-        erpAssemblyCode: undefined,
-        erpAssemblyName: undefined,
-      },
-      listPLQuery:{
-        BillType: 2,
-        //UserId: "00000000-0000-0000-0000-000000000000",
-      },
-      knrQuery:{ 
-        knr: undefined,
-      },
-      form:
-      {
-        leftdetails:[],
-        rightdetails:[],
-      },
-      saveform:{
-        m100Bill:
-        {
-          knr:undefined,
-          vehicleModelCode:undefined,
-          vin:undefined,
-          hostSN:undefined,
-          onlineTime:undefined,
-          billStatus:2,
-          billM100Parts:[],
-        },
-        erpAssemblyList:
-        [
-          // {
-          //   erpAssemblyCode:undefined,
-          //   erpAssemblyName:undefined,
-          //   vehicleModel:undefined,
-          //   //isCover: true,
-          //   details: undefined,
-          //     // {
-          //     //   partCode: undefined,
-          //     //   partNum: 1,
-          //     //   description: undefined,
-          //     //   isKey: false
-          //     // }
-          // },
-        ]
-        
-        // #region
-        /*
-        
-        */
-       //  #endregion
-      },
-      rightAlldetails:[],
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      multipleSelection: [],
-      multipLeLeftSelection:[],
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      detailTableHeight:250,
-      //details:[], //修改子表数据源
-      PLList:[],//产线下拉
-      PLChildList:[],//筛选后产线下拉
-      vehicleModelQuery:{
-        dicTypeName:"派格车型",
-      },
-      vehicleModelList:[],//车型list
-	    productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}],
-      gettime:"",
-      KNRlist:null,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => { 
-        var offsetHei = document.documentElement.clientHeight;
-        //console.log(offsetHei);
-        let boxH = this.$refs.box.offsetHeight;
-        this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
-        //console.log(this.$refs.box.offsetHeight);
-        //console.log(this.tableHeight);
-    });
-  },
-  created() {
-    //this.getKNRList();
-    this.getProductLine();
-    //this.getList();
-    //console.log(this.userInfo);
-  },
-  computed: {
-    getDefaultField() {
-      
-      var tempsTabs = [];
-      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 130,
-      });
-      // tempsTabs.push({
-      //   label: "底盘号",
-      //   prop: "vin",
-      //   width: 130,
-      // });
-      tempsTabs.push({
-        label: "上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "接收时间",
-        prop: "receiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "采集点",
-        prop: "collectionPoint",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "文件名称",
-        prop: "fileName",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "产线",
-        prop: "productLine",
-        width: 120,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(['userInfo'])//获取当前用户信息
-  },
-  methods: {
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      //console.log(param)
-      var parentId = param.assemblyID; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    getCurrentTime() {
-        //获取当前时间并打印
-        var _this = this;
-        let yy = new Date().getFullYear();
-        let month =  new Date().getMonth()+1;
-        let mm = month<10 ? '0'+month : month;
-        let dd = new Date().getDate()<10 ? '0'+new Date().getDate() : new Date().getDate();
-        let hh = new Date().getHours()<10 ? '0'+new Date().getHours() : new Date().getHours();
-        let mf = new Date().getMinutes()<10 ? '0'+new Date().getMinutes() : new Date().getMinutes();
-        let ss = new Date().getSeconds()<10 ? '0'+new Date().getSeconds() : new Date().getSeconds();
-        _this.gettime = yy+'-'+mm+'-'+dd+' '+hh+':'+mf+':'+ss;
-    },
-    save() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.saveform.m100Bill.hostSN = this.form.hostSN;
-          this.saveform.m100Bill.knr = this.form.knr;
-          this.saveform.m100Bill.vin = this.form.vin;
-          this.saveform.m100Bill.onlineTime = this.form.onlineTime;
-          this.saveform.m100Bill.vehicleModelCode = this.form.vehicleModelCode;
-          this.getCurrentTime();
-          this.saveform.m100Bill.description = "无";
-          this.saveform.m100Bill.receiveTime = this.gettime;
-          //判断最后一次右侧数据rightdetails是否在右侧全部数据rightAlldetails中
-          this.form.rightdetails.forEach(element => {
-            var tlist = this.rightAlldetails.filter(u => u.erpAssemblyCode === element.erpAssemblyCode && u.partCode === element.partCode 
-                                          && u.partName === element.partName && u.partNum === element.partNum);
-            if(tlist.length === 0)
-            {
-              this.rightAlldetails.push(element);
-            }
-          });
-
-          //this.saveform.erpAssemblyList.details = {};
-          //console.log("当前左侧数据");
-          //console.log(this.form.leftdetails);
-          //console.log("当前右侧显示数据");
-          //console.log(this.form.rightdetails);
-          //console.log("当前右侧全部数据");
-          //console.log(this.rightAlldetails);
-
-          /**左右关联拼接最终erpAssemblyList格式 */
-          this.form.leftdetails.forEach((element,i) => {
-            var templist = this.rightAlldetails.filter(u => u.erpAssemblyCode === element.erpAssemblyCode);
-            let obj = {};
-            obj.erpAssemblyCode = element.erpAssemblyCode;
-            obj.erpAssemblyName = element.erpAssemblyName;
-            obj.vehicleModel = element.vehicleModel;
-            obj.details = [];
-
-            templist.forEach(detail => {
-              if(detail.partCode !== "" && detail.partCode !== undefined)
-              {
-                obj.details.push(detail);
-              }
-            });
-            this.saveform.erpAssemblyList.push(obj);
-          });
-
-          //console.log(this.saveform);
-          console.log("保存参数:" + JSON.stringify(this.saveform));
-          this.formLoading = true;
-          if (this.isEdit) {
-            //修改
-            this.$axios
-              .puts("/api/newjit/new-m100/" + this.multipleSelection[0].id,this.saveform)
-              .then((response) => {
-                console.log(response);
-                this.formLoading = false;
-                this.$notify({
-                  title: "成功",
-                  message: "更新成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.dialogFormVisible = false;
-                this.getList();
-              })
-              .catch(() => {
-                this.formLoading = false;
-                console.log("error");
-                this.saveform = {
-                  m100Bill:
-                  {
-                    knr:undefined,
-                    vehicleModelCode:undefined,
-                    vin:undefined,
-                    hostSN:undefined,
-                    onlineTime:undefined,
-                    billStatus:2,
-                    billM100Parts:[],
-                  },
-                  erpAssemblyList:[],
-                };
-                this.dialogFormVisible = false;
-                this.getList();
-              });
-          } else {
-            //insert添加
-            console.log(JSON.stringify(this.saveform));
-            this.$axios
-              .posts("/api/newjit/new-m100", this.saveform)
-              .then((response) => {
-                this.formLoading = false;
-                this.$notify({
-                  title: "成功",
-                  message: "新增成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.dialogFormVisible = false;
-                this.getList();
-              })
-              .catch(() => {
-                this.formLoading = false;
-                this.saveform = {
-                  m100Bill:
-                  {
-                    knr:undefined,
-                    vehicleModelCode:undefined,
-                    vin:undefined,
-                    hostSN:undefined,
-                    onlineTime:undefined,
-                    billStatus:2,
-                    billM100Parts:[],
-                  },
-                  erpAssemblyList:[],
-                };
-              });
-          }
-        }
-      });
-    },
-    /** 新增 */
-    handleCreate() {
-      this.getKNRList();
-      if (this.$refs["form"] !== undefined) {
-        this.$nextTick(() => {
-          this.$refs["form"].resetFields();
-        });
-      }
-      this.formTitle = "新增";
-      this.isEdit = false;
-      this.form = {};
-      this.rightAlldetails = [];
-      this.saveform = {
-        m100Bill:
-        {
-          knr:undefined,
-          vehicleModelCode:undefined,
-          vin:undefined,
-          hostSN:undefined,
-          onlineTime:undefined,
-          billStatus:2,
-          billM100Parts:[],
-        },
-        erpAssemblyList:[],
-      };
-      //this.details = [];
-      this.getvehicleModel();
-      this.dialogFormVisible = true;
-    },
-    /** 修改 */
-    handleUpdate(row) {
-      this.getKNRList();
-      this.formTitle = "修改";
-      this.isEdit = true;
-      this.rightAlldetails = [];
-      this.saveform = {
-        m100Bill:
-        {
-          knr:undefined,
-          vehicleModelCode:undefined,
-          vin:undefined,
-          hostSN:undefined,
-          onlineTime:undefined,
-          billStatus:2,
-          billM100Parts:[],
-        },
-        erpAssemblyList:[],
-      };
-      //this.details = [];
-      this.getvehicleModel();
-        if (this.multipleSelection.length != 1) {
-          this.$message({
-            message: "编辑必须选择单行",
-            type: "warning",
-          });
-          return;
-        } else {
-          this.fetchData(this.multipleSelection[0].id);
-          this.dialogFormVisible = true;
-        }
-    },
-    /** 删除 */
-    handleDelete(row) {
-      if (this.multipleSelection.length != 1) {
-          this.$message({
-            message: "编辑必须选择单行",
-            type: "warning",
-          });
-          return;
-      }
-        // this.$alert("暂时不支持批量删除", "提示", {
-        //   confirmButtonText: "确定",
-        //   callback: (action) => {
-        //     //
-        //   },
-        // });  
-        this.$confirm("是否删除底盘号" + this.multipleSelection[0].vin + "的数据?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-        .then(() => {
-          this.$axios
-            .deletes("/api/newjit/new-m100/"+ this.multipleSelection[0].id)
-            .then((response) => {
-              const index = this.list.indexOf(this.multipleSelection[0]);
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/new-m100/" + id)
-        .then((response) => {
-          //console.log(response);
-          this.form = response.item.m100Bill;
-          this.form.rightdetails = [];
-          this.form.leftdetails = response.item.erpAssemblyList;
-          response.item.erpAssemblyList.forEach((element,i) => {
-            element.details.forEach(item => {
-              item.erpAssemblyCode = element.erpAssemblyCode;
-              this.rightAlldetails.push(item);
-              if( i === 0 )
-              {
-                this.form.rightdetails.push(item);
-              }
-            });
-            //console.log(this.rightAlldetails);
-            //console.log(this.form.rightdetails);
-          });
-        });
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
-      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
-      console.log(JSON.stringify(this.listExportQuery));
-      this.$axios
-        .posts("/api/newjit/new-m100/export", this.listExportQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-      this.listLoading = false;
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.listQuery.OnlineTimeValue = [];
-      this.listQuery.ReceiveTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-
-    /**左增加 */
-    handleAddLeftDetails() {
-      this.$forceUpdate();
-      if (this.form.leftdetails === undefined) {
-        this.form.leftdetails = [];
-        //console.log(679);
-      }
-      let obj = {};
-      obj.erpAssemblyCode = "";
-      obj.erpAssemblyName = "";
-      obj.vehicleModel = this.form.vehicleModelCode;
-
-      //console.log(this.form.leftdetails);
-      this.form.leftdetails.push(obj);
-      //console.log(688);
-    },
-    /**右增加 */
-    handleAddRightDetails() {
-      this.$forceUpdate();
-      let obj = {};
-      //判断是否选择了左侧的数据
-      //console.log(this.multipLeLeftSelection);
-      if(this.multipLeLeftSelection.length !== 1)
-      {
-        this.$message({
-            message: "必须选择单行总成",
-            type: "warning",
-          });
-          return;
-      }
-      else
-      {
-        // if (this.form.rightdetails === undefined) {
-        //   this.form.rightdetails = [];
-        //   this.form.rightdetails.erpAssemblyCode = this.multipLeLeftSelection[0].erpAssemblyCode;
-        //   //console.log(679);
-        // }
-      }
-      obj.erpAssemblyCode = this.multipLeLeftSelection[0].erpAssemblyCode;
-      obj.partCode = "";
-      obj.description = "";
-      obj.partNum= 1;
-
-      //console.log(this.form.rightdetails);
-      this.form.rightdetails.push(obj);
-      //console.log(688);
-    },
-    /**左侧删除 */
-    handleLeftDeleteDetails(index,row){
-      this.form.leftdetails.splice(index, 1);
-      this.rightAlldetails = this. rightAlldetails.filter(u => u.erpAssemblyCode !== row.erpAssemblyCode);
-      //console.log(693);
-    },
-    /**右侧删除 */
-    handleRightDeleteDetails(index,row){
-      this.form.rightdetails.splice(index, 1);
-      this.rightAlldetails.forEach((element,i) => {
-        if(element === row)
-        {
-          //console.log("右侧删除");
-          this.rightAlldetails.splice(i, 1);
-          //console.log(this.rightAlldetails);
-          return;
-        }
-      });
-      // .filter(u => u.erpAssemblyCode !== row.erpAssemblyCode && u.partCode !== row.partCode 
-      //                                             && u.partName !== row.partName && u.partNum !== row.partNum);
-                                          
-      //console.log(693);
-    },
-
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 0: "未生效", 2: "已生效", 3: "已发布" }[row[column.property]];
-      }
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList(data) {
-      this.listLoading = true;
-        if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if(this.listQuery.OnlineTimeValue!== undefined)
-      {
-        this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
-        this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
-      }
-      if(this.listQuery.ReceiveTimeValue!== undefined)
-      {
-        this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
-        this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
-      }
-      this.$axios
-        .gets("/api/newjit/new-m100/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    getKNRList() {
-      var lq = {};
-      var tlist = [];
-      this.$axios
-        .gets("/api/newjit/bill-r100/list", lq)
-        .then((response) => {
-          this.KNRlist = response.items;
-          console.log("获取R100的KNR信息");
-          console.log(this.KNRlist);
-        })
-        .catch(() => {
-          console.log("error");
-        });
-    },
-    getVModel()
-    {
-      this.form.vehicleModelCode = this.KNRlist.filter(u => u.knr === this.form.knr)[0].vehicleModelCode;
-      this.knrQuery.knr = this.form.knr;
-      this.form.rightdetails = [];
-      this.$axios
-        .gets("/api/newjit/new-m100/get-erp-assembly-list", this.knrQuery)
-        .then((response) => {
-          if(response.status === true)
-          {
-            this.KNREClist = response.item;
-            //console.log("获取KNR的总成信息");
-            //console.log(this.KNREClist);
-            this.form.leftdetails = response.item;
-            this.$forceUpdate();
-            response.item.forEach((element,i) => {
-              element.details.forEach(detail => {
-                detail.erpAssemblyCode = element.erpAssemblyCode;
-                this.rightAlldetails.push(detail);
-                if( i === 0 )
-                {
-                  this.form.rightdetails.push(detail);
-                }
-              });
-            });
-          }
-          else
-          {
-            console.log("接口返回结果为错误");
-          }
-        })
-        .catch(() => {
-          console.log("error");
-        });
-    },
-    vMchange()
-    {
-      this.$forceUpdate();
-    },
-
-    valueselectChange(){this.$forceUpdate();},
-    handleImportSAP(){},
-
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-      //console.log(this.multipleSelection);
-    },
-    handleLeftSelectionChange(val)
-    {
-      // console.log("左改变");
-      // console.log(val);
-      // this.multipLeLeftSelection = [];
-      // this.multipLeLeftSelection.push(val);
-      // console.log(this.multipLeLeftSelection);
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    /**主表点击*/
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    /**左点击*/
-    handleLeftRowClick(row, column, event) {
-      this.$forceUpdate();
-      //console.log("左点击");
-      this.$refs.LeftDetialTable.clearSelection();
-      this.$refs.LeftDetialTable.toggleRowSelection(row);
-      this.multipLeLeftSelection = [];
-      this.multipLeLeftSelection.push(row);
-      if(this.form.rightdetails === undefined)
-      {
-        this.form.rightdetails = []
-      }
-      if(this.form.rightdetails.length > 0)
-      {
-        var templist = this.rightAlldetails.filter(u => u.erpAssemblyCode === this.form.rightdetails[0].erpAssemblyCode);
-        this.form.rightdetails.forEach(element => {
-          var temp = templist.filter(u => u.erpAssemblyCode === element.erpAssemblyCode && u.partCode === element.partCode 
-                            && u.partName === element.partName && u.partNum === element.partNum);
-          if(temp.length >= 1)
-          {
-            //console.log("判定包含");
-            //console.log(templist);
-            //console.log(element);
-          }
-          else
-          {
-            //console.log("判定不包含");
-            //console.log(element);
-            this.rightAlldetails.push(element);
-          }
-        });
-      }
-      else
-      {
-        var templist = [];
-      }
-      //.log("右侧全数据");
-      //console.log(this.rightAlldetails);
-      this.form.rightdetails = this.rightAlldetails.filter(u => u.erpAssemblyCode === this.multipLeLeftSelection[0].erpAssemblyCode);
-      //console.log("右侧数据");
-      //console.log(this.form.rightdetails);
-    },
-    //获取所有产线
-    getProductLine()
-    {
-      this.listPLQuery.UserId = this.userInfo.userId;
-      this.$axios
-          .gets(
-            "/api/newjit/product-line/list",this.listPLQuery
-          )
-          .then((response) => {
-            //console.log(response);
-            this.PLList = response.item;
-            this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
-            this.listQuery.productLine = this.PLChildList[0].productLineCode;
-            this.getList();
-            
-            //console.log(this.PLList);
-          })
-          .catch(() => {
-          });
-    },
-    //产线类型变更
-    ptypeselectChange()
-    {
-      this.$forceUpdate();
-      this.listQuery.productLine = "";
-      //console.log(this.listQuery.productType);
-      //console.log(this.PLChildList)
-      this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
-      //console.log(this.PLList)
-      //console.log(this.listQuery.productType)
-      //console.log(this.PLChildList)
-    },
-    //获取车型
-    getvehicleModel()
-    {
-      this.$axios
-          .gets(
-            "/api/newjit/dic/list",this.vehicleModelQuery
-          )
-          .then((response) => {
-            //console.log(response);
-            this.vehicleModelList = response.item;
-            //console.log()
-          })
-          .catch(() => {
-          });
-    },
-    leftclick()
-    {
-      this.$forceUpdate();
-      let obj = {};
-      obj.erpAssemblyCode = this.form.erpAssemblyCode;
-      obj.erpAssemblyName = this.form.erpAssemblyName;
-      obj.vehicleModel = this.form.vehicleModelCode;
-      
-      if (this.form.leftdetails === undefined) {
-        this.form.leftdetails = [];
-      }
-      this.form.leftdetails.push(obj);
-    },
-    rightclick(){},
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-
-// /*表格全选框去除空框*/
-// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
-//   display: none;
-//   position: relative;
-// }
-// /*表格全选框改为：选择*/
-// .el-table >>> .DisabledSelection .cell:before {
-//   content: "是否Key件";
-//   position: absolute;
-//   left: 7px;
-// }
-.divider1{
-  margin: 0 ;
-}
-.divider2{
-  margin: 10px;
-  margin-bottom: 20px ;
-  width: 95%;
-}
-</style>
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue b/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
deleted file mode 100644
index 6dba1915..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
+++ /dev/null
@@ -1,830 +0,0 @@
-<!--重新打印门板模块-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <el-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="HostSN">
-                <el-input
-                  v-model="listQuery.HostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-           <!-- <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endHostSN">
-                <el-input
-                  v-model="listQuery.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            -->
-          </el-form-item>
-
-          <!-- <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="Vin">
-                <el-input
-                  v-model="listQuery.Vin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item> -->
-            <!-- </el-col> -->
-           <!--  <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endVin">
-                <el-input
-                  v-model="listQuery.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            -->
-          <!-- </el-form-item> -->
-
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
-
-          <el-form-item >
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleUpdate()"
-              >重打</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底盘号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="vehicleModel_DoorPlankCode"
-                label="车型门板代码"
-              ></el-table-column>
-              <el-table-column
-                prop="topBoxPositionNum"
-                label="上箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="topSAPMaterialNum"
-                label="上箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="topMaterialDescription"
-                label="上箱位 物料描述"
-              ></el-table-column>
-              <el-table-column
-                prop="belowBoxPositionNum"
-                label="下箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowSAPMaterialNum"
-                label="下箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowMaterialDescription "
-                label="下箱位 物料描述"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosMB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        Vin: undefined,
-        HostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        Vin: undefined,
-        HostSN: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        Vin: undefined,
-        HostSN: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosMB: {
-      handler(newVal) {
-        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = element.PrintType;
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
-      tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 });
-      tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "起始底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "结束底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      if (this.listQuery.Vin != "") {
-        this.listQuery.Vin = this.listQuery.Vin;
-      }
-      if (this.listQuery.HostSN != "") {
-        this.listQuery.HostSN = this.listQuery.HostSN;
-      }
-      this.listQuery.partType = this.listQuery.partType;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/MenBanPackingList/MenBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          
-          response.items.forEach((item)=>{
-            if(item.printType == 0)
-            {
-              item.printType = "正常打印";
-            }
-            else if(item.printType == 1)
-            {
-              item.printType = "重打";
-            }
-            else
-            {
-              item.printType = "补打";
-            }
-
-          });
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      var MBVin1 = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        MBVin1.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          MBVin1.push(id);
-        });
-        myalert = "选中项";
-      }
-        // let MBVin1 = this.multipleSelection[0].id;
-        let MBId = MBVin1;
-        var params = {
-          printType: 1,
-          productLine: this.customerInfo.productLine,
-          reportIdList: MBId,
-        };
-        console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
-          .then((response) => {
-            //alert(response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=menban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-               this.getList();
-            }
-          })
-          .catch(() => {});
-      
-
-      // this.isEdit = true;
-      // if (this.multipleSelection.length != 1) {
-      //   this.$message({
-      //     message: "重新打印必须选择单行，不能多选！",
-      //     type: "warning",
-      //   });
-      //   return;
-      // } else {
-      //   //this.fetchData(this.multipleSelection[0].id);
-      //   //重新打印方法
-      //   let MBVin1 = this.multipleSelection[0].id;
-      //   let MBId = [MBVin1];
-      //   var params = {
-      //     printType: 1,
-      //     productLine: this.customerInfo.productLine,
-      //     reportIdList: MBId,
-      //   };
-      //   console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
-      //   this.$axios
-      //     .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
-      //     .then((response) => {
-      //       //alert(response.status);
-      //       const index = this.list.indexOf(row);
-      //       if (response.status === false) {
-      //         this.$message({
-      //           message: response.message,
-      //           type: "error",
-      //         });
-      //         return;
-      //       } else {
-      //         this.fileQuery.dataname = JSON.stringify(response.item);
-      //         console.log(
-      //           "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-      //             JSON.stringify(this.fileQuery.dataname)
-      //         );
-      //         this.$axios
-      //           .posts(
-      //             "/Handlers/Handler1.ashx?report=menban",
-      //             qs.stringify(this.fileQuery)
-      //           )
-      //           .then((response) => {
-      //             this.printpdf(response); //打印我文件流
-      //           });
-      //          this.getList();
-      //       }
-      //     })
-      //     .catch(() => {});
-      
-      
-      // }
-
-
-    },
-    //作废操作，支持批量操作-门板
-    handleDelete(row) {
-      //批量删除
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否作废" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/newjit/MenBanPackingList/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "作废成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue b/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
deleted file mode 100644
index dff79930..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
+++ /dev/null
@@ -1,875 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <el-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="HostSN">
-                <el-input
-                  v-model="listQuery.HostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <!-- <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="Vin">
-                <el-input
-                  v-model="listQuery.Vin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-         
-          </el-form-item> -->
-
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
-
-          <el-form-item style="margin-top: -20px">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleUpdate()"
-              >打印当前页</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleUpdateall()"
-              >打印全部</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底牌号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode"
-                label="柱护板零件号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode2"
-                label="柱护板零件号2"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosZHB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "1",
-        productLine: "",
-        partType: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        Vin: undefined,
-        HostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        HostSN: undefined,
-        Vin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        HostSN: undefined,
-        Vin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosZHB: {
-      handler(newVal) {
-        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = "1";
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
-      tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 });
-      tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "起始底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "结束底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date); //alert("ifr.src:"+JSON.stringify(ifr.src))
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      if (this.listQuery.HostSN != "") {
-        this.listQuery.HostSN = this.listQuery.HostSN;
-      }
-      if (this.listQuery.Vin != "") {
-        this.listQuery.Vin = this.listQuery.Vin;
-      }
-      //this.listQuery.partType = this.listQuery.partType;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
-
-      console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          response.items.forEach((item) => {
-            if (item.printType == 0) {
-              item.printType = "正常打印";
-            } else if (item.printType == 1) {
-              item.printType = "重打";
-            } else {
-              item.printType = "补打";
-            }
-          });
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        let beginVin1 = this.multipleSelection[0].id;
-        let ZHBId = [beginVin1];
-        var params = {
-          printType: "1",
-          productLine: this.customerInfo.productLine,
-          reportIdList: ZHBId,
-          partType: this.multipleSelection[0].partType,
-          dataResultType: "2",
-        };
-        console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
-          .then((response) => {
-            console.log("柱护版-打印返回的状态：" + response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-
-              debugger
-              let partNum = 0;
-              if(params.partType == "A上C上")
-              {
-                partNum = 1;
-              }
-              else if(params.partType == "B柱下")
-              {
-                partNum = 2;
-              }
-              else if(params.partType == "A柱下A中")
-              {
-                partNum = 3;
-              }
-              else if(params.partType == "B柱上")
-              {
-                partNum = 4;
-              }
-              else if(params.partType == "D柱")
-              {
-                partNum = 5;
-              }
-              else if(params.partType == "后轮上装饰板")
-              {
-                partNum = 6;
-              }
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report="+partNum+"&returnfile=0",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-              this.getList();
-            }
-          })
-          .catch(() => {});
-      }
-      // var ZHBVin1 = [];
-      // ZHBVin1.push(row.id);
-      // let myalert = ""; //声明变量，其变量必须在此声明后使用
-      // this.isEdit = true;
-      // if (this.multipleSelection.length != 1) {
-      //   this.$message({
-      //     message: "重新打印必须选择单行，不能多选！",
-      //     type: "warning",
-      //   });
-      //   return;
-      // } else {
-      //   // //多选
-      //   //  this.$message({
-      //   //   message: "重新打印必须选择单行，不能多选！",
-      //   //   type: "warning",
-      //   //    });
-      //   // return;
-      //   // this.multipleSelection.forEach((element) => {
-      //   //   let id = element.id;
-      //   //   beginVin1.push(id);
-      //   // });
-      //   // myalert = "选中项";
-
-      //   //let beginVin1 = this.multipleSelection[0].id;
-
-      //   let ZHBId = ZHBVin1;
-
-      //   var params = {
-      //     printType: 1,
-      //     productLine: this.customerInfo.productLine,
-      //     reportIdList: ZHBId,
-      //   };
-      //   console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
-      //   this.$axios
-      //     .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
-      //     .then((response) => {
-      //       console.log("柱护版-打印返回的状态：" + response.status);
-      //       const index = this.list.indexOf(row);
-      //       if (response.status === false) {
-      //         this.$message({
-      //           message: response.message,
-      //           type: "error",
-      //         });
-      //         return;
-      //       } else {
-      //         this.fileQuery.dataname = JSON.stringify(response.item);
-      //         console.log(
-      //           "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
-      //             JSON.stringify(this.fileQuery.dataname)
-      //         );
-      //         this.$axios
-      //           .posts(
-      //             "/Handlers/Handler1.ashx?report=zhuhuban",
-      //             qs.stringify(this.fileQuery)
-      //           )
-      //           .then((response) => {
-      //             this.printpdf(response); //打印我文件流
-      //           });
-      //         this.getList();
-      //       }
-      //     })
-      //     .catch(() => {});
-      // }
-    },
-    handleUpdateall(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        debugger;
-        let beginVin1 = this.multipleSelection[0].id;
-        let ZHBId = [beginVin1];
-        var params = {
-          printType: "1",
-          productLine: this.customerInfo.productLine,
-          reportIdList: ZHBId,
-          //partType: this.multipleSelection[0].partType,
-          dataResultType: "1",
-        };
-        console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
-          .then((response) => {
-            console.log("柱护版-打印返回的状态：" + response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=zhuhuban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-              this.getList();
-            }
-          })
-          .catch(() => {});
-      }
-    },
-    //作废操作，支持批量操作-门板
-    handleDelete(row) {
-      //批量删除
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否作废" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/newjit/ZhuHuBanPackingList/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "作废成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
deleted file mode 100644
index f3c7d860..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
+++ /dev/null
@@ -1,891 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <el-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="HostSN">
-                <el-input
-                  v-model="listQuery.HostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <!-- <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="Vin">
-                <el-input
-                  v-model="listQuery.Vin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-           
-          </el-form-item> -->
-
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
-
-          <el-form-item >
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-
-            <el-button
-              class="filter-item"
-              type="danger"
-              icon="el-icon-delete"
-              size="mini"
-              @click="print()"
-              >作废(支持批量)</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底盘号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="vehicleModel_DoorPlankCode"
-                label="车型门板代码"
-              ></el-table-column>
-              <el-table-column
-                prop="topBoxPositionNum"
-                label="上箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="topSAPMaterialNum"
-                label="上箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="topMaterialDescription"
-                label="上箱位 物料描述"
-              ></el-table-column>
-              <el-table-column
-                prop="belowBoxPositionNum"
-                label="下箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowSAPMaterialNum"
-                label="下箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowMaterialDescription "
-                label="下箱位 物料描述"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-    
-    <div>
-      <el-dialog
-        title="作废信息"
-        append-to-body="true"
-        :visible.sync="dialogTableVisible"
-      >
-        <el-table :data="zflist" class="dialogDiv">
-          <el-table-column
-            property="billNum"
-            label="装箱单号"
-            width="105"
-          ></el-table-column>
-          <el-table-column
-            property="billSerialNum"
-            label="单据顺号"
-            width="95"
-          ></el-table-column>
-          <el-table-column
-            property="billLocation"
-            label="左或右"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="providerCode"
-            label="供应商厂家代码"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="partType"
-            label="零件类型"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="capacity"
-            label="器具容量"
-            width="110"
-          ></el-table-column>
-          <el-table-column
-            property="printDate"
-            label="打印日期"
-            width="90"
-          ></el-table-column>
-        </el-table>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="dialogTableVisible = false"
-            >取消</el-button
-          >
-          <el-button type="primary" @click="handleDelete">确 认</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosMB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      dialogTableVisible: false,
-      zflist: null,
-      zuofei: [],
-      getRowKeys:
-      
-      
-      (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        Vin: undefined,
-        HostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        Vin: undefined,
-        HostSN: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        Vin: undefined,
-        HostSN: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosMB: {
-      handler(newVal) {
-        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = element.PrintType;
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 150 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 115 });
-      tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 115 });
-      tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "起始底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "结束底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      if (this.listQuery.Vin != "") {
-        this.listQuery.Vin = this.listQuery.Vin;
-      }
-      if (this.listQuery.HostSN != "") {
-        this.listQuery.HostSN = this.listQuery.HostSN;
-      }
-      this.listQuery.partType = this.listQuery.partType;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
-
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/MenBanPackingList/MenBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          response.items.forEach((item) => {
-            if (item.printType == 0) {
-              item.printType = "正常打印";
-            } else if (item.printType == 1) {
-              item.printType = "重打";
-            } else {
-              item.printType = "补打";
-            }
-          });
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        let Vin1 = this.multipleSelection[0].Vin;
-        var params = {
-          printType: 1,
-          productLine: this.customerInfo.productLine,
-          Vin: Vin1,
-        };
-        console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
-          .then((response) => {
-            //alert(response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=menban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-            }
-          })
-          .catch(() => {});
-      }
-    },
-    print(row) {
-      var params = [];
-      if (row) {
-        //单行
-        params.push(row.id);
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-      }
-      this.zuofei = params;
-
-      this.dialogTableVisible = true;
-      this.$axios
-        .posts("/api/newjit/MenBanPackingList/get-all-del-List", params)
-        .then((response) => {
-          //alert(response.status);
-          const index = this.list.indexOf(row);
-          if (response.status === false) {
-            this.$message({
-              message: response.message,
-              type: "error",
-            });
-            return;
-          } else {
-            this.fileQuery.dataname = JSON.stringify(response);
-            this.zflist = response;
-            console.log(
-              "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-                JSON.stringify(this.fileQuery.dataname)
-            );
-          }
-        })
-        .catch(() => {});
-    },
-
-    //作废详情页确认按钮
-    handleDelete() {
-      //debugger;
-      let params = this.zuofei;
-
-      this.$axios
-        .posts("/api/newjit/MenBanPackingList/scrap", params)
-        .then((response) => {
-          console.log(
-            "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-              JSON.stringify(response)
-          );
-          this.$notify({
-            title: "成功",
-            message: "作废成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.getList();
-        });
-      this.dialogTableVisible = false;
-      
-    },
-
-    //作废操作，支持批量操作-门板
-    // handleDelete(row) {
-    //   //批量删除
-    //   var params = [];
-    //   let myalert = ""; //声明变量，其变量必须在此声明后使用
-    //   let myalertcount = [];
-    //   if (row) {
-    //     //单行
-    //     params.push(row.id);
-    //     myalert = row.name;
-    //   } else {
-    //     //多选
-    //     this.multipleSelection.forEach((element) => {
-    //       let id = element.id;
-    //       params.push(id);
-    //     });
-    //     myalert = "选中项";
-    //   }
-    //   console.log("作废查询参数：" + JSON.stringify(params));
-    //   this.$axios
-    //     .posts("/api/newjit/MenBanPackingList/get-all-del-List", params)
-    //     .then((response) => {
-    //       //alert(response.status);
-    //       const index = this.list.indexOf(row);
-    //       if (response.status === false) {
-    //         this.$message({
-    //           message: response.message,
-    //           type: "error",
-    //         });
-    //         return;
-    //       } else {
-    //         this.fileQuery.dataname = JSON.stringify(response);
-    //         response.forEach((itemsss) => {
-    //           myalertcount.push(itemsss.billNum);
-    //         });
-    //         console.log(
-    //           "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-    //             JSON.stringify(this.fileQuery.dataname)
-    //         );
-    //         this.$confirm(
-    //           "是否作废选中的" + response.length + "条记录?",
-    //           "提示",
-    //           {
-    //             confirmButtonText: "确定",
-    //             cancelButtonText: "取消",
-    //             type: "warning",
-    //           }
-    //         )
-    //           .then(() => {
-    //             this.$axios
-    //               .posts("/api/newjit/MenBanPackingList/scrap", params)
-    //               .then((response) => {
-    //                 const index = this.list.indexOf(row);
-    //                 this.$notify({
-    //                   title: "成功",
-    //                   message: "作废成功",
-    //                   type: "success",
-    //                   duration: 2000,
-    //                 });
-    //                 this.getList();
-    //               });
-    //           })
-    //           .catch(() => {
-    //             this.$message({
-    //               type: "info",
-    //               message: "已取消操作",
-    //             });
-    //           });
-    //       }
-    //     })
-    //     .catch(() => {});
-    // },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-.dialogDiv {
-   max-height:300px;
-   overflow: auto;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue b/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
deleted file mode 100644
index 763acacd..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
+++ /dev/null
@@ -1,889 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <el-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="HostSN">
-                <el-input
-                  v-model="listQuery.HostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <!-- <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="beginVin">
-                <el-input
-                  v-model="listQuery.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endVin">
-                <el-input
-                  v-model="listQuery.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item> -->
-
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
-
-          <el-form-item >
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-
-            <el-button
-              class="filter-item"
-              type="danger"
-              icon="el-icon-delete"
-              size="mini"
-              @click=" print()"
-              >作废(支持批量)</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底牌号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode"
-                label="柱护板零件号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode2"
-                label="柱护板零件号2"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-    <div >
-      <el-dialog
-        title="作废信息"
-        append-to-body="true"
-
-
-        :visible.sync="dialogTableVisible"
-      >
-        <el-table :data="zflist" class="dialogDiv">
-          <el-table-column
-            property="billNum"
-            label="装箱单号"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="billSerialNum"
-            label="单据顺号"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="billLocation"
-            label="左或右"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="providerCode"
-            label="供应商厂家代码"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="partType"
-            label="零件类型"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="capacity"
-            label="器具容量"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="printDate"
-            label="打印日期"
-            width="100"
-          ></el-table-column>
-        </el-table>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="dialogTableVisible = false"
-            >取消</el-button
-          >
-          <el-button type="primary" @click="handleDelete">确 认</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosZHB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      dialogTableVisible: false,
-      zuofei: [],
-      zflist: null,
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "1",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosZHB: {
-      handler(newVal) {
-        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = "1";
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
-      tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 });
-      tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "起始底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "结束底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      alert("ifr.src:" + JSON.stringify(ifr.src));
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      this.listQuery.partType = this.listQuery.partType;
-      this.listQuery.beginVin = this.listQuery.beginVin;
-      this.listQuery.endVin = this.listQuery.endVin;
-      this.listQuery.beginHostSN = this.listQuery.beginHostSN;
-      this.listQuery.endHostSN = this.listQuery.endHostSN;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
-
-      console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          response.items.forEach((item) => {
-            if (item.printType == 0) {
-              item.printType = "正常打印";
-            } else if (item.printType == 1) {
-              item.printType = "重打";
-            } else {
-              item.printType = "补打";
-            }
-          });
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        let beginVin1 = this.multipleSelection[0].beginVin1;
-        let endVin1 = this.multipleSelection[0].endVin1;
-        var params = {
-          printType: "1",
-          productLine: this.customerInfo.productLine,
-          beginVin: beginVin1,
-          endVin: endVin1,
-        };
-        console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
-          .then((response) => {
-            console.log("柱护版-打印返回的状态：" + response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=zhuhuban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-            }
-          })
-          .catch(() => {});
-      }
-    },
-    print(row) {
-      var params = [];
-      if (row) {
-        //单行
-        params.push(row.id);
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-      }
-      this.zuofei = params;
-
-      this.dialogTableVisible = true;
-      this.$axios
-        .posts("/api/newjit/ZhuHuBanPackingList/get-all-del-List", params)
-        .then((response) => {
-          //alert(response.status);
-          const index = this.list.indexOf(row);
-          if (response.status === false) {
-            this.$message({
-              message: response.message,
-              type: "error",
-            });
-            return;
-          } else {
-            this.fileQuery.dataname = JSON.stringify(response);
-            this.zflist = response;
-            console.log(
-              "柱护板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-                JSON.stringify(this.fileQuery.dataname)
-            );
-          }
-        })
-        .catch(() => {});
-    },
-    //作废详情页确认按钮
-    handleDelete() {
-      //debugger;
-      let params = this.zuofei;
-
-      this.$axios
-        .posts("/api/newjit/ZhuHuBanPackingList/scrap", params)
-        .then((response) => {
-          console.log(
-            "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-              JSON.stringify(response)
-          );
-          this.$notify({
-            title: "成功",
-            message: "作废成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.getList();
-        });
-      this.dialogTableVisible = false;
-      
-    },
-    //作废操作，支持批量操作-门板
-    // handleDelete(row) {
-    //   //批量删除
-    //  var params = [];
-    //   let myalert = ""; //声明变量，其变量必须在此声明后使用
-    //   let myalertcount = [];
-    //   if (row) {
-    //     //单行
-    //     params.push(row.id);
-    //     myalert = row.name;
-    //   } else {
-    //     //多选
-    //     this.multipleSelection.forEach((element) => {
-    //       let id = element.id;
-    //       params.push(id);
-    //     });
-    //     myalert = "选中项";
-    //   }
-    //   console.log("作废查询参数：" + JSON.stringify(params));
-    //   this.$axios
-    //     .posts("/api/newjit/ZhuHuBanPackingList/get-all-del-List", params)
-    //     .then((response) => {
-    //       //alert(response.status);
-    //       const index = this.list.indexOf(row);
-    //       if (response.status === false) {
-    //         this.$message({
-    //           message: response.message,
-    //           type: "error",
-    //         });
-    //         return;
-    //       } else {
-    //         this.fileQuery.dataname = JSON.stringify(response);
-    //         response.forEach((itemsss) => {
-    //           myalertcount.push(itemsss.billNum);
-    //         });
-    //         console.log(
-    //           "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-    //             JSON.stringify(this.fileQuery.dataname)
-    //         );
-    //         this.$confirm(
-    //           "是否作废选中的" + response.length + "条记录?",
-    //           "提示",
-    //           {
-    //             confirmButtonText: "确定",
-    //             cancelButtonText: "取消",
-    //             type: "warning",
-    //           }
-    //         )
-    //           .then(() => {
-    //             this.$axios
-    //               .posts("/api/newjit/ZhuHuBanPackingList/scrap", params)
-    //               .then((response) => {
-    //                 const index = this.list.indexOf(row);
-    //                 this.$notify({
-    //                   title: "成功",
-    //                   message: "作废成功",
-    //                   type: "success",
-    //                   duration: 2000,
-    //                 });
-    //                 this.getList();
-    //               });
-    //           })
-    //           .catch(() => {
-    //             this.$message({
-    //               type: "info",
-    //               message: "已取消操作",
-    //             });
-    //           });
-    //       }
-    //     })
-        
-        
-    //     .catch(() => {});
-    // },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-.dialogDiv {
-            max-height:300px;
-            overflow: auto;
-        }
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue b/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
deleted file mode 100644
index be1d22de..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
+++ /dev/null
@@ -1,663 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="beginHostSN">
-                <el-input
-                  v-model="listQuery.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2" style="width: 12px; text-align: center">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endHostSN">
-                <el-input
-                  v-model="listQuery.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="beginVin">
-                <el-input
-                  v-model="listQuery.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2" style="width: 12px; text-align: center">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endVin">
-                <el-input
-                  v-model="listQuery.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-					
-					<el-form-item label="上线日期">
-					  <el-date-picker
-					    v-model="listQuery.onlineTimeValue"
-					    size="small"
-					    style="width: 380px"
-					    value-format="yyyy-MM-dd HH:mm:ss"
-					    type="datetimerange"
-					    :default-time="['00:00:00', '23:59:59']"
-					    range-separator="-"
-					    start-placeholder="开始日期"
-					    end-placeholder="结束日期"
-					  ></el-date-picker>
-					</el-form-item>
-
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleReplenishPrint()"
-              >补打(支持多选)</el-button
-            >
-
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px" sortable="false"></el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-export default {
-  name: "M100Online-budaMB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosMB: {
-      type: Array,
-      default: () => {
-
-        return [];
-      },
-    },
-  },
-  data() {
-
-    return {
-      crmType: "M100Online-MB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        beginVin: undefined,
-        endVin: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosMB: {
-      handler(newVal) {
-
-        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = 2; //2时补打
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 80 });
-      tempsTabs.push({
-        label: "底盘号",
-        prop: "vin",
-        width: 160,
-
-      });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 100,
-
-      });
-      tempsTabs.push({
-        label: "M100上线时间",
-        prop: "onlineTime",
-        width: 150,
-
-      });
-      tempsTabs.push({
-        label: "M100接收时间",
-        prop: "receiveTime",
-        width: 150,
-
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 100,
-
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 100,
-
-      });
-
-      tempsTabs.push({
-        label: "产线",
-        prop: "productLine",
-        width: 80,
-
-      });
-      tempsTabs.push({
-        label: "状态",
-        prop: "billStatus",
-        width: 80,
-
-      });
-
-      tempsTabs.push({
-        label: "备注",
-        prop: "remark",
-        width: 80,
-
-      });
-			tempsTabs.push({
-			  label: "R100上线时间",
-			  prop: "r100OnlineTime",
-			  width: 150,
-			
-			});
-			tempsTabs.push({
-			  label: "R100接收时间",
-			  prop: "r100ReceiveTime",
-			  width: 150,
-			
-			});
-      return tempsTabs;
-    },
-
-
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-		
-		/**
-		 * DataGrid只展开当前行
-		 * @param {Object} row
-		 * @param {Object} rowList
-		 */
-    exChange(row, rowList) {
-      //this.listLoading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-		
-    /**
-		 * 取列表数据
-		 * @param {Object} data
-		 */
-    getList(data) {
-
-      this.listLoading = true;
-			let inputParam = {};
-      if (data != undefined) {
-        inputParam.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        inputParam.SkipCount = (this.page - 1) * 15;
-      }
-      inputParam.vinBegin = this.listQuery.beginVin;
-      inputParam.vinEnd = this.listQuery.endVin;
-      inputParam.hostSNBegin = this.listQuery.beginHostSN;
-      inputParam.hostSNEnd = this.listQuery.endHostSN;
-			
-			if (this.listQuery.onlineTimeValue !== undefined) {
-			  inputParam.onlineTimeBegin = this.listQuery.onlineTimeValue[0];
-			  inputParam.onlineTimeEnd = this.listQuery.onlineTimeValue[1];
-			}
-
-      if (this.customerInfo.productLine != "") {
-        inputParam.productLine = this.customerInfo.productLine;
-      }
-
-      console.log('replenish-print-list方法输入参数：' + JSON.stringify(this.listQuery));
-      this.$axios
-        .gets(
-          "/api/newjit/bill-m100/replenish-print-list",
-          inputParam
-        )
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //补打-门板
-    handleReplenishPrint() {
-
-      this.isEdit = true;
-      if (this.multipleSelection == null || this.multipleSelection.length == 0) {
-        this.$message({
-          message: "请选择要补打的单据！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //补打方法
-        let beginVin1 = this.multipleSelection[0].vin;
-        let endVin1 = this.multipleSelection[this.multipleSelection.length -1].vin;
-        var params = {
-          printType: 2,
-          productLine: this.customerInfo.productLine,
-          beginVin: beginVin1,
-          endVin: endVin1,
-					m100IdList: []
-        };
-				this.multipleSelection.forEach(itm => {
-					params.m100IdList.push(itm.id);
-				});
-				
-        console.log("门板补打输入参数：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
-          .then((response) => {
-
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=menban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-									this.getList(); //刷新列表
-                });
-            }
-          })
-          .catch(() => {});
-      }
-    },
-
-
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-			this.listQuery.OnlineTimeValue = [];
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-
-    /** DataGrid格式化显示字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-
-    /**
-		 * 搜索按钮单击事件
-		 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-		/**
-		 * DataGrid列排序事件（未使用）
-		 * @param {Object} data
-		 */
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-		
-		/**
-		 * DataGrid多选触发事件
-		 * @param {Object} val
-		 */
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 
-		 * DataGrid通过回调控制style 
-		 */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** DataGrid通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-		
-		/**
-		 * DataGrid行单击事件
-		 * @param {Object} row
-		 * @param {Object} column
-		 * @param {Object} event
-		 */
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue b/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
deleted file mode 100644
index 46228707..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
+++ /dev/null
@@ -1,677 +0,0 @@
-<!--补打柱护板-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="beginHostSN">
-                <el-input
-                  v-model="listQuery.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2" style="width: 12px; text-align: center">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endHostSN">
-                <el-input
-                  v-model="listQuery.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="beginVin">
-                <el-input
-                  v-model="listQuery.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2" style="width: 12px; text-align: center">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endVin">
-                <el-input
-                  v-model="listQuery.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-					
-					<el-form-item label="上线日期">
-					  <el-date-picker
-					    v-model="listQuery.onlineTimeValue"
-					    size="small"
-					    style="width: 380px"
-					    value-format="yyyy-MM-dd HH:mm:ss"
-					    type="datetimerange"
-					    :default-time="['00:00:00', '23:59:59']"
-					    range-separator="-"
-					    start-placeholder="开始日期"
-					    end-placeholder="结束日期"
-					  ></el-date-picker>
-					</el-form-item>
-
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleReplenishPrint()"
-              >补打(支持多选)</el-button
-            >
-
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightZHB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px" sortable="false"></el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-export default {
-  name: "M100Online-budaZHB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosZHB: {
-      type: Array,
-      default: () => {
-
-        return [];
-      },
-    },
-  },
-  data() {
-
-    return {
-      crmType: "M100Online-ZHB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        beginVin: undefined,
-        endVin: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightZHB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosZHB: {
-      handler(newVal) {
-				debugger
-        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = 2; //2时补打
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 80 });
-      tempsTabs.push({
-        label: "底盘号",
-        prop: "vin",
-        width: 160,
-
-      });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 100,
-
-      });
-      tempsTabs.push({
-        label: "M100上线时间",
-        prop: "onlineTime",
-        width: 150,
-
-      });
-      tempsTabs.push({
-        label: "M100接收时间",
-        prop: "receiveTime",
-        width: 150,
-
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 100,
-
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 100,
-
-      });
-
-      tempsTabs.push({
-        label: "产线",
-        prop: "productLine",
-        width: 80,
-
-      });
-      tempsTabs.push({
-        label: "柱护板状态",
-        prop: "printBillNum",
-        width: 110,
-
-      });
-
-      tempsTabs.push({
-        label: "备注",
-        prop: "remark",
-        width: 80,
-
-      });
-			tempsTabs.push({
-			  label: "R100上线时间",
-			  prop: "r100OnlineTime",
-			  width: 150,
-			
-			});
-			tempsTabs.push({
-			  label: "R100接收时间",
-			  prop: "r100ReceiveTime",
-			  width: 150,
-			
-			});
-      return tempsTabs;
-    },
-
-
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-		
-		/**
-		 * DataGrid只展开当前行
-		 * @param {Object} row
-		 * @param {Object} rowList
-		 */
-    exChange(row, rowList) {
-      //this.listLoading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-		
-    /**
-		 * 取列表数据
-		 * @param {Object} data
-		 */
-    getList(data) {
-			//debugger
-      this.listLoading = true;
-			let inputParam = {};
-      if (data != undefined) {
-        inputParam.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        inputParam.SkipCount = (this.page - 1) * 15;
-      }
-      inputParam.vinBegin = this.listQuery.beginVin;
-      inputParam.vinEnd = this.listQuery.endVin;
-      inputParam.hostSNBegin = this.listQuery.beginHostSN;
-      inputParam.hostSNEnd = this.listQuery.endHostSN;
-			
-			if (this.listQuery.onlineTimeValue !== undefined) {
-			  inputParam.onlineTimeBegin = this.listQuery.onlineTimeValue[0];
-			  inputParam.onlineTimeEnd = this.listQuery.onlineTimeValue[1];
-			}
-
-      if (this.customerInfo.productLine != "") {
-        inputParam.productLine = this.customerInfo.productLine;
-      }
-
-      console.log('取柱护板补打列表replenish-print-zhb-list方法输入参数：' + JSON.stringify(this.listQuery));
-      this.$axios
-        .gets(
-          "/api/newjit/bill-m100/replenish-print-zhb-list",
-          inputParam
-        )
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //补打-柱护板
-    handleReplenishPrint() {
-			debugger
-      this.isEdit = true;
-      if (this.multipleSelection == null || this.multipleSelection.length == 0) {
-        this.$message({
-          message: "请选择要补打的单据！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //补打方法
-        let beginVin1 = this.multipleSelection[0].vin;
-        let endVin1 = this.multipleSelection[this.multipleSelection.length -1].vin;
-        var params = {
-          printType: 2,
-          productLine: this.customerInfo.productLine,
-          beginVin: beginVin1,
-          endVin: endVin1,
-					m100IdList: []
-        };
-				this.multipleSelection.forEach(itm => {
-					params.m100IdList.push(itm.id);
-				});
-				
-        console.log("柱护板补打输入参数：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
-          .then((response) => {
-
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-							
-              console.log(
-                "柱护板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-							
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=zhuhuban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-									this.getList(); //刷新列表
-                });
-            }
-          })
-          .catch(() => {});
-      }
-    },
-
-
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-			this.listQuery.OnlineTimeValue = [];
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-
-    /** DataGrid格式化显示字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-			if (column.property === "printBillNum") {
-				
-				if (row[column.property] != null && row[column.property].length > 0)
-				{
-					return "柱护板已打印"
-				}
-				else
-				{
-					return "柱护板未打印"
-				}
-			}	
-			
-      if (column.property == "printDate" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-
-    /**
-		 * 搜索按钮单击事件
-		 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-		/**
-		 * DataGrid列排序事件（未使用）
-		 * @param {Object} data
-		 */
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-		
-		/**
-		 * DataGrid多选触发事件
-		 * @param {Object} val
-		 */
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 
-		 * DataGrid通过回调控制style 
-		 */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** DataGrid通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-		
-		/**
-		 * DataGrid行单击事件
-		 * @param {Object} row
-		 * @param {Object} column
-		 * @param {Object} event
-		 */
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/detail.vue b/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/detail.vue
deleted file mode 100644
index 97d3fd13..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/detail.vue
+++ /dev/null
@@ -1,354 +0,0 @@
-<!--M100上线信息-明细数据-->
-<template>
-  <div class="cr-body-content">
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-      :row-key="getRowKeys"
-      :expand-row-keys="expands"
-      @expand-change="exChange"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <!-- <el-table-column
-        prop="总成名称"
-        label="erpAssemblyName"
-        sortable
-        width="180"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="erpAssemblyVersion"
-        label="总成版本号"
-        sortable
-        width="180"
-      >
-              style="width: calc(100% - 47px)"
-            class="two-list"
-      </el-table-column> -->
-
-      <el-table-column type="expand" prop="details">
-        <template slot-scope="scope">
-          <el-table :data="scope.row.details">
-            <el-table-column
-              prop="partCode"
-              label="客户零件代码"
-            ></el-table-column>
-            <el-table-column
-              prop="partNum"
-              label="客户零件数量"
-            ></el-table-column>
-            <el-table-column prop="description" label="描述"></el-table-column>
-            <el-table-column prop="isKey" label="是否Key件">
-              <template slot-scope="scope">
-                <span v-if="scope.row.isKey == true">
-                  <span style="color: #00b46d">是</span>
-                </span>
-                <span v-else>
-                  <span style="color: #d75c89">否</span>
-                </span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="erpAssemblyVersion"
-        label="总成版本号"
-        sortable
-        width="360"
-      >
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import { downloadFile } from "@/utils/crmindex.js";
-import Detail from "./detail";
-
-export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "stockFisDiffReport",
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      expands: [], //只展开一行放入当前行id
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        parentId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        SkipCount: 0,
-        MaxResultCount: 15,
-        id: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 30,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 30;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfos: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.parentId = element.ParentId;
-          });
-          if (this.customerInfo.parentId != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "总成编号",
-        prop: "erpAssemblyCode",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "总成名称",
-        prop: "erpAssemblyName",
-        width: 160,
-      });
-      // tempsTabs.push({
-      //   label: "总成版本号",
-      //   prop: "erpAssemblyName",
-      //   width: 160,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    exChange(row, rowList) {
-      this.loading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList() {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      //alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "partCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 6,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    resetQuery() {},
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue b/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
deleted file mode 100644
index 929265ae..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
+++ /dev/null
@@ -1,765 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <el-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="beginHostSN">
-                <el-input
-                  v-model="listQuery.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endHostSN">
-                <el-input
-                  v-model="listQuery.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="beginVin">
-                <el-input
-                  v-model="listQuery.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endVin">
-                <el-input
-                  v-model="listQuery.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
-
-          <el-form-item style="margin-top: -20px">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleUpdate()"
-              >重打(只支持单选)</el-button
-            >
-            <el-button
-              class="filter-item"
-              type="danger"
-              icon="el-icon-delete"
-              size="mini"
-              @click="handleDelete()"
-              >作废(支持批量)</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底牌号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="vehicleModel_DoorPlankCode"
-                label="车型门板代码"
-              ></el-table-column>
-              <el-table-column
-                prop="topBoxPositionNum"
-                label="上箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="topSAPMaterialNum"
-                label="上箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="topMaterialDescription"
-                label="上箱位 物料描述"
-              ></el-table-column>
-              <el-table-column
-                prop="belowBoxPositionNum"
-                label="下箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowSAPMaterialNum"
-                label="下箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowMaterialDescription "
-                label="下箱位 物料描述"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosMB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosMB: {
-      handler(newVal) {
-        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = element.PrintType;
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "起底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "止底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      this.listQuery.partType = this.listQuery.partType;
-      this.listQuery.beginVin = this.listQuery.beginVin;
-      this.listQuery.endVin = this.listQuery.endVin;
-      this.listQuery.beginHostSN = this.listQuery.beginHostSN;
-      this.listQuery.endHostSN = this.listQuery.endHostSN;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
-
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/MenBanPackingList/MenBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        let beginVin1 = this.multipleSelection[0].beginVin1;
-        let endVin1 = this.multipleSelection[0].endVin1;
-        var params = {
-          printType: 1,
-          productLine: this.customerInfo.productLine,
-          beginVin: beginVin1,
-          endVin: endVin1,
-        };
-        console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
-          .then((response) => {
-            //alert(response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=menban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-            }
-          })
-          .catch(() => {});
-      }
-    },
-    //作废操作，支持批量操作-门板
-    handleDelete(row) {
-      //批量删除
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否作废" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/newjit/MenBanPackingList/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "作废成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue b/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
deleted file mode 100644
index e5c9a3a1..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
+++ /dev/null
@@ -1,746 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <el-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="beginHostSN">
-                <el-input
-                  v-model="listQuery.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endHostSN">
-                <el-input
-                  v-model="listQuery.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="beginVin">
-                <el-input
-                  v-model="listQuery.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endVin">
-                <el-input
-                  v-model="listQuery.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
-
-          <el-form-item style="margin-top: -20px">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleUpdate()"
-              >重打(只支持单选)</el-button
-            >
-            <el-button
-              class="filter-item"
-              type="danger"
-              icon="el-icon-delete"
-              size="mini"
-              @click="handleDelete()"
-              >作废(支持批量)</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底牌号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode"
-                label="柱护板零件号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode2"
-                label="柱护板零件号2"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosZHB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "1",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosZHB: {
-      handler(newVal) {
-        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = "1";
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "起底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "止底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);alert("ifr.src:"+JSON.stringify(ifr.src))
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      this.listQuery.partType = this.listQuery.partType;
-      this.listQuery.beginVin = this.listQuery.beginVin;
-      this.listQuery.endVin = this.listQuery.endVin;
-      this.listQuery.beginHostSN = this.listQuery.beginHostSN;
-      this.listQuery.endHostSN = this.listQuery.endHostSN;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
-
-      console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        let beginVin1 = this.multipleSelection[0].beginVin1;
-        let endVin1 = this.multipleSelection[0].endVin1;
-        var params = {
-          printType: 1,
-          productLine: this.customerInfo.productLine,
-          beginVin: beginVin1,
-          endVin: endVin1,
-        };
-        console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
-          .then((response) => {
-            console.log("柱护版-打印返回的状态：" + response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=zhuhuban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-            }
-          })
-          .catch(() => {});
-      }
-    },
-    //作废操作，支持批量操作-门板
-    handleDelete(row) {
-      //批量删除
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否作废" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/newjit/ZhuHuBanPackingList/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "作废成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/index-old.vue b/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/index-old.vue
deleted file mode 100644
index e9b0e3f4..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/index-old.vue
+++ /dev/null
@@ -1,1641 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <!-- <el-row> -->
-          <el-form-item label="生产线:" prop="productType">
-            <el-select
-              v-model="listQuery.productType"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="ptypeselectChange"
-            >
-              <el-option
-                v-for="item in productTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="" prop="productLine">
-            <el-select
-              v-model="listQuery.productLine"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="valueselectChange"
-            >
-              <el-option
-                v-for="item in PLChildList"
-                :key="item.id"
-                :label="item.productLineName"
-                :value="item.productLineCode"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-collapse accordion>
-            <el-collapse-item>
-              <template slot="title">
-                其他搜索条件(单击折叠或伸展)<i class="header-icon el-icon-info"></i>
-              </template>
-              <el-form-item label="版本:" prop="Version">
-                <el-input
-                  v-model="listQuery.Version"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <!-- </el-row> -->
-              <el-form-item label="流水号:" prop="serialNumBegin">
-                <el-input
-                  v-model="listQuery.serialNumBegin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <el-form-item label="-" prop="serialNumEnd">
-                <el-input
-                  v-model="listQuery.serialNumEnd"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <!-- <el-row> -->
-              <el-form-item label="大众顺序号:" prop="HostSNBegin">
-                <el-input
-                  v-model="listQuery.HostSNBegin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <el-form-item label="-" prop="HostSNEnd">
-                <el-input
-                  v-model="listQuery.HostSNEnd"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-
-              <el-form-item label="KNR:" prop="KNRBegin">
-                <el-input
-                  v-model="listQuery.KNRBegin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <el-form-item label="-" prop="KNREnd">
-                <el-input
-                  v-model="listQuery.KNREnd"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <!-- </el-row> -->
-              <!-- <el-row> -->
-              <el-form-item label="底盘号:" prop="VINBegin">
-                <el-input
-                  v-model="listQuery.VINBegin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <el-form-item label="-" prop="VINEnd">
-                <el-input
-                  v-model="listQuery.VINEnd"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-
-              <el-form-item label="上线日期">
-                <el-date-picker
-                  v-model="listQuery.OnlineTimeValue"
-                  size="small"
-                  style="width: 380px"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetimerange"
-                  range-separator="-"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                ></el-date-picker>
-              </el-form-item>
-              <!-- </el-row> -->
-              <!-- <el-row> -->
-              <el-form-item label="接收日期">
-                <el-date-picker
-                  v-model="listQuery.ReceiveTimeValue"
-                  size="small"
-                  style="width: 380px"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetimerange"
-                  range-separator="-"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                ></el-date-picker>
-              </el-form-item>
-              <el-form-item label="单据状态" prop="State" v-show="isShowState">
-                <el-checkbox-group v-model="listQuery.state">
-                  <el-checkbox
-                    v-for="(item, index) in billState"
-                    :key="item.id"
-                    :label="item.id"
-                    @change="checkedListChange(index)"
-                  >
-                    {{ item.name }}
-                  </el-checkbox>
-                </el-checkbox-group>
-              </el-form-item>
-            </el-collapse-item>
-          </el-collapse>
-          <el-form-item style="margin-top: -10px">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              style="margin-left: 15px"
-              @click="handleDownload()"
-              >导出(Excel)
-            </el-button>
-            <el-button
-              ref="btn1"
-              type="primary"
-              size="mini"
-              style="margin-left: 15px"
-              @click="print()"
-              >打印门板发货排序单
-            </el-button>
-            <el-button
-              ref="btn2"
-              type="primary"
-              size="mini"
-              style="margin-left: 15px"
-              @click="rePrint()"
-              >重新打印门板发货排序单
-            </el-button>
-            <el-button
-              ref="btn3"
-              type="primary"
-              size="mini"
-              style="margin-left: 15px"
-              @click="makeUpPrint()"
-              >补打门板发货排序单
-            </el-button>
-            <!-- margin-left: 550px; -->
-            <el-button
-              type="text"
-              v-show="this.listQuery.productType === 1"
-              @click="drawerMB = true"
-              style="color: #e6a23c; fontweight: bold; font-size: 15pt"
-            >
-              <strong>门板重打和作废</strong></el-button
-            >
-            <el-button
-              type="text"
-              v-show="this.listQuery.productType === 2"
-              @click="drawerZHB = true"
-              style="color: #f56c6c; fontweight: bold; font-size: 15pt"
-              ><strong>柱护板重打和作废</strong></el-button
-            >
-          </el-form-item>
-
-          <!-- </el-row> -->
-        </el-form>
-      </flexbox>
-    </div>
-    <!--门板重打和作废-->
-    <el-drawer
-      title="门板作废和重打"
-      :visible.sync="drawerMB"
-      direction="rtl"
-      size="65%"
-    >
-      <MBDetail v-bind:customerInfosMB="customerInfosMB"></MBDetail>
-    </el-drawer>
-    <!--柱护板重打和作废-->
-    <el-drawer
-      title="柱护板作废和重打"
-      :visible.sync="drawerZHB"
-      direction="rtl"
-      size="65%"
-    >
-      <ZHBDetail v-bind:customerInfosZHB="customerInfosZHB"></ZHBDetail>
-    </el-drawer>
-
-    <div class="l-table" style="margin-top: -30px">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <el-table-column
-          label="底盘号"
-          prop="vin "
-          sortable="custom"
-          align="center"
-          width="180px"
-        >
-          <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.vin
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div>
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        :title="formTitle"
-        width="700px"
-        @close="closeDialog"
-      >
-        <el-form
-          ref="form"
-          :inline="true"
-          :model="form"
-          :rules="rules"
-          size="small"
-          label-width="120px"
-        >
-          <el-row>
-            <el-col :span="24">
-              <el-form-item
-                label="大众顺序号:"
-                prop="beginHostSN"
-                v-show="isShowHostSN"
-              >
-                <el-input
-                  v-model="form.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                />
-                <label class="label1">-</label>
-                <el-input
-                  v-model="form.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="底盘号:" prop="VIN" v-show="isShowVin">
-                <el-input
-                  v-model="form.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                />
-                <label class="label1">-</label>
-                <el-input
-                  v-model="form.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="dialogFormVisible = false"
-            >取消</el-button
-          >
-          <el-button v-loading="formLoading" type="primary" @click="save"
-            >确认</el-button
-          >
-        </div>
-      </el-dialog>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        style="margin-bottom: -5px; float: right"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-        <div>
-          <Detail
-            v-bind:customerInfos="customerInfos"
-            style="margin-top: -35px"
-          ></Detail>
-        </div>
-      </el-drawer>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import MBDetail from "./detailMB.vue";
-import ZHBDetail from "./detailZHB.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "M100Online",
-  components: {
-    Pagination,
-    CRMTableHead,
-    importExcel,
-    Detail,
-    MBDetail,
-    ZHBDetail,
-  },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online",
-      drawerZHB: false,
-      drawerMB: false,
-      activeNames: ["1"],
-      rules: {
-        erpAssemblyName: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      billState: [
-        { id: 2, name: "未打印" },
-        { id: 3, name: "已打印" },
-      ],
-      valueSelect: "",
-      customerInfos: [],
-      customerInfosMB: [],
-      customerInfosZHB: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        productType: 1, //1:门板；2:柱护板
-        ProductLine: undefined,
-        Version: undefined,
-        serialNumBegin: undefined,
-        serialNumEnd: undefined,
-        HostSNBegin: undefined,
-        HostSNEnd: undefined,
-        KNRBegin: undefined,
-        KNREnd: undefined,
-        VINBegin: undefined,
-        VINEnd: undefined,
-        OnlineTimeValue: [],
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-        ReceiveTimeValue: [],
-        ReceiveTimeBegin: undefined,
-        ReceiveTimeEnd: undefined,
-        billStatus: undefined,
-        state: [],
-      },
-      listExportQuery: {
-        erpAssemblyCode: undefined,
-        erpAssemblyName: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      vinPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      PLChildList: [], //筛选后产线下拉
-      productTypeList: [
-        { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
-      ],
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.billState.forEach((element, index) => {
-      if (index === 0) {
-        this.listQuery.state.push(element.id);
-      }
-    });
-    this.getProductLine();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
-      // tempsTabs.push({
-      //   label: "底盘号",
-      //   prop: "vin",
-      //   width: 130,
-      // });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "M100上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "M100接收时间",
-        prop: "receiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100上线时间",
-        prop: "r100OnlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100接收时间",
-        prop: "r100ReceiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "产线",
-        prop: "productLine",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "状态",
-        prop: "billStatus",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "备注",
-        prop: "remark",
-        width: 120,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      //console.log(510)
-      //console.log(param)
-      var parentId = param.assemblyID; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
-      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/newjit/assembly-cfg-erp/export", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-      this.listLoading = false;
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.listQuery.OnlineTimeValue = [];
-      this.listQuery.ReceiveTimeValue = [];
-      this.listQuery.state = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-
-    handleAddDetails() {
-      if (this.form.details === undefined) {
-        this.form.details = [];
-        //console.log(679);
-      }
-      let obj = {};
-      obj.partCode = "";
-      obj.partName = "";
-      obj.partNum = "";
-      obj.isKey = false;
-      obj.description = "";
-
-      //console.log(this.form.details);
-      this.form.details.push(obj);
-      //console.log(688);
-    },
-    handleDeleteDetails(index) {
-      this.form.details.splice(index, 1);
-      //console.log(693);
-    },
-
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.OnlineTimeValue !== undefined) {
-        this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
-        this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
-      }
-      if (this.listQuery.ReceiveTimeValue !== undefined) {
-        this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
-        this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
-      }
-      if (this.listQuery.state !== undefined) {
-        this.listQuery.billStatus = this.listQuery.state[0];
-      }
-      this.$axios
-        .gets("/api/newjit/bill-m100/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    getDetialList(partCode) {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
-        .then((response) => {
-          //console.log(partCode)
-          if (partCode !== "" && partCode !== undefined) {
-            //console.log(partCode)
-            this.list = response.item.details.filter(
-              (u) => u.partCode === partCode
-            );
-          } else {
-            this.list = response.item.details;
-          }
-          //alert(JSON.stringify(response.Items))
-          //this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    valueselectChange(val) {
-      this.$forceUpdate();
-      this.customerInfosMB = [];
-      this.customerInfosZHB = [];
-      if (this.listQuery.productType === 1) {
-        //把产线值传到子组件
-        this.customerInfosMB = [
-          {
-            PrintType: 1,
-            ProductLine: val,
-          },
-        ];
-      }
-      if (this.listQuery.productType === 2) {
-        //把产线值传到子组件
-        this.customerInfosZHB = [
-          {
-            PrintType: 1,
-            ProductLine: val,
-          },
-        ];
-      }
-    },
-    handleImportSAP() {},
-
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-    /**打印 */
-    print() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 0);
-      this.hostPrintQuery.printType = 0;
-      this.vinPrintQuery.printType = 0;
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "warning",
-        });
-        return;
-      }
-      this.hostSNQuery.productLine = this.listQuery.productLine;
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-      //后端服务更改了 前端跟着更改成以下方式
-      if (this.listQuery.productType === 1) {
-        //门板
-        this.hostSNQuery.isZhuHuBan = "0";
-        console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            console.log("获取hostsn大众顺序号起始");
-            console.log(response.item);
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              if (this.listQuery.productType === 1) {
-                //门板
-                this.form.endHostSN = parseInt(response.item) + 11;
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                this.form.endHostSN = parseInt(response.item) + 23;
-              }
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      } else if (this.listQuery.productType === 2) {
-        //柱护板
-        this.hostSNQuery.isZhuHuBan = "1";
-        console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            console.log("获取hostsn大众顺序号起始");
-            console.log(response.item);
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              if (this.listQuery.productType === 1) {
-                //门板
-                this.form.endHostSN = parseInt(response.item) + 11;
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                this.form.endHostSN = parseInt(response.item) + 23;
-              }
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      }
-
-      // this.$axios
-      //   .gets("/api/newjit/bill-m100/get-print-start-hostsn", this.hostSNQuery)
-      //   .then((response) => {
-      //     console.log("获取hostsn大众顺序号起始");
-      //     console.log(response.item);
-      //     if (response.item !== null) {
-      //       this.form.beginHostSN = parseInt(response.item);
-      //       if (this.listQuery.productType === 1) {
-      //         //门板
-      //         this.form.endHostSN = parseInt(response.item) + 11;
-      //       } else if (this.listQuery.productType === 2) {
-      //         //柱护板
-      //         this.form.endHostSN = parseInt(response.item) + 23;
-      //       }
-      //     } else {
-      //       this.$message({
-      //         message: "获取不到大众顺序号",
-      //         type: "warning",
-      //       });
-      //       return;
-      //     }
-      //   })
-      //   .catch(() => {});
-      this.formTitle = "打印";
-      this.dialogFormVisible = true;
-      this.form = {
-        beginHostSN: "",
-        endHostSN: "",
-      };
-      this.isShowHostSN = true;
-      this.isShowVin = false;
-    },
-    /**重打 */
-    rePrint() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 1);
-      this.hostPrintQuery.printType = 1;
-      this.vinPrintQuery.printType = 1;
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "warning",
-        });
-        return;
-      }
-      this.formTitle = "重打";
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-      this.dialogFormVisible = true;
-      this.form = {
-        beginVin: "",
-        endVin: "",
-      };
-      this.isShowHostSN = false;
-      this.isShowVin = true;
-    },
-    /**补打 */
-    makeUpPrint() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 2);
-      this.hostPrintQuery.printType = 2;
-      this.vinPrintQuery.printType = 2;
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "error",
-        });
-        return;
-      }
-      this.formTitle = "补打";
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-      this.dialogFormVisible = true;
-      this.form = {
-        beginVin: "",
-        endVin: "",
-      };
-      this.isShowHostSN = false;
-      this.isShowVin = true;
-    },
-    /**保存*/
-    save() {
-      if (this.isShowHostSN === true) {
-        if (this.form.beginHostSN === "" || this.form.endHostSN === "") {
-          this.$message({
-            message: "请输入完整的顺序号起始范围",
-            type: "error",
-          });
-          return;
-        } else {
-          if (this.listQuery.productType === 1) {
-            //门板
-            if (
-              parseInt(this.form.endHostSN) - parseInt(this.form.beginHostSN) <=
-              0
-            ) {
-              this.$message({
-                message: "起止大众顺序号相减不能为零！",
-                type: "error",
-              });
-              return;
-            }
-          } else if (this.listQuery.productType === 2) {
-            //柱护板
-            if (
-              parseInt(this.form.endHostSN) - parseInt(this.form.beginHostSN) >
-              23
-            ) {
-              this.$message({
-                message:
-                  "最多只能打印24个顺序号，终止顺序号不能大于" +
-                  (parseInt(this.form.beginHostSN) + 23),
-                type: "error",
-              });
-              return;
-            }
-          }
-        }
-      }
-      if (this.isShowVin === true) {
-        if (this.form.beginVin === "" || this.form.endVin === "") {
-          this.$message({
-            message: "请输入完整的底盘号起始范围",
-            type: "error",
-          });
-          return;
-        }
-      }
-      /**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */
-      if (this.formTitle === "打印") {
-        this.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN);
-        this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN);
-        //验证是否断号
-        this.$axios
-          .posts(
-            "/api/newjit/bill-m100/check-hostsn-break-num",
-            this.hostCheckQuery
-          )
-          .then((response) => {
-            console.log("检查hostsn大众顺序号是否断号");
-            console.log(response);
-            if (response.item.length > 0) {
-              this.$confirm("本次打印存在断号是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-              })
-                .then(() => {
-                  //判断productType类型
-                  if (this.listQuery.productType === 1) {
-                    //门板
-                    //传递大众顺序号起止
-                    this.$axios
-                      .posts(
-                        "/api/newjit/bill-m100/print-menban-packing-list",
-                        this.hostPrintQuery
-                      )
-                      .then((response) => {
-                        console.log("打印门板装箱单");
-                        console.log(response);
-                        console.log(response.status);
-                        if (response.status === false) {
-                          this.$message({
-                            message: response.message,
-                            type: "error",
-                          });
-                          return;
-                        } else if (response.status === true) {
-                          //传给grid++接口json数据，得到返回的文件base64
-                          //this.fileQuery.report = "menban";
-                          this.fileQuery.dataname = JSON.stringify(
-                            response.item
-                          );
-                          //this.fileQuery.dataname = "";
-                          console.log("打印json");
-                          console.log(this.fileQuery.dataname);
-                          this.$axios
-                            .posts(
-                              "/Handlers/Handler1.ashx?report=menban",
-                              qs.stringify(this.fileQuery)
-                            )
-                            .then((response) => {
-                              console.log("获取文件base64编码");
-                              console.log(response);
-                              this.printpdf(response); //打印我文件流
-                            });
-                        }
-                      });
-                  } else if (this.listQuery.productType === 2) {
-                    //柱护板
-                    //传递大众顺序号起止
-                    this.$axios
-                      .posts(
-                        "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-                        this.hostPrintQuery
-                      )
-                      .then((response) => {
-                        console.log("打印柱护板装箱单");
-                        console.log(response);
-                        if (response.status === false) {
-                          this.$message({
-                            message: response.message,
-                            type: "error",
-                          });
-                          return;
-                        } else if (response.status === true) {
-                          //传给grid++接口json数据，得到返回的文件base64
-                          //this.fileQuery.report = "menban";
-                          this.fileQuery.dataname = JSON.stringify(
-                            response.item
-                          );
-                          //this.fileQuery.dataname = "";
-                          console.log("打印json");
-                          console.log(this.fileQuery.dataname);
-                          this.$axios
-                            .posts(
-                              "/Handlers/Handler1.ashx?report=zhuhuban",
-                              qs.stringify(this.fileQuery)
-                            )
-                            .then((response) => {
-                              console.log("获取文件base64编码");
-                              console.log(response);
-                              this.printpdf(response); //打印我文件流
-                            });
-                        }
-                      });
-                  }
-                })
-                .catch(() => {});
-            } //无断号
-            else {
-              //判断productType类型
-              if (this.listQuery.productType === 1) {
-                //门板
-                //传递大众顺序号起止
-                this.$axios
-                  .posts(
-                    "/api/newjit/bill-m100/print-menban-packing-list",
-                    this.hostPrintQuery
-                  )
-                  .then((response) => {
-                    console.log("打印门板装箱单");
-                    console.log(response);
-                    if (response.status === false) {
-                      this.$message({
-                        message: response.message,
-                        type: "error",
-                      });
-                      return;
-                    } else if (response.status === true) {
-                      //传给grid++接口json数据，得到返回的文件base64
-                      //this.fileQuery.report = "menban";
-                      this.fileQuery.dataname = JSON.stringify(response.item);
-                      //this.fileQuery.dataname = "";
-                      console.log("打印json");
-                      console.log(this.fileQuery.dataname);
-                      this.$axios
-                        .posts(
-                          "/Handlers/Handler1.ashx?report=menban",
-                          qs.stringify(this.fileQuery)
-                        )
-                        .then((response) => {
-                          console.log("获取文件base64编码");
-                          console.log(response);
-                          this.printpdf(response); //打印我文件流
-                        });
-                    }
-                  })
-                  .catch(() => {
-                    this.$message({
-                      message: response.message,
-                      type: "error",
-                    });
-                    return;
-                  });
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                //传递大众顺序号起止
-                this.$axios
-                  .posts(
-                    "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-                    this.hostPrintQuery
-                  )
-                  .then((response) => {
-                    console.log("打印柱护板装箱单");
-                    console.log(response);
-                    if (response.status === false) {
-                      this.$message({
-                        message: response.message,
-                        type: "error",
-                      });
-                      return;
-                    } else if (response.status === true) {
-                      //传给grid++接口json数据，得到返回的文件base64
-                      //this.fileQuery.report = "menban";
-                      this.fileQuery.dataname = JSON.stringify(response.item);
-                      //this.fileQuery.dataname = "";
-                      console.log("打印json");
-                      console.log(this.fileQuery.dataname);
-                      this.$axios
-                        .posts(
-                          "/Handlers/Handler1.ashx?report=zhuhuban",
-                          qs.stringify(this.fileQuery)
-                        )
-                        .then((response) => {
-                          console.log("获取文件base64编码");
-                          console.log(response);
-                          this.printpdf(response); //打印我文件流
-                        });
-                    }
-                  })
-                  .catch(() => {
-                    this.$message({
-                      message: response.message,
-                      type: "error",
-                    });
-                    return;
-                  });
-              }
-            }
-          });
-      } else {
-        /**接口1获取打印数据，接口2获得grid++模板的base64编码 */
-        this.hostPrintQuery.beginVin = this.form.beginVin;
-        this.hostPrintQuery.endVin = this.form.endVin;
-        //判断productType类型
-        if (this.listQuery.productType === 1) {
-          //门板
-          //传递底盘号起止
-          this.$axios
-            .posts(
-              "/api/newjit/bill-m100/print-menban-packing-list",
-              this.hostPrintQuery
-            )
-            .then((response) => {
-              console.log(
-                "重新或补打打印门板装箱单" + JSON.stringify(this.hostPrintQuery)
-              );
-              console.log(response);
-              if (response.status === false) {
-                this.$message({
-                  message: response.message,
-                  type: "error",
-                });
-                return;
-              } else if (response.status === true) {
-                //传给grid++接口json数据，得到返回的文件base64
-                //this.fileQuery.report = "menban";
-                this.fileQuery.dataname = JSON.stringify(response.item);
-                //this.fileQuery.dataname = "";
-                console.log("打印json");
-                console.log(this.fileQuery.dataname);
-                this.$axios
-                  .posts(
-                    "/Handlers/Handler1.ashx?report=menban",
-                    qs.stringify(this.fileQuery)
-                  )
-                  .then((response) => {
-                    console.log("获取文件base64编码");
-                    console.log(response);
-                    this.printpdf(response); //打印我文件流
-                  });
-              }
-            })
-            .catch(() => {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            });
-        } else if (this.listQuery.productType === 2) {
-          //柱护板
-          //传递底盘号起止
-          this.$axios
-            .posts(
-              "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-              this.hostPrintQuery
-            )
-            .then((response) => {
-              console.log("打印柱护板装箱单");
-              console.log(response);
-              if (response.status === false) {
-                this.$message({
-                  message: response.message,
-                  type: "error",
-                });
-                return;
-              } else if (response.status === true) {
-                //传给grid++接口json数据，得到返回的文件base64
-                //this.fileQuery.report = "zhuhuban";
-                this.fileQuery.dataname = JSON.stringify(response.item);
-                //this.fileQuery.dataname = "";
-                console.log("打印json");
-                console.log(this.fileQuery.dataname);
-                this.$axios
-                  .posts(
-                    "/Handlers/Handler1.ashx?report=zhuhuban",
-                    qs.stringify(this.fileQuery)
-                  )
-                  .then((response) => {
-                    console.log("获取文件base64编码");
-                    console.log(response);
-                    this.printpdf(response); //打印我文件流
-                  });
-              }
-            })
-            .catch(() => {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            });
-        }
-      }
-    },
-    //获取所有产线
-    getProductLine() {
-      this.listPLQuery.UserId = this.userInfo.userId;
-      this.$axios
-        .gets("/api/newjit/product-line/list", this.listPLQuery)
-        .then((response) => {
-          //console.log(response);
-          this.PLList = response.item;
-          this.PLChildList = this.PLList.filter(
-            (u) => u.productType === parseInt(this.listQuery.productType)
-          ).sort((a, b) => {
-            return a.productLineCode - b.productLineCode;
-          });
-          this.listQuery.productLine = this.PLChildList[0].productLineCode;
-          if (this.listQuery.productLine != "") {
-            //把产线值传到子组件
-            this.customerInfosMB = [
-              {
-                PrintType: 1,
-                ProductLine: this.PLChildList[0].productLineCode,
-              },
-            ];
-          }
-          this.getList();
-          //console.log(this.PLList)
-        })
-        .catch(() => {});
-    },
-    //产线类型变更
-    ptypeselectChange() {
-      this.$forceUpdate();
-      //console.log(this.listQuery.productType);
-      this.listQuery.productLine = "";
-      this.PLChildList = this.PLList.filter(
-        (u) => u.productType === parseInt(this.listQuery.productType)
-      ).sort((a, b) => {
-        return a.productLineCode - b.productLineCode;
-      });
-      //console.log(this.PLList)
-      //变更打印按钮文字
-      if (this.listQuery.productType === 1) {
-        this.$refs.btn1.$el.innerText = "打印门板发货排序单";
-        this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
-        this.$refs.btn3.$el.innerText = "补打门板发货排序单";
-        this.listQuery.state.push(this.billState[0].id);
-        this.isShowState = true;
-      } else if (this.listQuery.productType === 2) {
-        this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
-        this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
-        this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
-        this.listQuery.state = [];
-        this.isShowState = false;
-      }
-    },
-    /*单据状态变更 */
-    checkedListChange(index) {
-      if (this.listQuery.state.length <= 1) {
-        this.listQuery.state.push(this.billState[index].id);
-      } else {
-        this.listQuery.state = [];
-        this.listQuery.state.push(this.billState[index].id);
-      }
-    },
-    /**解析文件流 */
-    getUrl() {
-      //dataResult.data是后台返回的流
-      let pdfUrl = window.URL.createObjectURL(
-        new Blob([dataResult.data], { type: `application/pdf` })
-      );
-      const fname = item.name + str + "_" + lists[1] + lists[2]; // 下载文件的名字
-      const link = document.createElement("a");
-      link.href = pdfUrl;
-      link.setAttribute("download", "下载的文件名");
-      document.body.appendChild(link);
-      link.click();
-      document.body.removeChild(link);
-    },
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    httpPost(URL, PARAMS) {
-      var temp = document.createElement("form");
-      temp.action = URL;
-      temp.method = "post";
-      temp.style.display = "none";
-
-      for (var x in PARAMS) {
-        var opt = document.createElement("textarea");
-        opt.name = x;
-        opt.value = PARAMS[x];
-        temp.appendChild(opt);
-      }
-
-      document.body.appendChild(temp);
-      temp.submit();
-
-      return temp;
-    },
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-
-// /*表格全选框去除空框*/
-// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
-//   display: none;
-//   position: relative;
-// }
-// /*表格全选框改为：选择*/
-// .el-table >>> .DisabledSelection .cell:before {
-//   content: "是否Key件";
-//   position: absolute;
-//   left: 7px;
-// }
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/index.vue b/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/index.vue
deleted file mode 100644
index da45289b..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ /dev/null
@@ -1,1682 +0,0 @@
-<!--总成模块信息管理页-->
-
-<!--
-此
-模
-块
-可
-能
-作
-废
--->
-
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <!-- <el-row> -->
-          <el-form-item label="生产线:" prop="productType">
-            <el-select
-              v-model="listQuery.productType"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="ptypeselectChange"
-            >
-              <el-option
-                v-for="item in productTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="" prop="productLine">
-            <el-select
-              v-model="listQuery.productLine"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="valueselectChange"
-            >
-              <el-option
-                v-for="item in PLChildList"
-                :key="item.id"
-                :label="item.productLineName"
-                :value="item.productLineCode"
-              />
-            </el-select>
-          </el-form-item>
-
-          <!-- <el-collapse accordion>
-            <el-collapse-item> -->
-          <!-- <template slot="title">
-                其他搜索条件(单击折叠或伸展)<i class="header-icon el-icon-info"></i>
-              </template> -->
-          <!-- <el-form-item label="版本:" prop="Version">
-                <el-input
-                  v-model="listQuery.Version"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item> -->
-          <!-- </el-row> -->
-          <!-- <el-form-item label="流水号:" prop="serialNumBegin">
-                <el-input
-                  v-model="listQuery.serialNumBegin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item> -->
-          <!-- <el-form-item label="-" prop="serialNumEnd">
-                <el-input
-                  v-model="listQuery.serialNumEnd"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item> -->
-          <!-- <el-row> -->
-          <!-- <el-form-item label="大众顺序号:" prop="HostSNBegin">
-                <el-input
-                  v-model="listQuery.HostSNBegin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <el-form-item label="-" prop="HostSNEnd">
-                <el-input
-                  v-model="listQuery.HostSNEnd"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item> -->
-
-          <!-- <el-form-item label="KNR:" prop="KNRBegin">
-                <el-input
-                  v-model="listQuery.KNRBegin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <el-form-item label="-" prop="KNREnd">
-                <el-input
-                  v-model="listQuery.KNREnd"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item> -->
-          <!-- </el-row> -->
-          <!-- <el-row> -->
-          <!-- <el-form-item label="底盘号:" prop="VINBegin">
-                <el-input
-                  v-model="listQuery.VINBegin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <el-form-item label="-" prop="VINEnd">
-                <el-input
-                  v-model="listQuery.VINEnd"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item> -->
-
-          <!-- <el-form-item label="上线日期">
-                <el-date-picker
-                  v-model="listQuery.OnlineTimeValue"
-                  size="small"
-                  style="width: 380px"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetimerange"
-                  range-separator="-"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                ></el-date-picker>
-              </el-form-item> -->
-          <!-- </el-row> -->
-          <!-- <el-row> -->
-          <!-- <el-form-item label="接收日期">
-                <el-date-picker
-                  v-model="listQuery.ReceiveTimeValue"
-                  size="small"
-                  style="width: 380px"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetimerange"
-                  range-separator="-"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                ></el-date-picker>
-              </el-form-item> -->
-          <!-- <el-form-item label="单据状态" prop="State" v-show="isShowState">
-                <el-checkbox-group v-model="listQuery.state">
-                  <el-checkbox
-                    v-for="(item, index) in billState"
-                    :key="item.id"
-                    :label="item.id"
-                    @change="checkedListChange(index)"
-                  >
-                    {{ item.name }}
-                  </el-checkbox>
-                </el-checkbox-group>
-              </el-form-item> -->
-          <!-- </el-collapse-item>
-          </el-collapse> -->
-          <el-form-item style="margin-top: -5px">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              style="margin-left: 15px"
-              @click="handleDownload()"
-              >导出(Excel)
-            </el-button>
-            <el-button
-              ref="btn1"
-              type="primary"
-              size="mini"
-              style="margin-left: 15px"
-              @click="print()"
-              >打印门板发货排序单
-            </el-button>
-            <el-button
-              ref="btn2"
-              type="primary"
-              size="mini"
-              style="margin-left: 15px"
-              @click="rePrint()"
-              >重新打印门板发货排序单
-            </el-button>
-            <el-button
-              ref="btn3"
-              type="primary"
-              size="mini"
-              style="margin-left: 15px"
-              @click="makeUpPrint()"
-              >补打门板发货排序单
-            </el-button>
-            <el-button
-              ref="btn4"
-              type="primary"
-              v-show="this.listQuery.productType === 1"
-              size="mini"
-              style="margin-left: 15px"
-              @click="drawerMB = true"
-              >门板重打和作废
-            </el-button>
-            <el-button
-              ref="btn5"
-              type="primary"
-              v-show="this.listQuery.productType === 2"
-              size="mini"
-              style="margin-left: 15px"
-              @click="drawerMB = true"
-              >柱护板重打和作废
-            </el-button>
-            <!-- margin-left: 550px; -->
-            <!-- <el-button
-              type="text"
-              v-show="this.listQuery.productType === 1"
-              @click="drawerMB = true"
-              style="color: #e6a23c; fontweight: bold; font-size: 15pt"
-            >
-              <strong>门板重打和作废</strong></el-button
-            > -->
-            <!-- <el-button
-              type="text"
-              v-show="this.listQuery.productType === 2"
-              @click="drawerZHB = true"
-              style="color: #f56c6c; fontweight: bold; font-size: 15pt"
-              ><strong>柱护板重打和作废</strong></el-button
-            > -->
-          </el-form-item>
-
-          <!-- </el-row> -->
-        </el-form>
-      </flexbox>
-    </div>
-    <!--门板重打和作废-->
-    <el-drawer
-      title="门板作废和重打"
-      :visible.sync="drawerMB"
-      direction="rtl"
-      size="65%"
-    >
-      <MBDetail v-bind:customerInfosMB="customerInfosMB"></MBDetail>
-    </el-drawer>
-    <!--柱护板重打和作废-->
-    <el-drawer
-      title="柱护板作废和重打"
-      :visible.sync="drawerZHB"
-      direction="rtl"
-      size="65%"
-    >
-      <ZHBDetail v-bind:customerInfosZHB="customerInfosZHB"></ZHBDetail>
-    </el-drawer>
-
-    <div class="l-table" style="margin-top: -30px">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <el-table-column
-          label="底盘号"
-          prop="vin "
-          sortable="custom"
-          align="center"
-          width="180px"
-        >
-          <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.vin
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div>
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        :title="formTitle"
-        width="700px"
-        @close="closeDialog"
-      >
-        <el-form
-          ref="form"
-          :inline="true"
-          :model="form"
-          :rules="rules"
-          size="small"
-          label-width="120px"
-        >
-          <el-row>
-            <el-col :span="24">
-              <el-form-item
-                label="大众顺序号:"
-                prop="beginHostSN"
-                v-show="isShowHostSN"
-              >
-                <el-input
-                  v-model="form.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                />
-                <label class="label1">-</label>
-                <el-input
-                  v-model="form.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="底盘号:" prop="VIN" v-show="isShowVin">
-                <el-input
-                  v-model="form.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                />
-                <label class="label1">-</label>
-                <el-input
-                  v-model="form.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="dialogFormVisible = false"
-            >取消</el-button
-          >
-          <el-button v-loading="formLoading" type="primary" @click="save"
-            >确认</el-button
-          >
-        </div>
-      </el-dialog>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        style="margin-bottom: -5px; float: right"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-        <div>
-          <Detail
-            v-bind:customerInfos="customerInfos"
-            style="margin-top: -35px"
-          ></Detail>
-        </div>
-      </el-drawer>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import MBDetail from "./detailMB.vue";
-import ZHBDetail from "./detailZHB.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "M100Online",
-  components: {
-    Pagination,
-    CRMTableHead,
-    importExcel,
-    Detail,
-    MBDetail,
-    ZHBDetail,
-  },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online",
-      drawerZHB: false,
-      drawerMB: false,
-      activeNames: ["1"],
-      rules: {
-        erpAssemblyName: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      billState: [
-        { id: 2, name: "未打印" },
-        { id: 3, name: "已打印" },
-      ],
-      valueSelect: "",
-      customerInfos: [],
-      customerInfosMB: [],
-      customerInfosZHB: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        productType: 1, //1:门板；2:柱护板
-        ProductLine: undefined,
-        Version: undefined,
-        serialNumBegin: undefined,
-        serialNumEnd: undefined,
-        HostSNBegin: undefined,
-        HostSNEnd: undefined,
-        KNRBegin: undefined,
-        KNREnd: undefined,
-        VINBegin: undefined,
-        VINEnd: undefined,
-        OnlineTimeValue: [],
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-        ReceiveTimeValue: [],
-        ReceiveTimeBegin: undefined,
-        ReceiveTimeEnd: undefined,
-        billStatus: 1,
-        state: [],
-      },
-      listExportQuery: {
-        erpAssemblyCode: undefined,
-        erpAssemblyName: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      vinPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      PLChildList: [], //筛选后产线下拉
-      productTypeList: [
-        { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
-      ],
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.billState.forEach((element, index) => {
-      if (index === 0) {
-        this.listQuery.state.push(element.id);
-      }
-    });
-    this.getProductLine();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
-      // tempsTabs.push({
-      //   label: "底盘号",
-      //   prop: "vin",
-      //   width: 130,
-      // });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "M100上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "M100接收时间",
-        prop: "receiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100上线时间",
-        prop: "r100OnlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100接收时间",
-        prop: "r100ReceiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "产线",
-        prop: "productLine",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "状态",
-        prop: "billStatus",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "柱护板状态",
-        prop: "billStatus",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "备注",
-        prop: "remark",
-        width: 120,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      //console.log(510)
-      //console.log(param)
-      var parentId = param.assemblyID; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
-      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/newjit/assembly-cfg-erp/export", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-      this.listLoading = false;
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.listQuery.OnlineTimeValue = [];
-      this.listQuery.ReceiveTimeValue = [];
-      this.listQuery.state = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-
-    handleAddDetails() {
-      if (this.form.details === undefined) {
-        this.form.details = [];
-        //console.log(679);
-      }
-      let obj = {};
-      obj.partCode = "";
-      obj.partName = "";
-      obj.partNum = "";
-      obj.isKey = false;
-      obj.description = "";
-
-      //console.log(this.form.details);
-      this.form.details.push(obj);
-      //console.log(688);
-    },
-    handleDeleteDetails(index) {
-      this.form.details.splice(index, 1);
-      //console.log(693);
-    },
-
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.OnlineTimeValue !== undefined) {
-        this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
-        this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
-      }
-      if (this.listQuery.ReceiveTimeValue !== undefined) {
-        this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
-        this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
-      }
-      if (this.listQuery.state == 1) {
-        this.listQuery.billStatus = this.listQuery.state[0];
-      }
-      if (this.listQuery.productType === 2) {
-        this.listQuery.ZHBBillStatus = 2;
-      } else {
-        this.listQuery.ZHBBillStatus = 0;
-      }
-      this.$axios
-        .gets("/api/newjit/bill-m100/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-						debugger
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    getDetialList(partCode) {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
-        .then((response) => {
-          //console.log(partCode)
-          if (partCode !== "" && partCode !== undefined) {
-            //console.log(partCode)
-            this.list = response.item.details.filter(
-              (u) => u.partCode === partCode
-            );
-          } else {
-            this.list = response.item.details;
-          }
-          //alert(JSON.stringify(response.Items))
-          //this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    valueselectChange(val) {
-      this.$forceUpdate();
-      this.customerInfosMB = [];
-      this.customerInfosZHB = [];
-      if (this.listQuery.productType === 1) {
-        //把产线值传到子组件
-        this.customerInfosMB = [
-          {
-            PrintType: 1,
-            ProductLine: val,
-          },
-        ];
-      }
-      if (this.listQuery.productType === 2) {
-        //把产线值传到子组件
-        this.customerInfosZHB = [
-          {
-            PrintType: 1,
-            ProductLine: val,
-          },
-        ];
-      }
-    },
-    handleImportSAP() {},
-
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-    /**打印 */
-    print() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 0);
-      this.hostPrintQuery.printType = 0;
-      this.vinPrintQuery.printType = 0;
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "warning",
-        });
-        return;
-      }
-      this.hostSNQuery.productLine = this.listQuery.productLine;
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-      //后端服务更改了 前端跟着更改成以下方式
-      if (this.listQuery.productType === 1) {
-        //门板
-        this.hostSNQuery.isZhuHuBan = "0";
-        console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            console.log("获取hostsn大众顺序号起始");
-            console.log(response.item);
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              if (this.listQuery.productType === 1) {
-                //门板
-                this.form.endHostSN = parseInt(response.item) + 11;
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                this.form.endHostSN = parseInt(response.item) + 23;
-              }
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      } else if (this.listQuery.productType === 2) {
-        //柱护板
-        this.hostSNQuery.isZhuHuBan = "1";
-        console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            console.log("获取hostsn大众顺序号起始");
-            console.log(response.item);
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              if (this.listQuery.productType === 1) {
-                //门板
-                this.form.endHostSN = parseInt(response.item) + 11;
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                this.form.endHostSN = parseInt(response.item) + 23;
-              }
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      }
-
-      // this.$axios
-      //   .gets("/api/newjit/bill-m100/get-print-start-hostsn", this.hostSNQuery)
-      //   .then((response) => {
-      //     console.log("获取hostsn大众顺序号起始");
-      //     console.log(response.item);
-      //     if (response.item !== null) {
-      //       this.form.beginHostSN = parseInt(response.item);
-      //       if (this.listQuery.productType === 1) {
-      //         //门板
-      //         this.form.endHostSN = parseInt(response.item) + 11;
-      //       } else if (this.listQuery.productType === 2) {
-      //         //柱护板
-      //         this.form.endHostSN = parseInt(response.item) + 23;
-      //       }
-      //     } else {
-      //       this.$message({
-      //         message: "获取不到大众顺序号",
-      //         type: "warning",
-      //       });
-      //       return;
-      //     }
-      //   })
-      //   .catch(() => {});
-      this.formTitle = "打印";
-      this.dialogFormVisible = true;
-      this.form = {
-        beginHostSN: "",
-        endHostSN: "",
-      };
-      this.isShowHostSN = true;
-      this.isShowVin = false;
-    },
-    /**重打 */
-    rePrint() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 1);
-      this.hostPrintQuery.printType = 1;
-      this.vinPrintQuery.printType = 1;
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "warning",
-        });
-        return;
-      }
-      this.formTitle = "重打";
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-      this.dialogFormVisible = true;
-      this.form = {
-        beginVin: "",
-        endVin: "",
-      };
-      this.isShowHostSN = false;
-      this.isShowVin = true;
-    },
-    /**补打 */
-    makeUpPrint() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 2);
-      this.hostPrintQuery.printType = 2;
-      this.vinPrintQuery.printType = 2;
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "error",
-        });
-        return;
-      }
-      this.formTitle = "补打";
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-      this.dialogFormVisible = true;
-      this.form = {
-        beginVin: "",
-        endVin: "",
-      };
-      this.isShowHostSN = false;
-      this.isShowVin = true;
-    },
-    /**保存*/
-    save() {
-      if (this.isShowHostSN === true) {
-        if (this.form.beginHostSN === "" || this.form.endHostSN === "") {
-          this.$message({
-            message: "请输入完整的顺序号起始范围",
-            type: "error",
-          });
-          return;
-        } else {
-          if (this.listQuery.productType === 1) {
-            //门板
-            if (
-              parseInt(this.form.endHostSN) - parseInt(this.form.beginHostSN) <=
-              0
-            ) {
-              this.$message({
-                message: "起止大众顺序号相减不能为零！",
-                type: "error",
-              });
-              return;
-            }
-          } else if (this.listQuery.productType === 2) {
-            //柱护板
-            if (
-              parseInt(this.form.endHostSN) - parseInt(this.form.beginHostSN) >
-              23
-            ) {
-              this.$message({
-                message:
-                  "最多只能打印24个顺序号，终止顺序号不能大于" +
-                  (parseInt(this.form.beginHostSN) + 23),
-                type: "error",
-              });
-              return;
-            }
-          }
-        }
-      }
-      if (this.isShowVin === true) {
-        if (this.form.beginVin === "" || this.form.endVin === "") {
-          this.$message({
-            message: "请输入完整的底盘号起始范围",
-            type: "error",
-          });
-          return;
-        }
-      }
-      /**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */
-      if (this.formTitle === "打印") {
-        this.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN);
-        this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN);
-        //验证是否断号
-        this.$axios
-          .posts(
-            "/api/newjit/bill-m100/check-hostsn-break-num",
-            this.hostCheckQuery
-          )
-          .then((response) => {
-            console.log("检查hostsn大众顺序号是否断号");
-            console.log(response);
-            if (response.item.length > 0) {
-              this.$confirm("本次打印存在断号是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-              })
-                .then(() => {
-                  //判断productType类型
-                  if (this.listQuery.productType === 1) {
-                    //门板
-                    //传递大众顺序号起止
-                    this.$axios
-                      .posts(
-                        "/api/newjit/bill-m100/print-menban-packing-list",
-                        this.hostPrintQuery
-                      )
-                      .then((response) => {
-                        console.log("打印门板装箱单");
-                        console.log(response);
-                        console.log(response.status);
-                        if (response.status === false) {
-                          this.$message({
-                            message: response.message,
-                            type: "error",
-                          });
-                          return;
-                        } else if (response.status === true) {
-                          //传给grid++接口json数据，得到返回的文件base64
-                          //this.fileQuery.report = "menban";
-                          this.fileQuery.dataname = JSON.stringify(
-                            response.item
-                          );
-                          //this.fileQuery.dataname = "";
-                          console.log("打印json");
-                          console.log(this.fileQuery.dataname);
-                          this.$axios
-                            .posts(
-                              "/Handlers/Handler1.ashx?report=menban",
-                              qs.stringify(this.fileQuery)
-                            )
-                            .then((response) => {
-                              console.log("获取文件base64编码");
-                              console.log(response);
-                              this.printpdf(response); //打印我文件流
-                            });
-                        }
-                      });
-                  } else if (this.listQuery.productType === 2) {
-                    //柱护板
-                    //传递大众顺序号起止
-                    this.$axios
-                      .posts(
-                        "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-                        this.hostPrintQuery
-                      )
-                      .then((response) => {
-                        console.log("打印柱护板装箱单");
-                        console.log(response);
-                        if (response.status === false) {
-                          this.$message({
-                            message: response.message,
-                            type: "error",
-                          });
-                          return;
-                        } else if (response.status === true) {
-                          //传给grid++接口json数据，得到返回的文件base64
-                          //this.fileQuery.report = "menban";
-                          this.fileQuery.dataname = JSON.stringify(
-                            response.item
-                          );
-                          //this.fileQuery.dataname = "";
-                          console.log("打印json");
-                          console.log(this.fileQuery.dataname);
-                          this.$axios
-                            .posts(
-                              "/Handlers/Handler1.ashx?report=zhuhuban",
-                              qs.stringify(this.fileQuery)
-                            )
-                            .then((response) => {
-                              console.log("获取文件base64编码");
-                              console.log(response);
-                              this.printpdf(response); //打印我文件流
-                            });
-                        }
-                      });
-                  }
-                })
-                .catch(() => {});
-            } //无断号
-            else {
-              //判断productType类型
-              if (this.listQuery.productType === 1) {
-                //门板
-                //传递大众顺序号起止
-                this.$axios
-                  .posts(
-                    "/api/newjit/bill-m100/print-menban-packing-list",
-                    this.hostPrintQuery
-                  )
-                  .then((response) => {
-                    console.log("打印门板装箱单");
-                    console.log(response);
-                    if (response.status === false) {
-                      this.$message({
-                        message: response.message,
-                        type: "error",
-                      });
-                      return;
-                    } else if (response.status === true) {
-                      //传给grid++接口json数据，得到返回的文件base64
-                      //this.fileQuery.report = "menban";
-                      this.fileQuery.dataname = JSON.stringify(response.item);
-                      //this.fileQuery.dataname = "";
-                      console.log("打印json");
-                      console.log(this.fileQuery.dataname);
-                      this.$axios
-                        .posts(
-                          "/Handlers/Handler1.ashx?report=menban",
-                          qs.stringify(this.fileQuery)
-                        )
-                        .then((response) => {
-                          console.log("获取文件base64编码");
-                          console.log(response);
-                          this.printpdf(response); //打印我文件流
-                        });
-                    }
-                  })
-                  .catch(() => {
-                    this.$message({
-                      message: response.message,
-                      type: "error",
-                    });
-                    return;
-                  });
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                //传递大众顺序号起止
-                this.$axios
-                  .posts(
-                    "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-                    this.hostPrintQuery
-                  )
-                  .then((response) => {
-                    console.log("打印柱护板装箱单");
-                    console.log(response);
-                    if (response.status === false) {
-                      this.$message({
-                        message: response.message,
-                        type: "error",
-                      });
-                      return;
-                    } else if (response.status === true) {
-                      //传给grid++接口json数据，得到返回的文件base64
-                      //this.fileQuery.report = "menban";
-                      this.fileQuery.dataname = JSON.stringify(response.item);
-                      //this.fileQuery.dataname = "";
-                      console.log("打印json");
-                      console.log(this.fileQuery.dataname);
-                      this.$axios
-                        .posts(
-                          "/Handlers/Handler1.ashx?report=zhuhuban",
-                          qs.stringify(this.fileQuery)
-                        )
-                        .then((response) => {
-                          console.log("获取文件base64编码");
-                          console.log(response);
-                          this.printpdf(response); //打印我文件流
-                        });
-                    }
-                  })
-                  .catch(() => {
-                    this.$message({
-                      message: response.message,
-                      type: "error",
-                    });
-                    return;
-                  });
-              }
-            }
-          });
-      } else {
-        /**接口1获取打印数据，接口2获得grid++模板的base64编码 */
-        this.hostPrintQuery.beginVin = this.form.beginVin;
-        this.hostPrintQuery.endVin = this.form.endVin;
-        //判断productType类型
-        if (this.listQuery.productType === 1) {
-          //门板
-          //传递底盘号起止
-          this.$axios
-            .posts(
-              "/api/newjit/bill-m100/print-menban-packing-list",
-              this.hostPrintQuery
-            )
-            .then((response) => {
-              console.log(
-                "重新或补打打印门板装箱单" + JSON.stringify(this.hostPrintQuery)
-              );
-              console.log(response);
-              if (response.status === false) {
-                this.$message({
-                  message: response.message,
-                  type: "error",
-                });
-                return;
-              } else if (response.status === true) {
-                //传给grid++接口json数据，得到返回的文件base64
-                //this.fileQuery.report = "menban";
-                this.fileQuery.dataname = JSON.stringify(response.item);
-                //this.fileQuery.dataname = "";
-                console.log("打印json");
-                console.log(this.fileQuery.dataname);
-                this.$axios
-                  .posts(
-                    "/Handlers/Handler1.ashx?report=menban",
-                    qs.stringify(this.fileQuery)
-                  )
-                  .then((response) => {
-                    console.log("获取文件base64编码");
-                    console.log(response);
-                    this.printpdf(response); //打印我文件流
-                  });
-              }
-            })
-            .catch(() => {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            });
-        } else if (this.listQuery.productType === 2) {
-          //柱护板
-          //传递底盘号起止
-          this.$axios
-            .posts(
-              "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-              this.hostPrintQuery
-            )
-            .then((response) => {
-              console.log("打印柱护板装箱单");
-              console.log(response);
-              if (response.status === false) {
-                this.$message({
-                  message: response.message,
-                  type: "error",
-                });
-                return;
-              } else if (response.status === true) {
-                //传给grid++接口json数据，得到返回的文件base64
-                //this.fileQuery.report = "zhuhuban";
-                this.fileQuery.dataname = JSON.stringify(response.item);
-                //this.fileQuery.dataname = "";
-                console.log("打印json");
-                console.log(this.fileQuery.dataname);
-                this.$axios
-                  .posts(
-                    "/Handlers/Handler1.ashx?report=zhuhuban",
-                    qs.stringify(this.fileQuery)
-                  )
-                  .then((response) => {
-                    console.log("获取文件base64编码");
-                    console.log(response);
-                    this.printpdf(response); //打印我文件流
-                  });
-              }
-            })
-            .catch(() => {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            });
-        }
-      }
-    },
-    //获取所有产线
-    getProductLine() {
-      this.listPLQuery.UserId = this.userInfo.userId;
-      this.$axios
-        .gets("/api/newjit/product-line/list", this.listPLQuery)
-        .then((response) => {
-          //console.log(response);
-          this.PLList = response.item;
-          this.PLChildList = this.PLList.filter(
-            (u) => u.productType === parseInt(this.listQuery.productType)
-          ).sort((a, b) => {
-            return a.productLineCode - b.productLineCode;
-          });
-          this.listQuery.productLine = this.PLChildList[0].productLineCode;
-          if (this.listQuery.productLine != "") {
-            //把产线值传到子组件
-            this.customerInfosMB = [
-              {
-                PrintType: 1,
-                ProductLine: this.PLChildList[0].productLineCode,
-              },
-            ];
-          }
-          this.getList();
-          //console.log(this.PLList)
-        })
-        .catch(() => {});
-    },
-    //产线类型变更
-    ptypeselectChange() {
-      this.$forceUpdate();
-      //console.log(this.listQuery.productType);
-      this.listQuery.productLine = "";
-      this.PLChildList = this.PLList.filter(
-        (u) => u.productType === parseInt(this.listQuery.productType)
-      ).sort((a, b) => {
-        return a.productLineCode - b.productLineCode;
-      });
-      //console.log(this.PLList)
-      //变更打印按钮文字
-      if (this.listQuery.productType === 1) {
-        this.$refs.btn1.$el.innerText = "打印门板发货排序单";
-        this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
-        this.$refs.btn3.$el.innerText = "补打门板发货排序单";
-        this.listQuery.state.push(this.billState[0].id);
-        this.isShowState = true;
-      } else if (this.listQuery.productType === 2) {
-        this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
-        this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
-        this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
-        this.listQuery.state = [];
-        this.isShowState = false;
-      }
-    },
-    /*单据状态变更 */
-    checkedListChange(index) {
-      if (this.listQuery.state.length <= 1) {
-        this.listQuery.state.push(this.billState[index].id);
-      } else {
-        this.listQuery.state = [];
-        this.listQuery.state.push(this.billState[index].id);
-      }
-    },
-    /**解析文件流 */
-    getUrl() {
-      //dataResult.data是后台返回的流
-      let pdfUrl = window.URL.createObjectURL(
-        new Blob([dataResult.data], { type: `application/pdf` })
-      );
-      const fname = item.name + str + "_" + lists[1] + lists[2]; // 下载文件的名字
-      const link = document.createElement("a");
-      link.href = pdfUrl;
-      link.setAttribute("download", "下载的文件名");
-      document.body.appendChild(link);
-      link.click();
-      document.body.removeChild(link);
-    },
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    httpPost(URL, PARAMS) {
-      var temp = document.createElement("form");
-      temp.action = URL;
-      temp.method = "post";
-      temp.style.display = "none";
-
-      for (var x in PARAMS) {
-        var opt = document.createElement("textarea");
-        opt.name = x;
-        opt.value = PARAMS[x];
-        temp.appendChild(opt);
-      }
-
-      document.body.appendChild(temp);
-      temp.submit();
-
-      return temp;
-    },
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-
-// /*表格全选框去除空框*/
-// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
-//   display: none;
-//   position: relative;
-// }
-// /*表格全选框改为：选择*/
-// .el-table >>> .DisabledSelection .cell:before {
-//   content: "是否Key件";
-//   position: absolute;
-//   left: 7px;
-// }
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
deleted file mode 100644
index d92a795f..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ /dev/null
@@ -1,2532 +0,0 @@
-<!--日常打印M100信息模块-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <!-- <el-row> -->
-          <el-form-item label="生产线:" prop="productType">
-            <el-select
-              v-model="listQuery.productType"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="ptypeselectChange"
-            >
-              <el-option
-                v-for="item in productTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="" prop="productLine">
-            <el-select
-              v-model="listQuery.productLine"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="valueselectChange"
-            >
-              <el-option
-                v-for="item in PLChildList"
-                :key="item.id"
-                :label="item.productLineName"
-                :value="item.productLineCode"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              style="margin-left: 15px"
-              @click="handleDownload()"
-              >导出(Excel)
-            </el-button>
-            <el-button
-              ref="btn1"
-              type="primary"
-              size="mini"
-              style="margin-left: 15px"
-              @click="print()"
-              >打印门板发货排序单
-            </el-button>
-            <el-button
-              v-show="this.listQuery.productType === 1"
-              @click="drawerMBPrint = true"
-              size="mini"
-              type="warning"
-              plain
-            >
-              <strong>重新打印门板</strong></el-button
-            >
-            <el-button
-              v-show="this.listQuery.productType === 1"
-              @click="drawerbudaMBPrint = true"
-              size="mini"
-              type="warning"
-              plain
-            >
-              <strong>门板补打</strong></el-button
-            >
-            <el-button
-              v-show="this.listQuery.productType === 1"
-              @click="drawerMBDelete = true"
-              size="mini"
-              type="danger"
-              plain
-              ><strong>门板作废</strong></el-button
-            >
-
-            <el-button
-              v-show="this.listQuery.productType === 2"
-              @click="drawerZHBPrint = true"
-              size="mini"
-              type="warning"
-              plain
-            >
-              <strong>重新打印柱护板</strong></el-button
-            >
-						
-						
-						<el-button
-							v-show="this.listQuery.productType === 2"
-							@click="drawerbudaZHBPrint = true"
-							size="mini"
-							type="warning"
-							plain
-						>
-							<strong>柱护板补打</strong></el-button
-						>
-						
-						
-            <el-button
-              v-show="this.listQuery.productType === 2"
-              @click="drawerZHBDelete = true"
-              size="mini"
-              type="danger"
-              plain
-              ><strong>柱护板作废</strong></el-button
-            >
-            <!-- <el-button icon="el-icon-refresh" size="mini" @click="open()"
-              >测试</el-button
-            >2Z
-            <el-button plain @click="open"> 不会自动关闭 </el-button> -->
-          </el-form-item>
-          <el-form-item>
-            <div id="app">
-              <div
-                style="
-                  border: solid 1px darkgray;
-                  border-radius: 5px;
-                  margin: 5px;
-                  padding: 5px;
-                "
-              >
-                <span ref="sp01">{{ content01 }}</span>
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                <span ref="sp05">{{ content05 }}</span>
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                <span ref="sp07">{{ content07 }}</span>
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                <span ref="sp08">{{ content08 }}</span>
-              </div>
-            </div>
-          </el-form-item>
-
-          <!-- </el-row> -->
-        </el-form>
-      </flexbox>
-    </div>
-    <!--门板重打-->
-    <el-drawer
-      title="门板重新打印"
-      :visible.sync="drawerMBPrint"
-      direction="rtl"
-      size="65%"
-    >
-      <RepetitionMB v-bind:customerInfosMB="customerInfosMB"></RepetitionMB>
-    </el-drawer>
-    <!--门板补打-->
-    <el-drawer
-      title="门板补打"
-      :visible.sync="drawerbudaMBPrint"
-      direction="rtl"
-      size="65%"
-    >
-      <budaMB v-bind:customerInfosMB="customerInfosMB"></budaMB>
-    </el-drawer>
-    <!--门板作废-->
-    <el-drawer
-      title="门板作废"
-      :visible.sync="drawerMBDelete"
-      direction="rtl"
-      @open="opens()"
-      size="65%"
-    >
-      <ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB>
-    </el-drawer>
-    <!--柱护板重打-->
-    <el-drawer
-      title="柱护板重新打印"
-      :visible.sync="drawerZHBPrint"
-      direction="rtl"
-      size="65%"
-    >
-      <RepetitionZHB v-bind:customerInfosZHB="customerInfosZHB"></RepetitionZHB>
-    </el-drawer>
-		
-		
-		<!--柱护板补打-->
-		<el-drawer
-		  title="柱护板补打"
-		  :visible.sync="drawerbudaZHBPrint"
-		  direction="rtl"
-		  size="65%"
-		>
-		  <budaZHB v-bind:customerInfosZHB="customerInfosZHB"></budaZHB>
-		</el-drawer>
-		
-		
-		
-    <!--柱护板重打和作废-->
-    <el-drawer
-      title="柱护板作废"
-      :visible.sync="drawerZHBDelete"
-      direction="rtl"
-      size="65%"
-    >
-      <ScrapZHB v-bind:customerInfosZHB="customerInfosZHB"></ScrapZHB>
-    </el-drawer>
-
-    <div class="l-table" style="margin-top: -10px">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <el-table-column
-          label="底盘号"
-          prop="vin "
-          sortable="custom"
-          align="center"
-          width="180px"
-        >
-          <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.vin
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div>
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        :title="formTitle"
-        width="700px"
-        @close="closeDialog"
-      >
-        <el-form
-          ref="form"
-          :inline="true"
-          :model="form"
-          :rules="rules"
-          size="small"
-          label-width="120px"
-        >
-          <el-row>
-            <el-col :span="24">
-              <el-row>
-                <el-col :md="10" :xs="24">
-                  <el-form-item
-                    label="要打印数量:"
-                    prop="printNum"
-                    v-show="this.listQuery.productType === 1"
-                  >
-                    <el-input-number
-                      v-model="printNum"
-                      :min="1"
-                      :step="1"
-                      @change="valueNumChange"
-                    ></el-input-number>
-                  </el-form-item>
-                </el-col>
-                <el-col :md="10" :xs="24">
-                  <el-form-item
-                    label="产线:"
-                    prop="printNum"
-                    v-show="this.listQuery.productType === 1"
-                  >
-                    {{ this.productName }}
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-row>
-                  <el-col :md="10" :xs="24">
-                    <el-form-item
-                      label="要打印数量:"
-                      prop="printNumZHB"
-                      v-show="this.listQuery.productType === 2"
-                    >
-                      <el-input-number
-                        v-model="printNumZHB"
-                        :min="1"
-                        :step="1"
-                        @change="valueNumChangeZHB"
-                      ></el-input-number>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :md="10" :xs="24">
-                    <el-form-item
-                      label="产线:"
-                      v-show="this.listQuery.productType === 2"
-                    >
-                      {{ this.productName }}
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-              </el-row>
-              <el-form-item
-                label="大众顺序号:"
-                prop="beginHostSN"
-                v-show="isShowHostSN"
-              >
-                <el-input
-                  v-model.number="form.beginHostSN"
-                  placeholder=""
-                  clearable
-                  type="number"
-                  size="small"
-                  style="width: 240px"
-                  @change="beginHostSNChange"
-                />
-                <label class="label1">-</label>
-                <el-input
-                  v-model="form.endHostSN"
-                  placeholder=""
-                  clearable
-                  :disabled="true"
-                  size="small"
-                  style="width: 240px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="底盘号:" prop="VIN" v-show="isShowVin">
-                <el-input
-                  v-model="form.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                />
-                <label class="label1">-</label>
-                <el-input
-                  v-model="form.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="dialogFormVisible = false"
-            >取消</el-button
-          >
-          <el-button
-            v-loading="formLoading"
-            type="primary"
-            :disabled="isDisable"
-            @click="save"
-            v-debounce="debounceClick"
-            >确认</el-button
-          >
-        </div>
-      </el-dialog>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        style="margin-bottom: -5px; float: right"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-        <div>
-          <Detail
-            v-bind:customerInfos="customerInfos"
-            style="margin-top: -35px"
-          ></Detail>
-        </div>
-      </el-drawer>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import MBDetail from "./detailMB.vue";
-import ZHBDetail from "./detailZHB.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-import RepetitionMB from "./RepetitionMB.vue";
-import budaMB from "./budaMB.vue";
-import budaZHB from "./budaZHB.vue";
-import RepetitionZHB from "./RepetitionZHB.vue";
-import ScrapMB from "./ScrapMB.vue";
-import ScrapZHB from "./ScrapZHB.vue";
-import { forEach } from "jszip/lib/object";
-
-export default {
-  name: "M100Online",
-  components: {
-    Pagination,
-    CRMTableHead,
-    importExcel,
-    Detail,
-    MBDetail,
-    ZHBDetail,
-    RepetitionMB,
-    RepetitionZHB,
-    ScrapMB,
-    ScrapZHB,
-    budaMB,
-		budaZHB
-  },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      content01: "",
-      content05: "",
-      content07: "",
-      content08: "",
-      // minute01: this.timeoutMinutes,
-      // minute05: this.timeoutMinutes,
-      // lastTime01: "14:00",
-      // lastTime05: "14:40",
-      crmType: "M100Online",
-      //productLineList:null,
-      isDisable: false,
-      drawerMBPrint: false,
-      drawerbudaMBPrint: false,
-			drawerbudaZHBPrint: false, //显示补打柱护板
-      drawerMBDelete: false,
-      drawerZHBPrint: false,
-      drawerZHBDelete: false,
-      activeNames: ["1"],
-      printNum: "12",
-      printNumZHB: "24",
-      rules: {
-        erpAssemblyName: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-        beginHostSN: [
-          { required: true, message: "必须输入数字！", trigger: "number" },
-        ],
-      },
-      billState: [
-        { id: 2, name: "未打印" },
-        { id: 3, name: "已打印" },
-      ],
-      valueSelect: "",
-      productName: "",
-      customerInfos: [],
-      customerInfosMB: [],
-      customerInfosZHB: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: false,
-      listLoaddingPrint: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        productType: 1, //1:门板；2:柱护板
-        ProductLine: undefined,
-        Version: undefined,
-        printBillNum: undefined,
-        serialNumBegin: undefined,
-        serialNumEnd: undefined,
-        HostSNBegin: undefined,
-        HostSNEnd: undefined,
-        KNRBegin: undefined,
-        KNREnd: undefined,
-        VINBegin: undefined,
-        VINEnd: undefined,
-        OnlineTimeValue: [],
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-        ReceiveTimeValue: [],
-        ReceiveTimeBegin: undefined,
-        ReceiveTimeEnd: undefined,
-        billStatus: undefined,
-        state: [],
-      },
-      listQueryList: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        ProductLine: undefined,
-        BillStatus: undefined,
-        CanNotPrint: false,
-        ZHBBillStatus: undefined,
-      },
-      listExportQuery: {
-        erpAssemblyCode: undefined,
-        erpAssemblyName: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      vinPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false, //关闭窗口
-      tableHeight: document.documentElement.clientHeight - 335,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      PLChildList: [], //筛选后产线下拉
-      productTypeList: [
-        { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
-      ],
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 67 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-
-    let timer = setInterval(() => {
-      this.open();
-    }, 5000);
-  },
-  created() {
-    this.billState.forEach((element, index) => {
-      if (index === 0) {
-        this.listQuery.state.push(element.id);
-      }
-    });
-    this.getProductLine();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
-      // tempsTabs.push({
-      //   label: "底盘号",
-      //   prop: "vin",
-      //   width: 130,
-      // });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "M100上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "M100接收时间",
-        prop: "receiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100上线时间",
-        prop: "r100OnlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100接收时间",
-        prop: "r100ReceiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "产线",
-        prop: "productLine",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "状态",
-        prop: "billStatus",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "柱护板状态",
-        prop: "printBillNum",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "备注",
-        prop: "remark",
-        width: 120,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    opens() {
-
-      this.getList();
-    },
-    open() {
-      // let productLineList = [];
-      // //console.log("门版-主界面传过来的值：11111111111111111111111111111111111111111" );
-      // productLineList.forEach(element => {
-      //   element=this.listQuery.productLine;
-      // });
-
-      //let productLineList = { productLineList: [this.listQuery.productLine] };
-      this.$refs.sp01.Visible = false;
-      this.$refs.sp05.Visible = false;
-      this.$refs.sp07.Visible = false;
-      this.$refs.sp08.Visible = false;
-
-      let productLineListMain = { productLineList: [] };
-
-      this.PLChildList.forEach((itm) => {
-        productLineListMain.productLineList.push(itm.productLineCode);
-      });
-
-      console.log(
-        "门版-主界面传过来的值：" + JSON.stringify(productLineListMain)
-      );
-      this.$axios
-        .posts(
-          "/api/newjit/bill-m100/product-line-timeout-remind",
-          productLineListMain
-        )
-        .then((response) => {
-          if (response.status == false) {
-            this.$message({
-              message: response.message,
-              type: "warning",
-            });
-            return;
-          } else {
-            console.log(
-              "超时提醒-接口传过来的值：" + JSON.stringify(response.item)
-            );
-
-            if (response.item !== null) {
-              response.item.forEach((JKITEM) => {
-                if (JKITEM.productLine == "01") {
-                  this.$refs.sp01.Visible = true;
-                  this.content01 =
-                    "01生产线已经" +
-                    JKITEM.timeoutMinutes +
-                    "分钟没收到报文\xa0\xa0\xa0\xa0";
-                  if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
-                    //写提示信息
-                    console.log(
-                      "222222222222222222222222222222222222222222222222"
-                    );
-                    this.$refs.sp01.style.color = "red";
-                    this.$refs.sp01.style.fontWeight = "bold";
-                  } else {
-                    this.$refs.sp01.style.color = "green";
-                  }
-                }
-                if (JKITEM.productLine == "05") {
-                  this.$refs.sp05.Visible = true;
-                  this.content05 =
-                    "05生产线已经" +
-                    JKITEM.timeoutMinutes +
-                    "分钟没收到报文\xa0\xa0\xa0\xa0";
-                  if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
-                    //写提示信息
-                    console.log(
-                      "222222222222222222222222222222222222222222222222"
-                    );
-                    this.$refs.sp05.style.color = "red";
-                    this.$refs.sp05.style.fontWeight = "bold";
-                  } else {
-                    this.$refs.sp05.style.color = "green";
-                  }
-                }
-                if (JKITEM.productLine == "07") {
-                  this.$refs.sp07.Visible = true;
-                  this.content07 =
-                    "07生产线已经" +
-                    JKITEM.timeoutMinutes +
-                    "分钟没收到报文\xa0\xa0\xa0\xa0";
-                  if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
-                    //写提示信息
-                    console.log(
-                      "222222222222222222222222222222222222222222222222"
-                    );
-                    this.$refs.sp07.style.color = "red";
-                    this.$refs.sp07.style.fontWeight = "bold";
-                  } else {
-                    this.$refs.sp07.style.color = "green";
-                  }
-                }
-                if (JKITEM.productLine == "08") {
-                  this.$refs.sp08.Visible = true;
-                  this.content08 =
-                    JKITEM.productLine +
-                    "生产线已经" +
-                    JKITEM.timeoutMinutes +
-                    "分钟没收到报文";
-                  if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
-                    //写提示信息
-                    console.log(
-                      "222222222222222222222222222222222222222222222222"
-                    );
-                    this.$refs.sp08.style.color = "red";
-                    this.$refs.sp08.style.fontWeight = "bold";
-                  } else {
-                    this.$refs.sp08.style.color = "green";
-                  }
-                }
-              });
-            } else {
-              this.$message({
-                message: "获取接口数据",
-                type: "warning",
-              });
-              return;
-            }
-          }
-        });
-    },
-    debounceClick() {
-      console.log("2秒内点击无数次，都只会触发一次");
-    },
-    //大众顺序号起止事件改变
-    beginHostSNChange(val) {
-      if (this.listQuery.productType === 1) {
-        this.form.endHostSN =
-          parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1;
-      } else if (this.listQuery.productType === 2) {
-        this.form.endHostSN =
-          parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
-      }
-    },
-    //门板打印数量更改
-    valueNumChange(val) {
-      this.printNum = val;
-      if (val == 12) {
-        //默认值是12
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              //门板
-              this.form.endHostSN = parseInt(response.item) + 11;
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      } else {
-        //起止顺序号默认数量不为12
-        this.form.endHostSN =
-          parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1;
-      }
-      // this.$axios
-      //   .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery)
-      //   .then((response) => {
-      //     if (response.item !== null) {
-      //       this.form.beginHostSN = parseInt(response.item);
-      //       if (val == 12) {
-      //         //门板
-      //         this.form.endHostSN = parseInt(response.item) + 11;
-      //       } else {
-      //         this.form.endHostSN =
-      //           parseInt(response.item) + parseInt(this.printNum) - 1;
-      //       }
-      //     } else {
-      //       this.$message({
-      //         message: "获取不到大众顺序号",
-      //         type: "warning",
-      //       });
-      //       return;
-      //     }
-      //   });
-    },
-    //柱护板打印更改
-    valueNumChangeZHB(val) {
-      this.printNumZHB = val;
-      if (val == 12) {
-        //默认值是12
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              //门板
-              this.form.endHostSN = parseInt(response.item) + 11;
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      } else {
-        //起止顺序号默认数量不为12
-        this.form.endHostSN =
-          parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
-      }
-      // this.$axios
-      //   .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery)
-      //   .then((response) => {
-      //     if (response.item !== null) {
-      //       this.form.beginHostSN = parseInt(response.item);
-      //       if (val == 24) {
-      //         //柱护板
-      //         this.form.endHostSN = parseInt(response.item) + 23;
-      //       } else {
-      //         this.form.endHostSN =
-      //           parseInt(response.item) + this.printNumZHB - 1;
-      //       }
-      //     } else {
-      //       this.$message({
-      //         message: "获取不到大众顺序号",
-      //         type: "warning",
-      //       });
-      //       return;
-      //     }
-      //   });
-    },
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      //console.log(510)
-      //console.log(param)
-      var parentId = param.assemblyID; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
-      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/newjit/assembly-cfg-erp/export", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-      this.listLoading = false;
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.listQuery.OnlineTimeValue = [];
-      this.listQuery.ReceiveTimeValue = [];
-      this.listQuery.state = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-
-    handleAddDetails() {
-      if (this.form.details === undefined) {
-        this.form.details = [];
-        //console.log(679);
-      }
-      let obj = {};
-      obj.partCode = "";
-      obj.partName = "";
-      obj.partNum = "";
-      obj.isKey = false;
-      obj.description = "";
-
-      //console.log(this.form.details);
-      this.form.details.push(obj);
-      //console.log(688);
-    },
-    handleDeleteDetails(index) {
-      this.form.details.splice(index, 1);
-      //console.log(693);
-    },
-
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property === "zHBBillStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQueryList.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQueryList.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.productType === 2) {
-        this.listQueryList.ZHBBillStatus = 2;
-      } else {
-        this.listQueryList.ZHBBillStatus = 0;
-      }
-      if (this.listQuery.productType === 2) {
-        this.listQuery.ZHBBillStatus = 2;
-      } else {
-        this.listQuery.ZHBBillStatus = 0;
-      }
-      this.listQueryList.BillStatus = 2; //状态
-      this.listQueryList.ProductLine = this.listQuery.productLine; //产线
-      this.listQueryList.CanNotPrint = false; //不可打印
-      console.log(
-        "日常打印M100查询条件：" + JSON.stringify(this.listQueryList)
-      );
-      //this.click();
-      this.$axios
-        .gets("/api/newjit/bill-m100/list", this.listQueryList)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    getDetialList(partCode) {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
-        .then((response) => {
-          //console.log(partCode)
-          if (partCode !== "" && partCode !== undefined) {
-            //console.log(partCode)
-            this.list = response.item.details.filter(
-              (u) => u.partCode === partCode
-            );
-          } else {
-            this.list = response.item.details;
-          }
-          //alert(JSON.stringify(response.Items))
-          //this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    valueselectChange(val) {
-      this.$forceUpdate();
-      this.customerInfosMB = [];
-      this.customerInfosZHB = [];
-      if (this.listQuery.productType === 1) {
-        //把产线值传到子组件
-        this.customerInfosMB = [
-          {
-            PrintType: 1,
-            ProductLine: val,
-          },
-        ];
-      }
-      if (this.listQuery.productType === 2) {
-        //把产线值传到子组件
-        this.customerInfosZHB = [
-          {
-            PrintType: 1,
-            ProductLine: val,
-          },
-        ];
-      }
-    },
-    handleImportSAP() {},
-
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-    /**打印 */
-    print() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 0);
-      this.hostPrintQuery.printType = 0;
-      this.vinPrintQuery.printType = 0;
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "warning",
-        });
-        return;
-      }
-      (this.printNum = "12"),
-        (this.printNumZHB = "24"),
-        (this.hostSNQuery.productLine = this.listQuery.productLine);
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-      //后端服务更改了 前端跟着更改成以下方式
-      if (this.listQuery.productType === 1) {
-        //门板
-        this.hostSNQuery.isZhuHuBan = "0";
-        console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            console.log("获取hostsn大众顺序号起始");
-            console.log(response.item);
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              if (this.listQuery.productType === 1) {
-                this.form.endHostSN = parseInt(response.item) + 11;
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                this.form.endHostSN = parseInt(response.item) + 23;
-              }
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      } else if (this.listQuery.productType === 2) {
-        //柱护板
-        this.hostSNQuery.isZhuHuBan = "1";
-        console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
-
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            console.log("获取hostsn大众顺序号起始");
-            console.log(response.item);
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              if (this.listQuery.productType === 1) {
-                //门板
-                this.form.endHostSN = parseInt(response.item) + 11;
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                this.form.endHostSN = parseInt(response.item) + 23;
-              }
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      }
-      if (this.$refs.btn1.$el.innerText === "打印门板发货排序单") {
-        this.productName = "";
-        switch (this.listQuery.productLine) {
-          case "01":
-            this.productName = "总装-01";
-            break;
-          case "05":
-            this.productName = "总装-05";
-            break;
-          case "07":
-            this.productName = "总装-07";
-            break;
-          case "08":
-            this.productName = "总装-08";
-            break;
-        }
-
-        this.formTitle = "打印-门板发货排序单";
-      } else {
-        this.productName = "";
-        switch (this.listQuery.productLine) {
-          case "08":
-            this.productName = "总装-柱护板";
-            break;
-        }
-        this.formTitle = "打印-柱护板发货排序单";
-      }
-      //this.formTitle = "打印";
-      this.dialogFormVisible = true;
-      this.form = {
-        beginHostSN: "",
-        endHostSN: "",
-      };
-      this.isShowHostSN = true;
-      this.isShowVin = false;
-    },
-    /**重打 */
-    rePrint() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 1);
-      this.hostPrintQuery.printType = 1;
-      this.vinPrintQuery.printType = 1;
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "warning",
-        });
-        return;
-      }
-      this.formTitle = "重打";
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-      this.dialogFormVisible = true;
-      this.form = {
-        beginVin: "",
-        endVin: "",
-      };
-      this.isShowHostSN = false;
-      this.isShowVin = true;
-    },
-    /**补打 */
-    makeUpPrint() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 2);
-      this.hostPrintQuery.printType = 2;
-      this.vinPrintQuery.printType = 2;
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "error",
-        });
-        return;
-      }
-      this.formTitle = "补打";
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-      this.dialogFormVisible = true;
-      this.form = {
-        beginVin: "",
-        endVin: "",
-      };
-      this.isShowHostSN = false;
-      this.isShowVin = true;
-    },
-    save() {
-      this.$refs.form.validate((valid) => {
-        
-        if (valid) {
-          //this.listLoaddingPrint = true;
-          if (this.isShowHostSN === true) {
-            if (this.form.beginHostSN === "" || this.form.endHostSN === "") {
-              this.$message({
-                message: "请输入完整的顺序号起始范围",
-                type: "error",
-              });
-              return;
-            } else {
-              if (this.listQuery.productType === 1) {
-                //门板
-                if (
-                  parseInt(this.form.endHostSN) -
-                    parseInt(this.form.beginHostSN) <=
-                  0
-                ) {
-                  this.$message({
-                    message: "起止大众顺序号相减不能为零！",
-                    type: "error",
-                  });
-                  return;
-                }
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                if (
-                  parseInt(this.form.endHostSN) -
-                    parseInt(this.form.beginHostSN) >
-                  23
-                ) {
-                  this.$message({
-                    message:
-                      "最多只能打印24个顺序号，终止顺序号不能大于" +
-                      (parseInt(this.form.beginHostSN) + 23),
-                    type: "error",
-                  });
-                  return;
-                }
-              }
-            }
-          }
-          if (this.isShowVin === true) {
-            if (this.form.beginVin === "" || this.form.endVin === "") {
-              this.$message({
-                message: "请输入完整的底盘号起始范围",
-                type: "error",
-              });
-              return;
-            }
-          }
-          /**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */
-          if (
-            this.formTitle === "打印-门板发货排序单" ||
-            this.formTitle === "打印-柱护板发货排序单"
-          ) {
-            this.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN);
-            this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN);
-
-            if (this.listQuery.productType === 1) {
-              //柱护板-打印
-              this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
-              this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
-              this.hostCheckQuery.productLine = this.listQuery.productLine;
-              this.isDisable = true;
-              console.log(
-                "检查柱护板-hostCheckQuery" +
-                  JSON.stringify(this.hostCheckQuery)
-              );
-              this.$axios
-                .posts(
-                  "/api/newjit/bill-m100/check-mb-hostsn-break-num",
-                  this.hostCheckQuery
-                )
-                .then((response) => {
-                  console.log("检查门板-大众顺序号是否断号");
-                  // this.isDisable = true;
-                  // setTimeout(() => {
-                  //   this.isDisable = false;
-                  // }, 1000);
-
-                  if (response.item.length > 0) {
-                    //有断号
-                    this.$confirm(
-                      "本次打印存在断号是否继续?" + response.item,
-                      "提示",
-                      {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning",
-                      }
-                    )
-                      .then(() => {
-                        //门板
-                        //传递大众顺序号起止
-                        this.$axios
-                          .posts(
-                            "/api/newjit/bill-m100/print-menban-packing-list",
-                            this.hostPrintQuery
-                          )
-                          .then((response) => {
-                            console.log("打印门板装箱单");
-                            console.log(response);
-                            console.log(response.status);
-                            if (response.status === false) {
-                              this.$message({
-                                message: response.message,
-                                type: "error",
-                              });
-                              return;
-                            } else if (response.status === true) {
-                              //传给grid++接口json数据，得到返回的文件base64
-                              //this.fileQuery.report = "menban";
-                              this.fileQuery.dataname = JSON.stringify(
-                                response.item
-                              );
-                              //this.fileQuery.dataname = "";
-                              console.log("打印json");
-                              console.log(this.fileQuery.dataname);
-                              this.$axios
-                                .posts(
-                                  "/Handlers/Handler1.ashx?report=menban",
-                                  qs.stringify(this.fileQuery)
-                                )
-                                .then((response) => {
-                                  console.log("获取文件base64编码");
-                                  console.log(response);
-                                  this.formLoading = false;
-                                  this.isDisable = false;
-                                  this.printpdf(response); //打印我文件流
-                                })
-                                .catch((error) => {
-                                  this.formLoading = false;
-                                  this.isDisable = false;
-                                });
-                            }
-                          });
-                      })
-                      .catch(() => {
-                        this.isDisable = false;
-                      });
-                  } else {
-                    //无断号
-                    //门板
-                    //传递大众顺序号起止
-                    this.$axios
-                      .posts(
-                        "/api/newjit/bill-m100/print-menban-packing-list",
-                        this.hostPrintQuery
-                      )
-                      .then((response) => {
-                        console.log("打印门板装箱单");
-                        console.log(response);
-                        if (response.status === false) {
-                          this.$message({
-                            message: response.message,
-                            type: "error",
-                          });
-                        
-                          this.isDisable=false;
-                          return;
-                        } else if (response.status === true) {
-                          //传给grid++接口json数据，得到返回的文件base64
-                          //this.fileQuery.report = "menban";
-                          this.fileQuery.dataname = JSON.stringify(
-                            response.item
-                          );
-                          //this.fileQuery.dataname = "";
-                          console.log("打印json");
-                          console.log(this.fileQuery.dataname);
-                          this.$axios
-                            .posts(
-                              "/Handlers/Handler1.ashx?report=menban",
-                              qs.stringify(this.fileQuery)
-                            )
-                            .then((response) => {
-                              console.log("获取文件base64编码");
-                              console.log(response);
-                              this.formLoading = false;
-                              this.isDisable = false;
-                              this.printpdf(response); //打印我文件流
-                            })
-                            .catch((error) => {
-                              this.formLoading = false;
-                              this.isDisable = false;
-                            });
-                        }
-                      })
-                      .catch(() => {
-                        this.$message({
-                          message: response.message,
-                          type: "error",
-                        });
-                        this.isDisable = false;
-                        return;
-                      });
-                  }
-                });
-            } else if (this.listQuery.productType === 2) {
-              //柱门板
-              this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
-              this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
-              this.hostCheckQuery.productLine = this.listQuery.productLine;
-              this.isDisable = true;
-              this.$axios
-                .posts(
-                  "/api/newjit/bill-m100/check-zhb-hostsn-break-num",
-                  this.hostCheckQuery
-                )
-                .then((response) => {
-                  console.log("检查门板-大众顺序号是否断号");
-                  // this.isDisable = true;
-                  // setTimeout(() => {
-                  //   this.isDisable = false;
-                  // }, 1000);
-                  if (response.item.length > 0) {
-                    //有断号
-                    this.$confirm(
-                      "本次打印存在断号是否继续?" + response.item,
-                      "提示",
-                      {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning",
-                      }
-                    )
-                      .then(() => {
-                        //门板
-                        //传递大众顺序号起止
-                        this.$axios
-                          .posts(
-                            "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-                            this.hostPrintQuery
-                          )
-                          .then((response) => {
-                            console.log("打印门板装箱单");
-                            console.log(response);
-                            console.log(response.status);
-                            if (response.status === false) {
-                              this.$message({
-                                message: response.message,
-                                type: "error",
-                              });
-                              return;
-                            } else if (response.status === true) {
-                              //传给grid++接口json数据，得到返回的文件base64
-                              //this.fileQuery.report = "menban";
-                              this.fileQuery.dataname = JSON.stringify(
-                                response.item
-                              );
-                              //this.fileQuery.dataname = "";
-                              console.log("打印json");
-                              console.log(this.fileQuery.dataname);
-                              this.$axios
-                                .posts(
-                                  "/Handlers/Handler1.ashx?report=zhuhuban",
-                                  qs.stringify(this.fileQuery)
-                                )
-                                .then((response) => {
-                                  console.log("获取文件base64编码");
-                                  console.log(response);
-                                  this.formLoading = false;
-                                  this.isDisable = false;
-                                  this.printpdf(response); //打印我文件流
-                                })
-                                .catch((error) => {
-                                  this.formLoading = false;
-                                  this.isDisable = false;
-                                });
-                            }
-                          });
-                      })
-                      .catch(() => {
-                        this.isDisable = false;
-                      });
-                  } else {
-                    //无断号
-                    //门板
-                    //传递大众顺序号起止
-                    this.$axios
-                      .posts(
-                        "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-                        this.hostPrintQuery
-                      )
-                      .then((response) => {
-                        console.log("打印门板装箱单");
-                        console.log(response);
-                        if (response.status === false) {
-                          this.$message({
-                            message: response.message,
-                            type: "error",
-                          });
-                          return;
-                        } else if (response.status === true) {
-                          //传给grid++接口json数据，得到返回的文件base64
-                          //this.fileQuery.report = "menban";
-                          this.fileQuery.dataname = JSON.stringify(
-                            response.item
-                          );
-                          //this.fileQuery.dataname = "";
-                          console.log("打印json");
-                          console.log(this.fileQuery.dataname);
-                          this.$axios
-                            .posts(
-                              "/Handlers/Handler1.ashx?report=zhuhuban",
-                              qs.stringify(this.fileQuery)
-                            )
-                            .then((response) => {
-                              console.log("获取文件base64编码");
-                              console.log(response);
-                              this.formLoading = false;
-                              this.isDisable = false;
-                              this.printpdf(response); //打印我文件流
-                            })
-                            .catch((error) => {
-                              this.formLoading = false;
-                              this.isDisable = false;
-                            });
-                        }
-                      })
-                      .catch(() => {
-                        this.$message({
-                          message: response.message,
-                          type: "error",
-                        });
-                        this.isDisable = false;
-                        return;
-                      });
-                  }
-                });
-              //柱护板
-
-              // this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
-              // this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
-              // this.hostCheckQuery.productLine = this.listQuery.productLine;
-              // this.$axios
-              //   .posts(
-              //     "/api/newjit/bill-m100/check-zhb-hostsn-break-num",
-              //     this.hostCheckQuery
-              //   )
-              //   .then((response) => {
-              //     console.log("检查柱护板-大众顺序号是否断号");
-              //     if (response.item.length > 0) {
-              //       //有断号
-              //       this.$confirm(
-              //         "本次打印存在断号是否继续?" + response.item,
-              //         "提示",
-              //         {
-              //           confirmButtonText: "确定",
-              //           cancelButtonText: "取消",
-              //           type: "warning",
-              //         }
-              //       )
-              //         .then(() => {
-              //           //门板
-              //           //传递大众顺序号起止
-              //           this.$axios
-              //             .posts(
-              //               "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-              //               this.hostPrintQuery
-              //             )
-              //             .then((response) => {
-              //               console.log("打印门板装箱单");
-              //               console.log(response);
-              //               console.log(response.status);
-              //               if (response.status === false) {
-              //                 this.$message({
-              //                   message: response.message,
-              //                   type: "error",
-              //                 });
-              //                 return;
-              //               } else {
-              //                 //传给grid++接口json数据，得到返回的文件base64
-              //                 //this.fileQuery.report = "menban";
-              //                 this.fileQuery.dataname = JSON.stringify(
-              //                   response.item
-              //                 );
-              //                 //this.fileQuery.dataname = "";
-              //                 console.log("打印json");
-              //                 console.log(this.fileQuery.dataname);
-              //                 this.$axios
-              //                   .posts(
-              //                     "/Handlers/Handler1.ashx?report=menban",
-              //                     qs.stringify(this.fileQuery)
-              //                   )
-              //                   .then((response) => {
-              //                     console.log("获取文件base64编码");
-              //                     console.log(response);
-              //                     this.printpdf(response); //打印我文件流
-              //                   });
-              //               }
-              //             });
-              //         })
-              //         .catch(() => {});
-              //     } //无断号
-              //     else {
-              //       //门板
-              //       //传递大众顺序号起止
-              //       this.$axios
-              //         .posts(
-              //           "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-              //           this.hostPrintQuery
-              //         )
-              //         .then((response) => {
-              //           console.log("打印门板装箱单");
-              //           console.log(response);
-              //           if (response.status === false) {
-              //             this.$message({
-              //               message: response.message,
-              //               type: "error",
-              //             });
-              //             return;
-              //           } else {
-              //             //传给grid++接口json数据，得到返回的文件base64
-              //             //this.fileQuery.report = "menban";
-              //             this.fileQuery.dataname = JSON.stringify(
-              //               response.item
-              //             );
-              //             //this.fileQuery.dataname = "";
-              //             console.log("打印json");
-              //             console.log(this.fileQuery.dataname);
-              //             this.$axios
-              //               .posts(
-              //                 "/Handlers/Handler1.ashx?report=menban",
-              //                 qs.stringify(this.fileQuery)
-              //               )
-              //               .then((response) => {
-              //                 console.log("获取文件base64编码");
-              //                 console.log(response);
-              //                 this.printpdf(response); //打印我文件流
-              //               });
-              //           }
-              //         })
-              //         .catch(() => {
-              //           this.$message({
-              //             message: response.message,
-              //             type: "error",
-              //           });
-              //           return;
-              //         });
-              //     }
-              //   });
-            }
-          } else {
-            /**接口1获取打印数据，接口2获得grid++模板的base64编码 */
-            this.hostPrintQuery.beginVin = this.form.beginVin;
-            this.hostPrintQuery.endVin = this.form.endVin;
-            //判断productType类型
-            if (this.listQuery.productType === 1) {
-              //门板
-              //传递底盘号起止
-              this.$axios
-                .posts(
-                  "/api/newjit/bill-m100/print-menban-packing-list",
-                  this.hostPrintQuery
-                )
-                .then((response) => {
-                  console.log(
-                    "重新或补打打印门板装箱单" +
-                      JSON.stringify(this.hostPrintQuery)
-                  );
-                  console.log(response);
-                  if (response.status === false) {
-                    this.$message({
-                      message: response.message,
-                      type: "error",
-                    });
-                    return;
-                  } else if (response.status === true) {
-                    //传给grid++接口json数据，得到返回的文件base64
-                    //this.fileQuery.report = "menban";
-                    this.fileQuery.dataname = JSON.stringify(response.item);
-                    //this.fileQuery.dataname = "";
-                    console.log("打印json");
-                    console.log(this.fileQuery.dataname);
-                    this.$axios
-                      .posts(
-                        "/Handlers/Handler1.ashx?report=menban",
-                        qs.stringify(this.fileQuery)
-                      )
-                      .then((response) => {
-                        console.log("获取文件base64编码");
-                        console.log(response);
-                        this.printpdf(response); //打印我文件流
-                      });
-                  }
-                })
-                .catch(() => {
-                  this.$message({
-                    message: response.message,
-                    type: "error",
-                  });
-                  return;
-                });
-            } else if (this.listQuery.productType === 2) {
-              //柱护板
-              //传递底盘号起止
-              this.$axios
-                .posts(
-                  "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-                  this.hostPrintQuery
-                )
-                .then((response) => {
-                  console.log("打印柱护板装箱单");
-                  console.log(response);
-                  if (response.status === false) {
-                    this.$message({
-                      message: response.message,
-                      type: "error",
-                    });
-                    return;
-                  } else if (response.status === true) {
-                    //传给grid++接口json数据，得到返回的文件base64
-                    //this.fileQuery.report = "zhuhuban";
-                    this.fileQuery.dataname = JSON.stringify(response.item);
-                    //this.fileQuery.dataname = "";
-                    console.log("打印json");
-                    console.log(this.fileQuery.dataname);
-                    this.$axios
-                      .posts(
-                        "/Handlers/Handler1.ashx?report=zhuhuban",
-                        qs.stringify(this.fileQuery)
-                      )
-                      .then((response) => {
-                        console.log("获取文件base64编码");
-                        console.log(response);
-                        this.printpdf(response); //打印我文件流
-                      });
-                  }
-                })
-                .catch(() => {
-                  this.$message({
-                    message: response.message,
-                    type: "error",
-                  });
-                  return;
-                });
-            }
-          }
-        }
-      });
-    },
-    /**保存*/
-    save1() {
-      //this.listLoaddingPrint = true;
-      if (this.isShowHostSN === true) {
-        if (this.form.beginHostSN === "" || this.form.endHostSN === "") {
-          this.$message({
-            message: "请输入完整的顺序号起始范围",
-            type: "error",
-          });
-          return;
-        } else {
-          if (this.listQuery.productType === 1) {
-            //门板
-            if (
-              parseInt(this.form.endHostSN) - parseInt(this.form.beginHostSN) <=
-              0
-            ) {
-              this.$message({
-                message: "起止大众顺序号相减不能为零！",
-                type: "error",
-              });
-              return;
-            }
-          } else if (this.listQuery.productType === 2) {
-            //柱护板
-            if (
-              parseInt(this.form.endHostSN) - parseInt(this.form.beginHostSN) >
-              23
-            ) {
-              this.$message({
-                message:
-                  "最多只能打印24个顺序号，终止顺序号不能大于" +
-                  (parseInt(this.form.beginHostSN) + 23),
-                type: "error",
-              });
-              return;
-            }
-          }
-        }
-      }
-      if (this.isShowVin === true) {
-        if (this.form.beginVin === "" || this.form.endVin === "") {
-          this.$message({
-            message: "请输入完整的底盘号起始范围",
-            type: "error",
-          });
-          return;
-        }
-      }
-      /**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */
-      if (
-        this.formTitle === "打印-门板发货排序单" ||
-        this.formTitle === "打印-柱护板发货排序单"
-      ) {
-        this.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN);
-        this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN);
-
-        if (this.listQuery.productType === 1) {
-          //门板-打印
-          this.$axios
-            .posts(
-              "/api/newjit/bill-m100/check-mb-hostsn-break-num",
-              this.hostCheckQuery
-            )
-            .then((response) => {
-              console.log("检查门板-大众顺序号是否断号");
-              if (response.item.length > 0) {
-                //有断号
-                this.$confirm(
-                  "本次打印存在断号是否继续?" + response.item,
-                  "提示",
-                  {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                  }
-                )
-                  .then(() => {
-                    //门板
-                    //传递大众顺序号起止
-                    this.$axios
-                      .posts(
-                        "/api/newjit/bill-m100/print-menban-packing-list",
-                        this.hostPrintQuery
-                      )
-                      .then((response) => {
-                        console.log("打印门板装箱单");
-                        console.log(response);
-                        console.log(response.status);
-                        if (response.status === false) {
-                          this.$message({
-                            message: response.message,
-                            type: "error",
-                          });
-                          return;
-                        } else if (response.status === true) {
-                          //传给grid++接口json数据，得到返回的文件base64
-                          //this.fileQuery.report = "menban";
-                          this.fileQuery.dataname = JSON.stringify(
-                            response.item
-                          );
-                          //this.fileQuery.dataname = "";
-                          console.log("打印json");
-                          console.log(this.fileQuery.dataname);
-                          this.$axios
-                            .posts(
-                              "/Handlers/Handler1.ashx?report=menban",
-                              qs.stringify(this.fileQuery)
-                            )
-                            .then((response) => {
-                              console.log("获取文件base64编码");
-                              console.log(response);
-                              this.formLoading = false;
-                              this.printpdf(response); //打印我文件流
-                            })
-                            .catch((error) => {
-                              this.formLoading = false;
-                            });
-                        }
-                      });
-                  })
-                  .catch(() => {});
-              } else {
-                //无断号
-                //门板
-                //传递大众顺序号起止
-                this.$axios
-                  .posts(
-                    "/api/newjit/bill-m100/print-menban-packing-list",
-                    this.hostPrintQuery
-                  )
-                  .then((response) => {
-                    console.log("打印门板装箱单");
-                    console.log(response);
-                    if (response.status === false) {
-                      this.$message({
-                        message: response.message,
-                        type: "error",
-                      });
-                      return;
-                    } else if (response.status === true) {
-                      //传给grid++接口json数据，得到返回的文件base64
-                      //this.fileQuery.report = "menban";
-                      this.fileQuery.dataname = JSON.stringify(response.item);
-                      //this.fileQuery.dataname = "";
-                      console.log("打印json");
-                      console.log(this.fileQuery.dataname);
-                      this.$axios
-                        .posts(
-                          "/Handlers/Handler1.ashx?report=menban",
-                          qs.stringify(this.fileQuery)
-                        )
-                        .then((response) => {
-                          console.log("获取文件base64编码");
-                          console.log(response);
-                          this.formLoading = false;
-                          this.printpdf(response); //打印我文件流
-                        })
-                        .catch((error) => {
-                          this.formLoading = false;
-                        });
-                    }
-                  })
-                  .catch(() => {
-                    this.$message({
-                      message: response.message,
-                      type: "error",
-                    });
-                    return;
-                  });
-              }
-            });
-        } else if (this.listQuery.productType === 2) {
-          //柱护板
-          this.$axios
-            .posts(
-              "/api/newjit/bill-m100/check-zhb-hostsn-break-num",
-              this.hostCheckQuery
-            )
-            .then((response) => {
-              console.log("检查柱护板-大众顺序号是否断号");
-              if (response.item.length > 0) {
-                //有断号
-                this.$confirm(
-                  "本次打印存在断号是否继续?" + response.item,
-                  "提示",
-                  {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                  }
-                )
-                  .then(() => {
-                    //门板
-                    //传递大众顺序号起止
-                    this.$axios
-                      .posts(
-                        "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-                        this.hostPrintQuery
-                      )
-                      .then((response) => {
-                        console.log("打印门板装箱单");
-                        console.log(response);
-                        console.log(response.status);
-                        if (response.status === false) {
-                          this.$message({
-                            message: response.message,
-                            type: "error",
-                          });
-                          return;
-                        } else if (response.status === true) {
-                          //传给grid++接口json数据，得到返回的文件base64
-                          //this.fileQuery.report = "menban";
-                          this.fileQuery.dataname = JSON.stringify(
-                            response.item
-                          );
-                          //this.fileQuery.dataname = "";
-                          console.log("打印json");
-                          console.log(this.fileQuery.dataname);
-                          this.$axios
-                            .posts(
-                              "/Handlers/Handler1.ashx?report=zhuhuban",
-                              qs.stringify(this.fileQuery)
-                            )
-                            .then((response) => {
-                              console.log("获取文件base64编码");
-                              console.log(response);
-                              this.printpdf(response); //打印我文件流
-                            });
-                        }
-                      });
-                  })
-                  .catch(() => {});
-              } //无断号
-              else {
-                //门板
-                //传递大众顺序号起止
-                this.$axios
-                  .posts(
-                    "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-                    this.hostPrintQuery
-                  )
-                  .then((response) => {
-                    console.log("打印门板装箱单");
-                    console.log(response);
-                    if (response.status === false) {
-                      this.$message({
-                        message: response.message,
-                        type: "error",
-                      });
-                      return;
-                    } else if (response.status === true) {
-                      //传给grid++接口json数据，得到返回的文件base64
-                      //this.fileQuery.report = "menban";
-                      this.fileQuery.dataname = JSON.stringify(response.item);
-                      //this.fileQuery.dataname = "";
-                      console.log("打印json");
-                      console.log(this.fileQuery.dataname);
-                      this.$axios
-                        .posts(
-                          "/Handlers/Handler1.ashx?report=zhuhuban",
-                          qs.stringify(this.fileQuery)
-                        )
-                        .then((response) => {
-                          console.log("获取文件base64编码");
-                          console.log(response);
-                          this.printpdf(response); //打印我文件流
-                        });
-                    }
-                  })
-                  .catch(() => {
-                    this.$message({
-                      message: response.message,
-                      type: "error",
-                    });
-                    return;
-                  });
-              }
-            });
-        }
-      } else {
-        /**接口1获取打印数据，接口2获得grid++模板的base64编码 */
-        this.hostPrintQuery.beginVin = this.form.beginVin;
-        this.hostPrintQuery.endVin = this.form.endVin;
-        //判断productType类型
-        if (this.listQuery.productType === 1) {
-          //门板
-          //传递底盘号起止
-          this.$axios
-            .posts(
-              "/api/newjit/bill-m100/print-menban-packing-list",
-              this.hostPrintQuery
-            )
-            .then((response) => {
-              console.log(
-                "重新或补打打印门板装箱单" + JSON.stringify(this.hostPrintQuery)
-              );
-              console.log(response);
-              if (response.status === false) {
-                this.$message({
-                  message: response.message,
-                  type: "error",
-                });
-                return;
-              } else if (response.status === true) {
-                //传给grid++接口json数据，得到返回的文件base64
-                //this.fileQuery.report = "menban";
-                this.fileQuery.dataname = JSON.stringify(response.item);
-                //this.fileQuery.dataname = "";
-                console.log("打印json");
-                console.log(this.fileQuery.dataname);
-                this.$axios
-                  .posts(
-                    "/Handlers/Handler1.ashx?report=menban",
-                    qs.stringify(this.fileQuery)
-                  )
-                  .then((response) => {
-                    console.log("获取文件base64编码");
-                    console.log(response);
-                    this.printpdf(response); //打印我文件流
-                  });
-              }
-            })
-            .catch(() => {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            });
-        } else if (this.listQuery.productType === 2) {
-          //柱护板
-          //传递底盘号起止
-          this.$axios
-            .posts(
-              "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-              this.hostPrintQuery
-            )
-            .then((response) => {
-              console.log("打印柱护板装箱单");
-              console.log(response);
-              if (response.status === false) {
-                this.$message({
-                  message: response.message,
-                  type: "error",
-                });
-                return;
-              } else if (response.status === true) {
-                //传给grid++接口json数据，得到返回的文件base64
-                //this.fileQuery.report = "zhuhuban";
-                this.fileQuery.dataname = JSON.stringify(response.item);
-                //this.fileQuery.dataname = "";
-                console.log("打印json");
-                console.log(this.fileQuery.dataname);
-                this.$axios
-                  .posts(
-                    "/Handlers/Handler1.ashx?report=zhuhuban",
-                    qs.stringify(this.fileQuery)
-                  )
-                  .then((response) => {
-                    console.log("获取文件base64编码");
-                    console.log(response);
-                    this.printpdf(response); //打印我文件流
-                  });
-              }
-            })
-            .catch(() => {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            });
-        }
-      }
-    },
-    //获取所有产线
-    getProductLine() {
-      this.listPLQuery.UserId = this.userInfo.userId;
-      console.log(
-        "this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" +
-          this.listPLQuery.UserId
-      );
-      this.$axios
-        .gets("/api/newjit/product-line/list", this.listPLQuery)
-        .then((response) => {
-          //console.log(response);
-          this.PLList = response.item;
-          this.PLChildList = this.PLList.filter(
-            (u) => u.productType === parseInt(this.listQuery.productType)
-          ).sort((a, b) => {
-            return a.productLineCode - b.productLineCode;
-          });
-          this.listQuery.productLine = this.PLChildList[0].productLineCode;
-          if (this.listQuery.productLine != "") {
-            //把产线值传到子组件
-            this.customerInfosMB = [
-              {
-                PrintType: 1,
-                ProductLine: this.PLChildList[0].productLineCode,
-              },
-            ];
-          }
-          this.getList();
-          //console.log(this.PLList)
-        })
-        .catch(() => {});
-    },
-    //产线类型变更
-    ptypeselectChange() {
-      this.$forceUpdate();
-      //console.log(this.listQuery.productType);
-      this.listQuery.productLine = "";
-      this.PLChildList = this.PLList.filter(
-        (u) => u.productType === parseInt(this.listQuery.productType)
-      ).sort((a, b) => {
-        return a.productLineCode - b.productLineCode;
-      });
-      //console.log(this.PLList)
-      //变更打印按钮文字
-      if (this.listQuery.productType === 1) {
-        this.$refs.btn1.$el.innerText = "打印门板发货排序单";
-        this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
-        this.$refs.btn3.$el.innerText = "补打门板发货排序单";
-        this.listQuery.state.push(this.billState[0].id);
-        this.isShowState = true;
-      } else if (this.listQuery.productType === 2) {
-        this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
-        this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
-        this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
-        this.listQuery.state = [];
-        this.isShowState = false;
-      }
-      if (this.listQuery.productType === 2) {
-        this.listQueryList.ZHBBillStatus = 2;
-      } else {
-        this.listQueryList.ZHBBillStatus = 0;
-      }
-    },
-    /*单据状态变更 */
-    checkedListChange(index) {
-      if (this.listQuery.state.length <= 1) {
-        this.listQuery.state.push(this.billState[index].id);
-      } else {
-        this.listQuery.state = [];
-        this.listQuery.state.push(this.billState[index].id);
-      }
-    },
-    /**解析文件流 */
-    getUrl() {
-      //dataResult.data是后台返回的流
-      let pdfUrl = window.URL.createObjectURL(
-        new Blob([dataResult.data], { type: `application/pdf` })
-      );
-      const fname = item.name + str + "_" + lists[1] + lists[2]; // 下载文件的名字
-      const link = document.createElement("a");
-      link.href = pdfUrl;
-      link.setAttribute("download", "下载的文件名");
-      document.body.appendChild(link);
-      link.click();
-      document.body.removeChild(link);
-    },
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-      this.getList();
-    },
-    httpPost(URL, PARAMS) {
-      var temp = document.createElement("form");
-      temp.action = URL;
-      temp.method = "post";
-      temp.style.display = "none";
-
-      for (var x in PARAMS) {
-        var opt = document.createElement("textarea");
-        opt.name = x;
-        opt.value = PARAMS[x];
-        temp.appendChild(opt);
-      }
-
-      document.body.appendChild(temp);
-      temp.submit();
-
-      return temp;
-    },
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-
-// /*表格全选框去除空框*/
-// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
-//   display: none;
-//   position: relative;
-// }
-// /*表格全选框改为：选择*/
-// .el-table >>> .DisabledSelection .cell:before {
-//   content: "是否Key件";
-//   position: absolute;
-//   left: 7px;
-// }
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/partSwitch/index.vue b/code/WebApp/vue/src/views/pg-fis/basedate/partSwitch/index.vue
deleted file mode 100644
index c36391d6..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/partSwitch/index.vue
+++ /dev/null
@@ -1,513 +0,0 @@
-<!--零件切换模块信息管理页-->
-<template>
-	<div class="cr-body-content">
-		<div ref="box">
-			<flexbox class="content-header">
-				<el-form :model="listQuery" ref="queryForm" v-show="showSearch" :inline="true">
-					<el-form-item label="源零件编码" prop="sourcePartCode" class="forimitem">
-						<el-input v-model="listQuery.sourcePartCode" placeholder="请输入源零件编码" clearable size="small" style="width: 240px"
-						 @keyup.enter.native="handleQuery" />
-					</el-form-item>
-
-					<el-form-item label="源零件名称" prop="sourcePartName" class="forimitem">
-						<el-input v-model="listQuery.sourcePartName" placeholder="请输入源零件名称" clearable size="small" style="width: 240px"
-						 @keyup.enter.native="handleQuery" />
-					</el-form-item>
-
-					<el-form-item label="目标零件编码" prop="targetPartCode" class="forimitem">
-						<el-input v-model="listQuery.targetPartCode" placeholder="请输入目标零件编码" clearable size="small" style="width: 240px"
-						 @keyup.enter.native="handleQuery" />
-					</el-form-item>
-
-					<el-form-item label="目标零件名称" prop="targetPartName" class="forimitem">
-						<el-input v-model="listQuery.targetPartName" placeholder="请输入目标零件名称" clearable size="small" style="width: 240px"
-						 @keyup.enter.native="handleQuery" />
-					</el-form-item>
-
-					<el-form-item class="formitem">
-						<el-button type="primary" icon="el-icon-search" size="mini" @click="handleFilter">搜索</el-button>
-						<el-button icon="el-icon-refresh" size="mini" @click="resetQuery('queryForm')">重置</el-button>
-						<el-button type="warning" plain icon="el-icon-download" size="mini" style="margin-left: 15px" @click="handleDownload()">导出(Excel)
-						</el-button>
-					</el-form-item>
-					
-					<el-form-item style="margin-bottom: 0px; ">
-						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleCreate">新增
-						</el-button>
-						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate">修改
-						</el-button>
-						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-delete" @click="handleDelete">删除
-						</el-button>
-					</el-form-item>
-				</el-form>
-			</flexbox>
-		</div>
-		<div class="l-table">
-			<!--表格渲染-->
-			<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
-			 class="cr-table" :data="tableData" :height="tableHeight" :cell-style="cellStyle" :header-cell-style="headerRowStyle"
-			 size="small" stripe border highlight-current-row style="width: 100%" @sort-change="sortChange" @selection-change="handleSelectionChange"
-			 @row-click="handleRowClick">
-				<el-table-column type="selection" width="44px"></el-table-column>
-				<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
-				 :min-width="item.width" :formatter="fieldFormatter" sortable="custom" show-overflow-tooltip :gutter="0">
-					<template slot="header" slot-scope="scope">
-						{{ scope.column.label }}
-					</template>
-				</el-table-column>
-			</el-table>
-
-			<!--表单渲染-->
-			<el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" :title="formTitle" width="700px" @close="closeDialog">
-				<el-form ref="form" :inline="true" :model="childFormModel" :rules="rules" size="small" label-width="120px">
-					<el-row>
-						<el-col :span="4">
-							<el-form-item label="源零件编码：" required />
-						</el-col>
-						<el-col :span="20">
-							<el-form-item prop="sourcePartCode">
-								<el-input style="width: 400px" v-model="childFormModel.sourcePartCode" />
-							</el-form-item>
-						</el-col>
-					</el-row>
-
-					<el-row>
-						<el-col :span="4">
-							<el-form-item label="目标零件编码：" required />
-						</el-col>
-						<el-col :span="20">
-							<el-form-item prop="targetPartCode">
-								<el-input style="width: 400px" v-model="childFormModel.targetPartCode" />
-							</el-form-item>
-						</el-col>
-					</el-row>
-				</el-form>
-				<!--表格渲染-->
-				<div slot="footer" class="dialog-footer">
-					<el-button type="text" @click="dialogFormVisible = false">取消</el-button>
-					<el-button v-loading="formLoading" type="primary" @click="save()">确认</el-button>
-				</div>
-			</el-dialog>
-		</div>
-
-		<div class="table-footer">
-			<!-- 分页控件 -->
-			<pagination v-show="totalCount > 0" :total="totalCount" :page.sync="pageIndex" :limit.sync="listQuery.maxResultCount"
-			 @pagination="getList" />
-		</div>
-
-	</div>
-</template>
-
-<script>
-	import Pagination from "@/components/Pagination";
-	import permission from "@/directive/permission/index.js";
-	import CRMTableHead from "../../components/CRMTableHead";
-	import importExcel from "@/components/ImportTxt";
-	import Lockr from "lockr";
-	import moment from "moment";
-	//import Detail from "./detail.vue";
-	import {
-		downloadFile
-	} from "@/utils/crmindex.js";
-
-	export default {
-		name: "PartSwitch",
-		components: {
-			Pagination,
-			CRMTableHead,
-			importExcel,
-			//Detail
-		},
-		directives: {
-			permission
-		},
-		// filters: {
-		// 	IsCustomerSignFilter(status) {
-		// 		//翻译是否签字
-		// 		const statusMap = {
-		// 			true: "是",
-		// 			false: "否",
-		// 		};
-		// 		return statusMap[status];
-		// 	},
-		// },
-		data() {
-
-			return {
-				rules: {
-					sourcePartCode: [{
-						required: true,
-						message: "必须输入！",
-						trigger: "blur"
-					}],
-					targetPartCode: [{
-						required: true,
-						message: "必须输入！",
-						trigger: "blur"
-					}],
-				},
-
-				tableData: null,
-				totalCount: 0,
-				listLoading: true,
-
-				listQuery: {
-					sourcePartCode: undefined,
-					sourcePartName: undefined,
-					targetPartCode: undefined,
-					targetPartName: undefined,
-					maxResultCount: 15,
-					skipCount: 0
-				},
-
-				childFormModel: {
-				},
-				//当前页索引
-				pageIndex: 1, 
-				// 显示搜索条件
-				showSearch: true,
-
-				multipleSelection: [],
-				dialogFormVisible: false,
-				formTitle: "",
-				isEdit: false,
-				formLoading: false,
-				tableHeight: document.documentElement.clientHeight - 280,
-			};
-		},
-		mounted() {
-			this.$nextTick(() => {
-				var offsetHei = document.documentElement.clientHeight;
-				//console.log(offsetHei);
-				let boxH = this.$refs.box.offsetHeight;
-				this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-
-			});
-		},
-		created() {
-			debugger
-			this.getList();
-			
-		},
-		computed: {
-			getDefaultField() {
-				var tempsTabs = [];
-				tempsTabs.push({
-					label: "源零件编码",
-					prop: "sourcePartCode",
-					width: 150,
-				});
-				tempsTabs.push({
-					label: "源零件名称",
-					prop: "sourcePartName",
-					width: 200,
-				});
-				tempsTabs.push({
-					label: "目标零件编码",
-					prop: "targetPartCode",
-					width: 150,
-				});
-				tempsTabs.push({
-					label: "目标零件名称",
-					prop: "targetPartName",
-					width: 200,
-				});
-				tempsTabs.push({
-					label: "创建时间",
-					prop: "creationTime",
-					width: 180,
-				});
-				console.log("字段列表：" + JSON.stringify(tempsTabs));
-				return tempsTabs;
-			},
-		},
-		methods: {
-			/**
-			 * 子窗口保存按钮事件
-			 */
-			save() {
-				
-				let _this = this;
-				this.$refs.form.validate((valid) => {
-					if (valid) {
-						console.log("保存参数:" + JSON.stringify(_this.childFormModel));
-						_this.formLoading = true;
-						if (_this.isEdit) {
-							//修改
-							_this.$axios
-								.puts("/api/newjit/part-switch/" + _this.childFormModel.id, _this.childFormModel)
-								.then((response) => {
-									_this.formLoading = false;
-									_this.$notify({
-										title: "成功",
-										message: "更新成功",
-										type: "success",
-										duration: 2000,
-									});
-									_this.dialogFormVisible = false;
-									_this.getList();
-								})
-								.catch(() => {
-									_this.formLoading = false;
-								});
-						} else {
-							//insert添加
-							console.log(JSON.stringify(_this.childFormModel));
-							_this.$axios
-								.posts("/api/newjit/part-switch", _this.childFormModel)
-								.then((response) => {
-									_this.formLoading = false;
-									_this.$notify({
-										title: "成功",
-										message: "新增成功",
-										type: "success",
-										duration: 2000,
-									});
-									_this.dialogFormVisible = false;
-									_this.getList();
-								})
-								.catch(() => {
-									_this.formLoading = false;
-								});
-						}
-					}
-				});
-			},
-
-			/** 新增 */
-			handleCreate() {
-				if (this.$refs["form"] !== undefined) {
-					this.$nextTick(() => {
-
-						this.$refs["form"].resetFields();
-					});
-				}
-				this.formTitle = "新增";
-				this.isEdit = false;
-				this.childFormModel = {};
-				this.dialogFormVisible = true;
-			},
-			/** 修改 */
-			handleUpdate(row) {
-				this.formTitle = "修改";
-				this.isEdit = true;
-				if (this.multipleSelection.length != 1) {
-					this.$message({
-						message: "编辑必须选择单行",
-						type: "warning",
-					});
-					return;
-				} else {
-					this.fetchData(this.multipleSelection[0].id);
-					this.dialogFormVisible = true;
-				}
-			},
-			/** 删除 */
-			handleDelete(row) {
-				if (this.multipleSelection.length != 1) {
-					this.$message({
-						message: "编辑必须选择单行",
-						type: "warning",
-					});
-					return;
-				}
-				this.$confirm(
-						"是否删除记录" + this.multipleSelection[0].sourcePartCode + "?",
-						"提示", {
-							confirmButtonText: "确定",
-							cancelButtonText: "取消",
-							type: "warning",
-						}
-					)
-					.then(() => {
-						this.$axios
-							.deletes(
-								"/api/newjit/part-switch/" + this.multipleSelection[0].id
-							)
-							.then((response) => {
-								
-								this.$notify({
-									title: "成功",
-									message: "删除成功",
-									type: "success",
-									duration: 2000,
-								});
-								this.getList();
-							});
-					})
-					.catch(() => {
-						this.$message({
-							type: "info",
-							message: "已取消删除",
-						});
-					});
-			},
-			fetchData(id) {
-				//循环动态
-				this.$axios
-					.gets("/api/newjit/part-switch/" + id)
-					.then((response) => {
-						this.childFormModel = response.item;
-					});
-			},
-			/** 导出功能 */
-			handleDownload() {
-				this.listLoading = true;
-				console.log(JSON.stringify(this.listQuery));
-				this.$axios
-					.posts("/api/newjit/part-switch/export", this.listQuery)
-					.then((res) => {
-						let filename = res.item;
-						this.$axios
-							.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-							.then((response) => {
-								if (filename.indexOf("_") != -1) {
-									let downName =
-										filename.slice(0, filename.lastIndexOf("_")) +
-										filename.slice(filename.lastIndexOf("."));
-									downloadFile(response, downName);
-									this.$notify({
-										title: "成功",
-										message: "数据-导出成功！",
-										type: "success",
-										duration: 2000,
-									});
-								} else {
-									downloadFile(response, filename);
-									this.$notify({
-										title: "成功",
-										message: "数据-导出成功！",
-										type: "success",
-										duration: 2000,
-									});
-								}
-								this.listLoading = false;
-							});
-					});
-				this.listLoading = false;
-			},
-			/** 重置按钮操作 */
-			resetQuery(refName) {
-				this.$refs[refName].resetFields();
-				this.handleQuery();
-				this.listQuery.TargetPartName = [];
-			},
-			/** 搜索按钮操作 */
-			handleQuery() {
-				this.listQuery.skipCount = 0;
-				this.getList();
-			},
-
-			/** 格式化字段 */
-			fieldFormatter(row, column) {
-				return row[column.property];
-			},
-
-			getList() {
-				let _this = this;
-				this.listLoading = true;
-				console.log("getList方法参数：" + JSON.stringify(this.listQuery));
-				this.listQuery.skipCount = (this.pageIndex - 1) * this.listQuery.maxResultCount;
-
-				this.$axios
-					.gets("/api/newjit/part-switch/list", this.listQuery)
-					.then((response) => {
-
-						_this.tableData = response.items;
-						console.log("getList方法结果：" + JSON.stringify(_this.tableData));
-						_this.totalCount = response.totalCount;
-						setTimeout(() => {
-							//大数据量加载时
-							_this.listLoading = false;
-						}, 500);
-					})
-					.catch(() => {
-						_this.listLoading = false;
-					});
-
-			},
-
-			handleFilter() {
-				this.pageIndex = 1;
-				this.getList();
-			},
-
-			sortChange(data) {
-				const {
-					prop,
-					order
-				} = data;
-				if (!prop || !order) {
-					this.handleFilter();
-					return;
-				}
-				this.listQuery.Sorting = prop + " " + order;
-				this.handleFilter();
-			},
-			
-			handleSelectionChange(val) {
-				this.multipleSelection = val;
-			},
-			/** 通过回调控制style */
-			cellStyle({
-				row,
-				column,
-				rowIndex,
-				columnIndex
-			}) {
-				if (column.property === "qty") {
-					return {
-						textAlign: "right"
-					};
-				} else {
-					return {
-						textAlign: "left"
-					};
-				}
-			},
-			/** 通过回调控制表头style */
-			headerRowStyle({
-				row,
-				column,
-				rowIndex,
-				columnIndex
-			}) {
-				if (column.property === "qty") {
-					return {
-						textAlign: "right",
-						background: "#FAFAFA"
-					};
-				} else {
-					return {
-						textAlign: "left",
-						background: "#FAFAFA"
-					};
-				}
-			},
-			
-			handleRowClick(row, column, event) {
-				this.$refs.multipleTable.clearSelection();
-				this.$refs.multipleTable.toggleRowSelection(row);
-			},
-
-			closeDialog() {
-				//this.multipleSelection = [];//清空数据
-			},
-		},
-	};
-</script>
-
-
-<style lang="scss" scoped>
-	@import "../../../pg-fis/styles/crmtable.scss";
-
-	.divider1 {
-		margin: 0;
-		//width: 100%;
-	}
-
-	.formitem {
-		margin-bottom: 0;
-	}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/productLine/index.vue b/code/WebApp/vue/src/views/pg-fis/basedate/productLine/index.vue
deleted file mode 100644
index 808920a7..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/productLine/index.vue
+++ /dev/null
@@ -1,963 +0,0 @@
-<!--零件匹配关系页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-    <flexbox class="content-header">
-
-      <el-form
-        :model="listQuery"
-        ref="queryForm"
-        v-show="showSearch"
-        :inline="true"
-      >
-      <!-- <span>版本:</span>
-
-      <XhJSSelect
-        :options="versionList"
-        style="width: 200px"
-        class="search-container"
-        @value-change="selectValue"
-      ></XhJSSelect> -->
-
-      
-      <el-form-item label="操作员登录名" prop="userName">
-        <el-input
-          v-model="listQuery.userName"
-          clearable
-          size="small"
-          placeholder=""
-          style="width: 180px"
-          class="search-container"
-          @keyup.enter.native="handleFilter"
-        />
-      </el-form-item>
-      
-      <el-form-item label="操作员真实名称" prop="name">
-        <el-input
-          v-model="listQuery.name"
-          clearable
-          size="small"
-          placeholder=""
-          style="width: 180px"
-          class="search-container"
-          @keyup.enter.native="handleFilter"
-        />
-      </el-form-item>
-
-      <!-- <el-form-item label="部门:" prop="dep">
-        <el-select
-          v-model="listQuery.dep"
-          clearable
-          placeholder="请选择"
-          size="medium"
-          style="margin-right: 15px"
-          @change="valueselectChange"
-        >
-          <el-option label="结算" value="R0003"></el-option>
-          <el-option label="二配" value="R0001"></el-option>
-        </el-select>
-      </el-form-item> -->
-
-      <el-form-item label="生产线" prop="productLineCode">
-        <el-select
-          v-model="listQuery.productLineCode"
-          clearable
-          placeholder="请选择"
-          size="medium"
-          style="margin-right: 15px"
-          @change="valueselectChange"
-        >
-          <el-option
-            v-for="item in PLList"
-            :key="item.id"
-            :label="item.productLineName"
-            :value="item.productLineCode"/>
-        </el-select>
-      </el-form-item>
-
-      <!-- <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照结算件基本信息搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      /> -->
-      <el-form-item>
-        <el-button
-          size="mini"
-          type="primary"
-          icon="el-icon-search"
-          @click="handleFilter"
-          >搜索
-        </el-button>
-      </el-form-item>
-
-      <el-form-item>
-        <el-button
-          icon="el-icon-refresh"
-          size="mini"
-          @click="resetQuery('queryForm')"
-          >重置
-        </el-button>
-      </el-form-item>
-
-      <el-form-item>
-        <el-button
-          class="filter-item"
-          plain
-          size="mini"
-          type="warning"
-          icon="el-icon-bottom"
-          @click="handleDownload()"
-          >导出Excel
-        </el-button>
-      </el-form-item>
-      <el-form-item>
-        <el-button
-          class="filter-item"
-          plain
-          size="mini"
-          type="primary"
-          @click="permissionConfig()"
-          >权限配置
-        </el-button>
-      </el-form-item>
-      <!--表格头组件，filter查询-->
-      <!-- <c-r-m-table-head
-        ref="crmTableHead"
-        :crm-type="crmType"
-        @handle="handleHandle"
-        @filter="handleFilters"
-      >
-      </c-r-m-table-head> -->
-      </el-form>
-    </flexbox>
-    </div>
-    <!--表格渲染-->
-    <el-row>
-      <!--主表-->
-      <el-col :span="14">
-        <el-table
-          ref="multipleTable"
-          v-loading.fullscreen.lock="listLoading"
-          element-loading-text="拼命加载中..."
-          element-loading-spinner="el-icon-loading"
-          class="cr-table"
-          :data="list"
-          :height="tableHeight"
-          :cell-style="cellStyle"
-          :header-cell-style="headerRowStyle"
-          size="small"
-          stripe
-          border
-          highlight-current-row
-          style="width: 100%"
-          @sort-change="sortChange"
-          @selection-change="handleSelectionChange"
-          @row-click="handleRowClick"
-        >
-          <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-          <el-table-column
-            type="index" label="序号"
-            :index="1">
-          </el-table-column>
-          <el-table-column
-            v-for="(item, index) in getDefaultField"
-            :key="index"
-            :prop="item.prop"
-            :label="item.label"
-            :min-width="item.width"
-            :formatter="fieldFormatter"
-            sortable="custom"
-            show-overflow-tooltip
-            :gutter="0"
-          >
-            <template slot="header" slot-scope="scope">
-              {{ scope.column.label }}
-            </template>
-            <template slot-scope="scope">
-              {{scope.row[item.prop]}}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-      <!--子表-->
-      <el-col :span="10">
-        <el-table
-          ref="detailTable"
-          v-loading.fullscreen.lock="listDetailLoading"
-          element-loading-text="拼命加载中..."
-          element-loading-spinner="el-icon-loading"
-          class="cr-table"
-          :data="detaillist"
-          :height="tableHeight"
-          :cell-style="cellDetailStyle"
-          :header-cell-style="headerDetailRowStyle"
-          size="small"
-          stripe
-          border
-          highlight-current-row
-          style="width: 100%"
-          @sort-change="sortDetailChange"
-          @selection-change="handleDetailSelectionChange"
-          @row-click="handleDetailRowClick"
-        >
-          <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-          <!-- <el-table-column
-            label="版本"
-            prop="version"
-            sortable="custom"
-            align="center"
-            width="100px"
-          >fixed 默认固定在左边
-            <template slot-scope="scope">
-              <el-tooltip :content="scope.row.version" placement="top">
-                <span class="link-type">{{ scope.row.version }}</span>
-              </el-tooltip>
-            </template>
-          </el-table-column> -->
-          <el-table-column
-            type="index" label="序号"
-            :index="1">
-          </el-table-column>
-          <el-table-column
-            v-for="(item, index) in getChildDefaultField"
-            :key="index"
-            :prop="item.prop"
-            :label="item.label"
-            :min-width="item.width"
-            :formatter="fieldFormatter"
-            sortable="custom"
-            show-overflow-tooltip
-            :gutter="0"
-          >
-            <template slot="header" slot-scope="scope">
-              {{ scope.column.label }}
-            </template>
-            <template slot-scope="scope">
-              {{scope.row[item.prop]}}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-row>
-    <!--表单渲染-->
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        :title="formTitle"
-        width="700px"
-      >
-        <el-form
-          ref="form"
-          :inline="true"
-          :model="form"
-          :rules="rules"
-          size="small"
-          label-width="120px"
-        >
-          <el-row>
-            <el-col :span="4">
-              <el-form-item label="操作员" required />
-            </el-col>
-            <el-col :span="20">
-                <el-input
-                  style="width: 400px"
-                  v-model="form.userName"
-                  :disabled="isEdit"
-                />
-            </el-col>
-          </el-row>
-          
-
-          <el-row>
-            <el-transfer
-              v-model="form.worklines"
-              :titles="['可操作的生产线', '全部生产线']"
-              filterable
-              :data="UsePLList">
-            </el-transfer>
-          </el-row>
-        </el-form>
-        
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="dialogFormVisible = false"
-            >取消</el-button
-          >
-          <el-button v-loading="formLoading" type="primary" @click="save"
-            >确认</el-button
-          >
-        </div>
-      </el-dialog>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-invoice";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import Lockr from "lockr";
-import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
-import { filter } from 'jszip/lib/object';
-
-export default {
-  name: "productLine",
-  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "productLine",
-      versionValue: "",
-      //valueSelect: "R0003",
-      versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        worklines:[]
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      listDetailLoading: false,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        customerCode: "",
-        //userId: "00000000-0000-0000-0000-000000000000",
-        userName:undefined,//用户名称
-        name:undefined,//真实姓名
-        productLineCode:undefined,//生产线
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        fileType: 0,
-        userId: "",
-      },
-      listPLQuery:{
-        BillType: 0,
-        //UserId: "00000000-0000-0000-0000-000000000000",
-      },
-      saveQuery:{
-        userId: "",
-        productLineIdList:[],
-      },
-      showSearch: true,
-      page: 1,
-      multipleSelection: [],
-      formTitle: "人员产线权限变更",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      sortState:false, //标记刷新是否是排序调用
-      detaillist:[],
-      PLList:[],
-      UsePLList : [],
-
-      dialogFormVisible:false,//窗口显隐
-      
-    };
-  },
-  mounted() {
-    this.$nextTick(() => { 
-        var offsetHei = document.documentElement.clientHeight;
-        //console.log(offsetHei);
-        let boxH = this.$refs.box.offsetHeight;
-        this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
-        //console.log(this.$refs.box.offsetHeight);
-        //console.log(this.tableHeight);
-    });
-  },
-  created() {
-      this.getList();
-      this.getProductLine();
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-
-      // tempsTabs.push({
-      //   label: "序号",
-      //   prop: "seq",
-      //   width: 50,
-      // });
-      tempsTabs.push({
-        label: "操作员登录名",
-        prop: "userName",
-        width: 140,
-      });
-      tempsTabs.push({ 
-        label: "操作员真实名称", 
-        prop: "name", 
-        width: 140
-      });
-      // tempsTabs.push({
-      //   label: "部门",
-      //   prop: "dep",
-      //   width: 120,
-      // });
-      return tempsTabs;
-    },
-    /** 列表字段 */
-    getChildDefaultField() {
-      var tempsTabs = [];
-
-      tempsTabs.push({
-        label: "生产线编码",
-        prop: "productLineCode",
-        width: 100,
-      });
-      tempsTabs.push({ 
-        label: "生产线名称", 
-        prop: "productLineName", 
-        width: 170
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    valueselectChange(data) {
-      //alert(data);
-      //版本下拉选择
-      this.valueSelect = data;
-      this.getList();
-    },
-    handleTypeDrop(command, params = {}) {
-      if (command == "updateFis") {
-        this.listLoading = true;
-        //this.listQuery.SkipCount = (this.page - 1) * 10000;
-        this.$axios
-          .posts("/api/settleaccount/SettlementPart/updateFis")
-          .then((res) => {
-            if (res == true) {
-              this.$notify({
-                title: "成功",
-                message: "FIS数据-更新成功！",
-                type: "success",
-                duration: 2000,
-              });
-            } else {
-              this.$message({
-                type: "warning",
-                message: "FIS数据-更新失败！",
-              });
-            }
-            this.listLoading = false;
-          });
-      } else if (command == "enter") {
-      }
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    getVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listVersionQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts(
-          "/api/settleaccount/SettlementPart/versionlist",
-          this.listVersionQuery
-        )
-        .then((response) => {
-          this.versionList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.id;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-          const res = new Map()
-          this.versionList = this.versionList.filter((item) => !res.has(item.label) && res.set(item.label, 1))
-          if (JSON.stringify(this.versionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      /* if (column.property === "state") {
-        return { 0: "其他", 2: "已结" }[row[column.property]];
-      }
-      if (column.property == "accountDate" || column.property == "date") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        //return moment(date).format("YYYY-MM-DD HH:mm:ss");
-        return moment(date).format("YYYY-MM-DD");
-      } */
-      // if(column.property === 'customerCode')
-      // {
-      //   if(row[column.property] === 'R0001')
-      //   {
-      //     var vname = '二配';
-      //     return vname;
-      //   }
-      //   else if(row[column.property] === 'R0003')
-      //   {
-      //     var vname = '结算';
-      //     return vname;
-      //   }
-      //   else
-      //   {
-      //     return row[column.property];
-      //   }
-      // }
-      // return row[column.property] || "--";
-    },
-    importExcelData() {
-      //this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-    //导出功能
-    async handleDownload() {
-      this.listLoading = true;
-      // if (this.versionValue === "") {
-      //   this.$message.error("必需选择版本！");
-      //   this.listLoading = false;
-      //   return;
-      // }
-      // if (this.versionValue != "") {
-      //   this.listQuery.version = this.versionValue;
-      // }
-      console.log("发票导出:" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/product-line-authority/export",
-          this.listQuery
-        )
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      console.log("列表查询条件:" + JSON.stringify(this.listQuery));
-      this.$axios
-        .gets(
-          "/api/newjit/product-line-authority/list",
-          this.listQuery
-        )
-        .then((response) => {
-          this.list = response.item;
-          this.totalCount = response.item.length;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-          this.detaillist = this.list.filter(u => u.id === this.multipleSelection[0].id)[0].productLineList;
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/settleaccount/SettlementPart/" + id)
-        .then((response) => {
-          this.form = response;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      //#region 
-      /*
-      this.listQuery.Filters = [];
-      if (this.partCode != "") {
-        var column = "partCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.partCode,
-        };
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "partCode")
-        this.listQuery.Filters.push(filter);
-      }
-
-      if (this.partName != "") {
-        var column = "partName";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.partName,
-        };
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "partName")
-        this.listQuery.Filters.push(filter);
-      }
-
-      if (this.partType != "") {
-        var column = "partType";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.partType,
-        };
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "partType")
-        this.listQuery.Filters.push(filter);
-      }
-
-      if (this.partChildType != "") {
-        var column = "partChildType";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.partChildType,
-        };
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "partChildType")
-        this.listQuery.Filters.push(filter);
-      }
-      */
-     //#endregion
-      this.getList();
-    },
-    /** 多项筛选操作 */
-    /** 筛选操作 */
-    handleFilters(data) {
-      if (data === null) {
-        this.listQuery.Filters = [];
-        this.getList(); //查询所有
-      } else {
-        console.log(data)
-        this.filterObj = data;
-        console.log("筛选" + JSON.stringify(data));
-        var offsetHei = document.documentElement.clientHeight;
-        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
-        this.tableHeight = offsetHei - removeHeight;
-        this.currentPage = 1;
-        let Filter = [];
-        data.forEach((item) => {
-          let filter = {};
-          if (item.formType === "datetime" || item.formType === "datetime") {
-            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
-
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
-            }
-          } else {
-            filter["Column"] = item.fieldName;
-            filter["Value"] = item.value;
-            filter["Logic"] = 0;
-            filter["Action"] = item.action;
-            Filter.push(filter);
-          }
-        });
-        console.log("筛选条件" + JSON.stringify(Filter));
-        this.listQuery.Filters = Filter;
-        this.getList();
-      }
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.handleFilter();
-      this.getProductLine();
-    },
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
-      if(this.listQuery.Filters.length>0 && this.listQuery.Filters[0].column === "Enabled")
-      {
-        this.sortState = false;
-      }
-      else
-      {
-        this.sortState = true;
-      }
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-      console.log(row)
-      this.detaillist = row.productLineList;
-      //console.log(this.detaillist)
-    },
-    /** 通过回调控制style */
-    cellDetailStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerDetailRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleDetailRowClick(row, column, event) {
-      this.$refs.detailTable.clearSelection();
-      this.$refs.detailTable.toggleRowSelection(row);
-    },
-    handleDetailSelectionChange(){},
-    sortDetailChange(){},
-    //获取所有产线
-    getProductLine()
-    {
-      this.$axios
-          .gets(
-            "/api/newjit/product-line/list",this.listPLQuery
-          )
-          .then((response) => {
-            console.log(response);
-            this.PLList = response.item;
-            //console.log()
-          })
-          .catch(() => {
-          });
-    },
-
-    //权限配置
-    permissionConfig()
-    {
-      if(this.multipleSelection.length != 1)
-      {
-        this.$message({
-          message: "必须选择单行",
-          type: "warning",
-        });
-        return;
-      }
-      this.UsePLList = [];
-      this.dialogFormVisible = true;
-      this.form.worklines = [];
-      var templist = this.PLList;
-      this.multipleSelection[0].productLineList.forEach(element => {
-        templist = templist.filter(u => u.id !== element.id);
-        
-      });
-      this.PLList.forEach(element => {
-        this.UsePLList.push(
-          {
-            key:this.PLList.indexOf(element), //parseInt(element.productLineCode),
-            label:element.productLineName,
-            id:element.id,
-            productLineCode:element.productLineCode,
-            disabled:false,
-          }
-        );
-      });
-      templist.forEach(element => {
-        var key = this.UsePLList.filter(u => u.id === element.id)[0].key;//获取未分配的产线key
-        this.form.worklines.push(key);
-      });
-      console.log(this.form.worklines);
-      this.form.userName = this.multipleSelection[0].userName;
-    },
-
-    //窗口确认
-    save()
-    {
-      var templist = this.UsePLList;
-      this.form.worklines.forEach(element => {
-        templist = templist.filter(u => u.key !== element);
-      });
-      //console.log(933);
-      //console.log(templist);
-      this.saveQuery.userId = [];
-      this.saveQuery.productLineIdList = [];
-      //console.log(this.multipleSelection[0]);
-      this.saveQuery.userId = this.multipleSelection[0].id;
-      templist.forEach(element => {
-        this.saveQuery.productLineIdList.push(element.id)
-      });
-      //console.log(this.saveQuery);
-
-
-      this.$axios
-          .puts(
-            "/api/newjit/product-line-authority/do-authority",this.saveQuery
-          )
-          .then((response) => {
-            debugger
-            console.log(response);
-            this.dialogFormVisible = false;
-            this.getList();
-              console.log(948)
-              this.detaillist = this.list.filter(u => u.id === this.multipleSelection[0].id)[0].productLineList;
-          })
-          .catch(() => {
-          });
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/r100Online/detail.vue b/code/WebApp/vue/src/views/pg-fis/basedate/r100Online/detail.vue
deleted file mode 100644
index 8f84588e..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/r100Online/detail.vue
+++ /dev/null
@@ -1,354 +0,0 @@
-<!--M100上线信息-明细数据-->
-<template>
-  <div class="cr-body-content">
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-      :row-key="getRowKeys"
-      :expand-row-keys="expands"
-      @expand-change="exChange"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <!-- <el-table-column
-        prop="总成名称"
-        label="erpAssemblyName"
-        sortable
-        width="180"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="erpAssemblyVersion"
-        label="总成版本号"
-        sortable
-        width="180"
-      >
-              style="width: calc(100% - 47px)"
-            class="two-list"
-      </el-table-column> -->
-
-      <el-table-column type="expand" prop="details">
-        <template slot-scope="scope">
-          <el-table :data="scope.row.details">
-            <el-table-column
-              prop="partCode"
-              label="客户零件代码"
-            ></el-table-column>
-            <el-table-column
-              prop="partNum"
-              label="客户零件数量"
-            ></el-table-column>
-            <el-table-column prop="description" label="描述"></el-table-column>
-            <el-table-column prop="isKey" label="是否Key件">
-              <template slot-scope="scope">
-                <span v-if="scope.row.isKey == true">
-                  <span style="color: #00b46d">是</span>
-                </span>
-                <span v-else>
-                  <span style="color: #d75c89">否</span>
-                </span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="erpAssemblyVersion"
-        label="总成版本号"
-        sortable
-        width="360"
-      >
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import { downloadFile } from "@/utils/crmindex.js";
-import Detail from "./detail";
-
-export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "stockFisDiffReport",
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      expands: [], //只展开一行放入当前行id
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        parentId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        SkipCount: 0,
-        MaxResultCount: 15,
-        id: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 30,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 30;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfos: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.parentId = element.ParentId;
-          });
-          if (this.customerInfo.parentId != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "总成编号",
-        prop: "erpAssemblyCode",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "总成名称",
-        prop: "erpAssemblyName",
-        width: 160,
-      });
-      // tempsTabs.push({
-      //   label: "总成版本号",
-      //   prop: "erpAssemblyName",
-      //   width: 160,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    exChange(row, rowList) {
-      this.loading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList() {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      //alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "partCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 6,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    resetQuery() {},
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/r100Online/index.vue b/code/WebApp/vue/src/views/pg-fis/basedate/r100Online/index.vue
deleted file mode 100644
index 436ef018..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/r100Online/index.vue
+++ /dev/null
@@ -1,829 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <!-- <el-row> -->
-          <el-form-item label="生产线:" prop="productType">
-            <el-select
-              v-model="listQuery.productType"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="ptypeselectChange"
-            >
-              <el-option
-                v-for="item in productTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="" prop="productLine">
-            <el-select
-              v-model="listQuery.productLine"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="valueselectChange"
-            >
-              <el-option
-                v-for="item in PLChildList"
-                :key="item.id"
-                :label="item.productLineName"
-                :value="item.productLineCode"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="版本:" prop="Version">
-            <el-input
-              v-model="listQuery.Version"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <!-- </el-row> -->
-          <!-- <el-row> -->
-          <el-form-item label="大众顺序号:" prop="HostSNBegin">
-            <el-input
-              v-model="listQuery.HostSNBegin"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="-" prop="HostSNEnd">
-            <el-input
-              v-model="listQuery.HostSNEnd"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="KNR:" prop="KNRBegin">
-            <el-input
-              v-model="listQuery.KNRBegin"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="-" prop="KNREnd">
-            <el-input
-              v-model="listQuery.KNREnd"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <!-- </el-row> -->
-          <!-- <el-row> -->
-          <!-- <el-form-item label="底盘号:" prop="VINBegin">
-          <el-input
-            v-model="listQuery.VINBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="VINEnd">
-          <el-input
-            v-model="listQuery.VINEnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item> -->
-
-          <el-form-item label="上线日期">
-            <el-date-picker
-              v-model="listQuery.OnlineTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange" :default-time="['00:00:00','23:59:59']"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-          <!-- </el-row> -->
-          <!-- <el-row> -->
-          <el-form-item label="接收日期">
-            <el-date-picker
-              v-model="listQuery.ReceiveTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange" :default-time="['00:00:00','23:59:59']"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item label="单据状态" prop="State">
-            <el-checkbox-group v-model="listQuery.state">
-              <el-checkbox
-                v-for="(item, index) in billState"
-                :key="item.id"
-                :label="item.id"
-                @change="checkedListChange(index)"
-              >
-                {{ item.name }}
-              </el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-
-          <el-form-item style="margin:0">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              style="margin-left: 15px"
-              @click="handleDownload()"
-              >导出(Excel)
-            </el-button>
-            <el-button
-              type="primary"
-              size="mini"
-              style="margin-left: 15px"
-              @click="SAPExport()"
-              >导出Excel（用于SAP导入）
-            </el-button>
-          </el-form-item>
-          <!-- </el-row> -->
-        </el-form>
-      </flexbox>
-    </div>
-    <div class="l-table" style="margin-top:-30px">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%;margin-top:30px"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <el-table-column
-          label="KNR"
-          prop="knr"
-          sortable="custom"
-          align="center"
-          width="180px"
-        >
-          <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.knr
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-          
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-        <div>
-          <Detail
-            v-bind:customerInfos="customerInfos"
-            style="margin-top: -35px"
-          ></Detail>
-        </div>
-      </el-drawer>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "R100Online",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "R100Online",
-      rules: {
-        erpAssemblyName: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      billState: [
-        { id: 2, name: "未导出" },
-        { id: 3, name: "已导出" },
-      ],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        productType: 1,
-        ProductLine: undefined,
-        Version: undefined,
-        HostSNBegin: undefined,
-        HostSNBegin: undefined,
-        KNRBegin: undefined,
-        KNREnd: undefined,
-        //VINBegin:undefined,
-        VINEnd: undefined,
-        OnlineTimeValue: [],
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-        ReceiveTimeValue: [],
-        ReceiveTimeBegin: undefined,
-        ReceiveTimeEnd: undefined,
-        billStatus: undefined,
-        state: [],
-      },
-      listExportQuery: {
-        erpAssemblyCode: undefined,
-        erpAssemblyName: undefined,
-      },
-      listPLQuery: {
-        BillType: 1,
-        //UserId: "00000000-0000-0000-0000-000000000000",
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      multipleSelection: [],
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLChildList: [], //筛选后产线下拉
-      productTypeList: [
-        { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
-      ],
-    };
-  },
-  mounted() {
-    this.getList();
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //console.log(this.$refs.box.offsetHeight);
-      //console.log(this.tableHeight);
-    });
-  },
-  created() {
-    this.billState.forEach((element, index) => {
-      if (index === 0) {
-        this.listQuery.state.push(element.id);
-      }
-    });
-    this.getProductLine();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120});
-      // tempsTabs.push({
-      //   label: "底盘号",
-      //   prop: "vin",
-      //   width: 130,
-      // });
-      // tempsTabs.push({
-      //   label: "KNR",
-      //   prop: "knr",
-      //   width: 150,
-      // });
-      tempsTabs.push({
-        label: "单据状态",
-        prop: "billStatus",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "接收时间",
-        prop: "receiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "总成编号",
-        prop: "erpAssemblyCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "总成名称",
-        prop: "erpAssemblyName",
-        width: 400,
-      });
-      tempsTabs.push({
-        label: "产线",
-        prop: "productLine",
-        width: 120,
-      });
-      //   tempsTabs.push({
-      //   label: "状态",
-      //   prop: "billStatus",
-      //   width: 120,
-      // });
-      tempsTabs.push({
-        label: "备注",
-        prop: "remark",
-        width: 120,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      var parentId = param.assemblyID; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
-      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/newjit/bill-r100/export-erp-assembly-code", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-      this.listLoading = false;
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.listQuery.OnlineTimeValue = [];
-      this.listQuery.ReceiveTimeValue = [];
-      this.listQuery.state = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-
-    handleAddDetails() {
-      if (this.form.details === undefined) {
-        this.form.details = [];
-        //console.log(679);
-      }
-      let obj = {};
-      obj.partCode = "";
-      obj.partName = "";
-      obj.partNum = "";
-      obj.isKey = false;
-      obj.description = "";
-
-      //console.log(this.form.details);
-      this.form.details.push(obj);
-      //console.log(688);
-    },
-    handleDeleteDetails(index) {
-      this.form.details.splice(index, 1);
-      //console.log(693);
-    },
-
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 0: "未匹配", 2: "未导出", 3: "已导出" }[row[column.property]];
-      }
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.OnlineTimeValue !== undefined) {
-        this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
-        this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
-      }
-      if (this.listQuery.ReceiveTimeValue !== undefined) {
-        this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
-        this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
-      }
-      if (this.listQuery.state !== undefined) {
-        this.listQuery.billStatus = this.listQuery.state[0];
-      }
-      this.$axios
-        .gets("/api/newjit/bill-r100/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    getDetialList(partCode) {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
-        .then((response) => {
-          //console.log(partCode)
-          if (partCode !== "" && partCode !== undefined) {
-            //console.log(partCode)
-            this.list = response.item.details.filter(
-              (u) => u.partCode === partCode
-            );
-          } else {
-            this.list = response.item.details;
-          }
-          //alert(JSON.stringify(response.Items))
-          //this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    valueselectChange() {
-      this.$forceUpdate();
-    },
-    handleImportSAP() {},
-
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    SAPExport() {
-      this.listLoading = true;
-      // this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
-      // this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/newjit/bill-r100/export-erp-assembly-code", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-      this.listLoading = false;
-    },
-    //获取所有产线
-    getProductLine() {
-      this.listPLQuery.UserId = this.userInfo.userId;
-      this.$axios
-        .gets("/api/newjit/product-line/list", this.listPLQuery)
-        .then((response) => {
-          //console.log(response);
-          this.PLList = response.item;
-          this.PLChildList = this.PLList.filter(
-            (u) => u.productType === parseInt(this.listQuery.productType)
-          ).sort((a, b) => {
-            return a.productLineCode - b.productLineCode;
-          });
-          this.listQuery.productLine = this.PLChildList[0].productLineCode;
-          this.getList();
-          //console.log(this.PLList)
-        })
-        .catch(() => {});
-    },
-    //产线类型变更
-    ptypeselectChange() {
-      this.$forceUpdate();
-      //console.log(this.listQuery.productType);
-      this.listQuery.productLine = "";
-      this.PLChildList = this.PLList.filter(
-        (u) => u.productType === parseInt(this.listQuery.productType)
-      ).sort((a, b) => {
-        return a.productLineCode - b.productLineCode;
-      });
-      //console.log(this.PLList)
-    },
-    /*单据状态变更 */
-    checkedListChange(index) {
-      if (this.listQuery.state.length <= 1) {
-        this.listQuery.state.push(this.billState[index].id);
-      } else {
-        this.listQuery.state = [];
-        this.listQuery.state.push(this.billState[index].id);
-      }
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-
-// /*表格全选框去除空框*/
-// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
-//   display: none;
-//   position: relative;
-// }
-// /*表格全选框改为：选择*/
-// .el-table >>> .DisabledSelection .cell:before {
-//   content: "是否Key件";
-//   position: absolute;
-//   left: 7px;
-// }
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-</style>
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/repeatR100/detail.vue b/code/WebApp/vue/src/views/pg-fis/basedate/repeatR100/detail.vue
deleted file mode 100644
index 5cc6b73f..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/repeatR100/detail.vue
+++ /dev/null
@@ -1,285 +0,0 @@
-<!--重复报文查询-明细数据-->
-<template>
-  <div class="cr-body-content">
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-      :row-key="getRowKeys"
-      :expand-row-keys="expands"
-      @expand-change="exChange"
-    >
-      <el-table-column prop="partCode" label="客户零件代码"></el-table-column>
-      <el-table-column prop="partNum" label="客户零件数量"></el-table-column>
-      <el-table-column prop="description" label="描述"></el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import { downloadFile } from "@/utils/crmindex.js";
-import Detail from "./detail";
-
-export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "stockFisDiffReport",
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      expands: [], //只展开一行放入当前行id
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        parentId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        SkipCount: 0,
-        MaxResultCount: 15,
-        id: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 30,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 30;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfos: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.parentId = element.ParentId;
-          });
-          if (this.customerInfo.parentId != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "总成名称",
-        prop: "erpAssemblyName",
-        width: 160,
-      });
-      // tempsTabs.push({
-      //   label: "总成版本号",
-      //   prop: "erpAssemblyName",
-      //   width: 160,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    exChange(row, rowList) {
-      this.loading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList() {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      this.$axios
-        .gets("/api/newjit/repeat-m100/" + this.customerInfo.parentId)
-        .then((response) => {
-          this.list = response.item.m100RepeatParts;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "partCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 6,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    resetQuery() {},
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/repeatR100/index.vue b/code/WebApp/vue/src/views/pg-fis/basedate/repeatR100/index.vue
deleted file mode 100644
index 5a4b0332..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/repeatR100/index.vue
+++ /dev/null
@@ -1,941 +0,0 @@
-<!--重复报文信息页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <!-- <el-form-item label="数据采集点" prop="productType">
-      <el-checkbox v-model="listQuery.checked1" >M100</el-checkbox>
-      <el-checkbox v-model="listQuery.checked2" >R100</el-checkbox>
-        </el-form-item> -->
-          <el-form-item label="数据采集点" prop="State" >
-            <el-checkbox-group v-model="listQuery.state">
-              <el-checkbox
-                v-for="(item, index) in billState"
-                :key="item.id"
-                :label="item.id"
-                @change="checkedListChange(index)"
-              >
-                {{ item.name }}
-              </el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-
-          <el-form-item label="生产线:" prop="productType">
-            <el-select
-              v-model="listQuery.productType"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="ptypeselectChange"
-            >
-              <el-option
-                v-for="item in productTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="" prop="productLine">
-            <el-select
-              v-model="listQuery.productLine"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="valueselectChange"
-            >
-              <el-option
-                v-for="item in PLChildList"
-                :key="item.productLineCode"
-                :label="item.productLineName"
-                :value="item.productLineCode"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="起始顺序号" prop="HostSNBegin">
-            <el-input
-              v-model="listQuery.HostSNBegin"
-              placeholder="起始顺序号"
-              clearable
-              size="small"
-              style="width: 120px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="结束顺序号" prop="HostSNEnd">
-            <el-input
-              v-model="listQuery.HostSNEnd"
-              placeholder="结束顺序号"
-              clearable
-              size="small"
-              style="width: 120px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="KNR:" prop="KNRBegin">
-            <el-input
-              v-model="listQuery.KNRBegin"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="-" prop="KNREnd">
-            <el-input
-              v-model="listQuery.KNREnd"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
-         <el-form-item label="底盘号:" prop="VINBegin">
-                <el-input
-                  v-model="listQuery.VINBegin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 200px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <el-form-item label="-" prop="VINEnd">
-                <el-input
-                  v-model="listQuery.VINEnd"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 200px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-
-           <el-form-item label="车型代码" prop="vehicleModelCode">
-        <el-select
-          v-model="listQuery.vehicleModelCode"
-          clearable
-          placeholder="请选择"
-          size="medium"
-          style="margin-right: 15px"
-          @change="valueselectChange1"
-        >
-          <el-option
-            v-for="item in vehicleModelList"
-            :key="item.id"
-            :label="item.dicItemName"
-            :value="item.dicItemCode"/>
-        </el-select>
-      </el-form-item>
-
-            <!-- <el-select
-              v-model="listQuery.VehicleModelCode"
-              placeholder="请输入总成名称"
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            /> -->
-
-          <el-form-item label="版本" prop="Version">
-            <el-input
-              v-model="listQuery.Version"
-              placeholder="请输入总成名称"
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="上线日期">
-            <el-date-picker
-              v-model="OnlineTimeValue"
-              size="small"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item label="接收日期">
-            <el-date-picker
-              v-model="ReceiveTimeValue"
-              size="small"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-
-          <!-- <el-form-item label="单据状态" prop="BillStatus">
-          <el-select
-            v-model="listQuery.BillStatus"
-            placeholder="请选择"
-            style="width: 200px"
-          >
-            <el-option label="未领取生产任务" :value="1"></el-option>
-            <el-option label="已领取生产任务" :value="2"></el-option>
-            <el-option label="完成生产任务" :value="3"></el-option>
-          </el-select>
-        </el-form-item> -->
-
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              style="margin-left: 15px"
-              @click="handleDownload()"
-              >导出(Excel)查询信息
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </flexbox>
-    </div>
-    <div class="l-table">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <el-table-column
-          label="底盘号"
-          prop="vin "
-          sortable="custom"
-          align="center"
-          fixed
-          width="180px"
-        >
-          <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.vin
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-    <!-- 抽屉控件 -->
-    <el-drawer
-      title="信息详细页"
-      size="75%"
-      direction="rtl"
-      :visible.sync="drawer"
-      :before-close="handleDrawerClose"
-    >
-      <div>
-        <Detail
-          v-bind:customerInfos="customerInfos"
-          style="margin-top: -35px"
-        ></Detail>
-      </div>
-    </el-drawer>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import { mapGetters } from "vuex";
-import Lockr from "lockr";
-import moment from "moment";
-import message_table from "../../components/mixins/message_table";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "RepeatM100",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  mixins: [message_table],
-  data() {
-    return {
-      crmType: "bomdatabase",
-      customerInfos: [],
-      billState: [
-        { id: 2, name: "R100" },
-        { id: 3, name: "M100" },
-      ],
-      isVINShowState:false,
-      OnlineTimeValue: [],
-      ReceiveTimeValue: [],
-      versionValue: "",
-      customerInfosMB:[],
-      customerInfosZHB:[],
-      versionList: [], //版本列表
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        
-        productType: 1, //1:门板；2:柱护板
-        ProductLine: undefined,
-        checked1:true,
-        checked2:true,
-        SkipCount: 0,
-        MaxResultCount: 15,
-        HostSNBegin: undefined,
-        HostSNEnd: undefined,
-        VIN: undefined,
-        VINBegin: undefined,
-        VINEnd: undefined,
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-        ReceiveTimeBegin: undefined,
-        ReceiveTimeEnd: undefined,
-        VehicleModelCode: undefined,
-        Version: undefined,
-        KNR: undefined,
-        state: [],
-
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-       vehicleModelQuery:{
-        dicTypeName:"派格车型",
-      },
-      page: 1,
-      // 显示搜索条件
-        // VehicleModelCodelist:[
-        //   {id: 1, name: "C8"},
-        //   {id: 2, name: "B8L"},
-        //   {id: 3, name: "CC"},
-        //   {id: 4, name: "BSMV"},
-        //   {id: 5, name: "B9"},
-        //    {id: 6, name: "Q5"},
-        // ],
-        productTypeList: [
-        { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
-      ],
-      showSearch: true,
-      bomUnit,
-      PLList: [],
-      PLChildList: [], //筛选后产线下拉
-      multipleSelection: [],
-      drawer: false,
-      isShowState: true,
-      dialogTableVisible: false,
-      vehicleModelList:[],//车型list
-      //tableHeight: document.documentElement.clientHeight - 260,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => { 
-        var offsetHei = document.documentElement.clientHeight;
-        //console.log(offsetHei);
-        let boxH = this.$refs.box.offsetHeight;
-        this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
-    });
-  },
-  created() {
-    //this.getList();
-    this.billState.forEach((element, index) => {
-      if (index === 0) {
-        this.listQuery.state.push(element.id);
-      }
-    });
-    this.getvehicleModel();
-    this.getProductLine();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "底盘号",
-        prop: "vin",
-        width: 130,
-      });
-      tempsTabs.push({
-        label: "上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "接收时间",
-        prop: "receiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "产线",
-        prop: "productLine",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "数据采集点",
-        prop: "",
-        width: 150,
-      });
-
-      tempsTabs.push({ label: "单据状态", prop: "billStatus", width: 120 });
-      tempsTabs.push({
-        label: "车型名称",
-        prop: "vehicleModelName",
-        width: 120,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-       ss(data) {
-      //alert(data);
-      //版本下拉选择
-      this.valueSelect = data;
-      this.getList();
-    },
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      var parentId = param.id; //传入的是总成id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      // if (this.OnlineTimeValue != []) {
-      //   this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
-      //   this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
-      // }
-      // if (this.ReceiveTimeValue != []) {
-      //   this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
-      //   this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
-      // }
-      if (this.OnlineTimeValue != []) {
-        this.listQuery.OnlineTimeBegin = this.OnlineTimeValue
-          ? this.OnlineTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.OnlineTimeEnd = this.OnlineTimeValue
-          ? this.OnlineTimeValue[1] || undefined
-          : undefined;
-      }
-      if (this.ReceiveTimeValue != []) {
-        this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue
-          ? this.ReceiveTimeValue[0] || undefined
-          : undefined;
-
-        this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue
-          ? this.ReceiveTimeValue[1] || undefined
-          : undefined;
-      }
-      console.log("重复报文导出条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/newjit/repeat-m100/export", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            })
-            .catch(() => {
-              this.listLoading = false;
-            });
-        });
-    },
-    /*单据状态变更 */
-     checkedListChange(index) {
-      if (this.listQuery.state.length <= 1) {
-        this.listQuery.state.push(this.billState[index].id);
-      } else {
-        this.listQuery.state = [];
-        this.listQuery.state.push(this.billState[index].id);
-      }
-      if(this.listQuery.state[0]=="3")
-      {
-        this.isVINShowState = true;
-      }
-      else
-      {
-        this.isVINShowState = false;
-      }
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.OnlineTimeValue = [];
-      this.ReceiveTimeValue = [];
-      this.listQuery.state = [];
-      this.$refs[refName].resetFields();
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-      // this.getListM100();
-      //  this.getListR100();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-      // this.getListM100();
-      //  this.getListR100();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-      // this.getListM100();
-      //  this.getListR100();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-        // this.getListM100();
-        //  this.getListR100();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未领取生产任务", 2: "已领取生产任务", 3: "完成生产任务" }[
-          row[column.property]
-        ];
-      }
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-      
-    },
- 
-  getList(data){
-        
-      this.listLoading = true;
-        if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.OnlineTimeValue != []) {
-        this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
-        this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
-      }
-      //  if (this.valueSelect != "") {
-      //   this.listQuery.VehicleModelCode = this.valueSelect;
-      // } else {
-      //   this.listQuery.VehicleModelCode = "";
-      // }
-      if (this.ReceiveTimeValue != []) {
-        this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
-        this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
-      }
-    
-if(this.listQuery.state[0] == "2")
-{
-  this.dialogTableVisible = false;
-  console.log("555555555555555555555555555555"+JSON.stringify(this.listQuery));
-    this.$axios
-        .gets("/api/newjit/repeat-r100/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-}
-else
-{
-  this.dialogTableVisible = true;
-this.$axios
-        .gets("/api/newjit/repeat-m100/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-}
-
-    //  if (this.billState=== 2) {
-       
-    //   this.$axios
-    //     .gets("/api/newjit/repeat-r100/list", this.listQuery)
-    //     .then((response) => {
-    //       this.list = response.items;
-    //       this.totalCount = response.totalCount;
-    //       setTimeout(() => {
-    //         //大数据量加载时
-    //         this.listLoading = false;
-    //       }, 500);
-    //     })
-    //     .catch(() => {
-    //       this.listLoading = false;
-    //     });
-    //  }
-    //  else if(this.billState === 3){
-     
-    //   this.$axios
-    //     .gets("/api/newjit/repeat-m100/list", this.listQuery)
-    //     .then((response) => {
-    //       this.list = response.items;
-    //       this.totalCount = response.totalCount;
-    //       setTimeout(() => {
-    //         //大数据量加载时
-    //         this.listLoading = false;
-    //       }, 500);
-    //     })
-    //     .catch(() => {
-    //       this.listLoading = false;
-    //     });
-    //  }
-  //}
-    
-   
-    },
-    // getList(data) {
-    //   this.listLoading = true;
-    //     if (data != undefined) {
-    //     this.listQuery.SkipCount = (this.page - 1) * data.limit;
-    //   } else {
-    //     this.listQuery.SkipCount = (this.page - 1) * 15;
-    //   }
-    //   if (this.OnlineTimeValue != []) {
-    //     this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
-    //     this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
-    //   }
-    //   if (this.ReceiveTimeValue != []) {
-    //     this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
-    //     this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
-    //   }
-    //    if (this.listQuery.state !== undefined) {
-    //     this.listQuery.billStatus = this.listQuery.state[0];
-    //   }
-    //    //this.listQueryList.ProductLine = this.listQuery.productLine;
-    //   this.$axios
-    //     .gets("/api/newjit/repeat-m100/list", this.listQuery)
-    //     .then((response) => {
-    //       this.list = response.items;
-    //       this.totalCount = response.totalCount;
-    //       setTimeout(() => {
-    //         //大数据量加载时
-    //         this.listLoading = false;
-    //       }, 500);
-    //     })
-    //     .catch(() => {
-    //       this.listLoading = false;
-    //     });
-    // },
-    handleFilter() {
-     this.dialogTableVisible = false;
-      this.page = 1;
-      this.getList();
-      // this.getListM100();
-      //  this.getListR100();
-    },
-      //产线类型变更
-    ptypeselectChange() {
-      debugger
-      this.$forceUpdate();
-      //console.log("222222222222222222222222222222222222222222"+this.listQuery.productType);
-      this.listQuery.productLine = "";
-      this.PLChildList = this.PLList.filter(
-        (u) => u.productType === parseInt(this.listQuery.productType)
-      ).sort((a, b) => {
-        return a.productLineCode - b.productLineCode;
-      });
-      console.log(this.PLList)
-      },
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    getProductLine() {
-      //debugger
-      //console.log(JSON.stringify(this.userInfo));
-      this.listPLQuery.UserId = this.userInfo.userId;
-      console.log("this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId"+this.listPLQuery.UserId);
-      this.$axios
-        .gets("/api/newjit/product-line/list", this.listPLQuery)
-        .then((response) => {
-          
-          //console.log("获取产线数据："+JSON.stringify(response.item));
-          this.PLList = response.item;
-          
-          this.PLChildList = this.PLList.filter(
-            (u) => u.productType === parseInt(this.listQuery.productType)
-          ).sort((a, b) => {
-            return a.productLineCode - b.productLineCode;
-          });
-          console.log("2222222获取产线数据："+JSON.stringify(this.PLChildList));
-          this.listQuery.productLine = this.PLChildList[0].productLineCode;
-          if (this.listQuery.productLine != "") {
-            //把产线值传到子组件
-            this.customerInfosMB = [
-              {
-                PrintType: 1,
-                ProductLine: this.PLChildList[0].productLineCode,
-              },
-            ];
-          }
-           this.getList();
-          // this.getListM100();
-          // this.getListR100();
-          //console.log(this.PLList)
-        })
-        .catch(() => {});
-    },
-     valueselectChange1(){},
-
-     valueselectChange(val) {
-      this.$forceUpdate();
-      this.customerInfosMB = [];
-      this.customerInfosZHB = [];
-      if (this.listQuery.productType === 1) {
-        //把产线值传到子组件
-        this.customerInfosMB = [
-          {
-            PrintType: 1,
-            ProductLine: val,
-          },
-        ];
-      }
-      if (this.listQuery.productType === 2) {
-        //把产线值传到子组件
-        this.customerInfosZHB = [
-          {
-            PrintType: 1,
-            ProductLine: val,
-          },
-        ];
-      }
-    },
-
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-
-     getvehicleModel()
-    {
-      this.$axios
-          .gets(
-            "/api/newjit/dic/list",this.vehicleModelQuery
-          )
-          .then((response) => {
-            //console.log(response);
-            this.vehicleModelList = response.item;
-            //console.log()
-          })
-          .catch(() => {
-          });
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/select/detail.vue b/code/WebApp/vue/src/views/pg-fis/basedate/select/detail.vue
deleted file mode 100644
index 8f84588e..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/select/detail.vue
+++ /dev/null
@@ -1,354 +0,0 @@
-<!--M100上线信息-明细数据-->
-<template>
-  <div class="cr-body-content">
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-      :row-key="getRowKeys"
-      :expand-row-keys="expands"
-      @expand-change="exChange"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <!-- <el-table-column
-        prop="总成名称"
-        label="erpAssemblyName"
-        sortable
-        width="180"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="erpAssemblyVersion"
-        label="总成版本号"
-        sortable
-        width="180"
-      >
-              style="width: calc(100% - 47px)"
-            class="two-list"
-      </el-table-column> -->
-
-      <el-table-column type="expand" prop="details">
-        <template slot-scope="scope">
-          <el-table :data="scope.row.details">
-            <el-table-column
-              prop="partCode"
-              label="客户零件代码"
-            ></el-table-column>
-            <el-table-column
-              prop="partNum"
-              label="客户零件数量"
-            ></el-table-column>
-            <el-table-column prop="description" label="描述"></el-table-column>
-            <el-table-column prop="isKey" label="是否Key件">
-              <template slot-scope="scope">
-                <span v-if="scope.row.isKey == true">
-                  <span style="color: #00b46d">是</span>
-                </span>
-                <span v-else>
-                  <span style="color: #d75c89">否</span>
-                </span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="erpAssemblyVersion"
-        label="总成版本号"
-        sortable
-        width="360"
-      >
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import { downloadFile } from "@/utils/crmindex.js";
-import Detail from "./detail";
-
-export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "stockFisDiffReport",
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      expands: [], //只展开一行放入当前行id
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        parentId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        SkipCount: 0,
-        MaxResultCount: 15,
-        id: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 30,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 30;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfos: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.parentId = element.ParentId;
-          });
-          if (this.customerInfo.parentId != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "总成编号",
-        prop: "erpAssemblyCode",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "总成名称",
-        prop: "erpAssemblyName",
-        width: 160,
-      });
-      // tempsTabs.push({
-      //   label: "总成版本号",
-      //   prop: "erpAssemblyName",
-      //   width: 160,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    exChange(row, rowList) {
-      this.loading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList() {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      //alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "partCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 6,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    resetQuery() {},
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/select/detailMB.vue b/code/WebApp/vue/src/views/pg-fis/basedate/select/detailMB.vue
deleted file mode 100644
index 490cb21c..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/select/detailMB.vue
+++ /dev/null
@@ -1,765 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <el-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="beginHostSN">
-                <el-input
-                  v-model="listQuery.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endHostSN">
-                <el-input
-                  v-model="listQuery.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="beginVin">
-                <el-input
-                  v-model="listQuery.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endVin">
-                <el-input
-                  v-model="listQuery.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
-
-          <el-form-item style="margin-top: -20px">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleUpdate()"
-              >重打(只支持单选)</el-button
-            >
-            <el-button
-              class="filter-item"
-              type="danger"
-              icon="el-icon-delete"
-              size="mini"
-              @click="handleDelete()"
-              >作废(支持批量)</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底牌号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="vehicleModel_DoorPlankCode"
-                label="车型门板代码"
-              ></el-table-column>
-              <el-table-column
-                prop="topBoxPositionNum"
-                label="上箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="topSAPMaterialNum"
-                label="上箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="topMaterialDescription"
-                label="上箱位 物料描述"
-              ></el-table-column>
-              <el-table-column
-                prop="belowBoxPositionNum"
-                label="下箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowSAPMaterialNum"
-                label="下箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowMaterialDescription "
-                label="下箱位 物料描述"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosMB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosMB: {
-      handler(newVal) {
-        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = element.PrintType;
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "起底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "止底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      this.listQuery.partType = this.listQuery.partType;
-      this.listQuery.beginVin = this.listQuery.beginVin;
-      this.listQuery.endVin = this.listQuery.endVin;
-      this.listQuery.beginHostSN = this.listQuery.beginHostSN;
-      this.listQuery.endHostSN = this.listQuery.endHostSN;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
-
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/MenBanPackingList/MenBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        let beginVin1 = this.multipleSelection[0].beginVin1;
-        let endVin1 = this.multipleSelection[0].endVin1;
-        var params = {
-          printType: 1,
-          productLine: this.customerInfo.productLine,
-          beginVin: beginVin1,
-          endVin: endVin1,
-        };
-        console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
-          .then((response) => {
-            //alert(response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=menban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-            }
-          })
-          .catch(() => {});
-      }
-    },
-    //作废操作，支持批量操作-门板
-    handleDelete(row) {
-      //批量删除
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否作废" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/newjit/MenBanPackingList/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "作废成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未打印", 2: "已打印", 3: "不可打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/select/detailZHB.vue b/code/WebApp/vue/src/views/pg-fis/basedate/select/detailZHB.vue
deleted file mode 100644
index a8e34f9a..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/select/detailZHB.vue
+++ /dev/null
@@ -1,746 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <el-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="beginHostSN">
-                <el-input
-                  v-model="listQuery.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endHostSN">
-                <el-input
-                  v-model="listQuery.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="beginVin">
-                <el-input
-                  v-model="listQuery.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endVin">
-                <el-input
-                  v-model="listQuery.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
-
-          <el-form-item style="margin-top: -20px">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleUpdate()"
-              >重打(只支持单选)</el-button
-            >
-            <el-button
-              class="filter-item"
-              type="danger"
-              icon="el-icon-delete"
-              size="mini"
-              @click="handleDelete()"
-              >作废(支持批量)</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底牌号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode"
-                label="柱护板零件号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode2"
-                label="柱护板零件号2"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosZHB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "1",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosZHB: {
-      handler(newVal) {
-        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = "1";
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "起底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "止底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);alert("ifr.src:"+JSON.stringify(ifr.src))
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      this.listQuery.partType = this.listQuery.partType;
-      this.listQuery.beginVin = this.listQuery.beginVin;
-      this.listQuery.endVin = this.listQuery.endVin;
-      this.listQuery.beginHostSN = this.listQuery.beginHostSN;
-      this.listQuery.endHostSN = this.listQuery.endHostSN;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
-
-      console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        let beginVin1 = this.multipleSelection[0].beginVin1;
-        let endVin1 = this.multipleSelection[0].endVin1;
-        var params = {
-          printType: "1",
-          productLine: this.customerInfo.productLine,
-          beginVin: beginVin1,
-          endVin: endVin1,
-        };
-        console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
-          .then((response) => {
-            console.log("柱护版-打印返回的状态：" + response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=zhuhuban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-            }
-          })
-          .catch(() => {});
-      }
-    },
-    //作废操作，支持批量操作-门板
-    handleDelete(row) {
-      //批量删除
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否作废" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/newjit/ZhuHuBanPackingList/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "作废成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未打印", 2: "已打印", 3: "不可打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/select/index.vue b/code/WebApp/vue/src/views/pg-fis/basedate/select/index.vue
deleted file mode 100644
index bbc5c8c2..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/select/index.vue
+++ /dev/null
@@ -1,1642 +0,0 @@
-<!--M100查询模块-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <el-form-item label="生产线:" prop="productType">
-            <el-select
-              v-model="listQuery.productType"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="ptypeselectChange"
-            >
-              <el-option
-                v-for="item in productTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="" prop="productLine">
-            <el-select
-              v-model="listQuery.productLine"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="valueselectChange"
-            >
-              <el-option
-                v-for="item in PLChildList"
-                :key="item.id"
-                :label="item.productLineName"
-                :value="item.productLineCode"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="版本:" prop="Version">
-            <el-input
-              v-model="listQuery.Version"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 200px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <!-- </el-row> -->
-          <el-form-item label="流水号:" prop="serialNumBegin">
-            <el-input
-              v-model="listQuery.serialNumBegin"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 200px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="-" prop="serialNumEnd">
-            <el-input
-              v-model="listQuery.serialNumEnd"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 200px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <!-- <el-row> -->
-          <el-form-item label="大众顺序号:" prop="hostSN">
-            <el-input
-              v-model="listQuery.HostSNBegin"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 200px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-         <el-form-item label="-" prop="HostSNEnd">
-            <el-input
-              v-model="listQuery.HostSNEnd"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 200px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="KNR:" prop="KNRBegin">
-            <el-input
-              v-model="listQuery.KNRBegin"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 200px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="-" prop="KNREnd">
-            <el-input
-              v-model="listQuery.KNREnd"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 200px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <!-- </el-row> -->
-          <!-- <el-row> -->
-          <el-form-item label="底盘号:" prop="VINBegin">
-            <el-input
-              v-model="listQuery.VINBegin"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 200px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="-" prop="VINEnd">
-            <el-input
-              v-model="listQuery.VINEnd"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 200px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="上线日期">
-            <el-date-picker
-              v-model="listQuery.OnlineTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              :default-time="['00:00:00', '23:59:59']"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-          <!-- </el-row> -->
-          <!-- <el-row> -->
-          <el-form-item label="接收日期">
-            <el-date-picker
-              v-model="listQuery.ReceiveTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              :default-time="['00:00:00', '23:59:59']"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item label="单据状态" prop="State" v-show="isShowState">
-            <el-checkbox-group v-model="listQuery.state">
-              <el-checkbox
-                v-for="(item, index) in billState"
-                :key="item.id"
-                :label="item.id"
-                @change="checkedListChange(index)"
-              >
-                {{ item.name }}
-              </el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-
-          <el-form-item >
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              style="margin-left: 15px"
-              @click="handleDownload()"
-              >导出(Excel)
-            </el-button>
-          </el-form-item>
-
-          <!-- </el-row> -->
-        </el-form>
-      </flexbox>
-    </div>
-    <!--门板重打和作废-->
-    <el-drawer
-      title="门板作废和重打"
-      :visible.sync="drawerMB"
-      direction="rtl"
-      size="65%"
-    >
-      <MBDetail v-bind:customerInfosMB="customerInfosMB"></MBDetail>
-    </el-drawer>
-    <!--柱护板重打和作废-->
-    <el-drawer
-      title="柱护板作废和重打"
-      :visible.sync="drawerZHB"
-      direction="rtl"
-      size="65%"
-    >
-      <ZHBDetail v-bind:customerInfosZHB="customerInfosZHB"></ZHBDetail>
-    </el-drawer>
-
-    <div class="l-table" style="margin-top: -30px">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <el-table-column
-          label="底盘号"
-          prop="vin "
-          sortable="custom"
-          align="center"
-          width="180px"
-        >
-          <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.vin
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div>
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        :title="formTitle"
-        width="700px"
-        @close="closeDialog"
-      >
-        <el-form
-          ref="form"
-          :inline="true"
-          :model="form"
-          :rules="rules"
-          size="small"
-          label-width="120px"
-        >
-          <el-row>
-            <el-col :span="24">
-              <el-form-item
-                label="大众顺序号:"
-                prop="beginHostSN"
-                v-show="isShowHostSN"
-              >
-                <el-input
-                  v-model="form.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 200px"
-                />
-                <label class="label1">-</label>
-                <el-input
-                  v-model="form.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 200px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="底盘号:" prop="VIN" v-show="isShowVin">
-                <el-input
-                  v-model="form.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 200px"
-                />
-                <label class="label1">-</label>
-                <el-input
-                  v-model="form.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 200px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="dialogFormVisible = false"
-            >取消</el-button
-          >
-          <el-button v-loading="formLoading" type="primary" @click="save"
-            >确认</el-button
-          >
-        </div>
-      </el-dialog>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        style="margin-bottom: -5px; float: right"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-        <div>
-          <Detail
-            v-bind:customerInfos="customerInfos"
-            style="margin-top: -35px"
-          ></Detail>
-        </div>
-      </el-drawer>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import Detail from "./detail.vue";
-import MBDetail from "./detailMB.vue";
-import ZHBDetail from "./detailZHB.vue";
-import { mapGetters } from "vuex";
-import moment from "moment";
-
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "select",
-  components: {
-    Pagination,
-    CRMTableHead,
-    importExcel,
-    Detail,
-    MBDetail,
-    ZHBDetail,
-  },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      chkindex: 0, //复选按钮选择索引
-      crmType: "select",
-      drawerZHB: false,
-      drawerMB: false,
-      activeNames: ["1"],
-      rules: {
-        erpAssemblyName: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      billState: [
-        { id: 2, name: "未打印" },
-        { id: 3, name: "已打印" },
-        { id: 4, name: "不可打印" },
-      ],
-      valueSelect: "",
-      customerInfos: [],
-      customerInfosMB: [],
-      customerInfosZHB: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        productType: 1, //1:门板；2:柱护板
-        ProductLine: undefined,
-        Version: undefined,
-        printBillNum: undefined,
-        serialNumBegin: undefined,
-        serialNumEnd: undefined,
-        HostSNBegin: undefined,
-        HostSNEnd: undefined,
-        KNRBegin: undefined,
-        KNREnd: undefined,
-        VINBegin: undefined,
-        VINEnd: undefined,
-        OnlineTimeValue: [],
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-        ReceiveTimeValue: [],
-        ReceiveTimeBegin: undefined,
-        ReceiveTimeEnd: undefined,
-        billStatus: undefined,
-        state: [],
-        ZHBBillStatus: undefined,
-        Description:undefined
-      },
-      listExportQuery: {
-        erpAssemblyCode: undefined,
-        erpAssemblyName: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      vinPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      PLChildList: [], //筛选后产线下拉
-      productTypeList: [
-        { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
-      ],
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.billState.forEach((element, index) => {
-      if (index === 0) {
-        this.listQuery.state.push(element.id);
-      }
-    });
-    this.getProductLine();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
-      // tempsTabs.push({
-      //   label: "底盘号",
-      //   prop: "vin",
-      //   width: 130,
-      // });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "M100上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "M100接收时间",
-        prop: "receiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "产线",
-        prop: "productLine",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "状态",
-        prop: "billStatus",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "柱护板状态",
-        prop: "printBillNum",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "不可打印",
-        prop: "canNotPrint",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "R100上线时间",
-        prop: "r100OnlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100接收时间",
-        prop: "r100ReceiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "备注",
-        prop: "description",
-        width: 120,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      //console.log(510)
-      //console.log(param)
-      var parentId = param.assemblyID; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
-      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/newjit/assembly-cfg-erp/export", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-      this.listLoading = false;
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.listQuery.OnlineTimeValue = [];
-      this.listQuery.ReceiveTimeValue = [];
-      this.listQuery.state = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-
-    handleAddDetails() {
-      if (this.form.details === undefined) {
-        this.form.details = [];
-        //console.log(679);
-      }
-      let obj = {};
-      obj.partCode = "";
-      obj.partName = "";
-      obj.partNum = "";
-      obj.isKey = false;
-      obj.description = "";
-
-      //console.log(this.form.details);
-      this.form.details.push(obj);
-      //console.log(688);
-    },
-    handleDeleteDetails(index) {
-      this.form.details.splice(index, 1);
-      //console.log(693);
-    },
-
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if(column.property === "printBillNum"){
-        let value = row[column.property]
-        if(value!=null&&value.length > 0){
-          return "柱护板已打印";
-        }
-        else{
-          return "柱护板未打印";
-        }
-      }
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      if (column.property === "canNotPrint") {
-        return { true: "是", false: "否" }[row[column.property]];
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.OnlineTimeValue !== undefined) {
-        this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
-        this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
-      }
-      if (this.listQuery.ReceiveTimeValue !== undefined) {
-        this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
-        this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
-      }
-
-      if (this.chkindex == 2) {
-        //不可打印
-        this.listQuery.canNotPrint = true;
-        this.listQuery.billStatus = null;
-        this.listQuery.ZHBBillStatus = null;
-      } else {
-        this.listQuery.canNotPrint = null;
-        if (this.listQuery.state !== undefined) {
-          this.listQuery.billStatus = this.listQuery.state[0];
-        }
-
-        if (this.listQuery.productType === 2) {
-          this.listQuery.ZHBBillStatus = this.listQuery.billStatus;
-        } else {
-          this.listQuery.ZHBBillStatus = null;
-        }
-      }
-
-      console.log("M100查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .gets("/api/newjit/bill-m100/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          console.log("M100结果：" + JSON.stringify(this.list));
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    getDetialList(partCode) {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
-        .then((response) => {
-          //console.log(partCode)
-          if (partCode !== "" && partCode !== undefined) {
-            //console.log(partCode)
-            this.list = response.item.details.filter(
-              (u) => u.partCode === partCode
-            );
-          } else {
-            this.list = response.item.details;
-          }
-          //alert(JSON.stringify(response.Items))
-          //this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    valueselectChange(val) {
-      this.$forceUpdate();
-      this.customerInfosMB = [];
-      this.customerInfosZHB = [];
-      if (this.listQuery.productType === 1) {
-        //把产线值传到子组件
-        this.customerInfosMB = [
-          {
-            PrintType: 1,
-            ProductLine: val,
-          },
-        ];
-      }
-      if (this.listQuery.productType === 2) {
-        //把产线值传到子组件
-        this.customerInfosZHB = [
-          {
-            PrintType: 1,
-            ProductLine: val,
-          },
-        ];
-      }
-    },
-    handleImportSAP() {},
-
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-    /**打印 */
-    print() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 0);
-      this.hostPrintQuery.printType = 0;
-      this.vinPrintQuery.printType = 0;
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "warning",
-        });
-        return;
-      }
-      this.hostSNQuery.productLine = this.listQuery.productLine;
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-      //后端服务更改了 前端跟着更改成以下方式
-      if (this.listQuery.productType === 1) {
-        //门板
-        this.hostSNQuery.isZhuHuBan = "0";
-        console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            console.log("获取hostsn大众顺序号起始");
-            console.log(response.item);
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              if (this.listQuery.productType === 1) {
-                //门板
-                this.form.endHostSN = parseInt(response.item) + 11;
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                this.form.endHostSN = parseInt(response.item) + 23;
-              }
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      } else if (this.listQuery.productType === 2) {
-        //柱护板
-        this.hostSNQuery.isZhuHuBan = "1";
-        console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            console.log("获取hostsn大众顺序号起始");
-            console.log(response.item);
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              if (this.listQuery.productType === 1) {
-                //门板
-                this.form.endHostSN = parseInt(response.item) + 11;
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                this.form.endHostSN = parseInt(response.item) + 23;
-              }
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      }
-
-      // this.$axios
-      //   .gets("/api/newjit/bill-m100/get-print-start-hostsn", this.hostSNQuery)
-      //   .then((response) => {
-      //     console.log("获取hostsn大众顺序号起始");
-      //     console.log(response.item);
-      //     if (response.item !== null) {
-      //       this.form.beginHostSN = parseInt(response.item);
-      //       if (this.listQuery.productType === 1) {
-      //         //门板
-      //         this.form.endHostSN = parseInt(response.item) + 11;
-      //       } else if (this.listQuery.productType === 2) {
-      //         //柱护板
-      //         this.form.endHostSN = parseInt(response.item) + 23;
-      //       }
-      //     } else {
-      //       this.$message({
-      //         message: "获取不到大众顺序号",
-      //         type: "warning",
-      //       });
-      //       return;
-      //     }
-      //   })
-      //   .catch(() => {});
-      this.formTitle = "打印";
-      this.dialogFormVisible = true;
-      this.form = {
-        beginHostSN: "",
-        endHostSN: "",
-      };
-      this.isShowHostSN = true;
-      this.isShowVin = false;
-    },
-    /**重打 */
-    rePrint() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 1);
-      this.hostPrintQuery.printType = 1;
-      this.vinPrintQuery.printType = 1;
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "warning",
-        });
-        return;
-      }
-      this.formTitle = "重打";
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-      this.dialogFormVisible = true;
-      this.form = {
-        beginVin: "",
-        endVin: "",
-      };
-      this.isShowHostSN = false;
-      this.isShowVin = true;
-    },
-    /**补打 */
-    makeUpPrint() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 2);
-      this.hostPrintQuery.printType = 2;
-      this.vinPrintQuery.printType = 2;
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "error",
-        });
-        return;
-      }
-      this.formTitle = "补打";
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-      this.dialogFormVisible = true;
-      this.form = {
-        beginVin: "",
-        endVin: "",
-      };
-      this.isShowHostSN = false;
-      this.isShowVin = true;
-    },
-    /**保存*/
-    save() {
-      if (this.isShowHostSN === true) {
-        if (this.form.beginHostSN === "" || this.form.endHostSN === "") {
-          this.$message({
-            message: "请输入完整的顺序号起始范围",
-            type: "error",
-          });
-          return;
-        } else {
-          if (this.listQuery.productType === 1) {
-            //门板
-            if (
-              parseInt(this.form.endHostSN) - parseInt(this.form.beginHostSN) <=
-              0
-            ) {
-              this.$message({
-                message: "起止大众顺序号相减不能为零！",
-                type: "error",
-              });
-              return;
-            }
-          } else if (this.listQuery.productType === 2) {
-            //柱护板
-            if (
-              parseInt(this.form.endHostSN) - parseInt(this.form.beginHostSN) >
-              23
-            ) {
-              this.$message({
-                message:
-                  "最多只能打印24个顺序号，终止顺序号不能大于" +
-                  (parseInt(this.form.beginHostSN) + 23),
-                type: "error",
-              });
-              return;
-            }
-          }
-        }
-      }
-      if (this.isShowVin === true) {
-        if (this.form.beginVin === "" || this.form.endVin === "") {
-          this.$message({
-            message: "请输入完整的底盘号起始范围",
-            type: "error",
-          });
-          return;
-        }
-      }
-      /**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */
-      if (this.formTitle === "打印") {
-        this.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN);
-        this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN);
-        //验证是否断号
-        this.$axios
-          .posts(
-            "/api/newjit/bill-m100/check-hostsn-break-num",
-            this.hostCheckQuery
-          )
-          .then((response) => {
-            console.log("检查hostsn大众顺序号是否断号");
-            console.log(response);
-            if (response.item.length > 0) {
-              this.$confirm("本次打印存在断号是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-              })
-                .then(() => {
-                  //判断productType类型
-                  if (this.listQuery.productType === 1) {
-                    //门板
-                    //传递大众顺序号起止
-                    this.$axios
-                      .posts(
-                        "/api/newjit/bill-m100/print-menban-packing-list",
-                        this.hostPrintQuery
-                      )
-                      .then((response) => {
-                        console.log("打印门板装箱单");
-                        console.log(response);
-                        console.log(response.status);
-                        if (response.status === false) {
-                          this.$message({
-                            message: response.message,
-                            type: "error",
-                          });
-                          return;
-                        } else if (response.status === true) {
-                          //传给grid++接口json数据，得到返回的文件base64
-                          //this.fileQuery.report = "menban";
-                          this.fileQuery.dataname = JSON.stringify(
-                            response.item
-                          );
-                          //this.fileQuery.dataname = "";
-                          console.log("打印json");
-                          console.log(this.fileQuery.dataname);
-                          this.$axios
-                            .posts(
-                              "/Handlers/Handler1.ashx?report=menban",
-                              qs.stringify(this.fileQuery)
-                            )
-                            .then((response) => {
-                              console.log("获取文件base64编码");
-                              console.log(response);
-                              this.printpdf(response); //打印我文件流
-                            });
-                        }
-                      });
-                  } else if (this.listQuery.productType === 2) {
-                    //柱护板
-                    //传递大众顺序号起止
-                    this.$axios
-                      .posts(
-                        "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-                        this.hostPrintQuery
-                      )
-                      .then((response) => {
-                        console.log("打印柱护板装箱单");
-                        console.log(response);
-                        if (response.status === false) {
-                          this.$message({
-                            message: response.message,
-                            type: "error",
-                          });
-                          return;
-                        } else if (response.status === true) {
-                          //传给grid++接口json数据，得到返回的文件base64
-                          //this.fileQuery.report = "menban";
-                          this.fileQuery.dataname = JSON.stringify(
-                            response.item
-                          );
-                          //this.fileQuery.dataname = "";
-                          console.log("打印json");
-                          console.log(this.fileQuery.dataname);
-                          this.$axios
-                            .posts(
-                              "/Handlers/Handler1.ashx?report=zhuhuban",
-                              qs.stringify(this.fileQuery)
-                            )
-                            .then((response) => {
-                              console.log("获取文件base64编码");
-                              console.log(response);
-                              this.printpdf(response); //打印我文件流
-                            });
-                        }
-                      });
-                  }
-                })
-                .catch(() => {});
-            } //无断号
-            else {
-              //判断productType类型
-              if (this.listQuery.productType === 1) {
-                //门板
-                //传递大众顺序号起止
-                this.$axios
-                  .posts(
-                    "/api/newjit/bill-m100/print-menban-packing-list",
-                    this.hostPrintQuery
-                  )
-                  .then((response) => {
-                    console.log("打印门板装箱单");
-                    console.log(response);
-                    if (response.status === false) {
-                      this.$message({
-                        message: response.message,
-                        type: "error",
-                      });
-                      return;
-                    } else if (response.status === true) {
-                      //传给grid++接口json数据，得到返回的文件base64
-                      //this.fileQuery.report = "menban";
-                      this.fileQuery.dataname = JSON.stringify(response.item);
-                      //this.fileQuery.dataname = "";
-                      console.log("打印json");
-                      console.log(this.fileQuery.dataname);
-                      this.$axios
-                        .posts(
-                          "/Handlers/Handler1.ashx?report=menban",
-                          qs.stringify(this.fileQuery)
-                        )
-                        .then((response) => {
-                          console.log("获取文件base64编码");
-                          console.log(response);
-                          this.printpdf(response); //打印我文件流
-                        });
-                    }
-                  })
-                  .catch(() => {
-                    this.$message({
-                      message: response.message,
-                      type: "error",
-                    });
-                    return;
-                  });
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                //传递大众顺序号起止
-                this.$axios
-                  .posts(
-                    "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-                    this.hostPrintQuery
-                  )
-                  .then((response) => {
-                    console.log("打印柱护板装箱单");
-                    console.log(response);
-                    if (response.status === false) {
-                      this.$message({
-                        message: response.message,
-                        type: "error",
-                      });
-                      return;
-                    } else if (response.status === true) {
-                      //传给grid++接口json数据，得到返回的文件base64
-                      //this.fileQuery.report = "menban";
-                      this.fileQuery.dataname = JSON.stringify(response.item);
-                      //this.fileQuery.dataname = "";
-                      console.log("打印json");
-                      console.log(this.fileQuery.dataname);
-                      this.$axios
-                        .posts(
-                          "/Handlers/Handler1.ashx?report=zhuhuban",
-                          qs.stringify(this.fileQuery)
-                        )
-                        .then((response) => {
-                          console.log("获取文件base64编码");
-                          console.log(response);
-                          this.printpdf(response); //打印我文件流
-                        });
-                    }
-                  })
-                  .catch(() => {
-                    this.$message({
-                      message: response.message,
-                      type: "error",
-                    });
-                    return;
-                  });
-              }
-            }
-          });
-      } else {
-        /**接口1获取打印数据，接口2获得grid++模板的base64编码 */
-        this.hostPrintQuery.beginVin = this.form.beginVin;
-        this.hostPrintQuery.endVin = this.form.endVin;
-        //判断productType类型
-        if (this.listQuery.productType === 1) {
-          //门板
-          //传递底盘号起止
-          this.$axios
-            .posts(
-              "/api/newjit/bill-m100/print-menban-packing-list",
-              this.hostPrintQuery
-            )
-            .then((response) => {
-              console.log(
-                "重新或补打打印门板装箱单" + JSON.stringify(this.hostPrintQuery)
-              );
-              console.log(response);
-              if (response.status === false) {
-                this.$message({
-                  message: response.message,
-                  type: "error",
-                });
-                return;
-              } else if (response.status === true) {
-                //传给grid++接口json数据，得到返回的文件base64
-                //this.fileQuery.report = "menban";
-                this.fileQuery.dataname = JSON.stringify(response.item);
-                //this.fileQuery.dataname = "";
-                console.log("打印json");
-                console.log(this.fileQuery.dataname);
-                this.$axios
-                  .posts(
-                    "/Handlers/Handler1.ashx?report=menban",
-                    qs.stringify(this.fileQuery)
-                  )
-                  .then((response) => {
-                    console.log("获取文件base64编码");
-                    console.log(response);
-                    this.printpdf(response); //打印我文件流
-                  });
-              }
-            })
-            .catch(() => {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            });
-        } else if (this.listQuery.productType === 2) {
-          //柱护板
-          //传递底盘号起止
-          this.$axios
-            .posts(
-              "/api/newjit/bill-m100/print-zhuhuban-packing-list",
-              this.hostPrintQuery
-            )
-            .then((response) => {
-              console.log("打印柱护板装箱单");
-              console.log(response);
-              if (response.status === false) {
-                this.$message({
-                  message: response.message,
-                  type: "error",
-                });
-                return;
-              } else if (response.status === true) {
-                //传给grid++接口json数据，得到返回的文件base64
-                //this.fileQuery.report = "zhuhuban";
-                this.fileQuery.dataname = JSON.stringify(response.item);
-                //this.fileQuery.dataname = "";
-                console.log("打印json");
-                console.log(this.fileQuery.dataname);
-                this.$axios
-                  .posts(
-                    "/Handlers/Handler1.ashx?report=zhuhuban",
-                    qs.stringify(this.fileQuery)
-                  )
-                  .then((response) => {
-                    console.log("获取文件base64编码");
-                    console.log(response);
-                    this.printpdf(response); //打印我文件流
-                  });
-              }
-            })
-            .catch(() => {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            });
-        }
-      }
-    },
-    //获取所有产线
-    getProductLine() {
-      this.listPLQuery.UserId = this.userInfo.userId;
-      this.$axios
-        .gets("/api/newjit/product-line/list", this.listPLQuery)
-        .then((response) => {
-          //console.log(response);
-          this.PLList = response.item;
-          this.PLChildList = this.PLList.filter(
-            (u) => u.productType === parseInt(this.listQuery.productType)
-          ).sort((a, b) => {
-            return a.productLineCode - b.productLineCode;
-          });
-          this.listQuery.productLine = this.PLChildList[0].productLineCode;
-          if (this.listQuery.productLine != "") {
-            //把产线值传到子组件
-            this.customerInfosMB = [
-              {
-                PrintType: 1,
-                ProductLine: this.PLChildList[0].productLineCode,
-              },
-            ];
-          }
-          this.getList();
-          //console.log(this.PLList)
-        })
-        .catch(() => {});
-    },
-    //产线类型变更
-    ptypeselectChange() {
-      this.$forceUpdate();
-      //console.log(this.listQuery.productType);
-      this.listQuery.productLine = "";
-      this.PLChildList = this.PLList.filter(
-        (u) => u.productType === parseInt(this.listQuery.productType)
-      ).sort((a, b) => {
-        return a.productLineCode - b.productLineCode;
-      });
-      //console.log(this.PLList)
-      //变更打印按钮文字
-      if (this.listQuery.productType === 1) {
-        this.$refs.btn1.$el.innerText = "打印门板发货排序单";
-        this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
-        this.$refs.btn3.$el.innerText = "补打门板发货排序单";
-        this.listQuery.state.push(this.billState[0].id);
-        this.isShowState = true;
-      } else if (this.listQuery.productType === 2) {
-        this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
-        this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
-        this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
-        this.listQuery.state = [];
-        this.isShowState = false;
-      }
-    },
-    /*单据状态变更 */
-    checkedListChange(index) {
-      this.chkindex = index;
-
-      if (this.listQuery.state.length <= 1) {
-        this.listQuery.state.push(this.billState[index].id);
-      } else {
-        this.listQuery.state = [];
-        this.listQuery.state.push(this.billState[index].id);
-      }
-    },
-    /**解析文件流 */
-    getUrl() {
-      //dataResult.data是后台返回的流
-      let pdfUrl = window.URL.createObjectURL(
-        new Blob([dataResult.data], { type: `application/pdf` })
-      );
-      const fname = item.name + str + "_" + lists[1] + lists[2]; // 下载文件的名字
-      const link = document.createElement("a");
-      link.href = pdfUrl;
-      link.setAttribute("download", "下载的文件名");
-      document.body.appendChild(link);
-      link.click();
-      document.body.removeChild(link);
-    },
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    httpPost(URL, PARAMS) {
-      var temp = document.createElement("form");
-      temp.action = URL;
-      temp.method = "post";
-      temp.style.display = "none";
-
-      for (var x in PARAMS) {
-        var opt = document.createElement("textarea");
-        opt.name = x;
-        opt.value = PARAMS[x];
-        temp.appendChild(opt);
-      }
-
-      document.body.appendChild(temp);
-      temp.submit();
-
-      return temp;
-    },
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-
-// /*表格全选框去除空框*/
-// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
-//   display: none;
-//   position: relative;
-// }
-// /*表格全选框改为：选择*/
-// .el-table >>> .DisabledSelection .cell:before {
-//   content: "是否Key件";
-//   position: absolute;
-//   left: 7px;
-// }
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue b/code/WebApp/vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue
deleted file mode 100644
index fafdf9e6..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue
+++ /dev/null
@@ -1,286 +0,0 @@
-<!--未知总成-明细数据-->
-<template>
-  <div>
-    <table style="width: 99%">
-      <tr>
-        <td>
-          <div class="cr-body-content">
-            <!--表格渲染-->
-            <el-table
-              ref="multipleTable"
-              v-loading="listLoading"
-              element-loading-text="拼命加载中..."
-              element-loading-spinner="el-icon-loading"
-              class="cr-table"
-              :data="list"
-              :height="tableHeight"
-              :cell-style="cellStyle"
-              :header-cell-style="headerRowStyle"
-              size="small"
-              stripe
-              border
-              highlight-current-row
-              style="width: 100%"
-              @sort-change="sortChange"
-              @selection-change="handleSelectionChange"
-              @row-click="handleRowClick"
-            >
-              <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-              <el-table-column
-                label="客户零件代码"
-                prop="partCode "
-                sortable="custom"
-                align="center"
-                width="220px"
-              >
-                <template slot-scope="scope">
-                  <span>{{ scope.row.partCode }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                v-for="(item, index) in getDefaultField"
-                :key="index"
-                :prop="item.prop"
-                :label="item.label"
-                :min-width="item.width"
-                :formatter="fieldFormatter"
-                sortable="custom"
-                show-overflow-tooltip
-                :gutter="0"
-              >
-                <template slot="header" slot-scope="scope">
-                  {{ scope.column.label }}
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </td>
-      </tr>
-
-      <tr style="height: 20px">
-        <td>
-          <div align="center">共{{ pagecount }}条数据</div>
-        </td>
-      </tr>
-    </table>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import { downloadFile } from "@/utils/crmindex.js";
-import Detail from "./detail";
-import { logger } from "runjs/lib/common";
-
-export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  pagecount: 0,
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "stockFisDiffReport",
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        parentId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        SkipCount: 0,
-        MaxResultCount: 15,
-        id: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 30 - 50,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 67 - 79 - 50; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 30 - 50;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfos: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.parentId = element.ParentId;
-          });
-          if (this.customerInfo.parentId != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      //tempsTabs.push({ label: "客户零件代码", prop: "partCode ", width: 120 });
-      tempsTabs.push({ label: "客户零件数量", prop: "partNum", width: 95 });
-      tempsTabs.push({ label: "描述", prop: "description", width: 280 });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    // fieldFormatter(row, column) {
-    //   return row[column.property] || "--";
-    // },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList() {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      this.$axios
-        .gets("/api/newjit/unknown-assembly/" + this.customerInfo.parentId)
-        .then((response) => {
-          this.list = response.item.unknownAssemblyParts;
-          this.pagecount = response.item.unknownAssemblyParts.length;
-          //console.log("pagecountpagecountpagecountpagecountpagecount：" + JSON.stringify(this.pagecount));
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "partCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 6,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    resetQuery() {},
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left", background: "#FAFAFA" };
-    },
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-</style>
-
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/unknownAssembly/index copy.vue b/code/WebApp/vue/src/views/pg-fis/basedate/unknownAssembly/index copy.vue
deleted file mode 100644
index 9e29ae2d..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/unknownAssembly/index copy.vue	
+++ /dev/null
@@ -1,1563 +0,0 @@
-<!--未知总成管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-    <flexbox class="content-header">
-      <el-form
-        :model="listQuery"
-        ref="queryForm"
-        v-show="showSearch"
-        :inline="true"
-      >
-        <el-form-item label="KNR:" prop="KNRBegin">
-          <el-input
-            v-model="listQuery.KNRBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="KNREnd">
-          <el-input
-            v-model="listQuery.KNREnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="底盘号:" prop="VINBegin">
-          <el-input
-            v-model="listQuery.VINBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="VINEnd">
-          <el-input
-            v-model="listQuery.VINEnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-
-        <el-form-item label="车型代码" prop="VehicleModelCode">
-          <el-select
-            v-model="listQuery.vehicleModelCode"
-            clearable
-            placeholder="请选择"
-            size="medium"
-            style="margin-right: 15px"
-            @change="valueselectChange"
-          >
-            <el-option
-              v-for="item in vehicleModelList"
-              :key="item.id"
-              :label="item.dicItemName"
-              :value="item.dicItemCode"/>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="版本" prop="Version">
-          <el-input
-            v-model="listQuery.Version"
-            placeholder="请输入版本"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item label="上线日期">
-          <el-date-picker
-            v-model="OnlineTimeValue"
-            size="small"
-            style="width: 380px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-
-        <el-form-item>
-          <el-button
-            class="filter-item"
-            size="mini"
-            type="primary"
-            icon="el-icon-plus"
-            :loading="buttonLoading"
-            @click="handleUpdate()"
-            >重新解析(批量操作)
-          </el-button>
-        </el-form-item>
-        
-        <el-form-item>
-          <el-button
-            class="addAssy"
-            size="mini"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleCreate"
-            >添加总成
-          </el-button>
-        </el-form-item>
-
-        <el-form-item label="扫描点" prop="ScanPoint">
-          <el-select
-            v-model="listQuery.ScanPoint"
-            placeholder="请选择"
-            style="width: 200px"
-            clearable
-          >
-            <el-option
-              v-for="item in ScanPointList"
-              :key="item.id"
-              :label="item.label"
-              :value="item.id"/>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleFilter"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="resetQuery('queryForm')"
-            >重置</el-button
-          >
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            style="margin-left: 15px"
-            @click="handleDownload()"
-            >导出(Excel)
-          </el-button>
-
-          <el-button
-            class="filter-item"
-            plain
-            size="mini"
-            type="success"
-            icon="el-icon-check"
-            :loading="button2Loading"
-            @click="handleUpdateAll()"
-            >重新解析(执行全部)
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </flexbox>
-    </div>
-    <div class="l-table">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column
-          label="底盘号"
-          prop="vin"
-          sortable
-          align="center"
-          width="180px"
-        >
-          <template slot-scope="scope">
-              <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-                scope.row.vin
-              }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="操作" align="center" width="128px">
-          <template slot-scope="{ row }">
-            <el-button
-              type="primary"
-              size="mini"
-              @click="handleUpdate(row)"
-              icon="el-icon-edit"
-            />
-          </template>
-        </el-table-column> -->
-      </el-table>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-        <div>
-          <Detail
-            v-bind:customerInfos="customerInfos"
-            style="margin-top: -35px"
-          ></Detail>
-        </div>
-      </el-drawer>
-    </div>
-      
-      <!--添加总成-->
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        :title="formTitle"
-        append-to-body
-        width="1000px"
-      >
-        <div style="width:980px;height:600px">
-          <el-row>
-            <el-col :span="8">
-              <div style="border:1px;width:280px">
-                <el-row>
-                  <div class="app">
-                      <!-- handleCurrentChange -->
-                    <el-table border style="margin:0px;width:280px;" height="260px" ref="asTable" :data="erpAssemblyCfgList" highlight-current-row @row-click="rowClickass" @select="selectAss">
-                        <el-table-column type="selection" width="40px"></el-table-column>
-                        <el-table-column prop="erpAssemblyCode" label="总成编号" align="center" width="178px"></el-table-column>
-                        <!-- 添加删除按钮 -->
-                        <el-table-column align="center" width="61px">
-                          <!-- type="button" :render-header="renderHeader" -->
-                          <!-- <template slot="header" slot-scope="scope">
-                            <el-button @click="addzc(scope.$index,scope.row)" icon="el-icon-plus">
-                            </el-button>
-                          </template> -->
-                          <template slot-scope="scope">
-                            <el-button @click="delzc(scope.$index,scope.row)" icon="el-icon-minus" size="mini" align="left">
-                            </el-button>
-                          </template>
-                        </el-table-column>
-                    </el-table>
-                  </div>
-                </el-row>
-                <el-row>
-                  <div style="width:280px;border:1px" >
-                    <el-divider content-position="center">添加Erp总成</el-divider>
-                    <el-form style="border:1px" :label-position="labelPosition" label-width="100px" :model="assly" ref="assly" border>
-                      <el-form-item label="Erp总成编码" style="height:40px;width:280px">
-                        <el-input v-model="assly.erpAssemblyCode" clearable placeholder="请输入Erp总成编码"></el-input>
-                      </el-form-item>
-                      <el-form-item label="Erp总成名称" style="height:40px;width:280px">
-                        <el-input v-model="assly.erpAssemblyName" clearable placeholder="请输入Erp总成名称"></el-input>
-                      </el-form-item>
-                      <el-form-item label="车型" style="height:40px;">
-                        <!-- <el-input v-model="assly.carModel" clearable></el-input> -->
-                        <el-select v-model="assly.carModel" clearable placeholder="请选择车型">
-                          <el-option
-                            v-for="item in vehicleModelList"
-                            :key="item.id"
-                            :label="item.dicItemName"
-                            :value="item.dicItemCode"/>
-                        </el-select>
-                      </el-form-item>
-                      <el-form-item>
-                        <el-button type="primary" @click="submitAssyForm('assly')">添加</el-button>
-                      </el-form-item>
-                    </el-form>
-                  </div>
-                </el-row>
-              </div>
-            </el-col>
-            <el-col :span="7">
-              <div style="border:1px;height:570px;width:270px">
-                <el-table :data="tempdetails" ref="leftTable" height="550" stripe border highlight-current-row @row-click="rowClickLeft" @select="selectLeft">
-                  <el-table-column type="selection" width="40px"></el-table-column>
-                  <el-table-column prop="partCode" label="结算件代码" width="150px" align="center"></el-table-column>
-                  <el-table-column prop="partNum" label="数量" width="78px" align="center"></el-table-column>
-                </el-table>
-              </div>
-            </el-col>
-            <el-col :span="2">
-              <!-- 左右穿梭按钮 -->
-              <div align="center" style="height:570px;width:70px">
-                <el-row style="line-height: 300px;">
-                  <el-button @click="btnleftclick()" icon="el-icon-caret-left"></el-button>
-                </el-row>
-                <el-row>
-                  <el-button @click="btnrightclick()" icon="el-icon-caret-right"></el-button>
-                </el-row>
-              </div>
-            </el-col>
-            <el-col :span="7">
-              <div style="border:1px;height:570px;width:270px">
-                <el-table :data="data2" ref="rightTable" height="550" stripe border highlight-current-row @row-click="rowClickRight" @select="selectRight">
-                  <el-table-column type="selection" width="40px"></el-table-column>
-                  <el-table-column prop="partCode" label="结算件代码" width="150px" align="center"></el-table-column>
-                  <el-table-column prop="partNum" label="数量" width="78px" align="center"></el-table-column>
-                </el-table>
-              </div>
-            </el-col>
-                <!-- <el-table-transfer
-                    leftTitle="结算件"
-                    rightTitle="未知总成"
-                    :columns='columns'
-                    :dataLeft="data1"
-                    :dataRight="data2"
-                >
-                    <template v-slot:default="{scope}">
-                        <div>
-                          {{scope.row[scope.col.value]}}
-                        </div>
-                    </template>
-                </el-table-transfer> -->
-                <!-- 可以使用插槽获取到列信息和行信息，从而进行数据的处理 -->
-              <!-- <el-col :span="17"></el-col> -->
-          </el-row>
-          
-          <div slot="footer" class="dialog-footer" align="right" style="width:950px">
-            <el-button :loading="formLoading" type="primary" @click="save">确认</el-button>
-          </div>
-        </div>
-        
-      </el-dialog>
-
-      <!-- 移动数量窗体 -->
-      <el-dialog 
-        :visible.sync="dialogNumVisible"
-        :close-on-click-modal="false"
-        :title="numTitle"
-        append-to-body
-        width="570px"
-      >
-        <div>
-          <el-form :model="numFormData" ref="numFormData" label-width="100px" class="num-ruleForm">
-            <el-form-item
-              label="数量"
-              prop="num"
-              :rules="[
-                { required: true, message: '数量不能为空且至少为1'},
-              ]"
-            >
-              <el-input type="text" v-model="numFormData.num"></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div slot="footer" class="dialog-footer">
-          <el-button :loading="formLoading" type="primary" @click="saveNum()">确认</el-button>
-          <el-button type="text" @click="dialogNumVisible = false">取消</el-button>
-        </div>
-      </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "UnknownAssembly",
-  components: { Pagination, CRMTableHead, importExcel, Detail},
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "bomdatabase",
-      rules: {
-        erpAssemblyName: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      valueSelect: "",
-      OnlineTimeValue: [],//上线时间
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      asTemp:[],//总成编号点击缓存
-      rightRowTemp: [],//右侧移动点击缓存
-      leftRowTemp: [],//左侧移动点击缓存
-      selectioned:'',//单选中的值
-      carModels:[],//车型下拉框数据源
-      currentRow: "",
-      versionList: [], //版本列表
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-        KNR: undefined,
-        VIN: undefined,
-        ScanPoint: undefined,
-      },
-      listUnknownAssemblyQuery: {
-        billId:'',
-        //apply:"",
-        vin:'',
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      multipleSelection: [],
-      drawer: false,
-      dialogFormVisible: false,
-      dialogNumVisible: false,
-      formTitle: "",
-      numTitle: "",
-      isEdit: false,
-      formLoading: false,
-      buttonLoading:false,
-      button2Loading:false,
-      //dialogFormVisible: false,
-      tableHeight: document.documentElement.clientHeight - 220,
-      //columns: [
-      //          {name: '结算件代码', value: 'partCode', width: '180px'},
-      //          {name: '数量', value: 'partNum',},
-      //      ],
-      // data1: [
-      // ],
-      
-      numFormData:{
-        num: 1
-      },
-      zcCode:[],
-      /*最终提交缓存*/
-      tempAssCfgList: [
-      ],
-      /*右侧数据源*/
-      data2: [],
-      /*中间数据源*/
-      tempdetails:[
-            //{
-              // partCode: "1",
-              // partNum: 0,
-              // isKey: true
-            //}
-      ],
-      /*左侧总成数据源*/
-      erpAssemblyCfgList: [],
-        // {
-        //   erpAssemblyCode: "string",
-        //   erpAssemblyName: "string",
-        //   isCover: true,
-        //   carModel: "",
-        //   previousVersionId: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-        //   details: [
-        //     {
-        //       partCode: "string",
-        //       partNum: 0,
-        //       description: "string",
-        //       isKey: true
-        //     }
-        //   ]
-        // }
-      labelPosition: 'left',
-      assly: {
-        erpAssemblyCode: '',
-        erpAssemblyName: '',
-        carModel: ''
-      },
-      vehicleModelQuery:{
-        dicTypeName:"派格车型",
-      },
-      vehicleModelList:[],//车型list
-      ScanPointList:[{id:"0",label:" "},{id:"R100",label:"R100"},{id:"M100",label:"M100"}]
-      };
-  },
-  mounted() {
-    this.$nextTick(() => { 
-        var offsetHei = document.documentElement.clientHeight;
-        //console.log(offsetHei);
-        let boxH = this.$refs.box.offsetHeight;
-        this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
-    });
-  },
-  created() {
-    this.getvehicleModel();
-    this.getList();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "大众顺序号",
-        prop: "hostSN",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "扫描点",
-        prop: "scanPoint",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "车型名称",
-        prop: "vehicleModelName",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({ label: "客户零件数量", prop: "partNum", width: 135 });
-      tempsTabs.push({
-        label: "文件名",
-        prop: "fileName",
-        width: 180,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      var parentId = param.id; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    handleUpdateAll() {
-      var params = {
-        isSelectAll: true,
-        unknownAssemblyIdList: [],
-      };
-      this.$confirm("是否要全部进行解析?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.button2Loading = true;
-          this.$axios
-            .posts("/api/newjit/unknown-assembly/to-parse", params)
-            .then((response) => {
-              if (response.status == true) {
-                this.$notify({
-                  title: "成功",
-                  message: "操作成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.button2Loading = false;
-                this.getList();
-              } else {
-                this.button2Loading = false;
-                this.$message({
-                  type: "warning",
-                  message: response.message,
-                });
-              }
-            })
-            .catch(() => {
-              this.button2Loading = false;
-              this.$message({
-                  type: "warning",
-                  message: response.message,
-                });
-            });
-        })
-    },
-    /** 重新计算总成 */
-    handleUpdate(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行",
-          type: "warning",
-        });
-        return;
-      } else {
-        this.buttonLoading = true;
-        //批量操作
-        var params = {
-          isSelectAll: false,
-          unknownAssemblyIdList: [],
-        };
-        if (row) {
-          //单行
-          params.unknownAssemblyIdList.push(row.id);
-        } else {
-          //多选
-          this.multipleSelection.forEach((element) => {
-            let id = element.id;
-            params.unknownAssemblyIdList.push(id);
-          });
-        }
-        console.log("未知总成详表条件：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/unknown-assembly/to-parse", params)
-          .then((response) => {
-            if (response.status == true) {
-              this.$notify({
-                title: "成功",
-                message: "操作成功！",
-                type: "success",
-                duration: 2000,
-              });
-              this.buttonLoading = false;
-              this.getList();
-            } else {
-              this.buttonLoading = false;
-              this.$message({
-                type: "warning",
-                message: response.message,
-              });
-            }
-          })
-          .catch(() => {
-            this.buttonLoading = false;
-            this.$message({
-                type: "warning",
-                message: response.message,
-              });
-          });
-      }
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/unknown-assembly/" + id)
-        .then((response) => {
-          this.form = response.item;
-        });
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      this.$axios
-        .posts("/api/newjit/unknown-assembly/export", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.OnlineTimeValue = [];
-      this.$refs[refName].resetFields();
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-    /* 主页面添加总成按钮事件 */
-    handleCreate() {
-      // this.$nextTick(() => {
-      //   this.$refs["formCount"].resetFields();
-      // });
-      if (this.multipleSelection.length !== 1) {
-        this.$message({
-          message: "必须选择一行",
-          type: "warning",
-        });
-        return;
-      } else {
-        console.log(this.multipleSelection[0].id);
-        console.log(this.multipleSelection[0].vin);
-        this.formTitle = "添加总成";
-        this.isEdit = false;
-        this.form = {};
-        this.getUnknownAssemblyList();
-        this.getZcCode();
-        this.getvehicleModel();
-        this.dialogFormVisible = true;
-      }
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 0: "未生效", 2: "已生效", 3: "已发布" }[row[column.property]];
-      }
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.OnlineTimeValue != []) {
-        this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0]//this.OnlineTimeValue
-          // ? this.OnlineTimeValue[0] || ""
-          // : "";
-        this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1]//this.OnlineTimeValue
-          // ? this.OnlineTimeValue[1] || ""
-          // : "";
-      }
-      this.$axios
-        .gets("/api/newjit/unknown-assembly/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    /* 获取车型数据源 */
-    getCarModel(){
-      this.$axios
-        .gets("/api/newjit/dic/list"+"?dicTypeName=车型")
-        .then((response) => {
-          console.log("this is response.items",response.item);
-          this.carModels = response.item;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-        //console.log("this is carModels",this.carModels);
-    },
-    /* 加号按钮添加事件 */
-    addzc()
-    {
-      //todo 添加总成左侧的 加号按钮 待做
-      alert("1")
-    },
-    /* 减号按钮删除事件 */
-    delzc(index)
-    {
-      this.erpAssemblyCfgList.splice(index, 1);
-      console.log(this.erpAssemblyCfgList);
-    },
-    /* 添加总成最终提交的数据事件*/
-    save() {
-      //if(this.data2.length ===0){
-        if(this.data2.length !==0)
-        {
-          this.$message({
-              message: "还有件代码尚未匹配",
-              type: "error",
-            });
-          return;
-        }
-        this.formLoading = true;
-
-        var lastSubmit = {
-            billId:this.listUnknownAssemblyQuery.billId,
-            scanPoint: "M100",
-            erpAssemblyCfgList:[]
-        };
-        lastSubmit.erpAssemblyCfgList = this.tempAssCfgList;
-
-        // var lastSubmitt = [];
-        // console.log("flag")
-        // this.tempAssCfgList.forEach(element => {
-        //   element.details.forEach(element1 => {
-        //     lastSubmitt.push({
-        //       erpAssemblyCode: element.erpAssemblyCode,
-        //       erpAssemblyName: element.erpAssemblyName,
-        //       isCover: false,
-        //       previousVersionId:"f7d45dba-3164-4a91-b477-3c568c81e6a0",
-        //       vehicleModel: element.vehicleModel,
-        //       details:{
-        //         partCode:element1.partCode,
-        //         partNum:element1.partNum,
-        //         description:element1.description,
-        //         isKey: true,
-        //       }
-        //     })
-        //   });
-        // });
-        // console.log("this is lastSubmitt:",lastSubmitt)
-        // var lastSubmit = [];
-        // lastSubmitt.forEach(element => {
-        //   lastSubmit.push({
-        //     billID:this.listUnknownAssemblyQuery.billId,
-        //     scanPoint: "M100",
-        //     erpAssemblyCfgList:[{
-        //       erpAssemblyCode: element.erpAssemblyCode,
-        //       erpAssemblyName: element.erpAssemblyName,
-        //       isCover: false,
-        //       previousVersionId: null,
-        //       vehicleModel: element.vehicleModel,
-        //       details:element.details
-        //     }]
-        //   })
-        // });
-        // console.log("this is lastSubmit:",lastSubmit)
-
-        this.$axios
-          .posts(
-            "/api/newjit/unknown-assembly/add-assembly",
-            lastSubmit
-          )
-          .then((response) => {
-            if(response.status === true){
-              this.dialogFormVisible = false;
-              this.leftRowTemp = [];
-              this.rightRowTemp = [];
-              this.tempAssCfgList = [];
-              this.tempdetails = [];
-              this.erpAssemblyCfgList =[];
-              this.asTemp = [];
-              
-              this.$notify({
-                    title: "成功",
-                    message: "添加总成成功！",
-                    type: "success",
-                    duration: 2000,
-                  });
-            }
-          })
-          .catch(() => {
-            //this.listLoading = false;
-          });
-      // }
-      // else{
-      //   alert("未知零件未分配完，请确认！")
-      // }
-    },
-    /* 获取未知总成零件数据源 */
-    getUnknownAssemblyList(){
-      this.listUnknownAssemblyQuery.billId=this.multipleSelection[0].id;
-      //console.log(this.listUnknownAssemblyQuery);
-      this.$axios
-          .gets(
-            "/api/newjit/unknown-assembly/"+this.listUnknownAssemblyQuery.billId
-          ).then((response) => {
-          this.data2 = response.item.unknownAssemblyParts.filter(u => u.partType === "1" || u.partType === null);
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        })
-    },
-    /* 获取总成零件数据源*/
-    getZcCode(){
-      this.zcCode = [];
-      this.listUnknownAssemblyQuery.vin=this.multipleSelection[0].vin;
-      //console.log(this.listUnknownAssemblyQuery.vin);
-      this.$axios
-        .gets(
-          "/api/newjit/unknown-assembly/get-erp-assembly-code"+"?vin="+this.listUnknownAssemblyQuery.vin
-        ).then((response) => {
-          console.log(response.item);
-          if(response.item.length !== 0){
-            console.log("has no ASSCode");
-          }
-          else{
-            response.item.forEach((zccode) => {
-              this.erpAssemblyCfgList.push({
-                erpAssemblyCode: zccode,
-                erpAssemblyName: [],
-                isCover: false,
-                carModel: "",
-                previousVersionId: null,
-                details: [
-                  {
-                    partCode: "",
-                    partNum: 0,
-                    description: "",
-                    isKey: false
-                  }
-                ]
-              })
-            });
-          }
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-    },
-    /* 添加总成提交方法 */
-    submitAssyForm(formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            if(this.assly.erpAssemblyCode !== ""){
-              this.erpAssemblyCfgList.push({
-                erpAssemblyCode: this.assly.erpAssemblyCode,
-                erpAssemblyName: this.assly.erpAssemblyName,
-                carModel: this.assly.carModel,
-                isCover: false,
-                previousVersionId: null,
-                details: []
-              })
-              console.log(this.erpAssemblyCfgList);
-              this.assly.erpAssemblyCode = '';
-              this.assly.erpAssemblyName = '';
-              this.assly.carModel = '';
-            }
-            else{
-              alert("请先填写Erp总成信息！")
-            }
-          } 
-          else {
-            console.log('error submit!!');
-            return false;
-          }
-        });
-      },
-    btnleftclick(){
-      if(this.asTemp.length === 0){
-        alert("请先选择总成编号！")
-      }
-      else{
-        if(this.rightRowTemp.length === 0){
-          alert("请先选择需移动的零件")
-        }
-        else if(this.rightRowTemp.length !== 0 && parseInt(this.rightRowTemp[0].partNum) !== 1){
-          this.numFormData.num = parseInt(this.rightRowTemp[0].partNum);
-          this.dialogNumVisible = true;
-          this.numTitle = "输入移动结算件数量"
-        }
-        else{
-          console.log("R->F");
-            this.numFormData.num = 1;
-            if(this.numFormData.num <= this.rightRowTemp[0].partNum && this.numFormData.num > 0){
-
-              //数据插入最终缓存
-              if(this.tempAssCfgList.length !== 0){
-                console.log("second")
-                var rfMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
-                if(rfMove.length !== 0){
-                  var sameDetail = rfMove[0].details.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
-                  if(sameDetail.length !== 0){
-                    sameDetail[0].partNum =  parseInt(sameDetail[0].partNum) + parseInt(this.numFormData.num);
-                  }
-                  else{
-                    rfMove[0].details.push({
-                      description: this.rightRowTemp[0].description,
-                      isKey: false,
-                      partCode: this.rightRowTemp[0].partCode,
-                      partNum: this.numFormData.num,//移动框输入的数量
-                    })
-                  }
-                }
-                else{
-                  console.log("加进去了")
-                  this.tempAssCfgList.push({
-                  erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
-                  erpAssemblyName: this.asTemp[0].erpAssemblyName,
-                  isCover: false,
-                  previousVersionId: this.asTemp[0].previousVersionId,
-                  vehicleModel: this.asTemp[0].carModel,
-                  details:[{
-                    description: this.rightRowTemp[0].description,
-                    isKey: false,
-                    partCode: this.rightRowTemp[0].partCode,
-                    partNum: this.numFormData.num,//移动框输入的数量
-                  }]
-                })
-                }
-              }
-              else{
-                console.log("first")
-                this.tempAssCfgList.push({
-                  erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
-                  erpAssemblyName: this.asTemp[0].erpAssemblyName,
-                  isCover: false,
-                  previousVersionId: this.asTemp[0].previousVersionId,
-                  details:[{
-                    description: this.rightRowTemp[0].description,
-                    isKey: false,
-                    partCode: this.rightRowTemp[0].partCode,
-                    partNum: this.numFormData.num,//移动框输入的数量
-                  }]
-                })
-              }
-
-              console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
-              //数据插入中间数据源
-              var judge = this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
-              if(judge.length === 1){
-                var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-                this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode)[0].partNum = t;
-              }
-              else{
-                this.tempdetails.push({
-                  description: this.rightRowTemp[0].description,
-                  isKey: false,
-                  partCode: this.rightRowTemp[0].partCode,
-                  partNum: parseInt(this.numFormData.num),//移动框输入的数量
-                })
-              }
-              /* 右侧数据移动 */
-              var delid = this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0]
-              var n1 = parseInt(this.numFormData.num);
-              var n2 = parseInt(delid.partNum);
-              if(n1 === n2){
-                this.data2 = this.data2.filter(u=>u.id !== this.rightRowTemp[0].id);
-                this.rightRowTemp = [];
-              }
-              else{
-                this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0].partNum =  delid.partNum - this.numFormData.num;
-                this.rightRowTemp[0].partNum = n2 - n1;
-              }
-            }
-        }
-      }
-    },
-    btnrightclick(){
-      if(this.asTemp.length === 0){
-        alert("请先选择总成编号！")
-      }
-      else{
-        if(this.leftRowTemp.length === 0){
-        alert("请先选择需移动的零件")
-        }
-        else if(this.leftRowTemp.length !== 0 && parseInt(this.leftRowTemp[0].partNum) !== 1){
-          this.numFormData.num = parseInt(this.leftRowTempnpm[0].partNum);
-          this.dialogNumVisible = true;
-          this.numTitle = "输入移动结算件数量"
-        }
-        else{
-          console.log("F->R");
-          this.numFormData.num = 1;
-            if(this.numFormData.num <= this.leftRowTemp[0].partNum && this.numFormData.num > 0){
-              
-              //数据插入最终缓存
-              console.log("移除或删除")
-              var frMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
-              var samedetail = frMove[0].details.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
-              if(samedetail.length !== 0){
-                if(parseInt(samedetail[0].partNum) === parseInt(this.numFormData.num)){
-                  frMove[0].details = frMove[0].details.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
-                }
-                else{
-                  samedetail[0].partNum =  parseInt(samedetail[0].partNum) - parseInt(this.numFormData.num);
-                }
-              }
-              else if(samedetail.length !== 0){
-                alert("没有数据!");
-              }
-
-              console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
-              
-              //数据插入右侧数据源
-              var judge = this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
-              if(judge.length === 1){
-                var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-                this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum = t;
-              }
-              else{
-                  this.data2.push({
-                    description: this.leftRowTemp[0].description,
-                    isKey: false,
-                    partCode: this.leftRowTemp[0].partCode,
-                    partNum: parseInt(this.numFormData.num),//移动框输入的数量
-                })
-              }
-              /* 中间数据移动 */
-              var delid = this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0]
-              var n1 = parseInt(this.numFormData.num);
-              var n2 = parseInt(delid.partNum);
-              if(n1 === n2){
-                this.tempdetails = this.tempdetails.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
-                this.leftRowTemp = [];
-              }
-              else{
-                this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum =  parseInt(delid.partNum) - parseInt(this.numFormData.num);
-                this.leftRowTemp[0].partNum = n2 - n1;
-              }
-            }
-        }
-      }
-    },
-    /* 保存数量事件 */
-    saveNum(){
-      if(this.asTemp.length !== 0){
-        //判断中间选中移动还是右侧选中移动
-        /*   左侧移动到右侧   */
-        if(this.leftRowTemp.length !== 0){
-          console.log("F->R");
-          if(this.numFormData.num <= this.leftRowTemp[0].partNum && this.numFormData.num > 0){
-            
-            //数据插入最终缓存
-            console.log("移除或删除")
-            var frMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
-            var samedetail = frMove[0].details.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
-            if(samedetail.length !== 0){
-              if(parseInt(samedetail[0].partNum) === parseInt(this.numFormData.num)){
-                frMove[0].details = frMove[0].details.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
-              }
-              else{
-                samedetail[0].partNum =  parseInt(samedetail[0].partNum) - parseInt(this.numFormData.num);
-              }
-            }
-            else if(samedetail.length !== 0){
-              alert("没有数据!");
-            }
-
-            console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
-            
-            //数据插入右侧数据源
-            var judge = this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
-            if(judge.length === 1){
-              var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-              this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum = t;
-            }
-            else{
-                this.data2.push({
-                  description: this.leftRowTemp[0].description,
-                  isKey: false,
-                  partCode: this.leftRowTemp[0].partCode,
-                  partNum: parseInt(this.numFormData.num),//移动框输入的数量
-              })
-            }
-            /* 中间数据移动 */
-            var delid = this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0]
-            var n1 = parseInt(this.numFormData.num);
-            var n2 = parseInt(delid.partNum);
-            if(n1 === n2){
-              this.tempdetails = this.tempdetails.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
-              this.leftRowTemp = [];
-            }
-            else{
-              this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum =  parseInt(delid.partNum) - parseInt(this.numFormData.num);
-              this.leftRowTemp[0].partNum = n2 - n1;
-            }
-          }
-          else if(this.numFormData.num == 0){
-            alert("输入数字不能为0！");
-          }
-          else{
-            alert("输入不正确,请确认！");
-          }
-        }
-        /*   右侧移动到左侧   */
-        else if(this.rightRowTemp.length !== 0){
-          console.log("R->F");
-          if(this.numFormData.num <= this.rightRowTemp[0].partNum && this.numFormData.num > 0){
-
-            //数据插入最终缓存
-            if(this.tempAssCfgList.length !== 0){
-              console.log("second")
-              var rfMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
-              if(rfMove.length !== 0){
-                var sameDetail = rfMove[0].details.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
-                if(sameDetail.length !== 0){
-                  sameDetail[0].partNum =  parseInt(sameDetail[0].partNum) + parseInt(this.numFormData.num);
-                }
-                else{
-                  rfMove[0].details.push({
-                    description: this.rightRowTemp[0].description,
-                    isKey: false,
-                    partCode: this.rightRowTemp[0].partCode,
-                    partNum: this.numFormData.num,//移动框输入的数量
-                  })
-                }
-              }
-              else{
-                console.log("加进去了")
-                this.tempAssCfgList.push({
-                erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
-                erpAssemblyName: this.asTemp[0].erpAssemblyName,
-                vehicleModel: this.asTemp[0].carModel,
-                isCover: false,
-                previousVersionId: this.asTemp[0].previousVersionId,
-                details:[{
-                  description: this.rightRowTemp[0].description,
-                  isKey: false,
-                  partCode: this.rightRowTemp[0].partCode,
-                  partNum: this.numFormData.num,//移动框输入的数量
-                }]
-              })
-              }
-            }
-            else{
-              console.log("first")
-              this.tempAssCfgList.push({
-                erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
-                erpAssemblyName: this.asTemp[0].erpAssemblyName,
-                isCover: false,
-                previousVersionId: this.asTemp[0].previousVersionId,
-                vehicleModel: this.asTemp[0].carModel,
-                details:[{
-                  description: this.rightRowTemp[0].description,
-                  isKey: false,
-                  partCode: this.rightRowTemp[0].partCode,
-                  partNum: this.numFormData.num,//移动框输入的数量
-                }]
-              })
-            }
-
-            console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
-            //数据插入中间数据源
-            var judge = this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
-            if(judge.length === 1){
-              var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-              this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode)[0].partNum = t;
-            }
-            else{
-              this.tempdetails.push({
-                description: this.rightRowTemp[0].description,
-                isKey: false,
-                partCode: this.rightRowTemp[0].partCode,
-                partNum: parseInt(this.numFormData.num),//移动框输入的数量
-              })
-            }
-            /* 右侧数据移动 */
-            var delid = this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0]
-            var n1 = parseInt(this.numFormData.num);
-            var n2 = parseInt(delid.partNum);
-            if(n1 === n2){
-              this.data2 = this.data2.filter(u=>u.id !== this.rightRowTemp[0].id);
-              this.rightRowTemp = [];
-            }
-            else{
-              this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0].partNum =  delid.partNum - this.numFormData.num;
-              this.rightRowTemp[0].partNum = n2 - n1;
-            }
-          }
-          else if(this.numFormData.num == 0){
-            alert("输入数字不能为0！");
-          }
-          else{
-            alert("输入不正确,请确认！");
-          }
-        }
-        this.dialogNumVisible = false;
-      }
-      else{
-        alert("请先选择总成编号！")
-      }
-      this.dialogNumVisible = false;
-    },
-    /* 总成编号选中事件 */
-    rowClickass(row) {
-      this.asTemp=[];
-      this.tempdetails=[];
-      this.$refs.asTable.clearSelection();
-      this.$refs.asTable.toggleRowSelection(row);
-      this.asTemp.push(row);
-      
-      if(this.asTemp[0].details.length !== 0){
-        //选中插入中间数据源
-        this.tempdetails.push({
-          isKey: false,
-          partCode: this.asTemp[0].details[0].partCode,
-          partNum: this.asTemp[0].details[0].partNum,
-          vehicleModel:this.asTemp[0].details[0].carModel,
-        })
-      }
-      //二次选中插入最终提交中的details
-      var judgeSec = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode)
-      console.log("this is judgeSec:",judgeSec);
-      if(judgeSec.length !== 0){
-        console.log("this is judgeSec[0].details:",judgeSec[0].details);
-        judgeSec[0].details.forEach(element => {
-            this.tempdetails.push(element)
-        });
-      }
-      console.log("this is this.tempdetails",this.tempdetails);
-      console.log("this is asTemp",this.asTemp);
-    },
-    /* 总成编号复选框单选事件 */
-    selectAss(selection, row) {
-      this.asTemp=[]; //清空已选
-      this.tempdetails = [];
-      console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
-      // 选择项大于1时
-      if (selection.length > 1) {
-      let del_row = selection.shift();
-      // console.log('把数组的第一个元素从其中删除后', selection);
-      this.$refs.asTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
-      }
-      this.asTemp.push(selection[0])
-      console.log('当用户手动勾选数据行', this.asTemp)
-
-      if(this.asTemp[0].details.length !== 0){
-        //选中插入中间数据源
-        this.tempdetails.push({
-          isKey: false,
-          partCode: this.asTemp[0].details[0].partCode,
-          partNum: this.asTemp[0].details[0].partNum,
-          vehicleModel:this.asTemp[0].details[0].carModel,
-        })
-      }
-
-      //二次选中插入最终提交中的details
-      var judgeSec = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode)
-      console.log("this is judgeSec:",judgeSec);
-      if(judgeSec.length !== 0){
-        console.log("this is judgeSec[0].details:",judgeSec[0].details);
-        judgeSec[0].details.forEach(element => {
-            this.tempdetails.push(element)
-        });
-      }
-      console.log("this is this.tempdetails",this.tempdetails);
-      console.log("this is asTemp",this.asTemp);
-    },
-    /* 右侧数据选中事件 */
-    rowClickRight(row) {
-      this.rightRowTemp = [];
-      this.$refs.rightTable.clearSelection();
-      this.$refs.rightTable.toggleRowSelection(row);
-      this.rightRowTemp.push(row);
-    },
-    /* 左侧数据选中事件 */
-    rowClickLeft(row) {
-      this.leftRowTemp = [];
-      this.$refs.leftTable.clearSelection();
-      this.$refs.leftTable.toggleRowSelection(row);
-      this.leftRowTemp.push(row);
-    },
-    /* 右侧复选框单选事件 */
-    selectRight(selection, row) {
-      this.rightRowTemp=[]; //清空已选
-      console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
-      // 选择项大于1时
-      if (selection.length > 1) {
-      let del_row = selection.shift();
-      // console.log('把数组的第一个元素从其中删除后', selection);
-      this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
-      }
-      this.rightRowTemp.push(selection[0])
-      console.log('当用户手动勾选数据行', this.rightRowTemp)
-    },
-    /* 左侧复选框单选事件 */
-    selectLeft(selection, row) {
-      this.leftRowTemp=[]; //清空已选
-      console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
-      // 选择项大于1时
-      if (selection.length > 1) {
-      let del_row = selection.shift();
-      // console.log('把数组的第一个元素从其中删除后', selection);
-      this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
-      }
-      this.leftRowTemp.push(selection[0])
-      console.log('当用户手动勾选数据行', this.leftRowTemp)
-    },
-    getvehicleModel()
-    {
-      this.$axios
-          .gets(
-            "/api/newjit/dic/list",this.vehicleModelQuery
-          )
-          .then((response) => {
-            //console.log(response);
-            this.vehicleModelList = response.item;
-            //console.log()
-          })
-          .catch(() => {
-          });
-    },
-    valueselectChange(){},
-  },
-};
-
-</script>
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue b/code/WebApp/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
deleted file mode 100644
index d1033618..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
+++ /dev/null
@@ -1,1859 +0,0 @@
-<!--未知总成管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <el-form-item label="KNR:" prop="KNRBegin">
-            <el-input
-              v-model="listQuery.KNRBegin"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="-" prop="KNREnd">
-            <el-input
-              v-model="listQuery.KNREnd"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="底盘号:" prop="VINBegin">
-            <el-input
-              v-model="listQuery.VINBegin"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="-" prop="VINEnd">
-            <el-input
-              v-model="listQuery.VINEnd"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="车型代码" prop="VehicleModelCode">
-            <el-select
-              v-model="listQuery.vehicleModelCode"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="valueselectChange"
-            >
-              <el-option
-                v-for="item in vehicleModelList"
-                :key="item.id"
-                :label="item.dicItemName"
-                :value="item.dicItemCode"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="版本" prop="Version">
-            <el-input
-              v-model="listQuery.Version"
-              placeholder="请输入版本"
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="上线日期">
-            <el-date-picker
-              v-model="OnlineTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              :default-time="['00:00:00', '23:59:59']"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="primary"
-              icon="el-icon-plus"
-              :loading="buttonLoading"
-              @click="handleUpdate()"
-              >重新解析(批量操作)
-            </el-button>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button
-              class="addAssy"
-              size="mini"
-              type="primary"
-              icon="el-icon-plus"
-              @click="handleCreate"
-              >添加总成
-            </el-button>
-          </el-form-item>
-
-          <el-form-item label="扫描点" prop="ScanPoint">
-            <el-select
-              v-model="listQuery.ScanPoint"
-              placeholder="请选择"
-              style="width: 200px"
-              clearable
-            >
-              <el-option
-                v-for="item in ScanPointList"
-                :key="item.id"
-                :label="item.label"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              style="margin-left: 15px"
-              @click="handleDownload()"
-              >导出(Excel)
-            </el-button>
-
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              style="margin-left: 15px"
-              @click="handleDownloadNotRepeat()"
-              >导出(不重复)
-            </el-button>
-
-            <el-button
-              class="filter-item"
-              plain
-              size="mini"
-              type="success"
-              icon="el-icon-check"
-              :loading="button2Loading"
-              @click="handleUpdateAll()"
-              >重新解析(执行全部)
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </flexbox>
-    </div>
-    <div class="l-table">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column
-          label="大众顺序号"
-          prop="hostSN"
-          sortable
-          align="center"
-          width="110px"
-        >
-          <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.hostSN
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="操作" align="center" width="128px">
-          <template slot-scope="{ row }">
-            <el-button
-              type="primary"
-              size="mini"
-              @click="handleUpdate(row)"
-              icon="el-icon-edit"
-            />
-          </template>
-        </el-table-column> -->
-      </el-table>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-        <div>
-          <Detail
-            v-bind:customerInfos="customerInfos"
-            style="margin-top: -35px"
-          ></Detail>
-        </div>
-      </el-drawer>
-    </div>
-
-    <!--添加总成-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="1000px"
-    >
-      <div style="width: 980px; height: 600px">
-        <el-row>
-          <el-col :span="8">
-            <div style="border: 1px; width: 280px">
-              <el-row>
-                <div class="app">
-                  <!-- handleCurrentChange -->
-                  <el-table
-                    border
-                    style="margin: 0px; width: 280px"
-                    height="260px"
-                    ref="asTable"
-                    :data="erpAssemblyCfgList"
-                    highlight-current-row
-                    @row-click="rowClickass"
-                    @select="selectAss"
-                  >
-                    <el-table-column
-                      type="selection"
-                      width="40px"
-                    ></el-table-column>
-                    <el-table-column
-                      prop="erpAssemblyCode"
-                      label="总成编号"
-                      align="center"
-                      width="178px"
-                    ></el-table-column>
-                    <!-- 添加删除按钮 -->
-                    <el-table-column align="center" width="61px">
-                      <!-- type="button" :render-header="renderHeader" -->
-                      <!-- <template slot="header" slot-scope="scope">
-                            <el-button @click="addzc(scope.$index,scope.row)" icon="el-icon-plus">
-                            </el-button>
-                          </template> -->
-                      <template slot-scope="scope">
-                        <el-button
-                          @click="delzc(scope.$index, scope.row)"
-                          icon="el-icon-minus"
-                          size="mini"
-                          align="left"
-                        >
-                        </el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </div>
-              </el-row>
-              <el-row>
-                <div style="width: 280px; border: 1px">
-                  <el-divider content-position="center">添加Erp总成</el-divider>
-                  <el-form
-                    style="border: 1px"
-                    :label-position="labelPosition"
-                    label-width="100px"
-                    :model="assly"
-                    ref="assly"
-                    border
-                  >
-                    <el-form-item
-                      label="Erp总成编码"
-                      style="height: 40px; width: 280px"
-                    >
-                      <el-input
-                        v-model="assly.erpAssemblyCode"
-                        clearable
-                        placeholder="请输入Erp总成编码"
-                      ></el-input>
-                    </el-form-item>
-                    <el-form-item
-                      label="Erp总成名称"
-                      style="height: 40px; width: 280px"
-                    >
-                      <el-input
-                        v-model="assly.erpAssemblyName"
-                        clearable
-                        placeholder="请输入Erp总成名称"
-                      ></el-input>
-                    </el-form-item>
-                    <el-form-item label="车型" style="height: 40px">
-                      <!-- <el-input v-model="assly.carModel" clearable></el-input> -->
-                      <el-select
-                        v-model="assly.carModel"
-                        clearable
-                        placeholder="请选择车型"
-                      >
-                        <el-option
-                          v-for="item in vehicleModelList"
-                          :key="item.id"
-                          :label="item.dicItemName"
-                          :value="item.dicItemCode"
-                        />
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item>
-                      <el-button type="primary" @click="submitAssyForm('assly')"
-                        >添加</el-button
-                      >
-                    </el-form-item>
-                  </el-form>
-                </div>
-              </el-row>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <div style="border: 1px; height: 570px; width: 270px">
-              <el-table
-                :data="tempdetails"
-                ref="leftTable"
-                height="550"
-                stripe
-                border
-                highlight-current-row
-                @row-click="rowClickLeft"
-                @select="selectLeft"
-                @select-all="selectLeftAll"
-              >
-                <el-table-column
-                  type="selection"
-                  width="40px"
-                ></el-table-column>
-                <el-table-column
-                  prop="partCode"
-                  label="结算件代码"
-                  width="150px"
-                  align="center"
-                ></el-table-column>
-                <el-table-column
-                  prop="partNum"
-                  label="数量"
-                  width="78px"
-                  align="center"
-                ></el-table-column>
-              </el-table>
-            </div>
-          </el-col>
-          <el-col :span="2">
-            <!-- 左右穿梭按钮 -->
-            <div align="center" style="height: 570px; width: 70px">
-              <el-row style="line-height: 300px">
-                <el-button
-                  @click="btnleftclick()"
-                  icon="el-icon-caret-left"
-                ></el-button>
-              </el-row>
-              <el-row>
-                <el-button
-                  @click="btnrightclick()"
-                  icon="el-icon-caret-right"
-                ></el-button>
-              </el-row>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <div style="border: 1px; height: 570px; width: 270px">
-              <el-table
-                :data="data2"
-                ref="rightTable"
-                height="550"
-                stripe
-                border
-                highlight-current-row
-                @row-click="rowClickRight"
-                @select="selectRight"
-                @select-all="selectRightAll"
-              >
-                <el-table-column
-                  type="selection"
-                  width="40px"
-                ></el-table-column>
-                <el-table-column
-                  prop="partCode"
-                  label="结算件代码"
-                  width="150px"
-                  align="center"
-                ></el-table-column>
-                <el-table-column
-                  prop="partNum"
-                  label="数量"
-                  width="78px"
-                  align="center"
-                ></el-table-column>
-              </el-table>
-            </div>
-          </el-col>
-          <!-- <el-table-transfer
-                    leftTitle="结算件"
-                    rightTitle="未知总成"
-                    :columns='columns'
-                    :dataLeft="data1"
-                    :dataRight="data2"
-                >
-                    <template v-slot:default="{scope}">
-                        <div>
-                          {{scope.row[scope.col.value]}}
-                        </div>
-                    </template>
-                </el-table-transfer> -->
-          <!-- 可以使用插槽获取到列信息和行信息，从而进行数据的处理 -->
-          <!-- <el-col :span="17"></el-col> -->
-        </el-row>
-
-        <div
-          slot="footer"
-          class="dialog-footer"
-          align="right"
-          style="width: 950px"
-        >
-          <el-button :loading="formLoading" type="primary" @click="save"
-            >确认</el-button
-          >
-        </div>
-      </div>
-    </el-dialog>
-
-    <!-- 移动数量窗体 -->
-    <el-dialog
-      :visible.sync="dialogNumVisible"
-      :close-on-click-modal="false"
-      :title="numTitle"
-      append-to-body
-      width="570px"
-    >
-      <div>
-        <el-form
-          :model="numFormData"
-          ref="numFormData"
-          label-width="100px"
-          class="num-ruleForm"
-        >
-          <el-form-item
-            label="数量"
-            prop="num"
-            :rules="[{ required: true, message: '数量不能为空且至少为1' }]"
-          >
-            <el-input type="text" v-model="numFormData.num"></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="formLoading" type="primary" @click="saveNum()"
-          >确认</el-button
-        >
-        <el-button type="text" @click="dialogNumVisible = false"
-          >取消</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "UnknownAssembly",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "bomdatabase",
-      rules: {
-        erpAssemblyName: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      valueSelect: "",
-      OnlineTimeValue: [], //上线时间
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      asTemp: [], //总成编号点击缓存
-      rightRowTemp: [], //右侧移动点击缓存
-      leftRowTemp: [], //左侧移动点击缓存
-      selectioned: "", //单选中的值
-      carModels: [], //车型下拉框数据源
-      currentRow: "",
-      versionList: [], //版本列表
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-        KNR: undefined,
-        VIN: undefined,
-        ScanPoint: undefined,
-        BillDescription: undefined,
-      },
-      listUnknownAssemblyQuery: {
-        billId: "",
-        //apply:"",
-        vin: "",
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      multipleSelection: [],
-      drawer: false,
-      dialogFormVisible: false,
-      dialogNumVisible: false,
-      formTitle: "",
-      numTitle: "",
-      isEdit: false,
-      formLoading: false,
-      buttonLoading: false,
-      button2Loading: false,
-      //dialogFormVisible: false,
-      tableHeight: document.documentElement.clientHeight - 220,
-      //columns: [
-      //          {name: '结算件代码', value: 'partCode', width: '180px'},
-      //          {name: '数量', value: 'partNum',},
-      //      ],
-      // data1: [
-      // ],
-
-      numFormData: {
-        num: 1,
-      },
-      zcCode: [],
-      /*最终提交缓存*/
-      tempAssCfgList: [],
-      /*右侧数据源*/
-      data2: [],
-      /*中间数据源*/
-      tempdetails: [
-        //{
-        // partCode: "1",
-        // partNum: 0,
-        // isKey: true
-        //}
-      ],
-      /*左侧总成数据源*/
-      erpAssemblyCfgList: [],
-      // {
-      //   erpAssemblyCode: "string",
-      //   erpAssemblyName: "string",
-      //   isCover: true,
-      //   carModel: "",
-      //   previousVersionId: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-      //   details: [
-      //     {
-      //       partCode: "string",
-      //       partNum: 0,
-      //       description: "string",
-      //       isKey: true
-      //     }
-      //   ]
-      // }
-      labelPosition: "left",
-      assly: {
-        erpAssemblyCode: "",
-        erpAssemblyName: "",
-        carModel: "",
-      },
-      vehicleModelQuery: {
-        dicTypeName: "派格车型",
-      },
-      vehicleModelList: [], //车型list
-      ScanPointList: [
-        { id: "0", label: " " },
-        { id: "R100", label: "R100" },
-        { id: "M100", label: "M100" },
-      ],
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-    });
-  },
-  created() {
-    this.getvehicleModel();
-    this.getList();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      // tempsTabs.push({
-      //   label: "大众顺序号",
-      //   prop: "hostSN",
-      //   width: 150,
-      // });
-      tempsTabs.push({
-        label: "底盘号",
-        prop: "vin",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "扫描点",
-        prop: "scanPoint",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "车型名称",
-        prop: "",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "单据描述",
-        prop: "billDescription",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "备注",
-        prop: "description",
-        width: 120,
-      });
-      // tempsTabs.push({
-      //   label: "版本",
-      //   prop: "version",
-      //   width: 150,
-      // });
-      tempsTabs.push({ label: "客户零件数量", prop: "partNum", width: 135 });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      var parentId = param.id; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    handleUpdateAll() {
-      var params = {
-        isSelectAll: true,
-        unknownAssemblyIdList: [],
-      };
-      this.$confirm("是否要全部进行解析?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.button2Loading = true;
-        this.$axios
-          .posts("/api/newjit/unknown-assembly/to-parse", params)
-          .then((response) => {
-            if (response.status == true) {
-              this.$notify({
-                title: "成功",
-                message: "操作成功！",
-                type: "success",
-                duration: 2000,
-              });
-              this.button2Loading = false;
-              this.getList();
-            } else {
-              this.button2Loading = false;
-              this.$message({
-                type: "warning",
-                message: response.message,
-              });
-            }
-          })
-          .catch(() => {
-            this.button2Loading = false;
-            this.$message({
-              type: "warning",
-              message: response.message,
-            });
-          });
-      });
-    },
-    /** 重新计算总成 */
-    handleUpdate(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行",
-          type: "warning",
-        });
-        return;
-      } else {
-        this.buttonLoading = true;
-        //批量操作
-        var params = {
-          isSelectAll: false,
-          unknownAssemblyIdList: [],
-        };
-        if (row) {
-          //单行
-          params.unknownAssemblyIdList.push(row.id);
-        } else {
-          //多选
-          this.multipleSelection.forEach((element) => {
-            let id = element.id;
-            params.unknownAssemblyIdList.push(id);
-          });
-        }
-        console.log("未知总成详表条件：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/unknown-assembly/to-parse", params)
-          .then((response) => {
-            if (response.status == true) {
-              this.$notify({
-                title: "成功",
-                message: "操作成功！",
-                type: "success",
-                duration: 2000,
-              });
-              this.buttonLoading = false;
-              this.getList();
-            } else {
-              this.buttonLoading = false;
-              this.$message({
-                type: "warning",
-                message: response.message,
-              });
-            }
-          })
-          .catch(() => {
-            this.buttonLoading = false;
-            this.$message({
-              type: "warning",
-              message: response.message,
-            });
-          });
-      }
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/unknown-assembly/" + id)
-        .then((response) => {
-          this.form = response.item;
-        });
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      this.$axios
-        .posts("/api/newjit/unknown-assembly/export", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    /** 不重复导出功能 */
-    handleDownloadNotRepeat() {
-      this.listLoading = true;
-      this.$axios
-        .posts("/api/newjit/unknown-assembly/export-not-repeat", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.OnlineTimeValue = [];
-      this.$refs[refName].resetFields();
-      this.handleQuery();
-      
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-    /* 主页面添加总成按钮事件 */
-    handleCreate() {
-      // this.$nextTick(() => {
-      //   this.$refs["formCount"].resetFields();
-      // });
-      if (this.multipleSelection.length !== 1) {
-        this.$message({
-          message: "必须选择一行",
-          type: "warning",
-        });
-        return;
-      } else {
-        console.log(this.multipleSelection[0].id);
-        console.log(this.multipleSelection[0].vin);
-        this.formTitle = "添加总成";
-        this.isEdit = false;
-        this.form = {};
-        this.leftRowTemp = [];
-        this.rightRowTemp = [];
-        this.assly = {};
-        this.tempdetails = [];
-        this.erpAssemblyCfgList = [];
-        this.tempAssCfgList = [];
-        this.asTemp = [];
-        this.getUnknownAssemblyList();
-        this.getZcCode();
-        this.getvehicleModel();
-        this.dialogFormVisible = true;
-      }
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 0: "未生效", 2: "已生效", 3: "已发布" }[row[column.property]];
-      }
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.OnlineTimeValue != []) {
-        this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0]; //this.OnlineTimeValue
-        // ? this.OnlineTimeValue[0] || ""
-        // : "";
-        this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1]; //this.OnlineTimeValue
-        // ? this.OnlineTimeValue[1] || ""
-        // : "";
-      }
-      this.$axios
-        .gets("/api/newjit/unknown-assembly/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          console.log("未知总成" + JSON.stringify(this.listQuery));
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    /* 获取车型数据源 */
-    getCarModel() {
-      this.$axios
-        .gets("/api/newjit/dic/list" + "?dicTypeName=车型")
-        .then((response) => {
-          console.log("this is response.items", response.item);
-          this.carModels = response.item;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-      //console.log("this is carModels",this.carModels);
-    },
-    /* 加号按钮添加事件 */
-    addzc() {
-      //todo 添加总成左侧的 加号按钮 待做
-      alert("1");
-    },
-    /* 减号按钮删除事件 */
-    delzc(index) {
-      this.erpAssemblyCfgList.splice(index, 1);
-      console.log(this.erpAssemblyCfgList);
-    },
-    /* 添加总成最终提交的数据事件*/
-    save() {
-      //if(this.data2.length ===0){
-      if (this.data2.length !== 0) {
-        this.$message({
-          message: "还有结算价代码尚未匹配",
-          type: "error",
-        });
-        return;
-      }
-      this.formLoading = true;
-
-      var lastSubmit = {
-        billId: this.listUnknownAssemblyQuery.billId,
-        scanPoint: "M100",
-        erpAssemblyCfgList: [],
-      };
-      lastSubmit.erpAssemblyCfgList = this.tempAssCfgList;
-
-      //#region
-      // var lastSubmitt = [];
-      // console.log("flag")
-      // this.tempAssCfgList.forEach(element => {
-      //   element.details.forEach(element1 => {
-      //     lastSubmitt.push({
-      //       erpAssemblyCode: element.erpAssemblyCode,
-      //       erpAssemblyName: element.erpAssemblyName,
-      //       isCover: false,
-      //       previousVersionId:"f7d45dba-3164-4a91-b477-3c568c81e6a0",
-      //       vehicleModel: element.vehicleModel,
-      //       details:{
-      //         partCode:element1.partCode,
-      //         partNum:element1.partNum,
-      //         description:element1.description,
-      //         isKey: true,
-      //       }
-      //     })
-      //   });
-      // });
-      // console.log("this is lastSubmitt:",lastSubmitt)
-      // var lastSubmit = [];
-      // lastSubmitt.forEach(element => {
-      //   lastSubmit.push({
-      //     billID:this.listUnknownAssemblyQuery.billId,
-      //     scanPoint: "M100",
-      //     erpAssemblyCfgList:[{
-      //       erpAssemblyCode: element.erpAssemblyCode,
-      //       erpAssemblyName: element.erpAssemblyName,
-      //       isCover: false,
-      //       previousVersionId: null,
-      //       vehicleModel: element.vehicleModel,
-      //       details:element.details
-      //     }]
-      //   })
-      // });
-      // console.log("this is lastSubmit:",lastSubmit)
-      //#endregion
-
-      this.$axios
-        .posts("/api/newjit/unknown-assembly/add-assembly", lastSubmit)
-        .then((response) => {
-          if (response.status === true) {
-            this.dialogFormVisible = false;
-            this.leftRowTemp = [];
-            this.rightRowTemp = [];
-            this.tempAssCfgList = [];
-            this.tempdetails = [];
-            this.erpAssemblyCfgList = [];
-            this.asTemp = [];
-
-            this.$notify({
-              title: "成功",
-              message: "添加总成成功！",
-              type: "success",
-              duration: 2000,
-            });
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-      // }
-      // else{
-      //   alert("未知零件未分配完，请确认！")
-      // }
-    },
-    /* 获取未知总成零件数据源 */
-    getUnknownAssemblyList() {
-      this.listUnknownAssemblyQuery.billId = this.multipleSelection[0].id;
-      //console.log(this.listUnknownAssemblyQuery);
-      this.$axios
-        .gets(
-          "/api/newjit/unknown-assembly/" + this.listUnknownAssemblyQuery.billId
-        )
-        .then((response) => {
-          this.data2 = response.item.unknownAssemblyParts.filter(
-            (u) => u.partType === "1" || u.partType === null
-          );
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /* 获取总成零件数据源*/
-    getZcCode() {
-      this.zcCode = [];
-      this.listUnknownAssemblyQuery.vin = this.multipleSelection[0].vin;
-      //console.log(this.listUnknownAssemblyQuery.vin);
-      this.$axios
-        .gets(
-          "/api/newjit/unknown-assembly/get-erp-assembly-code" +
-            "?vin=" +
-            this.listUnknownAssemblyQuery.vin
-        )
-        .then((response) => {
-          console.log(response.item);
-          if (response.item.length !== 0) {
-            console.log("has no ASSCode");
-          } else {
-            response.item.forEach((zccode) => {
-              this.erpAssemblyCfgList.push({
-                erpAssemblyCode: zccode,
-                erpAssemblyName: [],
-                isCover: false,
-                carModel: "",
-                previousVersionId: null,
-                details: [
-                  {
-                    partCode: "",
-                    partNum: 0,
-                    description: "",
-                    isKey: false,
-                  },
-                ],
-              });
-            });
-          }
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        });
-    },
-    /* 添加总成提交方法 */
-    submitAssyForm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          if (this.assly.erpAssemblyCode !== "") {
-            this.erpAssemblyCfgList.push({
-              erpAssemblyCode: this.assly.erpAssemblyCode,
-              erpAssemblyName: this.assly.erpAssemblyName,
-              carModel: this.assly.carModel,
-              isCover: false,
-              previousVersionId: null,
-              details: [],
-            });
-            console.log(this.erpAssemblyCfgList);
-            this.assly.erpAssemblyCode = "";
-            this.assly.erpAssemblyName = "";
-            this.assly.carModel = "";
-          } else {
-            alert("请先填写Erp总成信息！");
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    btnleftclick() {
-      if (this.asTemp.length === 0) {
-        alert("请先选择总成编号！");
-      } else {
-        if (this.rightRowTemp.length === 0) {
-          alert("请先选择需移动的零件");
-        } else if (
-          this.rightRowTemp.length === 1 &&
-          parseInt(this.rightRowTemp[0].partNum) !== 1
-        ) {
-          this.numFormData.num = parseInt(this.rightRowTemp[0].partNum);
-          this.dialogNumVisible = true;
-          this.numTitle = "输入移动结算件数量";
-        } else {
-          console.log("R->F");
-          this.rightRowTemp.forEach((item) => {
-            this.numFormData.num = item.partNum;
-            //if(this.numFormData.num <= item.partNum && this.numFormData.num > 0){
-
-            //数据插入最终缓存
-            if (this.tempAssCfgList.length !== 0) {
-              console.log("second");
-              var rfMove = this.tempAssCfgList.filter(
-                (u) => u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode
-              );
-              if (rfMove.length !== 0) {
-                var sameDetail = rfMove[0].details.filter(
-                  (u) => u.partCode === item.partCode
-                );
-                if (sameDetail.length !== 0) {
-                  sameDetail[0].partNum =
-                    parseInt(sameDetail[0].partNum) +
-                    parseInt(this.numFormData.num);
-                } else {
-                  rfMove[0].details.push({
-                    description: item.description,
-                    isKey: false,
-                    partCode: item.partCode,
-                    partNum: this.numFormData.num, //移动框输入的数量
-                  });
-                }
-              } else {
-                console.log("加进去了");
-                this.tempAssCfgList.push({
-                  erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
-                  erpAssemblyName: this.asTemp[0].erpAssemblyName,
-                  isCover: false,
-                  previousVersionId: this.asTemp[0].previousVersionId,
-                  vehicleModel: this.asTemp[0].carModel,
-                  details: [
-                    {
-                      description: item.description,
-                      isKey: false,
-                      partCode: item.partCode,
-                      partNum: this.numFormData.num, //移动框输入的数量
-                    },
-                  ],
-                });
-              }
-            } else {
-              console.log("first");
-              this.tempAssCfgList.push({
-                erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
-                erpAssemblyName: this.asTemp[0].erpAssemblyName,
-                isCover: false,
-                previousVersionId: this.asTemp[0].previousVersionId,
-                details: [
-                  {
-                    description: item.description,
-                    isKey: false,
-                    partCode: item.partCode,
-                    partNum: this.numFormData.num, //移动框输入的数量
-                  },
-                ],
-              });
-            }
-
-            console.log("this is tempAssCfgList 最终数据", this.tempAssCfgList);
-            //数据插入中间数据源
-            var judge = this.tempdetails.filter(
-              (u) => u.partCode === item.partCode
-            );
-            if (judge.length === 1) {
-              var t =
-                parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-              this.tempdetails.filter(
-                (u) => u.partCode === item.partCode
-              )[0].partNum = t;
-            } else {
-              this.tempdetails.push({
-                description: item.description,
-                isKey: false,
-                partCode: item.partCode,
-                partNum: parseInt(this.numFormData.num), //移动框输入的数量
-              });
-            }
-            /* 右侧数据移动 */
-            var delid = this.data2.filter(
-              (u) => u.partCode === item.partCode
-            )[0];
-            var n1 = parseInt(this.numFormData.num);
-            var n2 = parseInt(delid.partNum);
-            if (n1 === n2) {
-              this.data2 = this.data2.filter(
-                (u) => u.partCode !== item.partCode
-              );
-              this.rightRowTemp = [];
-            } else {
-              this.data2.filter(
-                (u) => u.partCode === item.partCode
-              )[0].partNum = delid.partNum - this.numFormData.num;
-              item.partNum = n2 - n1;
-            }
-          });
-
-          //}
-        }
-      }
-    },
-    btnrightclick() {
-      if (this.asTemp.length === 0) {
-        alert("请先选择总成编号！");
-      } else {
-        if (this.leftRowTemp.length === 0) {
-          alert("请先选择需移动的零件");
-        } else if (
-          this.leftRowTemp.length === 1 &&
-          parseInt(this.leftRowTemp[0].partNum) !== 1
-        ) {
-          this.numFormData.num = parseInt(this.leftRowTempnpm[0].partNum);
-          this.dialogNumVisible = true;
-          this.numTitle = "输入移动结算件数量";
-        } else {
-          console.log("F->R");
-          this.leftRowTemp.forEach((item) => {
-            this.numFormData.num = item.partNum;
-            //if(this.numFormData.num <= this.leftRowTemp[0].partNum && this.numFormData.num > 0){
-
-            //数据插入最终缓存
-            console.log("移除或删除");
-            var frMove = this.tempAssCfgList.filter(
-              (u) => u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode
-            );
-            var samedetail = frMove[0].details.filter(
-              (u) => u.partCode === item.partCode
-            );
-            if (samedetail.length !== 0) {
-              if (
-                parseInt(samedetail[0].partNum) ===
-                parseInt(this.numFormData.num)
-              ) {
-                frMove[0].details = frMove[0].details.filter(
-                  (u) => u.partCode !== item.partCode
-                );
-              } else {
-                samedetail[0].partNum =
-                  parseInt(samedetail[0].partNum) -
-                  parseInt(this.numFormData.num);
-              }
-            } else if (samedetail.length !== 0) {
-              alert("没有数据!");
-            }
-
-            console.log("this is tempAssCfgList 最终数据", this.tempAssCfgList);
-
-            //数据插入右侧数据源
-            var judge = this.data2.filter((u) => u.partCode === item.partCode);
-            if (judge.length === 1) {
-              var t =
-                parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-              this.data2.filter(
-                (u) => u.partCode === item.partCode
-              )[0].partNum = t;
-            } else {
-              this.data2.push({
-                description: item.description,
-                isKey: false,
-                partCode: item.partCode,
-                partNum: parseInt(this.numFormData.num), //移动框输入的数量
-              });
-            }
-            /* 中间数据移动 */
-            var delid = this.tempdetails.filter(
-              (u) => u.partCode === item.partCode
-            )[0];
-            console.log(this.tempdetails);
-            var n1 = parseInt(this.numFormData.num);
-            var n2 = parseInt(delid.partNum);
-            if (n1 === n2) {
-              this.tempdetails = this.tempdetails.filter(
-                (u) => u.partCode !== item.partCode
-              );
-              this.leftRowTemp = [];
-            } else {
-              this.tempdetails.filter(
-                (u) => u.partCode === item.partCode
-              )[0].partNum =
-                parseInt(delid.partNum) - parseInt(this.numFormData.num);
-              item.partNum = n2 - n1;
-            }
-            //}
-          });
-        }
-      }
-    },
-    /* 保存数量事件 */
-    saveNum() {
-      if (this.asTemp.length !== 0) {
-        //判断中间选中移动还是右侧选中移动
-        /*   左侧移动到右侧   */
-        if (this.leftRowTemp.length !== 0) {
-          console.log("F->R");
-          if (
-            this.numFormData.num <= this.leftRowTemp[0].partNum &&
-            this.numFormData.num > 0
-          ) {
-            //数据插入最终缓存
-            console.log("移除或删除");
-            var frMove = this.tempAssCfgList.filter(
-              (u) => u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode
-            );
-            var samedetail = frMove[0].details.filter(
-              (u) => u.partCode === this.leftRowTemp[0].partCode
-            );
-            if (samedetail.length !== 0) {
-              if (
-                parseInt(samedetail[0].partNum) ===
-                parseInt(this.numFormData.num)
-              ) {
-                frMove[0].details = frMove[0].details.filter(
-                  (u) => u.partCode !== this.leftRowTemp[0].partCode
-                );
-              } else {
-                samedetail[0].partNum =
-                  parseInt(samedetail[0].partNum) -
-                  parseInt(this.numFormData.num);
-              }
-            } else if (samedetail.length !== 0) {
-              alert("没有数据!");
-            }
-
-            console.log("this is tempAssCfgList 最终数据", this.tempAssCfgList);
-
-            //数据插入右侧数据源
-            var judge = this.data2.filter(
-              (u) => u.partCode === this.leftRowTemp[0].partCode
-            );
-            if (judge.length === 1) {
-              var t =
-                parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-              this.data2.filter(
-                (u) => u.partCode === this.leftRowTemp[0].partCode
-              )[0].partNum = t;
-            } else {
-              this.data2.push({
-                description: this.leftRowTemp[0].description,
-                isKey: false,
-                partCode: this.leftRowTemp[0].partCode,
-                partNum: parseInt(this.numFormData.num), //移动框输入的数量
-              });
-            }
-            /* 中间数据移动 */
-            var delid = this.tempdetails.filter(
-              (u) => u.partCode === this.leftRowTemp[0].partCode
-            )[0];
-            var n1 = parseInt(this.numFormData.num);
-            var n2 = parseInt(delid.partNum);
-            if (n1 === n2) {
-              this.tempdetails = this.tempdetails.filter(
-                (u) => u.partCode !== this.leftRowTemp[0].partCode
-              );
-              this.leftRowTemp = [];
-            } else {
-              this.tempdetails.filter(
-                (u) => u.partCode === this.leftRowTemp[0].partCode
-              )[0].partNum =
-                parseInt(delid.partNum) - parseInt(this.numFormData.num);
-              this.leftRowTemp[0].partNum = n2 - n1;
-            }
-          } else if (this.numFormData.num == 0) {
-            alert("输入数字不能为0！");
-          } else {
-            alert("输入不正确,请确认！");
-          }
-        } else if (this.rightRowTemp.length !== 0) {
-          /*   右侧移动到左侧   */
-          console.log("R->F");
-          if (
-            this.numFormData.num <= this.rightRowTemp[0].partNum &&
-            this.numFormData.num > 0
-          ) {
-            //数据插入最终缓存
-            if (this.tempAssCfgList.length !== 0) {
-              console.log("second");
-              var rfMove = this.tempAssCfgList.filter(
-                (u) => u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode
-              );
-              if (rfMove.length !== 0) {
-                var sameDetail = rfMove[0].details.filter(
-                  (u) => u.partCode === this.rightRowTemp[0].partCode
-                );
-                if (sameDetail.length !== 0) {
-                  sameDetail[0].partNum =
-                    parseInt(sameDetail[0].partNum) +
-                    parseInt(this.numFormData.num);
-                } else {
-                  rfMove[0].details.push({
-                    description: this.rightRowTemp[0].description,
-                    isKey: false,
-                    partCode: this.rightRowTemp[0].partCode,
-                    partNum: this.numFormData.num, //移动框输入的数量
-                  });
-                }
-              } else {
-                console.log("加进去了");
-                this.tempAssCfgList.push({
-                  erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
-                  erpAssemblyName: this.asTemp[0].erpAssemblyName,
-                  vehicleModel: this.asTemp[0].carModel,
-                  isCover: false,
-                  previousVersionId: this.asTemp[0].previousVersionId,
-                  details: [
-                    {
-                      description: this.rightRowTemp[0].description,
-                      isKey: false,
-                      partCode: this.rightRowTemp[0].partCode,
-                      partNum: this.numFormData.num, //移动框输入的数量
-                    },
-                  ],
-                });
-              }
-            } else {
-              console.log("first");
-              this.tempAssCfgList.push({
-                erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
-                erpAssemblyName: this.asTemp[0].erpAssemblyName,
-                isCover: false,
-                previousVersionId: this.asTemp[0].previousVersionId,
-                vehicleModel: this.asTemp[0].carModel,
-                details: [
-                  {
-                    description: this.rightRowTemp[0].description,
-                    isKey: false,
-                    partCode: this.rightRowTemp[0].partCode,
-                    partNum: this.numFormData.num, //移动框输入的数量
-                  },
-                ],
-              });
-            }
-
-            console.log("this is tempAssCfgList 最终数据", this.tempAssCfgList);
-            //数据插入中间数据源
-            var judge = this.tempdetails.filter(
-              (u) => u.partCode === this.rightRowTemp[0].partCode
-            );
-            if (judge.length === 1) {
-              var t =
-                parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-              this.tempdetails.filter(
-                (u) => u.partCode === this.rightRowTemp[0].partCode
-              )[0].partNum = t;
-            } else {
-              this.tempdetails.push({
-                description: this.rightRowTemp[0].description,
-                isKey: false,
-                partCode: this.rightRowTemp[0].partCode,
-                partNum: parseInt(this.numFormData.num), //移动框输入的数量
-              });
-            }
-            /* 右侧数据移动 */
-            var delid = this.data2.filter(
-              (u) => u.id === this.rightRowTemp[0].id
-            )[0];
-            var n1 = parseInt(this.numFormData.num);
-            var n2 = parseInt(delid.partNum);
-            if (n1 === n2) {
-              this.data2 = this.data2.filter(
-                (u) => u.id !== this.rightRowTemp[0].id
-              );
-              this.rightRowTemp = [];
-            } else {
-              this.data2.filter(
-                (u) => u.id === this.rightRowTemp[0].id
-              )[0].partNum = delid.partNum - this.numFormData.num;
-              this.rightRowTemp[0].partNum = n2 - n1;
-            }
-          } else if (this.numFormData.num == 0) {
-            alert("输入数字不能为0！");
-          } else {
-            alert("输入不正确,请确认！");
-          }
-        }
-        this.dialogNumVisible = false;
-      } else {
-        alert("请先选择总成编号！");
-      }
-      this.dialogNumVisible = false;
-    },
-    /* 总成编号选中事件 */
-    rowClickass(row) {
-      this.asTemp = [];
-      this.tempdetails = [];
-      this.$refs.asTable.clearSelection();
-      this.$refs.asTable.toggleRowSelection(row);
-      this.asTemp.push(row);
-
-      if (this.asTemp[0].details.length !== 0) {
-        //选中插入中间数据源
-        this.tempdetails.push({
-          isKey: false,
-          partCode: this.asTemp[0].details[0].partCode,
-          partNum: this.asTemp[0].details[0].partNum,
-          vehicleModel: this.asTemp[0].details[0].carModel,
-        });
-      }
-      //二次选中插入最终提交中的details
-      var judgeSec = this.tempAssCfgList.filter(
-        (u) => u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode
-      );
-      console.log("this is judgeSec:", judgeSec);
-      if (judgeSec.length !== 0) {
-        console.log("this is judgeSec[0].details:", judgeSec[0].details);
-        judgeSec[0].details.forEach((element) => {
-          this.tempdetails.push(element);
-        });
-      }
-      console.log("this is this.tempdetails", this.tempdetails);
-      console.log("this is asTemp", this.asTemp);
-    },
-    /* 总成编号复选框单选事件 */
-    selectAss(selection, row) {
-      this.asTemp = []; //清空已选
-      this.tempdetails = [];
-      console.log(
-        "当用户手动勾选数据行的 Checkbox 时触发的事件",
-        selection,
-        row
-      );
-      // 选择项大于1时
-      if (selection.length > 1) {
-        let del_row = selection.shift();
-        // console.log('把数组的第一个元素从其中删除后', selection);
-        this.$refs.asTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
-      }
-      this.asTemp.push(selection[0]);
-      console.log("当用户手动勾选数据行", this.asTemp);
-
-      if (this.asTemp[0].details.length !== 0) {
-        //选中插入中间数据源
-        this.tempdetails.push({
-          isKey: false,
-          partCode: this.asTemp[0].details[0].partCode,
-          partNum: this.asTemp[0].details[0].partNum,
-          vehicleModel: this.asTemp[0].details[0].carModel,
-        });
-      }
-
-      //二次选中插入最终提交中的details
-      var judgeSec = this.tempAssCfgList.filter(
-        (u) => u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode
-      );
-      console.log("this is judgeSec:", judgeSec);
-      if (judgeSec.length !== 0) {
-        console.log("this is judgeSec[0].details:", judgeSec[0].details);
-        judgeSec[0].details.forEach((element) => {
-          this.tempdetails.push(element);
-        });
-      }
-      console.log("this is this.tempdetails", this.tempdetails);
-      console.log("this is asTemp", this.asTemp);
-    },
-    /* 右侧数据选中事件 */
-    rowClickRight(row) {
-      this.rightRowTemp = [];
-      this.$refs.rightTable.clearSelection();
-      this.$refs.rightTable.toggleRowSelection(row);
-      this.rightRowTemp.push(row);
-    },
-    /* 左侧数据选中事件 */
-    rowClickLeft(row) {
-      this.leftRowTemp = [];
-      this.$refs.leftTable.clearSelection();
-      this.$refs.leftTable.toggleRowSelection(row);
-      this.leftRowTemp.push(row);
-    },
-    /* 右侧复选框单选事件 */
-    selectRight(selection, row) {
-      this.rightRowTemp = []; //清空已选
-      console.log(
-        "当用户手动勾选数据行的 Checkbox 时触发的事件",
-        selection,
-        row
-      );
-      // 选择项大于1时
-      // if (selection.length > 1) {
-      // let del_row = selection.shift();
-      // // console.log('把数组的第一个元素从其中删除后', selection);
-      // this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
-      // }
-      selection.forEach((item) => {
-        this.rightRowTemp.push(item);
-      });
-      console.log("当用户手动勾选数据行", this.rightRowTemp);
-    },
-    /* 右侧复选框全选事件 */
-    selectRightAll(selection) {
-      this.rightRowTemp = []; //清空已选
-      console.log("当用户手动勾选全选 Checkbox 时触发的事件", selection);
-      selection.forEach((item) => {
-        this.rightRowTemp.push(item);
-      });
-      console.log("当用户手动勾选全选", this.rightRowTemp);
-    },
-    /* 左侧复选框单选事件 */
-    selectLeft(selection, row) {
-      this.leftRowTemp = []; //清空已选
-      console.log(
-        "当用户手动勾选数据行的 Checkbox 时触发的事件",
-        selection,
-        row
-      );
-      // // 选择项大于1时
-      // if (selection.length > 1) {
-      // let del_row = selection.shift();
-      // // console.log('把数组的第一个元素从其中删除后', selection);
-      // this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
-      // }
-      selection.forEach((item) => {
-        this.leftRowTemp.push(item);
-      });
-      console.log("当用户手动勾选数据行", this.leftRowTemp);
-    },
-    /* 左侧复选框全选事件 */
-    selectLeftAll(selection) {
-      this.leftRowTemp = []; //清空已选
-      console.log("当用户手动勾选全选 Checkbox 时触发的事件", selection);
-      selection.forEach((item) => {
-        this.leftRowTemp.push(item);
-      });
-      console.log("当用户手动勾选全选", this.leftRowTemp);
-    },
-    getvehicleModel() {
-      this.$axios
-        .gets("/api/newjit/dic/list", this.vehicleModelQuery)
-        .then((response) => {
-          //console.log(response);
-          this.vehicleModelList = response.item;
-          //console.log()
-        })
-        .catch(() => {});
-    },
-    valueselectChange() {},
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue b/code/WebApp/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
deleted file mode 100644
index c89f773f..00000000
--- a/code/WebApp/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
+++ /dev/null
@@ -1,880 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <!-- <el-row> -->
-          <el-form-item label="生产线:" prop="productType">
-            <el-select
-              v-model="listQuery.productType"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="ptypeselectChange"
-            >
-              <el-option
-                v-for="item in productTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="" prop="productLine">
-            <el-select
-              v-model="listQuery.productLine"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="valueselectChange"
-            >
-              <el-option
-                v-for="item in PLChildList"
-                :key="item.id"
-                :label="item.productLineName"
-                :value="item.productLineCode"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="版本:" prop="version">
-            <el-input
-              v-model="listQuery.version"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <!-- </el-row> -->
-          <el-form-item label="流水号:" prop="serialNumBegin">
-            <el-input
-              v-model="listQuery.serialNumBegin"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="-" prop="serialNumEnd">
-            <el-input
-              v-model="listQuery.serialNumEnd"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <!-- <el-row> -->
-          <el-form-item label="大众顺序号:" prop="HostSNBegin">
-            <el-input
-              v-model="listQuery.HostSNBegin"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="-" prop="HostSNEnd">
-            <el-input
-              v-model="listQuery.HostSNEnd"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="KNR:" prop="KNRBegin">
-            <el-input
-              v-model="listQuery.KNRBegin"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="-" prop="KNREnd">
-            <el-input
-              v-model="listQuery.KNREnd"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <!-- </el-row> -->
-          <!-- <el-row> -->
-          <el-form-item label="底盘号:" prop="VINBegin">
-            <el-input
-              v-model="listQuery.VINBegin"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="-" prop="VINEnd ">
-            <el-input
-              v-model="listQuery.VINEnd"
-              placeholder=""
-              clearable
-              size="small"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="上线日期">
-            <el-date-picker
-              v-model="listQuery.OnlineTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange" :default-time="['00:00:00','23:59:59']"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-          <!-- </el-row> -->
-          <!-- <el-row> -->
-          <el-form-item label="接收日期">
-            <el-date-picker
-              v-model="listQuery.ReceiveTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange" :default-time="['00:00:00','23:59:59']"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item label="对比状态" prop="State">
-            <el-checkbox-group v-model="listQuery.cstate">
-              <el-checkbox
-                v-for="item in compareState"
-                :key="item.id"
-                :label="item.id"
-              >
-                {{ item.name }}
-              </el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-
-          <el-form-item >
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              style="margin-left: 15px"
-              @click="handleDownload()"
-              >导出焊装总成对比(Excel)
-            </el-button>
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              style="margin-left: 15px"
-              @click="handleDownloadCSV()"
-              >导出焊装总成对比(CSV)
-            </el-button>
-          </el-form-item>
-          <!-- </el-row> -->
-        </el-form>
-      </flexbox>
-    </div>
-    <div class="l-table" style="margin-top:-20px">
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeight"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%"
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-      >
-        <!-- <el-table-column
-          label="底盘号"
-          prop="vin "
-          sortable="custom"
-          align="center"
-          
-          width="180px"
-        >
-          <template slot-scope="scope">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.vin
-            }}</span>
-          </template>
-        </el-table-column> -->
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-      </el-drawer>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import { downloadFile } from "@/utils/crmindex.js";
-
-//组件计量单位
-const bomUnit = [
-  { key: 0, display_name: "PC" },
-  { key: 1, display_name: "TON" },
-  { key: 2, display_name: "Other" },
-];
-
-const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
-
-export default {
-  name: "WeldingAssembly",
-  components: { Pagination, CRMTableHead, importExcel },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "WeldingAssembly",
-      rules: {
-        erpAssemblyName: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      compareState: [
-        { id: 0, name: "有焊装无总装" },
-        { id: 1, name: "有焊装有总装" },
-      ],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        productType: 1,
-        ProductLine: undefined,
-        version: undefined,
-        serialNumBegin: undefined,
-        serialNumEnd: undefined,
-        HostSNBegin: undefined,
-        HostSNEnd: undefined,
-        KNRBegin: undefined,
-        KNREnd: undefined,
-        VINBegin: undefined,
-        VINEnd: undefined,
-        OnlineTimeValue: undefined,
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-        ReceiveTimeValue: undefined,
-        ReceiveTimeBegin: undefined,
-        ReceiveTimeEnd: undefined,
-        HasR100NotHasM100: undefined, //有焊装无总装
-        HasR100HasM100: undefined, //有焊装有总装
-        cstate: [],
-      },
-      listExportQuery: {
-        erpAssemblyCode: undefined,
-        erpAssemblyName: undefined,
-      },
-      listPLQuery: {
-        BillType: 1,
-        //UserId: "00000000-0000-0000-0000-000000000000",
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      bomUnit,
-      multipleSelection: [],
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      billStatus: [],
-      PLChildList: [], //筛选后产线下拉
-      productTypeList: [
-        { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
-      ],
-    };
-  },
-  mounted() {
-    this.getList();
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //console.log(this.$refs.box.offsetHeight);
-      //console.log(this.tableHeight);
-    });
-  },
-  created() {
-    this.compareState.forEach((element, index) => {
-      this.listQuery.cstate.push(element.id);
-    });
-    this.getProductLine();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
-      // tempsTabs.push({
-      //   label: "底盘号",
-      //   prop: "vin",
-      //   width: 130,
-      // });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100单据状态",
-        prop: "r100BillStatus",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100上线时间",
-        prop: "r100OnlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100接收时间",
-        prop: "r100ReceiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "M100流水号",
-        prop: "serialNum",
-        width: 130,
-      });
-      tempsTabs.push({
-        label: "M100底盘号",
-        prop: "Vin",
-        width: 130,
-      });
-      tempsTabs.push({
-        label: "M100上线时间",
-        prop: "m100OnlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "M100接收时间",
-        prop: "m100ReceiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "M100单据状态",
-        prop: "m100BillStatus",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "总成编号",
-        prop: "r100ErpAssemblyCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "总成名称",
-        prop: "r100ErpAssemblyName",
-        width: 180,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      var parentId = param.id; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
-      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
-      console.log(JSON.stringify(this.listExportQuery));
-      this.$axios
-        .posts("/api/newjit/r100-m100-compare/export", this.listExportQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-      this.listLoading = false;
-    },
-    /** 导出功能 */
-    handleDownloadCSV() {
-      this.listLoading = true;
-      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
-      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/newjit/r100-m100-compare/export-CSV", this.listQuery)
-        .then((res) => {
-          let filename = res.item;
-          this.$axios
-            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
-            .then((response) => {
-              if (filename.indexOf("_") != -1) {
-                let downName =
-                  filename.slice(0, filename.lastIndexOf("_")) +
-                  filename.slice(filename.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, filename);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-      this.listLoading = false;
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.listQuery.billType = undefined;
-      this.listQuery.productLine = undefined;
-      this.listQuery.Version = undefined;
-      this.listQuery.serialNumBegin = undefined;
-      this.listQuery.serialNumEnd = undefined;
-      this.listQuery.HostSNBegin = undefined;
-      this.listQuery.HostSNEnd = undefined;
-      this.listQuery.KNRBegin = undefined;
-      this.listQuery.KNREnd = undefined;
-      this.listQuery.VINBegin = undefined;
-      this.listQuery.VINEnd = undefined;
-      this.listQuery.OnlineTimeValue = [];
-      this.listQuery.OnlineTimeBegin = undefined;
-      this.listQuery.OnlineTimeEnd = undefined;
-      this.listQuery.ReceiveTimeValue = [];
-      this.listQuery.ReceiveTimeBegin = undefined;
-      this.listQuery.ReceiveTimeEnd = undefined;
-      this.listQuery.cstate = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      //this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-
-    handleAddDetails() {
-      if (this.form.details === undefined) {
-        this.form.details = [];
-        //console.log(679);
-      }
-      let obj = {};
-      obj.partCode = "";
-      obj.partName = "";
-      obj.partNum = "";
-      obj.isKey = false;
-      obj.description = "";
-
-      //console.log(this.form.details);
-      this.form.details.push(obj);
-      //console.log(688);
-    },
-    handleDeleteDetails(index) {
-      this.form.details.splice(index, 1);
-      //console.log(693);
-    },
-
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property == "onlineTime" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      if (
-        column.property == "r100BillStatus" ||
-        column.property == "m100BillStatus"
-      ) {
-        return { 1: "未匹配", 2: "未打印", 3: "已发布" }[row[column.property]];
-      }
-      return row[column.property] || "--"; //|| "--"加上后会掩盖m100单据状态为0不显示
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.OnlineTimeValue !== undefined) {
-        this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
-        this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
-      }
-      if (this.listQuery.ReceiveTimeValue !== undefined) {
-        this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
-        this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
-      }
-
-      this.listQuery.HasR100NotHasM100 = false;
-      this.listQuery.HasR100HasM100 = false;
-
-      if (
-        this.listQuery.cstate !== undefined &&
-        this.listQuery.cstate.length > 0
-      ) {
-        //console.log(this.listQuery.cstate)
-        this.listQuery.cstate.forEach((element) => {
-          //console.log(element)
-          if (element === 0) {
-            this.listQuery.HasR100NotHasM100 = true;
-          }
-          if (element === 1) {
-            this.listQuery.HasR100HasM100 = true;
-          }
-        });
-      }
-      this.$axios
-        .gets("/api/newjit/r100-m100-compare/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    getDetialList(partCode) {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
-        .then((response) => {
-          //console.log(partCode)
-          if (partCode !== "" && partCode !== undefined) {
-            //console.log(partCode)
-            this.list = response.item.details.filter(
-              (u) => u.partCode === partCode
-            );
-          } else {
-            this.list = response.item.details;
-          }
-          //alert(JSON.stringify(response.Items))
-          //this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-
-    valueselectChange() {
-      this.$forceUpdate();
-    },
-    handleImportSAP() {},
-
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    SAPExport() {},
-    //获取所有产线
-    getProductLine() {
-      this.listPLQuery.UserId = this.userInfo.userId;
-      this.$axios
-        .gets("/api/newjit/product-line/list", this.listPLQuery)
-        .then((response) => {
-          //console.log(response);
-          this.PLList = response.item;
-          this.PLChildList = this.PLList.filter(
-            (u) => u.productType === parseInt(this.listQuery.productType)
-          ).sort((a, b) => {
-            return a.productLineCode - b.productLineCode;
-          });
-          this.listQuery.productLine = this.PLChildList[0].productLineCode;
-          this.getList();
-        })
-        .catch(() => {});
-    },
-    //产线类型变更
-    ptypeselectChange() {
-      //console.log(this.listQuery.productType);
-      this.listQuery.productLine = "";
-      this.PLChildList = this.PLList.filter(
-        (u) => u.productType === parseInt(this.listQuery.productType)
-      ).sort((a, b) => {
-        return a.productLineCode - b.productLineCode;
-      });
-      //console.log(this.PLList);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
-
-// /*表格全选框去除空框*/
-// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
-//   display: none;
-//   position: relative;
-// }
-// /*表格全选框改为：选择*/
-// .el-table >>> .DisabledSelection .cell:before {
-//   content: "是否Key件";
-//   position: absolute;
-//   left: 7px;
-// }
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-</style>
-
diff --git a/code/WebApp/vue/src/views/pg-fis/components/CRMCreateView.vue b/code/WebApp/vue/src/views/pg-fis/components/CRMCreateView.vue
deleted file mode 100644
index e4acf007..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/CRMCreateView.vue
+++ /dev/null
@@ -1,2674 +0,0 @@
-<template>
-  <create-view
-    :loading="loading"
-    :body-style="{ height: '100%' }"
-    :width="width"
-  >
-    <flexbox direction="column" align="stretch" class="crm-create-container">
-      <flexbox class="crm-create-header">
-        <div style="flex: 1; font-size: 17px; color: #333">{{ title }}</div>
-        <img
-          class="close"
-          src="@/assets/img/task_close.png"
-          @click="hidenView"
-        />
-      </flexbox>
-      <div class="crm-create-flex">
-        <create-sections title="基本信息">
-          <flexbox direction="column" align="stretch">
-            <div class="crm-create-body">
-              <el-form
-                ref="crmForm"
-                :model="crmForm"
-                label-position="top"
-                class="crm-create-box"
-              >
-              <!-- :prop="'crmFields.' + index + '.value'" -->
-                <el-form-item
-                  v-for="(item, index) in crmForm.crmFields"
-                  :key="item.key"
-                  :prop="'crmFields.' + index + '.value'"
-                  :class="{
-                    'crm-create-block-item': item.showblock,
-                    'crm-create-item': !item.showblock,
-                  }"
-                  :rules="crmRules[item.key]"
-                  :style="{
-                    'padding-left': getPaddingLeft(item, index),
-                    'padding-right': getPaddingRight(item, index),
-                  }"
-                >
-                  <div slot="label" style="display: inline-block">
-                    <div
-                      style="
-                        margin: 5px 0;
-                        font-size: 12px;
-                        word-wrap: break-word;
-                        word-break: break-all;
-                      "
-                    >
-                      {{ item.data.name }} 
-                      <span style="color: #999">
-                        {{
-                          item.data.inputTips
-                            ? "（" + item.data.inputTips + "）"
-                            : ""
-                        }}
-                      </span>
-                    </div>
-                  </div>
-                  <component
-                    :is="item.data.formType | typeToComponentName"
-                    :value="item.value"
-                    :index="index"
-                    :item="item"
-                    :relation="item.relation"
-                    :radio="false"
-                    :disabled="item.disabled"
-                    @value-change="fieldValueChange"
-                  />
-                </el-form-item>
-              </el-form>
-            </div>
-          </flexbox>
-        </create-sections>
-      </div>
-<!-- 
-      <DialogTable
-        ref="formDialog"
-        :logMessage="{}"
-        v-if="crmType == 'dicts' && action.type != 'update'"
-      ></DialogTable> -->
-
-      <div class="handle-bar">
-        <el-button class="handle-button" @click.native="hidenView"
-          >取消</el-button
-        >
-        <el-button
-          class="handle-button"
-          type="primary"
-          :disabled="saveDisabled"
-          @click.native="saveField(false)"
-          >保存</el-button
-        >
-      </div>
-    </flexbox>
-  </create-view>
-</template>
-<script type="text/javascript">
-import crmTypeModel from "@/views/ux/model/crmTypeModel";
-import CreateView from "@/components/CreateView";
-import CreateSections from "@/components/CreateSections";
-import DialogTable from "../dict/components/DialogTable";
-import { crmLeadsSave, crmLeadsRead, crmLeadsUpdate } from "@/api/ux/clue";
-import {
-  crmDictsSave,
-  crmDictsRead,
-  crmDictsUpdate,
-  crmDictsItemDetailRead,
-  crmDictsItemIndex,
-  crmDictsItemAdd,
-  crmDictsItemUpdate,
-} from "@/api/dict/dict";
-import {
-  crmTransactionSave,
-  crmTransactionRead,
-  crmTransactionUpdate,
-} from "@/api/transaction/transaction";
-import {
-  crmStrategySave,
-  crmStrategyRead,
-  crmStrategyUpdate,
-} from "@/api/strategy/strategy";
-import { crmRuleSave, crmRuleRead, crmRuleUpdate } from "@/api/rule/rule";
-import {
-  crmStrategyRulesSave,
-  crmStrategyRulesRead,
-  crmStrategyRulesUpdate,
-} from "@/api/strategyRules/strategyRules";
-import {
-  crmVerificationSave,
-  crmVerificationRead,
-  crmVerificationUpdate,
-} from "@/api/verification/verification";
-import { crmStageSave, crmStageRead, crmStageUpdate } from "@/api/stage/stage";
-import {
-  crmCustomerSave,
-  crmCustomerRead,
-  crmCustomerUpdate,
-} from "@/api/customer/customer";
-import {
-  crmSlgItemSave,
-  crmSlgItemRead,
-  crmSlgItemUpdate,
-} from "@/api/slgItem/slgItem";
-//add-fdw-引入bom-保存、读取、更新
-import { crmBomSave, crmBomRead, crmBomUpdate } from "@/api/bom/bom";
-//add-fdw-引主uomgroup-保存、读取、更新
-import {
-  crmUomGroupSave,
-  crmUomGroupRead,
-  crmUomGroupUpdate,
-} from "@/api/uomGroup/uomGroup";
-import { crmUomSave, crmUomRead, crmUomUpdate } from "@/api/uom/uom";
-import {
-  crmInterfaceCalendarSave,
-  crmInterfaceCalendarRead,
-  crmInterfaceCalendarUpdate,
-} from "@/api/interfaceCalendar/interfaceCalendar";
-import {
-  crmVerificationStagesSave,
-  crmVerificationStagesRead,
-  crmVerificationStagesUpdate,
-} from "@/api/verificationStages/verificationStages";
-import { crmAreaSave, crmAreaRead, crmAreaUpdate } from "@/api/area/area"; // 区域
-import {
-  crmAreaItemSave,
-  crmAreaItemRead,
-  crmAreaItemUpdate,
-} from "@/api/areaItem/areaItem"; // 区域-物品
-import {
-  crmCurrencySave,
-  crmCurrencyRead,
-  crmCurrencyUpdate,
-} from "@/api/currency/currency"; // 货币
-import {
-  crmCurrencyExchangeSave,
-  crmCurrencyExchangeRead,
-  crmCurrencyExchangeUpdate,
-} from "@/api/currencyExchange/currencyExchange"; // 货币换算
-import {
-  crmCustomerBomSave,
-  crmCustomerBomRead,
-  crmCustomerBomUpdate,
-} from "@/api/customerBom/customerBom"; // 客户物品产品结构
-import {
-  crmCustomerItemSave,
-  crmCustomerItemRead,
-  crmCustomerItemUpdate,
-} from "@/api/customerItem/customerItem"; // 客户物品
-import {
-  crmEqptTypeSave,
-  crmEqptTypeRead,
-  crmEqptTypeUpdate,
-} from "@/api/eqptType/eqptType"; // 器具类型
-import {
-  crmEqptTypeItemSave,
-  crmEqptTypeItemRead,
-  crmEqptTypeItemUpdate,
-} from "@/api/eqptTypeItem/eqptTypeItem"; // 器具类型-物品
-import { crmItemSave, crmItemRead, crmItemUpdate } from "@/api/item/item"; // 物品
-import {
-  crmItemTransTypeInventoryRouteSave,
-  crmItemTransTypeInventoryRouteRead,
-  crmItemTransTypeInventoryRouteUpdate,
-} from "@/api/itemTransTypeInventoryRoute/itemTransTypeInventoryRoute"; // 物品-事务类型-物流路线分配
-import {
-  crmItemTransTypeOpStrategySave,
-  crmItemTransTypeOpStrategyRead,
-  crmItemTransTypeOpStrategyUpdate,
-} from "@/api/itemTransTypeOpStrategy/itemTransTypeOpStrategy"; // 物品-事务类型-工序-策略分配
-import { crmLocSave, crmLocRead, crmLocUpdate } from "@/api/loc/loc"; // 库位
-import {
-  crmMachineSave,
-  crmMachineRead,
-  crmMachineUpdate,
-} from "@/api/machine/machine"; // 机器
-import { crmParamSave, crmParamRead, crmParamUpdate } from "@/api/param/param"; // 参数
-import { crmPortSave, crmPortRead, crmPortUpdate } from "@/api/port/port"; // 收货口
-import {
-  crmProdLineSave,
-  crmProdLineRead,
-  crmProdLineUpdate,
-} from "@/api/prodLine/prodLine"; // 生产线
-import {
-  crmProdLineItemSave,
-  crmProdLineItemRead,
-  crmProdLineItemUpdate,
-} from "@/api/prodLineItem/prodLineItem"; // 生产线-物品
-import {
-  crmProjectSave,
-  crmProjectRead,
-  crmProjectUpdate,
-} from "@/api/project/project"; // 项目
-import { crmShiftSave, crmShiftRead, crmShiftUpdate } from "@/api/shift/shift"; // 班次
-import { crmSlgSave, crmSlgRead, crmSlgUpdate } from "@/api/slg/slg"; // 库位组
-import {
-  crmSupplierSave,
-  crmSupplierRead,
-  crmSupplierUpdate,
-} from "@/api/supplier/supplier"; // 供应商
-import {
-  crmSupplierItemSave,
-  crmSupplierItemRead,
-  crmSupplierItemUpdate,
-} from "@/api/supplierItem/supplierItem"; // 供应商物品
-import { crmTeamSave, crmTeamRead, crmTeamUpdate } from "@/api/team/team"; // 班组
-import {
-  crmUomConversionSave,
-  crmUomConversionRead,
-  crmUomConversionUpdate,
-} from "@/api/uomConversion/uomConversion"; // 计量单位转换
-import { crmWlgSave, crmWlgRead, crmWlgUpdate } from "@/api/wlg/wlg"; // 工作组
-import {
-  crmWlgItemSave,
-  crmWlgItemRead,
-  crmWlgItemUpdate,
-} from "@/api/wlgItem/wlgItem"; // 工作组-物品
-import {
-  crmWorkCalendarSave,
-  crmWorkCalendarRead,
-  crmWorkCalendarUpdate,
-} from "@/api/workCalendar/workCalendar"; // 工作日历
-import {
-  crmWorkCenterSave,
-  crmWorkCenterRead,
-  crmWorkCenterUpdate,
-} from "@/api/workCenter/workCenter"; // 工作中心
-import {
-  crmInventoryRouteSave,
-  crmInventoryRouteRead,
-  crmInventoryRouteUpdate,
-  crmInventoryRouteDetailRead,
-  crmInventoryRouteDetailIndex,
-  crmInventoryRouteDetailAdd,
-  crmInventoryRouteDetailUpdate,
-} from "@/api/inventoryRoute/inventoryRoute"; //物流路线
-import {
-  crmPurchasePriceSheetSave,
-  crmPurchasePriceSheetRead,
-  crmPurchasePriceSheetUpdate,
-  crmPurchasePriceDetailRead,
-  crmPurchasePriceDetailIndex,
-  crmPurchasePriceDetailAdd,
-  crmPurchasePriceDetailUpdate,
-} from "@/api/purchasePriceSheet/purchasePriceSheet"; //采购价格单
-import {
-  crmRouteSave,
-  crmRouteRead,
-  crmRouteUpdate,
-  crmRouteDetailRead,
-  crmRouteDetailIndex,
-  crmRouteDetailAdd,
-  crmRouteDetailUpdate,
-} from "@/api/route/route"; //工艺路线
-
-import {
-  crmSalePriceSheetSave,
-  crmSalePriceSheetRead,
-  crmSalePriceSheetUpdate,
-  crmSalePriceDetailRead,
-  crmSalePriceDetailIndex,
-  crmSalePriceDetailAdd,
-  crmSalePriceDetailUpdate,
-} from "@/api/salePriceSheet/salePriceSheet"; //销售价格单
-
-import {
-  crmStdCostPriceSheetSave,
-  crmStdCostPriceSheetRead,
-  crmStdCostPriceSheetUpdate,
-  crmStdCostPriceDetailRead,
-  crmStdCostPriceDetailIndex,
-  crmStdCostPriceDetailAdd,
-  crmStdCostPriceDetailUpdate,
-} from "@/api/stdCostPriceSheet/stdCostPriceSheet"; //标准成本价格单
-
-import { crmOrgRead } from "@/api/org/org";
-//import {crmUomRead} from '@/api/uom/uom'
-//新增业务的创建、修改引入的两个json文件
-import data from "../../../../static/createField";
-import dataupdate from "../../../../static/updateField";
-import crmtypes from "../../../../static/crmTypes";
-
-import {
-  regexIsInt,
-  regexIsNumber,
-  regexIsCRMNumber,
-  regexIsCRMNumber2,
-  regexIsCRMNumber4,
-  regexIsCRMMoneyNumber,
-  regexIsCRMMobile,
-  regexIsCRMEmail,
-  regexIsCRMRate,
-  objDeepCopy,
-} from "@/utils";
-
-import { isArray } from "@/utils/types";
-
-import Lockr from "lockr";
-
-import {
-  XhInput,
-  XhTextarea,
-  XhSelect,
-  XhSwitch,
-  XhMultipleSelect,
-  XhDate,
-  XhDateTime,
-  XhUserCell,
-  XhStructureCell,
-  XhFiles,
-  CrmRelativeCell,
-  XhProuctCate,
-  XhProduct,
-  XhBusinessStatus,
-  XhCustomerAddress,
-  XhReceivablesPlan, // 回款计划期数
-} from "@/components/CreateCom";
-
-export default {
-  name: "CrmCreateView", // 所有新建效果的view
-  components: {
-    CreateView,
-    CreateSections,
-    XhInput,
-    XhTextarea,
-    XhSelect,
-    XhSwitch,
-    XhMultipleSelect,
-    XhDate,
-    XhDateTime,
-    XhUserCell,
-    XhStructureCell,
-    XhFiles,
-    CrmRelativeCell,
-    XhProuctCate,
-    XhProduct,
-    XhBusinessStatus,
-    XhCustomerAddress,
-    XhReceivablesPlan,
-    DialogTable, //子表表格组件
-  },
-  filters: {
-    /** 根据type 找到组件 */
-    typeToComponentName(formType) {
-      // if (
-      //   formType == "text" ||
-      //   formType == "number" ||
-      //   formType == "floatnumber" ||
-      //   formType == "mobile" ||
-      //   formType == "email"
-      // ) 
-      
-      if(formType == "text" || 
-         formType== "int" || 
-         formType == "number" ||
-         formType == "number2" || 
-         formType == "number4" ||  
-         formType == "moneynumber" || 
-         formType == "mobile" ||  
-         formType == "email" ||
-         formType == "rate" )
-      {
-        return "XhInput";
-      } else if (formType == "textarea") {
-        return "XhTextarea";
-      } else if (formType == "select" || formType == "business_status") {
-        return "XhSelect";
-      } else if (formType == "switch") {
-        return "XhSwitch";
-      } else if (formType == "checkbox") {
-        return "XhMultipleSelect";
-      } else if (formType == "date") {
-        return "XhDate";
-      } else if (formType == "datetime") {
-        return "XhDateTime";
-      } else if (formType == "user") {
-        return "XhUserCell";
-      } else if (formType == "structure") {
-        return "XhStructureCell";
-      } else if (formType == "file") {
-        return "XhFiles";
-      } else if (
-        //add-fdw-自定义弹出框
-        formType == "contacts" ||
-        formType == "customer" ||
-        formType == "contract" ||
-        formType == "business" ||
-        formType == "strategy" ||
-        formType == "rule" ||
-        formType == "route" ||
-        formType == "org" ||
-        formType == "slg" ||
-        formType == "item" ||
-        formType == "bom" ||
-        formType == "uom" ||
-        formType == "uomGroup" ||
-        formType == "verification" ||
-        formType == "stage" ||
-        formType == "area" ||
-        formType == "areaItem" ||
-        formType == "currency" ||
-        formType == "currencyExchange" ||
-        formType == "customerBom" ||
-        formType == "customerItem" ||
-        formType == "eqptType" ||
-        formType == "eqptTypeItem" ||
-        formType == "itemTransTypeInventoryRoute" ||
-        formType == "itemTransTypeOpStrategy" ||
-        formType == "loc" ||
-        formType == "machine" ||
-        formType == "param" ||
-        formType == "port" ||
-        formType == "prodLine" ||
-        formType == "prodLineItem" ||
-        formType == "project" ||
-        formType == "shift" ||
-        formType == "slg" ||
-        formType == "supplier" ||
-        formType == "supplierItem" ||
-        formType == "team" ||
-        formType == "uomConversion" ||
-        formType == "wlg" ||
-        formType == "wlgItem" ||
-        formType == "workCalendar" ||
-        formType == "workCenter" ||
-        formType == "inventoryRoute" ||
-        formType == "purchaseUomConversion" ||
-        formType == "stockUomConversion" ||
-        formType == "productionUomConversion" ||
-        formType == "sellUomConversion" ||
-        formType == "allocation"
-      ) {
-        return "CrmRelativeCell";
-      } else if (formType == "category") {
-        // 产品类别
-        return "XhProuctCate";
-      } else if (formType == "business_type") {
-        // 商机类别
-        return "XhBusinessStatus";
-      } else if (formType == "product") {
-        return "XhProduct";
-      } else if (formType == "map_address") {
-        return "XhCustomerAddress";
-      } else if (formType == "receivables_plan") {
-        return "XhReceivablesPlan";
-      }
-    },
-  },
-  props: {
-    // CRM类型
-    crmType: {
-      type: String,
-      default: "",
-    },
-    action: {
-      type: Object,//updata:更新 create:新建 detail:详细信息
-      default: () => {
-        return {
-          type: "save",
-          id: "",
-          subid: "",
-          data: {}, // 编辑所需信息
-        };
-      },
-    },
-    width: {
-      type: String,
-      default: "700px",
-    },
-    formTitle:''
-  },
-  data() {
-    return {
-      // 标题展示名称
-      title: "",
-      loading: false,
-      saveAndCreate: false, // 保存并新建
-      // 自定义字段验证规则
-      crmRules: {},
-      // 自定义字段信息表单
-      crmForm: {
-        crmFields: [],
-      },
-      // 审批信息
-      examineInfo: {},
-      formLabelWidth: "80px",
-      limitNum: 1,
-      dialogImageUrl: "",
-      //表单信息
-      crmData: {},
-      //子表信息
-      subtableData: [],
-      crmTypes:{},
-      saveDisabled:false
-    };
-  },
-  computed: {
-    
-  },
-  watch: {
-    crmType: function (value) {
-      this.title = this.getTitle();
-      this.crmRules = {};
-      this.crmForm = {
-        crmFields: [],
-      };
-      this.examineInfo = {};
-      this.getField();
-    },
-  },
-  mounted() {
-    // 获取title展示名称
-    document.body.appendChild(this.$el);
-    this.crmTypes=crmtypes;
-    if(this.action.type == "detail")
-    {
-      this.saveDisabled=true;
-    }
-    else {
-      this.saveDisabled=false;
-    }
-    this.title = this.getTitle();
-    this.getField();
-
-    // 注册子表组件传来的数据方法
-    this.$bus.$on("updateData", (content) => {
-      this.subtableData = content;
-      console.log(JSON.stringify(this.subtableData));
-    });
-  },
-  destroyed() {
-    // remove DOM node after destroy
-    if (this.$el && this.$el.parentNode) {
-      this.$el.parentNode.removeChild(this.$el);
-    }
-    this.crmData = {};
-    // this.bus.$off('updateData',(content)=>{
-    // });
-  },
-  methods: {
-    // 审批信息值更新
-    examineValueChange(data) {
-      this.examineInfo = data;
-    },
-    // 字段的值更新
-    fieldValueChange(data) {
-      var item = this.crmForm.crmFields[data.index];
-      item.value = data.value;
-
-      // 无事件的处理 后期可换成input实现
-      if (
-        item.data.formType == "user" ||
-        item.data.formType == "structure" ||
-        item.data.formType == "file" ||
-        item.data.formType == "category" ||
-        item.data.formType == "customer" ||
-        item.data.formType == "business" ||
-        item.data.formType == "contract" ||
-        item.data.formType == "strategy" ||
-        item.data.formType == "rule" ||
-        item.data.formType == "org" ||
-        item.data.formType == "slg" ||
-        item.data.formType == "item" ||
-        item.data.formType == "bom" ||
-        item.data.formType == "uom" ||
-        item.data.formType == "uomGroup" ||
-        item.data.formType == "verification" ||
-        item.data.formType == "stage" ||
-        item.data.formType == "area" ||
-        item.data.formType == "areaItem" ||
-        item.data.formType == "currency" ||
-        item.data.formType == "currencyExchange" ||
-        item.data.formType == "customerBom" ||
-        item.data.formType == "customerItem" ||
-        item.data.formType == "eqptType" ||
-        item.data.formType == "eqptTypeItem" ||
-        item.data.formType == "itemTransTypeInventoryRoute" ||
-        item.data.formType == "itemTransTypeOpStrategy" ||
-        item.data.formType == "loc" ||
-        item.data.formType == "machine" ||
-        item.data.formType == "param" ||
-        item.data.formType == "port" ||
-        item.data.formType == "prodLine" ||
-        item.data.formType == "prodLineItem" ||
-        item.data.formType == "project" ||
-        item.data.formType == "shift" ||
-        item.data.formType == "slg" ||
-        item.data.formType == "supplier" ||
-        item.data.formType == "supplierItem" ||
-        item.data.formType == "team" ||
-        item.data.formType == "uomConversion" ||
-        item.data.formType == "wlg" ||
-        item.data.formType == "wlgItem" ||
-        item.data.formType == "workCalendar" ||
-        item.data.formType == "workCenter"|| 
-        item.data.formType == "route"
-      ) {
-        this.$refs.crmForm.validateField("crmFields." + data.index + ".value");
-      }
-    },
-
-    getField() {
-      this.loading = true;
-       // 进行编辑操作
-      if (this.action.type == "update" || this.action.type == "detail") {
-        this.getUpdateField();
-      } else {
-        console.log("----- 添加 -----");
-        const filedList = data[this.crmType].data;
-        this.getcrmRulesAndModel(filedList);
-      }
-      this.loading = false;
-    },
-
-    getUpdateField() {
-      this.loading = true;
-      const filedListEdit = dataupdate[this.crmType].data;
-      // 获取自定义字段的更新时间
-      var params = {
-        label: crmTypeModel[this.crmType],
-      };
-
-      params.id = this.action.id;
-      params.subid = this.action.subid; //子表Id
-
-      //1.查询要编辑表的详细信息
-      let crmRequest = this.getReadRequest();
-      crmRequest(params.id, params.subid)
-        .then((res) => {
-          this.crmData = res;
-          console.log(JSON.stringify(res));
-          //2.遍历UpdateJson中的属性
-          filedListEdit.map((item) => {
-            //3.遍历从接口获取的返回值‘res’的属性
-            Object.keys(res).forEach((key) => {
-              if (key == item.fieldName) {
-                //3.1如果字段的值来自关联表
-                if (key.endsWith("ID") && item.formType != "text") {
-                  //3.1.1获取关联表的请求
-                  let relationReadRequest = this.getReadRequest(item.formType);
-                  if (
-                    relationReadRequest == undefined ||
-                    relationReadRequest == ""
-                  ) {
-                    console.log(
-                      "------ update没有找到 " +
-                        item.formType +
-                        " 的 crmXXXXRead -----"
-                    );
-                  } else {
-                    relationReadRequest(res[key]).then((resRelation) => {
-                      let _json = {};
-                      _json["Id"] = res[key];
-                      _json[key] = res[key];
-
-                      if (key === "OrgID") {
-                        _json["branchName"] = resRelation.name;
-                      }
-                      else
-                      { 
-                        _json["Code"] = resRelation.Code;
-                        _json["Name"] = resRelation.Name;
-                      }
-                  
-                      var _array = [_json];
-                      item.value = _array;
-                    }) .catch((error) => {
-                      this.loading = false;
-                    });;
-                  }
-                }
-                //3.2 直接
-                else {
-                  item.value = res[key];
-                }
-              }
-              this.loading = false;
-            });
-          });
-          //4.根据filedListEdit渲染界面
-          setTimeout((item) => {
-            this.getcrmRulesAndModel(filedListEdit);
-          }, 500);
-        })
-        .catch(() => {
-          this.loading = false;
-        });
-    },
-
-    // 根据自定义字段获取自定义字段规则及Model
-    getcrmRulesAndModel(list) {
-      console.log("----- 根据自定义字段获取自定义字段规则 -----");
-      let showStyleIndex = -1;
-      for (let index = 0; index < list.length; index++) {
-        const item = list[index];
-        showStyleIndex += 1;
-
-        //规则
-        this.crmRules[item.fieldName] = this.getItemRulesArrayFromItem(item);
-        // let otherRules=this.getOtherRulesArrayFromItem(item,this.crmForm.crmFields);
-        var params = {};
-        if (this.action.type == "update") //编辑
-        {
-          params["value"] = item.value; //  
-          params["disabled"]=item.disabled ||false; //控件是否可用
-        } else if(this.action.type == "detail") //详细信息
-        {
-          params["value"] = item.value;
-          params["disabled"]=true; //控件不可用
-        }
-        else //新增
-         {
-          //赋初始值
-          if (item.formType === "text") {
-            params["value"] = item.defaultValue || "";
-           } else if(item.formType === "int" || 
-            item.formType === "number"  || 
-            item.formType === "number2" || 
-            item.formType === "number4" || 
-            item.formType === "moneynumber" || 
-            item.formType === "rate")
-          {
-            //params["value"] =item.isNull===1? 0:null; 
-            params["value"] =0; 
-          } else if (item.formType === "switch") {
-            params["value"] = true;
-          } else if (item.formType === "datetime") {
-            //params["value"] =item.isNull===1? this.getNowDate():null; 
-            params["value"] =this.getNowDate()
-          }else {
-            params["value"] = item.defaultValue;
-          }
-          params["disabled"]=false; //新增控件可用
-        }
-        params["key"] = item.fieldName;
-        params["data"] = item;
-        params["styleIndex"] = showStyleIndex;
-        this.crmForm.crmFields.push(params);
-      }
-    },
-
-    // 保存数据
-    saveField(saveAndCreate, isDraft = false) {
-      console.log("-------- 保存 --------");
-      this.saveAndCreate = saveAndCreate;
-      this.$refs.crmForm.validate((valid) => {
-        if (valid) {
-          //其他校验
-          var otherValid=this.getCrmFormOtherValidate()
-          if(otherValid)
-          {
-            var params = this.getSubmiteParams(this.crmForm.crmFields);
-            //获取其他参数
-            this.getOtherParams(params);
-           
-            console.log("params" + JSON.stringify(params));
-            this.submiteParams(params);
-          }
-        } else {
-          this.$message.error('表单校验未通过,请查看表单信息');
-          return false;
-        }
-      });
-    }, 
-    //获取其他校验规则
-    getCrmFormOtherValidate()
-    {
-      if(this.crmType==='strategyRules' ||
-         this.crmType==='uom' ||
-         this.crmType==='uomConversion'  
-      )
-      {
-        var EffectiveTimeValue= this.crmForm.crmFields.find(item=>{return item.key==='EffectiveTime'}).value;
-        var ExpireTimeValue= this.crmForm.crmFields.find(item=>{return item.key==='ExpireTime'}).value;
-
-         if(EffectiveTimeValue >= ExpireTimeValue){
-            this.$message.error('生效时间不能大于等于失效时间');
-            return false;
-         } 
-      }
-      else if( 
-              this.crmType==='project' ||
-              this.crmType==='workCalendar' ||
-              this.crmType==='shift' ||
-              this.crmType==='interfaceCalendar' ||
-              this.crmType==='purchasePriceDetail' ||
-              this.crmType == "salePriceDetail" ||
-              this.crmType == "stdCostPriceDetail"   )
-      {
-        var BeginTimeValue= this.crmForm.crmFields.find(item=>{return item.key==='BeginTime'}).value;
-        var EndTimeValue= this.crmForm.crmFields.find(item=>{return item.key==='EndTime'}).value;
-
-         if(BeginTimeValue >= EndTimeValue){
-            this.$message.error('开始时间不能大于等于结束时间');
-            return false;
-         } 
-      }
-      else if(this.crmType==='customerBom' ||  this.crmType==='bom' )
-      {
-         var ParentItemCodeValue= this.crmForm.crmFields.find(item=>{return item.key==='ParentItemID'}).value;
-         var ChildItemCodeValue= this.crmForm.crmFields.find(item=>{return item.key==='ChildItemID'}).value;
-           if(ParentItemCodeValue!=null && ChildItemCodeValue!=null &&   ParentItemCodeValue[0].Id === ChildItemCodeValue[0].Id){
-            this.$message.error('主物品不能等于子物品');
-            return false;
-         } 
-
-        var failureTime='FailureTime';
-        if(this.crmType==='bom' )
-        {
-          failureTime='ExpireTime'
-        }
-         var EffectiveTimeValue= this.crmForm.crmFields.find(item=>{return item.key==='EffectiveTime'}).value;
-         var FailureTimeValue= this.crmForm.crmFields.find(item=>{return item.key===failureTime}).value;
-
-         if(EffectiveTimeValue >= FailureTimeValue){
-            this.$message.error('生效时间不能大于等于失效时间');
-            return false;
-         } 
-
-      }
-      return true;    
-    },
-
-    /* 提交 */
-    submiteParams(params) {
-      this.loading = true;
-      if (this.action.type == "update") {
-        this.submiteUpdateRequest(params);
-      }
-      //新增
-      else {
-        this.submiteAddRequest(params);
-      }
-    },
-
-    submiteAddRequest(params) {
-      let crmRequest = this.getSubmiteRequest();
-      console.log("ID:" +this.action.id);
-      //子主表保存的参数类型是数组
-      if (
-        this.crmType == "dictssub" ||
-        this.crmType == "stdCostPriceDetail" ||
-        this.crmType == "inventoryRouteDetail" ||
-        this.crmType == "purchasePriceDetail" ||
-        this.crmType == "routeDetail" ||
-        this.crmType == "salePriceDetail"
-      ) {
-        let newParams = [];
-        newParams.push(params);
-        crmRequest(this.action.id, newParams)
-          .then((res) => {
-            this.submiteParamsCallBack(res);
-          })
-          .catch((error) => {
-            this.loading = false;
-            // this.$message.error(error.message); 系统已经默认弹出提示
-            console.log(error.details);
-          });
-      } //其他表保存的参数类型是单独Dto
-      else {
-        crmRequest(params)
-          .then((res) => {
-            this.submiteParamsCallBack(res);
-          })
-          .catch((err) => {
-            //唯一索引重复
-            if(err.message==='An error occurred while updating the entries. See the inner exception for details.')
-            {
-              //SqlException 返回的异常消息 ,包括唯一索引重复
-              if(err.details.indexOf('SqlException: '))
-              {
-                let beginindex= err.details.indexOf('SqlException: ')
-                let endindex= err.details.indexOf('语句已终止。')
-                //语句已终止。
-                let message=  err.details.substring(beginindex, endindex);
-                this.$message.error(message);
-              }
-              
-            }
-            else
-            {
-              //this.$message.error(err.message); 系统已经默认弹出提示
-            }
-            console.log(err.details);
-            this.loading = false;
-          });
-      }
-    },
-
-    submiteUpdateRequest(params) {
-      console.log("ID:" +this.action.id);
-      console.log("ID:" +params);
-
-      let crmRequest = this.getSubmiteUpdateRequest();
-      if (
-        this.crmType == "dictssub" ||
-        this.crmType == "stdCostPriceDetail" ||
-        this.crmType == "inventoryRouteDetail" ||
-        this.crmType == "purchasePriceDetail" ||
-        this.crmType == "routeDetail" ||
-        this.crmType == "salePriceDetail"
-      ) {
-        let newParams = [];
-        newParams.push(params);
-        console.log("parentID:" +this.action.id);
-        crmRequest(this.action.id, newParams)
-          .then((res) => {
-            this.submiteParamsCallBack(res);
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      } else {
-        crmRequest(this.action.id, params)
-          .then((res) => {
-            this.submiteParamsCallBack(res);
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      }
-    },
-
-    submiteParamsCallBack(res) {
-      this.loading = false;
-      this.hidenView();
-      this.$message.success(
-        this.action.type == "update" ? "编辑成功" : "添加成功"
-      );
-      // 回到保存成功
-      this.$emit("save-success", {
-        type: this.crmType,
-        data: res.data || {},
-        saveAndCreate: this.saveAndCreate,
-      });
-    },
-
-    /**获取详情url**/
-    getReadRequest(crmTypes = this.crmType) {
-      console.log(
-        "----- 方法 : 获取详情url getReadRequest(crmTypes = " + crmTypes + ")"
-      );
-      if (crmTypes == "leads") {
-        return crmLeadsRead;
-      } else if (crmTypes == "dicts") {
-        return crmDictsRead;
-      } else if (crmTypes == "dictssub") {
-        return crmDictsItemDetailRead;
-      } else if (crmTypes == "transaction") {
-        return crmTransactionRead;
-      } else if (crmTypes == "strategy") {
-        return crmStrategyRead;
-      } else if (crmTypes == "rule") {
-        return crmRuleRead;
-      } else if (crmTypes == "strategyRules") {
-        return crmStrategyRulesRead;
-      } else if (crmTypes == "verification") {
-        return crmVerificationRead;
-      } else if (crmTypes == "stage") {
-        return crmStageRead;
-      } else if (crmTypes == "customer") {
-        return crmCustomerRead;
-      } else if (crmTypes == "slgItem") {
-        return crmSlgItemRead;
-      } else if (crmTypes == "bom") {
-        return crmBomRead;
-      } else if (crmTypes == "uomGroup") {
-        //add-fdw
-        return crmUomGroupRead;
-      } else if (crmTypes == "uom") {
-        //add-fdw
-        return crmUomRead;
-      } else if (crmTypes == "interfaceCalendar") {
-        return crmInterfaceCalendarRead;
-      } else if (crmTypes == "verificationStages") {
-        return crmVerificationStagesRead;
-      } else if (crmTypes == "area") {
-        // 区域
-        return crmAreaRead;
-      } else if (crmTypes == "areaItem") {
-        // 区域-物品
-        return crmAreaItemRead;
-      } else if (crmTypes == "currency") {
-        // 货币
-        return crmCurrencyRead;
-      } else if (crmTypes == "currencyExchange") {
-        // 货币换算
-        return crmCurrencyExchangeRead;
-      } else if (crmTypes == "customerBom") {
-        // 客户物品产品结构
-        return crmCustomerBomRead;
-      } else if (crmTypes == "customerItem") {
-        // 客户物品
-        return crmCustomerItemRead;
-      } else if (crmTypes == "eqptType") {
-        // 器具类型
-        return crmEqptTypeRead;
-      } else if (crmTypes == "eqptTypeItem") {
-        // 器具类型-物品
-        return crmEqptTypeItemRead;
-      } else if (crmTypes == "item") {
-        // 物品
-        return crmItemRead;
-      } else if (crmTypes == "itemTransTypeInventoryRoute") {
-        // 物品-事务类型-物流路线分配
-        return crmItemTransTypeInventoryRouteRead;
-      } else if (crmTypes == "itemTransTypeOpStrategy") {
-        // 物品-事务类型-工序-策略分配
-        return crmItemTransTypeOpStrategyRead;
-      } else if (crmTypes == "loc") {
-        // 库位
-        return crmLocRead;
-      } else if (crmTypes == "machine") {
-        // 机器
-        return crmMachineRead;
-      } else if (crmTypes == "param") {
-        // 参数
-        return crmParamRead;
-      } else if (crmTypes == "port") {
-        // 收货口
-        return crmPortRead;
-      } else if (crmTypes == "prodLine") {
-        // 生产线
-        return crmProdLineRead;
-      } else if (crmTypes == "prodLineItem") {
-        // 生产线-物品
-        return crmProdLineItemRead;
-      } else if (crmTypes == "project") {
-        // 项目
-        return crmProjectRead;
-      } else if (crmTypes == "shift") {
-        // 班次
-        return crmShiftRead;
-      } else if (crmTypes == "slg") {
-        // 库位组
-        return crmSlgRead;
-      } else if (crmTypes == "supplier") {
-        // 供应商
-        return crmSupplierRead;
-      } else if (crmTypes == "supplierItem") {
-        // 供应商物品
-        return crmSupplierItemRead;
-      } else if (crmTypes == "team") {
-        // 班组
-        return crmTeamRead;
-      } else if (crmTypes == "uomConversion") {
-        // 计量单位转换
-        return crmUomConversionRead;
-      } else if (crmTypes == "wlg") {
-        // 工作组
-        return crmWlgRead;
-      } else if (crmTypes == "wlgItem") {
-        // 工作组-物品
-        return crmWlgItemRead;
-      } else if (crmTypes == "workCalendar") {
-        // 工作日历
-        return crmWorkCalendarRead;
-      } else if (crmTypes == "workCenter") {
-        // 工作中心
-        return crmWorkCenterRead;
-      } else if (crmTypes == "inventoryRoute") {
-        // 物流路线
-        return crmInventoryRouteRead;
-      } else if (crmTypes == "inventoryRouteDetail") {
-        // 物流路线明细
-        return crmInventoryRouteDetailRead;
-      } else if (crmTypes == "purchasePriceDetail") {
-        // 采购价格单明细
-        return crmPurchasePriceDetailRead;
-      } else if (crmTypes == "purchasePriceSheet") {
-        // 采购价格单
-        return crmPurchasePriceSheetRead;
-      } else if (crmTypes == "route") {
-        // 工艺路线
-        return crmRouteRead;
-      } else if (crmTypes == "routeDetail") {
-        // 工艺路线明细
-        return crmRouteDetailRead;
-      } else if (crmTypes == "salePriceDetail") {
-        // 销售价格单明细
-        return crmSalePriceDetailRead;
-      } else if (crmTypes == "salePriceSheet") {
-        // 销售价格单
-        return crmSalePriceSheetRead;
-      } else if (crmTypes == "stdCostPriceDetail") {
-        // 标准成本价格明细
-        return crmStdCostPriceDetailRead;
-      } else if (crmTypes == "stdCostPriceSheet") {
-        // 标准成本价格单
-        return crmStdCostPriceSheetRead;
-      } else if (
-        crmTypes == "purchaseUomConversion" ||
-        crmTypes == "stockUomConversion" ||
-        crmTypes == "productionUomConversion" ||
-        crmTypes == "sellUomConversion"
-      ) {
-        // 采购计量单位转换等
-        return crmUomConversionRead;
-      }
-    },
-    /** 获取上传url */
-    getSubmiteUpdateRequest() {
-      if (this.crmType == "leads") {
-        return crmLeadsUpdate;
-      } else if (this.crmType == "dicts") {
-        return crmDictsUpdate;
-      } else if (this.crmType == "dictssub") {
-        return crmDictsItemUpdate;
-      } else if (this.crmType == "transaction") {
-        return crmTransactionUpdate;
-      } else if (this.crmType == "strategy") {
-        return crmStrategyUpdate;
-      } else if (this.crmType == "rule") {
-        return crmRuleUpdate;
-      } else if (this.crmType == "strategyRules") {
-        return crmStrategyRulesUpdate;
-      } else if (this.crmType == "verification") {
-        return crmVerificationUpdate;
-      } else if (this.crmType == "stage") {
-        return crmStageUpdate;
-      } else if (this.crmType == "customer") {
-        return crmCustomerUpdate;
-      } else if (this.crmType == "slgItem") {
-        return crmSlgItemUpdate;
-      } else if (this.crmType == "bom") {
-        return crmBomUpdate;
-      } else if (this.crmType == "uomGroup") {
-        //add-fdw
-        return crmUomGroupUpdate;
-      } else if (this.crmType == "uom") {
-        //add-fdw
-        return crmUomUpdate;
-      } else if (this.crmType == "interfaceCalendar") {
-        return crmInterfaceCalendarUpdate;
-      } else if (this.crmType == "verificationStages") {
-        return crmVerificationStagesUpdate;
-      } else if (this.crmType == "area") {
-        // 区域
-        return crmAreaUpdate;
-      } else if (this.crmType == "areaItem") {
-        // 区域-物品
-        return crmAreaItemUpdate;
-      } else if (this.crmType == "currency") {
-        // 货币
-        return crmCurrencyUpdate;
-      } else if (this.crmType == "currencyExchange") {
-        // 货币换算
-        return crmCurrencyExchangeUpdate;
-      } else if (this.crmType == "customerBom") {
-        // 客户物品产品结构
-        return crmCustomerBomUpdate;
-      } else if (this.crmType == "customerItem") {
-        // 客户物品
-        return crmCustomerItemUpdate;
-      } else if (this.crmType == "eqptType") {
-        // 器具类型
-        return crmEqptTypeUpdate;
-      } else if (this.crmType == "eqptTypeItem") {
-        // 器具类型-物品
-        return crmEqptTypeItemUpdate;
-      } else if (this.crmType == "item") {
-        // 物品
-        return crmItemUpdate;
-      } else if (this.crmType == "itemTransTypeInventoryRoute") {
-        // 物品-事务类型-物流路线分配
-        return crmItemTransTypeInventoryRouteUpdate;
-      } else if (this.crmType == "itemTransTypeOpStrategy") {
-        // 物品-事务类型-工序-策略分配
-        return crmItemTransTypeOpStrategyUpdate;
-      } else if (this.crmType == "loc") {
-        // 库位
-        return crmLocUpdate;
-      } else if (this.crmType == "machine") {
-        // 机器
-        return crmMachineUpdate;
-      } else if (this.crmType == "param") {
-        // 参数
-        return crmParamUpdate;
-      } else if (this.crmType == "port") {
-        // 收货口
-        return crmPortUpdate;
-      } else if (this.crmType == "prodLine") {
-        // 生产线
-        return crmProdLineUpdate;
-      } else if (this.crmType == "prodLineItem") {
-        // 生产线-物品
-        return crmProdLineItemUpdate;
-      } else if (this.crmType == "project") {
-        // 项目
-        return crmProjectUpdate;
-      } else if (this.crmType == "shift") {
-        // 班次
-        return crmShiftUpdate;
-      } else if (this.crmType == "slg") {
-        // 库位组
-        return crmSlgUpdate;
-      } else if (this.crmType == "supplier") {
-        // 供应商
-        return crmSupplierUpdate;
-      } else if (this.crmType == "supplierItem") {
-        // 供应商物品
-        return crmSupplierItemUpdate;
-      } else if (this.crmType == "team") {
-        // 班组
-        return crmTeamUpdate;
-      } else if (this.crmType == "uomConversion") {
-        // 计量单位转换
-        return crmUomConversionUpdate;
-      } else if (this.crmType == "wlg") {
-        // 工作组
-        return crmWlgUpdate;
-      } else if (this.crmType == "wlgItem") {
-        // 工作组-物品
-        return crmWlgItemUpdate;
-      } else if (this.crmType == "workCalendar") {
-        // 工作日历
-        return crmWorkCalendarUpdate;
-      } else if (this.crmType == "workCenter") {
-        // 工作中心
-        return crmWorkCenterUpdate;
-      } else if (this.crmType == "inventoryRoute") {
-        // 物流路线
-        return crmInventoryRouteUpdate;
-      } else if (this.crmType == "inventoryRouteDetail") {
-        // 物流路线明细
-        return crmInventoryRouteDetailUpdate;
-      } else if (this.crmType == "purchasePriceDetail") {
-        // 采购价格单明细
-        return crmPurchasePriceDetailUpdate;
-      } else if (this.crmType == "purchasePriceSheet") {
-        // 采购价格单
-        return crmPurchasePriceSheetUpdate;
-      } else if (this.crmType == "route") {
-        // 工艺路线
-        return crmRouteUpdate;
-      } else if (this.crmType == "routeDetail") {
-        // 工艺路线明细
-        return crmRouteDetailUpdate;
-      } else if (this.crmType == "salePriceDetail") {
-        // 销售价格单明细
-        return crmSalePriceDetailUpdate;
-      } else if (this.crmType == "salePriceSheet") {
-        // 销售价格单
-        return crmSalePriceSheetUpdate;
-      } else if (this.crmType == "stdCostPriceDetail") {
-        // 标准成本价格明细
-        return crmStdCostPriceDetailUpdate;
-      } else if (this.crmType == "stdCostPriceSheet") {
-        // 标准成本价格单
-        return crmStdCostPriceSheetUpdate;
-      }
-    },
-    /** 获取创建方法 */
-    getSubmiteRequest() {
-      if (this.crmType == "leads") {
-        return crmLeadsSave;
-      } else if (this.crmType == "dicts") {
-        return crmDictsSave;
-      } else if (this.crmType == "dictssub") {
-        return crmDictsItemAdd;
-      } else if (this.crmType == "transaction") {
-        return crmTransactionSave;
-      } else if (this.crmType == "strategy") {
-        return crmStrategySave;
-      } else if (this.crmType == "rule") {
-        return crmRuleSave;
-      } else if (this.crmType == "strategyRules") {
-        return crmStrategyRulesSave;
-      } else if (this.crmType == "verification") {
-        return crmVerificationSave;
-      } else if (this.crmType == "stage") {
-        return crmStageSave;
-      } else if (this.crmType == "customer") {
-        return crmCustomerSave;
-      } else if (this.crmType == "slgItem") {
-        return crmSlgItemSave;
-      } else if (this.crmType == "bom") {
-        //add-引入bom
-        return crmBomSave;
-      } else if (this.crmType == "uomGroup") {
-        //add-引入uomgroup
-        return crmUomGroupSave;
-      } else if (this.crmType == "uom") {
-        //add-引入uomgroup
-        return crmUomSave;
-      } else if (this.crmType == "interfaceCalendar") {
-        return crmInterfaceCalendarSave;
-      } else if (this.crmType == "verificationStages") {
-        return crmVerificationStagesSave;
-      } else if (this.crmType == "area") {
-        // 区域
-        return crmAreaSave;
-      } else if (this.crmType == "areaItem") {
-        // 区域-物品
-        return crmAreaItemSave;
-      } else if (this.crmType == "currency") {
-        // 货币
-        return crmCurrencySave;
-      } else if (this.crmType == "currencyExchange") {
-        // 货币换算
-        return crmCurrencyExchangeSave;
-      } else if (this.crmType == "customerBom") {
-        // 客户物品产品结构
-        return crmCustomerBomSave;
-      } else if (this.crmType == "customerItem") {
-        // 客户物品
-        return crmCustomerItemSave;
-      } else if (this.crmType == "eqptType") {
-        // 器具类型
-        return crmEqptTypeSave;
-      } else if (this.crmType == "eqptTypeItem") {
-        // 器具类型-物品
-        return crmEqptTypeItemSave;
-      } else if (this.crmType == "item") {
-        // 物品
-        return crmItemSave;
-      } else if (this.crmType == "itemTransTypeInventoryRoute") {
-        // 物品-事务类型-物流路线分配
-        return crmItemTransTypeInventoryRouteSave;
-      } else if (this.crmType == "itemTransTypeOpStrategy") {
-        // 物品-事务类型-工序-策略分配
-        return crmItemTransTypeOpStrategySave;
-      } else if (this.crmType == "loc") {
-        // 库位
-        return crmLocSave;
-      } else if (this.crmType == "machine") {
-        // 机器
-        return crmMachineSave;
-      } else if (this.crmType == "param") {
-        // 参数
-        return crmParamSave;
-      } else if (this.crmType == "port") {
-        // 收货口
-        return crmPortSave;
-      } else if (this.crmType == "prodLine") {
-        // 生产线
-        return crmProdLineSave;
-      } else if (this.crmType == "prodLineItem") {
-        // 生产线-物品
-        return crmProdLineItemSave;
-      } else if (this.crmType == "project") {
-        // 项目
-        return crmProjectSave;
-      } else if (this.crmType == "shift") {
-        // 班次
-        return crmShiftSave;
-      } else if (this.crmType == "slg") {
-        // 库位组
-        return crmSlgSave;
-      } else if (this.crmType == "supplier") {
-        // 供应商
-        return crmSupplierSave;
-      } else if (this.crmType == "supplierItem") {
-        // 供应商物品
-        return crmSupplierItemSave;
-      } else if (this.crmType == "team") {
-        // 班组
-        return crmTeamSave;
-      } else if (this.crmType == "uomConversion") {
-        // 计量单位转换
-        return crmUomConversionSave;
-      } else if (this.crmType == "wlg") {
-        // 工作组
-        return crmWlgSave;
-      } else if (this.crmType == "wlgItem") {
-        // 工作组-物品
-        return crmWlgItemSave;
-      } else if (this.crmType == "workCalendar") {
-        // 工作日历
-        return crmWorkCalendarSave;
-      } else if (this.crmType == "workCenter") {
-        // 工作中心
-        return crmWorkCenterSave;
-      } else if (this.crmType == "inventoryRoute") {
-        // 物流路线
-        return crmInventoryRouteSave;
-      } else if (this.crmType == "inventoryRouteDetail") {
-        // 物流路线明细
-        return crmInventoryRouteDetailAdd;
-      } else if (this.crmType == "purchasePriceSheet") {
-        // 采购价格单
-        return crmPurchasePriceSheetSave;
-      } else if (this.crmType == "purchasePriceDetail") {
-        // 采购价格单明细
-        return crmPurchasePriceDetailAdd;
-      } else if (this.crmType == "route") {
-        // 工艺路线
-        return crmRouteSave;
-      } else if (this.crmType == "routeDetail") {
-        // 工艺路线明细
-        return crmRouteDetailAdd;
-      } else if (this.crmType == "salePriceSheet") {
-        // 销售价格单
-        return crmSalePriceSheetSave;
-      } else if (this.crmType == "salePriceDetail") {
-        // 销售价格单明细
-        return crmSalePriceDetailAdd;
-      } else if (this.crmType == "stdCostPriceSheet") {
-        // 标准成本价格单
-        return crmStdCostPriceSheetSave;
-      } else if (this.crmType == "stdCostPriceDetail") {
-        // 标准成本价格明细
-        return crmStdCostPriceDetailAdd;
-      }
-    },
-    /** 拼接上传传输 */
-    getSubmiteParams(array) {
-      console.log(array)
-      var params = { entity: {}, field: [] };
-      for (let index = 0; index < array.length; index++) {
-        const element = array[index];
-
-        if (element.data.fieldType == 1) {
-          params.entity[element.key] = this.getRealParams(element);
-          //params.entity[element.key] = this.getRealParams(element) || ''
-        } else {
-          //枚举列表的fieldType==0
-          element.data.value = this.getRealParams(element);
-          params.field.push(element.data);
-        }
-      }
-      return params.entity;
-    },
-    /** 获取其他参数 nxt */
-    getOtherParams(params) {
-      console.log("this.crmType : " + this.crmType);
-      //新增
-      if (this.action.type != "update") {
-        // if (this.crmType == "dicts") {
-        //   params["DictionaryItems"] = this.subtableData;
-        // } else 
-        //增加组织ID参数
-        if (
-          this.crmType === "area" ||
-          this.crmType === "team" ||
-          this.crmType === "port" ||
-          this.crmType === "project" ||
-          this.crmType === "wlg" ||
-          this.crmType === "param" ||
-          this.crmType === "stdCostPriceSheet" ||
-          this.crmType === "inventoryRoute" ||
-          this.crmType === "purchasePriceSheet" ||
-          this.crmType === "route" ||
-          this.crmType === "salePriceSheet" ||
-          this.crmType === "stdCostPriceDetail" ||
-          this.crmType === "inventoryRouteDetail" ||
-          this.crmType === "purchasePriceDetail" ||
-          this.crmType === "routeDetail" ||
-          this.crmType === "salePriceDetail" ||
-          this.crmType == "areaItem" ||
-          this.crmType == "customer" ||
-          this.crmType == "customerBom" ||
-          this.crmType == "customerItem" ||
-          this.crmType == "eqptTypeItem" ||
-          this.crmType == "item" ||
-          this.crmType == "itemTransTypeInventoryRoute" ||
-          this.crmType == "itemTransTypeOpStrategy" ||
-          this.crmType == "loc" ||
-          this.crmType == "machine" ||
-          this.crmType == "prodLineItem" ||
-          this.crmType == "slg" ||
-          this.crmType == "supplier" ||
-          this.crmType == "supplierItem" ||
-          this.crmType == "wlgItem" ||
-          this.crmType == "workCenter" ||
-          this.crmType == "bom" ||
-          this.crmType == "prodLine" ||
-          this.crmType == "slgItem"||
-          this.crmType == "interfaceCalendar"||
-          this.crmType == "workCalendar"||
-          this.crmType == "shift"
-        ) {
-          //获取当前登录用户的组织ID
-          console.log('Lockr.get("currentorgID")' + Lockr.get("currentorgID"));
-          params["OrgID"] = Lockr.get("currentorgID");
-
-        }
-      } //修改
-      else {
-        params["Id"] = this.action.subid;
-        //子表修改时要有Id
-
-        if (this.crmType == "dictssub") {
-          params["ItemName"] = this.crmData["ItemName"];
-        } else if (this.crmType === "inventoryRouteDetail") {
-          params["AreaID"] = this.crmData["AreaID"];
-          params["TaskType"] = this.crmData["TaskType"];
-        } else if (this.crmType === "purchasePriceDetail") {
-          params["ItemID"] = this.crmData["ItemID"];
-          params["BeginTime"] = this.crmData["BeginTime"];
-        } else if (this.crmType === "stdCostPriceDetail") {
-          params["ItemID"] = this.crmData["ItemID"];
-          params["BeginTime"] = this.crmData["BeginTime"];
-        } else if (this.crmType === "routeDetail") {
-          params["ItemID"] = this.crmData["ItemID"];
-          params["OperateProcess"] = this.crmData["OperateProcess"];
-        } else if (this.crmType === "salePriceDetail") {
-          params["ItemID"] = this.crmData["ItemID"];
-          params["BeginTime"] = this.crmData["BeginTime"];
-        }
-      }
-    },
-
-    // 获取控件值
-    getRealParams(element) {
-      if (element.key == "OrgID") {
-        return Lockr.get("currentorgID");
-      }
-      //关联表
-      else if (element.key.endsWith("ID") && element.data.formType !== "text") {
-        if (element.value && element.value.length) {
-          return element.value[0].Id;
-        } else {
-          return null;
-        }
-      } else if (element.data.formType == "select") {
-        //element.data.value的值应该从element.data.Setting中取
-        if (element.value == "是") {
-          element.value = true;
-        } else if (element.value == "否") {
-          element.value = false;
-        }
-      } else if (element.data.formType == "switch") {
-        //如果不设置defaultValue element.value为""
-        if (element.value == true || element.value === "" || element.value === null) {
-          element.value = true;
-        } else if (element.value == false) {
-          element.value = false;
-        }
-      } else if(element.data.formType == "int" || element.data.formType == "number" || element.data.formType == "number2" || 
-                element.data.formType == "number4" || element.data.formType == "moneynumber" || 
-                element.data.formType == "mobile" || element.data.formType == "email" || element.data.formType == "rate" )
-      {
-        if(element.value === "" || element.value === null )     
-        {
-          element.value =0;
-          //element.value =element.data.isNull===1? 0:null;
-        }
-      }else if(element.data.formType == "datetime")
-      {
-        if(element.value === "" || element.value === null)     
-        {
-          element.value = this.getNowDate();
-        }
-      }
-      return element.value;
-    },
-    hidenView() {
-      this.$emit("hiden-view");
-    },
-    // 根据类型获取标题展示名称
-    getTitle() {
-      let type=this.crmTypes[this.crmType];
-      if(type===undefined)
-      { 
-        return ''
-      }
-      else
-      {
-        let name= type.name
-        if(this.action.type == "create" || this.action.type == "save")
-        {
-          return '新增'+name;
-        }
-        else if(this.action.type == "update")
-        {
-          return '编辑'+name;
-
-        }
-        else if(this.action.type == "detail")
-        {
-          return name+'详细信息';
-        }   
-      }   
-    },
-    // 获取左边padding
-    getPaddingLeft(item, index) {
-      if (item.showblock && item.showblock == true) {
-        return "0";
-      }
-      return item.styleIndex % 2 == 0 ? "0" : "25px";
-    },
-    // 获取左边padding
-    getPaddingRight(item, index) {
-      if (item.showblock && item.showblock == true) {
-        return "0";
-      }
-      return item.styleIndex % 2 == 0 ? "25px" : "0";
-    },
-    // 上传之前的格式设置
-    beforeAvatarUpload(file) {
-      const isJPG =
-        file.type === "image/png" ||
-        file.type === "image/gif" ||
-        file.type === "image/jpg" ||
-        file.type === "image/jpeg";
-      const isLt2M = file.size / 1024 / 1024 < 2;
-      if (!isJPG) {
-        this.$message.error("上传头像图片只能是 JPG,PNG,GIF,JPEG 格式!");
-      }
-      if (!isLt2M) {
-        this.$message.error("上传头像图片大小不能超过 2MB!");
-      }
-      this.multfileImg = file;
-      return isJPG && isLt2M;
-    },
-    httpRequest(data) {
-      let _this = this;
-      let rd = new FileReader(); // 创建文件读取对象
-      let file = data.file;
-      rd.readAsDataURL(file); // 文件读取装换为base64类型
-      rd.onloadend = function (e) {
-        _this.dialogImageUrl = this.result; // this指向当前方法onloadend的作用域
-      };
-    },
-    // 上传文件个数超过定义的数量
-    handleExceed(files, fileList) {
-      //this.$message.warning(`当前限制选择 1 个文件`)
-    },
-
-    getNowDate() {
-      var nowDate = new Date();
-      var date = {
-        year: nowDate.getFullYear(),
-        month: nowDate.getMonth() + 1,
-        day: nowDate.getDate()
-        // hour: nowDate.getHours(),
-        // minute: nowDate.getMinutes(),
-        // second: nowDate.getSeconds(),
-      };
-
-      var year = date.year;
-      var month = date.month >= 10 ? date.month : "0" + date.month;
-      var date = date.day >= 10 ? date.day : "0" + date.day;
-      // var hour = date.hour >=10 ? date.hour: '0' +date.hour;
-      // var minute = date.minute >=10 ? date.minute: '0' +date.minute;
-      // var second = date.second >=10 ? date.second: '0' +date.second;
-
-      // var systemDate =date.year + "-" + month + "-" + date +' ' + hour + ':' + minute + ':' + second;
-
-      var systemDate = year + "-" + month + "-" + date + " 00:00:00";
-      return systemDate;
-    },
-
-    //2021年1月15日前代码
-    // 获取自定义字段
-    getField_Old() {
-      console.log("");
-      console.log("");
-      this.loading = true;
-      console.log("----- 获取自定义字段 data -----");
-      console.log(data);
-      console.log("this.crmType : " + this.crmType);
-      const filedList = data[this.crmType].data;
-      console.log("----- filedList -----");
-      console.log(filedList);
-      const filedListEdit = dataupdate[this.crmType].data;
-
-      // 获取自定义字段的更新时间
-      var params = {
-        label: crmTypeModel[this.crmType],
-      };
-      // 进行编辑操作
-      if (this.action.type == "update") {
-        console.log("----- 进行编辑操作 -----");
-        console.log("this.action.type : " + this.action.type);
-        params.id = this.action.id;
-        params.subid = this.action.subid;
-        let crmRequest = this.getReadRequest();
-        console.log(crmRequest);
-        crmRequest(params.id, params.subid)
-          .then((res) => {
-            console.log("----- 循环字段开始 -----");
-            filedListEdit.map((item) => {
-              //获取JSON的KEY和value
-              Object.keys(res).forEach((key) => {
-                if (
-                  key == item.fieldName &&
-                  key.includes("ID") &&
-                  item.formType != "text"
-                ) {
-                  console.log("----- 字段特殊判断 : 显示字段不是Name的 -----");
-                  // 字段特殊判断
-                  // if(item.formType == 'item'){
-                  //   console.log('----- 字段特殊处理 : item-----')
-                  //   crmItemRead(res[key]).then(resinner => {
-                  //     let _json = {};
-                  //     _json["Name"] = resinner.Code;
-                  //     _json['Id'] = res[key]
-                  //     var _array = [_json]
-                  //     item.value = _array
-                  //   })
-                  // } else {
-                  console.log("----- 准备获取对应列表接口 -----");
-                  let ReadRequest = this.getReadRequest(item.formType);
-                  console.log(ReadRequest);
-                  if (ReadRequest == undefined || ReadRequest == "") {
-                    console.log(
-                      "------ 没有找到 " +
-                        item.formType +
-                        " 的 crmXXXXRead -----"
-                    );
-                  } else {
-                    ReadRequest(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                  //}
-                } else if (
-                  key !== "OrgID" &&
-                  key !== "ItemID" &&
-                  key !== "SlgID" &&
-                  key !== "UomID" &&
-                  key !== "UomGroupID" &&
-                  key !== "BasicUomID" &&
-                  key !== "PurchaseUomConversionID" &&
-                  key !== "StockUomConversionID" &&
-                  key !== "ProductionUomConversionID" &&
-                  key !== "SellUomConversionID" &&
-                  key !== "ProjectID" &&
-                  key !== "InventoryRouteID" &&
-                  key !== "AllocationID"
-                ) {
-                  if (key == item.fieldName) {
-                    item.value = res[key];
-                    //  if(item.value==true){
-                    //    item.value='是'
-                    //  }else if(item.value==false){
-                    //    item.value='否'
-                    //  }
-                  }
-                } else if (key === "OrgID") {
-                  if (key == item.fieldName) {
-                    crmOrgRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["branchName"] = resinner.name;
-                      _json[key] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "ItemID") {
-                  if (key == item.fieldName) {
-                    console.log("ItemID" + res[key]);
-                    crmItemRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "SlgID") {
-                  if (key == item.fieldName) {
-                    console.log("SlgID" + res[key]);
-                    crmSlgRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "UomID") {
-                  if (key == item.fieldName) {
-                    console.log("UomID" + res[key]);
-                    crmUomRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "UomGroupID") {
-                  if (key == item.fieldName) {
-                    console.log("UomGroupID" + res[key]);
-                    crmUomGroupRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "BasicUomID") {
-                  if (key == item.fieldName) {
-                    console.log("BasicUomID" + res[key]);
-                    crmUomGroupRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "PurchaseUomConversionID") {
-                  if (key == item.fieldName) {
-                    crmUomConversionRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "StockUomConversionID") {
-                  if (key == item.fieldName) {
-                    crmUomConversionRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "ProductionUomConversionID") {
-                  if (key == item.fieldName) {
-                    crmUomConversionRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "SellUomConversionID") {
-                  if (key == item.fieldName) {
-                    crmUomConversionRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "ProjectID") {
-                  if (key == item.fieldName) {
-                    crmProjectRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "InventoryRouteID") {
-                  if (key == item.fieldName) {
-                    crmInventoryRouteRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                } else if (key === "AllocationID") {
-                  if (key == item.fieldName) {
-                    crmInventoryRouteRead(res[key]).then((resinner) => {
-                      let _json = {};
-                      _json["Name"] = resinner.Name;
-                      _json["Id"] = res[key];
-                      var _array = [_json];
-                      item.value = _array;
-                    });
-                  }
-                }
-              });
-            });
-            console.log("----- 循环字段结束 -----");
-            this.loading = false;
-
-            setTimeout((item) => {
-              this.getcrmRulesAndModel(filedListEdit);
-            }, 500);
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      } else {
-        console.log("----- 添加 -----");
-        this.getcrmRulesAndModel(filedList);
-      }
-      this.loading = false;
-    },
-
-    getRealParams_Old(element) {
-      if (
-        element.key == "customer_id" ||
-        element.key == "contacts_id" ||
-        element.key == "business_id" ||
-        element.key == "leads_id" ||
-        element.key == "contract_id"
-      ) {
-        if (element.value && element.value.length) {
-          const key = element.key.replace("_id", "Id");
-          return element.value[0][key];
-        } else {
-          return "";
-        }
-      } else if (element.key == "OrgID") {
-        return Lockr.get("currentorgID");
-        // if (element.value && element.value.length) {
-        //   //return element.value[0].OrgID
-        //   return Lockr.get("currentorgID")
-        // } else {
-        //   return ''
-        // }
-      } else if (
-        element.key == "UomID" ||
-        element.key == "SlgID" ||
-        element.key == "ItemID" ||
-        element.key == "RuleID" ||
-        element.key == "StrategyID" ||
-        element.key == "UomGroupID" ||
-        element.key == "BasicUomID" ||
-        element.key == "PurchaseUomConversionID" ||
-        element.key == "StockUomConversionID" ||
-        element.key == "ProductionUomConversionID" ||
-        element.key == "SellUomConversionID" ||
-        element.key == "ProjectID" ||
-        element.key == "InventoryRouteID" ||
-        element.key == "VerificationID" ||
-        element.key == "StageID" ||
-        element.key.includes("ID") ||
-        element.key.includes("Id")
-      ) {
-        if (element.value && element.value.length) {
-          return element.value[0].Id;
-        } else {
-          return "";
-        }
-      } else if (element.data.formType == "select") {
-        if (element.value == "是") {
-          element.value = true;
-        } else if (element.value == "否") {
-          element.value = false;
-        }
-      } else if (element.data.formType == "switch") {
-        //如果不设置defaultValue element.value为""
-        if (element.value === "" || element.value == true) {
-          element.value = true;
-        } else if (element.value == false) {
-          element.value = false;
-        }
-      } else if (
-        element.data.formType == "user" ||
-        element.data.formType == "structure"
-      ) {
-        return element.value
-          .map(function (item, index, array) {
-            return element.data.formType == "user" ? item.userId : item.id;
-          })
-          .join(",");
-      } else if (element.data.formType == "file") {
-        if (element.value && element.value.length > 0) {
-          return element.value[0].batchId;
-        }
-        return "";
-      } else if (element.key == "category_id") {
-        if (element.value && element.value.length > 0) {
-          return element.value[element.value.length - 1];
-        }
-        return "";
-      } else if (element.data.formType == "checkbox") {
-        if (element.value && element.value.length > 0) {
-          return element.value.join(",");
-        }
-        return "";
-      }
-      // //将bool转成string类型
-      // switch(element.value){
-      //   case true:
-      //     element.value = 'true'
-      //     break;
-      //   case false:
-      //     element.value = 'false'
-      //     break;
-      // }
-      return element.value;
-    },
-    // 根据自定义字段获取自定义字段规则
-    getcrmRulesAndModel_Old(list) {
-      console.log("----- 根据自定义字段获取自定义字段规则 -----");
-      let showStyleIndex = -1;
-      for (let index = 0; index < list.length; index++) {
-        const item = list[index];
-        showStyleIndex += 1;
-        /**
-         * 规则数据
-         */
-        this.crmRules[item.fieldName] = this.getItemRulesArrayFromItem(item);
-
-        console.log("----- this.crmRules[item.fieldName] -----");
-        console.log(this.crmRules[item.fieldName]);
-        /**
-         * 表单数据
-         */
-        if (
-          // crm相关信息特殊处理
-         
-          item.formType == "contacts" ||
-          item.formType == "customer" ||
-          item.formType == "contract" ||
-          item.formType == "business" ||
-          item.formType == "receivables_plan" ||
-          item.formType == "rule" ||
-          item.formType == "org" ||
-          item.formType == "slg" ||
-          item.formType == "item" ||
-          item.formType == "uom" ||
-          item.formType == "uomGroup" ||
-          item.formType == "interfaceCalendar" ||
-          item.formType == "verificationStages" ||
-          item.formType == "verification" ||
-          item.formType == "stage" ||
-          item.formType == "area" ||
-          item.formType == "areaItem" ||
-          item.formType == "currency" ||
-          item.formType == "currencyExchange" ||
-          item.formType == "customerBom" ||
-          item.formType == "customerItem" ||
-          item.formType == "eqptType" ||
-          item.formType == "eqptTypeItem" ||
-          item.formType == "itemTransTypeInventoryRoute" ||
-          item.formType == "itemTransTypeOpStrategy" ||
-          item.formType == "loc" ||
-          item.formType == "machine" ||
-          item.formType == "param" ||
-          item.formType == "port" ||
-          item.formType == "prodLine" ||
-          item.formType == "prodLineItem" ||
-          item.formType == "project" ||
-          item.formType == "shift" ||
-          item.formType == "slg" ||
-          item.formType == "supplier" ||
-          item.formType == "supplierItem" ||
-          item.formType == "team" ||
-          item.formType == "uomConversion" ||
-          item.formType == "wlg" ||
-          item.formType == "wlgItem" ||
-          item.formType == "workCalendar" ||
-          item.formType == "workCenter" ||
-          item.formType == "dicts" ||
-          item.formType == "inventoryRoute" ||
-          item.formType == "stdCostPriceSheet" ||
-          item.formType == "purchasePriceSheet" ||
-          item.formType == "route" ||
-          item.formType == "salePriceSheet"
-        ) {
-          var params = {};
-          params["key"] = item.fieldName;
-          params["data"] = item;
-
-          // 获取 value relative 信息
-          this.getParamsValueAndRelativeInfo(params, item, list);
-          params["disabled"] = this.getItemDisabledFromItem(item);
-          params["styleIndex"] = showStyleIndex;
-          console.log("---------->" + JSON.stringify(params));
-          this.crmForm.crmFields.push(params);
-        } else {
-          var params = {};
-          if (
-            item.formType == "user" ||
-            item.formType == "structure" ||
-            item.formType == "file" ||
-            item.formType == "category" ||
-            item.formType == "customer" ||
-            item.formType == "business" ||
-            item.formType == "contract"
-          ) {
-            //if (this.action.type == 'update'&& item.value)
-            if (this.action.type == "update") {
-              params["value"] = item.value ? objDeepCopy(item.value) : [];
-            } else {
-              params["value"] = item.defaultValue
-                ? objDeepCopy(item.defaultValue)
-                : [];
-            }
-          } else {
-            if (this.action.type == "update") {
-              params["value"] = item.value; // 编辑的值 在value∂ç字段
-            } else {
-              //params['value'] = item.defaultValue || ''
-            }
-          }
-          params["key"] = item.fieldName;
-          params["data"] = item;
-          params["disabled"] = false; // 是否可交互
-          params["styleIndex"] = showStyleIndex;
-          this.crmForm.crmFields.push(params);
-        }
-      }
-    },
-    /**
-     * 获取关联项的值 和 关联信息
-     */
-    getParamsValueAndRelativeInfo(params, item, list) {
-      if (this.action.type == "relative") {
-        const relativeData = this.action.data[item.formType];
-        if (item.formType == "receivables_plan") {
-          params["value"] = "";
-        } else {
-          params["value"] = relativeData ? [relativeData] : [];
-        }
-      } else {
-        if (item.formType == "receivables_plan") {
-          params["value"] = item.value || "";
-        } else {
-          params["value"] = item.value || [];
-        }
-      }
-    },
-    /**
-     * 获取相关联item
-     */
-    getItemRelatveInfo(item, list, fromType) {
-      let crmItem = null;
-      if (this.action.type == "relative") {
-        crmItem = this.action.data[fromType];
-      } else {
-        const crmObj = list.find((listItem) => {
-          return listItem.formType === fromType;
-        });
-        if (crmObj && crmObj.value && crmObj.value.length > 0) {
-          crmItem = crmObj.value[0];
-        }
-      }
-      return crmItem;
-    },
-    /**
-     * 获取关联项是否可操作
-     */
-    getItemDisabledFromItem(item) {
-      // 相关添加
-      if (this.action.type == "relative") {
-        const relativeDisInfos = {
-          business: {
-            customer: { customer: true },
-            contacts: { customer: true },
-          },
-          contacts: {
-            customer: { customer: true },
-            business: { customer: true },
-          },
-          contract: {
-            customer: { customer: true },
-            business: { customer: true, business: true },
-          },
-          receivables_plan: {
-            contract: { customer: true, contract: true },
-            customer: { customer: true },
-          },
-          receivables: {
-            contract: { customer: true, contract: true },
-            customer: { customer: true },
-          },
-        };
-        // 添加类型
-        const crmTypeDisInfos = relativeDisInfos[this.crmType];
-        if (crmTypeDisInfos) {
-          // 在哪个类型下添加
-          const relativeTypeDisInfos = crmTypeDisInfos[this.action.crmType];
-          if (relativeTypeDisInfos) {
-            // 包含的字段值
-            return relativeTypeDisInfos[item.formType] || false;
-          }
-        }
-        return false;
-      } else if (this.action.type != "update") {
-        // 新建
-        if (this.crmType === "contract" && item.formType === "business") {
-          return true;
-          // 回款下 新建 合同 和 回款计划 默认不能操作
-        } else if (this.crmType === "receivables") {
-          if (item.formType === "contract") {
-            return true;
-          } else if (item.formType === "receivables_plan") {
-            return true;
-          }
-        }
-      }
-      return false;
-    },
-    /**
-     * item 当行数据源
-     */
-    getItemRulesArrayFromItem(item) {
-      var tempList = [];
-      // 验证必填
-      if (item.isNull == 1) {
-
-        if(item.formType!=='switch')
-          {
-            tempList.push({
-              required: true,
-              message: item.name + "不能为空",
-              trigger: ["blur"]
-              // trigger: ["blur", "change"],
-            });
-          }
-         
-      }
-
-      if(item.formType==='text') //增加长度校验
-      {     
-        tempList.push({
-          min:0,
-          max:36,
-          message: "长度在1到36个字符",
-          trigger: ["blur", "change"],
-        });
-      }
-       
-
-  
-      // // 验证唯一
-      // if (item.isUnique == 1) {
-      //   var validateUnique = (rule, value, callback) => {
-      //     if ((isArray(value) && value.length == 0) || !value) {
-      //       callback();
-      //     } else {
-      //       var validatesParams = {};
-      //       validatesParams.fieldId = item.fieldId;
-      //       if (isArray(value)) {
-      //         let postValue = "";
-      //         if (value.length > 0) {
-      //           if (
-      //             rule.item.formType == "user" ||
-      //             rule.item.formType == "structure"
-      //           ) {
-      //             postValue = value
-      //               .map((valueItem) => {
-      //                 return rule.item.formType == "user"
-      //                   ? valueItem.userId
-      //                   : valueItem.id;
-      //               })
-      //               .join(",");
-      //           } else if (rule.item.fieldName == "categoryId") {
-      //             if (value && value.length) {
-      //               postValue = value[value.length - 1];
-      //             } else {
-      //               postValue = "";
-      //             }
-      //           } else if (rule.item.formType == "checkbox") {
-      //             postValue = value.join(",");
-      //           }
-      //         }
-      //         validatesParams.value = postValue;
-      //       } else {
-      //         validatesParams.value = value;
-      //       }
-      //       if (this.action.type == "update") {
-      //         validatesParams.batchId = this.action.batchId;
-      //       }
-      //       //filedValidates(validatesParams)
-      //       //   .then(res => {
-      //       callback();
-      //       // })
-      //       // .catch(error => {
-      //       //   callback(new Error(error.msg ? error.msg : '验证出错'))
-      //       // })
-      //     }
-      //   };
-      //   tempList.push({
-      //     validator: validateUnique,
-      //     item: item,
-      //     trigger:
-      //       item.formType == "checkbox" || item.formType == "select"
-      //         ? ["change"]
-      //         : ["blur"],
-      //   });
-      // }
-      // 其他字符
-      let validItem={item:item,trigger: ["blur"] };
-      if (item.formType == "int") {
-        var validateInt = (rule, value, callback) => {
-          if (!value || value == "" || regexIsInt(value)) {
-            callback();
-          } else {
-            callback(new Error("整数类型长度必须是小于12位的数字"));
-          }
-        };
-        validItem.validator= validateInt;
-        tempList.push(validItem);
-      }
-      else if (item.formType == "number") {
-        var validateNumber = (rule, value, callback) => {
-          if ( value == "" || regexIsNumber(value)) {
-            callback();
-          } else {
-            callback(new Error("数字的整数部及小数部分须是整数"));
-          }
-        };
-        validItem.validator= validateNumber;
-        tempList.push(validItem);
-      } 
-      else if (item.formType == "number2") {
-        var validateCRMNumber2 = (rule, value, callback) => {
-          if (value == "" || regexIsCRMNumber2(value)) {
-            callback();
-          } else {
-            callback(new Error("数字的整数部分须少于12位，小数部分须少于2位"));
-          }
-        };
-        validItem.validator= validateCRMNumber2;
-      } else if (item.formType == "number4") {
-        var validateCRMNumber4 = (rule, value, callback) => {
-          if (value == "" || regexIsCRMNumber4(value)) {
-            callback();
-          } else {
-            callback(new Error("数字的整数部分须少于12位，小数部分须少于4位"));
-          }
-        };
-        validItem.validator= validateCRMNumber4;
-        tempList.push(validItem);
-      } 
-      else if (item.formType == "moneynumber") {
-        var validateCRMMoneyNumber = (rule, value, callback) => {
-          if (value == "" || regexIsCRMMoneyNumber(value)) {
-            callback();
-          } else {
-            callback(new Error("货币的整数部分须少于10位，小数部分须少于4位"));
-          }
-        };
-        validItem.validator= validateCRMMoneyNumber;
-        tempList.push(validItem);
-      } else if (item.formType == "mobile") {
-        var validateCRMMobile = (rule, value, callback) => {
-          if (value == "" || regexIsCRMMobile(value)) {
-            callback();
-          } else {
-            callback(new Error("手机格式有误"));
-          }
-        };
-        validItem.validator= validateCRMMobile;
-        tempList.push(validItem);
-      } else if (item.formType == "email") {
-        var validateCRMEmail = (rule, value, callback) => {
-          if (value == "" || regexIsCRMEmail(value)) {
-            callback();
-          } else {
-            callback(new Error("邮箱格式有误"));
-          }
-        };
-       validItem.validator= validateCRMEmail;
-       tempList.push(validItem);
-      }
-      else if (item.formType == "rate") {
-        var validateCRMRate = (rule, value, callback) => {
-          if (value == "" || regexIsCRMRate(value)) {
-            callback();
-          } else {
-             callback(new Error("税率/百分比应小于1，小数部分须少于6位"));
-          }
-        };
-       validItem.validator= validateCRMRate;
-       tempList.push(validItem);
-      }
-
-      //获取其他校验规则
-      let otherRules= this.getOtherRulesArrayFromItem(item);
-      if(otherRules.length>0)
-      { 
-        otherRules.forEach(item=>tempList.push(item));
-      }
-      return tempList;
-    },
-    /**
-     * item 其他校验规则  getItemRulesArrayFromItem
-     */
-    getOtherRulesArrayFromItem(item)
-    {
-      var tempList = [];
-      if(this.crmType==='interfaceCalendar')
-      { 
-        let InterfaceCalendarRules=this.getInterfaceCalendarRules(item);
-   
-        if(InterfaceCalendarRules.length>0){
-            InterfaceCalendarRules.forEach(rule => {
-            (tempList.push(rule));
-          });
-        }
-      }
-
-      
-      // if(this.crmType==='strategyRules')
-      // { 
-      //   let strategyRules=this.getStrategyrules(item,list);
-      //   strategyRules.forEach(item=>tempList.push(item));
-      // }
-
-      return tempList;
-    },
-    getProductParams(params, element) {
-      if (element.value) {
-        params["product"] = element.value.product ? element.value.product : [];
-        params.entity["totalPrice"] = element.value.totalPrice
-          ? element.value.totalPrice
-          : 0;
-        params.entity["discountRate"] = element.value.discountRate
-          ? element.value.discountRate
-          : 0;
-      } else {
-        params["product"] = [];
-        params.entity["totalPrice"] = "";
-        params.entity["discountRate"] = "";
-      }
-    },
-    // 获取客户位置参数
-    getCustomerAddressParams(params, element) {
-      params["address"] = element.value.address
-        ? element.value.address.join(",")
-        : "";
-      params["detailAddress"] = element.value.detailAddress;
-      params["location"] = element.value.location;
-      params["lng"] = element.value.lng;
-      params["lat"] = element.value.lat;
-    },
-    getStrategyrules(item)
-    {
-      let list=this.crmForm.crmFields
-      var tempList = [];
-      let validItem={item:item,trigger: ["blur"] };
-      if(item.fieldName==='EffectiveTime')
-      {
-        var validateEffectiveTime = (rule, value, callback) => {
-          const ExpireTimeItem = list.find((listItem) => {
-            return listItem.key === 'ExpireTime'; });
-
-          const ExpireTimeValue=ExpireTimeItem.value;
-
-          if(ExpireTimeValue!=null && value>= ExpireTimeValue )
-          {
-            callback(new Error("生效时间不能大于等于失效时间"));
-          } else {
-
-            //this.$refs.crmForm.validateField("crmFields." + ExpireTimeItem.styleIndex + ".value");
-            callback();
-          }
-        }
-        validItem.validator= validateEffectiveTime;
-        tempList.push(validItem);
-      }
-      else if(item.fieldName==='ExpireTime')
-      {
-        var validateExpireTime = (rule, value, callback) => {
-          const EffectiveItem = list.find((listItem) => {
-            return listItem.key === 'EffectiveTime'; }).value;
-            
-          const EffectiveValue =EffectiveItem.value;
-
-          if(EffectiveValue!=null && EffectiveValue>= value )
-          {
-            callback(new Error("失效时间时间不能小于等于生效时间"));
-          } else {
-            //this.$refs.crmForm.validateField("EffectiveItem." + ExpireTimeItem.styleIndex + ".value");
-            callback();
-          }
-        }
-        validItem.validator= validateExpireTime;
-        tempList.push(validItem);
-      }
-      return tempList;
-    },
-    getInterfaceCalendarRules(item)
-    {
-      var tempList = [];
-      let validItem={item:item,trigger: ["blur"] };
-      if(item.fieldName==='Year') //
-      {
-        var validateYear = (rule, value, callback) => {
-          if ( value>=2000 && value<=3000) {
-            callback();
-          } else {
-            callback(new Error("年份应该在2000-3000之间"));
-          }
-        };
-        validItem.validator= validateYear;
-        tempList.push(validItem);
-      }
-      else if(item.fieldName==='Month') //
-      {
-        var validateEffectiveTime = (rule, value, callback) => {
-           if ( value >=1 && value<=12) {
-            callback();
-          } else {
-            callback(new Error("月份应该在1-12之间"));
-          }
-        }
-        validItem.validator= validateEffectiveTime;
-        tempList.push(validItem);
-      }
-      return tempList;
-    }
-  },
-};
-</script>
-<style lang="scss" scoped>
-.crm-create-container {
-  position: relative;
-  height: 100%;
-}
-
-.crm-create-flex {
-  position: relative;
-  overflow-x: hidden;
-  overflow-y: auto;
-  flex: 1;
-}
-
-.crm-create-header {
-  height: 40px;
-  margin-bottom: 20px;
-  padding: 0 10px;
-  flex-shrink: 0;
-  .close {
-    display: block;
-    width: 40px;
-    height: 40px;
-    margin-right: -10px;
-    padding: 10px;
-    cursor: pointer;
-  }
-}
-
-.crm-create-body {
-  // flex: 1;
-  overflow-x: hidden;
-  // overflow-y: scroll;
-  border-right: 1px;
-  min-height: 350px;
-  max-height: 550px;
-  overflow-y: auto;
-  padding: 20px;
-}
-
-/** 将其改变为flex布局 */
-.crm-create-box {
-  display: flex;
-  flex-wrap: wrap;
-  padding: 0 10px;
-}
-
-.crm-create-item {
-  flex: 0 0 50%;
-  flex-shrink: 0;
-  // overflow: hidden;
-  padding-bottom: 10px;
-}
-
-// 占用一整行
-.crm-create-block-item {
-  flex: 0 0 100%;
-  flex-shrink: 0;
-  padding-bottom: 10px;
-}
-
-.el-form-item /deep/ .el-form-item__label {
-  line-height: normal;
-  font-size: 13px;
-  color: #333333;
-  position: relative;
-  padding-left: 8px;
-  padding-bottom: 0;
-}
-
-.el-form /deep/ .el-form-item {
-  margin-bottom: 0px;
-}
-
-.el-form /deep/ .el-form-item.is-required .el-form-item__label:before {
-  content: "*";
-  color: #f56c6c;
-  margin-right: 4px;
-  position: absolute;
-  left: 0;
-  top: 5px;
-}
-
-.handle-bar {
-  position: relative;
-  .handle-button {
-    float: right;
-    margin-top: 5px;
-    margin-right: 20px;
-  }
-}
-
-.el-button + .el-button {
-  margin-left: 0;
-}
-
-// 审核信息 里的审核类型
-.examine-type {
-  font-size: 12px;
-  color: white;
-  background-color: #fd715a;
-  padding: 0 8px;
-  margin-left: 5px;
-  height: 16px;
-  line-height: 16px;
-  border-radius: 8px;
-  transform: scale(0.8, 0.8);
-}
-
-.avatar-uploader {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-.avatar-uploader .el-upload:hover {
-  border-color: #409eff;
-}
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/CRMDetailHead.vue b/code/WebApp/vue/src/views/pg-fis/components/CRMDetailHead.vue
deleted file mode 100644
index 70c4b905..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/CRMDetailHead.vue
+++ /dev/null
@@ -1,337 +0,0 @@
-<template>
-  <div style="position: relative;">
-    <flexbox class="t-section">
-      <img
-        :src="crmIcon"
-        class="t-img" >
-      <div class="t-name">{{ name }}</div>
-      <el-button
-        class="head-handle-button"
-        type="primary"
-        @click.native="handleTypeClick('edit')">编辑</el-button>
-<!--      <img-->
-<!--        class="t-close"-->
-<!--        src="@/assets/img/task_close.png"-->
-<!--        @click="hideView" >-->
-    </flexbox>
-    <flexbox
-      class="h-section"
-      align="stretch">
-      <flexbox-item
-        v-for="(item, index) in headDetails"
-        :key="index"
-        class="h-item"
-        span="200">
-        <div class="h-title">{{ item.name }}</div>
-        <div class="h-value text-one-line">{{ item.value}}</div>
-      </flexbox-item>
-    </flexbox>
-    <slot/>
-  </div>
-</template>
-<script type="text/javascript">
-import tableFields from "../../../../static/tableField";
-
-export default {
-  name: 'CRMDetailHead',
-  components: {
-    // TransferHandle,
-    // AllocHandle,
-    // DealStatusHandle
-  },
-  props: {
-    /** 模块ID */
-    id: [String, Number],
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: ''
-    },
-    // 辅助 使用
-    isSeas: {
-      type: Boolean,
-      default: false
-    },
-    /** 详细信息 */
-    detail: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      moreTypes: [], // 更多操作
-      fieldInfoList: [],
-      headDetails: {
-      type: Array,
-      default: () => {
-        return []
-      }
-     }
-    }
-  },
-  computed: {
-    // ...mapGetters(['crm', 'CRMConfig']),
-    crmIcon() {
-      if (this.crmType === 'transaction') {
-        return require('@/assets/img/customer_detail.png')
-      } else if (this.crmType === 'leads') {
-        return require('@/assets/img/clue_detail.png')
-      } else if (this.crmType === 'strategy') {
-        return require('@/assets/img/business_detail.png')
-      } else if (this.crmType === 'rule') {
-        return require('@/assets/img/contacts_detail.png')
-      } else if (this.crmType === 'customer') {
-        return require('@/assets/img/contract_detail.png')
-      } else if (this.crmType === 'slgItem') {
-        return require('@/assets/img/money_detail.png')
-      } else if (this.crmType === 'dicts') {
-        return require('@/assets/img/product_detail.png')
-      } else if (this.crmType === 'bom') {
-        return require('@/assets/img/product_detail.png')
-      } else if (this.crmType === 'uomGroup') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'uom') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'area') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'areaItem') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'currency') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'currencyExchange') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'customerBom') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'customerItem') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'eqptType') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'eqptTypeItem') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'item') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'itemTransTypeInventoryRoute') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'itemTransTypeOpStrategy') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'loc') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'machine') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'param') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'port') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'prodLine') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'prodLineItem') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'project') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'shift') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'slg') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'supplier') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'supplierItem') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'team') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'uomConversion') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'wlg') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'wlgItem') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'workCalendar') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'workCenter') {
-        return require('@/assets/img/product_detail.png')
-      } else if (this.crmType === 'inventoryRoute') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'inventoryRouteDetail') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'purchasePriceDetail') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'purchasePriceSheet') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'route') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'routeDetail') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'salePriceDetail') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'salePriceSheet') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'stdCostPriceDetail') {
-        return require('@/assets/img/product_detail.png')
-      }else if (this.crmType === 'stdCostPriceSheet') {
-        return require('@/assets/img/product_detail.png')
-      }else {
-        return require('@/assets/img/product_detail.png')
-      }
-      return ''
-    },
-    name() {
-      return this.detail.name
-    },
-    showEdit() {
-      return this.crm[this.crmType].update
-    },
-  },
-  watch: {
-    detail:function(val)
-    {
-     this. GetBaseInfoValue(val);
-    }
-  },
-  mounted() {
-    //this.moreTypes = this.getSelectionHandleItemsInfo()
-  },
-  methods: {
-    GetBaseInfoValue(res)
-    {
-      this.headDetails=[];
-      this.list=[]
-      let filedList = tableFields[this.crmType].data;
-      let resKeys= Object.keys(res);
-      filedList.map((item) => {
-      let key= resKeys.find(r=>{return r == item.fieldName && r!='Description'}); //不显示描述
-      if(key!=null)
-      {
-         let resValue=this.valueConverter(res[key],item);
-            let filedJSON={ 
-                "formType": key.includes('TIME')?"datetime":"text",
-                "name":item.name,
-                "value":resValue,
-                "data":item
-              }
-            this.headDetails.push(filedJSON);
-      }
-    });
-      
-
-    //  Object.keys(res).forEach((key)=>{
-    //       if (key == item.fieldName && key!='Description') //不显示描述
-    //       {
-    //         let resValue=this.valueConverter(res[key],item);
-    //         let filedJSON={ 
-    //             "formType": key.includes('TIME')?"datetime":"text",
-    //             "name":item.name,
-    //             "value":resValue,
-    //             "data":item
-    //           }
-    //         this.headDetails.push(filedJSON);
-    //       }
-    //     });
-    //   });
-    },
-
-    valueConverter(value,item) {
-  
-      if(item.formType==='switch')
-      {
-        if(value===true)
-        {
-          return '是'
-        }
-        else if(value===false)
-        {
-          return '否'
-        }
-        else
-        {
-          return ''
-        }
-      }
-      else if(item.formType==='select')
-      {
-        //取select的值
-        return value
-      }
-      else
-      {
-        return value
-      }
-    },
-
-    /** 更多操作 */
-    handleTypeClick(type) {
-      if (type == 'edit') {
-        // 编辑
-        this.$emit('handle', { type: 'edit' })
-      } 
-    },
-    hideView() {
-      this.$emit('close')
-    },
-    // 子组件 回调的 结果
-    handleCallBack(data) {
-      this.$emit('handle', { type: data.type })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.t-section {
-  position: relative;
-  padding: 10px 17px;
-  min-height: 60px;
-  .t-img {
-    display: block;
-    width: 35px;
-    height: 35px;
-    margin-right: 10px;
-  }
-  .t-name {
-    font-size: 14px;
-    color: #333333;
-    flex: 1;
-  }
-  .t-more {
-    border: 1px solid #dcdfe6;
-    font-size: 12px;
-    color: #606266;
-    padding: 0 10px 0 12px;
-    border-radius: 2px;
-    font-weight: 500;
-    height: 25px;
-    cursor: pointer;
-  }
-  .t-close {
-    display: block;
-    width: 40px;
-    height: 40px;
-    margin-left: 20px;
-    padding: 10px;
-    cursor: pointer;
-  }
-}
-
-.h-section {
-  position: relative;
-  padding: 8px 17px 15px 17px;
-  min-height: 58px;
-  overflow-x: auto;
-  .h-item {
-    .h-title {
-      font-size: 12px;
-      color: #777;
-    }
-    .h-value {
-      min-height: 14px;
-      margin-top: 8px;
-      font-size: 13px;
-      color: #333333;
-    }
-  }
-}
-.head-handle-button {
-  padding: 5px 15px;
-  margin-right: 10px;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/CRMExport-old.vue b/code/WebApp/vue/src/views/pg-fis/components/CRMExport-old.vue
deleted file mode 100644
index 4d5039cf..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/CRMExport-old.vue
+++ /dev/null
@@ -1,327 +0,0 @@
-<template>
-  <el-dialog
-    :visible.sync="showDialog"
-    :title="'导出'+crmTypeName"
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    :before-close="beforeClose"
-    :close-on-press-escape="false"
-    width="550px"
-    @close="closeView"
-  >
-    <div class="dialog-body">
-      <p
-        v-if="error"
-        class="error"
-        v-text="error" />
-      <p
-        v-if="done"
-        class="done">
-        <i class="el-icon-success"/>
-        导出已完成
-      </p>
-      <p
-        v-else-if="cancel"
-        class="cancel">
-        <i class="el-icon-warning"/>
-        导出已取消
-      </p>
-      <div v-else>
-        <i class="el-icon-loading" />
-        导出中...
-        {{ progress }}
-      </div>
-    </div>
-    <span slot="footer" class="dialog-footer" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-// import {
-//   crmCustomerExcelExport,
-//   crmCustomerExcelAllExport,
-//   crmCustomerPoolExcelExportAPI
-// } from '@/api/customermanagement/customer'
-// import { crmLeadsExcelExport, crmLeadsExcelAllExport } from '@/api/customermanagement/clue'
-// import { crmContactsExcelExport, crmContactsExcelAllExport } from '@/api/customermanagement/contacts'
-// import { crmProductExcelExport, crmProductExcelAllExport } from '@/api/customermanagement/product'
-// import { crmBusinessExcelExport, crmBusinessExcelAllExport } from '@/api/customermanagement/business'
-// import { crmContractExcelExport, crmContractExcelAllExport } from '@/api/customermanagement/contract'
-// import { crmReceivablesExcelExport, crmReceivablesExcelAllExport } from '@/api/customermanagement/money'
-
-export default {
-  name: 'CRMExport', // 文件导出
-  components: {},
-
-  props: {
-    show: {
-      type: Boolean,
-      default: false
-    },
-    // CRM类型
-    crmType: {
-      type: String,
-      default: ''
-    },
-    /** 是公海 */
-    isSeas: {
-      type: Boolean,
-      default: false
-    },
-    // 搜索条件
-    search: {
-      type: String,
-      default: ''
-    },
-    // 场景
-    scene_id: {
-      type: [Number, String],
-      default: ''
-    },
-    // 高级搜索
-    filterObj: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    exportParams: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      showDialog: false,
-      progress: '',
-      error: '',
-      // 导出已完成
-      done: false,
-      // 取消导出
-      cancel: false,
-      // 队列标识
-      exportQueueIndex: '',
-      // 临时数据
-      tempData: {
-        temp_file: ''
-      },
-      // 排序
-      sortData: {}
-    }
-  },
-  computed: {
-    ...mapGetters(['userInfo']),
-    crmTypeName() {
-      return (
-        {
-          customer: '客户',
-          leads: '线索',
-          contacts: '联系人',
-          product: '产品'
-        }[this.crmType] || ''
-      )
-    }
-  },
-  watch: {
-    show(val) {
-      this.showDialog = val
-      if (val) {
-        this.cancel = false
-        this.exportInfos()
-        window.onbeforeunload = (event) => {
-          this.exportInfos({
-            page: -1,
-            temp_file: this.tempData.temp_file
-          })
-          return event
-        }
-      } else {
-        window.onbeforeunload = null
-      }
-    }
-  },
-  mounted() {
-    this.$bus.off('getSortData')
-    this.$bus.on('getSortData', (sortData) => {
-      this.sortData = sortData
-    })
-  },
-  methods: {
-    // 关闭操作
-    closeView() {
-      this.error = ''
-      this.done = false
-      this.exportQueueIndex = ''
-      this.progress = ''
-      this.$emit('close')
-    },
-    // 点叉
-    beforeClose(done) {
-      if (this.error || this.done) {
-        done()
-        return
-      }
-      this.$confirm('此操作将终止导出, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.cancel = true
-          done()
-        })
-        .catch(() => {
-        })
-    },
-    // 导出操作
-    exportInfos(data = {}) {
-      var params = {
-        export_queue_index: this.exportQueueIndex,
-        search: this.search,
-        ...this.exportParams,
-        ...this.sortData,
-        ...data
-      }
-      if (this.scene_id) {
-        params.scene_id = this.scene_id
-      }
-      for (var key in this.filterObj) {
-        params[key] = this.filterObj[key]
-      }
-
-      let exportAll = 'All'
-      if (params['ids']) {
-        exportAll = ''
-      }
-
-      let request
-      // 公海的请求
-      if (this.isSeas) {
-        request = crmCustomerPoolExcelExportAPI
-      } else {
-        request = {
-          customer: crmCustomerExcelExport,
-          customerAll: crmCustomerExcelAllExport,
-          leads: crmLeadsExcelExport,
-          leadsAll: crmLeadsExcelAllExport,
-          contacts: crmContactsExcelExport,
-          contactsAll: crmContactsExcelAllExport,
-          product: crmProductExcelExport,
-          productAll: crmProductExcelAllExport,
-          business: crmBusinessExcelExport,
-          businessAll: crmBusinessExcelAllExport,
-          contract: crmContractExcelExport,
-          contractAll: crmContractExcelAllExport,
-          receivables: crmReceivablesExcelExport,
-          receivablesAll: crmReceivablesExcelAllExport
-        }[this.crmType + exportAll]
-      }
-      request(params)
-        .then(res => {
-          if (res.data.type.indexOf('json') !== -1) {
-            var blob = new Blob([res.data], {
-              type: 'application/json'
-            })
-            var reader = new FileReader()
-            reader.readAsText(blob, 'utf-8')
-            reader.onload = () => {
-              var temp = JSON.parse(reader.result)
-              this.tempData = temp.data
-              if (temp.error) {
-                this.error = temp.error
-                return
-              }
-              this.exportQueueIndex = temp.data.export_queue_index
-              if (this.cancel) {
-                if (temp.data.page !== -1) {
-                  this.exportInfos({
-                    page: -1,
-                    temp_file: temp.data.temp_file
-                  })
-                }
-              } else if (temp.data.page === -2) {
-                setTimeout(() => {
-                  this.exportInfos({
-                    page: 1,
-                    temp_file: temp.data.temp_file
-                  })
-                }, 1000)
-              } else if (temp.data.page > 0) {
-                this.exportInfos({
-                  page: temp.data.page,
-                  temp_file: temp.data.temp_file
-                })
-                this.progress = String(temp.data.done) + ' / ' + String(temp.data.total)
-              }
-            }
-          } else {
-            this.exportQueueIndex = ''
-            this.done = true
-            var blob = new Blob([res.data], {
-              type: 'application/vnd.ms-excel;charset=utf-8'
-            })
-            var downloadElement = document.createElement('a')
-            var href = window.URL.createObjectURL(blob) // 创建下载的链接
-            downloadElement.href = href
-            downloadElement.download =
-              decodeURI(
-                res.headers['content-disposition'].split('filename=')[1]
-              ) || '' // 下载后文件名
-            document.body.appendChild(downloadElement)
-            downloadElement.click() // 点击下载
-            document.body.removeChild(downloadElement) // 下载完成移除元素
-            window.URL.revokeObjectURL(href) // 释放掉blob对象
-          }
-        })
-        .catch(() => {
-        })
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-
-.dialog-body {
-  height: 150px;
-  text-align: center;
-  padding-top: 40px;
-  color: #659DED;
-  .el-icon-loading {
-    margin-bottom: 10px;
-    display: block;
-  }
-  p.error {
-    color: #E6A23C;
-  }
-  p.done {
-    color: #67C23A;
-    .el-icon-success {
-      font-size: 30px;
-      display: block;
-    }
-  }
-}
-
-.cancel {
-  color: #E6A23C;
-  .el-icon-warning {
-    font-size: 30px;
-    display: block;
-  }
-}
-
-.el-dialog__wrapper {
-  /deep/ .el-icon-loading {
-    font-size: 30px;
-  }
-
-  /deep/ .el-loading-text {
-    font-size: 18px;
-    margin-top: 10px;
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/CRMExport.vue b/code/WebApp/vue/src/views/pg-fis/components/CRMExport.vue
deleted file mode 100644
index 16b4076f..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/CRMExport.vue
+++ /dev/null
@@ -1,257 +0,0 @@
-<template>
-  <el-dialog
-    :visible.sync="showDialog"
-    :title="'导出'+crmTypeName"
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    :before-close="beforeClose"
-    :close-on-press-escape="false"
-    width="550px"
-    @close="closeView"
-  >
-    <div class="dialog-body">
-      <p
-        v-if="error"
-        class="error"
-        v-text="error" />
-      <p
-        v-if="done"
-        class="done">
-        <i class="el-icon-success"/>
-        导出已完成
-      </p>
-      <p
-        v-else-if="cancel"
-        class="cancel">
-        <i class="el-icon-warning"/>
-        导出已取消
-      </p>
-      <div v-else>
-        <i class="el-icon-loading" />
-        导出中...
-        {{ progress }}
-      </div>
-    </div>
-    <span slot="footer" class="dialog-footer" />
-  </el-dialog>
-</template>
-
-<script>
-import { winUomGroupExcelAllExport } from '@/api/uomGroup/uomGroup'
-import { downloadFile } from '@/utils/crmindex.js'
-
-
-
-export default {
-  name: 'CRMExport', // 文件导出 
-  components: {},
-
-  props: {
-    show: {
-      type: Boolean,
-      default: false
-    },
-    // CRM类型
-    crmType: {
-      type: String,
-      default: ''
-    },
-    /** 是公海 */
-    isSeas: {
-      type: Boolean,
-      default: false
-    },
-    // 搜索条件
-    search: {
-      type: String,
-      default: ''
-    },
-    // 高级搜索
-    filterObj: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    exportParams: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      showDialog: false,
-      progress: '',
-      error: '',
-      // 导出已完成
-      done: false,
-      // 取消导出
-      cancel: false,
-      // 队列标识
-      exportQueueIndex: '',
-      // 临时数据
-      tempData: {
-        temp_file: ''
-      },
-      // 排序
-      sortData: {}
-    }
-  },
-  computed: {
-    crmTypeName() {
-      return (
-        {
-          uomGroup: '计量单位组'
-        }[this.crmType] || ''
-      )
-    }
-  },
-  watch: {
-    show(val) {
-      this.showDialog = val
-      if (val) {
-        this.cancel = false
-        this.exportInfos()
-        window.onbeforeunload = (event) => {
-          this.exportInfos({
-            page: -1,
-            temp_file: this.tempData.temp_file
-          })
-          return event
-        }
-      } else {
-        window.onbeforeunload = null
-      }
-    }
-  },
-  mounted() {
-    this.$bus.off('getSortData')
-    this.$bus.on('getSortData', (sortData) => {
-      this.sortData = sortData
-    })
-  },
-  methods: {
-    // 关闭操作
-    closeView() {
-      this.error = ''
-      this.done = false
-      this.exportQueueIndex = ''
-      this.progress = ''
-      this.$emit('close')
-    },
-    // 点叉
-    beforeClose(done) {
-      if (this.error || this.done) {
-        done()
-        return
-      }
-      this.$confirm('此操作将终止导出, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.cancel = true
-          done()
-        })
-        .catch(() => {
-        })
-    },
-    // 导出操作
-    exportInfos(data = {}) {
-      // var params = {
-      //   export_queue_index: this.exportQueueIndex,
-      //   search: this.search,
-      //   ...this.exportParams,
-      //   ...this.sortData,
-      //   ...data
-      // }
-      var params = { 
-        //有组织ID传入
-      }
-      // for (var key in this.filterObj) {
-      //   params[key] = this.filterObj[key]
-      // }
-
-      let exportAll = 'All'
-      if (params['ids']) {
-        exportAll = ''
-      }
-
-      // let request = {
-      //     uomGroup: crmReceivablesExcelAllExport
-      //   }[this.crmType + exportAll]
-      let request = {
-          uomGroup: winUomGroupExcelAllExport
-        }[this.crmType]
-      request(params)
-        .then(res => {
-          var downExportExcelName=res;//获取生成到服务器上的导出excel文件名称
-          this.$axios
-          .BolbGets('/api/basedataservice/exceltemplate/downloadExcelFiles/' + downExportExcelName)
-          .then((response) => {
-            downloadFile(response, this.crmTypeName+'导出数据.xlsx')
-            this.error = ''
-            this.done = false
-            this.exportQueueIndex = ''
-            this.progress = ''
-            this.$emit('close')
-            this.$notify({
-              title: '成功',
-              message: '数据导出成功！',
-              type: 'success',
-              duration: 2000
-            })
-          })
-        })
-        .catch(() => {
-        })
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-
-.dialog-body {
-  height: 150px;
-  text-align: center;
-  padding-top: 40px;
-  color: #659DED;
-  .el-icon-loading {
-    margin-bottom: 10px;
-    display: block;
-  }
-  p.error {
-    color: #E6A23C;
-  }
-  p.done {
-    color: #67C23A;
-    .el-icon-success {
-      font-size: 30px;
-      display: block;
-    }
-  }
-}
-
-.cancel {
-  color: #E6A23C;
-  .el-icon-warning {
-    font-size: 30px;
-    display: block;
-  }
-}
-
-.el-dialog__wrapper {
-  /deep/ .el-icon-loading {
-    font-size: 30px;
-  }
-
-  /deep/ .el-loading-text {
-    font-size: 18px;
-    margin-top: 10px;
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/CRMImport-old.vue b/code/WebApp/vue/src/views/pg-fis/components/CRMImport-old.vue
deleted file mode 100644
index bcc4d040..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/CRMImport-old.vue
+++ /dev/null
@@ -1,668 +0,0 @@
-<template>
-  <el-dialog
-    :visible="show"
-    :title="'导入'+crmTypeName"
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    width="600px"
-    @close="closeView">
-    <div class="dialog-body">
-      <!-- <el-steps
-        :active="stepsActive"
-        simple>
-        <el-step
-          v-for="(item, index) in stepList"
-          :key="index"
-          :title="item.title"
-          :icon="item.icon"
-          :status="item.status" />
-      </el-steps> -->
-
-      <div v-if="stepsActive == 1" class="step-section">
-        <div class="sections">
-          <div class="sections__title">一、请按照数据模板的格式准备要导入的数据。<span
-            class="download"
-            @click="download">点击下载《{{ crmTypeName }}导入模板》</span></div>
-          <div class="sections__tips">导入文件请勿超过2MB（约10,000条数据）</div>
-        </div>
-        <div class="sections">
-          <div class="sections__title">二、请选择数据重复时的处理方式（查重规则：【{{ fieldUniqueInfo }}】）</div>
-          <div class="sections__tips">查重规则为：添加{{ crmTypeName }}时所需填写的所有唯一字段，当前设置唯一字段为：{{ fieldUniqueInfo }}</div>
-          <div class="content">
-            <el-select
-              v-model="config"
-              placeholder="请选择">
-              <el-option
-                v-for="(item, index) in [{name: '覆盖系统原有数据',value: 1},{name: '跳过',value: 2}]"
-                :key="index"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </div>
-        </div>
-        <div class="sections">
-          <div class="sections__title">三、请选择需要导入的文件</div>
-          <div class="content">
-            <flexbox class="file-select">
-              <el-input
-                v-model="file.name"
-                :disabled="true"/>
-              <el-button
-                type="primary"
-                @click="selectFile">选择文件</el-button>
-            </flexbox>
-          </div>
-        </div>
-        <div class="sections">
-          <div class="sections__title">四、请选择负责人（{{ crmType == 'customer' ? '如不选择，导入的客户将进入公海' : '必选' }}）</div>
-          <div class="content">
-            <div class="user-cell">
-              <xh-user-cell
-                :value="user"
-                @value-change="userSelect"/>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div
-        v-loading="loading"
-        v-else-if="stepsActive == 2"
-        element-loading-text="数据导入中"
-        element-loading-spinner="el-icon-loading"
-        class="step-section" />
-
-      <div
-        v-loading="loading"
-        v-else-if="stepsActive == 3"
-        class="step-section">
-        <div class="result-info">
-          <i class="wk wk-success result-info__icon" />
-          <p class="result-info__des">数据导入完成</p>
-          <p class="result-info__detail">导入总数据<span class="result-info__detail--all">{{ resultData.totalSize }}</span>条，导入成功<span class="result-info__detail--suc">{{ resultData.totalSize - resultData.errSize }}</span>条，导入失败<span class="result-info__detail--err">{{ resultData.errSize }}</span>条</p>
-          <el-button
-            v-if="resultData && resultData.errSize > 0"
-            class="result-info__btn--err"
-            type="text"
-            @click="downloadErrData">下载错误数据</el-button>
-        </div>
-      </div>
-
-      <input
-        id="importInputFile"
-        type="file"
-        accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-        @change="uploadFile">
-    </div>
-    <span
-      slot="footer"
-      class="dialog-footer">
-      <el-popover
-        v-model="historyPopoverShow"
-        placement="top"
-        width="800"
-        popper-class="no-padding-popover"
-        trigger="click">
-        <!-- <c-r-m-import-history
-          :show="historyPopoverShow"
-          :crm-type="crmType"
-          @close="historyPopoverShow = false" />
-        <el-button
-          slot="reference"
-          class="history-btn"
-          type="text">查看历史导入记录</el-button> -->
-      </el-popover>
-
-
-
-      <el-button
-        :class="{ 'is-hidden': !showCancel }"
-        @click="closeView">取消</el-button>
-      <el-button
-        v-if="sureTitle"
-        type="primary"
-        @click="sureClick">{{ sureTitle }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-// import {
-//   crmQueryImportNumAPI,
-//   crmQueryImportInfoAPI,
-//   crmDownImportErrorAPI,
-//   filedGetField
-// } from '@/api/customermanagement/common'
-// import {
-//   crmCustomerExcelImport,
-//   crmCustomerDownloadExcelAPI
-// } from '@/api/customermanagement/customer'
-// import {
-//   crmLeadsExcelImport,
-//   crmLeadsDownloadExcelAPI
-// } from '@/api/customermanagement/clue'
-// import {
-//   crmContactsExcelImport,
-//   crmContactsDownloadExcelAPI
-// } from '@/api/customermanagement/contacts'
-// import {
-//   crmProductExcelImport,
-//   crmProductDownloadExcelAPI
-// } from '@/api/customermanagement/product'
-
-import { XhUserCell } from '@/components/CreateCom'
-// import CRMImportHistory from './CRMImportHistory'
-
-import { mapGetters } from 'vuex'
-import crmTypeModel from '@/views/ux/model/crmTypeModel'
-import { downloadExcelWithResData } from '@/utils/index'
-
-export default {
-  name: 'CRMImport', // 文件导入
-  components: {
-    XhUserCell
-  },
-  props: {
-    show: {
-      type: Boolean,
-      default: false
-    },
-    // CRM类型
-    crmType: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      fieldList: [],
-      config: 1, // 	1 覆盖，2跳过
-      file: { name: '' },
-      user: [],
-
-      stepsActive: 1,
-      stepList: [
-        {
-          icon: 'wk wk-upload',
-          title: '上传文件',
-          status: 'wait'
-        },
-        {
-          icon: 'wk wk-data-import',
-          title: '导入数据',
-          status: 'wait'
-        },
-        {
-          icon: 'wk wk-success',
-          title: '导入完成',
-          status: 'wait'
-        }
-      ],
-      resultData: null,
-      processData: {
-        count: 0,
-        status: ''
-      },
-      messageId: null,
-      intervalTimer: null,
-
-      historyPopoverShow: false
-    }
-  },
-  computed: {
-    ...mapGetters(['userInfo']),
-
-    crmTypeName() {
-      return (
-        {
-          customer: '客户',
-          leads: '线索',
-          contacts: '联系人',
-          product: '产品'
-        }[this.crmType] || ''
-      )
-    },
-
-    sureTitle() {
-      return {
-        1: '立即导入',
-        2: '最小化',
-        3: '确定'
-      }[this.stepsActive]
-    },
-
-    showCancel() {
-      return this.stepsActive != 2
-    },
-
-    fieldUniqueInfo() {
-      const uniqueList = this.fieldList.filter(item => {
-        return item.isUnique == 1
-      })
-
-      return uniqueList.map(item => {
-        return item.name
-      }).join('/') || '无'
-    }
-  },
-  watch: {
-    show: function(val) {
-      if (val) {
-        if (this.stepsActive == 1) {
-          if (this.userInfo) {
-            this.user = [this.userInfo]
-          }
-        }
-
-        this.getField()
-      } else {
-        if (this.stepsActive == 3) {
-          this.resetData()
-        }
-
-        this.fieldList = []
-      }
-    },
-
-    stepsActive() {
-      this.$emit('status', {
-        1: 'wait',
-        2: 'process',
-        3: 'finish'
-      }[this.stepsActive])
-    }
-
-    // file() {
-    //   this.getFirstStepStatus()
-    // },
-
-    // user() {
-    //   this.getFirstStepStatus()
-    // }
-
-  },
-  mounted() {
-  },
-  methods: {
-    sureClick() {
-      if (this.stepsActive == 1) {
-        if (this.stepList[0].status == 'finish') {
-          this.stepList[1].status = 'process'
-          this.stepsActive = 2
-          this.firstUpdateFile(res => {
-            this.messageId = res.data
-            this.secondQueryNum()
-            this.intervalTimer = setInterval(() => {
-              if (this.processData.status == 'end') {
-                clearInterval(this.intervalTimer)
-                this.intervalTimer = null
-                this.thirdQueryResult()
-              } else {
-                this.secondQueryNum()
-              }
-            }, 2000)
-          })
-        } else {
-          if (!this.file.name) {
-            this.$message.error('请选择导入文件')
-          } else if (
-            this.crmType != 'customer' &&
-            (!this.user || this.user.length == 0)
-          ) {
-            this.$message.error('请选择负责人')
-          }
-        }
-      } else {
-        this.closeView()
-      }
-    },
-
-
-    /**
-     * 第一步上传
-     */
-    firstUpdateFile(result) {
-      var params = {}
-      params.repeatHandling = this.config
-      params.file = this.file
-      params.ownerUserId = this.user.length > 0 ? this.user[0].userId : ''
-      var request = {
-        customer: crmCustomerExcelImport,
-        leads: crmLeadsExcelImport,
-        contacts: crmContactsExcelImport,
-        product: crmProductExcelImport
-      }[this.crmType]
-      this.loading = true
-      request(params)
-        .then(res => {
-          if (result) {
-            result(res)
-          }
-        })
-        .catch(() => {
-          if (result) {
-            result(false)
-          }
-          this.loading = false
-        })
-    },
-
-    /**
-     * 第二步查询数量
-     */
-    secondQueryNum() {
-      crmQueryImportNumAPI({ messageId: this.messageId })
-        .then(res => {
-          if (res.data === null) {
-            this.processData.status = 'end'
-          } else {
-            this.processData.status = ''
-            this.processData.count = res.data
-          }
-        })
-        .catch(() => {
-          // this.processData.status = 'err'
-        })
-    },
-
-    /**
-     * 第三部 查询结果
-     */
-    thirdQueryResult() {
-      crmQueryImportInfoAPI({ messageId: this.messageId })
-        .then(res => {
-          this.loading = false
-          this.stepList[1].status = 'finish'
-          this.stepsActive = 3
-          this.$emit('status', 'finish')
-          if (res) {
-            this.resultData = res
-            if (res.errSize > 0) {
-              this.stepList[2].status = 'error'
-            } else {
-              this.stepList[2].status = 'finish'
-            }
-          }
-        })
-        .catch(() => {})
-    },
-
-    /**
-     * 下载错误模板
-     */
-    downloadErrData() {
-      this.loading = true
-      crmDownImportErrorAPI({ messageId: this.messageId })
-        .then(res => {
-          downloadExcelWithResData(res)
-          this.loading = false
-        })
-        .catch(() => {
-          this.loading = false
-        })
-    },
-
-    // 下载模板操作
-    download() {
-      const request = {
-        customer: crmCustomerDownloadExcelAPI,
-        leads: crmLeadsDownloadExcelAPI,
-        contacts: crmContactsDownloadExcelAPI,
-        product: crmProductDownloadExcelAPI
-      }[this.crmType]
-      request()
-        .then(res => {
-          var blob = new Blob([res.data], {
-            type: 'application/vnd.ms-excel;charset=utf-8'
-          })
-          var downloadElement = document.createElement('a')
-          var href = window.URL.createObjectURL(blob) // 创建下载的链接
-          downloadElement.href = href
-          downloadElement.download =
-            decodeURI(
-              res.headers['content-disposition'].split('filename=')[1]
-            ) || '' // 下载后文件名
-          document.body.appendChild(downloadElement)
-          downloadElement.click() // 点击下载
-          document.body.removeChild(downloadElement) // 下载完成移除元素
-          window.URL.revokeObjectURL(href) // 释放掉blob对象
-        })
-        .catch(() => {})
-    },
-    // 选择文件
-    selectFile() {
-      document.getElementById('importInputFile').click()
-    },
-    /** 图片选择出发 */
-    uploadFile(event) {
-      var files = event.target.files
-      const file = files[0]
-      this.file = file
-      event.target.value = ''
-
-      // 阶段一状态
-      this.getFirstStepStatus()
-    },
-    // 用户选择
-    userSelect(data) {
-      if (data.value && data.value.length > 0) {
-        this.user = data.value
-      } else {
-        this.user = []
-      }
-
-      // 阶段一状态
-      this.getFirstStepStatus()
-    },
-
-    getFirstStepStatus() {
-      // 阶段一状态
-      const hasFile = this.file && this.file.size
-      const hasUser = this.user && this.user.length > 0
-
-      if (this.crmType === 'customer') {
-        this.stepList[0].status = hasFile ? 'finish' : 'wait'
-      } else {
-        this.stepList[0].status = hasFile && hasUser ? 'finish' : 'wait'
-      }
-    },
-
-    // 关闭操作
-    closeView() {
-      this.$emit('update:show', false)
-      this.$emit('close', this.stepsActive == 3 ? 'finish' : '')
-    },
-
-    /**
-     * 重置页面数据
-     */
-    resetData() {
-      this.config = 1
-      this.file = { name: '' }
-      this.user = []
-
-      this.stepsActive = 1
-      this.stepList = [
-        {
-          icon: 'wk wk-upload',
-          title: '上传文件',
-          status: 'wait'
-        },
-        {
-          icon: 'wk wk-data-import',
-          title: '导入数据',
-          status: 'wait'
-        },
-        {
-          icon: 'wk wk-success',
-          title: '导入完成',
-          status: 'wait'
-        }
-      ]
-      this.resultData = null
-      this.processData = {
-        count: 0,
-        status: ''
-      }
-      this.messageId = null
-    },
-
-    /**
-     * 获取验证字段
-     */
-    getField() {
-      var params = {
-        label: crmTypeModel[this.crmType]
-      }
-
-      filedGetField(params)
-        .then(res => {
-          this.fieldList = res.data
-        })
-        .catch(() => {
-        })
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.el-steps {
-  margin-bottom: 15px;
-
-  /deep/ .el-step__title {
-    font-size: 14px;
-  }
-
-  /deep/ .el-step.is-simple .el-step__arrow::before,
-  /deep/ .el-step.is-simple .el-step__arrow::after {
-    height: 10px;
-    width: 2px;
-  }
-
-  /deep/ .el-step.is-simple .el-step__arrow::after {
-    transform: rotate(45deg) translateY(3px);
-  }
-  /deep/ .el-step.is-simple .el-step__arrow::before {
-    transform: rotate(-45deg) translateY(-2px);
-  }
-}
-
-.step-section {
-  min-height: 300px;
-
-  /deep/ .el-loading-spinner {
-    top: 45%;
-    .el-icon-loading {
-      font-size: 40px;
-      color: #999;
-    }
-
-    .el-loading-text {
-      color: #333;
-    }
-  }
-}
-
-.sections {
-  font-size: 14px;
-  color: #333;
-
-  &__title {
-    font-weight: 600;
-  }
-
-  &__tips {
-    padding-left: 30px;
-    margin: 8px 0 15px;
-    color: #999;
-    font-size: 12px;
-    line-height: 1.4;
-  }
-
-  .download {
-    cursor: pointer;
-    color: #2362FB;
-  }
-
-}
-
-.sections__tips + .content {
-  padding-top: 0;
-}
-
-.content {
-  padding: 10px 10px 10px 30px;
-  .el-select {
-    width: 400px;
-  }
-  .user-cell {
-    width: 400px;
-  }
-}
-
-#importInputFile {
-  display: none;
-}
-
-.file-select {
-  .el-input {
-    width: 400px;
-  }
-  button {
-    margin-left: 20px;
-  }
-}
-
-.is-hidden {
-  visibility: hidden;
-}
-
-.history-btn {
-  float: left;
-  margin-left: 15px;
-}
-
-
-// 结果信息
-.result-info {
-  text-align: center;
-  padding-top: 80px;
-
-  &__icon {
-    font-size: 40px;
-    color: #3E84E9;
-  }
-
-  &__des {
-    margin-top: 15px;
-    color: #333;
-    font-size: 14px;
-  }
-
-  &__detail {
-    margin-top: 15px;
-    font-size: 12px;
-    color: #666;
-    &--all {
-      color: #333;
-      font-weight: 600;
-    }
-
-    &--suc {
-      color: #3E84E9;
-      font-weight: 600;
-    }
-
-    &--err {
-      color: #f94e4e;
-      font-weight: 600;
-    }
-  }
-
-  &__btn--err {
-    margin-top: 10px;
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/CRMImport.vue b/code/WebApp/vue/src/views/pg-fis/components/CRMImport.vue
deleted file mode 100644
index 0ccf73ac..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/CRMImport.vue
+++ /dev/null
@@ -1,591 +0,0 @@
-<template>
-  <el-dialog
-    :visible="show"
-    :title="'导入'+crmTypeName"
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    width="600px" 
-    @close="closeView">
-   <div class="dialog-body">
-      <div v-if="stepsActive == 1" class="step-section">
-       
-         <div class="sections">
-          <div class="sections__title" v-loading="loading">
-            一、初始生成模板：
-            <span class="download" @click="createTemplate">点击生成《{{ crmTypeName }}导入模板》</span>
-           <div class="sections__tips">通过值映射，可保持生成的模板最新，例如自动生成下拉列表项！</div>
-          </div>
-        </div>
-        <div class="sections">
-          <div class="sections__title">
-            二、请按照数据模板的格式准备要导入的数据。
-            <span class="download" @click="download">点击下载《{{ crmTypeName }}导入模板》</span>
-          </div>
-          <div class="sections__tips">1、模板名称可以进行修改，但不要删除模板中设置的字段！</div>
-          <div class="sections__tips" style="margin-top:-10px;">2、必填项列头会标红标*！</div>
-           <div class="sections__tips" style="margin-top:-10px;">3、导入文件请勿超过2MB！且只能上传Excel，但不支持“.xls”文件，即不支持Excel97-2003!</div>
-        </div>
-        <div class="sections">
-          <div class="sections__title">三、请选择需要导入的文件</div>
-          <div class="content">
-            <flexbox class="file-select">
-               <el-upload
-                  ref="upload"
-                    class="avatar-uploader"
-                    drag
-                    action="#"
-                    :http-request="httpRequestfiles"
-                    :headers="httpHeader"
-                    :file-list="fileuploadList"
-                    :before-upload="beforeAvatarUpload"
-                    :before-remove="beforeRemove"
-                    :on-remove="handleRemove"
-                    multiple
-                    :limit="1">
-                    <i class="el-icon-upload" ></i>
-                      <div class="el-upload__text">
-                          将文件拖到此处，或
-                          <em>点击上传</em>
-                      </div>
-              </el-upload>
-            </flexbox>
-          </div>
-        </div>
-       
-      </div>
-
-      <div
-        v-loading="loading"
-        v-else-if="stepsActive == 2"
-        element-loading-text="数据导入中,请耐心等待..."
-        element-loading-spinner="el-icon-loading"
-        class="step-section"
-      />
-
-        <div
-        v-loading="loading"
-        v-else-if="stepsActive == 3"
-        class="step-section">
-        <div class="result-info">
-        <el-card style="height:300px;margin-top:-20px" shadow="always">
-          <i class="wk wk-success result-info__icon" />
-          <p class="result-info__des">数据导入结果：</p>
-          <!-- <p class="result-info__detail">导入总数据<span class="result-info__detail--all">{{ this.resultData.totalSize }}</span>条，导入成功<span class="result-info__detail--suc">{{ this.resultData.totalSize - this.resultData.errSize }}</span>条，导入失败<span class="result-info__detail--err">{{ this.resultData.errSize }}</span>条</p> -->
-          <p class="result-info__detail">导入总数据<span class="result-info__detail--all">{{ this.resultData.totalSize }}</span>条，导入成功<span class="result-info__detail--suc">{{ this.resultData.succeessSize }}</span>条，导入失败<span class="result-info__detail--err">{{ this.resultData.errSize }}</span>条</p>
-          <el-button
-            v-if="this.resultData && this.resultData.errSize > 0"
-            class="result-info__btn--err"
-            type="text"
-            @click="downloadErrData">下载错误数据</el-button>
-          </el-card>
-        </div>
-      </div>
-
-      <div
-        v-loading="loading"
-        v-else-if="stepsActive ==4"
-        class="step-section">
-        <div class="result-info">
-          <el-card style="height:300px" shadow="always">
-          <i class="wk wk-success result-info__icon" />
-          <p class="result-info__des">数据导入结果：</p>
-          <!-- <p class="result-info__detail">导入总数据<span class="result-info__detail--all">{{ this.resultData.totalSize }}</span>条，导入成功<span class="result-info__detail--suc">{{ this.resultData.totalSize - this.resultData.errSize }}</span>条，导入失败<span class="result-info__detail--err">{{ this.resultData.errSize }}</span>条</p> -->
-          <p class="result-info__detail">导入总数据<span class="result-info__detail--all">{{ this.resultData.totalSize }}</span>条，导入成功<span class="result-info__detail--suc">{{ this.resultData.succeessSize }}</span>条，当前失败<span class="result-info__detail--err">{{ this.resultData.errSize }}</span>条</p>
-           <p class="result-info__detail--err" >数据错误信息：</p>
-          <p class="result-info__detail">{{this.resultData.errMessage}}</p>
-           </el-card>
-        </div>      
-      </div>
-     
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-popover
-        v-model="historyPopoverShow"
-        placement="top"
-        width="800"
-        popper-class="no-padding-popover"
-        trigger="click"
-      >
-        
-      </el-popover>
-
-      <!-- <el-button  @click="closeView">取消</el-button> -->
-      <el-button
-        :class="{ 'is-hidden': !showCancel }"
-        @click="closeView">取消</el-button>
-       <el-button
-        v-if="sureTitle"
-        type="primary"
-        @click="sureClick">{{ sureTitle }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-
-import {downloadFile} from '@/utils/crmindex.js'
-import { getToken } from '@/utils/auth' // get token from cookie
-//业务--生成模板接口
-import { winUomGroupExcelImportTemplate,winUomGroupExcelImport} from '@/api/uomGroup/uomGroup'
-
-
-
-export default {
-  name: "CRMImport", // 文件导入
-  props: {
-    show: {
-      type: Boolean,
-      default: false,
-    },
-    // CRM类型
-    crmType: {
-      type: String,
-      default: "",
-    },
-  },
-  data() {
-    return {
-      loading: false,
-      fieldList: [],
-      config: 1, // 	1 覆盖，2跳过
-      //file: { name: "" },
-      user: [],
-
-      stepsActive: 1,
-      stepList: [
-        {
-          icon: "wk wk-upload",
-          title: "上传文件",
-          status: "wait",
-        },
-        {
-          icon: "wk wk-data-import",
-          title: "导入数据",
-          status: "wait",
-        },
-        {
-          icon: "wk wk-success",
-          title: "导入完成",
-          status: "wait",
-        },
-      ],
-      //resultData: null,
-      resultData:{
-        totalSize:0,
-        errSize:0,
-        errTemplate:"",
-        errMessage:""
-      },
-      processData: {
-        count: 0,
-        status: "",
-      },
-      messageId: null,
-      intervalTimer: null,
-      fileuploadList:[],
-      isLt2M:"",
-      isFileType:"",
-      historyPopoverShow: false,
-    };
-  },
-   computed: {
-    sureTitle() {
-      return {
-        1: '立即导入',
-        2: '最小化',
-        3: '确定'
-      }[this.stepsActive]
-    },
-    showCancel() {
-      return this.stepsActive != 2
-    },
-    crmTypeName() {//根据传入的crmType进行翻译
-      return (
-        {
-          uomGroup: "计量单位组",
-        }[this.crmType] || ""
-      );
-    },
-    getImportTemplate() {//模板名称
-      return (
-        {
-          uomGroup: '计量单位组信息导入模板.xlsx',
-        }[this.crmType] || ""
-      );
-    },
-     httpHeader() {
-      return {
-        'Authorization':'Bearer ' + getToken()
-      }
-    }
-  },
-  watch: {
-    show: function (val) {
-       if (val) {
-        this.stepsActive = 1
-      } else {
-        if (this.stepsActive == 3) {
-          //以下是重置数据
-          this.stepsActive = 1
-          this.stepList = [
-            {
-              icon: 'wk wk-upload',
-              title: '上传文件',
-              status: 'wait'
-            },
-            {
-              icon: 'wk wk-data-import',
-              title: '导入数据',
-              status: 'wait'
-            },
-            {
-              icon: 'wk wk-success',
-              title: '导入完成',
-              status: 'wait'
-            }
-          ]
-          this.resultData = null
-        }
-      }
-    },
-
-    stepsActive() {
-      this.$emit(
-        "status",
-        {
-          1: "wait",
-          2: "process",
-          3: "finish",
-        }[this.stepsActive]
-      );
-    },
-  },
-  mounted() {},
-  methods: {
-    handleImportExcelClick() {//父组件中，初始化此子组件时调用
-      this.fileuploadList = [];
-      //this.$refs.upload.clearFiles();
-    },
-    httpRequestfiles(data) {
-      let _this = this;
-      let rd = new FileReader(); // 创建文件读取对象
-      let file = data.file;
-      this.fileuploadList.push(file);
-      rd.readAsDataURL(file); // 文件读取装换为base64类型
-    },
-     beforeAvatarUpload(file) {
-      var FileExt = file.name.replace(/.+\./, "");       
-        if (['xlsx'].indexOf(FileExt.toLowerCase()) === -1){            
-            this.$message({ 
-                type: 'warning', 
-                message: '只支持xlsx类型文件！' 
-            });   
-            this.isFileType="0"             
-            return false;       
-        } 
-        else{
-            this.isFileType="1"
-        } 
-      this.isLt2M = file.size / 1024 / 1024 < 2?'1':'0'; 
-      if (this.isLt2M==="0") {
-        this.$message.error("上传文件大小不能超过 2MB!");
-      }
-      return this.isLt2M==='1'?true: false;
-    },
-    beforeRemove(file, fileList) {
-        if (this.isLt2M==="1" && this.isFileType==="1") {
-         return this.$confirm(`确定移除 ${ file.name }？`);
-        }
-    },
-    handleRemove(file, fileList) {//附件列表删除操作
-      const index=this.fileuploadList.indexOf(file.originFileObj)
-      const newFileList=this.fileuploadList.slice()
-      newFileList.splice(index,1)
-      this.fileuploadList = newFileList;
-    },
-    //执行按钮
-    sureClick() {
-      if (this.fileuploadList===[] || JSON.stringify(this.fileuploadList) === "[]") {
-        this.$message.error("请选择导入文件");
-        return false;
-      }
-      if (this.stepsActive == 1) {
-        if (this.stepList[0].status == "wait") {
-           this.stepsActive = 2;
-           this.loading = true; 
-           setTimeout(() => {
-             this.saveTemplateData();
-            }, 2000)
-           if( this.stepList[1].status == 'finish')
-           {
-
-           }
-        } else {
-          if (this.fileuploadList === "[]") {
-            this.$message.error("请选择导入文件");
-          } 
-        }
-      } else {
-        this.closeView();
-      }
-    },
-    
-    saveTemplateData() {//保存项目、合同管理、客户等信息的共用方法
-      //--上传附件，批量或拖拽
-      if (JSON.stringify(this.fileuploadList) != "[]") {
-        let fd = new FormData();
-        const{fileuploadList}=this;
-        fileuploadList.forEach(file=>{
-            fd.append("files", file); // 添加文件
-        })
-        console.log("fd:"+JSON.stringify(fd))
-        var request = {
-            uomGroup: winUomGroupExcelImport
-        }[this.crmType]
-         request(fd)
-            .then((res) => {//此处，导出模板上设置的错误
-              this.loading = false;
-              this.resultData = res;
-              if(res.errSize>0 && res.errMessage==="RowErrors"){//上传有错误数据 && res.errMessage.length <= 0
-                this.stepList[0].status = 'wait';
-                this.resultData.errSize=res.errSize;//错误数据个数
-                this.resultData.errTemplate=res.errTemplate;//指定错误模板名称，作为参数，用于错误模板下载
-                this.stepsActive = 3;
-              }
-              else{
-                if(res.errMessage.length > 0 && res.errMessage !="SccessData"){//此处，是判断数据库中是否匹配
-                  this.stepsActive = 4;
-                }
-                else {
-                  this.stepList[1].status = 'finish'
-                  this.resultData.totalSize=res.totalSize;//返回导入成功的数据总数
-                  if (this.isLt2M==="1" 
-                    && this.isFileType==="1"
-                    && res.errMessage ==="SccessData"
-                    && res.totalSize>0) {
-                    this.$notify({
-                      title: "成功",
-                      message: "数据导入成功！",
-                      type: "success",
-                      duration: 2000,
-                    });
-                  }
-                  this.stepsActive = 3;
-                }
-              }
-              this.$emit("save-success", {
-                type: this.crmType
-              });
-              this.$emit('status', 'finish');
-            })
-            .catch(() => {this.loading = false;});
-          } else {
-            this.loading = false;
-            this.$message({
-                message: "未上传任何附件，请查检！",
-                type: "warning",
-              });
-            }
-    },
-
-     /**
-     * 下载错误模板数据等（统一接口） 
-     */
-    downloadErrData() {
-      var fileName=this.getImportTemplate;
-      this.$axios
-        .BolbGets("/api/basedataservice/exceltemplate/downloadExcelFiles/" + this.resultData.errTemplate)
-        .then((response) => {
-            downloadFile(response,fileName);
-       });
-    },
-    /**
-     * 生成模板，引入相关业务接口 
-     */
-    createTemplate(){
-    var request = {
-        uomGroup: winUomGroupExcelImportTemplate
-      }[this.crmType]
-      //this.loading = true
-      request()
-        .then(res => {
-            result(res)
-            this.loading = false
-            this.$notify({
-                    title: "成功",
-                    message: "模板生成成功！",
-                    type: "success",
-                    duration: 2000,
-                });
-        })
-        .catch(() => {
-          this.loading = false
-        })
-    },
-    // 下载模板操作)(统一接口)
-    download() {
-       var fileName=this.getImportTemplate;
-       this.loading = true
-       this.$axios
-        .BolbGets("/api/basedataservice/exceltemplate/downloadExcelTemplate/" + fileName)
-        .then((response) => {
-          downloadFile(response,fileName);
-          this.loading = false
-      })
-      .catch(() => {
-          this.loading = false
-        });
-    },
-    // 关闭操作
-    closeView() {
-      this.$emit("update:show", false);
-      this.$emit("close", this.stepsActive == 3 ? "finish" : "");
-    }
-
-  },
-};
-</script>
-<style scoped lang="scss">
-@import '@/styles/xr-theme.scss';
-.el-steps {
-  margin-bottom: 15px;
-
-  /deep/ .el-step__title {
-    font-size: 14px;
-  }
-
-  /deep/ .el-step.is-simple .el-step__arrow::before,
-  /deep/ .el-step.is-simple .el-step__arrow::after {
-    height: 10px;
-    width: 2px;
-  }
-
-  /deep/ .el-step.is-simple .el-step__arrow::after {
-    transform: rotate(45deg) translateY(3px);
-  }
-  /deep/ .el-step.is-simple .el-step__arrow::before {
-    transform: rotate(-45deg) translateY(-2px);
-  }
-}
-
-.step-section {
-  min-height: 300px;
-
-  /deep/ .el-loading-spinner {
-    top: 45%;
-    .el-icon-loading {
-      font-size: 40px;
-      color: #999;
-    }
-
-    .el-loading-text {
-      color: #333;
-    }
-  }
-}
-
-.sections {
-  font-size: 14px;
-  color: #333;
-
-  &__title {
-    font-weight: 600;
-  }
-
-  &__tips {
-    padding-left: 30px;
-    margin: 8px 0 15px;
-    color: #999;
-    font-size: 12px;
-    line-height: 1.4;
-  }
-
-  .download {
-    cursor: pointer;
-    color: #2362fb;
-  }
-}
-
-.sections__tips + .content {
-  padding-top: 0;
-  
-}
-
-.content {
-  padding: 10px 10px 10px 30px;
-  .el-select {
-    width: 400px;
-  }
-  .user-cell {
-    width: 400px;
-  }
-}
-
-#importInputFile {
-  display: none;
-}
-
-.file-select {
-  .el-input {
-    width: 400px;
-  }
-  button {
-    margin-left: 20px;
-  }
-}
-
-.is-hidden {
-  visibility: hidden;
-}
-
-.history-btn {
-  float: left;
-  margin-left: 15px;
-}
-
-// 结果信息
-.result-info {
-  text-align: center;
-  padding-top: 50px;
-
-  &__icon {
-    font-size: 40px;
-    color: $xr-color-primary;
-  }
-
-  &__des {
-    margin-top: -15px;
-    color: #333;
-    font-size: 30px;
-  }
-
-  &__detail {
-    margin-top: 35px;
-    font-size: 20px;
-    color: #666;
-    &--all {
-      color: #333;
-      font-weight: 600;
-    }
-
-    &--suc {
-      color: $xr-color-primary;
-      font-weight: 600;
-    }
-
-    &--err {
-      margin-top: 25px;
-      color: #f94e4e;
-      font-weight: 600;
-    }
-  }
-
-  &__btn--err {
-    margin-top: 10px;
-    font-size: 20px;
-  }
-}
-</style>
-
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/components/CRMListHead.vue b/code/WebApp/vue/src/views/pg-fis/components/CRMListHead.vue
deleted file mode 100644
index 9e103975..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/CRMListHead.vue
+++ /dev/null
@@ -1,266 +0,0 @@
-<template>
-  <div class="c-container">
-    <div class="title">{{ title }}</div>
-    <!-- <el-input
-      :placeholder="placeholder"
-      v-model="inputContent"
-      class="sc-container"
-      @input="inputChange"
-      @keyup.enter.native="searchInput" v-show="showSearch">
-      <el-button
-        slot="append"
-        icon="el-icon-search"
-        @click.native="searchInput"/>
-    </el-input> -->
-    <div class="right-container">
-      <el-button
-        size="small"
-        type="primary"
-        @click="createClick">{{ createTitle }}</el-button>
-      <el-dropdown
-        v-if="moreTypes.length > 0"
-        trigger="click"
-        @command="handleTypeDrop">
-        <flexbox class="right-more-item">
-          <div>更多</div>
-          <i
-            class="el-icon-arrow-down el-icon--right"
-            style="color:#777;"/>
-        </flexbox>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item
-            v-for="(item, index) in moreTypes"
-            :key="index"
-            :command="item.type">{{ item.name }}</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-    <c-r-m-create-view
-      v-if="isCreate"
-      :crm-type="createCRMType"
-      :action="createActionInfo"
-      @save-success="createSaveSuccess"
-      @hiden-view="hideView"
-      width='700px'
-    />
-    <c-r-m-import
-      :show="showCRMImport"
-      :crm-type="crmType"
-      @save-success="createSaveSuccess"
-      @close="showCRMImport=false"/>
-    <c-r-m-export
-      :show="showCRMExport"
-      :crm-type="crmType"
-      :search="search"
-      :scene_id="scene_id"
-      :filter-obj="filterObj"
-      :export-params="exportParams"
-      @close="showCRMExport=false"/>
-  </div>
-</template>
-
-<script type="text/javascript">
-import { mapGetters } from 'vuex'
-import CRMCreateView from './CRMCreateView'
-import CRMImport from './CRMImport'
-import CRMExport from './CRMExport'
-import crmTypes from "../../../../static/crmTypes";
-
-export default {
-  name: 'CRMListHead', // 客户管理下 重要提醒 回款计划提醒
-  components: {
-    CRMCreateView,
-    CRMImport,
-    CRMExport
-  },
-  props: {
-    showSearch:{
-      type: Boolean,
-      default: true
-    },
-
-    // CRM类型
-    crmType: {
-      type: String,
-      default: ''
-    },
-    search: String,
-    scene_id: {
-      type: [Number, String],
-      default: ''
-    },
-    filterObj: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-    title: {
-      type: String,
-      default: ''
-    },
-    placeholder: {
-      type: String,
-      default: '请输入内容'
-    },
-    createTitle: {
-      type: String,
-      default: ''
-    },
-    inputContent: '',
-    /** 更多操作 */
-    moreTypes: [],
-    // 创建的相关信息
-    createActionInfo: { type: 'create' },
-    createCRMType: '',
-    isCreate: false, // 是创建
-    // 导入
-    showCRMImport: false,
-    // 导出
-    showCRMExport: false,
-    // 导出选中参数
-    exportParams: {}
-    }
-  },
-  computed: {
-    // ...mapGetters(['crm']),
-    // canSave() {
-    //   if (this.isSeas) {
-    //     return false
-    //   }
-    //   return this.crm[this.crmType].save
-    // }
-  },
-  mounted() {
-    // 线索和客户判断更多操作
-    
-    this.getTitle();
-    if (!this.isSeas) {
-      //if (this.crm[this.crmType].excelimport) {
-        this.moreTypes.push({ type: 'enter', name: '导入' })
-      //}
-      //if (this.crm[this.crmType].excelexport) {
-        this.moreTypes.push({ type: 'out', name: '导出全部' })
-     // }
-    } else {
-      // 客户池的导出关键字不同
-      //if (this.crm.pool.excelexport) {
-        this.moreTypes.push({ type: 'out', name: '导出全部' })
-     // }
-    }
-  },
-  methods: {
-    getTitle() {
-      let type=crmTypes[this.crmType];
-      if(type===undefined)
-      { 
-        this.title=this.crmType+'管理';
-        this.createTitle='新增'+this.crmType;
-      }
-      else
-      {
-        this.title= type.name+'管理'
-        this.createTitle='新增'+type.name;
-      }   
-    },
-
-    handleTypeDrop(command, params = {}) {
-      if (command == 'out') {
-        let paramsData = {}
-        if (params.__export) {
-          paramsData = params
-          delete paramsData.__export
-        } else {
-          paramsData = {}
-        }
-        this.exportParams = paramsData
-        this.showCRMExport = true
-      } else if (command == 'enter') {
-        this.showCRMImport = true
-      }
-    },
-    createClick() {
-
-      this.createCRMType = this.crmType
-      this.createActionInfo = { type: 'save' }
-      this.isCreate = !this.isCreate
-    },
-    inputChange() {
-      this.$emit('update:search', this.inputContent)
-    },
-    // 进行搜索操作
-    searchInput() {
-      this.$emit('on-search', this.inputContent)
-    },
-    // 创建数据页面 保存成功
-    createSaveSuccess(data) {
-      if (data && data.saveAndCreate) {
-        if (data.type == 'customer') {
-          this.createCRMType = 'contacts'
-          this.createActionInfo = {
-            type: 'relative',
-            crmType: 'customer',
-            data: {}
-          }
-          this.createActionInfo.data['customer'] = data.data
-          this.isCreate = true
-        }
-      } else {
-        // 回到保存成功
-        this.$emit('on-handle', { type: 'save-success' })
-      }
-    },
-    hideView() {
-      this.isCreate = false
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.c-container {
-  height: 60px;
-  position: relative;
-  z-index: 100;
-  .title {
-    float: left;
-    padding: 0 20px;
-    font-size: 18px;
-    line-height: 60px;
-  }
-  .sc-container {
-    width: 300px;
-    margin: -18px 0 0 -150px;
-    position: absolute;
-    left: 50%;
-    top: 50%;
-  }
-
-  .right-container {
-    margin-right: -10px;
-    float: right;
-    margin: 12px 20px 0 0;
-    position: relative;
-    .right-item {
-      float: left;
-      margin-right: 10px;
-      padding: 8px 10px;
-      font-size: 13px;
-      border-radius: 2px;
-    }
-
-    .right-more-item {
-      cursor: pointer;
-      border: 1px solid #dcdfe6;
-      background-color: white;
-      font-size: 13px;
-      color: #777;
-      padding: 0 12px;
-      border-radius: 2px;
-      height: 31px;
-    }
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/CRMTableHead.vue b/code/WebApp/vue/src/views/pg-fis/components/CRMTableHead.vue
deleted file mode 100644
index 3ff145da..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/CRMTableHead.vue
+++ /dev/null
@@ -1,399 +0,0 @@
-<template>
-  <div>
-    <flexbox v-show="selectionList.length == 0" class="th-container">
-      <!-- <div v-if="!isSeas">场景：</div>
-      <div @click="getAllClick" class="condition_title">
-        {{ sceneData.name || getDefaultSceneName() }}
-      </div> -->
-      <img
-        :style="{ 'margin-left': isSeas ? 0 : '30px' }"
-        class="c-filtrate"
-        src="@/assets/img/c_filtrate.png"
-        @click="showFilterClick"
-      />
-      <div class="condition_title" @click="showFilterClick">高级筛选</div>
-      <filter-form
-        :field-list="fieldList"
-        :dialog-visible.sync="showFilter"
-        :obj="filterObj"
-        :crm-type="crmType"
-        :is-seas="isSeas"
-        @filter="handleFilter"
-      />
-    </flexbox>
-
-    <scene-set
-      :dialog-visible.sync="showSceneSet"
-      :crm-type="crmType"
-      @save-success="updateSceneList"
-    />
-    <scene-create
-      :field-list="fieldList"
-      :crm-type="crmType"
-      :dialog-visible.sync="showSceneCreate"
-      :obj="sceneFilterObj"
-      @saveSuccess="updateSceneList"
-    />
-  </div>
-</template>
-
-<script type="text/javascript">
-import { mapGetters } from "vuex";
-import crmTypeModel from "@/views/ux/model/crmTypeModel";
-//获取表格列
-import {
-  filterIndexfields,
-  // crmSceneSave
-} from "@/api/ux/common";
-
-import filterForm from "./filterForm";
-import filterContent from "./filterForm/filterContent";
-import SceneSet from "./sceneForm/SceneSet"; // 场景设置
-import SceneCreate from "./sceneForm/SceneCreate";
-import data from "../../../../static/tableFieldForSearch";
-import crmtypes from "../../../../static/crmTypes";
-
-export default {
-  name: "CRMTableHead", // 客户管理下 重要提醒 回款计划提醒
-  components: {
-    filterForm,
-    filterContent,
-    SceneCreate,
-    SceneSet,
-  },
-  props: {
-    title: {
-      type: String,
-      default: "",
-    },
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: "",
-    },
-    // 辅助 使用 公海没有场景
-    isSeas: {
-      type: Boolean,
-      default: false,
-    },
-    //父ID,主要用于批量删除
-    parentID: {
-      type: String,
-      default: "",
-    },
-  },
-  data() {
-    return {
-      sceneTypes: [
-        { type: "enter", name: "我负责的" },
-        { type: "out", name: "我" },
-      ],
-      sceneType: null,
-      showScene: false, // 场景操作
-      showFilter: false, // 控制筛选框
-      fieldList: [],
-      filterObj: { form: [] }, // 筛选确定数据
-
-      sceneData: { id: "", bydata: "", name: "" },
-      showSceneSet: false, // 展示场景设置
-      showSceneCreate: false, // 展示场景添加
-      sceneFilterObj: { form: [] }, // 筛选确定数据
-
-      /** 勾选操作数据 */
-      selectionList: [],
-      transferDialogShow: false,
-      teamsDialogShow: false, // 团队操作提示框
-      teamsTitle: "", // 团队操作标题名
-      allocDialogShow: false, // 公海分配操作提示框
-      dealStatusShow: false, // 成交状态修改框
-      crmTypes: {},
-    };
-  },
-  computed: {},
-  watch: {},
-  mounted() {},
-  methods: {
-    /** 发布 时候的类型选择 */
-    handleTypeDrop(command) {
-      this.sceneType = command;
-    },
-    /** 搜索全部 */
-    getAllClick() {
-      //清空搜索条件
-      this.filterObj = { form: [] };
-      this.$emit("filter", null);
-    },
-    /** 展示高级筛选 */
-    showFilterClick() {
-      this.getFilterFieldInfo();
-    },
-    // 获取高级筛选字段数据
-    getFilterFieldInfo() {
-      this.fieldList = data[this.crmType].data;
-      this.showFilter = true;
-    },
-    handleFilter(form) {
-      this.showFilter = false;
-      if (form === null) {
-        this.$emit("filter", null);
-      } else {
-        this.filterObj = form;
-        this.showFilter = false;
-        if (form.saveChecked) {
-          crmSceneSave({
-            type: crmTypeModel[this.crmType],
-            isDefault: form.saveDefault ? 1 : 0,
-            name: form.saveName,
-            data: JSON.stringify(form.obj),
-          })
-            .then((res) => {
-              this.updateSceneList();
-            })
-            .catch(() => {});
-        }
-        this.$emit("filter", form.obj);
-        //this.$emit('filter', form.form)
-      }
-    },
-    //清空条件
-    handleClearField() {
-      this.filterObj = data.obj;
-    },
-    // 场景操作
-    /** 选择了场景 */
-    sceneSelect(data) {
-      this.sceneData = data;
-      this.$emit("scene", data);
-    },
-    sceneHandle(data) {
-      if (data.type == "set") {
-        this.showSceneSet = true;
-      } else if (data.type == "add") {
-        filterIndexfields({
-          label: crmTypeModel[this.crmType],
-        })
-          .then((res) => {
-            this.fieldList = res.data;
-            this.showSceneCreate = true;
-          })
-          .catch(() => {});
-      }
-    },
-    /**  创建保存成功 */
-    updateSceneList() {
-      this.$refs.sceneList.getSceneList();
-    },
-    /** 勾选后的表头操作 */
-    headSelectionChange(array) {
-      this.selectionList = array;
-    },
-    /** 操作 */
-    selectionBarClick(type) {
-      var message = "";
-      if (type == "export") {
-        message = "确定要导出这些数据嘛?";
-      } else if (type == "delete") {
-        message = "确定要删除这些数据嘛?";
-      }
-      this.$confirm(message, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.confirmHandle(type);
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-
-    confirmHandle(type) {
-      if (type === "export") {
-        this.handleExport();
-      }
-    },
-    handleExport() {
-      const params = {};
-      params["ids"] = this.selectionList
-        .map((item) => {
-          return item[this.crmType + "Id"];
-        })
-        .join(",");
-      params.__export = true;
-      this.$emit("exportData", params);
-    },
-
-    deleteItemsCallBack() {
-      this.$message({
-        type: "success",
-        message: "删除成功",
-      });
-      this.$emit("handle", { type: "delete" });
-    },
-    /** 获取展示items */
-    getSelectionHandleItemsInfo() {
-      const handleInfos = {
-        export: {
-          name: "导出选中",
-          type: "export",
-          icon: require("@/assets/img/selection_export.png"),
-        },
-        delete: {
-          name: "批量删除",
-          type: "delete",
-          icon: require("@/assets/img/selection_delete.png"),
-        },
-      };
-
-      return this.forSelectionHandleItems(handleInfos, ["export", "delete"]);
-    },
-    forSelectionHandleItems(handleInfos, array) {
-      var tempsHandles = [];
-      for (let index = 0; index < array.length; index++) {
-        tempsHandles.push(handleInfos[array[index]]);
-      }
-      return tempsHandles;
-    },
-    // 判断是否展示
-    whetherTypeShowByPermision: function (type) {
-      if (type == "transfer") {
-        return this.sceneData.bydata == "transform"
-          ? false
-          : this.crm[this.crmType].transfer;
-      } else if (type == "transform") {
-        return this.sceneData.bydata == "transform"
-          ? false
-          : this.crm[this.crmType].transform;
-      } else if (type == "export") {
-        if (this.isSeas) {
-          return this.crm.pool.excelexport;
-        }
-        return this.crm[this.crmType].excelexport;
-      } else if (type == "delete") {
-        return this.crm[this.crmType].delete;
-      } else if (type == "put_seas") {
-        // 放入公海(客户)
-        return this.crm[this.crmType].putinpool;
-      } else if (type == "lock" || type == "unlock") {
-        // 锁定解锁(客户)
-        return (
-          this.crm[this.crmType].lock && this.CRMConfig.customerConfig == 1
-        );
-      } else if (type == "add_user" || type == "delete_user") {
-        // 添加 移除团队成员
-        return this.crm[this.crmType].teamsave;
-      } else if (type == "alloc") {
-        // 分配(公海)
-        return this.crm.pool.distribute;
-      } else if (type == "get") {
-        // 领取(公海)
-        return this.crm.pool.receive;
-      } else if (type == "start") {
-        // 上架 下架(产品)
-        for (let index = 0; index < this.selectionList.length; index++) {
-          const element = this.selectionList[index];
-          if (element.是否上下架 == "上架") {
-            return false;
-          }
-        }
-        return this.crm[this.crmType].status;
-      } else if (type == "disable") {
-        // 上架 下架(产品)
-        for (let index = 0; index < this.selectionList.length; index++) {
-          const element = this.selectionList[index];
-          if (element.是否上下架 == "下架") {
-            return false;
-          }
-        }
-        return this.crm[this.crmType].status;
-      } else if (type == "deal_status") {
-        // 客户状态修改
-        return this.crm[this.crmType].dealStatus;
-      }
-      return true;
-    },
-    // 子组件 回调的 结果
-    handleCallBack(data) {
-      this.$emit("handle", { type: data.type });
-    },
-    // 获取默认场景名字
-    getDefaultSceneName() {
-      //add-场景
-      this.crmTypes = crmtypes;
-      let type = this.crmTypes[this.crmType];
-      if (type === undefined) {
-        return "全部" + this.crmType;
-      } else {
-        return "全部" + type.name;
-      }
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-@import "../../../styles/xr-theme";
-.th-container {
-  font-size: 13px;
-  height: 50px;
-  padding: 0 20px;
-}
-/** 场景和筛选 */
-.condition_title {
-  cursor: pointer;
-}
-.condition_title:hover {
-  color: $xr-color-primary;
-}
-
-.m-arrow {
-  margin: 0 8px;
-}
-.c-filtrate {
-  margin: 0 10px 0 30px;
-  width: 12px;
-}
-
-/** 勾选操作 */
-.selection-bar {
-  font-size: 12px;
-  height: 50px;
-  padding: 0 20px;
-  color: #777;
-
-  .selected—title {
-    flex-shrink: 0;
-    padding-right: 20px;
-    border-right: 1px solid $--table-border-color;
-    .selected—count {
-      color: $xr-color-primary;
-    }
-  }
-}
-
-.selection-items-box {
-  overflow-x: auto;
-  overflow-y: hidden;
-  .selection-item {
-    width: auto;
-    padding: 15px;
-    flex-shrink: 0;
-    .selection-item-icon {
-      display: block;
-      margin-right: 5px;
-      width: 15px;
-      height: 15px;
-    }
-    .selection-item-name {
-      cursor: pointer;
-      color: #777;
-    }
-    .selection-item-name:hover {
-      color: $xr-color-primary;
-    }
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/MixAdd.vue b/code/WebApp/vue/src/views/pg-fis/components/MixAdd.vue
deleted file mode 100644
index 6083d3c4..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/MixAdd.vue
+++ /dev/null
@@ -1,601 +0,0 @@
-<template>
-  <div class="mix-container">
-    <div class="i-cont">
-      <el-input
-        ref="textarea"
-        v-model="content"
-        :autosize="inputAutosize"
-        type="textarea"
-        clearable
-        resize="none"
-        placeholder="请输入内容"
-        @focus="inputFocus"/>
-    </div>
-    <section
-      v-if="imgFiles.length > 0"
-      class="img-cont">
-      <flexbox wrap="wrap">
-        <div
-          v-for="(item, index) in imgFiles"
-          :key="index"
-          :style="{ 'background-image': 'url('+item.url+')' }"
-          class="img-item"
-          @mouseover="mouseImgOver(item, index)"
-          @mouseleave="mouseImgLeave(item, index)">
-          <div
-            v-if="item.showDelete"
-            class="img-delete"
-            @click="deleteImgOrFile('image', item, index)">×</div>
-        </div>
-        <div class="img-item-add">
-          <input
-            type="file"
-            class="img-item-iput"
-            accept="image/*"
-            multiple
-            @change="uploadFile">
-        </div>
-      </flexbox>
-      <div
-        class="img-bar"
-        @click="deleteAllImg">全部删除</div>
-    </section>
-    <section
-      v-if="files.length > 0"
-      class="file-cont">
-      <flexbox class="f-header">
-        <img
-          class="f-logo"
-          src="@/assets/img/send_file.png">
-        <div class="f-name">附件</div>
-      </flexbox>
-      <div class="f-body">
-        <flexbox
-          v-for="(item, index) in files"
-          :key="index"
-          class="f-item">
-          <img
-            :src="item.icon"
-            class="f-img">
-          <div class="f-name">{{ item.name+'('+item.size+')' }}</div>
-          <div
-            class="close-button"
-            @click="deleteImgOrFile('file', item, index)">×</div>
-        </flexbox>
-      </div>
-      <div
-        class="img-bar"
-        @click="files=[]">全部删除</div>
-    </section>
-    <section
-      v-if="business.length > 0"
-      class="c-cont">
-      <flexbox class="c-header">
-        <img
-          class="c-logo"
-          src="@/assets/img/send_business.png">
-        <div class="c-name">商机</div>
-      </flexbox>
-      <div class="c-body">
-        <flexbox wrap="wrap">
-          <flexbox
-            v-for="(item, index) in business"
-            :key="index"
-            class="c-item">
-            <div class="c-item-name">{{ item.businessName }}</div>
-            <div
-              class="c-item-close"
-              @click="business.splice(index, 1)">×</div>
-          </flexbox>
-        </flexbox>
-      </div>
-    </section>
-    <section
-      v-if="contacts.length > 0"
-      class="c-cont">
-      <flexbox class="c-header">
-        <img
-          class="c-logo"
-          src="@/assets/img/send_contacts.png">
-        <div class="c-name">联系人</div>
-      </flexbox>
-      <div class="c-body">
-        <flexbox wrap="wrap">
-          <flexbox
-            v-for="(item, index) in contacts"
-            :key="index"
-            class="c-item">
-            <div class="c-item-name">{{ item.name }}</div>
-            <div
-              class="c-item-close"
-              @click="contacts.splice(index, 1)">×</div>
-          </flexbox>
-        </flexbox>
-      </div>
-    </section>
-    <flexbox class="bar-cont">
-      <template v-for="(item, index) in barItems">
-        <flexbox
-          v-if="item.type=='img'||item.type=='file'"
-          :key="index"
-          class="bar-item"
-          @click.native="barClick(item)">
-          <input
-            :accept="item.data"
-            type="file"
-            class="bar-input"
-            multiple
-            @change="uploadFile">
-          <img
-            :src="item.img"
-            class="bar-img">
-          <div class="bar-title">{{ item.title }}</div>
-        </flexbox>
-        <el-popover
-          v-else
-          :key="index"
-          v-model="item.show"
-          placement="bottom"
-          width="700"
-          popper-class="no-padding-popover"
-          trigger="click">
-<!--          <crm-relative-->
-<!--            ref="crmrelative"-->
-<!--            :show="item.show"-->
-<!--            :radio="false"-->
-<!--            :action="{ type: 'condition', data: { moduleType: crmType, customerId: id } }"-->
-<!--            :selected-data="item.type == 'business' ? { 'business': business } : { 'contacts': contacts }"-->
-<!--            :crm-type="item.type"-->
-<!--            @close="item.show=false"-->
-<!--            @changeCheckout="checkRelativeInfos"/>-->
-          <flexbox
-            slot="reference"
-            class="bar-item"
-            @click.native="barClick(item)">
-            <img
-              :src="item.img"
-              class="bar-img">
-            <div class="bar-title">{{ item.title }}</div>
-          </flexbox>
-        </el-popover>
-      </template>
-    </flexbox>
-  </div>
-</template>
-
-<script>
-// import { fileSize, getFileTypeIcon } from '@/utils/index'
-// import { crmFileSave, crmFileDelete } from '@/api/common'
-// import CrmRelative from '@/components/CreateCom/CrmRelative'
-
-export default {
-  /** 跟进记录 下的 添加 有添加框的都需要*/
-  name: 'MixAdd',
-  components: {
-    // CrmRelative
-  },
-  props: {
-    /** 展示相关商机关联 */
-    showRelativeBusiness: {
-      type: Boolean,
-      default: false
-    },
-    /** 展示相关商机关联 */
-    showRelativeContacts: {
-      type: Boolean,
-      default: false
-    },
-    /** 模块ID */
-    id: [String, Number],
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      /** 输入法 */
-      content: '',
-      inputAutosize: { minRows: 1, maxRows: 6 }, // 默认1 聚焦是 变成3
-      /** 快捷添加 */
-      barItems: [
-        {
-          img: require('@/assets/img/send_img.png'),
-          title: '图片',
-          type: 'img',
-          data: 'image/*'
-        },
-        {
-          img: require('@/assets/img/send_file.png'),
-          title: '附件',
-          type: 'file',
-          data: '*.*'
-        }
-      ],
-      /** 图片信息 */
-      imgFiles: [],
-      /** 图片信息 */
-      files: [],
-      /** 关联商机信息 */
-      business: [],
-      /** 关联联系人信息 */
-      contacts: [],
-      /** 展示关联弹窗 */
-      showRelativeType: '',
-      batchId: '' // 批次ID
-    }
-  },
-  computed: {},
-  mounted() {
-    /** 控制展示关联商机 和 联系人 */
-    if (this.showRelativeBusiness) {
-      this.barItems.push({
-        img: require('@/assets/img/send_business.png'),
-        title: '关联商机',
-        type: 'business',
-        show: false
-      })
-    }
-
-    if (this.showRelativeContacts) {
-      this.barItems.push({
-        img: require('@/assets/img/send_contacts.png'),
-        title: '关联联系人',
-        type: 'contacts',
-        show: false
-      })
-    }
-    /** 父组件通知子组件提交数据 */
-    /** 将拼接好的数据回调父组件 this.$refs.child.$emit('submit-info');  调用*/
-    this.$on('submit-info', function() {
-      this.$emit('mixadd-info', {
-        content: this.content,
-        files: this.files,
-        images: this.imgFiles,
-        business: this.business,
-        contacts: this.contacts,
-        batchId: this.batchId
-      })
-    })
-  },
-
-  beforeDestroy() {
-    this.$off('submit-info')
-  },
-  methods: {
-    resetInfo() {
-      /** 输入法 */
-      this.content = ''
-      /** 图片信息 */
-      this.imgFiles = []
-      /** 图片信息 */
-      this.files = []
-      /** 关联商机信息 */
-      this.business = []
-      /** 关联联系人信息 */
-      this.contacts = []
-      /** 展示关联弹窗 */
-      this.showRelativeType = ''
-      this.batchId = ''
-    },
-    /** 快捷添加按钮 */
-    checkRelativeInfos(data) {
-      if (this.showRelativeType == 'business') {
-        this.business = data.data
-      } else if (this.showRelativeType == 'contacts') {
-        this.contacts = data.data
-      }
-    },
-    barClick(item) {
-      this.showRelativeType = item.type
-      if (item.type == 'business') {
-        item.show = true
-      } else if (item.type == 'contacts') {
-        item.show = true
-      }
-    },
-    /** 图片选择出发 */
-    uploadFile(event) {
-      var files = event.target.files
-      if (files.length) {
-        for (let index = 0; index < files.length; index++) {
-          const file = files[index]
-          if (
-            file.type.indexOf('image') == -1 &&
-            this.showRelativeType == 'img'
-          ) {
-            this.$message.error('请上传正确的文件类型')
-            return
-          }
-        }
-
-        var type = event.target.accept == 'image/*' ? 'img' : 'file'
-        var firstFile = files[0]
-        this.sendFileRequest(firstFile, type, () => {
-          for (let index = 1; index < files.length; index++) {
-            const file = files[index]
-            this.sendFileRequest(file, type)
-          }
-          event.target.value = ''
-        })
-      }
-    },
-    // 发送请求
-    sendFileRequest(file, type, result) {
-      var params = { file: file, type: type }
-      if (this.batchId) {
-        params.batchId = this.batchId
-      }
-      crmFileSave(params)
-        .then(res => {
-          if (this.batchId == '') {
-            this.batchId = res.batchId
-          }
-          res.size = fileSize(file.size)
-          if (type == 'img') {
-            this.imgFiles.push(res)
-          } else {
-            res['icon'] = getFileTypeIcon(file)
-            this.files.push(res)
-          }
-          if (result) {
-            result()
-          }
-        })
-        .catch(() => {})
-    },
-    /** 删除全部图片 */
-    deleteAllImg() {
-      this.imgFiles = []
-    },
-    deleteImgOrFile(type, item, index) {
-      crmFileDelete({
-        id: item.fileId
-      })
-        .then(res => {
-          if (type == 'image') {
-            this.imgFiles.splice(index, 1)
-          } else {
-            this.files.splice(index, 1)
-          }
-          this.$message.success('操作成功')
-        })
-        .catch(() => {})
-    },
-    /** 鼠标移入和移除 图片区域 */
-    mouseImgOver(item, index) {
-      item.showDelete = true
-      this.$set(this.imgFiles, index, item)
-    },
-    mouseImgLeave(item, index) {
-      item.showDelete = false
-      this.$set(this.imgFiles, index, item)
-    },
-    inputFocus() {
-      this.inputAutosize = { minRows: 3, maxRows: 6 }
-      this.$nextTick(() => {
-        this.$refs.textarea.resizeTextarea()
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.mix-container {
-  position: relative;
-  border: 1px solid #e6e6e6;
-  border-radius: 3px;
-  .i-cont {
-    padding: 8px 10px;
-  }
-}
-
-.i-cont /deep/ .el-textarea__inner {
-  border: none;
-  padding: 0;
-}
-/** 图片  */
-.img-cont {
-  padding: 0 10px;
-  margin-bottom: 15px;
-  .img-item {
-    width: 98px;
-    height: 98px;
-    border: 1px solid #ccc;
-    display: inline-block;
-    margin: 0 4px 4px 0;
-    background-size: contain;
-    background-repeat: no-repeat;
-    background-position: center;
-    position: relative;
-    .img-delete {
-      position: absolute;
-      cursor: pointer;
-      top: 0;
-      right: 0;
-      width: 20px;
-      height: 20px;
-      line-height: 20px;
-      text-align: center;
-      font-size: 17px;
-      background-color: #666;
-      color: white;
-    }
-  }
-  .img-item-add {
-    width: 98px;
-    height: 98px;
-    line-height: 98px;
-    font-size: 60px;
-    color: #ccc;
-    text-align: center;
-    margin: 0 4px 4px 0;
-    cursor: pointer;
-    display: inline-block;
-    border-width: 1px;
-    border-style: dashed;
-    border-color: #ddd;
-    position: relative;
-    font-weight: 100;
-    .img-item-iput {
-      position: absolute;
-      top: 0;
-      right: 0;
-      height: 98px;
-      width: 98px;
-      opacity: 0;
-      cursor: pointer;
-    }
-  }
-  .img-item-add:before {
-    width: 2px;
-    height: 39.5px;
-    content: ' ';
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    background-color: #2888e4;
-  }
-  .img-item-add:after {
-    width: 39.5px;
-    height: 2px;
-    content: ' ';
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    background-color: #2888e4;
-  }
-  .img-bar {
-    color: #5a8ae2;
-    font-size: 12px;
-    padding: 5px 0;
-    cursor: pointer;
-  }
-}
-/** 附件  */
-.file-cont {
-  padding: 0 10px;
-  margin: 0 10px 15px;
-  border: 1px dashed #dfdfdf;
-  .f-header {
-    padding: 8px 0 15px;
-    .f-logo {
-      position: block;
-      width: 15px;
-      height: 15px;
-      margin-right: 8px;
-    }
-    .f-name {
-      color: #777;
-      font-size: 12px;
-    }
-  }
-
-  .f-body {
-    .f-item {
-      padding: 3px 0;
-      height: 25px;
-      .f-img {
-        position: block;
-        width: 15px;
-        height: 15px;
-        margin-right: 8px;
-      }
-      .f-name {
-        color: #666;
-        font-size: 12px;
-      }
-    }
-  }
-
-  .img-bar {
-    color: #5a8ae2;
-    font-size: 12px;
-    padding: 5px 0;
-  }
-}
-/** CRM  */
-.c-cont {
-  padding: 0 10px;
-  margin: 0 10px 15px;
-  border: 1px dashed #dfdfdf;
-  .c-header {
-    padding: 8px 0 15px;
-    .c-logo {
-      position: block;
-      width: 15px;
-      height: 15px;
-      margin-right: 8px;
-    }
-    .c-name {
-      color: #777;
-      font-size: 12px;
-    }
-  }
-
-  .c-body {
-    margin-bottom: 10px;
-    .c-item {
-      height: 24px;
-      border-radius: 12px;
-      padding: 0 8px;
-      margin: 0 5px 5px 0;
-      background-color: #3487e2;
-      color: white;
-      width: auto;
-      .c-item-name {
-        font-size: 12px;
-      }
-      .c-item-close {
-        padding-left: 5px;
-        font-size: 17px;
-      }
-    }
-  }
-}
-/** 底部bar  */
-.bar-cont {
-  background-color: #f9f9f9;
-  padding: 8px 15px;
-  .bar-item {
-    width: auto;
-    padding-right: 20px;
-    position: relative;
-    cursor: pointer;
-    .bar-input {
-      position: absolute;
-      top: 0;
-      right: 0;
-      height: 15px;
-      width: 68px;
-      opacity: 0;
-      font-size: 0;
-      cursor: pointer;
-    }
-    .bar-img {
-      display: block;
-      width: 15px;
-      height: 15px;
-      margin-right: 8px;
-    }
-    .bar-title {
-      color: #777;
-      font-size: 12px;
-    }
-  }
-}
-/** 关闭按钮  */
-.close-button {
-  width: 30px;
-  line-height: 16px;
-  cursor: pointer;
-  color: #ccc;
-  height: 16px;
-  font-size: 17px;
-  text-align: center;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/RelativeFiles.vue b/code/WebApp/vue/src/views/pg-fis/components/RelativeFiles.vue
deleted file mode 100644
index be963624..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/RelativeFiles.vue
+++ /dev/null
@@ -1,1228 +0,0 @@
-<template>
-  <div class="f-container">
-    <flexbox
-      direction="column"
-      align="stretch"
-      class="d-container">
-       <div class="crm-create-flex">
-      <!--表单渲染-->
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        width="580px"
-        append-to-body>
-        <div class="crm-create-body" v-if="stepsActive == 1">
-          <el-form
-            ref="form"
-            :inline="true"
-            size="small"
-            label-width="80px">
-            <el-row>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="上传附件" />
-              </el-col>
-              <el-col :md="20" :xs="24">
-                <el-form-item>
-                  <el-upload
-                    ref="upload"
-                    class="avatar-uploader"
-                    drag
-                    action="#"
-                    :http-request="httpRequestfiles"
-                    :on-change="handleChangefiles"
-                    :headers="httpHeader"
-                    :file-list="fileuploadList"
-                    :before-upload="beforeAvatarUpload"
-                    :before-remove="beforeRemove"
-                    :on-remove="handleRemove"
-                     multiple
-                    :limit="5"
-                    :on-exceed="handleExceedfiles" >
-                    <i class="el-icon-upload" ></i>
-                    <div class="el-upload__text">
-                      将文件拖到此处，或
-                      <em>点击上传</em>
-                    </div>
-                  </el-upload>
-                </el-form-item>
-                <el-form-item>
-                   <div style="margin: 10px;margin-top: 1px;" >
-                  <span style="color: #ccc;font-size:13px;">说明：单个附件大小不能超过2M，单次最多一起上传5个，请上传后缀名为jpg、png、gif、jpeg、txt、pdf、doc、docx、xlsx、zip或rar的附件！!</span>
-                </div>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-        <div
-        v-loading="formLoading"
-        v-else-if="stepsActive == 2"
-        element-loading-text="数据上传中,请耐心等待..."
-        element-loading-spinner="el-icon-loading"
-        class="step-section"
-      />
-        <div slot="footer" class="dialog-footer">
-          <el-button
-          v-if="stepsActive == 1"
-          type="text"
-          @click="dialogFormVisible = false">取消</el-button>
-           <!-- <el-button  type="primary" @click="LoadSave">确认</el-button> -->
-           <el-button
-            v-if="sureTitle"
-            type="primary"
-            @click="sureClick">{{ sureTitle }}</el-button>
-
-        </div>
-      </el-dialog>
-    </div>
-
-      <div class="tabs">
-              <el-row >
-                <div style="margin: 10px;margin-top: 1px;" >
-                  <el-button
-                    class="filter-item"
-                    size="mini"
-                    type="primary"
-                    icon="el-icon-plus"
-                    @click="handleCreate()"
-                  >上传附件</el-button>
-                </div>
-              </el-row>
-                 <el-row >
-                <div style="margin: 10px;margin-top: 1px;" >
-                  <span style="color: #ccc;font-size:13px;">说明：单个附件大小不能超过2M,单次最多一起上传5个，请上传后缀名为jpg、png、gif、jpeg、txt、pdf、doc、docx、xlsx、zip或rar的附件!</span>
-                </div>
-              </el-row>
-              <el-row >
-              <el-card  shadow="always" >
-              <!-- <div style="margin-top: -25px;" >  -->
-                <div  v-loading="listLoading"
-                  element-loading-text="数据加载中,请耐心等待..."
-                  element-loading-spinner="el-icon-loading"
-                  class="step-section">
-                <flexbox
-                  :gutter="0"
-                  wrap="wrap"
-                  style="padding: 10px 8px 0;">
-                  <flexbox-item
-                    v-for="(item, index) in fileList"
-                    :span="0.5"
-                    :key="index"
-                    class="b-cell">
-                   <flexbox
-                      v-if="item.fileType === 'png'"
-                      align="stretch"
-                      class="b-cell-b">
-                      <div class="b-cell-name">PNG文件</div>
-                      <div class="b-cell-value">
-                        <flexbox  class="f-item">
-                          <img
-                            class="f-img"
-                            src="@/assets/img/relevance_file.png" >
-                           <div class="f-name">{{  item | getfilesize1 }}<span style="color: #ccc;">{{ item | getfilesize2}}</span></div>
-                           <img
-                                 src="@/assets/img/chakan.png"
-                                @click="handleFile('preview', item, index)" />
-                          <img
-                                 src="@/assets/img/xiazai.png"
-                                @click="handleImgFile(item, index)" />
-                          <img
-                                src="@/assets/img/shanchu.png"
-                                @click="handleFile('delete', item, index)" />
-                        </flexbox>
-                      </div>
-                    </flexbox>
-                    <flexbox
-                      v-else-if="item.fileType === 'jpg'"
-                      align="stretch"
-                      class="b-cell-b">
-                      <div class="b-cell-name">JPG文件</div>
-                      <div class="b-cell-value">
-                        <flexbox  class="f-item">
-                          <img
-                            class="f-img"
-                            src="@/assets/img/relevance_file.png" >
-                          <div class="f-name">{{  item | getfilesize1 }}<span style="color: #ccc;">{{ item | getfilesize2}}</span></div>
-                          <img
-                                 src="@/assets/img/chakan.png"
-                                @click="handleFile('preview', item, index)" />
-                          <img
-                                 src="@/assets/img/xiazai.png"
-                                @click="handleImgFile(item, index)" />
-                          <img
-                                src="@/assets/img/shanchu.png"
-                                @click="handleFile('delete', item, index)" />
-                        </flexbox>
-                      </div>
-                    </flexbox>
-                     <flexbox
-                      v-else-if="item.fileType === 'gif'"
-                      align="stretch"
-                      class="b-cell-b">
-                      <div class="b-cell-name">GIF文件</div>
-                      <div class="b-cell-value">
-                        <flexbox  class="f-item">
-                          <img
-                            class="f-img"
-                            src="@/assets/img/relevance_file.png" >
-                          <div class="f-name">{{  item | getfilesize1 }}<span style="color: #ccc;">{{ item | getfilesize2}}</span></div>
-                          <img
-                                 src="@/assets/img/chakan.png"
-                                @click="handleFile('preview', item, index)" />
-                          <img
-                                 src="@/assets/img/xiazai.png"
-                                @click="handleImgFile(item, index)" />
-                          <img
-                                src="@/assets/img/shanchu.png"
-                                @click="handleFile('delete', item, index)" />
-                        </flexbox>
-                      </div>
-                    </flexbox>
-                     <flexbox
-                      v-else-if="item.fileType === 'jpeg'"
-                      align="stretch"
-                      class="b-cell-b">
-                      <div class="b-cell-name">JPEG文件</div>
-                      <div class="b-cell-value">
-                        <flexbox  class="f-item">
-                          <img
-                            class="f-img"
-                            src="@/assets/img/relevance_file.png" >
-                          <div class="f-name">{{  item | getfilesize1 }}<span style="color: #ccc;">{{ item | getfilesize2}}</span></div>
-                          <img
-                                 src="@/assets/img/chakan.png"
-                                @click="handleFile('preview', item, index)" />
-                          <img
-                                 src="@/assets/img/xiazai.png"
-                                @click="handleImgFile(item, index)" />
-                          <img
-                                src="@/assets/img/shanchu.png"
-                                @click="handleFile('delete', item, index)" />
-                        </flexbox>
-                      </div>
-                    </flexbox>
-                    <flexbox
-                      v-else
-                      align="stretch"
-                      class="b-cell-b">
-                      <div class="b-cell-name">{{item.fileType}}文件</div>
-                      <div class="b-cell-value">
-                        <flexbox  class="f-item">
-                          <img
-                            class="f-img"
-                            src="@/assets/img/relevance_file.png" >
-                          <div class="f-name">{{  item | getfilesize1 }}<span style="color: #ccc;">{{ item | getfilesize2}}</span></div>
-                        <img
-                                 src="@/assets/img/xiazai.png"
-                                @click="handleFile('download',item, index)" />
-                          <img
-                                src="@/assets/img/shanchu.png"
-                                @click="handleFile('delete', item, index)" />
-                        </flexbox>
-                      </div>
-                    </flexbox>
-                  </flexbox-item>
-                </flexbox>
-
-                 <pagination
-                     v-show="totalFileCount>0"
-                     :total="totalFileCount"
-                     :page.sync="pageFiles"
-                     :limit.sync="listQuery.MaxResultCount"
-                      style="margin-top: -25px;margin-bottom:-18px;float:right;"
-                      @pagination="getFileList"
-                   />
-
-                    </div>
-                    </el-card>
-                </el-row>
-      </div>
-    </flexbox>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import {downloadImage, downloadFile, fileSize,downloadFileHttpRequest,getFileTypeIcon} from '@/utils/crmindex.js'
-import { getToken } from '@/utils/auth' // get token from cookie
-
-
-export default {
-  name: "project",
-  components: { Pagination},
-  directives: { permission },
-  props: {
-    /** 模块ID：客户模块、项目模块、合同模块 */
-    modid: [String, Number]
-  },
-  filters: {
-    getfilesize1(file) {
-      const name = file.fileName && file.fileName.length > 5 ? (file.fileName.substring(0, 5) + '...') : file.fileName
-      return name
-    },
-    getfilesize2(file) {
-      return '(' + fileSize(file.fileLength) + ')'
-    }
-  },
-  data() {
-    return {
-      elementLoadingText: "正在加载...",
-      value:"0",
-      newsList: [],
-      paginationLog: {
-        total: 0,
-        page: 1,
-        pageSize: 10,
-      },
-      form: {},
-      list: null,
-      fileList:[],
-      fileuploadList:[],
-      fileFormData: null, // 将要上传的formdata数据
-      customerList:[],
-      totalCount: 0,
-      dialogFormVisible: false,
-      totalFileCount: 0,
-      listLoading: false,
-      formLoading: false,
-      propsCustomerId:"",
-      listQuery: {
-        CustomerId: "",
-        Sorting: "",
-        SkipCount: 0,
-        MaxResultCount: 10
-      },
-      page: 1,
-      pageFiles: 1,
-      pageImg: 1,
-      multipleSelection: [],
-      customerInfo:{
-        customerID:"",
-        code:"",
-        name:"",
-        fullname:"",
-        remark:""
-      },
-      isLt2M:"",
-      isFileType:"",
-      stepsActive: 1,
-      tableHeight: document.documentElement.clientHeight -350
-    };
-  },
-  watch: {
-       modid: {
-          handler(newVal) {
-          if(newVal=="" || newVal=="undefined")
-          {
-            this.fileList =[];
-          }
-          else{
-            this.getFileList()
-          }
-      },
-      immediate: true
-    }
-  },
-
-  mounted() {
-     var self = this
-    /** 控制table的高度 */
-    window.onresize = function() {
-      var offsetHei = document.documentElement.clientHeight
-      self.tableHeight = offsetHei - 350
-    }
-   },
-  computed: {
-     sureTitle() {
-      return {
-        1: '立即上传',
-        2: '上传中...'
-      }[this.stepsActive]
-    },
-     httpHeader() {//文件上传时，带token认证信息，提高安全性
-      return {
-        'Authorization':'Bearer ' + getToken()
-      }
-    }
-  },
-  created() {
-     this.fileuploadList=[];
-     this.fileFormData = new FormData();
-
-  },
-  methods: {
-    handleCreate() {
-      this.stepsActive = 1;
-      this.fileuploadList=[];
-      this.dialogFormVisible = true;
-      this.$refs.upload.clearFiles();
-    },
-    getFileList() {//附件列表
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.pageFiles - 1) * 10;
-      this.listQuery.CustomerId=this.modid;
-      this.$axios.gets("/api/abpvnext_master/uploadfile/allofcustomers", this.listQuery).then(response => {
-        this.fileList =[];
-        this.fileList = response.items;
-        this.totalFileCount = response.totalCount;
-        this.listLoading = false;
-        // setTimeout(() => {
-        //     //大数据量加载时
-        //     this.listLoading = false;
-        //   }, 1000);
-      });
-    },
-    httpRequestfiles(data) {
-     // this.fileuploadList=[]
-      let _this = this;
-      let rd = new FileReader(); // 创建文件读取对象
-      let file = data.file;
-      this.fileuploadList.push(file);
-      //this.fileFormData.append("files", file);
-      rd.readAsDataURL(file); // 文件读取装换为base64类型
-    },
-     handleChangefiles(file, fileList) {//上传时解发
-    //   this.fileuploadList=[]
-    //   this.fileuploadList = fileList;
-    },
-    // 上传之前的格式设置
-    beforeAvatarUpload(file) {
-      var FileExt = file.name.replace(/.+\./, "");
-        if (['jpg','png','png','jpeg','txt','zip', 'rar','pdf','docx','doc','xlsx','xls'].indexOf(FileExt.toLowerCase()) === -1){
-            this.$message({
-                type: 'warning',
-                message: '请上传后缀名为jpg、png、gif、jpeg、txt、pdf、doc、docx、xlsx、xls、zip或rar的附件！'
-            });
-            this.isFileType="0"
-            return false;
-        }
-        else{
-            this.isFileType="1"
-        }
-      this.isLt2M = file.size / 1024 / 1024 < 2?'1':'0';
-      if (this.isLt2M==="0") {
-        this.$message.error("上传文件大小不能超过 2MB!");
-      }
-      return this.isLt2M==='1'?true: false;
-    },
-    beforeRemove(file, fileList) {
-        if (this.isLt2M==="1" && this.isFileType==="1") {
-         return this.$confirm(`确定移除 ${ file.name }？`);
-        }
-      },
-    handleRemove(file, fileList) {//附件列表删除操作
-      const index=this.fileuploadList.indexOf(file.originFileObj)
-      const newFileList=this.fileuploadList.slice()
-      newFileList.splice(index,1)
-      this.fileuploadList = newFileList;
-    },
-    handleExceedfiles(files, fileList) {
-      this.$message.warning(
-        `当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
-          files.length + fileList.length
-        } 个文件`
-      );
-    },
-    showCancel() {
-      return this.stepsActive != 2
-    },
-    sureClick(){
-        if (this.fileuploadList===[] || JSON.stringify(this.fileuploadList) === "[]") {
-           this.$message.error("请选择上传文件");
-        return false;
-      }
-      if (this.stepsActive == 1) {
-        this.stepsActive = 2;
-        this.formLoading = true;
-        setTimeout(() => {
-             this.save();
-        }, 2000)
-      }
-    },
-     save() {
-      //this.formLoading = true;
-      //--上传附件，批量或拖拽
-      if (JSON.stringify(this.fileuploadList) != "[]") {
-          let fd = new FormData();
-        //   var outfd = this.fileFormData.getAll("files");
-        //   alert("outfd"+outfd)
-        //   for (let i = 0; i < outfd.length; i++) {
-        //     fd.append("files", outfd[i]); // 添加文件
-        //   }
-        const{fileuploadList}=this;
-        fileuploadList.forEach(file=>{
-            fd.append("files", file); // 添加文件
-        })
-          fd.append("customerId",this.modid);//模块ID
-          this.$axios
-            .posts(
-              "/api/abpvnext_master/getblobfile/UploadFilesPost",
-                fd
-              )
-            .then((response) => {
-             this.formLoading = false;
-              this.getFileList();
-              if (this.isLt2M==="1" && this.isFileType==="1") {
-                    this.$notify({
-                    title: "成功",
-                    message: "附件上传成功！",
-                    type: "success",
-                    duration: 2000,
-                });
-              }
-
-            })
-            .catch(() => {this.formLoading = false;});
-          } else {
-            this.formLoading = false;
-            this.$message({
-                message: "未上传任何附件，请查检！",
-                type: "warning",
-              });
-            }
-            //-end-上传附件完成
-
-          this.dialogFormVisible = false;
-    },
-    /**
-     * 附件查看
-     */
-    handleFile(type, item, index) {
-      if (type === 'preview') {
-          var down_fileName=item.fileName+"."+item.fileType;//下载时附件名
-          var previewList =[]
-          previewList.push({
-              url: item.fileUrl,
-              id:item.id,
-              fileType:item.fileType,
-              name:down_fileName
-            })
-          this.$bus.emit('preview-image-bus', {
-            index: 0,
-            data: previewList
-          })
-      } else if (type === 'download') {
-          var param_fileName=item.id+"."+item.fileType;//传入的参数（后端接口接收）
-          var down_fileName=item.fileName+"."+item.fileType || '文件';//下载时附件名
-          this.$axios
-            .BolbGets("/api/abpvnext_master/getblobfile/download/" + param_fileName)
-            .then((response) => {
-                //方法一(插件下载)
-                downloadFile(response,down_fileName);
-                //方法二（a标签下载）
-                //  var blob = new Blob([response], {
-                //    type: 'application/octet-stream'
-                // })
-                // if (window.navigator.msSaveBlob) {  // IE 10+以及IE内核的浏览器
-                //   try {
-                //     window.navigator.msSaveOrOpenBlob(blob,down_fileName );
-                //   } catch (e) {
-                //     console.log(e)
-                //   }
-                // } else {//chrome/firefox浏览器
-                //   //alert("chrome/firefox浏览器")
-                //   let url = window.URL.createObjectURL(blob)
-                //   let link = document.createElement('a')
-                //   link.style.display = 'none'
-                //   link.href = url
-                //   link.setAttribute('download', down_fileName)// 文件名
-                //   document.body.appendChild(link)
-                //   link.click()
-                //   document.body.removeChild(link) // 下载完成移除元素
-                //   window.URL.revokeObjectURL(url) // 释放掉blob对象
-                // }
-          });
-      }
-      else if(type === 'delete'){
-        var params = [];
-        let myalert=""//声明变量，其变量必须在此声明后使用
-        params.push(item.id);
-        myalert=item.fileName
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          this.$axios.posts("/api/abpvnext_master/uploadfile/DeleteFile",params).then(response => {
-            this.$notify({
-              title: "成功",
-              message: "删除成功",
-              type: "success",
-              duration: 2000
-            });
-            this.getFileList();
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除"
-          });
-        });
-      }
-    },
-    // 下载图片
-    handleImgFile(item,index) {
-        var param_fileName=item.id+"."+item.fileType;//传入的参数（后端接口接收）
-        var down_fileName=item.fileName+"."+item.fileType;//下载时附件名
-        this.$axios
-            .BolbGets("/api/abpvnext_master/getblobfile/downloadImg/" + param_fileName)
-            .then((response) => {
-                downloadFile(response,down_fileName);
-        });
-    },
-    getStatusStyle(status) {
-      if (status == 0) {
-        return {
-          'border-color': '#E6A23C',
-          'background-color': '#FDF6EC',
-          'color': '#E6A23C'
-        }
-      } else if (status == 1) {
-        return {
-          'border-color': '#409EFF',
-          'background-color': '#ECF5FF',
-          'color': '#409EFF'
-        }
-      } else if (status == 3) {
-        return {
-          'border-color': '#67C23A',
-          'background-color': '#F0F9EB',
-          'color': '#67C23A'
-        }
-      } else if (status == 2) {
-        return {
-          'border-color': '#F56C6B',
-          'background-color': '#FEF0F0',
-          'color': '#F56C6B'
-        }
-      } else if (status == 4) {
-        return {
-          'background-color': '#E4E7ED'
-        }
-      }
-    },
-    getHTStatusStyle(status) {
-      if (status == 0) {//新增
-        return {
-          'border-color': '#E6A23C',
-          'background-color': '#FDF6EC',
-          'color': '#E6A23C'
-        }
-      }else if (status == 1 || status == 2) {//审核中
-         return {
-          'border-color': '#409EFF',
-          'background-color': '#ECF5FF',
-          'color': '#409EFF'
-
-        }
-      }else if (status == 3 || status == 6) {//已签定和完成
-        return {
-          'border-color': '#67C23A',
-          'background-color': '#F0F9EB',
-          'color': '#67C23A'
-        }
-      } else if (status == 4) {
-        return {
-          'border-color': '#E9E9EB',
-          'background-color': '#F4F4F5',
-          'color': '#909399'
-        }
-       } else if (status == 5) {//执行
-        return {
-          'border-color': '#F56C6B',
-          'background-color': '#FEF0F0',
-          'color': '#F56C6B'
-        }
-      } else if (status == 7) {//中止
-        return {
-          'border-color': '#E9E9EB',
-          'background-color': '#F4F4F5',
-          'color': '#909399'
-        }
-
-      }
-    },
-    handleFilter() {
-      this.page = 1;
-      this.pageFiles=1;
-      this.pageImg=1;
-      this.getFileList();
-    },
-    resetQuery() {},
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    handleCollapseChange(val) {
-
-    },
-    handleLogChange(val) {
-      this.value = val;
-      this.paginationLog.total = 0;
-      this.paginationLog.page = 1;
-      this.paginationLog.pageSize = 2;
-      //this.fetchData();
-    },
-    handleSizeChange(val) {
-      this.paginationLog.pageSize = val;
-      this.fetchData();
-    },
-    handleCurrentChange(val) {
-      this.paginationLog.page = val;
-      this.fetchData();
-    }
-  }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.is-hidden {
-  visibility: hidden;
-}
-.opts {
-  padding: 6px 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-.el-timeline {
-      margin-top: 20px;
-
-      &-item {
-        padding-bottom: 1px;
-      }
-  }
-.el-drawer{
-    overflow: scroll
-    }
-.box{
-  height: 100%;//如高度等于网页高度
-  overflow: auto;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-around;
- }
-
- .goods-list-container {
-  .goods-list-card-body {
-    position: relative;
-    text-align: center;
-    vertical-align:middle;
-    cursor: pointer;
-
-    .goods-list-tag-group {
-      position: absolute;
-      top: 10px;
-      right: 5px;
-      z-index: 9;
-    }
-
-    .goods-list-image-group {
-      height: 80px;
-      overflow: hidden;
-
-      .goods-list-image {
-        width: 80px;
-        height: 80px;
-        transition: all ease-in-out 0.3s;
-
-        &:hover {
-          transform: scale(1.1);
-        }
-      }
-    }
-
-    .goods-list-title {
-      margin: 8px 0;
-      font-size: 14px;
-      font-weight: bold;
-    }
-
-    .goods-list-description {
-      font-size: 14px;
-      color: #808695;
-    }
-
-    .goods-list-price {
-      margin: 8px 0;
-      font-size: 14px;
-      color: #ff6700;
-      s {
-        color: #c5c8ce;
-      }
-    }
-  }
-
-
-}
-</style>
-
-<style>
-.clearfix:before,
-  .clearfix:after {
-    display: table;
-    content: "";
-  }
-  .clearfix:after {
-    clear: both
-  }
-  .el-col {
-    border-radius: 2px;
-  }
-  .bg-purple-dark {
-    background: #99a9bf;
-  }
-  .bg-purple {
-    background: #d3dce6;
-  }
-  .bg-purple-light {
-    background: hsl(221, 31%, 14%);
-  }
-  .grid-content {
-    border-radius: 2px;
-    min-height: 30px;
-  }
-  .status_button {
-  padding: 1px 6px;
-  border: 1px solid #e6e6e6;
-  border-radius: 4px;
-  display: inline-block;
-  font-size: 12px;
-  margin: 0 auto;
-}
-</style>
-
-
-<style type="text/css">
-*{margin: 0;padding: 0;}
-.div11{
-width:150px;
-height: 100px;
-display: table-cell;
-vertical-align: middle;
-text-align: center;
-border:1px solid #000;
-}
-.img11 {
-width: 50px;
-height: 50px;
-}
-</style>
-
-
-
-<style lang="scss" scoped>
-//客户相关详情 头部类似布局
-.el-tabs /deep/ .el-tabs__nav-wrap::after {
-  display: none !important;
-}
-
-.el-tabs /deep/ .el-tabs__header {
-  background-color: #F5F6F9;
-  padding: 0 17px;
-  margin: 0 0 15px !important;
-}
-
-.el-tabs /deep/ .el-tabs__item {
-  font-size: 13px !important;
-  height: 40px !important;
-  line-height: 40px !important;
-}
-
-.d-container {
-  position: relative;
-  height: 100%;
-}
-
-/** 让element 查询到的标签 */
-.t-loading-content {
-  position: relative;
-  overflow-y: scroll;
-  flex: 1;
-}
-
-/** 审核信息 */
-.examine-info {
-  padding: 0 17px 17px 17px;
-
-  .examine-info-border {
-    border: 1px solid #e6e6e6;
-    border-radius: 3px;
-    padding: 17px;
-  }
-}
-.t-section {
-  position: relative;
-  padding: 10px 17px;
-  min-height: 60px;
-  .t-img {
-    display: block;
-    width: 45px;
-    height: 45px;
-    margin-right: 10px;
-  }
-  .t-name {
-    font-size: 14px;
-    color: #333333;
-    flex: 1;
-  }
-  .t-more {
-    border: 1px solid #dcdfe6;
-    font-size: 12px;
-    color: #606266;
-    padding: 0 10px 0 12px;
-    border-radius: 2px;
-    font-weight: 500;
-    height: 25px;
-    cursor: pointer;
-  }
-  .t-close {
-    display: block;
-    width: 40px;
-    height: 40px;
-    margin-left: 20px;
-    padding: 10px;
-    cursor: pointer;
-  }
-}
-
-.h-section {
-  position: relative;
-  padding: 8px 17px 15px 17px;
-  min-height: 58px;
-  .h-item {
-    .h-title {
-      font-size: 12px;
-      color: #777;
-    }
-    .h-value {
-      min-height: 14px;
-      margin-top: 8px;
-      font-size: 13px;
-      color: #333333;
-    }
-  }
-}
-.head-handle-button {
-  padding: 5px 15px;
-  margin-right: 10px;
-}
-</style>
-
-<style scoped>
-
-.business-list {
-  margin-bottom: 15px;
-}
-.business-label {
-  display: inline-block;
-  width: 100px;
-}
-.business-des {
-  display: inline-block;
-  color: #999;
-  font-size: 12px;
-  width: 60px;
-}
-.business-setting-content {
-  border: 1px solid #e6e6e6;
-  margin-top: 10px;
-}
-.business-setting-table-header {
-  background: #f5f5f5;
-}
-.business-setting-table,
-.business-setting-table-header {
-  display: flex;
-  text-align: center;
-  height: 50px;
-  line-height: 50px;
-}
-.business-setting-table-body {
-  height: 250px;
-  overflow-y: auto;
-}
-.business-setting-table > span,
-.business-setting-table-header > span,
-.business-setting-table > .el-input {
-  flex: 1;
-}
-.business-setting-table > span > .el-input {
-  width: 70%;
-}
-.business-setting-table > .icon-span > .el-input {
-  width: 50%;
-}
-.business-setting-table > span .el-icon-circle-plus {
-  color: #3e84e9;
-  width: 20px;
-  height: 20px;
-  cursor: pointer;
-}
-.business-setting-table > span .el-icon-remove {
-  color: #ff6767;
-  width: 20px;
-  height: 20px;
-  cursor: pointer;
-}
-.business-setting-table:nth-child(2n + 1) {
-  background: #f7f8fa;
-}
-.icon-box {
-  width: 50px;
-  display: inline-block;
-  text-align: left;
-  margin-left: 10px;
-}
-
-
-</style>
-
-<style lang="scss" scoped>
-@import '../styles/file.scss';
-
-.step-section {
-  min-height: 300px;
-
-  /deep/ .el-loading-spinner {
-    top: 45%;
-    .el-icon-loading {
-      font-size: 40px;
-      color: #999;
-    }
-
-    .el-loading-text {
-      color: #333;
-    }
-  }
-}
-.busi-line {
-  position: absolute;
-  bottom: 0;
-  left: 17px;
-  right: 17px;
-  height: 1px;
-  background-color: #e6e6e6;
-}
-
-.busi-state {
-  position: relative;
-  padding-left: 20px;
-  overflow-x: auto;
-  overflow-y: hidden;
-  a {
-    flex-shrink: 0;
-  }
-}
-
-.busi-state-item {
-  padding: 10px 30px;
-  margin: 5px 0;
-  height: 38px;
-  position: relative;
-  margin-right: 5px;
-  border-top: 2px solid #ebebeb;
-  border-bottom: 2px solid #ebebeb;
-  .state-circle {
-    width: 38px;
-    height: 38px;
-    border-radius: 19px;
-    background-color: white;
-    transform: rotate(45deg);
-    position: absolute;
-    z-index: -1;
-  }
-  .state-arrow {
-    width: 38px;
-    height: 38px;
-    transform: scale(0.707) rotate(45deg);
-    border-top: 2px solid #ebebeb;
-    border-right: 2px solid #ebebeb;
-    background-color: white;
-    position: absolute;
-  }
-}
-
-.state-undo {
-  border-top: 2px solid #ebebeb;
-  border-bottom: 2px solid #ebebeb;
-  background-color: white;
-  color: #666;
-  .state-circle {
-    border-color: #ebebeb;
-    background-color: white;
-  }
-  .state-arrow {
-    border-color: #ebebeb;
-    background-color: white;
-  }
-}
-
-.state-doing {
-  border-top: 2px solid #34cecf;
-  border-bottom: 2px solid #34cecf;
-  background-color: white;
-  color: #34cecf;
-  .circle-left {
-    border-color: #34cecf;
-    background-color: white;
-  }
-  .circle-right {
-    border-color: #34cecf;
-    background-color: white;
-  }
-  .arrow-left {
-    border-color: #34cecf;
-    background-color: white;
-  }
-  .arrow-right {
-    border-color: #34cecf;
-    background-color: white;
-  }
-}
-
-.state-suc {
-  border-top: 2px solid #34cecf;
-  border-bottom: 2px solid #34cecf;
-  background-color: #34cecf;
-  color: white;
-  .circle-left {
-    border-color: #a07988;
-    background-color: #34cecf;
-  }
-  .circle-right {
-    border-color: #34cecf;
-    background-color: #34cecf;
-  }
-  .arrow-left {
-    border-color: #34cecf;
-    background-color: white;
-  }
-  .arrow-right {
-    border-color: #34cecf;
-    background-color: #34cecf;
-  }
-}
-
-.state-fail {
-  border-top: 2px solid #ff6767;
-  border-bottom: 2px solid #ff6767;
-  background-color: #ff6767;
-  color: white;
-  .circle-left {
-    border-color: #ff6767;
-    background-color: #ff6767;
-  }
-  .circle-right {
-    border-color: #ff6767;
-    background-color: #ff6767;
-  }
-  .arrow-left {
-    border-color: #ff6767;
-    background-color: white;
-  }
-  .arrow-right {
-    border-color: #ff6767;
-    background-color: #ff6767;
-  }
-}
-
-.state-invalid {
-  border-top: 2px solid #ebebeb;
-  border-bottom: 2px solid #ebebeb;
-  background-color: #ebebeb;
-  color: #666;
-  .state-circle {
-    border-color: #ebebeb;
-    background-color: #ebebeb;
-  }
-  .state-arrow {
-    border-color: #ebebeb;
-    background-color: #ebebeb;
-  }
-
-  .circle-left {
-    border-color: #ebebeb;
-    background-color: #ebebeb;
-  }
-  .circle-right {
-    border-color: #ebebeb;
-    background-color: #ebebeb;
-  }
-  .arrow-left {
-    border-color: #ebebeb;
-    background-color: white;
-  }
-  .arrow-right {
-    border-color: #ebebeb;
-    background-color: #807676;
-  }
-}
-
-.arrow-right {
-  z-index: 1;
-  top: -2px;
-  right: -19px;
-}
-.arrow-left {
-  top: -2px;
-  left: -18px;
-}
-.circle-right {
-  border-top: 2px solid #ebebeb;
-  border-right: 2px solid #ebebeb;
-  z-index: 1;
-  top: -2px;
-  right: -15.5px;
-}
-.circle-left {
-  border-left: 2px solid #ebebeb;
-  border-bottom: 2px solid #ebebeb;
-  top: -2px;
-  left: -17px;
-}
-
-/** 状态操作布局 */
-.state-handel-cont {
-  font-size: 13px;
-  color: #333;
-  .state-handel-item {
-    padding: 10px 0;
-    cursor: pointer;
-    .state-handel-item-img {
-      width: 16px;
-      height: 16px;
-      border-radius: 8px;
-      margin-right: 8px;
-      flex-shrink: 0;
-      display: block;
-    }
-    .state-handel-item-name {
-      flex: 1;
-    }
-    .state-handel-item-value {
-      flex-shrink: 0;
-    }
-  }
-  .state-handel-item:hover {
-    background-color: #f7f8fa;
-  }
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/pg-fis/components/Sections.vue b/code/WebApp/vue/src/views/pg-fis/components/Sections.vue
deleted file mode 100644
index 8a7dc21f..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/Sections.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<template>
-  <div class="section">
-    <div
-      v-if="title && title.length > 0"
-      class="section-header">
-      <div
-        :style="{ 'border-left-color': mColor }"
-        class="section-mark"/>
-      <div class="section-title">{{ title }}</div>
-      <flexbox
-        v-if="showF"
-        class="f-container">
-        <div
-          v-for="(item, index) in fItems"
-          :key="index"
-          :class="{ 'f-item-select':fIndex==item.type }"
-          class="f-item"
-          @click="fClick(item)">{{ item.title }}</div>
-      </flexbox>
-    </div>
-    <div
-      :style="{ 'height': contentHeight }"
-      class="content">
-      <div
-        v-if="showNoData"
-        class="no-data-container">
-        <img
-          class="no-data"
-          src="@/assets/img/no_data.png" >
-        <div class="no-data-name">暂无数据</div>
-      </div>
-      <slot/>
-    </div>
-  </div>
-</template>
-<script type="text/javascript">
-export default {
-  name: 'Sections',
-  components: {},
-  props: {
-    title: {
-      type: String,
-      default: ''
-    },
-    mColor: {
-      type: String,
-      default: '#FF6767'
-    },
-    /** 内容区域固定高度 */
-    contentHeight: {
-      type: String,
-      default: '327px'
-    },
-    /** 展示客户工作台  重要提醒 时间筛选 */
-    showF: {
-      type: Boolean,
-      default: false
-    },
-    fItems: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    /** 展示无数据 */
-    showNoData: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      fIndex: -1
-    }
-  },
-  computed: {},
-  mounted() {},
-  methods: {
-    fClick(item) {
-      this.fIndex = item.type
-      this.$emit('f-click', 'val')
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.section {
-  position: relative;
-  background-color: white;
-  margin-top: 8px;
-}
-.section:first-child {
-  margin-top: 0;
-}
-
-.section-mark {
-  border-left-width: 3px;
-  border-left-style: solid;
-  height: 10px;
-}
-
-.section-header {
-  display: flex;
-  align-items: center;
-  padding: 5px 15px;
-}
-.section-title {
-  font-size: 13px;
-  color: #333;
-  margin-left: 8px;
-  flex-shrink: 0;
-}
-
-.f-container {
-  width: auto;
-  margin-left: 40px;
-  .f-item {
-    padding: 2px 4px;
-    font-size: 12px;
-    margin-right: 10px;
-    color: #666;
-  }
-  .f-item-select {
-    border-radius: 2px;
-    background-color: #ff6767;
-    color: white;
-  }
-}
-
-.content {
-  overflow: auto;
-  .no-data-container {
-    text-align: center;
-    .no-data {
-      margin-top: 30px;
-    }
-    .no-data-name {
-      font-size: 12px;
-      margin-top: 8px;
-      color: #666;
-    }
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/filterForm/filterContent.vue b/code/WebApp/vue/src/views/pg-fis/components/filterForm/filterContent.vue
deleted file mode 100644
index 4fb37590..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/filterForm/filterContent.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <div class="wrapper">
-    <ul class="list">
-      <li
-        v-for="(item, index) in showObj.form"
-        :key="index"
-        class="list-item">
-        <span v-if="item.formType == 'date'">{{ item.name +'&nbsp;“' + item.value[0] + '-' + item.value[1] + '”' }}</span>
-        <span v-else-if="item.formType === 'datetime'">{{ item.name +'&nbsp;“' + item.value[0] + '-' + item.value[1] + '”' }}</span>
-        <!-- <span v-else-if="item.formType === 'business_type'">{{ item.name +'&nbsp;“' + getTypesName(item) + getStatusName(item) + '”' }}</span>
-        <span v-else-if="item.formType === 'map_address'">{{ `${item.name} ${item.address.state} ${item.address.city} ${item.address.area}` }}</span>
-        <span v-else-if="item.formType === 'checkStatus'">{{ item.name +'&nbsp;“' + optionsNames[item.condition]+ '”'+'&nbsp;'+ getCheckName(item) }}</span>
-        <span v-else-if="item.formType === 'user'">{{ item.name +'&nbsp;' + optionsNames[item.condition] + '“' + item.value[0].realname + '”' }}</span>
-        <span v-else-if="item.formType === 'category' && item.value.length > 0">{{ item.name +'&nbsp;“' + item.valueContent + '”' }}</span> -->
-        <span v-else-if="item.formType === 'select' && item.value.length > 0">{{ item.name + '&nbsp;' + optionsNames[item.condition] + '“' + getSelectName(item) + '”' }}</span>
-        <span v-else-if="item.formType === 'switch'">{{ item.name + '&nbsp;' + optionsNames[item.condition] + '“' + getSwitchName(item) + '”' }}</span>
-        <span v-else-if="item.formType != 'text' && item.fieldName.endsWith('ID')">{{ item.name + '&nbsp;' + optionsNames[item.condition] + '“' + getRelativeName(item) + '”' }}</span>
-        <span v-else>{{ item.name + '&nbsp;' + optionsNames[item.condition] + '“' + item.value + '”' }}</span>
-        <i
-          class="el-icon-close icon"
-          @click="handleDelete(item, index)"/>
-      </li>
-    </ul>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'FilterContent',
-  props: {
-    obj: {
-      type: Object,
-      required: true,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      // 获取条件名称
-      optionsNames: {
-        is: '等于',
-        isNot: '不等于',
-        contains: '包含',
-        notContains: '不包含',
-        startWith: '开始于',
-        endWith: '结束于',
-        isNull: '为空',
-        isNotNull: '不为空',
-        eq: '等于',
-        neq: '不等于',
-        gt: '大于',
-        egt: '大于等于',
-        lt: '小于',
-        elt: '小于等于'
-      },
-      // 展示信息
-      showObj: {}
-    }
-  },
-  computed: {},
-  watch: {
-    obj: function(val) {
-      this.showObj = val
-    }
-  },
-  mounted() {
-    this.showObj = this.obj
-  },
-  methods: {
-    /**
-     * 删除高级筛选条件
-     * @param index
-     */
-    handleDelete(item, index) {
-      this.$delete(this.showObj.obj, item.fieldName)
-      this.showObj.form.splice(index, 1)
-      this.$emit('delete', { item: item, index: index, obj: this.showObj })
-    },
-    // 商机组展示名称
-    getTypesName(data) {
-      if (data.typeId) {
-        const obj = data.typeOption.find(item => {
-          return item.typeId === data.typeId
-        })
-        return obj.name || ''
-      }
-      return ''
-    },
-    getCheckName(data) {
-      let value = ''
-      data.setting.forEach(item => {
-        if (item.value === data.value) {
-          value = item.name
-          return
-        }
-      })
-      return value
-    },
-    // 商机阶段展示名称
-    getStatusName(data) {
-      if (data.statusId) {
-        const obj = data.statusOption.find(item => {
-          return item.statusId === data.statusId
-        })
-        if (obj.name) {
-          return '-' + obj.name
-        }
-        return ''
-      }
-      return ''
-    },
-    getSelectName(data) {
-      let value = ''
-      data.setting.forEach(item => {
-        if (item.split(",")[1] === data.value) {
-          value = item.split(",")[0]
-          return
-        }
-      })
-      return value
-    },
-    getSwitchName(data) {
-       return  data.value===false? '否':'是';
-    } ,
-    getRelativeName(data)
-    {
-        return data.displadValue;
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-@mixin left() {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-}
-@mixin center() {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.wrapper {
-  width: 100%;
-  min-height: 50px;
-  background: white;
-  border-top: 1px solid #e1e1e1;
-  font-size: 13px;
-  overflow-x: scroll;
-  color: #aaa;
-  @include left;
-  .list {
-    width: 100%;
-    padding: 0 20px;
-    margin-bottom: 10px;
-    flex-shrink: 0;
-    @include left;
-    .list-item {
-      height: 30px;
-      padding: 0 10px;
-      margin: 10px 15px 0 0;
-      border: 1px solid #e1e1e1;
-      border-radius: 3px;
-      flex-shrink: 0;
-      @include center;
-      .icon {
-        margin-left: 20px;
-        cursor: pointer;
-      }
-    }
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/filterForm/index.vue b/code/WebApp/vue/src/views/pg-fis/components/filterForm/index.vue
deleted file mode 100644
index 692d056c..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/filterForm/index.vue
+++ /dev/null
@@ -1,757 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :visible.sync="visible"
-    :close-on-click-modal="false"
-    title="高级筛选"
-    width="900px"
-    :append-to-body="true"
-    @close="handleCancel"
-  >
-    <div style="margin-bottom: 10px">筛选条件</div>
-    <el-form id="filter-container" class="filter-container">
-      <el-form-item>
-        <template v-for="(formItem, index) in form">
-          <el-row :key="index">
-            <el-col :span="8">
-              <el-select
-                v-model="formItem.fieldName"
-                placeholder="请选择要筛选的字段名"
-                @change="fieldChange(formItem)"
-              >
-                <el-option
-                  v-for="item in fieldList"
-                  :key="item.fieldName"
-                  :label="item.name"
-                  :value="item.fieldName"
-                />
-              </el-select>
-            </el-col>
-
-            <el-col v-if="showCalCondition(formItem.formType)" :span="1"
-              >&nbsp;</el-col
-            >
-            <el-col v-if="showCalCondition(formItem.formType)" :span="4">
-              <el-select
-                v-model="formItem.condition"
-                placeholder="请选择筛选方法"
-                @change="actionChange(formItem)"
-              >
-                <el-option
-                  v-for="item in calConditionOptions(
-                    formItem.formType,
-                    formItem
-                  )"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-col>
-
-            <!-- 商机组 -->
-            <el-col v-if="formItem.formType == 'business_type'" :span="1"
-              >&nbsp;</el-col
-            >
-            <el-col v-if="formItem.formType == 'business_type'" :span="4">
-              <el-select
-                v-model="formItem.typeId"
-                placeholder="请选择"
-                @change="typeOptionsChange(formItem)"
-              >
-                <el-option
-                  v-for="item in formItem.typeOption"
-                  :key="item.typeId"
-                  :label="item.name"
-                  :value="item.typeId"
-                />
-              </el-select>
-            </el-col>
-
-            <el-col :span="1">&nbsp;</el-col>
-            <el-col
-              :span="
-                formItem.formType === 'datetime' ||
-                formItem.formType === 'date' ||
-                formItem.formType === 'map_address'
-                  ? 13
-                  : 8
-              "
-            >
-              <el-switch
-                v-if="formItem.formType === 'switch'"
-                v-model="formItem.value"
-                :value="formItem.value"
-              >
-              </el-switch>
-              <el-select
-                v-else-if="formItem.formType === 'select'"
-                clearable
-                v-model="formItem.value"
-                placeholder="请选择筛选条件"
-              >
-                <el-option
-                  v-for="item in formItem.setting"
-                  :key="item.split(',')[1]"
-                  :label="item.split(',')[0]"
-                  :value="item.split(',')[1]"
-                />
-              </el-select>
-              <el-select
-                v-else-if="formItem.formType === 'checkStatus'"
-                v-model="formItem.value"
-                placeholder="请选择筛选条件"
-              >
-                <el-option
-                  v-for="item in formItem.setting"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-              <el-date-picker
-                v-else-if="
-                  formItem.formType === 'date' ||
-                  formItem.formType === 'datetime'
-                "
-                v-model="formItem.value"
-                :value-format="
-                  formItem.formType === 'date'
-                    ? 'yyyy-MM-dd'
-                    : 'yyyy-MM-dd HH:mm:ss'
-                "
-                :type="
-                  formItem.formType === 'date' ? 'daterange' : 'datetimerange'
-                "
-                style="padding: 0px 10px"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              />
-              <el-select
-                v-else-if="formItem.formType === 'business_type'"
-                v-model="formItem.statusId"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in formItem.statusOption"
-                  :key="item.statusId"
-                  :label="item.name"
-                  :value="item.statusId"
-                />
-              </el-select>
-
-              <crm-relative-cell
-                ref="CrmRelativeCell"
-                v-else-if="
-                  formItem.formType != 'text' &&
-                  formItem.fieldName.endsWith('ID')
-                "
-                :item="formItem"
-                :relation="{ type: formItem.formType }"
-                :radio="false"
-                :disabled="formItem.disabled"
-                @value-change="valueChange"
-              />
-
-              <el-input
-                v-else
-                v-model="formItem.value"
-                placeholder="请输入筛选条件"
-              />
-
-              <!-- <el-input
-                v-else-if="formItem.formType === 'text'"
-                v-model="formItem.value"
-                placeholder="请输入筛选条件"/> -->
-              <!-- <xh-user-cell
-                v-else-if="formItem.formType === 'user'"
-                :item="formItem"
-                :info-params="{m	:'crm',c: crmType,a: 'index' }"
-                @value-change="arrayValueChange"/>
-              <xh-prouct-cate
-                v-else-if="formItem.formType === 'category'"
-                :item="formItem"
-                @value-change="arrayValueChange"/>
-              <v-distpicker
-                v-else-if="formItem.formType === 'map_address'"
-                :province="formItem.address.state"
-                :city="formItem.address.city"
-                :area="formItem.address.area"
-                @province="selectProvince($event,formItem)"
-                @city="selectCity($event,formItem)"
-                @area="selectArea($event,formItem)"/> -->
-            </el-col>
-            <el-col :span="1" class="delete">
-              <i
-                class="el-icon-error delete-btn"
-                @click="handleDelete(index)"
-              />
-            </el-col>
-          </el-row>
-        </template>
-      </el-form-item>
-    </el-form>
-    <p v-show="showErrors" class="el-icon-warning warning-info">
-      <span class="desc">筛选条件中有重复项！</span>
-    </p>
-    <el-button type="text" @click="handleAdd">+ 添加筛选条件</el-button>
-    <!-- <div
-      v-if="!isSeas"
-      class="save">
-      <el-checkbox v-model="saveChecked">保存为场景</el-checkbox>
-      <el-input
-        v-show="saveChecked"
-        v-model.trim="saveName"
-        :maxlength="10"
-        class="name"
-        placeholder="请输入场景名称，最多10个字符"/>
-      <div
-        v-show="saveChecked"
-        class="save-setting">
-        <el-checkbox v-model="saveDefault">设置为默认</el-checkbox>
-      </div>
-    </div> -->
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="handleCancel">取 消</el-button>
-      <el-button type="primary" @click="handleConfirm">确 定</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { objDeepCopy } from "@/utils";
-import { CrmRelativeCell } from "@/components/CreateCom";
-// import { XhUserCell, XhProuctCate } from '@/components/CreateCom'
-// import VDistpicker from 'v-distpicker'
-/**
- * fieldList: 高级筛选的字段
- *     type:  date || datetime || select || 其他 input
- */
-export default {
-  name: "Index",
-  components: {
-    "crm-relative-cell": CrmRelativeCell,
-    // XhUserCell,
-    // XhProuctCate,
-    // VDistpicker
-  },
-  props: {
-    dialogVisible: {
-      type: Boolean,
-      required: true,
-      default: false,
-    },
-    fieldList: {
-      type: Array,
-      required: true,
-      default: () => {
-        return [];
-      },
-    },
-    obj: {
-      type: Object,
-      required: true,
-      default: () => {
-        return {};
-      },
-    },
-    /** 获取客户管理下列表权限内的员工列表 针对 usersList */
-    crmType: {
-      type: String,
-      default: "",
-    },
-    // 辅助 使用 公海没有场景
-    isSeas: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {
-      form: [],
-      visible: false,
-      showErrors: false,
-      saveChecked: false, // 展示场景
-      saveDefault: false, // 设置为默认场景
-      saveName: null, // 场景名称
-    };
-  },
-  watch: {
-    dialogVisible: {
-      handler(val) {
-        if (val) {
-          this.form = objDeepCopy(this.obj.form);
-          if (this.form.length == 0) {
-            this.form.push({
-              fieldName: "",
-              name: "",
-              formType: "text",
-              condition: "is",
-              action: 0,
-              value: "",
-              displadValue: "",
-              typeOption: [],
-              statusOption: [],
-              typeId: "",
-              statusId: "",
-              address: {
-                state: "",
-                city: "",
-                area: "",
-              },
-            });
-          }
-          this.saveChecked = false;
-          this.saveDefault = false;
-          this.saveName = null;
-        }
-        this.visible = this.dialogVisible;
-      },
-      deep: true,
-      immediate: true,
-    },
-
-    form() {
-      this.$nextTick(() => {
-        var container = document.getElementById("filter-container");
-        container.scrollTop = container.scrollHeight;
-      });
-    },
-  },
-  methods: {
-    /**
-     * 位置更改
-     */
-    selectProvince(data, formItem) {
-      formItem.address.state = data.value;
-    },
-    selectCity(data, formItem) {
-      formItem.address.city = data.value;
-    },
-    selectArea(data, formItem) {
-      formItem.address.area = data.value;
-    },
-
-    /**
-     * 商机组状态
-     */
-    typeOptionsChange(formItem) {
-      if (formItem.typeId) {
-        const obj = formItem.typeOption.find((item) => {
-          return item.typeId === formItem.typeId;
-        });
-        formItem.statusOption = obj.statusList || [];
-      } else {
-        formItem.statusOption = [];
-      }
-      formItem.statusId = "";
-    },
-    /**
-     * 用户创建人
-     * 产品类别
-     */
-    arrayValueChange(data) {
-      if (data.value.length > 0) {
-        data.item.value = data.value;
-        data.item.valueContent = data.valueContent;
-      } else {
-        data.item.value = [];
-      }
-    },
-
-    /**
-     * 是否展示条件
-     */
-    showCalCondition(formType) {
-      if (
-        formType == "date" ||
-        formType == "datetime" ||
-        formType == "business_type" ||
-        formType == "category" ||
-        formType == "map_address"
-      ) {
-        return false;
-      }
-      return true;
-    },
-    /** 条件数据源 */
-    calConditionOptions(formType, item) {
-      //bool 或者 枚举类型
-      if (
-        formType == "select" ||
-        formType == "switch" ||
-        formType == "checkbox"
-        // ||formType == 'user' ||
-        // formType == 'checkStatus'
-      ) {
-        return [
-          { action: 0, value: "is", label: "等于", disabled: false },
-          { action: 1, value: "isNot", label: "不等于", disabled: false },
-        ];
-      }
-      //字符串类型
-      else if (
-        formType == "module" ||
-        formType == "text" ||
-        formType == "textarea"
-      ) {
-        return [
-          { action: 0, value: "is", label: "等于", disabled: false },
-          { action: 1, value: "isNot", label: "不等于", disabled: false },
-          { value: "contains", label: "包含", disabled: false },
-          { value: "notContains", label: "不包含", disabled: false },
-        ];
-      }
-      //数值类型
-      else if (formType == "floatnumber" || formType == "number") {
-        return [
-          { value: "is", label: "等于", disabled: false },
-          { value: "isNot", label: "不等于", disabled: false },
-          // { value: 'contains', label: '包含', disabled: false },
-          // { value: 'notContains', label: '不包含', disabled: false },
-          // { value: 'isNull', label: '为空', disabled: false },
-          // { value: 'isNotNull', label: '不为空', disabled: false },
-          { value: "gt", label: "大于", disabled: false },
-          { value: "egt", label: "大于等于", disabled: false },
-          { value: "lt", label: "小于", disabled: false },
-          { value: "elt", label: "小于等于", disabled: false },
-        ];
-      } else if (formType == "datetime") {
-        return [
-          { value: "startWith", label: "开始于", disabled: false },
-          { value: "endWith", label: "结束于", disabled: false },
-        ];
-      }
-      // else if (formType == 'category') {
-      //   return [
-      //     { value: 'is', label: '等于', disabled: false },
-      //     { value: 'isnot', label: '不等于', disabled: false },
-      //     { value: 'contains', label: '包含', disabled: false },
-      //     { value: 'not_contain', label: '不包含', disabled: false }
-      //   ]
-      // }
-      else {
-        //默认查询条件
-        return [
-          { value: "is", label: "等于", disabled: false },
-          { value: "isNot", label: "不等于", disabled: false },
-          // { value: 'contains', label: '包含', disabled: false },
-          // { value: 'notContains', label: '不包含', disabled: false },
-          // { value: 'startWith', label: '开始于', disabled: false },
-          // { value: 'endWith', label: '结束于', disabled: false },
-          // { value: 'isNull', label: '为空', disabled: false },
-          // { value: 'isNotNull', label: '不为空', disabled: false },
-          // { value: 'gt', label: '大于', disabled: false },
-          // { value: 'egt', label: '大于等于', disabled: false },
-          // { value: 'lt', label: '小于', disabled: false },
-          // { value: 'elt', label: '小于等于', disabled: false }
-        ];
-      }
-    },
-    /**
-     * 当前选择的字段名改变，判断是否有重复
-     * @param formItem
-     */
-    fieldChange(formItem) {
-      const obj = this.fieldList.find((item) => {
-        return item.fieldName === formItem.fieldName;
-      });
-      if (obj) {
-        formItem.formType = obj.formType;
-        formItem.name = obj.name;
-        if (formItem.formType === "date" || formItem.formType === "datetime") {
-          formItem.value = [];
-        } else if (formItem.formType == "select") {
-          formItem.setting = obj.setting || [];
-          formItem.value = "";
-        }
-        //关联表
-        else if (
-          formItem.formType != "text" &&
-          formItem.fieldName.endsWith("ID")
-        ) {
-          //清空内容
-          formItem.value = "";
-        }
-      }
-
-      const arr = this.form.filter((item) => {
-        return item.fieldName === formItem.fieldName;
-      });
-      if (arr.length > 1) this.showErrors = true;
-      else this.showErrors = false;
-    },
-    actionChange(formItem) {
-      switch (formItem.condition) {
-        case "is": // 等于
-          formItem.action = 0;
-          break;
-        case "isNot": // 不等于
-          formItem.action = 1;
-          break;
-        case "gt": //大于
-          formItem.action = 2;
-          break;
-        case "lt": //小于
-          formItem.action = 3;
-          break;
-        case ("egt", "startWith"): //大于等于
-          formItem.action = 4;
-          break;
-        case ("elt", "endWith"): //小于等于
-          formItem.action = 5;
-          break;
-        case "contains": // 类似于
-          formItem.action = 6;
-          break;
-        case "notContains": //不类似于
-          formItem.action = 7;
-          break;
-        default:
-          return 0;
-      }
-    },
-    valueChange(data) {
-      var type = data.type;
-      var formItem = this.form.find((item) => {
-        return item.formType === type;
-      });
-      if (
-        formItem != null &&
-        data.value[0] != null &&
-        data.value[0]["Id"] != null
-      ) {
-        formItem.value = data.value[0]["Id"];
-        formItem.displadValue = data.value[0]["Name"];
-      }
-    },
-    /**
-     * 取消选择
-     */
-    handleCancel() {
-      this.$emit("update:dialogVisible", false);
-    },
-    /**
-     * 确定选择
-     */
-    handleConfirm() {
-      if (this.showErrors) {
-        this.$message.error("筛选条件中有重复项！");
-        return;
-      }
-      if (this.saveChecked) {
-        if (!this.saveName || this.saveName === "") {
-          this.$message.error("场景名称不能为空！");
-          return;
-        }
-      }
-      for (let i = 0; i < this.form.length; i++) {
-        const o = this.form[i];
-        if (!o.fieldName || o.fieldName === "") {
-          this.$emit("filter", null);
-          return;
-        } else {
-          if (o.formType == "date" || o.formType == "datetime") {
-            if (!o.value || o.value.length === 0) {
-              this.$message.error("请选择筛选条件的值！");
-              return;
-            }
-          } else if (o.formType == "text") {
-            if (!o.value && o.value !== 0) {
-              this.$message.error("请输入筛选条件的值！");
-              return;
-            }
-          }
-          //关联表
-          else if (o.formType != "text" && o.fieldName.endsWith("ID")) {
-            if (!o.value && o.value !== 0) {
-              this.$message.error("请选择筛选条件的值！");
-              return;
-            }
-          }
-        }
-      }
-
-      let items = [];
-      this.form.forEach((o) => {
-        let obj = {};
-        if (o.formType == "text") {
-          obj = {
-            condition: o.condition,
-            action: o.action,
-            value: o.value,
-            formType: o.formType,
-            fieldName: o.fieldName,
-          };
-        } else if (o.formType == "datetime" || o.formType == "date") {
-          obj = {
-            condition: o.condition,
-            action: o.action,
-            start: o.value[0],
-            end: o.value[1],
-            formType: o.formType,
-            fieldName: o.fieldName,
-          };
-        } else if (o.formType == "select") {
-          obj = {
-            condition: o.condition,
-            action: o.action,
-            value: o.value,
-            formType: o.formType,
-            fieldName: o.fieldName,
-          };
-        } else if (o.formType == "switch") {
-          let value = o.value === false ? "false" : "true"; //o.value默认等于''
-          obj = {
-            condition: o.condition,
-            action: o.action,
-            value: value,
-            formType: o.formType,
-            fieldName: o.fieldName,
-          };
-        }
-        //关联表
-        else {
-          obj = {
-            condition: o.condition,
-            action: o.action,
-            value: o.value,
-            formType: o.formType,
-            fieldName: o.fieldName,
-            displadValue: o.displadValue,
-          };
-        }
-        items.push(obj);
-      });
-      const data = {
-        obj: items,
-        form: this.form,
-        saveChecked: this.saveChecked,
-        saveDefault: this.saveDefault,
-        saveName: this.saveName,
-      };
-      data.obj = items;
-      this.$emit("filter", data);
-    },
-    /**
-     * 添加筛选条件
-     */
-    handleAdd() {
-      this.form.push(
-        {
-          fieldName: "",
-          formType: "text",
-          condition: "is",
-          action: 0,
-          value: "",
-          displadValue: "",
-          formType: "",
-          setting: [],
-          typeOption: [],
-          statusOption: [],
-          typeId: "",
-          statusId: "",
-          data: [],
-        }
-      );
-    },
-    /**
-     * 删除筛选条件
-     * @param index
-     */
-    handleDelete(index) {
-      this.$confirm("您确定要删除这一条数据吗?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.form.splice(index, 1);
-          this.form.forEach((itemForm) => {
-            //用于判断是否有重复项
-            //this.fieldChange(item);
-            const arr = this.form.filter((item) => {
-              return item.fieldName === itemForm.fieldName;
-            });
-            if (arr.length > 1) this.showErrors = true;
-            else this.showErrors = false;
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-/deep/ .el-dialog__body {
-  padding: 10px 20px;
-}
-
-/deep/ .el-form-item__label {
-  width: 100%;
-  text-align: left;
-}
-.filter-container {
-  max-height: 300px;
-  overflow-y: auto;
-}
-
-.save {
-  margin-top: 10px;
-  .name {
-    width: 300px;
-    margin-left: 10px;
-    /deep/ .el-input__inner {
-      height: 32px;
-    }
-  }
-  .save-setting {
-    margin-top: 20px;
-  }
-}
-
-.el-form-item {
-  margin-bottom: 0;
-}
-
-.el-row {
-  margin-bottom: 20px;
-  .delete-btn {
-    margin-left: 15px;
-    color: #bbb;
-    cursor: pointer;
-  }
-  .el-select,
-  .el-date-editor {
-    width: 100%;
-  }
-}
-
-.warning-info {
-  width: 100%;
-  font-size: 14px;
-  color: #f56c6c;
-  margin-top: 10px;
-  .desc {
-    padding-left: 8px;
-  }
-}
-
-.distpicker-address-wrapper /deep/ select {
-  border-radius: 2px;
-  font-size: 13px;
-  height: 34px;
-  -webkit-appearance: none;
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAWCAYAAAAW5GZjAAAMHmlDQ1BEaXNwbGF5AABIx62Xd1RTyRrA55YkJCS0QASkhN4E6VV6jVSpgo2QBBJKDAlBxI4uKrgWVCxYkVUR21oAWWzYlUWw90URFGVdLNhAeZME0NXz/njnvDln7v3lm2++lrlzZgBQjWGLRNmoGgA5wjxxbGgAc2JyCpP0BBCBGiADXaDK5khE/jExEQC24fe/2/tbAJG9r9vKbIH/ralzeRIOAEgM5DSuhJMD+QgAuCtHJM4DgNAD5SYz8kSQiTBKoCmGAUI2lXGGgt1lnKbgCLlOfGwg5FQAlKhstjgDABVZXMx8Tga0o7IMsr2QKxBCboTsw+GzuZAHII/JyZkOWdUSsmXad3Yy/mUzbcQmm50xwopc5E0pSCARZbNngv93y8mWDvswgZ3KF4fFynKW1S1reriMqZAvCtOioiFrQL4h4Mr1ZdzFl4YlDOl/5EgCYc0AAwCUymUHhUPWg2wszI6KGJL7pAtCWJBh7dF4QR4rXjEX5Yqnxw7ZRwt4kuC4YWaL5b5kOiXSrAT/IZtb+DzWsM2GQn58kiJOtDVfkBgFWQXyA0lWXPiQzotCfmDUsI5YGiuLGf7nGEgXh8QqdDDTHMlwXpgnX8CKGuKIPH58mGIuNpXDlsemDTmTJ5kYMRwnlxcUrMgLK+IJE4bix8pEeQGxQ/pVouyYIX2skZcdKpMbQ26R5McNz+3Ng4tNkS8ORHkx8YrYcM1M9vgYRQy4NYgAgSAIMIEU9jQwHWQCQUtPXQ/8pRgJAWwgBhmAB2yHJMMzkuQjQviMA4Xgb0g8IBmZFyAf5YF8KP8yIlU8bUG6fDRfPiMLdEHOAeEgG/6WymcJR7wlgqdQIvjJOwfGmg27bOwnGVN1WEYMJgYRw4ghRCtcF/fBvfAI+PSD3RF3xz2G4/qmT+gitBGeEG4S2gl3pwmKxD9EzgSRoB3GGDKUXdr32eHm0KoLHoB7Q/vQNs7AdYEt7gw9+eO+0LcLlH4fq3Qk42+1HLJFtiej5FFkP7LljxGoWKu4jFiRVer7WijiShupVuDIyI95BH5XPy58h/+oiS3BDmMXsNPYJawRqwNM7CRWjzVjx2U8sjaeytfGsLdYeTxZ0I7gJ3/sIZ+yqknsa+y77QeGxkAeryBP9rEEThfNFAsy+HlMf7hb85gsIcduDNPR3gHuorK9X7G1vGXI93SEcfmbLPcUAB4lUJjxTcaGe9CxLgDo77/JTN7AZb8SgOOtHKk4XyHDZQ8CoABV+KXoAAO4d1nCjByBK/ACfiAYjAfRIB4kg6mwzny4TsVgBpgNFoBiUApWgrVgI9gKdoDdYB84BOpAIzgNzoMroBXcBPfhWukEL0EveA/6EQQhITSEjugghogZYoM4Iu6IDxKMRCCxSDKSimQgQkSKzEYWIqVIGbIR2Y5UI78jx5DTyCWkDbmLPEa6kTfIZxRDqagmqo+ao2NRd9QfDUfj0SloBpqLFqKL0OXoerQS3YvWoqfRK+hNtB19ifZhAFPGGJgRZou5Y4FYNJaCpWNibC5WgpVjldh+rAH+09exdqwH+4QTcTrOxG3heg3DE3AOnovPxZfhG/HdeC1+Fr+OP8Z78a8EGkGPYEPwJLAIEwkZhBmEYkI5YSfhKOEc/HY6Ce+JRCKDaEF0g99eMjGTOIu4jLiZeIB4ithG7CD2kUgkHZINyZsUTWKT8kjFpA2kvaSTpGukTtJHJWUlQyVHpRClFCWhUpFSudIepRNK15SeKfWT1chmZE9yNJlLnkleQa4iN5CvkjvJ/RR1igXFmxJPyaQsoKyn7KecozygvFVWVjZW9lCeoCxQnq+8Xvmg8kXlx8qfqBpUa2ogdTJVSl1O3UU9Rb1LfUuj0cxpfrQUWh5tOa2adob2iPZRha5ip8JS4arMU6lQqVW5pvJKlaxqpuqvOlW1ULVc9bDqVdUeNbKauVqgGlttrlqF2jG122p96nR1B/Vo9Rz1Zep71C+pP9cgaZhrBGtwNRZp7NA4o9FBx+gm9EA6h76QXkU/R+/UJGpaaLI0MzVLNfdptmj2amloOWslahVoVWgd12pnYAxzBouRzVjBOMS4xfg8Sn+U/yjeqKWj9o+6NuqD9mhtP22edon2Ae2b2p91mDrBOlk6q3TqdB7q4rrWuhN0Z+hu0T2n2zNac7TXaM7oktGHRt/TQ/Ws9WL1Zunt0GvW69M30A/VF+lv0D+j32PAMPAzyDRYY3DCoNuQbuhjKDBcY3jS8AVTi+nPzGauZ55l9hrpGYUZSY22G7UY9RtbGCcYFxkfMH5oQjFxN0k3WWPSZNJramgaaTrbtMb0nhnZzN2Mb7bO7ILZB3ML8yTzxeZ15s8ttC1YFoUWNRYPLGmWvpa5lpWWN6yIVu5WWVabrVqtUWsXa751hfVVG9TG1UZgs9mmbQxhjMcY4ZjKMbdtqbb+tvm2NbaP7Rh2EXZFdnV2r8aajk0Zu2rshbFf7V3ss+2r7O87aDiMdyhyaHB442jtyHGscLzhRHMKcZrnVO/02tnGmee8xfmOC90l0mWxS5PLF1c3V7HrftduN1O3VLdNbrfdNd1j3Je5X/QgeAR4zPNo9Pjk6eqZ53nI8x8vW68srz1ez8dZjOONqxrX4W3szfbe7t3uw/RJ9dnm0+5r5Mv2rfR94mfix/Xb6ffM38o/03+v/6sA+wBxwNGAD4GegXMCTwVhQaFBJUEtwRrBCcEbgx+FGIdkhNSE9Ia6hM4KPRVGCAsPWxV2m6XP4rCqWb3j3cbPGX82nBoeF74x/EmEdYQ4oiESjRwfuTryQZRZlDCqLhpEs6JXRz+MsYjJjfljAnFCzISKCV2xDrGzYy/E0eOmxe2Jex8fEL8i/n6CZYI0oSlRNXFyYnXih6SgpLKk9oljJ86ZeCVZN1mQXJ9CSklM2ZnSNyl40tpJnZNdJhdPvjXFYkrBlEtTdadmTz0+TXUae9rhVEJqUuqe1AF2NLuS3ZfGStuU1ssJ5KzjvOT6cddwu3nevDLes3Tv9LL05xneGaszuvm+/HJ+jyBQsFHwOjMsc2vmh6zorF1Zg9lJ2QdylHJSc44JNYRZwrPTDaYXTG8T2YiKRe25nrlrc3vF4eKdEkQyRVKfpwkP2c1SS+kv0sf5PvkV+R9nJM44XKBeICxonmk9c+nMZ4Uhhb/NwmdxZjXNNpq9YPbjOf5zts9F5qbNbZpnMm/RvM75ofN3L6AsyFrwZ5F9UVnRu4VJCxsW6S+av6jjl9BfaopVisXFtxd7Ld66BF8iWNKy1GnphqVfS7gll0vtS8tLB5Zxll3+1eHX9b8OLk9f3rLCdcWWlcSVwpW3Vvmu2l2mXlZY1rE6cnXtGuaakjXv1k5be6ncuXzrOso66br29RHr6zeYbli5YWAjf+PNioCKA5v0Ni3d9GEzd/O1LX5b9m/V31q69fM2wbY720O311aaV5bvIO7I39FVlVh14Tf336p36u4s3flll3BX++7Y3Wer3aqr9+jtWVGD1khruvdO3tu6L2hf/X7b/dsPMA6UHgQHpQdf/J76+61D4YeaDrsf3n/E7Mimo/SjJbVI7cza3jp+XXt9cn3bsfHHmhq8Go7+YffHrkajxorjWsdXnKCcWHRi8GThyb5TolM9pzNOdzRNa7p/ZuKZG2cnnG05F37u4vmQ82cu+F84edH7YuMlz0vHLrtfrrvieqW22aX56J8ufx5tcW2pvep2tb7Vo7WhbVzbiWu+105fD7p+/gbrxpWbUTfbbiXcunN78u32O9w7z+9m3319L/9e//35DwgPSh6qPSx/pPeo8i+rvw60u7Yffxz0uPlJ3JP7HZyOl08lTwc6F3XRusqfGT6rfu74vLE7pLv1xaQXnS9FL/t7iv9W/3vTK8tXR/7x+6e5d2Jv52vx68E3y97qvN31zvldU19M36P3Oe/7P5R81Pm4+5P7pwufkz4/658xQBpY/8XqS8PX8K8PBnMGB0VsMVt+FMBgR9PTAXizCwBaMjw7tAJAmaS4m8kborhPygn8N1bc3+TNFYBdfgAkzAcgAp5RtsBuBpkK37IjeLwfQJ2cRvpQk6Q7OSpsUeGNhfBxcPCtPgCkBgC+iAcH+zcPDn6pgsHeBeBUruJOKGuyO+g2Oxm1dr766W72H1oCcSjh6sMlAAAACXBIWXMAABYlAAAWJQFJUiTwAAAF9mlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDAgNzkuMTYwNDUxLCAyMDE3LzA1LzA2LTAxOjA4OjIxICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoTWFjaW50b3NoKSIgeG1wOkNyZWF0ZURhdGU9IjIwMTgtMDctMjdUMDc6NTY6NDctMDc6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDE4LTA3LTI3VDA3OjU5OjA4LTA3OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDE4LTA3LTI3VDA3OjU5OjA4LTA3OjAwIiBkYzpmb3JtYXQ9ImltYWdlL3BuZyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgcGhvdG9zaG9wOklDQ1Byb2ZpbGU9IkRpc3BsYXkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OWVmMTg3ZTUtMWVmNy00NzlhLWE1Y2QtMmVkMTE5NjQ2Y2ZmIiB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6MTRmNTk5YTMtYTc1Zi05NDQxLTk3ZDQtMmY3OTNjNWQ3NTI3IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6M2FmYmY3ZWYtNWFiOS00MTk4LWFjODUtNzY2NzE2NDk2ODM1Ij4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDozYWZiZjdlZi01YWI5LTQxOTgtYWM4NS03NjY3MTY0OTY4MzUiIHN0RXZ0OndoZW49IjIwMTgtMDctMjdUMDc6NTY6NDctMDc6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChNYWNpbnRvc2gpIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo5ZWYxODdlNS0xZWY3LTQ3OWEtYTVjZC0yZWQxMTk2NDZjZmYiIHN0RXZ0OndoZW49IjIwMTgtMDctMjdUMDc6NTk6MDgtMDc6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChNYWNpbnRvc2gpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDwvcmRmOlNlcT4gPC94bXBNTTpIaXN0b3J5PiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pr46tjAAAACBSURBVCjPY/j//z8DOgaCVVjFsSgMB2IQIxuvYiBgBuJHUMXfgVgCn+I+qEIYXoxVMRBYoymEYX9sio/hUHz79+/fCMVAUIxDIQy3Q9UxyAPxPwKKQdgEHKZAfI4IvJ8BW+DjwoNFMUkeJCnoSIoUkqOb5IREUhIlOfGTlK0IZVgAkODRpD7i30MAAAAASUVORK5CYII=);
-  background-position: calc(100% - 4px) 50%;
-  background-repeat: no-repeat;
-  background-size: 5px 11px;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/followLog/RecordLog.vue b/code/WebApp/vue/src/views/pg-fis/components/followLog/RecordLog.vue
deleted file mode 100644
index bb6e2c5b..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/followLog/RecordLog.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-  <div v-loading="loading">
-    <div v-empty="list.length === 0">
-      <div class="log-items">
-        <follow-record-cell
-          v-for="(item, index) in list"
-          :item="item"
-          :index="index"
-          :crm-type="crmType"
-          :key="index"
-          @on-handle="cellHandle"/>
-        <div class="load">
-          <el-button
-            :loading="loadMoreLoading"
-            type="text">{{ loadMoreLoading ? '加载更多' : '没有更多了' }}</el-button>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import FollowRecordCell from './components/FollowRecordCell' // 跟进记录
-import { crmLeadsRecordIndex } from '@/api/ux/clue'
-// import { crmCustomerRecordIndex } from '@/api/customermanagement/customer'
-// import { crmContactsRecordIndex } from '@/api/customermanagement/contacts'
-// import { crmBusinessRecordIndex } from '@/api/customermanagement/business'
-// import { crmContractRecordIndex } from '@/api/customermanagement/contract'
-
-export default {
-  /** 线索管理 的 线索详情 的 跟进记录*/
-  name: 'RecordLog',
-  components: {
-    FollowRecordCell
-  },
-  props: {
-    /** 模块ID */
-    id: [String, Number],
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      loadMoreLoading: true,
-      isPost: false,
-      page: 1,
-      list: [] // 跟进记录列表
-    }
-  },
-  computed: {},
-  watch: {
-    id: function(val) {
-      this.refreshList()
-    }
-  },
-  mounted() {
-    this.$bus.on('follow-log-refresh', data => {
-      if (data.type == 'record-log') {
-        this.refreshList()
-      }
-    })
-
-    // 分批次加载
-    const dom = document.getElementById('follow-log-content')
-    dom.onscroll = () => {
-      const scrollOff = dom.scrollTop + dom.clientHeight - dom.scrollHeight
-      // 滚动条到底部的条件
-      if (Math.abs(scrollOff) < 10 && this.loadMoreLoading == true) {
-        if (!this.isPost) {
-          this.isPost = true
-          this.page++
-          this.getList()
-        } else {
-          this.loadMoreLoading = false
-        }
-      }
-    }
-
-   this.getList()
-  },
-  activated: function() {},
-  deactivated: function() {},
-
-  beforeDestroy() {
-    this.$bus.off('follow-log-refresh')
-  },
-  methods: {
-    getList() {
-      this.loading = true
-      const request = {
-        // customer: crmCustomerRecordIndex,
-        leads: crmLeadsRecordIndex,
-        // contacts: crmContactsRecordIndex,
-        // business: crmBusinessRecordIndex,
-        // contract: crmContractRecordIndex
-      }[this.crmType]
-      const params = {
-        page: this.page,
-        limit: 10
-      }
-      params[this.crmType + 'Id'] = this.id
-      request(params)
-        .then(res => {
-          this.list = this.list.concat(res.data)
-          if (res.data.length < 10) {
-            this.loadMoreLoading = false
-          } else {
-            this.loadMoreLoading = true
-          }
-          this.loading = false
-          this.isPost = false
-        })
-        .catch(() => {
-          this.isPost = false
-          this.loading = false
-        })
-    },
-    refreshList() {
-      this.page = 1
-      this.list = []
-      this.getList()
-    },
-    /**
-     * 行布局删除
-     */
-    cellHandle(data) {
-      if (data.type == 'delete') {
-        this.list.splice(data.data.index, 1)
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.log-items {
-  min-height: 400px;
-  position: relative;
-}
-
-.load {
-  color: #999;
-  font-size: 13px;
-  margin: 0 auto 15px;
-  text-align: center;
-  .el-button,
-  .el-button:focus {
-    color: #ccc;
-    cursor: auto;
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/followLog/components/FollowRecordCell.vue b/code/WebApp/vue/src/views/pg-fis/components/followLog/components/FollowRecordCell.vue
deleted file mode 100644
index 20b3ab08..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/followLog/components/FollowRecordCell.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-<template>
-  <div class="fl-c">
-    <flexbox class="fl-h">
-      <div
-        v-photo="{img: item.userImg, realname: item.realname}"
-        v-lazy:background-image="$options.filters.filterUserLazyImg(item.userImg)"
-        class="div-photo fl-h-img"/>
-      <div class="fl-h-b">
-        <div class="fl-h-name">{{ item.realname }}</div>
-        <div class="fl-h-time">{{ item.createTime }}</div>
-      </div>
-      <flexbox class="fl-h-mark">
-        <img
-          class="fl-h-mark-img"
-          src="@/assets/img/follow_record.png" >
-        <div class="fl-h-mark-name">跟进记录</div>
-      </flexbox>
-      <el-dropdown
-        trigger="click"
-        @command="handleCommand">
-        <i
-          style="color:#CDCDCD;margin-left: 8px;"
-          class="el-icon-arrow-down el-icon-more"/>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="delete">删除</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-    </flexbox>
-    <div class="fl-b">
-      <div class="fl-b-content">{{ item.content }}</div>
-      <flexbox
-        v-if="item.img && item.img.length > 0"
-        class="fl-b-images"
-        wrap="wrap">
-        <div
-          v-lazy:background-image="file.filePath"
-          v-for="(file, index) in item.img"
-          :key="file.filePath"
-          class="fl-b-img-item"
-          @click="previewImg(item.img, index)"/>
-      </flexbox>
-      <div
-        v-if="item.file && item.file.length > 0"
-        class="fl-b-files">
-        <flexbox
-          v-for="(file, index) in item.file"
-          :key="index"
-          class="cell">
-          <img
-            class="cell-head"
-            src="@/assets/img/relevance_file.png" >
-          <div class="cell-body">{{ file.name }}<span style="color: #ccc;">（{{ file.size }}）</span></div>
-          <el-button
-            type="primary"
-            icon="el-icon-download"
-            @click="downloadFile(file)">下载</el-button>
-        </flexbox>
-      </div>
-      <div
-        v-if="item.category || item.nextTime"
-        class="follow">
-        <span
-          v-if="item.category"
-          class="follow-info">{{ item.category }}</span>
-        <span
-          v-if="item.nextTime"
-          class="follow-info">{{ item.nextTime }}</span>
-      </div>
-      <div
-        v-if="item.contactsList && item.contactsList.length > 0"
-        class="fl-b-other">
-        <div class="fl-b-other-name">关联联系人</div>
-        <div>
-          <flexbox
-            v-for="(item, index) in item.contactsList"
-            :key="index"
-            class="cell"
-            @click.native="checkRelationDetail('contacts', item.contactsId)">
-            <i
-              :style="{'opacity': index == 0 ? 1 : 0}"
-              class="wukong wukong-contacts cell-head crm-type"/>
-            <div
-              class="cell-body"
-              style="color: #6394E5;cursor: pointer;">{{ item.name }}</div>
-          </flexbox>
-        </div>
-      </div>
-      <div
-        v-if="item.businessList && item.businessList.length > 0"
-        class="fl-b-other">
-        <div class="fl-b-other-name">关联商机</div>
-        <div>
-          <flexbox
-            v-for="(item, index) in item.businessList"
-            :key="index"
-            class="cell"
-            @click.native="checkRelationDetail('business', item.businessId)">
-            <i
-              :style="{'opacity': index == 0 ? 1 : 0}"
-              class="wukong wukong-business cell-head crm-type"/>
-            <div
-              class="cell-body"
-              style="color: #6394E5;cursor: pointer;">{{ item.businessName }}</div>
-          </flexbox>
-        </div>
-      </div>
-      <slot/>
-    </div>
-<!--    <c-r-m-full-screen-detail-->
-<!--      :visible.sync="showFullDetail"-->
-<!--      :crm-type="relationCrmType"-->
-<!--      :id="relationID"/>-->
-  </div>
-</template>
-
-<script>
-// import { downloadFile } from '@/utils'
-// import { crmRecordDelete } from '@/api/customermanagement/common'
-
-export default {
-  /** 客户管理 的 客户详情 的 跟进记录cell*/
-  name: 'FollowRecordCell',
-  components: {
-    // CRMFullScreenDetail: () =>
-    //   import('@/views/customermanagement/components/CRMFullScreenDetail.vue')
-  },
-  props: {
-    item: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: ''
-    },
-    index: [String, Number]
-  },
-  data() {
-    return {
-      showFullDetail: false, // 查看相关客户管理详情
-      relationID: '', // 相关ID参数
-      relationCrmType: '' // 相关类型
-    }
-  },
-  computed: {},
-  mounted() {},
-  methods: {
-    previewImg(list, index) {
-      this.$bus.emit('preview-image-bus', {
-        index: index,
-        data: list.map(function(item, index, array) {
-          item.url = item.filePath
-          return item
-        })
-      })
-    },
-    downloadFile(file) {
-      // downloadFile({ path: file.filePath, name: file.name })
-    },
-    /**
-     * 删除跟进记录
-     */
-    handleCommand(command) {
-      // this.$confirm('确定删除?', '提示', {
-      //   confirmButtonText: '确定',
-      //   cancelButtonText: '取消',
-      //   type: 'warning'
-      // })
-      //   .then(() => {
-      //     crmRecordDelete({
-      //       recordId: this.item.recordId
-      //     })
-      //       .then(res => {
-      //         this.$emit('on-handle', {
-      //           type: command,
-      //           data: { item: this.item, index: this.index }
-      //         })
-      //         this.$message.success('操作成功')
-      //       })
-      //       .catch(() => {})
-      //   })
-      //   .catch(() => {
-      //     this.$message({
-      //       type: 'info',
-      //       message: '已取消操作'
-      //     })
-      //   })
-    },
-    /**
-     * 查看相关客户管理详情
-     */
-    checkRelationDetail(type, id) {
-      this.relationID = id
-      this.relationCrmType = type
-      this.showFullDetail = true
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import '../styles/followcell.scss';
-.follow {
-  .follow-info {
-    padding: 5px 10px;
-    background-color: #f5f7fa;
-    color: #999;
-    height: 40px;
-    line-height: 40px;
-    border-radius: 28px;
-    font-size: 12px;
-    margin-right: 10px;
-  }
-}
-
-.crm-type {
-  color: rgb(99, 148, 229);
-  font-size: 14px;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/followLog/styles/followcell.scss b/code/WebApp/vue/src/views/pg-fis/components/followLog/styles/followcell.scss
deleted file mode 100644
index 3645f72c..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/followLog/styles/followcell.scss
+++ /dev/null
@@ -1,174 +0,0 @@
-/** 跟进记录相关的 日志 审批任务 日程 项目 公共css */
-.fl-c {
-  background-color: white;
-  padding: 10px 20px;
-  position: relative;
-}
-
-/** 头部布局 名字 头像 */
-.fl-h {
-  .fl-h-img {
-    display: block;
-    width: 34px;
-    height: 34px;
-    border-radius: 17px;
-    margin-right: 8px;
-  }
-
-  .fl-h-b {
-    flex: 1;
-
-    .fl-h-name {
-      font-size: 13px;
-      color: #333;
-    }
-
-    .fl-h-time {
-      font-size: 12px;
-      color: #999;
-      margin-top: 3px;
-    }
-  }
-}
-
-/** 头部 右侧 布局*/
-.fl-h-handle {
-  width: auto;
-
-  .fl-h-handle-name {
-    font-size: 13px;
-    color: #333;
-    margin-right: 6px;
-  }
-}
-
-.fl-h-mark {
-  width: auto;
-
-  .fl-h-mark-img {
-    display: block;
-    width: 20px;
-    height: 20px;
-    margin-right: 8px;
-  }
-
-  .fl-h-mark-name {
-    font-size: 13px;
-    color: #333;
-  }
-}
-
-/** 内容区域 */
-.fl-b {
-  margin: 20px 0 0 40px;
-
-  .fl-b-content {
-    font-size: 13px;
-    color: #333;
-    margin-bottom: 10px;
-    white-space: pre-wrap;
-    word-wrap: break-word;
-    letter-spacing: 0.5px;
-    line-height: 18px;
-  }
-
-  .fl-b-images {
-    margin-top: 5px;
-    width: 310px;
-
-    .fl-b-img-item {
-      width: 98px;
-      height: 98px;
-      display: inline-block;
-      margin: 0 4px 4px 0;
-      background-size: contain;
-      background-repeat: no-repeat;
-      background-position: center;
-      position: relative;
-      cursor: pointer;
-    }
-  }
-
-  .fl-b-other {
-    margin: 8px 0;
-
-    .fl-b-other-name {
-      margin: 10px 0;
-      color: #666;
-      font-size: 13px;
-    }
-  }
-}
-
-.fl-c:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #e5e5e5;
-  color: #e5e5e5;
-  -webkit-transform-origin: 0 0;
-  transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-  transform: scaleY(0.5);
-  left: 15px;
-  z-index: 2;
-}
-
-.fl-c:first-child:before {
-  display: none;
-}
-
-/** 附件 */
-.fl-b-files {
-  margin-top: 10px;
-}
-
-/** 关联附件 联系人 客户 行布局 */
-.cell {
-  padding: 8px;
-  background-color: #F5F7FA;
-  border-radius: 2px;
-  position: relative;
-
-  .cell-head {
-    display: block;
-    width: 15px;
-    height: 15px;
-    margin-right: 8px;
-  }
-
-  .cell-body {
-    flex: 1;
-    color: #333;
-    font-size: 12px;
-  }
-
-  .cell-foot {
-    display: block;
-    width: 20px;
-    padding: 0 4px;
-    margin-right: 8px;
-  }
-}
-
-.cell:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #e5e5e5;
-  color: #e5e5e5;
-  -webkit-transform-origin: 0 0;
-  transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-  transform: scaleY(0.5);
-  left: 30px;
-  z-index: 2;
-}
-
-.cell:first-child:before {
-  display: none;
-}
diff --git a/code/WebApp/vue/src/views/pg-fis/components/mixins/message_table.js b/code/WebApp/vue/src/views/pg-fis/components/mixins/message_table.js
deleted file mode 100644
index b1025c84..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/mixins/message_table.js
+++ /dev/null
@@ -1,57 +0,0 @@
-
-export default {
-  components: {},
-  data() {
-    return {
-      loading: false, // 加载动画
-      tableHeight: document.documentElement.clientHeight - 300, // 表的高度
-      total: 0
-    }
-  },
-
-  computed: {
-    // 展示options下拉选择
-    showOptions() {
-      if (this.infoType == 'putInPoolRemind') {
-        return false
-      }
-      return true
-    }
-  },
-
-  mounted() {
-    this.$bus.on('message-scroll', tableHeight => {
-      this.tableHeight = tableHeight
-    })
-
-    this.$bus.on('examine-handle-bus', () => {
-    })
-
-    /** 控制table的高度 */
-    window.onresize = () => {
-      this.updateTableHeight()
-    }
-  },
-
-  beforeDestroy() {
-    this.$bus.off('message-scroll')
-    this.$bus.off('examine-handle-bus')
-
-    if (document.getElementById('crm-table')) {
-      document.getElementById('crm-table').removeEventListener('click', e => {
-        e.stopPropagation()
-      })
-    }
-  },
-
-  methods: {
-    /**
-     * 更新表高
-     */
-    updateTableHeight() {
-      var offsetHei = document.documentElement.clientHeight
-      var removeHeight = Object.keys(this.filterObj).length > 0 ? 360 : 300
-      this.tableHeight = offsetHei - removeHeight
-    }
-  }
-}
diff --git a/code/WebApp/vue/src/views/pg-fis/components/sceneForm/SceneCreate.vue b/code/WebApp/vue/src/views/pg-fis/components/sceneForm/SceneCreate.vue
deleted file mode 100644
index 1b326600..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/sceneForm/SceneCreate.vue
+++ /dev/null
@@ -1,640 +0,0 @@
-<template>
-  <el-dialog
-    :title="edit_id ? '编辑场景' : '新建场景'"
-    :visible.sync="visible"
-    :append-to-body="true"
-    width="800px"
-    @close="handleCancel">
-    <div class="scene-name-container">
-      <div class="scene-name">场景名称</div>
-      <el-input
-        v-model.trim="saveName"
-        :maxlength="10"
-        class="scene-input"
-        placeholder="请输入场景名称，最多10个字符"/>
-    </div>
-    <div class="scene-name">筛选条件</div>
-    <el-form
-      id="scene-filter-container"
-      class="filter-container">
-      <el-form-item>
-        <template v-for="(formItem, index) in form">
-          <el-row :key="index">
-            <el-col :span="8">
-              <el-select
-                v-model="formItem.fieldName"
-                placeholder="请选择要筛选的字段名"
-                @change="fieldChange(formItem)">
-                <el-option
-                  v-for="item in fieldList"
-                  :key="item.fieldName"
-                  :label="item.name"
-                  :value="item.fieldName"/>
-              </el-select>
-            </el-col>
-
-            <el-col
-              v-if="formItem.formType !== 'date' && formItem.formType !== 'datetime' && formItem.formType !== 'business_type'"
-              :span="1">&nbsp;</el-col>
-            <el-col
-              v-if="formItem.formType !== 'date' && formItem.formType !== 'datetime' && formItem.formType !== 'business_type'"
-              :span="4">
-              <el-select
-                v-model="formItem.condition"
-                placeholder="请选择范围">
-                <el-option
-                  v-for="item in calConditionOptions(formItem.formType, formItem)"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-col>
-
-            <!-- 商机组 -->
-            <el-col
-              v-if="formItem.formType == 'business_type'"
-              :span="1">&nbsp;</el-col>
-            <el-col
-              v-if="formItem.formType == 'business_type'"
-              :span="4">
-              <el-select
-                v-model="formItem.typeId"
-                placeholder="请选择"
-                @change="typeOptionsChange(formItem)">
-                <el-option
-                  v-for="item in formItem.typeOption"
-                  :key="item.typeId"
-                  :label="item.name"
-                  :value="item.typeId"/>
-              </el-select>
-            </el-col>
-
-            <el-col :span="1">&nbsp;</el-col>
-            <el-col :span="formItem.formType === 'datetime' || formItem.formType === 'date' ? 13 : 8">
-              <el-select
-                v-if="formItem.formType === 'select'"
-                v-model="formItem.value"
-                placeholder="请选择筛选条件">
-                <el-option
-                  v-for="item in formItem.setting"
-                  :key="item"
-                  :label="item"
-                  :value="item"/>
-              </el-select>
-              <el-select
-                v-else-if="formItem.formType === 'checkStatus'"
-                v-model="formItem.value"
-                placeholder="请选择筛选条件">
-                <el-option
-                  v-for="item in formItem.setting"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"/>
-              </el-select>
-              <el-date-picker
-                v-else-if="formItem.formType === 'date' || formItem.formType === 'datetime'"
-                v-model="formItem.value"
-                :value-format="formItem.formType === 'date' ? 'yyyy-MM-dd' : 'yyyy-MM-dd HH:mm:ss'"
-                :type="formItem.formType === 'date' ? 'daterange' : 'datetimerange'"
-                style="padding: 0px 10px;"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"/>
-              <el-select
-                v-else-if="formItem.formType === 'business_type'"
-                v-model="formItem.statusId"
-                placeholder="请选择">
-                <el-option
-                  v-for="item in formItem.statusOption"
-                  :key="item.statusId"
-                  :label="item.name"
-                  :value="item.statusId"/>
-              </el-select>
-<!--              <xh-user-cell-->
-<!--                v-else-if="formItem.formType === 'user'"-->
-<!--                :item="formItem"-->
-<!--                :value="formItem.value"-->
-<!--                @value-change="userValueChange"/>-->
-              <el-input
-                v-else
-                v-model="formItem.value"
-                placeholder="请输入筛选条件"/>
-            </el-col>
-            <el-col
-              :span="1"
-              class="delete">
-              <i
-                class="el-icon-error delete-btn"
-                @click="handleDelete(index)"/>
-            </el-col>
-          </el-row>
-        </template>
-      </el-form-item>
-    </el-form>
-    <p
-      v-show="showErrors"
-      class="el-icon-warning warning-info">
-      <span class="desc">筛选条件中有重复项！</span>
-    </p>
-    <el-button
-      type="text"
-      @click="handleAdd">+ 添加筛选条件</el-button>
-    <div class="save">
-      <div class="save-setting">
-        <el-checkbox v-model="saveDefault">设置为默认</el-checkbox>
-      </div>
-    </div>
-    <div
-      slot="footer"
-      class="dialog-footer">
-      <el-button @click="handleCancel">取 消</el-button>
-      <el-button
-        type="primary"
-        @click="handleConfirm">确 定</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-// import crmTypeModel from '@/views/ux/model/crmTypeModel'
-// import { crmSceneSave, crmSceneUpdate } from '@/api/customermanagement/common'
-import {
-  objDeepCopy
-} from '@/utils'
-// import { XhUserCell } from '@/components/CreateCom'
-
-/**
- * fieldList: 高级筛选的字段
- *     type:  date || datetime || select || 其他 input
- */
-export default {
-  name: 'SceneCreate', // 新建场景
-  components: {
-    // XhUserCell
-  },
-  props: {
-    dialogVisible: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
-    fieldList: {
-      type: Array,
-      required: true,
-      default: () => {
-        return []
-      }
-    },
-    obj: {
-      type: Object,
-      default: () => {
-        return {}
-      },
-      required: true
-    },
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: ''
-    },
-    /** 名字和 默认 id 编辑的时候需要 */
-    name: {
-      type: String,
-      default: ''
-    },
-    isDefault: {
-      type: Boolean,
-      default: false
-    },
-    edit_id: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      form: [],
-      visible: false, // 控制展示
-      showErrors: false,
-      saveDefault: false, // 设置为默认场景
-      saveName: null // 场景名称
-    }
-  },
-  watch: {
-    dialogVisible: {
-      handler(val) {
-        if (val) {
-          // 处理编辑数据
-          if (this.edit_id) {
-            this.form = []
-            for (const field in this.obj.obj) {
-              const element = this.obj.obj[field]
-              const item = this.getItem()
-              item.fieldName = element.name
-              item.condition = element.condition
-              item.formType = element.formType
-              if (element.formType == 'date') {
-                item.value = [element.start_date, element.end_date]
-              } else if (element.formType == 'datetime') {
-                item.value = [element.start, element.end]
-              } else if (element.formType == 'business_type') {
-                item.typeId = element.typeId
-                item.statusId = element.statusId
-                item.typeOption = element.setting
-                if (element.typeId) {
-                  const obj = element.setting.find(typeItem => {
-                    return typeItem.typeId === element.typeId
-                  })
-                  if (obj) {
-                    item.statusOption = obj.statusList
-                  } else {
-                    item.statusOption = []
-                  }
-                }
-              } else if (element.formType == 'user') {
-                item.value = element.setting ? [element.setting] : []
-              } else {
-                item.setting = element.setting
-                item.value = element.value
-              }
-              this.form.push(item)
-            }
-          } else {
-            this.form = objDeepCopy(this.obj.form)
-            if (this.form.length == 0) {
-              this.form.push(this.getItem())
-            }
-          }
-
-          /** 只有编辑会牵扯到这两个字段赋值 */
-          if (this.name) {
-            this.saveName = this.name
-          } else {
-            this.saveName = ''
-          }
-          if (this.isDefault) {
-            this.saveDefault = this.isDefault
-          } else {
-            this.saveDefault = false
-          }
-        }
-        this.visible = this.dialogVisible
-      },
-      deep: true,
-      immediate: true
-    },
-
-    form() {
-      this.$nextTick(() => {
-        var container = document.getElementById('scene-filter-container')
-        container.scrollTop = container.scrollHeight
-      })
-    }
-  },
-  methods: {
-    getItem() {
-      return {
-        fieldName: '',
-        name: '',
-        formType: '',
-        condition: 'is',
-        value: '',
-        typeOption: [],
-        statusOption: [],
-        typeId: '',
-        statusId: ''
-      }
-    },
-    /**
-     * 商机组状态
-     */
-    typeOptionsChange(formItem) {
-      if (formItem.typeId) {
-        const obj = formItem.typeOption.find(item => {
-          return item.typeId === formItem.typeId
-        })
-        formItem.statusOption = obj.statusList || []
-      } else {
-        formItem.statusOption = []
-      }
-      formItem.statusId = ''
-    },
-    /**
-     * 用户创建人
-     */
-    userValueChange(data) {
-      if (data.value.length > 0) {
-        data.item.value = data.value
-      } else {
-        data.item.value = []
-      }
-    },
-    /** 条件数据源 */
-    calConditionOptions(formType, item) {
-      if (
-        formType == 'select' ||
-        formType == 'checkbox' ||
-        formType == 'user' ||
-        formType == 'checkStatus'
-      ) {
-        return [
-          { value: 'is', label: '等于', disabled: false },
-          { value: 'isNot', label: '不等于', disabled: false }
-        ]
-      } else if (
-        formType == 'module' ||
-        formType == 'text' ||
-        formType == 'textarea'
-      ) {
-        return [
-          { value: 'is', label: '等于', disabled: false },
-          { value: 'isNot', label: '不等于', disabled: false },
-          { value: 'contains', label: '包含', disabled: false },
-          { value: 'notContains', label: '不包含', disabled: false }
-        ]
-      } else if (formType == 'floatnumber' || formType == 'number') {
-        return [
-          { value: 'is', label: '等于', disabled: false },
-          { value: 'isNot', label: '不等于', disabled: false },
-          { value: 'contains', label: '包含', disabled: false },
-          { value: 'notContains', label: '不包含', disabled: false },
-          { value: 'isNull', label: '为空', disabled: false },
-          { value: 'isNotNull', label: '不为空', disabled: false },
-          { value: 'gt', label: '大于', disabled: false },
-          { value: 'egt', label: '大于等于', disabled: false },
-          { value: 'lt', label: '小于', disabled: false },
-          { value: 'elt', label: '小于等于', disabled: false }
-        ]
-      } else {
-        return [
-          { value: 'is', label: '等于', disabled: false },
-          { value: 'isNot', label: '不等于', disabled: false },
-          { value: 'contains', label: '包含', disabled: false },
-          { value: 'notContains', label: '不包含', disabled: false },
-          { value: 'startWith', label: '开始于', disabled: false },
-          { value: 'endWith', label: '结束于', disabled: false },
-          { value: 'isNull', label: '为空', disabled: false },
-          { value: 'isNotNull', label: '不为空', disabled: false },
-          { value: 'gt', label: '大于', disabled: false },
-          { value: 'egt', label: '大于等于', disabled: false },
-          { value: 'lt', label: '小于', disabled: false },
-          { value: 'elt', label: '小于等于', disabled: false }
-        ]
-      }
-    },
-    /**
-     * 当前选择的字段名改变，判断是否有重复
-     * @param formItem
-     */
-    fieldChange(formItem) {
-      const obj = this.fieldList.find(item => {
-        return item.fieldName === formItem.fieldName
-      })
-      if (obj) {
-        formItem.formType = obj.formType
-        formItem.name = obj.name
-        if (formItem.formType == 'business_type') {
-          formItem.typeOption = obj.setting
-          formItem.statusOption = []
-          formItem.typeId = ''
-          formItem.statusId = ''
-        } else if (
-          formItem.formType == 'select' ||
-          formItem.formType == 'checkStatus'
-        ) {
-          formItem.setting = obj.setting || []
-        } else if (
-          formItem.formType === 'date' ||
-          formItem.formType === 'datetime' ||
-          formItem.formType === 'user'
-        ) {
-          formItem.value = []
-        }
-      }
-
-      const arr = this.form.filter(item => {
-        return item.fieldName === formItem.fieldName
-      })
-      if (arr.length > 1) this.showErrors = true
-      else this.showErrors = false
-    },
-    /**
-     * 取消选择
-     */
-    handleCancel() {
-      this.visible = false
-      this.$emit('update:dialogVisible', false)
-    },
-    /**
-     * 确定选择
-     */
-    handleConfirm() {
-      if (this.showErrors) {
-        this.$message.error('筛选条件中有重复项！')
-        return
-      }
-      if (!this.saveName || this.saveName === '') {
-        this.$message.error('场景名称不能为空！')
-        return
-      }
-      for (let i = 0; i < this.form.length; i++) {
-        const o = this.form[i]
-        if (!o.fieldName || o.fieldName === '') {
-          this.$message.error('要筛选的字段名称不能为空！')
-          return
-        }
-
-        if (o.formType == 'business_type') {
-          if (!o.typeId && !o.statusId) {
-            this.$message.error('请输入筛选条件的值！')
-            return
-          }
-        } else if (
-          o.formType == 'date' ||
-          o.formType == 'datetime' ||
-          o.formType == 'user'
-        ) {
-          if (!o.value || o.value.length === 0) {
-            this.$message.error('请输入筛选条件的值！')
-            return
-          }
-        } else if (!o.value) {
-          this.$message.error('请输入筛选条件的值！')
-          return
-        }
-      }
-      const obj = {}
-      this.form.forEach(o => {
-        if (o.formType == 'datetime' || o.formType == 'date') {
-          obj[o.fieldName] = {
-            start: o.value[0],
-            end: o.value[1],
-            formType: o.formType,
-            name: o.fieldName
-          }
-        } else if (o.formType == 'business_type') {
-          obj[o.fieldName] = {
-            typeId: o.typeId,
-            statusId: o.statusId,
-            formType: o.formType,
-            name: o.fieldName
-          }
-        } else if (o.formType == 'user') {
-          obj[o.fieldName] = {
-            condition: o.condition,
-            value: o.value[0].userId,
-            formType: o.formType,
-            setting: o.value[0],
-            name: o.fieldName
-          }
-        } else {
-          obj[o.fieldName] = {
-            condition: o.condition,
-            value: o.value,
-            formType: o.formType,
-            name: o.fieldName
-          }
-        }
-      })
-      const data = {
-        obj: obj,
-        form: this.form,
-        saveDefault: this.saveDefault,
-        saveName: this.saveName
-      }
-      this.requestCreateScene(data)
-    },
-    // 创建场景
-    requestCreateScene(data) {
-      /** 编辑操作 */
-      if (this.edit_id) {
-        // crmSceneUpdate({
-        //   isDefault: data.saveDefault ? 1 : 0,
-        //   name: data.saveName,
-        //   sceneId: this.edit_id,
-        //   data: JSON.stringify(data.obj)
-        // })
-        //   .then(res => {
-        //     this.$message({
-        //       type: 'success',
-        //       message: '编辑成功'
-        //     })
-        //     // 新建成功
-        //     this.$emit('saveSuccess')
-        //     this.handleCancel()
-        //   })
-        //   .catch(() => {})
-      } else {
-        // crmSceneSave({
-        //   type: crmTypeModel[this.crmType],
-        //   isDefault: data.saveDefault ? 1 : 0,
-        //   name: data.saveName,
-        //   data: JSON.stringify(data.obj)
-        // })
-        //   .then(res => {
-        //     this.$message({
-        //       type: 'success',
-        //       message: '创建成功'
-        //     })
-        //     // 新建成功
-        //     this.$emit('saveSuccess')
-        //     this.handleCancel()
-        //   })
-        //   .catch(() => {})
-      }
-    },
-    /**
-     * 添加筛选条件
-     */
-    handleAdd() {
-      this.form.push(this.getItem())
-    },
-    /**
-     * 删除筛选条件
-     * @param index
-     */
-    handleDelete(index) {
-      this.$confirm('您确定要删除这一条数据吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.form.splice(index, 1)
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  /deep/ .el-dialog__body {
-    padding: 10px 20px;
-  }
-
-  /deep/ .el-form-item__label {
-    width: 100%;
-    text-align: left;
-  }
-  .filter-container {
-    max-height: 200px;
-    overflow-y: auto;
-  }
-
-  .save {
-    margin-top: 10px;
-    .name {
-      width: 300px;
-      margin-left: 10px;
-      /deep/ .el-input__inner {
-        height: 32px;
-      }
-    }
-    .save-setting {
-      margin-top: 20px;
-    }
-  }
-
-  .el-form-item {
-    margin-bottom: 0;
-  }
-
-  .el-row {
-    margin-bottom: 20px;
-    .delete-btn {
-      margin-left: 15px;
-      color: #bbb;
-      cursor: pointer;
-    }
-    .el-select,
-    .el-date-editor {
-      width: 100%;
-    }
-  }
-
-  .warning-info {
-    width: 100%;
-    font-size: 14px;
-    color: #f56c6c;
-    margin-top: 10px;
-    .desc {
-      padding-left: 8px;
-    }
-  }
-
-  .scene-name-container {
-    padding-bottom: 15px;
-    .scene-input {
-      width: 300px;
-    }
-  }
-  .scene-name {
-    margin-bottom: 10px;
-  }
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/sceneForm/SceneList.vue b/code/WebApp/vue/src/views/pg-fis/components/sceneForm/SceneList.vue
deleted file mode 100644
index 569143d1..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/sceneForm/SceneList.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-  <div class="scene-container">
-    <div class="scene-list">
-      <div
-        v-for="(item, index) in sceneList"
-        :key="index"
-        :class="{'scene-list-item-select':item.sceneId == sceneSelectId}"
-        class="scene-list-item"
-        @click="selectScene(item, index)">
-        {{ item.name }}
-      </div>
-    </div>
-    <div>
-      <flexbox
-        class="handle-button"
-        @click.native="addScene">
-        <img
-          class="handle-button-icon"
-          src="@/assets/img/scene_add.png" >
-        <div class="handle-button-name">新建场景</div>
-      </flexbox>
-      <flexbox
-        class="handle-button"
-        @click.native="setScene">
-        <img
-          class="handle-button-icon"
-          src="@/assets/img/scene_set.png" >
-        <div class="handle-button-name">管理</div>
-      </flexbox>
-    </div>
-
-  </div>
-</template>
-
-<script type="text/javascript">
-// import crmTypeModel from '@/views/ux/model/crmTypeModel'
-import { mapGetters } from 'vuex'
-import { crmSceneIndex } from '@/api/ux/common'
-
-export default {
-  name: 'SceneList', // 客户管理下 重要提醒 回款计划提醒
-  components: {},
-  props: {
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      // 场景列表
-      sceneSelectId: -1,
-      sceneList: []
-    }
-  },
-  computed: {
-    // ...mapGetters(['crm'])
-  },
-  watch: {},
-  mounted() {
-      this.getSceneList()
-  },
-  methods: {
-    getSceneList() {
-      crmSceneIndex()
-        .then(res => {
-          const defaultScenes = res.data.filter(function(item, index) {
-            return item.isDefault === 1
-          })
-
-          if (defaultScenes && defaultScenes.length > 0) {
-            const defaultScene = defaultScenes[0]
-            this.sceneSelectId = defaultScene.sceneId
-            this.$emit('scene', {
-              id: defaultScene.sceneId,
-              name: defaultScene.name,
-              bydata: defaultScene.bydata || ''
-            })
-          } else {
-            this.sceneSelectId = ''
-            this.$emit('scene', { id: '', name: '', bydata: '' })
-          }
-
-          this.sceneList = res.data
-        })
-        .catch(() => {
-          this.$emit('scene', { id: '', name: '', bydata: '' })
-        })
-    },
-
-    // 选择场景、
-    selectScene(item, index) {
-      this.sceneSelectId = item.sceneId
-      this.$emit('scene', {
-        id: item.sceneId,
-        name: item.name,
-        bydata: item.bydata
-      })
-      this.$emit('hidden-scene')
-    },
-    // 添加场景
-    addScene() {
-      this.$emit('scene-handle', { type: 'add' })
-    },
-    // 设置场景
-    setScene() {
-      this.$emit('scene-handle', { type: 'set' })
-    }
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.scene-container {
-  position: relative;
-  width: 150px;
-}
-
-.scene-list {
-  max-height: 240px;
-  overflow-y: auto;
-  font-size: 12px;
-  .scene-list-item {
-    color: #333;
-    padding: 10px 15px;
-    cursor: pointer;
-    background-color: white;
-  }
-  .scene-list-item:hover {
-    background-color: #1682e6;
-    color:#f7f8fa;
-  }
-
-  .scene-list-item-select {
-    color: #f7f8fa;
-    background-color: #1682e6;
-  }
-}
-
-.handle-button {
-  padding: 10px 20px;
-  cursor: pointer;
-  .handle-button-icon {
-    display: block;
-    width: 15px;
-    height: 15px;
-    margin-right: 8px;
-  }
-  .handle-button-name {
-    font-size: 12px;
-  }
-}
-.handle-button:hover {
-  color: #3E84E9;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/sceneForm/SceneSet.vue b/code/WebApp/vue/src/views/pg-fis/components/sceneForm/SceneSet.vue
deleted file mode 100644
index aea9a02a..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/sceneForm/SceneSet.vue
+++ /dev/null
@@ -1,648 +0,0 @@
-<template>
-  <el-dialog
-    :visible.sync="visible"
-    :append-to-body="true"
-    title="场景管理"
-    width="700px"
-    @close="handleCancel">
-    <div class="scene-name">您可通过拖拽管理标签</div>
-    <flexbox class="scene-list">
-      <div class="scene-list-box">
-        <flexbox class="scene-list-head">
-          <el-checkbox
-            :indeterminate="isleftIndeterminate"
-            v-model="checkleftAll"
-            @change="handleleftCheckAllChange"/>
-          <div class="scene-list-head-name">显示的标签</div>
-          <div class="scene-list-head-detail">{{ leftCheckItems.length + '/' + checkedLeftData.length }}</div>
-        </flexbox>
-        <div class="scene-list-body">
-          <flexbox
-            v-for="(item, index) in checkedLeftData"
-            v-if="item.isSystem == 1"
-            :key="index"
-            class="list-item">
-            <div
-              :class="{'default-mark-active': item.sceneId == defaultId}"
-              class="default-mark"/>
-            <el-checkbox
-              v-model="item.check"
-              :disabled="true"
-              class="list-item-check"
-              @change="leftCheckItemChange"/>
-            <div class="list-item-name">{{ item.name }}</div>
-            <div class="list-item-handle">
-              <el-dropdown
-                trigger="click"
-                @command="defaultHandle">
-                <i
-                  class="el-icon-arrow-down"
-                  @click="itemHandle('default', item, index)"/>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item>设置为默认标签</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </div>
-          </flexbox>
-          <draggable
-            v-model="checkedLeftData"
-            :move="leftMove"
-            :options="{group: 'list',forceFallback:false, fallbackClass:'draggingStyle'}"
-            style="min-height: 100px;"
-            @end="leftMoveEnd">
-            <flexbox
-              v-for="(item, index) in checkedLeftData"
-              v-if="item.isSystem != 1"
-              :key="index"
-              class="list-item">
-              <div
-                :class="{'default-mark-active': item.sceneId == defaultId}"
-                class="default-mark"/>
-              <el-checkbox
-                v-model="item.check"
-                class="list-item-check"
-                @change="leftCheckItemChange"/>
-              <div class="list-item-name">{{ item.name }}</div>
-              <div class="list-item-handle">
-                <i
-                  class="el-icon-edit"
-                  @click="itemHandle('edit', item, index)"/>
-                <i
-                  class="el-icon-delete"
-                  @click="itemHandle('delete', item, index)"/>
-                <el-dropdown @command="defaultHandle">
-                  <i
-                    class="el-icon-arrow-down"
-                    @click="itemHandle('default', item, index)"/>
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item>设置为默认标签</el-dropdown-item>
-                  </el-dropdown-menu>
-                </el-dropdown>
-              </div>
-            </flexbox>
-          </draggable>
-
-        </div>
-      </div>
-      <div class="scene-middle-list">
-        <el-button
-          :class="{'scene-middle-button-select':rightCheckItems.length > 0}"
-          :disabled="rightCheckItems.length == 0"
-          class="scene-middle-left-button"
-          @click="changePositon('left')">
-          <i class="el-icon-arrow-left scene-middle-icon"/>
-        </el-button>
-        <el-button
-          :class="{'scene-middle-button-select':leftCheckItems.length > 0}"
-          :disabled="leftCheckItems.length == 0"
-          class="scene-middle-right-button"
-          @click="changePositon('right')">
-          <i class="el-icon-arrow-right scene-middle-icon"/>
-        </el-button>
-      </div>
-      <div class="scene-list-box">
-        <flexbox class="scene-list-head">
-          <el-checkbox
-            :indeterminate="isrightIndeterminate"
-            v-model="checkrightAll"
-            @change="handlerightCheckAllChange"/>
-          <div class="scene-list-head-name">隐藏的标签</div>
-          <div class="scene-list-head-detail">{{ rightCheckItems.length + '/' + checkedRightData.length }}</div>
-        </flexbox>
-        <div class="scene-list-body">
-          <draggable
-            v-model="checkedRightData"
-            :move="rightMove"
-            :options="{group: 'list',forceFallback:false, fallbackClass:'draggingStyle'}"
-            style="min-height: 100px;"
-            @end="rightMoveEnd">
-            <flexbox
-              v-for="(item, index) in checkedRightData"
-              :key="index"
-              class="list-item">
-              <el-checkbox
-                v-model="item.check"
-                style="margin-left:9px;"
-                class="list-item-check"
-                @change="rightCheckItemChange"/>
-              <div class="list-item-name">{{ item.name }}</div>
-            </flexbox>
-          </draggable>
-        </div>
-      </div>
-    </flexbox>
-    <div class="handle-bar">
-      <div
-        class="handle-bar-add"
-        @click="addAndEditScene('add',{})">+ 新建场景</div>
-      <div class="handle-bar-save">
-        <el-button @click.native="handleCancel">取消</el-button>
-        <el-button
-          type="primary"
-          @click.native="handleConfirm">保存</el-button>
-      </div>
-    </div>
-    <scene-create
-      :field-list="fieldList"
-      :crm-type="crmType"
-      :dialog-visible.sync="showCreateScene"
-      :obj="filterObj"
-      :name="filterName"
-      :edit_id="filterEditId"
-      :is-default="filterDefault"
-      @saveSuccess="getSceneList"/>
-  </el-dialog>
-</template>
-
-<script type="text/javascript">
-// import crmTypeModel from '@/views/ux/model/crmTypeModel'
-// import {
-//   crmSceneSetIndex,
-//   crmSceneSort,
-//   crmSceneDefaults,
-//   crmSceneDelete,
-//   filterIndexfields
-// } from '@/api/customermanagement/common'
-import draggable from 'vuedraggable'
-import SceneCreate from './SceneCreate' // 新建编辑场景
-
-export default {
-  name: 'SceneSet', // 场景 设置
-  components: {
-    draggable,
-    SceneCreate
-  },
-  props: {
-    dialogVisible: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
-    /** 没有值就是全部类型 有值就是当个类型 */
-    crmType: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      defaultId: '', // 默认场景id
-      visible: false, // 控制展示
-      isleftIndeterminate: false, // 标注头部是多选框效果
-      checkleftAll: false, // 关联全选操作多选框
-
-      checkedLeftData: [], // 数据源
-      leftCheckItems: [], // 选择的数据源
-
-      isrightIndeterminate: false,
-      checkrightAll: false,
-
-      checkedRightData: [],
-      rightCheckItems: [],
-
-      moveItem: {}, // 移动中的item
-      handlDefaultItem: {}, // 设置默认的中间item
-
-      /** 添加 编辑 场景 */
-      showCreateScene: false, // 展示场景添加
-      fieldList: [],
-      filterObj: { form: [] }, // 筛选确定数据
-      filterName: '',
-      filterDefault: false,
-      filterEditId: '' // 编辑id
-    }
-  },
-  computed: {},
-  watch: {
-    dialogVisible: {
-      handler(val) {
-        this.visible = val
-        if (val) {
-          this.getSceneList()
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  mounted() {},
-  methods: {
-    getSceneList() {
-      // crmSceneSetIndex({
-      //   type: crmTypeModel[this.crmType]
-      // })
-      //   .then(res => {
-      //     this.checkedLeftData = res.data.value.map(function(item, index) {
-      //       item.check = false
-      //       return item
-      //     })
-      //     this.checkedRightData = res.data.hide_value.map(function(
-      //       item,
-      //       index
-      //     ) {
-      //       item.check = false
-      //       return item
-      //     })
-      //     var defaultScene = this.checkedLeftData.filter(function(item, index) {
-      //       return item.isDefault == 1
-      //     })
-      //     // 如果有默认场景
-      //     if (defaultScene && defaultScene.length > 0) {
-      //       this.defaultId = defaultScene[0].sceneId
-      //     } else {
-      //       this.defaultId = ''
-      //     }
-      //   })
-      //   .catch(() => {})
-    },
-    /**
-     * 确定选择
-     */
-    handleConfirm() {
-      // 如果选择默认的 不包含在左侧列表 重置为没有默认
-      var self = this
-      var leftTemps = this.checkedLeftData.filter(function(item, index) {
-        return item.sceneId == self.defaultId
-      })
-      if (leftTemps.length == 0) {
-        this.defaultId = ''
-      }
-      // crmSceneSort({
-      //   type: crmTypeModel[this.crmType],
-      //   noHideIds: this.checkedLeftData
-      //     .map(function(item, index, array) {
-      //       return item.sceneId
-      //     })
-      //     .join(','),
-      //   hideIds: this.checkedRightData
-      //     .map(function(item, index, array) {
-      //       return item.sceneId
-      //     })
-      //     .join(',')
-      // })
-      //   .then(res => {
-      //     this.$message({
-      //       type: 'success',
-      //       message: '操作成功'
-      //     })
-      //     this.handleCancel()
-      //     this.$emit('save-success')
-      //   })
-      //   .catch(() => {})
-    },
-    /** 事项操作 */
-    itemHandle(type, item, index) {
-      if (type == 'edit') {
-        this.addAndEditScene('edit', item)
-      } else if (type == 'delete') {
-        this.$confirm('您确定要删除这一条数据吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            crmSceneDelete({
-              sceneId: item.sceneId
-            })
-              .then(res => {
-                this.$message({
-                  type: 'success',
-                  message: '删除成功'
-                })
-                this.checkedLeftData.splice(index, 1)
-                this.leftCheckItemChange()
-                this.$emit('save-success')
-              })
-              .catch(() => {})
-          })
-          .catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消删除'
-            })
-          })
-      } else if (type == 'default') {
-        this.handlDefaultItem = item
-      }
-    },
-    /** 操作默认 */
-    defaultHandle() {
-      crmSceneDefaults({
-        sceneId: this.handlDefaultItem.sceneId
-      })
-        .then(res => {
-          this.$message({
-            type: 'success',
-            message: '操作成功'
-          })
-          this.defaultId = this.handlDefaultItem.sceneId
-        })
-        .catch(() => {})
-    },
-    /** 添加编辑场景 */
-    addAndEditScene(type, data) {
-      // filterIndexfields({
-      //   label: crmTypeModel[this.crmType]
-      // })
-      //   .then(res => {
-      //     this.fieldList = res.data
-      //     if (type == 'edit') {
-      //       this.filterObj = { form: [], obj: data.data }
-      //       this.filterName = data.name
-      //       this.filterDefault = data.isDefault == 1
-      //       this.filterEditId = data.sceneId.toString()
-      //     } else {
-      //       this.filterObj = { form: [] }
-      //       this.filterEditId = ''
-      //       this.filterName = ''
-      //       this.filterDefault = false
-      //     }
-      //     this.showCreateScene = true
-      //   })
-      //   .catch(() => {})
-    },
-    /**
-     * 取消选择
-     */
-    handleCancel() {
-      this.visible = false
-      this.$emit('update:dialogVisible', false)
-    },
-    /** 拖拽操作 */
-    rightMoveEnd(evt) {
-      this.moveItem.check = false
-      this.leftCheckItemChange()
-      this.rightCheckItemChange()
-    },
-    rightMove(obj) {
-      this.moveItem = obj.draggedContext.element
-    },
-    leftMoveEnd(evt) {
-      this.moveItem.check = false
-      this.leftCheckItemChange()
-      this.rightCheckItemChange()
-    },
-    leftMove(obj) {
-      this.moveItem = obj.draggedContext.element
-    },
-    // 选择全部
-    handleleftCheckAllChange(value) {
-      if (value) {
-        this.isleftIndeterminate = false
-      }
-      this.checkedLeftData = this.checkedLeftData.filter(function(
-        item,
-        index,
-        array
-      ) {
-        item.check = value
-        return item
-      })
-      this.leftCheckItems = value ? this.checkedLeftData : []
-    },
-    leftCheckItemChange() {
-      this.leftCheckItems = this.checkedLeftData.filter(function(
-        item,
-        index,
-        array
-      ) {
-        return item.check == true
-      })
-      if (this.leftCheckItems.length > 0) {
-        if (this.leftCheckItems.length == this.checkedLeftData.length) {
-          this.checkleftAll = true
-          this.isleftIndeterminate = false
-        } else {
-          this.checkleftAll = false
-          this.isleftIndeterminate = true
-        }
-      } else {
-        this.checkleftAll = false
-        this.isleftIndeterminate = false
-      }
-    },
-    // 选择全部
-    handlerightCheckAllChange(value) {
-      if (value) {
-        this.isrightIndeterminate = false
-      }
-      this.checkedRightData = this.checkedRightData.filter(function(
-        item,
-        index,
-        array
-      ) {
-        item.check = value
-        return item
-      })
-      this.rightCheckItems = value ? this.checkedRightData : []
-    },
-    rightCheckItemChange() {
-      this.rightCheckItems = this.checkedRightData.filter(function(
-        item,
-        index,
-        array
-      ) {
-        return item.check == true
-      })
-      if (this.rightCheckItems.length > 0) {
-        if (this.rightCheckItems.length == this.checkedRightData.length) {
-          this.checkrightAll = true
-          this.isrightIndeterminate = false
-        } else {
-          this.checkrightAll = false
-          this.isrightIndeterminate = true
-        }
-      } else {
-        this.checkrightAll = false
-        this.isrightIndeterminate = false
-      }
-    },
-    // 按钮操作
-    changePositon(type) {
-      var self = this
-      // 从右往左
-      if (type == 'left') {
-        this.checkedRightData = this.checkedRightData.filter(function(
-          item,
-          index,
-          array
-        ) {
-          var remove = false
-          self.rightCheckItems.forEach(function(element, index) {
-            if (item.sceneId == element.sceneId) {
-              remove = true
-            }
-          })
-          return !remove
-        })
-
-        this.rightCheckItems.forEach(function(element, index) {
-          element.check = false
-          self.checkedLeftData.push(element)
-        })
-
-        this.rightCheckItems = []
-        this.isrightIndeterminate = false
-        this.checkrightAll = false
-
-        // 刷新左侧效果
-        this.leftCheckItemChange()
-        this.rightCheckItemChange()
-      } else {
-        this.checkedLeftData = this.checkedLeftData.filter(function(
-          item,
-          index,
-          array
-        ) {
-          var remove = false
-          self.leftCheckItems.forEach(function(element, index) {
-            if (item.sceneId == element.sceneId) {
-              remove = true
-            }
-          })
-          return !remove
-        })
-
-        this.leftCheckItems.forEach(function(element, index) {
-          element.check = false
-          self.checkedRightData.push(element)
-        })
-
-        this.leftCheckItems = []
-        this.isleftIndeterminate = false
-        this.checkleftAll = false
-
-        // 刷新右侧效果
-        this.leftCheckItemChange()
-        this.rightCheckItemChange()
-      }
-    }
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.scene-name {
-  font-size: 12px;
-  padding-bottom: 5px;
-  color: #aaa;
-}
-
-.default-mark {
-  width: 4px;
-  height: 4px;
-  border-radius: 2px;
-  margin-right: 5px;
-}
-.default-mark-active {
-  background-color:#3E84E9;
-}
-
-.scene-list {
-  .scene-list-box {
-    flex: 1;
-    border: 1px solid #3E84E9;
-    border-radius: 2px;
-    height: 300px;
-    position: relative;
-    padding: 15px;
-  }
-  .scene-middle-list {
-    width: 50px;
-    text-align: center;
-    button {
-      border: 1px solid #cccccc;
-      width: 34px;
-      height: 34px;
-      border-radius: 17px;
-      background-color: #f5f7fa;
-    }
-    .scene-middle-icon {
-      color: #cccccc;
-      font-size: 14px;
-    }
-    .scene-middle-left-button {
-    }
-    .scene-middle-right-button {
-      margin-top: 15px;
-      margin-left: 0;
-    }
-
-    .scene-middle-button-select {
-      border: 1px solid #3E84E9 !important;
-      background-color: #3E84E9 !important;
-      .scene-middle-icon {
-        color: white !important;
-      }
-    }
-  }
-  .scene-list-head {
-    padding-bottom: 15px;
-    padding-left: 9px;
-    border-bottom: 1px dashed #3E84E9;
-    font-size: 13px;
-    .scene-list-head-name {
-      color: #333;
-      flex: 1;
-      margin: 0 8px;
-    }
-
-    .scene-list-head-detail {
-      color: #aaa;
-    }
-  }
-  .scene-list-body {
-    padding: 5px 0;
-    height: 240px;
-    position: relative;
-    overflow-y: auto;
-  }
-
-  .list-item {
-    padding: 5px 0;
-    cursor: pointer;
-    .list-item-check {
-      margin-right: 8px;
-    }
-    .list-item-name {
-      font-size: 13px;
-      color: #333;
-      flex: 1;
-    }
-    .list-item-handle {
-      flex-shrink: 0;
-      display: none;
-      i {
-        color: #aaa;
-        font-size: 12px;
-        margin-right: 5px;
-      }
-      i:hover {
-        color: #3E84E9;
-      }
-    }
-  }
-
-  .list-item:hover {
-    .list-item-handle {
-      display: block;
-    }
-  }
-}
-
-.handle-bar {
-  font-size: 12px;
-  .handle-bar-add {
-    cursor: pointer;
-    color: #3e84e9;
-    padding: 20px 10px;
-  }
-  .handle-bar-save {
-    position: relative;
-    height: 30px;
-    button {
-      float: right;
-      margin-right: 10px;
-    }
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/components/tableDetail/index.vue b/code/WebApp/vue/src/views/pg-fis/components/tableDetail/index.vue
deleted file mode 100644
index fef42597..00000000
--- a/code/WebApp/vue/src/views/pg-fis/components/tableDetail/index.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag 
-    :visible.sync="visible"
-    :close-on-click-modal="false"
-    title="详细信息"
-    width="900px"
-    height="300px"
-    :append-to-body="true">  
-    <div
-      slot="footer"
-      class="dialog-footer">
-       <crm-base-info
-        :is="tabName"
-        :detail="data"
-        :id="id"
-        :crm-type="crmType">
-        </crm-base-info>
-      <el-button >取 消</el-button>
-      <el-button
-        type="primary"
-        >确 定</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import CRMBaseInfo from '../CRMBaseInfo' // 基本信息
- 
-export default {
-  name: 'Index',
-  components: {
-    CRMBaseInfo
-  },
-  props: {
-    dialogVisible: {
-    type: Boolean,
-    required: true,
-    default: false
-    },
-    detailData: {},    
-  },
-  data() {
-    return{
-        visible: false, 
-        data:{},
-        tabName:'',
-        id: [String, Number],
-    }
-  },
-   watch: {
-    dialogVisible: {
-      handler(val) {
-        if (val) {
-        
-        }
-        this.visible = this.dialogVisible
-      },
-    },
-    detailData:{
-        handler(val) {
-            this.data=this.detailData;
-        }
-    }
-  },
-  methods: {
-  }
-}
-</script>
-
-<style lang="scss">
- 
-</style>
diff --git a/code/WebApp/vue/src/views/pg-fis/styles/crmdetail.scss b/code/WebApp/vue/src/views/pg-fis/styles/crmdetail.scss
deleted file mode 100644
index 23885c79..00000000
--- a/code/WebApp/vue/src/views/pg-fis/styles/crmdetail.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-//客户相关详情 头部类似布局
-.el-tabs /deep/ .el-tabs__nav-wrap::after {
-  display: none !important;
-}
-
-.el-tabs /deep/ .el-tabs__header {
-  background-color: #F5F6F9;
-  padding: 0 17px;
-  margin: 0 0 15px !important;
-}
-
-.el-tabs /deep/ .el-tabs__item {
-  font-size: 13px !important;
-  height: 40px !important;
-  line-height: 40px !important;
-}
-
-.d-container {
-  position: relative;
-  height: 100%;
-}
-
-/** 让element 查询到的标签 */
-.t-loading-content {
-  position: relative;
-  overflow-y: scroll;
-  flex: 1;
-}
-
-/** 审核信息 */
-.examine-info {
-  padding: 0 17px 17px 17px;
-
-  .examine-info-border {
-    border: 1px solid #e6e6e6;
-    border-radius: 3px;
-    padding: 17px;
-  }
-}
diff --git a/code/WebApp/vue/src/views/pg-fis/styles/crmtable.scss b/code/WebApp/vue/src/views/pg-fis/styles/crmtable.scss
deleted file mode 100644
index 5d83e892..00000000
--- a/code/WebApp/vue/src/views/pg-fis/styles/crmtable.scss
+++ /dev/null
@@ -1,120 +0,0 @@
-.cr-body-content {
-  margin: 2px ;
-  position: relative;
-  background-color: white;
-  overflow-x: auto;
-  //border-bottom: 1px solid $xr-border-line-color;
-}
-.el-table .cell {
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-.content-header {
-  position: relative;
-  padding: 10px 20px;
-  .search-container {
-    margin: 0 20px;
-    width: 200px;
-  }
-  .create-button {
-    position: absolute;
-    right: 10px;
-    top: 15px;
-  }
-}
-
-.right-container {
-  margin-right: -10px;
-  float: right;
-  margin: 2px;
-  position: relative;
-  .right-item {
-    float: left;
-    margin-right: 10px;
-    padding: 8px 10px;
-    font-size: 13px;
-    border-radius: 2px;
-  }
-
-  .right-more-item {
-    cursor: pointer;
-    border: 1px solid #e6e1dc;
-    background-color: rgb(255, 255, 255);
-    font-size: 13px;
-    color: #777;
-    padding: 0 12px;
-    border-radius: 2px;
-    height: 31px;
-  }
-}
-
-//表尾 上一页按钮
-.table-footer {
-  padding: 1px 20px;
-}
-
-// .el-table /deep/ thead th {
-//   font-weight: 400;
-//   font-size: 12px;
-// }
-.el-table /deep/ thead th {
-  background-color: #fafdff;
-  font-weight: 400;
-  border-color: #E6E6E6;
-  color: #475059;
-  font-size: 12px;
-}
-
-.el-table /deep/ tbody tr td {
-  border-top-color: transparent;
-  border-left-color: transparent;
-  border-right-color: transparent;
-  border-bottom-color: #E6E6E6;
-  font-size: 13px;
-}
-
-.el-table /deep/ thead .el-checkbox {
-  display: inline;
-}
-
-body .el-table th.gutter {
-  display: table-cell !important;
-}
-
-.el-table /deep/ .el-table__body-wrapper {
-  height: calc(100% - 58px) !important;
-}
-
-.n-table--border {
-  border-color: #e6e6e6;
-  border-left-color: transparent;
-  border-right-color: transparent;
-}
-
-.n-table--border::after {
-  display: none;
-}
-
-.el-dropdown-link {
-  cursor: pointer;
-  color: #409EFF;
-}
-.el-icon-arrow-down {
-  font-size: 12px;
-}
-.demonstration {
-  display: block;
-  color: #8492a6;
-  font-size: 14px;
-  margin-bottom: 20px;
-}
-
-.link-type,
-.link-type:focus {
-  color: #337ab7;
-  cursor: pointer;
-
-  &:hover {
-    color: rgb(32, 160, 255);
-  }
-}
\ No newline at end of file
diff --git a/code/WebApp/vue/src/views/pg-fis/styles/detailview.scss b/code/WebApp/vue/src/views/pg-fis/styles/detailview.scss
deleted file mode 100644
index c08cb019..00000000
--- a/code/WebApp/vue/src/views/pg-fis/styles/detailview.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  /** 客户管理详情页面的 css 侧滑进入的详情 */
-  .d-view {
-    position: fixed;
-    width: 60%;
-    top: 45px;
-    bottom: 0px;
-    right: 0px;
-  }
diff --git a/code/WebApp/vue/src/views/pg-fis/styles/file.scss b/code/WebApp/vue/src/views/pg-fis/styles/file.scss
deleted file mode 100644
index a4539c9d..00000000
--- a/code/WebApp/vue/src/views/pg-fis/styles/file.scss
+++ /dev/null
@@ -1,131 +0,0 @@
-/** 附件  */
-.f-container {
-  padding: 0 17px;
-}
-.f-item {
-  padding: 3px 0;
-  height: 35px;
-  .f-img {
-    position: block;
-    width: 30px;
-    height: 30px;
-    padding: 0 1px;
-    margin-right: 8px;
-  }
-  .f-name {
-    color: #666;
-    font-size: 12px;
-    margin-right: 10px;
-  }
-}
-.xh-files-cont {
-    position: relative;
-    display: inline-block;
-    border-radius: 3px;
-    width: 100%;
-    border: 1px solid #ddd;
-    padding: 3.5px 5px;
-    margin: 3px;
-    line-height: 15px;
-  }
-
-  .xh-files-cont.is_disabled {
-    background-color: #f5f7fa;
-    border-color: #e4e7ed;
-    cursor: not-allowed;
-    .f-name {
-      background-color: #f0f4f8ea;
-      color: #c0c4cc;
-      cursor: not-allowed;
-    }
-  }
-
-  .xh-files-cont.is_valid:hover {
-    border-color: #c0c4cc;
-  }
-
-  .f-header {
-    cursor: pointer;
-    padding: 5px 0 5px;
-    .f-logo {
-      position: block;
-      width: 15px;
-      height: 15px;
-      margin-right: 8px;
-    }
-    .f-name {
-      color: #3e84e9;
-      font-size: 12px;
-    }
-  }
-  .f-header.is_disabled {
-    cursor: not-allowed;
-  }
-
-  .f-body {
-    .f-item {
-      padding: 3px 0;
-      height: 25px;
-      .f-img {
-        position: block;
-        width: 15px;
-        height: 15px;
-        padding: 0 1px;
-        margin-right: 8px;
-      }
-      .f-name {
-        color: #666;
-        font-size: 12px;
-      }
-      .close-button {
-        cursor: pointer;
-      }
-    }
-  }
-
-  .bar-iput {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 0;
-    width: 0;
-    opacity: 0;
-  }
-
-  .b-cont {
-    position: relative;
-    padding: 0 50px 20px 20px;
-  }
-
-  .b-cells {
-    margin-top: 25px;
-  }
-
-  .b-cell {
-    padding: 0 10px;
-    .b-cell-b {
-      width: auto;
-      padding: 8px;
-      .b-cell-name {
-        width: 100px;
-        margin-top: 13px;
-        margin-right: -5px;
-        font-size: 13px;
-        flex-shrink: 0;
-        color: #777;
-      }
-      .b-cell-value {
-        font-size: 13px;
-        color: #333;
-        white-space: pre-wrap;
-        word-wrap: break-word;
-      }
-      .b-cell-foot {
-        flex-shrink: 0;
-        display: block;
-        width: 15px;
-        height: 15px;
-        margin-left: 8px;
-      }
-    }
-  }
diff --git a/code/WebApp/vue/src/views/pg-fis/styles/followcell.scss b/code/WebApp/vue/src/views/pg-fis/styles/followcell.scss
deleted file mode 100644
index ddcfd42a..00000000
--- a/code/WebApp/vue/src/views/pg-fis/styles/followcell.scss
+++ /dev/null
@@ -1,170 +0,0 @@
-/** 跟进记录相关的 日志 审批任务 日程 项目 公共css */
-.fl-c {
-  background-color: white;
-  padding: 10px 20px;
-  position: relative;
-}
-
-/** 头部布局 名字 头像 */
-.fl-h {
-  .fl-h-img {
-    display: block;
-    width: 34px;
-    height: 34px;
-    border-radius: 17px;
-    margin-right: 8px;
-  }
-
-  .fl-h-b {
-    flex: 1;
-
-    .fl-h-name {
-      font-size: 13px;
-      color: #333;
-    }
-
-    .fl-h-time {
-      font-size: 12px;
-      color: #999;
-      margin-top: 3px;
-    }
-  }
-}
-
-/** 头部 右侧 布局*/
-.fl-h-handle {
-  width: auto;
-
-  .fl-h-handle-name {
-    font-size: 13px;
-    color: #333;
-    margin-right: 6px;
-  }
-}
-
-.fl-h-mark {
-  width: auto;
-
-  .fl-h-mark-img {
-    display: block;
-    width: 20px;
-    height: 20px;
-    margin-right: 8px;
-  }
-
-  .fl-h-mark-name {
-    font-size: 13px;
-    color: #333;
-  }
-}
-
-/** 内容区域 */
-.fl-b {
-  margin: 20px 0 0 40px;
-
-  .fl-b-content {
-    font-size: 13px;
-    color: #333;
-    margin-bottom: 10px;
-  }
-
-  .fl-b-images {
-    margin-top: 5px;
-    width: 310px;
-
-    .fl-b-img-item {
-      width: 98px;
-      height: 98px;
-      display: inline-block;
-      margin: 0 4px 4px 0;
-      background-size: contain;
-      background-repeat: no-repeat;
-      background-position: center;
-      position: relative;
-      cursor: pointer;
-    }
-  }
-
-  .fl-b-other {
-    margin: 8px 0;
-
-    .fl-b-other-name {
-      margin: 10px 0;
-      color: #666;
-      font-size: 13px;
-    }
-  }
-}
-
-.fl-c:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #e5e5e5;
-  color: #e5e5e5;
-  -webkit-transform-origin: 0 0;
-  transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-  transform: scaleY(0.5);
-  left: 15px;
-  z-index: 2;
-}
-
-.fl-c:first-child:before {
-  display: none;
-}
-
-/** 附件 */
-.fl-b-files {
-  margin-top: 10px;
-}
-
-/** 关联附件 联系人 客户 行布局 */
-.cell {
-  padding: 8px;
-  background-color: #F5F7FA;
-  border-radius: 2px;
-  position: relative;
-
-  .cell-head {
-    display: block;
-    width: 15px;
-    height: 15px;
-    margin-right: 8px;
-  }
-
-  .cell-body {
-    flex: 1;
-    color: #333;
-    font-size: 12px;
-  }
-
-  .cell-foot {
-    display: block;
-    width: 20px;
-    padding: 0 4px;
-    margin-right: 8px;
-  }
-}
-
-.cell:before {
-  content: " ";
-  position: absolute;
-  top: 0;
-  right: 0;
-  height: 1px;
-  border-top: 1px solid #e5e5e5;
-  color: #e5e5e5;
-  -webkit-transform-origin: 0 0;
-  transform-origin: 0 0;
-  -webkit-transform: scaleY(0.5);
-  transform: scaleY(0.5);
-  left: 30px;
-  z-index: 2;
-}
-
-.cell:first-child:before {
-  display: none;
-}
diff --git a/code/WebApp/vue/src/views/pg-fis/styles/followlog.scss b/code/WebApp/vue/src/views/pg-fis/styles/followlog.scss
deleted file mode 100644
index 7fa5f031..00000000
--- a/code/WebApp/vue/src/views/pg-fis/styles/followlog.scss
+++ /dev/null
@@ -1,86 +0,0 @@
-// 跟进记录效果
-.f-container {
-  padding: 0 17px;
-}
-
-/** 发布行css  */
-.se-section {
-  position: relative;
-  margin: 5px 0;
-  height: 40px;
-  line-height: 40px;
-
-  .se-name {
-    font-size: 12px;
-    color: #333333;
-    margin-right: 5px;
-  }
-
-  .se-select {
-    border: 1px solid #dcdfe6;
-    font-size: 12px;
-    color: #606266;
-    padding: 0 8px;
-    border-radius: 2px;
-    font-weight: 500;
-    height: 25px;
-
-    .se-select-name {
-      margin-right: 20px;
-    }
-  }
-
-  .se-datepicker {
-    font-size: 12px;
-    width: 200px;
-    margin-right: 20px;
-  }
-
-  .se-send {
-    position: absolute;
-    right: 0;
-    padding: 5px 15px;
-  }
-}
-
-.el-date-editor /deep/ .el-input__inner {
-  height: 25px;
-  line-height: 25px;
-}
-
-.el-date-editor /deep/ .el-input__icon {
-  height: 25px;
-  line-height: 25px;
-}
-
-.el-checkbox /deep/ .el-checkbox__label {
-  font-size: 12px;
-  color: #333333;
-}
-
-.log-cont {
-  margin: 0px 0;
-  border: 1px solid #e6e6e6;
-  border-radius: 2px;
-
-  .log-tabs-item {
-    font-size: 13px;
-    padding: 8px 15px;
-    cursor: pointer;
-  }
-
-  .log-tabs-item:hover {
-    color: #F18C70 !important;
-  }
-
-  .log-tabs-line {
-    height: 10px;
-    background-color: #e6e6e6;
-    width: 2px;
-  }
-}
-
-.log-items {
-  min-height: 400px;
-  position: relative;
-}
diff --git a/code/WebApp/vue/src/views/pg-fis/styles/relativecrm.scss b/code/WebApp/vue/src/views/pg-fis/styles/relativecrm.scss
deleted file mode 100644
index 0d90ab64..00000000
--- a/code/WebApp/vue/src/views/pg-fis/styles/relativecrm.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-/**客户下相关信息 table 效果 */
-.rc-cont {
-    position: relative;
-    padding: 0 20px 20px 20px;
-    .rc-head {
-        margin-bottom: 15px;
-        position: relative;
-        .rc-head-item {
-            font-size: 12px;
-            padding: 8px 5px;
-            border-radius: 2px;
-            margin-right: 20px;
-            margin-left: 0px;
-        }
-        .rc-head-item:first-child {
-            margin-right: 0;
-        }
-    }
-}
-
-.el-table /deep/ thead th{
-    background-color: #F5F5F5;
-    font-weight: 400;
-    font-size: 12px;
-}
-
-.el-table /deep/ tbody{
-    font-size: 13px;
-}
diff --git a/code/WebApp/vue/src/views/pg-fis/styles/table.scss b/code/WebApp/vue/src/views/pg-fis/styles/table.scss
deleted file mode 100644
index 4c513cbe..00000000
--- a/code/WebApp/vue/src/views/pg-fis/styles/table.scss
+++ /dev/null
@@ -1,129 +0,0 @@
-@import './detailview.scss';
-
-.crm-container {
-  background-color: white;
-  border: 1px solid #E6E6E6;
-  border-radius: 2px;
-}
-
-/**
-  .el-table /deep/ thead th {
-    border-right: 1px solid #ebeef5;
-  }
-
-  .el-table /deep/ tbody tr td:nth-child(2){
-    border-right: 1px solid #ebeef5;
-  }
-
-  .b-bottom {
-    border-bottom: 1px solid #ebeef5;
-  }
-  */
-
-.el-table /deep/ thead th {
-  //background-color: #fafdff;
-  //font-weight: 400;
-  //border-color: #E6E6E6;
-  //color: #475059;
-    background-color: #61687a;
-    font-weight: 400;
-    border-color: #fff;
-    color: #fff;
-  font-size: 12px;
-}
-
-.table-set {
-  width: 15px;
-  margin-top: 5px;
-  cursor: pointer;
-}
-
-.table-head-name {
-  font-size: 14px;
-  color: #475059;
-  line-height: 23px;
-  padding: 0;
-}
-
-.el-table /deep/ thead .cell {
-  height: 23px;
-}
-
-.el-table /deep/ .el-table__row.current-row {
-  td:first-child::before {
-    content: ' ';
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    width: 2px;
-    background-color: #5383ED;
-  }
-}
-
-.el-table /deep/ tbody tr td {
-  border-top-color: transparent;
-  border-left-color: transparent;
-  border-right-color: transparent;
-  border-bottom-color: #E6E6E6;
-  font-size: 13px;
-}
-
-.el-table /deep/ tbody tr td:nth-child(2) {
-  border-right: 1px solid #E6E6E6;
-}
-
-.n-table--border {
-  border-color: #E6E6E6;
-  border-left-color: transparent;
-  border-right-color: transparent;
-}
-
-.n-table--border::after {
-  display: none;
-}
-
-.p-contianer {
-  position: relative;
-  background-color: white;
-  height: 44px;
-
-  .p-bar {
-    float: right;
-    margin: 5px 100px 0 0;
-    font-size: 14px !important;
-  }
-}
-
-// 列表状态
-.status_button {
-  padding: 1px 6px;
-  border: 1px solid #e6e6e6;
-  border-radius: 4px;
-  display: inline-block;
-  font-size: 12px;
-  margin: 0 auto;
-}
-
-.el-table /deep/ .sort-caret.ascending {
-  top: 0px;
-}
-.el-table /deep/ .sort-caret.descending{
-  bottom: 2px;
-}
-.el-table /deep/ .caret-wrapper {
-  height: 24px;
-}
-
-.el-table /deep/ .warning-row {
-  background: #e3ecf3;
-}
-.el-table /deep/ .success-row {
-  background: #f4f8fd;
-}
-.el-table /deep/ thead {
-   background: #61687a;
-}
-.el-table /deep/ th.gutter {
-  display: table-cell!important;
-}
diff --git a/code/WebApp/vue/src/views/storage/local/index.vue b/code/WebApp/vue/src/views/storage/local/index.vue
index daf83289..9c388817 100644
--- a/code/WebApp/vue/src/views/storage/local/index.vue
+++ b/code/WebApp/vue/src/views/storage/local/index.vue
@@ -212,9 +212,14 @@ export default {
       });
       this.loading = false;
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .gets(config.storage.ip + "/api/app/file", this.listQuery)
         .then((response) => {
diff --git a/code/WebApp/vue/src/views/tenant/index.vue b/code/WebApp/vue/src/views/tenant/index.vue
index 87b038d3..ebc91f92 100644
--- a/code/WebApp/vue/src/views/tenant/index.vue
+++ b/code/WebApp/vue/src/views/tenant/index.vue
@@ -144,9 +144,14 @@ export default {
     this.getList();
   },
   methods: {
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .gets("/api/multi-tenancy/tenants", this.listQuery)
         .then((response) => {
diff --git a/code/WebApp/vue/src/views/user-branch/index.rar b/code/WebApp/vue/src/views/user-branch/index.rar
new file mode 100644
index 00000000..b7480c0c
Binary files /dev/null and b/code/WebApp/vue/src/views/user-branch/index.rar differ
diff --git a/code/WebApp/vue/src/views/user-branch/index20210302.rar b/code/WebApp/vue/src/views/user-branch/index20210302.rar
new file mode 100644
index 00000000..edc54f76
Binary files /dev/null and b/code/WebApp/vue/src/views/user-branch/index20210302.rar differ
diff --git a/code/WebApp/vue/src/views/user-branch/index20210303-1.rar b/code/WebApp/vue/src/views/user-branch/index20210303-1.rar
new file mode 100644
index 00000000..8a7422ad
Binary files /dev/null and b/code/WebApp/vue/src/views/user-branch/index20210303-1.rar differ
diff --git a/code/WebApp/vue/src/views/user-branch/index20210303.rar b/code/WebApp/vue/src/views/user-branch/index20210303.rar
new file mode 100644
index 00000000..f0f3de36
Binary files /dev/null and b/code/WebApp/vue/src/views/user-branch/index20210303.rar differ
diff --git a/code/WebApp/vue/src/views/user/index.vue b/code/WebApp/vue/src/views/user/index.vue
index 00c06ffd..6ab37e08 100644
--- a/code/WebApp/vue/src/views/user/index.vue
+++ b/code/WebApp/vue/src/views/user/index.vue
@@ -66,7 +66,7 @@
             </el-form-item>
             <el-form-item label="电话" prop="phoneNumber">
               <el-input
-                v-model="form.phoneNumber"
+                v-model.number="form.phoneNumber"
                 style="width: 184px"
                 maxlength="20"
               />
@@ -398,7 +398,6 @@ export default {
       },
       filterText: "",
       form: Object.assign({}, defaultForm),
-      //form: {},
       list: null,
       orgName: "",
       orgs: [],
@@ -425,7 +424,7 @@ export default {
       multipleSelection: [],
       formTitle: "",
       isEdit: false,
-      tableHeight: document.documentElement.clientHeight - 270, // 表的高度
+      tableHeight: document.documentElement.clientHeight - 370, // 表的高度
       treeHeight: document.documentElement.clientHeight - 150, // 表的3度
       treeHeight2: document.documentElement.clientHeight - 150,
       currentroleMessage: [],
@@ -438,7 +437,7 @@ export default {
     var self = this;
     /** 控制table的高度 */
     window.onresize = function () {
-      self.tableHeight = document.documentElement.clientHeight - 270;
+      self.tableHeight = document.documentElement.clientHeight - 370;
       self.treeHeight = document.documentElement.clientHeight - 150;
       self.treeHeight2 = document.documentElement.clientHeight - 150;
     };
@@ -501,7 +500,7 @@ export default {
     },
     fetchData(id) {
       //this.getAllRoles();
-      //this.getOrgNodes();
+      this.getOrgNodes();
       //this.getJobs()
       this.$axios.gets("/api/base/user/" + id).then((response) => {
         this.form = response;
@@ -612,7 +611,6 @@ export default {
                 this.formLoading = false;
               });
           } else {
-            console.log(JSON.stringify(this.form))
             this.$axios
               .posts("/api/base/user", this.form)
               .then((response) => {
@@ -639,7 +637,7 @@ export default {
       this.dialogFormVisible = true;
       this.getAllRoles();
       //this.getJobs()
-      //this.getOrgNodes();
+      this.getOrgNodes();
     },
     handleDelete(row) {
       if (row) {
@@ -757,9 +755,9 @@ export default {
       } else {
         if (val && val.id) {
           //this.fetchData(val.id);
-          //this.fetchUserforRole(val.id);
-          //this.fetchUserforOrg(val.id);
-          //this.getRoleRulesInfo();
+          this.fetchUserforRole(val.id);
+          this.fetchUserforOrg(val.id);
+          this.getRoleRulesInfo();
         }
       }
     },
diff --git a/code/WebApp/vue/src/views/ux/backGroundWork/detail.vue b/code/WebApp/vue/src/views/ux/backGroundWork/detail.vue
index afce0f57..4b66e451 100644
--- a/code/WebApp/vue/src/views/ux/backGroundWork/detail.vue
+++ b/code/WebApp/vue/src/views/ux/backGroundWork/detail.vue
@@ -85,42 +85,6 @@ export default {
     },
   },
   methods: {
-        /**
-     * 导出类型的文件
-     */
-    sideClick(param) {
-      let fileNameOfProject = param;
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出成功！",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出成功！",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
-    },
     /** 格式化字段 */
     fieldFormatter(row, column) {
       return row[column.property] || "--";
diff --git a/code/WebApp/vue/src/views/ux/backGroundWork/index.vue b/code/WebApp/vue/src/views/ux/backGroundWork/index.vue
index 40b881db..901323a7 100644
--- a/code/WebApp/vue/src/views/ux/backGroundWork/index.vue
+++ b/code/WebApp/vue/src/views/ux/backGroundWork/index.vue
@@ -1,26 +1,55 @@
 <!--零件匹配关系页-->
 <template>
   <div class="cr-body-content">
-    <div style="float: left">
-      <flexbox class="content-header">
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleCreate"
-          >条件查询
-        </el-button>
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-search"
-          size="mini"
-          style="margin-left: 15px"
-          @click="searchALl()"
-          >查询全部任务信息
-        </el-button>
-        <!-- <el-tooltip class="item" effect="dark" content="手动刷新" placement="top">
+    <flexbox class="content-header">
+      <!-- <span style="margin-right: -15px">任务状态过滤：</span>
+      <el-select
+        v-model="selectValue"
+        size="small"
+        placeholder="选择任务状态过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
+      >
+        <el-option label="执行成功" value="Succeeded"></el-option>
+        <el-option label="执行失败" value="Failed"></el-option>
+        <el-option label="执行中" value="Processing"></el-option>
+        <el-option label="等待执行" value="Enqueued"></el-option>
+      </el-select>
+      <span style="margin-right: -15px"> 操作名称过滤：</span>
+      <el-select
+        v-model="selectNameValue"
+        size="small"
+        placeholder="选择操作名称过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectNameOptionsChange"
+      >
+        <el-option label="导入" value="导入"></el-option>
+        <el-option label="导出" value="导出"></el-option>
+        <el-option label="消息" value="消息"></el-option>
+      </el-select> -->
+
+      <!-- <el-button
+        type="danger"
+        plain
+        icon="el-icon-delete"
+        size="mini"
+        v-permission="['SettleAccount.MaterialRelationships.Delete']"
+        @click="handleDelete()"
+        >批量删除
+      </el-button>
+      <el-button
+        type="warning"
+        plain
+        icon="el-icon-download"
+        size="mini"
+        @click="handleDownload()"
+        >导出
+      </el-button> -->
+      <el-tooltip class="item" effect="dark" content="手动刷新" placement="top">
         <el-button
           size="mini"
           circle
@@ -30,31 +59,24 @@
       </el-tooltip>
       <span style="margin-left: 10px; color: #ff5640"
         >说明：每间隔一分钟进行自动刷新！</span
-      > -->
-        <!-- 刷新 -->
-      </flexbox>
-    </div>
-    <div style="float: right">
-      <flexbox class="content-header">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="手动刷新"
-          placement="top"
-        >
-          <el-button
-            size="mini"
-            circle
-            icon="el-icon-refresh"
-            @click="refresh()"
-          />
-        </el-tooltip>
-
-        <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
-        >
-      </flexbox>
-    </div>
+      >
+      <!-- <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照任务名称搜索..."
+        style="width: 250px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button> -->
+    </flexbox>
 
     <!--表格渲染-->
     <el-table
@@ -138,8 +160,8 @@
         width="165"
         column-key="stateName"
         :filters="[
-          { text: '执行完成(任务成功)', value: 'Succeeded' },
-          { text: '执行完成(任务失败)', value: 'Failed' },
+          { text: '执行完成(成功)', value: 'Succeeded' },
+          { text: '执行完成(失败)', value: 'Failed' },
           { text: '执行中', value: 'Processing' },
           { text: '等待执行', value: 'Enqueued' },
         ]"
@@ -151,53 +173,16 @@
             v-for="(item, index) in stateNameCateMap"
             v-show="scope.row.stateName == item.value"
             :key="index"
-            :type="item.cssName"
+            :type="item.cssName"reduce
           >
             {{ item.label }}
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="left" width="280">
+      <el-table-column label="操作" align="center" width="280">
         <template slot-scope="scope">
           <el-button
-            v-if="
-              scope.row.actionName == '导出' &&
-              scope.row.stateName == 'Succeeded' &&
-              scope.row.downFileName != ''
-            "
-            size="mini"
-            type="text"
-            @click="handleDownload(scope.row)"
-            icon="el-icon-edit"
-            >下载</el-button
-          >
-          <el-button
-            v-if="
-              scope.row.actionName == '导出' &&
-              scope.row.error != '' &&
-              scope.row.stateName == 'Succeeded'
-            "
-            size="mini"
-            type="text"
-            @click="handleDownload(scope.row)"
-            icon="el-icon-edit"
-            >检验失败，下载</el-button
-          >
-          <el-button
-            v-if="
-              scope.row.actionName == '导入' &&
-              scope.row.error != '' &&
-              scope.row.stateName == 'Succeeded'
-            "
-            size="mini"
-            type="text"
-            @click="handleDownload(scope.row)"
-            icon="el-icon-edit"
-            >检验失败，下载</el-button
-          >
-          <el-button
-            v-if="scope.row.actionName != '导出'"
-            size="mini"
+            size="mini"22
             type="text"
             icon="el-icon-view"
             @click="handleView(scope.row)"
@@ -283,27 +268,15 @@
                               <div id="chatarea">
                                 <div
                                   style="display: inline; color: #71d87f"
-                                  v-if="
-                                    form.stateName == 'Succeeded' &&
-                                    form.error == ''
-                                  "
+                                  v-if="form.stateName == 'Succeeded'"
                                 >
-                                  执行结果：任务执行成功
-                                </div>
-                                <div
-                                  style="display: inline; color: #ff5640"
-                                  v-if="
-                                    form.stateName == 'Succeeded' &&
-                                    form.error != ''
-                                  "
-                                >
-                                  执行结果：任务执行成功(检验失败)
+                                  执行结果：执行成功
                                 </div>
                                 <div
                                   style="display: inline; color: #ff5640"
                                   v-else-if="form.stateName == 'Failed'"
                                 >
-                                  执行结果：任务执行失败
+                                  执行结果：执行失败
                                 </div>
                               </div>
                             </div>
@@ -331,7 +304,7 @@
                                   ></el-date-picker>
                                 </el-form-item>
                               </el-col>
-                              <!-- <el-col :span="24">
+                              <el-col :span="24">
                                 <el-form-item
                                   label="异常信息："
                                   style="color: #ff5640"
@@ -344,22 +317,7 @@
                                     >下载错误数据</el-button
                                   >
                                 </el-form-item>
-                                <el-form-item
-                                  label="生成数据："
-                                  style="color: #ff5640"
-                                  v-else-if="
-                                    form.stateName == 'Succeeded' &&
-                                    form.actionName == '导出'
-                                  "
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.downFileName)"
-                                    >下载生成数据</el-button
-                                  >
-                                </el-form-item>
-                              </el-col> -->
+                              </el-col>
                             </div>
                           </el-card>
                         </div>
@@ -388,81 +346,6 @@
         <el-button @click="openView = false">关 闭</el-button>
       </div>
     </el-dialog>
-    <!--表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="550px"
-    >
-      <el-form ref="formCount" :inline="true" :model="formCount" size="mini">
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="任务编号" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="taskId">
-              <el-input v-model="formCount.taskId" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="模块名称" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="name">
-              <el-input v-model="formCount.name" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="创建人" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="creator">
-              <el-input v-model="formCount.creator" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row>
-          <el-col :xs="24">
-            <el-form-item prop="version" label="请选择日期：">
-              <el-date-picker
-                v-model="ReceiveTimeVale"
-                size="small"
-                style="width: 240px"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24">
-            <el-form-item prop="version" label="结算状态：">
-              <el-radio-group v-model="form.resource">
-                <el-radio label="未结"></el-radio>
-                <el-radio label="部分结算"></el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -475,18 +358,17 @@ import moment from "moment";
 import Detail from "./detail.vue";
 
 export default {
-  name: "BackGroundWork",
+  name: "PartsSettlement",
   components: { Pagination, CRMTableHead, Detail },
   directives: { permission },
 
   data() {
     return {
-      crmType: "backJob",
+      crmType: "materialRelation",
       selectValue: "",
       selectNameValue: "",
       // 是否显示详细弹出层
       openView: false,
-      formTitle: "",
       timer: null, //定时器名称
       //当前位置
       activeIndex: 1,
@@ -510,7 +392,6 @@ export default {
       customerInfos: "",
       searchContent: "", // 输入内容
       form: {},
-      formCount: {},
       list: null,
       totalCount: 0,
       listLoading: true,
@@ -524,6 +405,7 @@ export default {
       },
       listQuery: {
         taskId: "",
+        stateName: "",
       },
       page: 1,
       dialogFormVisible: false,
@@ -536,9 +418,9 @@ export default {
         { label: "消息", value: "消息", cssName: "info" },
       ],
       stateNameCateMap: [
-        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
+        { label: "执行完成(成功)", value: "Succeeded", cssName: "success" },
         { label: "执行中...", value: "Processing", cssName: "primary" },
-        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
+        { label: "执行完成(失败)", value: "Failed", cssName: "danger" },
         { label: "等待执行", value: "Enqueued", cssName: "warning" },
       ],
     };
@@ -553,7 +435,7 @@ export default {
       this.listQuery.taskId = "";
       this.listQuery.stateName = "";
       setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
+    }, 1000 * 60); //1分钟刷新一次页面
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
@@ -578,7 +460,7 @@ export default {
       tempsTabs.push({
         label: "模块名称",
         prop: "name",
-        width: 200,
+        width: 100,
       });
       // tempsTabs.push({
       //   label: "操作名称",
@@ -609,50 +491,6 @@ export default {
     },
   },
   methods: {
-    resetForm(formName) {
-      this.formCount = {};
-    },
-    save() {
-      console.log("参数:" + JSON.stringify(this.formCount));
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.formCount)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-          this.dialogFormVisible = false;
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    handleCreate() {
-      // this.$nextTick(() => {
-      //   this.$refs["formCount"].resetFields();
-      // });
-      this.formTitle = "条件查询";
-      this.isEdit = false;
-      this.form = {};
-      this.dialogFormVisible = true;
-    },
-    searchALl() {
-      this.listLoading = true;
-      this.listQuery.taskId = "";
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
     filterHandler(value, row, column) {
       const property = column["property"];
       return row[property] === value;
@@ -698,41 +536,41 @@ export default {
       }
     },
     /**
-     * 导出类型的文件
+     * 下载错误模板
      */
     downloadErrData(param) {
       let fileNameOfProject = param;
-      console.log("下载文件名称：" + fileNameOfProject);
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出成功！",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出成功！",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
+      alert(fileNameOfProject);
+      // this.$axios
+      //   .BolbGets(
+      //     "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+      //   )
+      //   .then((response) => {
+      //     if (fileNameOfProject.indexOf("_") != -1) {
+      //       let downName =
+      //         fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
+      //         fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+      //       downloadFile(response, downName);
+      //       this.$notify({
+      //         title: "成功",
+      //         message: "错误数据-导出成功！",
+      //         type: "success",
+      //         duration: 2000,
+      //       });
+      //     } else {
+      //       downloadFile(response, fileNameOfProject);
+      //       this.$notify({
+      //         title: "成功",
+      //         message: "错误数据-导出成功！",
+      //         type: "success",
+      //         duration: 2000,
+      //       });
+      //     }
+      //     this.listLoading = false;
+      //   })
+      //   .catch((error) => {
+      //     this.listLoading = false;
+      //   });
     },
     selectOptionsChange(params) {
       //   if (params != "") {
@@ -802,21 +640,30 @@ export default {
       }
       return row[column.property] || "--";
     },
-    handleDownload(row) {
-      if (row.stateName == "Succeeded" && row.actionName == "导出") {
-        this.downloadErrData(row.downFileName);
-      } else if (
-        row.stateName == "Succeeded" &&
-        row.error != "" &&
-        row.actionName == "导入"
-      ) {
-        this.downloadErrData(row.error);
-      }
+    async handleDownload() {
+      this.listLoading = true;
+      this.$axios
+        .posts("/api/settleaccount/MaterialRelationship/Export", this.listQuery)
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              downloadFile(response, fileNameOfProject);
+              this.$notify({
+                title: "成功",
+                message: "数据-导出成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.listLoading = false;
+            });
+        });
     },
     getList() {
       this.listLoading = true;
-      //导入界面中超链接过来的参数
-      this.listQuery.taskId = JSON.stringify(this.$route.params.taskId);
       //this.listQuery.SkipCount = (this.page - 1) * 10;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
@@ -896,5 +743,8 @@ export default {
 @import "../styles/crmtable.scss";
 @import "../styles/steps.scss";
 </style>
-
+<style lang="scss">
+.el-table .cell.el-tooltip {
+  white-space: pre-wrap;
+}
 </style>
diff --git a/code/WebApp/vue/src/views/ux/basedata/Invoice/index.vue b/code/WebApp/vue/src/views/ux/basedata/Invoice/index.vue
deleted file mode 100644
index 412f62e5..00000000
--- a/code/WebApp/vue/src/views/ux/basedata/Invoice/index.vue
+++ /dev/null
@@ -1,588 +0,0 @@
-<!--发票导入功能-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <XhJSSelect
-        :options="versionList"
-        style="width: 200px"
-        class="search-container"
-        @value-change="selectValue"
-      ></XhJSSelect>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload2"
-        @click="handleImportExcel()"
-        >导入文件（Excel）
-      </el-button>
-      <!-- <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-download"
-        @click="handleDownload()"
-        >导出Excel
-      </el-button> -->
-      <el-dropdown
-        size="small"
-        class="filter-item"
-        style="margin-left: 15px; font-weight: bold"
-        @command="handleCommand"
-      >
-        <span class="el-dropdown-link">
-          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="excel" icon="el-icon-plus"
-            >导出Excel</el-dropdown-item
-          >
-          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
-            >导出Csv</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
-      <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照零件号搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button>
-      <!--表格头组件，filter查询-->
-      <c-r-m-table-head
-        ref="crmTableHead"
-        :crm-type="crmType"
-        @handle="handleHandle"
-        @filter="handleFilters"
-      >
-      </c-r-m-table-head>
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-base";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import Lockr from "lockr";
-import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
-
-export default {
-  name: "Invoices",
-  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "invoice",
-      versionValue: "",
-      versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        site: "TH",
-        userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        fileType: 0,
-        userId: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
-    };
-  },
-  created() {
-    this.getVersionInfo();
-    if (this.versionList == []) {
-      this.getList();
-    }
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
-      tempsTabs.push({ label: "物料号", prop: "materialCode", width: 150 });
-      tempsTabs.push({
-        label: "零件名称",
-        prop: "materialDesc",
-        width: 280,
-      });
-      tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
-      tempsTabs.push({ label: "金额", prop: "amt", width: 120 });
-      return tempsTabs;
-    },
-    MoreTypes() {
-      var moreTypes = [];
-      moreTypes.push({ type: "updateFis", name: "更新FIS结算数据" });
-      //moreTypes.push({ type: "enter", name: "新按钮" });
-      return moreTypes;
-    },
-  },
-  methods: {
-    handleCommand(command) {
-      if (this.versionValue === "") {
-        this.$message.error("请先选择版本！");
-        return;
-      }
-      switch (command) {
-        case "excel":
-          this.listQuery.fileType = 1; //0是csv,1是excel
-          break;
-        case "csv":
-          this.listQuery.fileType = 0; //0是csv,1是excel
-          break;
-        default:
-          //这里是没有找到对应的值处理
-          break;
-      }
-      this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("发票导出：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/settleaccount/Invoices/Export", this.listQuery)
-        .then((res) => {
-          let fileNameOfProject = res;
-          this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
-            .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
-                let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, fileNameOfProject);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    //导出功能
-    // async handleDownload() {
-    //   this.listLoading = true;
-    //   if (this.versionValue === "") {
-    //     this.$message.error("必需选择版本！");
-    //     this.listLoading = false;
-    //     return;
-    //   }
-    //   if (this.versionValue != "") {
-    //     this.listQuery.version = this.versionValue;
-    //   }
-    //   console.log("发票导出：" + JSON.stringify(this.listQuery));
-    //   this.$axios
-    //     .posts("/api/settleaccount/Invoices/Export", this.listQuery)
-    //     .then((res) => {
-    //       let fileNameOfProject = res;
-    //       this.$axios
-    //         .BolbGets(
-    //           "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-    //         )
-    //         .then((response) => {
-    //           if (fileNameOfProject.indexOf("_") != -1) {
-    //             let downName =
-    //               fileNameOfProject.slice(
-    //                 0,
-    //                 fileNameOfProject.lastIndexOf("_")
-    //               ) +
-    //               fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-    //             downloadFile(response, downName);
-    //             this.$notify({
-    //               title: "成功",
-    //               message: "数据-导出成功！",
-    //               type: "success",
-    //               duration: 2000,
-    //             });
-    //           } else {
-    //             downloadFile(response, fileNameOfProject);
-    //             this.$notify({
-    //               title: "成功",
-    //               message: "数据-导出成功！",
-    //               type: "success",
-    //               duration: 2000,
-    //             });
-    //           }
-    //           this.listLoading = false;
-    //         });
-    //     });
-    // },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    getVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/Invoices/listVersion", this.listQuery)
-        .then((response) => {
-          this.versionList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.id;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-          if (JSON.stringify(this.versionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    handleImportExcel() {
-      //导入
-      this.showExcelImport = true;
-      this.$refs.importexcel.handleImportExcelClick();
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "state") {
-        return { 0: "其他", 2: "已结" }[row[column.property]];
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/settleaccount/Invoices/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios.gets("/api/settleaccount/Invoices/" + id).then((response) => {
-        this.form = response;
-      });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "materialCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    /** 多项筛选操作 */
-    /** 筛选操作 */
-    handleFilters(data) {
-      if (data === null) {
-        this.listQuery.Filters = [];
-        this.getList(); //查询所有
-      } else {
-        this.filterObj = data;
-        console.log("筛选" + JSON.stringify(data));
-        var offsetHei = document.documentElement.clientHeight;
-        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
-        this.tableHeight = offsetHei - removeHeight;
-        this.currentPage = 1;
-        let Filter = [];
-        data.forEach((item) => {
-          let filter = {};
-          if (item.formType === "datetime" || item.formType === "datetime") {
-            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
-
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
-            }
-          } else {
-            filter["Column"] = item.fieldName;
-            filter["Value"] = item.value;
-            filter["Logic"] = 0;
-            filter["Action"] = item.action;
-            Filter.push(filter);
-          }
-        });
-        console.log("筛选条件" + JSON.stringify(Filter));
-        this.listQuery.Filters = Filter;
-        this.getList();
-      }
-    },
-    resetQuery() {},
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      // if (column.property === "qty") {
-      //   return { textAlign: "right" };
-      // } else {
-      //   return { textAlign: "left" };
-      // }
-      return { textAlign: "left" };
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/ux/basedata/bomdatabase/index.vue b/code/WebApp/vue/src/views/ux/basedata/bomdatabase/index.vue
index 7bee58dc..10e3c4b2 100644
--- a/code/WebApp/vue/src/views/ux/basedata/bomdatabase/index.vue
+++ b/code/WebApp/vue/src/views/ux/basedata/bomdatabase/index.vue
@@ -2,13 +2,29 @@
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
+      <!-- <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select> -->
       <XhJSSelect
         :options="versionList"
         style="width: 200px"
         class="search-container"
         @value-change="selectValue"
       ></XhJSSelect>
-      <!-- <el-button
+      <el-button
         class="filter-item"
         size="mini"
         type="warning"
@@ -16,7 +32,7 @@
         @click="handleImportExcel()"
         v-permission="['SettleAccount.Boms.Create']"
         >导入Excel
-      </el-button> -->
+      </el-button>
 
       <el-input
         v-model="searchContent"
@@ -119,7 +135,7 @@
 import Pagination from "@/components/Pagination";
 import permission from "@/directive/permission/index.js";
 import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-base";
+import importExcel from "@/components/ImportExcel-vw";
 import Lockr from "lockr";
 import { downloadFile } from "@/utils/crmindex.js";
 import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
@@ -161,6 +177,7 @@ export default {
     return {
       crmType: "bomdatabase",
       versionValue: "",
+      versionLable: "",
       versionList: [], //版本列表
       searchContent: "", // 输入内容
       showExcelImport: false,
@@ -201,23 +218,6 @@ export default {
             value: "true",
           }, //默认查询可用的
         ],
-        Sorting:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        ParentId: null,
-        fileType: 0,
-        userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listVersionQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        Sorting:"",
         SkipCount: 0,
         MaxResultCount: 15,
         ParentId: null,
@@ -261,6 +261,7 @@ export default {
   computed: {
     getDefaultField() {
       var tempsTabs = [];
+      tempsTabs.push({ label: "工厂", prop: "factory", width: 100 });
       tempsTabs.push({ label: "版本", prop: "version", width: 100 });
       tempsTabs.push({
         label: "ERP总成物料号",
@@ -295,10 +296,16 @@ export default {
     selectValue(params) {
       //版本下拉选择
       this.versionValue = params.value;
-      console.log(params)
+      const obj = params.data.find((item) => {
+        return item.value === params.value;
+      });
+      this.versionLable = obj.label.slice(0, 6);
+      console.log("下拉版本：" + JSON.stringify(this.versionLable));
+      this.listQuery.Filters = [];
       this.getList();
     },
     handleCommand(command) {
+      let Filter = [];
       if (this.versionValue === "") {
         this.$message.error("请先选择版本！");
         return;
@@ -326,6 +333,19 @@ export default {
         this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
       this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      //传入版本条件筛选
+      if (this.versionValue != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.versionLable, //传入版本条件
+        };
+        Filter.push(filter);
+      }
+      this.listQuery.Filters = Filter;
+
       console.log("产品结构导出：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts("/api/settleaccount/bom/Export", this.listQuery)
@@ -375,9 +395,9 @@ export default {
     getVersionInfo() {
       //取版本列表信息
       this.listLoading = true;
-      this.listVersionQuery.SkipCount = (this.page - 1) * 1000;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/bom/listVersion", this.listVersionQuery)
+        .posts("/api/settleaccount/bom/listVersion", this.listQuery)
         .then((response) => {
           this.versionList = [];
           response.items.forEach((element) => {
@@ -386,10 +406,11 @@ export default {
             options.label = element.version;
             this.versionList.push(options);
           });
-            console.log(this.versionList)
           if (JSON.stringify(this.versionList) != "[]") {
             //因版本下拉有默认值，所以详表要自动绑定子表数据
             this.versionValue = this.versionList[0].value;
+            this.versionLable = this.versionList[0].label.slice(0, 6); //取版本条件值
+            console.log("版本：" + JSON.stringify(this.versionLable));
             this.getList();
           }
           //this.totalCount = response.totalCount;
@@ -423,25 +444,24 @@ export default {
     roleFilter(type) {
       return projectTypeKeyValue[type];
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if(this.listQuery.Sorting === "")
-      {
-        this.listQuery.Sorting = "parentItemCode ascending";
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       if (this.versionValue != "") {
         this.listQuery.ParentId = this.versionValue;
       } else {
         this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("bom查询条件："+JSON.stringify(this.listQuery))
+      console.log(JSON.stringify(this.listQuery));
       this.$axios
         .posts("/api/settleaccount/bom/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           this.totalCount = response.totalCount;
-          this.listQuery.Sorting = '';
           setTimeout(() => {
             //大数据量加载时
             this.listLoading = false;
diff --git a/code/WebApp/vue/src/views/ux/basedata/carMaterialConfig/index.vue b/code/WebApp/vue/src/views/ux/basedata/carMaterialConfig/index.vue
index c1cd3105..da395eac 100644
--- a/code/WebApp/vue/src/views/ux/basedata/carMaterialConfig/index.vue
+++ b/code/WebApp/vue/src/views/ux/basedata/carMaterialConfig/index.vue
@@ -359,13 +359,18 @@ export default {
             });
         });
     },
-    getList() {
+    getList(data) {
       // this.currentPage = 1;
       // if (this.sortData) {
       //   this.listQuery.Sorting = this.sortData;
       // }
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .posts("/api/settleaccount/CarMaterialConfig/list", this.listQuery)
         .then((response) => {
diff --git a/code/WebApp/vue/src/views/ux/basedata/centralizedControl/index.vue b/code/WebApp/vue/src/views/ux/basedata/centralizedControl/index.vue
index 4f5a92d6..7f05f856 100644
--- a/code/WebApp/vue/src/views/ux/basedata/centralizedControl/index.vue
+++ b/code/WebApp/vue/src/views/ux/basedata/centralizedControl/index.vue
@@ -387,9 +387,14 @@ export default {
       this.showExcelImport = false;
       this.getList();
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .posts("/api/settleaccount/CentralizedControl/list", this.listQuery)
         .then((response) => {
@@ -702,9 +707,9 @@ export default {
         this.handleFilter();
         return;
       }
-     
+
       this.listQuery.Sorting = prop + " " + order;
-       console.log(JSON.stringify( this.listQuery))
+      console.log(JSON.stringify(this.listQuery));
       this.handleFilter();
     },
     handleSelectionChange(val) {
diff --git a/code/WebApp/vue/src/views/ux/basedata/codeSetting/index.vue b/code/WebApp/vue/src/views/ux/basedata/codeSetting/index.vue
index 01479723..c8405e48 100644
--- a/code/WebApp/vue/src/views/ux/basedata/codeSetting/index.vue
+++ b/code/WebApp/vue/src/views/ux/basedata/codeSetting/index.vue
@@ -10,14 +10,14 @@
         @click="handleCreate"
         >新增
       </el-button>
-      <!-- <el-button
+      <el-button
         class="filter-item"
         size="mini"
         type="success"
         icon="el-icon-edit"
         @click="handleUpdate()"
         >修改
-      </el-button> -->
+      </el-button>
       <el-button
         class="filter-item"
         type="danger"
@@ -216,7 +216,7 @@
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-base";
+import importExcel from "@/components/ImportExcel-vw";
 import { downloadFile } from "@/utils/crmindex.js";
 import CRMTableHead from "../../components/CRMTableHead";
 
@@ -236,14 +236,6 @@ export default {
   components: { Pagination, importExcel, CRMTableHead },
   directives: { permission },
   data() {
-     const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
     return {
       crmType: "codeSetting",
       rules: {
@@ -406,13 +398,18 @@ export default {
             });
         });
     },
-    getList() {
+    getList(data) {
       // this.currentPage = 1;
       // if (this.sortData) {
       //   this.listQuery.Sorting = this.sortData;
       // }
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .posts("/api/settleaccount/CodeSetting/list", this.listQuery)
         .then((response) => {
diff --git a/code/WebApp/vue/src/views/ux/basedata/customerStorageLocation/index.vue b/code/WebApp/vue/src/views/ux/basedata/customerStorageLocation/index.vue
index 0ac66b90..0c8d03d3 100644
--- a/code/WebApp/vue/src/views/ux/basedata/customerStorageLocation/index.vue
+++ b/code/WebApp/vue/src/views/ux/basedata/customerStorageLocation/index.vue
@@ -415,9 +415,14 @@ export default {
             });
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .posts(
           "/api/settleaccount/CustomerStorageLocation/list",
diff --git a/code/WebApp/vue/src/views/ux/basedata/estimatedInventoryDetail/index.vue b/code/WebApp/vue/src/views/ux/basedata/estimatedInventoryDetail/index.vue
index f76c5d62..098a14d6 100644
--- a/code/WebApp/vue/src/views/ux/basedata/estimatedInventoryDetail/index.vue
+++ b/code/WebApp/vue/src/views/ux/basedata/estimatedInventoryDetail/index.vue
@@ -516,9 +516,13 @@ export default {
           this.listLoading = false;
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
         this.listQuery.ParentId = this.versionValue;
       } else {
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/vwKanBan/index.vue b/code/WebApp/vue/src/views/ux/basedata/estimatedSum/index.vue
similarity index 67%
rename from code/WebApp/vue/src/views/ux/vw/dataInput/vwKanBan/index.vue
rename to code/WebApp/vue/src/views/ux/basedata/estimatedSum/index.vue
index 403682d0..72836576 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/vwKanBan/index.vue
+++ b/code/WebApp/vue/src/views/ux/basedata/estimatedSum/index.vue
@@ -1,7 +1,31 @@
-<!--大众看板导入功能-->
+<!--应付暂估汇总-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <!-- <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select> -->
       <XhJSSelect
         :options="versionList"
         style="width: 200px"
@@ -14,34 +38,21 @@
         type="warning"
         icon="el-icon-upload2"
         @click="handleImportExcel()"
-        >导入文件（Excel）
+        >导入Excel
       </el-button>
       <!-- <el-button
         class="filter-item"
         size="mini"
-        type="primary"
+        type="info"
         icon="el-icon-download"
         @click="handleDownload()"
-        >导出Excel
+        >导出
       </el-button> -->
-      <el-dropdown size="small" class="filter-item" style="margin-left:15px;font-weight:bold" @command="handleCommand">
-        <span class="el-dropdown-link">
-          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="excel" icon="el-icon-plus"
-            >导出Excel</el-dropdown-item
-          >
-          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
-            >导出Csv</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照看板条码号搜索..."
+        placeholder="按照采购订单号搜索..."
         style="width: 200px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -61,11 +72,24 @@
         @filter="handleFilters"
       >
       </c-r-m-table-head>
+      <el-dropdown size="small" class="filter-item" @command="handleCommand">
+        <span class="el-dropdown-link">
+          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="excel" icon="el-icon-plus"
+            >导出Excel</el-dropdown-item
+          >
+          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
+            >导出Csv</el-dropdown-item
+          >
+        </el-dropdown-menu>
+      </el-dropdown>
     </flexbox>
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
+      v-loading="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
@@ -82,23 +106,8 @@
       @selection-change="handleSelectionChange"
       @row-click="handleRowClick"
     >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
       <el-table-column
-        v-for="(item, index) in getDefaultField"
+        v-for="(item, index) in fieldList"
         :key="index"
         :prop="item.prop"
         :label="item.label"
@@ -114,7 +123,7 @@
       </el-table-column>
     </el-table>
     <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <!-- 分页控件 -->
       <pagination
         v-show="totalCount > 0"
         :total="totalCount"
@@ -136,18 +145,25 @@
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-base";
-import CRMTableHead from "../../../components/CRMTableHead";
-import moment from "moment";
-import Lockr from "lockr";
 import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-vw";
+import Lockr from "lockr";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
 
 export default {
-  name: "VWKanBan",
+  name: "Bomdatabase",
   components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
   filters: {
+    statusFilter(status) {
+      const statusMap = {
+        0: "Service",
+        1: "Trade",
+        2: "Labor",
+      };
+      return statusMap[status];
+    },
     IsCustomerSignFilter(status) {
       //翻译是否签字
       const statusMap = {
@@ -167,72 +183,33 @@ export default {
   },
   data() {
     return {
-      crmType: "vWKanBan",
+      crmType: "estimatedSum",
       versionValue: "",
       versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
+      form: {},
       customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
+        estimatedSumId: "",
       },
+      searchContent: "", // 输入内容
       list: null,
       totalCount: 0,
       listLoading: true,
       formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
       listQuery: {
         Filters: [
           {
             logic: 0,
-            column: "Enabled",
+            column: "enabled",
             action: 0,
             value: "true",
           }, //默认查询可用的
         ],
-        //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        version: "",
-        site: "TH",
+        ParentId: "",
         fileType: 0,
         userId: "00000000-0000-0000-0000-000000000000",
       },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        fileType: 0,
-        userId: "",
-      },
       page: 1,
       dialogFormVisible: false,
       multipleSelection: [],
@@ -247,53 +224,63 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
     this.getVersionInfo();
-    if (this.versionList == []) {
-      this.getList();
-    }
+    this.getList();
   },
+  // watch: {
+  //   customerInfos: {
+  //     handler(newVal) {
+  //       if (newVal == "" || newVal == "undefined") {
+  //         //TODO
+  //       } else {
+  //         newVal.forEach((element) => {
+  //           this.customerInfo.estimatedSumId = element.EstimatedSumId;
+  //         });
+  //         if (this.customerInfo.estimatedSumId != "") {
+  //           this.getList();
+  //         }
+  //       }
+  //     },
+  //   },
+  // },
   computed: {
     /** 列表字段 */
-    getDefaultField() {
+    fieldList() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "看板条码号", prop: "kanban", width: 200 });
-      tempsTabs.push({ label: "入库关联号", prop: "relation", width: 200 });
-      tempsTabs.push({ label: "工厂", prop: "factory", width: 120 });
-      tempsTabs.push({ label: "零件号", prop: "materialCode", width: 220 });
-      tempsTabs.push({ label: "零件类型", prop: "partType", width: 100 });
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
+      // tempsTabs.push({ label: "记账期间", prop: "postingperiod", width: 100 });
       tempsTabs.push({
-        label: "R3入库时间",
-        prop: "settleInputDate",
+        label: "采购订单号",
+        prop: "purchaseDocument",
         width: 150,
-        formType: "datetime",
       });
-      tempsTabs.push({ label: "供应商编码", prop: "supplierCode", width: 140 });
-      tempsTabs.push({ label: "数量", prop: "qty", width: 90 });
-      tempsTabs.push({ label: "批次", prop: "batch", width: 100 });
-
-      tempsTabs.push({ label: "入库结算标识", prop: "flag", width: 150 });
       tempsTabs.push({
-        label: "结算日期",
-        prop: "settleDate",
+        label: "采购订单行号",
+        prop: "purchaseLine",
         width: 150,
-        formType: "datetime",
       });
-      tempsTabs.push({ label: "结算状态", prop: "state", width: 150 });
-
+      tempsTabs.push({ label: "ERP物料号", prop: "materialCode", width: 150 });
+      tempsTabs.push({
+        label: "ERP物料描述",
+        prop: "materialDesc",
+        width: 250,
+      });
+      tempsTabs.push({ label: "供应商编号", prop: "supplierCode", width: 120 });
+      tempsTabs.push({ label: "供应商描述", prop: "supplierDesc", width: 200 });
+      tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
       return tempsTabs;
     },
-    MoreTypes() {
-      var moreTypes = [];
-      moreTypes.push({ type: "updateFis", name: "更新FIS结算数据" });
-      //moreTypes.push({ type: "enter", name: "新按钮" });
-      return moreTypes;
-    },
   },
   methods: {
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
     handleCommand(command) {
       if (this.versionValue === "") {
         this.$message.error("请先选择版本！");
@@ -317,11 +304,14 @@ export default {
         return;
       }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("大众看板导出：" + JSON.stringify(this.listQuery));
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log("应付暂估汇总导出：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/VWKanBan/Export", this.listQuery)
+        .posts("/api/settleaccount/EstimatedSum/Export", this.listQuery)
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -356,7 +346,6 @@ export default {
             });
         });
     },
-    //导出功能
     async handleDownload() {
       this.listLoading = true;
       if (this.versionValue === "") {
@@ -365,11 +354,15 @@ export default {
         return;
       }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("大众看板导出：" + JSON.stringify(this.listQuery));
+      this.listQuery.fileType = 1; //0是csv,1是excel
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log("暂估汇总：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/VWKanBan/Export", this.listQuery)
+        .posts("/api/settleaccount/EstimatedSum/Export", this.listQuery)
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -404,21 +397,21 @@ export default {
             });
         });
     },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
     selectOptionsChange(item) {
       this.getList();
     },
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
     getVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
+      this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/VWKanBan/listVersion", this.listQuery)
+        .posts("/api/settleaccount/EstimatedSum/listVersion", this.listQuery)
         .then((response) => {
+          //取版本列表信息
           this.versionList = [];
           response.items.forEach((element) => {
             let options = {};
@@ -428,20 +421,19 @@ export default {
           });
           if (JSON.stringify(this.versionList) != "[]") {
             //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
+            this.versionValue = this.versionList[0].value;
             this.getList();
           }
-          this.listLoading = false;
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
         })
         .catch(() => {
           this.listLoading = false;
         });
     },
-    handleImportExcel() {
-      //导入
-      this.showExcelImport = true;
-      this.$refs.importexcel.handleImportExcelClick();
-    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {
@@ -450,37 +442,33 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      // if (column.property === "state") {
-      //   return { 0: "其他", 2: "已结" }[row[column.property]];
-      // }
-      if (
-        column.property == "settleInputDate" ||
-        column.property == "settleDate"
-      ) {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      if (column.property === "projectRole") {
+        return { 0: "是", 1: "否" }[row[column.property]];
       }
       return row[column.property] || "--";
     },
     importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
       //关闭导入窗体时调用
       this.showExcelImport = false;
+      this.getVersionInfo();
+      //this.getList();
     },
 
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
+      console.log("汇总" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/VWKanBan/list", this.listQuery)
+        .posts("/api/settleaccount/EstimatedSum/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           this.totalCount = response.totalCount;
@@ -494,10 +482,12 @@ export default {
         });
     },
     fetchData(id) {
-      //循环动态
-      this.$axios.gets("/api/settleaccount/VWKanBan/" + id).then((response) => {
-        this.form = response;
-      });
+      //循环动态，取客户名称
+      this.$axios
+        .gets("/api/settleaccount/EstimatedSum/" + id)
+        .then((response) => {
+          this.form = response;
+        });
     },
     /** 筛选操作 */
     handleFilter() {
@@ -505,11 +495,11 @@ export default {
       this.getList();
       this.listQuery.Filters = [];
       if (this.searchContent != "") {
-        var column = "kanban";
+        var column = "purchaseDocument";
         let filter = {
           logic: 0,
           column: column,
-          action: 0,
+          action: 6,
           value: this.searchContent,
         };
         this.listQuery.Filters.push(filter);
@@ -559,6 +549,43 @@ export default {
       }
     },
     resetQuery() {},
+    // handleDelete(row) {//批量删除
+    //   var params = []
+    //   let myalert = ''//声明变量，其变量必须在此声明后使用
+    //   if (row) {//单行
+    //     params.push(row.id)
+    //     myalert = row.name
+    //   } else {//多选
+    //     this.multipleSelection.forEach(element => {
+    //       let id = element.id
+    //       params.push(id)
+    //     })
+    //     myalert = '选中项'
+    //   }
+    //   this.$confirm('是否删除' + myalert + '?', '提示', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   })
+    //     .then(() => {
+    //       this.$axios.posts('/api/abpvnext_master/contract/Delete', params).then(response => {
+    //         const index = this.list.indexOf(row)
+    //         this.$notify({
+    //           title: '成功',
+    //           message: '删除成功',
+    //           type: 'success',
+    //           duration: 2000
+    //         })
+    //         this.getList()
+    //       })
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: 'info',
+    //         message: '已取消删除'
+    //       })
+    //     })
+    // },
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
@@ -566,7 +593,6 @@ export default {
         return;
       }
       this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
       this.handleFilter();
     },
     handleSelectionChange(val) {
@@ -574,12 +600,11 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      // if (column.property === "qty") {
-      //   return { textAlign: "right" };
-      // } else {
-      //   return { textAlign: "left" };
-      // }
-      return { textAlign: "left" };
+      if (column.property === "qty") {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
     },
     /** 通过回调控制表头style */
     headerRowStyle({ row, column, rowIndex, columnIndex }) {
@@ -599,12 +624,6 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../../styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
+@import "../../styles/crmtable.scss";
 </style>
 
-
diff --git a/code/WebApp/vue/src/views/ux/basedata/Prebatch/index.vue b/code/WebApp/vue/src/views/ux/basedata/factory/index.vue
similarity index 75%
rename from code/WebApp/vue/src/views/ux/basedata/Prebatch/index.vue
rename to code/WebApp/vue/src/views/ux/basedata/factory/index.vue
index 6921a44d..4b67d4b7 100644
--- a/code/WebApp/vue/src/views/ux/basedata/Prebatch/index.vue
+++ b/code/WebApp/vue/src/views/ux/basedata/factory/index.vue
@@ -1,4 +1,4 @@
-<!--预批量输入表-->
+<!--通用代码设置-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
@@ -7,48 +7,34 @@
         size="mini"
         type="primary"
         icon="el-icon-plus"
-        v-permission="['SettleAccount.Prebatchs.Create']"
+        v-permission="['SettleAccount.Factorys.Create']"
         @click="handleCreate"
         >新增
       </el-button>
       <el-button
-        class="filter-item modifybutton"
+        class="filter-item"
         size="mini"
+        type="success"
         icon="el-icon-edit"
         @click="handleUpdate()"
-        >修改</el-button
-      >
+        v-permission="['SettleAccount.Factorys.Update']"
+        >修改
+      </el-button>
       <el-button
         class="filter-item"
         type="danger"
         icon="el-icon-delete"
         size="mini"
-        v-permission="['SettleAccount.Prebatchs.Delete']"
         @click="handleDelete()"
-        >作废(状态：其他)
-      </el-button>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload2"
-        @click="handleImportExcel()"
-        >导入
-      </el-button>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="info"
-        icon="el-icon-download"
-        @click="handleDownload()"
-        >导出Excel
+        v-permission="['SettleAccount.Factorys.Delete']"
+        >批量删除
       </el-button>
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照KEEN号搜索..."
-        style="width: 220px"
+        placeholder="按照编码搜索..."
+        style="width: 200px"
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
@@ -78,16 +64,18 @@
       :data="list"
       :height="tableHeight"
       :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
       size="small"
       stripe
       border
       highlight-current-row
+      tooltip-effect="dark"
       style="width: 100%"
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
       @row-click="handleRowClick"
     >
-      <el-table-column type="selection" width="44px"></el-table-column>
+      <el-table-column type="selection" width="55"> </el-table-column>
       <el-table-column
         v-for="(item, index) in getDefaultField"
         :key="index"
@@ -103,6 +91,22 @@
           {{ scope.column.label }}
         </template>
       </el-table-column>
+      <!-- <el-table-column label="操作" align="center" width="128px">
+        <template slot-scope="{ row }">
+          <el-button
+            type="primary"
+            size="mini"
+            @click="handleUpdate(row)"
+            icon="el-icon-edit"
+          />
+          <el-button
+            type="danger"
+            size="mini"
+            @click="handleDelete(row)"
+            icon="el-icon-delete"
+          />
+        </template>
+      </el-table-column> -->
     </el-table>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@@ -139,64 +143,37 @@
       >
         <el-row>
           <el-col :md="4" :xs="24">
-            <el-form-item label="KEEN号" required />
-          </el-col>
-          <el-col :md="8" :xs="24">
-            <el-form-item prop="kennCode">
-              <el-input v-model="form.kennCode" :disabled="isEdit" />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="状态" required />
-          </el-col>
-          <el-col :md="8" :xs="24">
-            <el-form-item prop="state">
-              <el-select
-                v-model="form.state"
-                clearable
-                style="width: 188px"
-                placeholder="请选择"
-              >
-                <el-option label="预批量" :value="3"></el-option>
-                <el-option label="其他" :value="0"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="年份" required />
+            <el-form-item label="客户编码" required />
           </el-col>
           <el-col :md="8" :xs="24">
-            <el-form-item prop="year">
-              <el-date-picker
-                v-model="form.year"
-                style="width: 188px"
-                type="year"
-                format="yyyy 年"
-                value-format="yyyy"
-                placeholder="选择年"
-                :disabled="isEdit"
-              >
-              </el-date-picker>
+            <el-form-item prop="customerCode">
+              <el-input v-model="form.customerCode" :disabled="isEdit" />
             </el-form-item>
           </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="车型" required />
+           <el-col :md="4" :xs="24">
+            <el-form-item label="编码" required />
           </el-col>
           <el-col :md="8" :xs="24">
-            <el-form-item prop="carCode">
-              <el-input v-model="form.carCode"  />
+            <el-form-item prop="code">
+              <el-input v-model="form.code" :disabled="isEdit"/>
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row>
           <el-col :md="4" :xs="24">
-            <el-form-item label="标识" required />
+            <el-form-item label="描述" required />
           </el-col>
           <el-col :md="20" :xs="24">
-            <el-form-item prop="yearKennCode">
-              <el-input v-model="form.yearKennCode" />
+            <el-form-item prop="desc">
+              <el-input
+                type="textarea"
+                v-model="form.desc"
+                maxlength="4000"
+                show-word-limit
+                style="width: 455px"
+                placeholder="最多输入4000个字符"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -216,7 +193,7 @@
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-base";
+import importExcel from "@/components/ImportExcel-vw";
 import { downloadFile } from "@/utils/crmindex.js";
 import CRMTableHead from "../../components/CRMTableHead";
 
@@ -232,7 +209,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
 }, {});
 
 export default {
-  name: "Prebatch",
+  name: "factory",
   components: { Pagination, importExcel, CRMTableHead },
   directives: { permission },
   filters: {
@@ -255,15 +232,14 @@ export default {
   },
   data() {
     return {
-      crmType: "prebatch",
+      crmType: "factory",
       rules: {
-        kennCode: [{ required: true, message: "必须输入！", trigger: "blur" }],
-        state: [{ required: true, message: "必须选择！", trigger: "change" }],
-        yearKennCode: [
+        //前端定义的规则，后端也有验证
+        code: [{ required: true, message: "必须输入！", trigger: "blur" }],
+        desc: [
           { required: true, message: "必须输入！", trigger: "blur" },
+          { max: 4000, message: "长度最多为4000个字符", trigger: "blur" },
         ],
-        carCode: [{ required: true, message: "必须输入！", trigger: "blur" }],
-        year: [{ required: true, message: "必须选择！", trigger: "change" }],
       },
       searchContent: "", // 输入内容
       form: {},
@@ -323,15 +299,17 @@ export default {
     //   },
     getDefaultField() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "年份", prop: "year", width: 130 });
-      tempsTabs.push({ label: "KENN号", prop: "kennCode", width: 130 });
-      tempsTabs.push({ label: "状态", prop: "state", width: 130 });
-      tempsTabs.push({ label: "车型", prop: "carCode", width: 130 });
-      tempsTabs.push({ label: "标识", prop: "yearKennCode", width: 130 });
+      tempsTabs.push({ label: "客户编码", prop: "customerCode", width: 130 });
+      tempsTabs.push({ label: "编码", prop: "code", width: 130 });
+      tempsTabs.push({ label: "描述", prop: "desc", width: 230 });
       return tempsTabs;
     },
   },
   methods: {
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "center", background: "#FAFAFA" };
+    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {
@@ -350,8 +328,8 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property === "state") {
-        return { 3: "预批量", 0: "其他" }[row[column.property]];
+      if (column.property === "projectRole") {
+        return { 0: "是", 1: "否" }[row[column.property]];
       }
       return row[column.property] || "--";
     },
@@ -369,40 +347,40 @@ export default {
       this.getList();
     },
     async handleDownload() {
-      this.listLoading = true;
-      this.$axios
-        .posts("/api/settleaccount/Prebatch/Export", this.listQuery)
-        .then((res) => {
-          let fileNameOfProject = res;
-          this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
-            .then((response) => {
-              downloadFile(response, fileNameOfProject);
-              this.$notify({
-                title: "成功",
-                message: "数据-导出成功！",
-                type: "success",
-                duration: 2000,
-              });
-              this.listLoading = false;
-            });
-        });
+      // await this.getDownBoms();
+      // var fileNameOfProject = "CodeSettingExcelExporter.xlsx";
+      // this.$axios
+      //   .BolbGets(
+      //     "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+      //   )
+      //   .then((response) => {
+      //     downloadFile(response, "工厂设置信息.xlsx");
+      //     this.$notify({
+      //       title: "成功",
+      //       message: "工厂设置-下载成功！",
+      //       type: "success",
+      //       duration: 2000,
+      //     });
+      //   });
     },
-    getDownBoms() {
+    // getDownBoms() {
+    //   this.listLoading = true;
+    //   this.$axios
+    //     .gets("/api/settleaccount/Factory/ExcelExporte")
+    //     .then((response) => {
+    //       this.listLoading = false;
+    //     });
+    // },
+    getList(data) {
       this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
-        .gets("/api/settleaccount/Prebatch/ExcelExporte")
-        .then((response) => {
-          this.listLoading = false;
-        });
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      this.$axios
-        .posts("/api/settleaccount/Prebatch/list", this.listQuery)
+        .posts("/api/settleaccount/Factory/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           //alert(JSON.stringify(response.Items))
@@ -418,7 +396,7 @@ export default {
     },
     fetchData(id) {
       //循环动态，取客户名称
-      this.$axios.gets("/api/settleaccount/Prebatch/" + id).then((response) => {
+      this.$axios.gets("/api/settleaccount/Factory/" + id).then((response) => {
         this.form = response;
       });
     },
@@ -470,7 +448,7 @@ export default {
       this.getList();
       this.listQuery.Filters = [];
       if (this.searchContent != "") {
-        var column = "kennCode";
+        var column = "code";
         let filter = {
           logic: 0,
           column: column,
@@ -489,7 +467,7 @@ export default {
           if (this.isEdit) {
             console.log(JSON.stringify(this.form));
             this.$axios
-              .puts("/api/settleaccount/Prebatch/" + this.form.id, this.form)
+              .puts("/api/settleaccount/Factory/" + this.form.id, this.form)
               .then((response) => {
                 this.formLoading = false;
                 this.$notify({
@@ -508,7 +486,7 @@ export default {
             //insert添加
             console.log(JSON.stringify(this.form));
             this.$axios
-              .posts("/api/settleaccount/Prebatch", this.form)
+              .posts("/api/settleaccount/Factory", this.form)
               .then((response) => {
                 this.formLoading = false;
                 this.$notify({
@@ -536,25 +514,6 @@ export default {
       this.form = {};
       this.dialogFormVisible = true;
     },
-    handleUpdate(row) {
-      this.formTitle = "修改";
-      this.isEdit = true;
-      if (row) {
-        this.fetchData(row.id);
-        this.dialogFormVisible = true;
-      } else {
-        if (this.multipleSelection.length != 1) {
-          this.$message({
-            message: "编辑必须选择单行",
-            type: "warning",
-          });
-          return;
-        } else {
-          this.fetchData(this.multipleSelection[0].id);
-          this.dialogFormVisible = true;
-        }
-      }
-    },
     handleDelete(row) {
       //批量删除
       var params = [];
@@ -578,7 +537,7 @@ export default {
       })
         .then(() => {
           this.$axios
-            .posts("/api/settleaccount/Prebatch/delete", params)
+            .posts("/api/settleaccount/Factory/delete", params)
             .then((response) => {
               const index = this.list.indexOf(row);
               this.$notify({
@@ -597,6 +556,25 @@ export default {
           });
         });
     },
+    handleUpdate(row) {
+      this.formTitle = "修改";
+      this.isEdit = true;
+      if (row) {
+        this.fetchData(row.id);
+        this.dialogFormVisible = true;
+      } else {
+        if (this.multipleSelection.length != 1) {
+          this.$message({
+            message: "编辑必须选择单行",
+            type: "warning",
+          });
+          return;
+        } else {
+          this.fetchData(this.multipleSelection[0].id);
+          this.dialogFormVisible = true;
+        }
+      }
+    },
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
@@ -677,7 +655,7 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
+      return { textAlign: "center" };
     },
     handleRowClick(row, column, event) {
       this.$refs.multipleTable.clearSelection();
@@ -691,9 +669,5 @@ export default {
 <style lang="scss" scoped>
 @import "../../styles/crmtable.scss";
 </style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
+
 
diff --git a/code/WebApp/vue/src/views/ux/basedata/fis.rar b/code/WebApp/vue/src/views/ux/basedata/fis.rar
new file mode 100644
index 00000000..3f8c1f52
Binary files /dev/null and b/code/WebApp/vue/src/views/ux/basedata/fis.rar differ
diff --git a/code/WebApp/vue/src/views/ux/billManage/claimDemage/index.vue b/code/WebApp/vue/src/views/ux/basedata/inventoryDetail/index.vue
similarity index 64%
rename from code/WebApp/vue/src/views/ux/billManage/claimDemage/index.vue
rename to code/WebApp/vue/src/views/ux/basedata/inventoryDetail/index.vue
index cec09806..a1806b42 100644
--- a/code/WebApp/vue/src/views/ux/billManage/claimDemage/index.vue
+++ b/code/WebApp/vue/src/views/ux/basedata/inventoryDetail/index.vue
@@ -1,4 +1,4 @@
-<!--索赔单-->
+<!--库存明细-子表-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
@@ -10,7 +10,7 @@
             @click="handleDelete()"
           >批量删除
           </el-button> -->
-      <el-select
+      <!-- <el-select
         v-model="versionValue"
         size="small"
         placeholder="选择版本过滤..."
@@ -25,14 +25,20 @@
           :label="item.label"
           :value="item.value"
         ></el-option>
-      </el-select>
+      </el-select> -->
+      <XhJSSelect
+        :options="versionList"
+        style="width: 200px"
+        class="search-container"
+        @value-change="selectValue"
+      ></XhJSSelect>
       <el-button
         class="filter-item"
         size="mini"
         type="warning"
         icon="el-icon-upload2"
         @click="handleImportExcel()"
-        >导入（Excel）
+        >导入Excel
       </el-button>
       <!-- <el-button
         class="filter-item"
@@ -40,13 +46,13 @@
         type="info"
         icon="el-icon-download"
         @click="handleDownload()"
-        >导出Csv
+        >导出Excel
       </el-button> -->
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照零件号搜索..."
+        placeholder="按照物料编号搜索..."
         style="width: 200px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -79,26 +85,6 @@
           >
         </el-dropdown-menu>
       </el-dropdown>
-      <!-- <div class="right-container">
-        <el-dropdown
-          v-if="MoreTypes.length > 0"
-          trigger="click"
-          @command="handleTypeDrop"
-        >
-          <flexbox class="right-more-item">
-            <div>更多</div>
-            <i class="el-icon-arrow-down el-icon--right" style="color: #777" />
-          </flexbox>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item
-              v-for="(item, index) in MoreTypes"
-              :key="index"
-              :command="item.type"
-              >{{ item.name }}</el-dropdown-item
-            >
-          </el-dropdown-menu>
-        </el-dropdown>
-      </div> -->
     </flexbox>
     <!--表格渲染-->
     <el-table
@@ -110,6 +96,7 @@
       :data="list"
       :height="tableHeight"
       :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
       size="small"
       stripe
       border
@@ -119,21 +106,6 @@
       @selection-change="handleSelectionChange"
       @row-click="handleRowClick"
     >
-      <el-table-column
-        label="索赔单号"
-        prop="documentNumber"
-        sortable="custom"
-        align="center"
-        width="250px"
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.kennCode" placement="top">
-            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.kennCode
-            }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
       <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
       <el-table-column
         v-for="(item, index) in getDefaultField"
@@ -150,45 +122,6 @@
           {{ scope.column.label }}
         </template>
       </el-table-column>
-      <el-table-column min-width="300px" label="是否接收">
-        <template slot-scope="{ row }">
-          <template v-if="row.isEditCell">
-            <el-input v-model="row.state" class="edit-input" size="small" />
-            <el-button
-              class="cancel-btn"
-              size="small"
-              icon="el-icon-refresh"
-              type="warning"
-              @click="cancelEdit(row)"
-            >
-              cancel
-            </el-button>
-          </template>
-          <span v-else>{{ row.state }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="操作" width="120">
-        <template slot-scope="{ row }">
-          <el-button
-            v-if="row.isEditCell"
-            type="success"
-            size="small"
-            icon="el-icon-circle-check-outline"
-            @click="confirmEdit(row)"
-          >
-            Ok
-          </el-button>
-          <el-button
-            v-else
-            type="primary"
-            size="small"
-            icon="el-icon-edit"
-            @click="row.isEditCell = !row.isEditCell"
-          >
-            Edit
-          </el-button>
-        </template>
-      </el-table-column>
     </el-table>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@@ -206,21 +139,6 @@
         :crmType="crmType"
         @close="importExcelData"
       />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="附件信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-        <div>
-          <Detail
-            v-bind:customerInfos="customerInfos"
-            style="margin-top: -35px"
-          ></Detail>
-        </div>
-      </el-drawer>
     </div>
   </div>
 </template>
@@ -228,47 +146,35 @@
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportTxt";
+import { downloadFile } from "@/utils/crmindex.js";
 import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-vw";
 import moment from "moment";
 import Lockr from "lockr";
-import { downloadFile } from "@/utils/crmindex.js";
-import Detail from "./detail";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
 
 export default {
   name: "Bomdatabase",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
+  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
     },
   },
   data() {
     return {
-      crmType: "settleAccount",
+      crmType: "inventorydetail",
       versionValue: "",
-      customerInfos: [],
       versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
       searchContent: "", // 输入内容
+      searchContent: "", // 输入内容
+      form: {},
       customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
+        inventoryId: "",
       },
       list: null,
       totalCount: 0,
@@ -281,15 +187,11 @@ export default {
           return {};
         },
       },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
       listQuery: {
         Filters: [
           {
             logic: 0,
-            column: "Enabled",
+            column: "enabled",
             action: 0,
             value: "true",
           }, //默认查询可用的
@@ -301,22 +203,6 @@ export default {
         fileType: 0,
         userId: "00000000-0000-0000-0000-000000000000",
       },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        ParentId: "",
-        fileType: 0,
-        userId: "",
-      },
       page: 1,
       dialogFormVisible: false,
       multipleSelection: [],
@@ -338,125 +224,71 @@ export default {
     this.getVersionInfo();
     this.getList();
   },
+  // watch: {
+  //   customerInfos: {
+  //     handler(newVal) {
+  //       if (newVal == "" || newVal == "undefined") {
+  //         //TODO
+  //       } else {
+  //         newVal.forEach((element) => {
+  //           this.customerInfo.inventoryId = element.InventoryId;
+  //         });
+  //         if (this.customerInfo.inventoryId != "") {
+  //           this.getList();
+  //         }
+  //       }
+  //     },
+  //   },
+  // },
   computed: {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-      //   tempsTabs.push({ label: "年度", prop: "year", width: 120 });
-      //   tempsTabs.push({ label: "期间", prop: "period", width: 150 });
-      //tempsTabs.push({ label: "索赔单号", prop: "kennCode", width: 150 });
+      tempsTabs.push({ label: "工厂", prop: "factory", width: 120 });
+      tempsTabs.push({ label: "版本", prop: "version", width: 80 });
+      // tempsTabs.push({ label: "期间", prop: "period", width: 80 });
+      tempsTabs.push({ label: "物料编号", prop: "materialCode", width: 180 });
+      //tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 150 });
+      tempsTabs.push({ label: "入库数量", prop: "inputQty", width: 120 });
+      tempsTabs.push({ label: "出库数量", prop: "outputQty", width: 120 });
       tempsTabs.push({
-        label: "销售订单号",
-        prop: "chassisNumber",
+        label: "期初数量",
+        prop: "openingInventoryQty",
         width: 120,
       });
-      tempsTabs.push({ label: "交付索引号", prop: "model", width: 100 });
-      tempsTabs.push({ label: "零件号", prop: "materialCode", width: 200 });
-      tempsTabs.push({ label: "索赔数量", prop: "qty", width: 100 });
       tempsTabs.push({
-        label: "索赔时间",
-        prop: "cP5A",
+        label: "期末数量",
+        prop: "endingInventoryQty",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "估价类别",
+        prop: "appraisalCategory",
+        width: 120,
+      });
+      // tempsTabs.push({ label: "估价描述", prop: "appraisalDesc", width: 180 });
+      tempsTabs.push({
+        label: "存储地点",
+        prop: "storageLocation",
         width: 150,
-        formType: "datetime",
       });
-      //tempsTabs.push({ label: "是否接受", prop: "state", width: 120 });
-      tempsTabs.push({ label: "是否发货", prop: "state", width: 120 });
-      tempsTabs.push({ label: "是否提货", prop: "state", width: 120 });
+      tempsTabs.push({ label: "基本计量单位", prop: "unit", width: 150 });
+      // tempsTabs.push({
+      //   label: "存储地点描述",
+      //   prop: "storageLocationDesc",
+      //   width: 150,
+      // });
+      //
+      // tempsTabs.push({ label: "价格", prop: "price", width: 120 });
       return tempsTabs;
     },
-    MoreTypes() {
-      var moreTypes = [];
-      moreTypes.push({ type: "updateFis", name: "更新FIS结算数据" });
-      //moreTypes.push({ type: "enter", name: "新按钮" });
-      return moreTypes;
-    },
   },
   methods: {
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      var parentId = param.id; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    handleTypeDrop(command, params = {}) {
-      if (command == "updateFis") {
-        this.listLoading = true;
-        //this.listQuery.SkipCount = (this.page - 1) * 10000;
-        this.$axios
-          .posts("/api/settleaccount/SettleAccount/updateFis")
-          .then((res) => {
-            if (res == true) {
-              this.$notify({
-                title: "成功",
-                message: "FIS数据-更新成功！",
-                type: "success",
-                duration: 2000,
-              });
-            } else {
-              this.$message({
-                type: "warning",
-                message: "FIS数据-更新失败！",
-              });
-            }
-            this.listLoading = false;
-          });
-      } else if (command == "enter") {
-      }
-    },
-    selectOptionsChange(item) {
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
       this.getList();
     },
-    getVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 3000;
-      this.$axios
-        .posts("/api/settleaccount/SettleAccount/listVersion", this.listQuery)
-        .then((response) => {
-          this.versionList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.id;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    handleImportExcel() {
-      //导入
-      this.showExcelImport = true;
-      this.$refs.importexcel.handleImportExcelClick();
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "state") {
-        return { 0: "是", 2: "否" }[row[column.property]];
-      }
-      if (column.property == "cP5A" || column.property == "cP7") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
     handleCommand(command) {
       if (this.versionValue === "") {
         this.$message.error("请先选择版本！");
@@ -485,9 +317,9 @@ export default {
         this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
       this.listQuery.userId = Lockr.get("loginUserInfo").userId;
-      console.log("二配调整输入表导出条件：" + JSON.stringify(this.listQuery));
+      console.log("库存明细导出：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/SecondaryDiscount/Export", this.listQuery)
+        .posts("/api/settleaccount/InventoryDetail/Export", this.listQuery)
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -522,13 +354,60 @@ export default {
             });
         });
     },
+    selectOptionsChange(item) {
+      this.getList();
+    },
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
+    getVersionInfo() {
+      //取版本列表信息
+
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/InventoryDetail/listVersion", this.listQuery)
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.id;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+          if (JSON.stringify(this.versionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.versionValue = this.versionList[0].value;
+            this.getList();
+          }
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
     importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
       //关闭导入窗体时调用
       this.showExcelImport = false;
+      this.getVersionInfo();
+      //this.getList();
     },
-    //导出功能
     async handleDownload() {
       this.listLoading = true;
       if (this.versionValue === "") {
@@ -543,9 +422,9 @@ export default {
       }
       this.listQuery.fileType = 0; //0是csv,1是excel
       this.listQuery.userId = Lockr.get("loginUserInfo").userId;
-      console.log("R3导出：" + JSON.stringify(this.listQuery));
+      console.log("库存明细导出：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/SettleAccount/Export", this.listQuery)
+        .posts("/api/settleaccount/InventoryDetail/Export", this.listQuery)
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -580,23 +459,22 @@ export default {
             });
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
         this.listQuery.ParentId = this.versionValue;
       } else {
         this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
       this.$axios
-        .posts("/api/settleaccount/SettleAccount/list", this.listQuery)
+        .posts("/api/settleaccount/InventoryDetail/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
-          //动态加一个是否编辑的标识
-          this.list.forEach((element) => {
-            element["state"] = "是";
-            element["isEditCell"] = false;
-          });
           //alert(JSON.stringify(response.Items))
           this.totalCount = response.totalCount;
           setTimeout(() => {
@@ -608,41 +486,14 @@ export default {
           this.listLoading = false;
         });
     },
-    confirmEdit(row) {
-      row.isEditCell = false;
-    },
-    cancelEdit(row) {
-      row.isEditCell = false;
-    //   this.$message({
-    //     message: "The title has been restored to the original value",
-    //     type: "warning",
-    //   });
-    },
     fetchData(id) {
       //循环动态
       this.$axios
-        .gets("/api/settleaccount/SettleAccount/" + id)
+        .gets("/api/settleaccount/InventoryDetail/" + id)
         .then((response) => {
           this.form = response;
         });
     },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "materialCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
     /** 多项筛选操作 */
     /** 筛选操作 */
     handleFilters(data) {
@@ -685,7 +536,61 @@ export default {
         this.getList();
       }
     },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "materialCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
     resetQuery() {},
+    // handleDelete(row) {//批量删除
+    //   var params = []
+    //   let myalert = ''//声明变量，其变量必须在此声明后使用
+    //   if (row) {//单行
+    //     params.push(row.id)
+    //     myalert = row.name
+    //   } else {//多选
+    //     this.multipleSelection.forEach(element => {
+    //       let id = element.id
+    //       params.push(id)
+    //     })
+    //     myalert = '选中项'
+    //   }
+    //   this.$confirm('是否删除' + myalert + '?', '提示', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   })
+    //     .then(() => {
+    //       this.$axios.posts('/api/settleaccount/CodeSetting/delete', params).then(response => {
+    //         const index = this.list.indexOf(row)
+    //         this.$notify({
+    //           title: '成功',
+    //           message: '删除成功',
+    //           type: 'success',
+    //           duration: 2000
+    //         })
+    //         this.getList()
+    //       })
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: 'info',
+    //         message: '已取消删除'
+    //       })
+    //     })
+    // },
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
@@ -700,7 +605,13 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
+      if (
+        column.property === "inputQty" ||
+        column.property === "outputQty" ||
+        column.property === "openingInventoryQty" ||
+        column.property === "price" ||
+        column.property === "endingInventoryQty"
+      ) {
         return { textAlign: "right" };
       } else {
         return { textAlign: "left" };
@@ -708,7 +619,13 @@ export default {
     },
     /** 通过回调控制表头style */
     headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
+      if (
+        column.property === "inputQty" ||
+        column.property === "outputQty" ||
+        column.property === "openingInventoryQty" ||
+        column.property === "price" ||
+        column.property === "endingInventoryQty"
+      ) {
         return { textAlign: "right", background: "#FAFAFA" };
       } else {
         return { textAlign: "left", background: "#FAFAFA" };
@@ -727,4 +644,3 @@ export default {
 @import "../../styles/crmtable.scss";
 </style>
 
-
diff --git a/code/WebApp/vue/src/views/ux/basedata/material/index.vue b/code/WebApp/vue/src/views/ux/basedata/material/index.vue
index 64755b00..2d91c26d 100644
--- a/code/WebApp/vue/src/views/ux/basedata/material/index.vue
+++ b/code/WebApp/vue/src/views/ux/basedata/material/index.vue
@@ -2,14 +2,14 @@
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
-      <!-- <el-button
+      <el-button
         class="filter-item"
         size="mini"
         type="primary"
         icon="el-icon-plus"
         @click="handleCreate"
         >新增
-      </el-button> 
+      </el-button>
       <el-button
         class="filter-item"
         size="mini"
@@ -17,11 +17,11 @@
         icon="el-icon-upload2"
         @click="handleImportExcel()"
         >导入Excel
-      </el-button>-->
+      </el-button>
       <el-button
         class="filter-item"
         size="mini"
-        type="warning"
+        type="info"
         icon="el-icon-download"
         @click="handleDownload()"
         >导出Excel
@@ -43,13 +43,13 @@
         >搜索
       </el-button>
       <!--表格头组件，filter查询-->
-      <!-- <c-r-m-table-head
+      <c-r-m-table-head
         ref="crmTableHead"
         :crm-type="crmType"
         @handle="handleHandle"
         @filter="handleFilters"
       >
-      </c-r-m-table-head> -->
+      </c-r-m-table-head>
     </flexbox>
     <!--表格渲染-->
     <el-table
@@ -160,7 +160,7 @@
             </el-form-item>
           </el-col>
           <el-col :md="4" :xs="24">
-            <el-form-item label="产品类型" required />
+            <el-form-item label="估价类" required />
           </el-col>
           <el-col :md="8" :xs="24">
             <el-form-item prop="estimateType">
@@ -186,6 +186,23 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="估价类描述" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="estimateTypeDesc">
+              <el-input
+                type="textarea"
+                v-model="form.estimateTypeDesc"
+                maxlength="4000"
+                show-word-limit
+                style="width: 455px"
+                placeholder="最多输入4000个字符"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="text" @click="dialogFormVisible = false"
@@ -202,7 +219,7 @@
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-base";
+import importExcel from "@/components/ImportExcel-vw";
 import { downloadFile } from "@/utils/crmindex.js";
 import CRMTableHead from "../../components/CRMTableHead";
 
@@ -277,7 +294,6 @@ export default {
           }, //默认查询可用的
         ],
         //OrgID:"",
-        Sorting: "",
         SkipCount: 0,
         MaxResultCount: 15,
       },
@@ -309,6 +325,7 @@ export default {
       var offsetHei = document.documentElement.clientHeight;
       self.tableHeight = offsetHei - 190;
     };
+    this.getAllFactory();
   },
   created() {
     this.getList();
@@ -321,12 +338,34 @@ export default {
       tempsTabs.push({ label: "物料号", prop: "materialCode", width: 150 });
       tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 200 });
       tempsTabs.push({ label: "基本计量单位", prop: "unit", width: 100 });
-      tempsTabs.push({ label: "产品类型", prop: "estimateType", width: 90 });
-
+      tempsTabs.push({ label: "估价类", prop: "estimateType", width: 90 });
+      tempsTabs.push({
+        label: "估价类描述",
+        prop: "estimateTypeDesc",
+        width: 250,
+      });
       return tempsTabs;
     },
   },
   methods: {
+    getAllFactory() {
+      //取工厂列表信息
+      this.yearMonthList = [];
+      this.listQueryCustom.SkipCount = (this.page - 1) * 500;
+      this.$axios
+        .posts("/api/settleaccount/Factory/list", this.listQueryCustom)
+        .then((response) => {
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.code;
+            options.label = element.desc;
+            this.yearMonthList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
     handleCreate() {
       this.$nextTick(() => {
         this.$refs["form"].resetFields();
@@ -336,25 +375,6 @@ export default {
       this.form = {};
       this.dialogFormVisible = true;
     },
-    handleUpdate(row) {
-      this.formTitle = "修改";
-      this.isEdit = true;
-      if (row) {
-        this.fetchData(row.id);
-        this.dialogFormVisible = true;
-      } else {
-        if (this.multipleSelection.length != 1) {
-          this.$message({
-            message: "编辑必须选择单行",
-            type: "warning",
-          });
-          return;
-        } else {
-          this.fetchData(this.multipleSelection[0].id);
-          this.dialogFormVisible = true;
-        }
-      }
-    },
     save() {
       this.$refs.form.validate((valid) => {
         if (valid) {
@@ -459,12 +479,13 @@ export default {
         });
     },
 
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-       this.listQuery.Filters = [];
-      if (this.listQuery.Sorting === "") {
-        this.listQuery.Sorting = "materialCode ascending";
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.$axios
         .posts("/api/settleaccount/Material/list", this.listQuery)
@@ -472,7 +493,6 @@ export default {
           this.list = response.items;
           //alert(JSON.stringify(response.Items))
           this.totalCount = response.totalCount;
-          this.listQuery.Sorting = "";
           setTimeout(() => {
             //大数据量加载时
             this.listLoading = false;
@@ -533,7 +553,7 @@ export default {
     /** 筛选操作 */
     handleFilter() {
       this.page = 1;
-      //this.getList();
+      this.getList();
       this.listQuery.Filters = [];
       if (this.searchContent != "") {
         var column = "materialCode";
diff --git a/code/WebApp/vue/src/views/ux/basedata/material/index1.vue b/code/WebApp/vue/src/views/ux/basedata/material/index1.vue
new file mode 100644
index 00000000..a0f46011
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/basedata/material/index1.vue
@@ -0,0 +1,843 @@
+<!--物料主数据-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >新增
+      </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload2"
+        @click="handleCreate1"
+        >回执确认
+      </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出Excel
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="搜索..."
+        style="width: 220px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 导入Excel组件 -->
+      <importExcel
+        ref="importexcel"
+        :show="showExcelImport"
+        :crmType="crmType"
+        @close="importExcelData"
+      />
+    </div>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="运输商：" required />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="factory">
+              <el-select
+                v-model="form.factory"
+                clearable
+                style="width: 188px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in yearMonthList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="车牌号" required />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="factory">
+              <el-select
+                v-model="form.factory"
+                clearable
+                style="width: 188px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in yearMonthList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="发运单号：" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="unit">
+              <el-input v-model="form.unit" style="width: 452px" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="备注："  />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="materialDesc">
+              <el-input
+                type="textarea"
+                v-model="form.materialDesc"
+                maxlength="4000"
+                show-word-limit
+                style="width: 455px"
+                placeholder="最多输入4000个字符"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+
+    <!--回执单-->
+    <el-dialog
+      :visible.sync="dialogFormVisible1"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+          <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="送达时间" required />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="year">
+              <el-date-picker
+                v-model="form.year"
+                style="width: 188px"
+                type="year"
+                format="yyyy 年"
+                value-format="yyyy"
+                placeholder="选择时间"
+                :disabled="isEdit"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="运输路线：" required />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="factory">
+              <el-select
+                v-model="form.factory"
+                clearable
+                style="width: 188px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in yearMonthList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+         
+        </el-row>
+
+        <el-row>
+             <el-col :md="4" :xs="24">
+            <el-form-item label="附加运输费用："  />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="unit">
+              <el-input v-model="form.unit" />
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="补助："  />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="unit">
+              <el-input v-model="form.unit"  />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="备注："  />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="materialDesc">
+              <el-input
+                type="textarea"
+                v-model="form.materialDesc"
+                maxlength="4000"
+                show-word-limit
+                style="width: 455px"
+                placeholder="最多输入4000个字符"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+ <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="上传附件："  />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="materialDesc">
+             <el-upload
+                ref="upload"
+                class="avatar-uploader"
+                drag
+                action="#"
+                :http-request="httpRequestfiles"
+                :headers="httpHeader"
+                :file-list="fileuploadList"
+                :before-upload="beforeAvatarUpload"
+                :before-remove="beforeRemove"
+                :on-remove="handleRemove"
+                multiple
+                :limit="10"
+              >
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+                </div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible1 = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import importExcel from "@/components/ImportExcel-vw";
+import { downloadFile } from "@/utils/crmindex.js";
+import CRMTableHead from "../../components/CRMTableHead";
+
+export default {
+  name: "Bomdatabase",
+  components: { Pagination, importExcel, CRMTableHead },
+  directives: { permission },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        0: "Service",
+        1: "Trade",
+        2: "Labor",
+      };
+      return statusMap[status];
+    },
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "material",
+      rules: {
+        //前端定义的规则，后端也有验证
+        materialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+        materialDesc: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+        unit: [{ required: true, message: "必须输入！", trigger: "blur" }],
+        estimateType: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+        estimateTypeDesc: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+        factory: [{ required: true, message: "请选择工厂", trigger: "change" }],
+      },
+      searchContent: "", // 输入内容
+      YearMonthValue: "",
+      yearMonthList: [],
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      dialogFormVisible1: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+      listQueryCustom: {
+        Filters: [
+          {
+            logic: 0,
+            column: "customerCode",
+            action: 0,
+            value: "U22000",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+    this.getAllFactory();
+  },
+  created() {
+    this.getList();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "交货地点", prop: "factory", width: 120 });
+      tempsTabs.push({ label: "发货地点", prop: "estimateType", width: 150 });
+       tempsTabs.push({ label: "发送时间", prop: "creationTime", width: 150 });
+        tempsTabs.push({ label: "使用时间", prop: "creationTime", width: 150 });
+      tempsTabs.push({ label: "背板数量", prop: "version", width: 100 });
+      tempsTabs.push({ label: "发货数量", prop: "unit", width: 100 });
+      tempsTabs.push({ label: "摸具数量", prop: "unit", width: 100 });
+      tempsTabs.push({ label: "车号", prop: "estimateType", width: 90 });
+       tempsTabs.push({ label: "司机", prop: "estimateType", width: 90 });
+       tempsTabs.push({ label: "信息员", prop: "materialDesc", width: 90 });
+      tempsTabs.push({
+        label: "备注",
+        prop: "estimateTypeDesc",
+        width: 250,
+      });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    getAllFactory() {
+      //取工厂列表信息
+      this.yearMonthList = [];
+      this.listQueryCustom.SkipCount = (this.page - 1) * 500;
+      this.$axios
+        .posts("/api/settleaccount/Factory/list", this.listQueryCustom)
+        .then((response) => {
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.code;
+            options.label = element.desc;
+            this.yearMonthList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      this.$nextTick(() => {
+        this.$refs["form"].resetFields();
+      });
+      this.formTitle = "新增";
+      this.isEdit = false;
+      this.form = {};
+      this.dialogFormVisible = true;
+    },
+    handleCreate1() {
+      this.$nextTick(() => {
+        this.$refs["form"].resetFields();
+      });
+      this.formTitle = "回执确认";
+      this.isEdit = false;
+      this.form = {};
+      this.dialogFormVisible1 = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          if (this.isEdit) {
+            console.log("修改参数:" + JSON.stringify(this.form));
+            this.$axios
+              .puts("/api/settleaccount/Material/" + this.form.id, this.form)
+              .then((response) => {
+                this.formLoading = false;
+                this.$notify({
+                  title: "成功",
+                  message: "更新成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.dialogFormVisible = false;
+                this.getList();
+              })
+              .catch(() => {
+                this.formLoading = false;
+              });
+          } else {
+            //insert添加
+            console.log(JSON.stringify(this.form));
+            this.$axios
+              .posts("/api/settleaccount/Material", this.form)
+              .then((response) => {
+                this.formLoading = false;
+                this.$notify({
+                  title: "成功",
+                  message: "新增成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.dialogFormVisible = false;
+                this.getList();
+              })
+              .catch(() => {
+                this.formLoading = false;
+              });
+          }
+        }
+      });
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    async handleDownload() {
+      this.listLoading = true;
+      this.$axios
+        .posts("/api/settleaccount/Material/Export", this.listQuery)
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.$axios
+        .posts("/api/settleaccount/Material/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态，取客户名称
+      this.$axios.gets("/api/settleaccount/Material/" + id).then((response) => {
+        this.form = response;
+      });
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "materialCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+    handleDelete(row) {
+      //批量删除
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+        myalert = "选中项";
+      }
+      this.$confirm("是否删除" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/settleaccount/CodeSetting/delete", params)
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    getHTStatusStyle(status) {
+      if (status == 0) {
+        //新增
+        return {
+          "border-color": "#E6A23C",
+          "background-color": "#FDF6EC",
+          color: "#E6A23C",
+        };
+      } else if (status == 1 || status == 2) {
+        //审核中
+        return {
+          "border-color": "#409EFF",
+          "background-color": "#ECF5FF",
+          color: "#409EFF",
+        };
+      } else if (status == 3 || status == 6) {
+        //已签定和完成
+        return {
+          "border-color": "#67C23A",
+          "background-color": "#F0F9EB",
+          color: "#67C23A",
+        };
+      } else if (status == 4) {
+        return {
+          "border-color": "#71d87f",
+          "background-color": "#F4F4F5",
+          color: "#71d87f",
+        };
+      } else if (status == 5) {
+        //执行
+        return {
+          "border-color": "#F56C6B",
+          "background-color": "#FEF0F0",
+          color: "#F56C6B",
+        };
+      } else if (status == 7) {
+        //中止
+        return {
+          "border-color": "#E9E9EB",
+          "background-color": "#F4F4F5",
+          color: "#909399",
+        };
+      }
+    },
+    getHTTypeStatusStyle(status) {
+      //合同类型
+      if (status == 0) {
+        return {
+          "border-color": "#91af49",
+          "background-color": "#FDF6EC",
+          color: "#91af49",
+        };
+      } else if (status == 1) {
+        return {
+          "border-color": "#71d87f",
+          "background-color": "#ECF5FF",
+          color: "#71d87f",
+        };
+      } else if (status == 2) {
+        return {
+          "border-color": "#d87171",
+          "background-color": "#F0F9EB",
+          color: "#d87171",
+        };
+      }
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/basedata/materialRelationSupplier/index.vue b/code/WebApp/vue/src/views/ux/basedata/materialRelationSupplier/index.vue
index 061779ef..774c7814 100644
--- a/code/WebApp/vue/src/views/ux/basedata/materialRelationSupplier/index.vue
+++ b/code/WebApp/vue/src/views/ux/basedata/materialRelationSupplier/index.vue
@@ -384,9 +384,14 @@ export default {
             });
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .posts("/api/settleaccount/SupplierItemSetUp/list", this.listQuery)
         .then((response) => {
diff --git a/code/WebApp/vue/src/views/ux/basedata/modulesManager/index.vue b/code/WebApp/vue/src/views/ux/basedata/modulesManager/index.vue
index b7b7a71a..372fa99a 100644
--- a/code/WebApp/vue/src/views/ux/basedata/modulesManager/index.vue
+++ b/code/WebApp/vue/src/views/ux/basedata/modulesManager/index.vue
@@ -237,7 +237,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
 }, {});
 
 export default {
-  name: "ModulesManager",
+  name: "PartsSettlement",
   components: { Pagination, importExcel, CRMTableHead },
   directives: { permission },
   filters: {
@@ -260,7 +260,7 @@ export default {
   },
   data() {
     return {
-      crmType: "ModulesManager",
+      crmType: "materialRelation",
       versionValue: "",
       searchContent: "", // 输入内容
       form: {
@@ -587,9 +587,14 @@ export default {
             });
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .posts("/api/settleaccount/importMap/list", this.listQuery)
         .then((response) => {
diff --git a/code/WebApp/vue/src/views/ux/basedata/partsSettlement/index.vue b/code/WebApp/vue/src/views/ux/basedata/partsSettlement/index.vue
index aadd8a4d..8eecd0ce 100644
--- a/code/WebApp/vue/src/views/ux/basedata/partsSettlement/index.vue
+++ b/code/WebApp/vue/src/views/ux/basedata/partsSettlement/index.vue
@@ -1,52 +1,57 @@
-<!--总成与结算件关系页-->
+<!--零件匹配关系页-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
-      <span>版本:</span>
-
-      <XhJSSelect
-        :options="versionList"
-        style="width: 200px"
-        class="search-container"
-        @value-change="selectValue"
-      ></XhJSSelect>
-
-      <span>适用功能：</span>
-      <el-select
-        v-model="valueSelect"
-        clearable
-        placeholder="请选结算或二配"
-        size="medium"
-        style="margin-right: 15px"
-        @change="valueselectChange"
-      >
-        <el-option label="结算" value="R0003"></el-option>
-        <el-option label="二配" value="R0001"></el-option>
-      </el-select>
-
       <el-button
         class="filter-item"
         size="mini"
         type="primary"
         icon="el-icon-plus"
-        @click="handleImportExcel()"
-        >导入文件（Excel）
+        v-permission="['SettleAccount.MaterialRelationships.Create']"
+        @click="handleCreate"
+        >新增
+      </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="success"
+        icon="el-icon-edit"
+        v-permission="['SettleAccount.MaterialRelationships.Update']"
+        @click="handleUpdate()"
+        >修改
+      </el-button>
+      <el-button
+        class="filter-item"
+        type="danger"
+        icon="el-icon-delete"
+        size="mini"
+        v-permission="['SettleAccount.MaterialRelationships.Delete']"
+        @click="handleDelete()"
+        >批量删除
       </el-button>
-
       <el-button
         class="filter-item"
         size="mini"
         type="warning"
-        icon="el-icon-bottom"
+        icon="el-icon-upload2"
+        @click="handleImportExcel()"
+        v-permission="['SettleAccount.MaterialRelationships.Create']"
+        >导入
+      </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
         @click="handleDownload()"
-        >导出Excel
+        >导出
       </el-button>
       <el-input
         v-model="searchContent"
         clearable
         size="small"
         placeholder="按照ERP物料号搜索..."
-        style="width: 200px"
+        style="width: 250px"
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
@@ -58,6 +63,7 @@
         >搜索
       </el-button>
       <!--表格头组件，filter查询-->
+      <!--表格头组件，filter查询-->
       <c-r-m-table-head
         ref="crmTableHead"
         :crm-type="crmType"
@@ -65,18 +71,24 @@
         @filter="handleFilters"
       >
       </c-r-m-table-head>
+      <!-- <el-dropdown size="mini"  class="filter-item" split-button type="primary" @command="handleCommand">
+            更多菜单
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="cr-import">导入</el-dropdown-item>
+              <el-dropdown-item command="cr-export">导出全部</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown> -->
     </flexbox>
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
+      v-loading="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
       :data="list"
       :height="tableHeight"
       :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
       size="small"
       stripe
       border
@@ -86,20 +98,7 @@
       @selection-change="handleSelectionChange"
       @row-click="handleRowClick"
     >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        ><!-- fixed 默认固定在左边-->
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
+      <el-table-column type="selection" width="44px"></el-table-column>
       <el-table-column
         v-for="(item, index) in getDefaultField"
         :key="index"
@@ -115,6 +114,22 @@
           {{ scope.column.label }}
         </template>
       </el-table-column>
+      <!-- <el-table-column label="操作" align="center" width="128px" fixed="right">
+        <template slot-scope="{ row }">
+          <el-button
+            type="primary"
+            size="mini"
+            @click="handleUpdate(row)"
+            icon="el-icon-edit"
+          />
+          <el-button
+            type="danger"
+            size="mini"
+            @click="handleDelete(row)"
+            icon="el-icon-delete"
+          />
+        </template>
+      </el-table-column> -->
     </el-table>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@@ -133,24 +148,137 @@
         @close="importExcelData"
       />
     </div>
+
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="ERP物料号" required />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="erpMaterialCode">
+              <el-input v-model="form.erpMaterialCode" :disabled="isEdit" />
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="物料属性" required />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="materialProperty">
+              <el-input v-model="form.materialProperty" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="结算物料号" />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="settleMaterialCode">
+              <el-input v-model="form.settleMaterialCode" />
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="发货看板物料号" />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="shipMaterailCode">
+              <el-input v-model="form.shipMaterailCode" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="估价类" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="appraisalCategory">
+              <el-input
+                type="textarea"
+                v-model="form.appraisalCategory"
+                maxlength="4000"
+                show-word-limit
+                style="width: 455px"
+                placeholder="最多输入4000个字符"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="物料描述" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="materialDesc">
+              <el-input
+                type="textarea"
+                v-model="form.materialDesc"
+                maxlength="4000"
+                show-word-limit
+                style="width: 455px"
+                placeholder="最多输入4000个字符"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-hq";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import Lockr from "lockr";
+import importExcel from "@/components/ImportExcel-vw";
 import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
+import CRMTableHead from "../../components/CRMTableHead";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
 
 export default {
-  name: "MaterialRelationshipDetail",
-  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
+  name: "PartsSettlement",
+  components: { Pagination, importExcel, CRMTableHead },
   directives: { permission },
   filters: {
+    statusFilter(status) {
+      const statusMap = {
+        0: "Service",
+        1: "Trade",
+        2: "Labor",
+      };
+      return statusMap[status];
+    },
     IsCustomerSignFilter(status) {
       //翻译是否签字
       const statusMap = {
@@ -160,30 +288,29 @@ export default {
       return statusMap[status];
     },
   },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
   data() {
     return {
       crmType: "materialRelation",
-      versionValue: "",
-      valueSelect: "R0003",
-      versionList: [], //版本列表
       rules: {
-        //前端定义的规则，后端也有验证
         erpMaterialCode: [
           { required: true, message: "必须输入！", trigger: "blur" },
         ],
+        appraisalCategory: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+        materialProperty: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+        customerDesc: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+          { max: 4000, message: "长度最多为4000个字符", trigger: "blur" },
+        ],
+        materialDesc: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+          { max: 4000, message: "长度最多为4000个字符", trigger: "blur" },
+        ],
       },
       searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
       form: {
         dicDetailID: "",
         customerId: "",
@@ -200,10 +327,6 @@ export default {
           return {};
         },
       },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
       listQuery: {
         Filters: [
           {
@@ -216,26 +339,9 @@ export default {
         //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        version: "",
-        customerCode: ""
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        fileType: 0,
-        userId: "",
       },
       page: 1,
+      bomUnit,
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
@@ -249,180 +355,86 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
-    this.getVersionInfo();
-    //if (this.versionList == []) {
-      this.getList();
-   // }
+    this.getList();
   },
   computed: {
-    /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-
-      tempsTabs.push({
-        label: "适配功能",
-        prop: "customerCode",
-        width: 150,
-      });
+     
       tempsTabs.push({
         label: "ERP物料号",
         prop: "erpMaterialCode",
         width: 150,
       });
       tempsTabs.push({
-        label: "ERP物料描述",
-        prop: "materialDesc",
-        width: 250,
+        label: "物料属性",
+        prop: "materialProperty",
+        width: 100,
       });
       tempsTabs.push({
         label: "结算物料号",
         prop: "settleMaterialCode",
         width: 120,
+      });
+       tempsTabs.push({
+        label: "发货看板物料号",
+        prop: "shipMaterailCode",
+        width: 100,
       });
       tempsTabs.push({
-        label: "数量",
-        prop: "qty",
-        width: 120,
+        label: "估价类",
+        prop: "appraisalCategory",
+        width: 100,
       });
+      tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 });
       return tempsTabs;
     },
-    MoreTypes() {
-      var moreTypes = [];
-      moreTypes.push({ type: "updateFis", name: "更新FIS结算数据" });
-      //moreTypes.push({ type: "enter", name: "新按钮" });
-      return moreTypes;
-    },
   },
   methods: {
-    handleImportExcel() {
-      //导入
-      this.showExcelImport = true;
-      this.$refs.importexcel.handleImportExcelClick();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    valueselectChange(data) {
-      //alert(data);
-      //版本下拉选择
-      this.valueSelect = data;
-      this.getList();
-    },
-    handleTypeDrop(command, params = {}) {
-      if (command == "updateFis") {
-        this.listLoading = true;
-        //this.listQuery.SkipCount = (this.page - 1) * 10000;
-        this.$axios
-          .posts("/api/settleaccount/MaterialRelationshipDetail/updateFis")
-          .then((res) => {
-            if (res == true) {
-              this.$notify({
-                title: "成功",
-                message: "FIS数据-更新成功！",
-                type: "success",
-                duration: 2000,
-              });
-            } else {
-              this.$message({
-                type: "warning",
-                message: "FIS数据-更新失败！",
-              });
-            }
-            this.listLoading = false;
-          });
-      } else if (command == "enter") {
-      }
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    getVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts(
-          "/api/settleaccount/MaterialRelationshipDetail/versionlist",
-          this.listQuery
-        )
-        .then((response) => {
-          this.versionList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.id;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-          const res = new Map()
-          this.versionList = this.versionList.filter((item) => !res.has(item.label) && res.set(item.label, 1))
-          if (JSON.stringify(this.versionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {
         this.getList();
       }
     },
+    handleCommand(command) {
+      if (command === "cr-import") {
+        //导入功能
+        this.showExcelImport = true;
+        this.$refs.importexcel.handleImportExcelClick();
+      } else if (command === "cr-export") {
+        //导出功能
+        //
+      }
+    },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property === "customerCode") {
-        if (row[column.property] === "R0001") {
-          var vname = "二配";
-          return vname;
-        } else if (row[column.property] === "R0003") {
-          var vname = "结算";
-          return vname;
-        } else {
-          return row[column.property];
-        }
-      }
+      // if (column.property === 'projectRole') {
+      //   return { 0: '是', 1: '否' }[row[column.property]]
+      // }
       return row[column.property] || "--";
     },
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
+    },
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
     importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
       //关闭导入窗体时调用
       this.showExcelImport = false;
+      this.getList();
     },
-    //导出功能
     async handleDownload() {
       this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
-       if (this.valueSelect === "") {
-        this.$message.error("必需选择适用功能！");
-        this.listLoading = false;
-        return;
-      }
-      if (this.valueSelect != "") {
-        this.listQuery.customerCode = this.valueSelect;
-      } 
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("总成与结算件的导出条件：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts(
-          "/api/settleaccount/MaterialRelationshipDetail/Export",
-          this.listQuery
-        )
+        .posts("/api/settleaccount/MaterialRelationship/Export", this.listQuery)
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -430,52 +442,30 @@ export default {
               "/api/settleaccount/getblobfile/download/" + fileNameOfProject
             )
             .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
-                let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, fileNameOfProject);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
+              downloadFile(response, fileNameOfProject);
+              this.$notify({
+                title: "成功",
+                message: "数据-导出成功！",
+                type: "success",
+                duration: 2000,
+              });
               this.listLoading = false;
             });
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      if (this.valueSelect != "") {
-        this.listQuery.customerCode = this.valueSelect;
+     // this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
       } else {
-        this.listQuery.customerCode = "";
+        this.listQuery.SkipCount = (this.page - 1) * 15;
       }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts(
-          "/api/settleaccount/MaterialRelationshipDetail/list",
-          this.listQuery
-        )
+        .posts("/api/settleaccount/MaterialRelationship/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
+          //alert(JSON.stringify(response.Items))
           this.totalCount = response.totalCount;
           setTimeout(() => {
             //大数据量加载时
@@ -486,32 +476,14 @@ export default {
           this.listLoading = false;
         });
     },
-
     fetchData(id) {
-      //循环动态
+      //循环动态，取客户名称
       this.$axios
-        .gets("/api/settleaccount/MaterialRelationshipDetail/" + id)
+        .gets("/api/settleaccount/MaterialRelationship/" + id)
         .then((response) => {
           this.form = response;
         });
     },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "erpMaterialCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
     /** 多项筛选操作 */
     /** 筛选操作 */
     handleFilters(data) {
@@ -554,7 +526,141 @@ export default {
         this.getList();
       }
     },
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "erpMaterialCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
     resetQuery() {},
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          if (this.isEdit) {
+            console.log(JSON.stringify(this.form));
+            this.$axios
+              .puts(
+                "/api/settleaccount/MaterialRelationship/" + this.form.id,
+                this.form
+              )
+              .then((response) => {
+                this.formLoading = false;
+                this.$notify({
+                  title: "成功",
+                  message: "更新成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.dialogFormVisible = false;
+                this.getList();
+              })
+              .catch(() => {
+                this.formLoading = false;
+              });
+          } else {
+            //insert添加
+            console.log(JSON.stringify(this.form));
+            this.$axios
+              .posts("/api/settleaccount/MaterialRelationship", this.form)
+              .then((response) => {
+                this.formLoading = false;
+                this.$notify({
+                  title: "成功",
+                  message: "新增成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.dialogFormVisible = false;
+                this.getList();
+              })
+              .catch(() => {
+                this.formLoading = false;
+              });
+          }
+        }
+      });
+    },
+    handleCreate() {
+      this.$nextTick(() => {
+        this.$refs["form"].resetFields();
+      });
+      this.formTitle = "新增零件匹配关系";
+      this.isEdit = false;
+      this.form = {};
+      this.dialogFormVisible = true;
+    },
+    handleDelete(row) {
+      //批量删除
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+        myalert = "选中项";
+      }
+      this.$confirm("是否删除" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/settleaccount/MaterialRelationship/delete", params)
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    handleUpdate(row) {
+      this.formTitle = "修改零件匹配关系";
+      this.isEdit = true;
+      if (row) {
+        this.fetchData(row.id);
+        this.dialogFormVisible = true;
+      } else {
+        if (this.multipleSelection.length != 1) {
+          this.$message({
+            message: "编辑必须选择单行",
+            type: "warning",
+          });
+          return;
+        } else {
+          this.fetchData(this.multipleSelection[0].id);
+          this.dialogFormVisible = true;
+        }
+      }
+    },
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
@@ -562,7 +668,6 @@ export default {
         return;
       }
       this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
       this.handleFilter();
     },
     handleSelectionChange(val) {
@@ -570,19 +675,18 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "left" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "left", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
+      // if (column.property === 'parentItemCode'
+      //   || column.property === 'parentItemDesc'
+      //   || column.property === 'childItemCode'
+      //   || column.property === 'childItemDesc'
+      //   || column.property === 'childItemUom'
+      //   || column.property === 'bomType') {
+      //   return { textAlign: 'left' }
+      // } else if (column.property === 'qty' || column.property === 'operateProcess' || column.property === 'scrapPercent') {
+      //   return { textAlign: 'right' }
+      // } else {
+      return { textAlign: "left" };
+      //}
     },
     handleRowClick(row, column, event) {
       this.$refs.multipleTable.clearSelection();
@@ -601,5 +705,3 @@ export default {
   white-space: pre-wrap;
 }
 </style>
-
-
diff --git a/code/WebApp/vue/src/views/ux/basedata/secondaryPriceRatio/index.vue b/code/WebApp/vue/src/views/ux/basedata/secondaryPriceRatio/index.vue
new file mode 100644
index 00000000..bf5b725a
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/basedata/secondaryPriceRatio/index.vue
@@ -0,0 +1,689 @@
+<!--二配结算价格比例-子表-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <!-- <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select> -->
+      <XhJSSelect
+        :options="versionList"
+        style="width: 200px"
+        class="search-container"
+        @value-change="selectValue"
+      ></XhJSSelect>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload2"
+        @click="handleImportExcel()"
+        >导入Excel
+      </el-button>
+      <!-- <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出Excel
+      </el-button> -->
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照客户总成物料号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+      <el-dropdown size="small" class="filter-item" @command="handleCommand">
+        <span class="el-dropdown-link">
+          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="excel" icon="el-icon-plus"
+            >导出Excel</el-dropdown-item
+          >
+          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
+            >导出Csv</el-dropdown-item
+          >
+        </el-dropdown-menu>
+      </el-dropdown>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 导入Excel组件 -->
+      <importExcel
+        ref="importexcel"
+        :show="showExcelImport"
+        :crmType="crmType"
+        @close="importExcelData"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import { downloadFile } from "@/utils/crmindex.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-vw";
+import Lockr from "lockr";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
+
+export default {
+  name: "Bomdatabase",
+  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
+  directives: { permission },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "secondaryPriceRatio",
+      versionValue: "",
+      versionList: [], //版本列表
+      searchContent: "", // 输入内容
+      form: {},
+      customerInfo: {
+        inventoryId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: "",
+        fileType: 0,
+        userId: "00000000-0000-0000-0000-000000000000",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getVersionInfo();
+    this.getList();
+  },
+  // watch: {
+  //   customerInfos: {
+  //     handler(newVal) {
+  //       if (newVal == "" || newVal == "undefined") {
+  //         //TODO
+  //       } else {
+  //         newVal.forEach((element) => {
+  //           this.customerInfo.inventoryId = element.InventoryId;
+  //         });
+  //         if (this.customerInfo.inventoryId != "") {
+  //           this.getList();
+  //         }
+  //       }
+  //     },
+  //   },
+  // },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "版本",
+        prop: "version",
+        width: 100,
+      });
+      tempsTabs.push({
+        label: "客户代码",
+        prop: "customerCode",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "客户总成物料号",
+        prop: "customItemCode",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "客户物料号结算价格",
+        prop: "customItemPrice",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "客户组件",
+        prop: "customSubItemCode",
+        width: 200,
+      });
+      tempsTabs.push({
+        label: "客户组件结算价格",
+        prop: "customSubItemPrice",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "供应商代码",
+        prop: "supplierCode",
+        width: 150,
+      });
+      tempsTabs.push({ label: "供应商描述", prop: "supplierDesc", width: 250 });
+      tempsTabs.push({
+        label: "供货比例",
+        prop: "supplyProportion",
+        width: 120,
+      });
+
+      tempsTabs.push({
+        label: "比例供货价格",
+        prop: "supplyProportionPrice",
+        width: 120,
+      });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts(
+          "/api/settleaccount/SecondaryPriceRatio/listVersion",
+          this.listQuery
+        )
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.id;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+          if (JSON.stringify(this.versionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.versionValue = this.versionList[0].value;
+            this.getList();
+          }
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
+    selectOptionsChange(item) {
+      this.getList();
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property == "supplyProportion") {
+        return row[column.property] * 100 + "%" || "0";
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getVersionInfo();
+      //this.getList();
+    },
+    handleCommand(command) {
+      if (this.versionValue === "") {
+        this.$message.error("请先选择版本！");
+        return;
+      }
+      switch (command) {
+        case "excel":
+          this.listQuery.fileType = 1; //0是csv,1是excel
+          break;
+        case "csv":
+          this.listQuery.fileType = 0; //0是csv,1是excel
+          break;
+        default:
+          //这里是没有找到对应的值处理
+          break;
+      }
+      this.listLoading = true;
+      if (this.versionValue === "") {
+        this.$message.error("必需选择版本！");
+        this.listLoading = false;
+        return;
+      }
+      if (this.versionValue != "") {
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
+      }
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log(
+        "二配价格结算比例导出条件：" + JSON.stringify(this.listQuery)
+      );
+      this.$axios
+        .posts("/api/settleaccount/SecondaryPriceRatio/Export", this.listQuery)
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    async handleDownload() {
+      this.listLoading = true;
+      if (this.versionValue === "") {
+        this.$message.error("必需选择版本！");
+        this.listLoading = false;
+        return;
+      }
+      if (this.versionValue != "") {
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
+      }
+      this.listQuery.fileType = 1; //0是csv,1是excel
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log("SecondaryPriceRatio：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts("/api/settleaccount/SecondaryPriceRatio/Export", this.listQuery)
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+      // await this.getDownBoms();
+      // var fileNameOfProject = "InventoryDetailExcelExporter.xlsx";
+      // this.$axios
+      //   .BolbGets(
+      //     "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+      //   )
+      //   .then((response) => {
+      //     downloadFile(response, "库存明细信息.xlsx");
+      //     this.$notify({
+      //       title: "成功",
+      //       message: "库存明细信息-下载成功！",
+      //       type: "success",
+      //       duration: 2000,
+      //     });
+      //   });
+    },
+    getDownBoms() {
+      this.listLoading = true;
+      this.$axios
+        .gets("/api/settleaccount/SecondaryPriceRatio/ExcelExporte")
+        .then((response) => {
+          this.listLoading = false;
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      if (this.versionValue != "") {
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
+      }
+      this.$axios
+        .posts("/api/settleaccount/SecondaryPriceRatio/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/SecondaryPriceRatio/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "customItemCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+    // handleDelete(row) {//批量删除
+    //   var params = []
+    //   let myalert = ''//声明变量，其变量必须在此声明后使用
+    //   if (row) {//单行
+    //     params.push(row.id)
+    //     myalert = row.name
+    //   } else {//多选
+    //     this.multipleSelection.forEach(element => {
+    //       let id = element.id
+    //       params.push(id)
+    //     })
+    //     myalert = '选中项'
+    //   }
+    //   this.$confirm('是否删除' + myalert + '?', '提示', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   })
+    //     .then(() => {
+    //       this.$axios.posts('/api/settleaccount/CodeSetting/delete', params).then(response => {
+    //         const index = this.list.indexOf(row)
+    //         this.$notify({
+    //           title: '成功',
+    //           message: '删除成功',
+    //           type: 'success',
+    //           duration: 2000
+    //         })
+    //         this.getList()
+    //       })
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: 'info',
+    //         message: '已取消删除'
+    //       })
+    //     })
+    // },
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "customSubItemPrice" ||
+        column.property === "customItemPrice" ||
+        column.property == "supplyProportionPrice" ||
+        column.property === "supplyProportionPrice"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "customSubItemPrice" ||
+        column.property === "customItemPrice" ||
+        column.property == "supplyProportionPrice" ||
+        column.property === "supplyProportionPrice"
+      ) {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+<style lang="scss">
+.el-table .cell.el-tooltip {
+  white-space: pre-wrap;
+}
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/basedata/settlementPakAndSparePartsRef/index.vue b/code/WebApp/vue/src/views/ux/basedata/settlementPakAndSparePartsRef/index.vue
deleted file mode 100644
index 99a54016..00000000
--- a/code/WebApp/vue/src/views/ux/basedata/settlementPakAndSparePartsRef/index.vue
+++ /dev/null
@@ -1,648 +0,0 @@
-<!--零件匹配关系页-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <span>版本:</span>
-
-      <XhJSSelect
-        :options="versionList"
-        style="width: 200px"
-        class="search-container"
-        @value-change="selectValue"
-      ></XhJSSelect>
-
-      <span>适用功能：</span>
-      <el-select
-        v-model="valueSelect"
-        clearable
-        placeholder="请选结算或二配"
-        size="medium"
-        style="margin-right: 15px"
-        @change="valueselectChange"
-      >
-        <el-option label="结算" value="R0003"></el-option>
-        <el-option label="二配" value="R0001"></el-option>
-      </el-select>
-
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-bottom"
-        @click="handleDownload()"
-        >导出Excel
-      </el-button>
-      <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照结算件编码搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button>
-      <!--表格头组件，filter查询-->
-      <c-r-m-table-head
-        ref="crmTableHead"
-        :crm-type="crmType"
-        @handle="handleHandle"
-        @filter="handleFilters"
-      >
-      </c-r-m-table-head>
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-      ><!-- fixed 默认固定在左边-->
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-invoice";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import Lockr from "lockr";
-import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
-
-export default {
-  name: "SettlementPartAndSpareParts",
-  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "settlementPartAndSpareParts",
-      versionValue: "",
-      valueSelect: "R0001",
-      versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        fileType: 1,
-        //site: "TH",
-        customerCode: "",
-        //userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        fileType: 0,
-        userId: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      sortState:false //标记刷新是否是排序调用
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
-    };
-  },
-  created() {
-    this.getVersionInfo();
-    this.getList();
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      /* tempsTabs.push({
-        label: "期间",
-        prop: "period",
-        width: 100,
-      }); */
-      tempsTabs.push({
-        label: "适用功能",
-        prop: "customerCode",
-        width: 100,
-      });
-      tempsTabs.push({
-        label: "结算件编码",
-        prop: "settlementPartCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "(Erp散件)零件号",
-        prop: "erpSparePartCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "(Erp散件)零件名称",
-        prop: "settlementPartDesc",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "QAD代码",
-        prop: "qadCode",
-        width: 100,
-      });
-      tempsTabs.push({
-        label: "供应商代码",
-        prop: "supplierCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "供应商名称",
-        prop: "supplierName",
-        width: 140,
-      });
-      tempsTabs.push({
-        label: "产品类",
-        prop: "productLine",
-        width: 100,
-      });
-      tempsTabs.push({
-        label: "每车数量",
-        prop: "perCarNum",
-        width: 100,
-      });
-      tempsTabs.push({
-        label: "单价",
-        prop: "price",
-        width: 100,
-      });
-      tempsTabs.push({
-        label: "供货比例",
-        prop: "supplyProportion",
-        width: 100,
-      });
-      tempsTabs.push({
-        label: "辆份价格",
-        prop: "quantityPrice",
-        width: 100,
-      });
-      return tempsTabs;
-    },
-    MoreTypes() {
-      var moreTypes = [];
-      moreTypes.push({ type: "updateFis", name: "更新FIS结算数据" });
-      //moreTypes.push({ type: "enter", name: "新按钮" });
-      return moreTypes;
-    },
-  },
-  methods: {
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    valueselectChange(data) {
-      //alert(data);
-      //版本下拉选择
-      this.valueSelect = data;
-      this.getList();
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    getVersionInfo() {
-      //取版本列表信息
-      this.listLoading = true;
-      this.listVersionQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts(
-          "/api/settleaccount/SettlementPakAndSpareParts/versionList",
-          this.listVersionQuery
-        )
-        .then((response) => {
-          this.versionList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.id;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-          if (JSON.stringify(this.versionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if(column.property === 'customerCode')
-      {
-        if(row[column.property] === 'R0001')
-        {
-          var vname = '二配';
-          return vname;
-        }
-        else if(row[column.property] === 'R0003')
-        {
-          var vname = '结算';
-          return vname;
-        }
-        else
-        {
-          return row[column.property];
-        }
-      }
-      /* if(column.property === 'supplyProportion')
-      {
-        var value = parseInt(row[column.property]) * 100 + "%";
-        return value;
-      } */
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-    //导出功能
-    async handleDownload() {
-      this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("发票导出：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/settleaccount/SettlementPakAndSpareParts/Export",
-          this.listQuery
-        )
-        .then((res) => {
-          let fileNameOfProject = res;
-          this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
-            .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
-                let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, fileNameOfProject);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      if (this.valueSelect != "") {
-        console.log(this.valueSelect)
-        this.listQuery.customerCode = this.valueSelect;
-        /* var column = "customerCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter); */
-      } else {
-        this.listQuery.customerCode = "";
-      }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/settleaccount/SettlementPakAndSpareParts/list",
-          this.listQuery
-        )
-        .then((response) => {
-          this.list = response.items;
-          this.list.forEach(item => {
-            if(item.customerCode === 'R0001')
-            {
-              item.customerCode = '二配';
-            }
-            else if(item.customerCode === 'R0003')
-            {
-              item.customerCode = '结算';
-            }
-          });
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/settleaccount/SettlementPart/" + id)
-        .then((response) => {
-          this.form = response;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      if(this.sortState === false)
-      {
-        this.listQuery.Filters = [];
-      }
-      else
-      {
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "Enabled")
-      }
-      //this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "settlementPartCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    /** 多项筛选操作 */
-    /** 筛选操作 */
-    handleFilters(data) {
-      if (data === null) {
-        this.listQuery.Filters = [];
-        this.getList(); //查询所有
-      } else {
-        console.log(data)
-        this.filterObj = data;
-        console.log("筛选" + JSON.stringify(data));
-        var offsetHei = document.documentElement.clientHeight;
-        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
-        this.tableHeight = offsetHei - removeHeight;
-        this.currentPage = 1;
-        let Filter = [];
-        data.forEach((item) => {
-          let filter = {};
-          if (item.formType === "datetime" || item.formType === "datetime") {
-            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
-
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
-            }
-          } else {
-            filter["Column"] = item.fieldName;
-            filter["Value"] = item.value;
-            filter["Logic"] = 0;
-            filter["Action"] = item.action;
-            Filter.push(filter);
-          }
-        });
-        console.log("筛选条件" + JSON.stringify(Filter));
-        this.listQuery.Filters = Filter;
-        this.getList();
-      }
-    },
-    resetQuery() {},
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
-      if(this.listQuery.Filters.length>0 && this.listQuery.Filters[0].column === "Enabled")
-      {
-        this.sortState = false;
-      }
-      else
-      {
-        this.sortState = true;
-      }
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/ux/basedata/settlementParts/index.vue b/code/WebApp/vue/src/views/ux/basedata/settlementParts/index.vue
deleted file mode 100644
index cefd06f7..00000000
--- a/code/WebApp/vue/src/views/ux/basedata/settlementParts/index.vue
+++ /dev/null
@@ -1,654 +0,0 @@
-<!--零件匹配关系页-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <span>版本:</span>
-
-      <XhJSSelect
-        :options="versionList"
-        style="width: 200px"
-        class="search-container"
-        @value-change="selectValue"
-      ></XhJSSelect>
-
-      <span>适用功能：</span>
-      <el-select
-        v-model="valueSelect"
-        clearable
-        placeholder="请选结算或二配"
-        size="medium"
-        style="margin-right: 15px"
-        @change="valueselectChange"
-      >
-        <el-option label="结算" value="R0003"></el-option>
-        <el-option label="二配" value="R0001"></el-option>
-      </el-select>
-
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-bottom"
-        @click="handleDownload()"
-        >导出Excel
-      </el-button>
-      <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照结算件基本信息搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button>
-      <!--表格头组件，filter查询-->
-      <c-r-m-table-head
-        ref="crmTableHead"
-        :crm-type="crmType"
-        @handle="handleHandle"
-        @filter="handleFilters"
-      >
-      </c-r-m-table-head>
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-      ><!-- fixed 默认固定在左边-->
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-invoice";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import Lockr from "lockr";
-import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
-
-export default {
-  name: "SettlementPart",
-  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "settlementPart",
-      versionValue: "",
-      valueSelect: "R0003",
-      versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        //site: "TH",
-        customerCode: "",
-        //userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        fileType: 0,
-        userId: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      sortState:false //标记刷新是否是排序调用
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
-    };
-  },
-  created() {
-    this.getVersionInfo();
-    if (this.versionList == []) {
-      this.getList();
-    }
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-
-      tempsTabs.push({
-        label: "适用功能",
-        prop: "customerCode",
-        width: 100,
-      });
-      tempsTabs.push({
-        label: "工厂",
-        prop: "factory",
-        width: 100,
-      });
-      tempsTabs.push({ 
-        label: "车型", 
-        prop: "model", 
-        width: 150
-      });
-      /* tempsTabs.push({
-        label: "物料属性",
-        prop: "materialProperty",
-        width: 100,
-      }); */
-      tempsTabs.push({
-        label: "结算件代码",
-        prop: "settlementPartCode",
-        width: 120,
-      });
-      /* tempsTabs.push({
-        label: "结算件描述",
-        prop: "settlementPartDesc",
-        width: 120,
-      }); */
-      tempsTabs.push({
-        label: "价格",
-        prop: "price",
-        width: 120,
-      });
-      /* tempsTabs.push({
-        label: "计量单位",
-        prop: "uom",
-        width: 120,
-      }); */
-      /* tempsTabs.push({
-        label: "发货看板物料号",
-        prop: "shipMaterailCode",
-        width: 100,
-      });
-      tempsTabs.push({
-        label: "估价类",
-        prop: "appraisalCategory",
-        width: 100,
-      }); */
-      return tempsTabs;
-    },
-    MoreTypes() {
-      var moreTypes = [];
-      moreTypes.push({ type: "updateFis", name: "更新FIS结算数据" });
-      //moreTypes.push({ type: "enter", name: "新按钮" });
-      return moreTypes;
-    },
-  },
-  methods: {
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    valueselectChange(data) {
-      //alert(data);
-      //版本下拉选择
-      this.valueSelect = data;
-      this.getList();
-    },
-    handleTypeDrop(command, params = {}) {
-      if (command == "updateFis") {
-        this.listLoading = true;
-        //this.listQuery.SkipCount = (this.page - 1) * 10000;
-        this.$axios
-          .posts("/api/settleaccount/SettlementPart/updateFis")
-          .then((res) => {
-            if (res == true) {
-              this.$notify({
-                title: "成功",
-                message: "FIS数据-更新成功！",
-                type: "success",
-                duration: 2000,
-              });
-            } else {
-              this.$message({
-                type: "warning",
-                message: "FIS数据-更新失败！",
-              });
-            }
-            this.listLoading = false;
-          });
-      } else if (command == "enter") {
-      }
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    getVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listVersionQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts(
-          "/api/settleaccount/SettlementPart/versionlist",
-          this.listVersionQuery
-        )
-        .then((response) => {
-          this.versionList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.id;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-          const res = new Map()
-          this.versionList = this.versionList.filter((item) => !res.has(item.label) && res.set(item.label, 1))
-          if (JSON.stringify(this.versionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      /* if (column.property === "state") {
-        return { 0: "其他", 2: "已结" }[row[column.property]];
-      }
-      if (column.property == "accountDate" || column.property == "date") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        //return moment(date).format("YYYY-MM-DD HH:mm:ss");
-        return moment(date).format("YYYY-MM-DD");
-      } */
-      if(column.property === 'customerCode')
-      {
-        if(row[column.property] === 'R0001')
-        {
-          var vname = '二配';
-          return vname;
-        }
-        else if(row[column.property] === 'R0003')
-        {
-          var vname = '结算';
-          return vname;
-        }
-        else
-        {
-          return row[column.property];
-        }
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-    //导出功能
-    async handleDownload() {
-      this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("发票导出：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/settleaccount/SettlementPart/Export",
-          this.listQuery
-        )
-        .then((res) => {
-          let fileNameOfProject = res;
-          this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
-            .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
-                let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, fileNameOfProject);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      if (this.valueSelect != "") {
-        this.listQuery.customerCode = this.valueSelect;
-      } else {
-        this.listQuery.customerCode = "";
-      }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/settleaccount/SettlementPart/list",
-          this.listQuery
-        )
-        .then((response) => {
-          this.list = response.items;
-          this.list.forEach(item => {
-            if(item.customerCode === 'R0001')
-            {
-              item.customerCode = '二配';
-            }
-            else if(item.customerCode === 'R0003')
-            {
-              item.customerCode = '结算';
-            }
-          });
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/settleaccount/SettlementPart/" + id)
-        .then((response) => {
-          this.form = response;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      if(this.sortState === false)
-      {
-        this.listQuery.Filters = [];
-      }
-      else
-      {
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "Enabled")
-      }
-      //this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "settlementPartCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    /** 多项筛选操作 */
-    /** 筛选操作 */
-    handleFilters(data) {
-      if (data === null) {
-        this.listQuery.Filters = [];
-        this.getList(); //查询所有
-      } else {
-        console.log(data)
-        this.filterObj = data;
-        console.log("筛选" + JSON.stringify(data));
-        var offsetHei = document.documentElement.clientHeight;
-        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
-        this.tableHeight = offsetHei - removeHeight;
-        this.currentPage = 1;
-        let Filter = [];
-        data.forEach((item) => {
-          let filter = {};
-          if (item.formType === "datetime" || item.formType === "datetime") {
-            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
-
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
-            }
-          } else {
-            filter["Column"] = item.fieldName;
-            filter["Value"] = item.value;
-            filter["Logic"] = 0;
-            filter["Action"] = item.action;
-            Filter.push(filter);
-          }
-        });
-        console.log("筛选条件" + JSON.stringify(Filter));
-        this.listQuery.Filters = Filter;
-        this.getList();
-      }
-    },
-    resetQuery() {},
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
-      if(this.listQuery.Filters.length>0 && this.listQuery.Filters[0].column === "Enabled")
-      {
-        this.sortState = false;
-      }
-      else
-      {
-        this.sortState = true;
-      }
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/code/WebApp/vue/src/views/ux/benteng-out-data/btNotConsignReport/detail.vue
similarity index 68%
rename from code/WebApp/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
rename to code/WebApp/vue/src/views/ux/benteng-out-data/btNotConsignReport/detail.vue
index c7fdcb9a..1fb9fadb 100644
--- a/code/WebApp/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
+++ b/code/WebApp/vue/src/views/ux/benteng-out-data/btNotConsignReport/detail.vue
@@ -2,35 +2,20 @@
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
-      <!-- <el-button
+
+      <el-button
         class="filter-item"
         size="mini"
         type="info"
         icon="el-icon-download"
         @click="handleDownload()"
         >导出全部
-      </el-button> -->
-      <el-button
-        class="filter-item"
-        type="success"
-        icon="el-icon-check"
-        size="mini"
-        @click="handleCreateBills()"
-        >确认出库单(支持批量)</el-button
-      >
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="info"
-        icon="el-icon-download"
-        @click="handleCancelBills()"
-        >取消出库(支持批量)
       </el-button>
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照零件号搜索..."
+        placeholder="按照物料号搜索..."
         style="width: 230px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -71,7 +56,7 @@
       @selection-change="handleSelectionChange"
       @row-click="handleRowClick"
     >
-      <el-table-column type="selection" width="44px"></el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
       <el-table-column
         v-for="(item, index) in getDefaultField"
         :key="index"
@@ -109,8 +94,18 @@ import { downloadFile } from "@/utils/crmindex.js";
 
 export default {
   name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, CRMTableHead },
+  components: { Pagination, CRMTableHead },
   directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
   props: {
     customerInfos: {
       type: Array,
@@ -121,7 +116,7 @@ export default {
   },
   data() {
     return {
-      crmType: "vwOutOrder",
+      crmType: "stockFisDiffReport",
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -152,9 +147,9 @@ export default {
         Filters: [
           {
             logic: 0,
-            column: "",
+            column: "Enabled",
             action: 0,
-            value: "",
+            value: "true",
           }, //默认查询可用的
         ],
         //OrgID:"",
@@ -162,10 +157,6 @@ export default {
         MaxResultCount: 15,
         ParentId: "",
       },
-      listOutPutQuery: {
-        version: "",
-        ids: "",
-      },
       page: 1,
       dialogFormVisible: false,
       multipleSelection: [],
@@ -208,136 +199,24 @@ export default {
     getDefaultField() {
       var tempsTabs = [];
       tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件号",
-        prop: "materialCode",
+        label: "单据流水号",
+        prop: "documentNumber",
         width: 150,
       });
-      tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 });
-      tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 });
-      tempsTabs.push({ label: "数量", prop: "wmsBillNum", width: 100 });
+      tempsTabs.push({ label: "版本", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户代码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "订货看板编号", prop: "orderKBCode", width: 160 });
+      tempsTabs.push({ label: "物料编号", prop: "materialCode", width: 160 });
+      tempsTabs.push({ label: "物料名称", prop: "materialDesc", width: 160 });
+
+      tempsTabs.push({ label: "需求数", prop: "needQty", width: 80 });
+      tempsTabs.push({ label: "结算数量", prop: "consignQty", width: 80 });
+      tempsTabs.push({ label: "交货时间", prop: "deliveryDateTime", width: 100 });
+      tempsTabs.push({ label: "状态", prop: "state", width: 80 });
       return tempsTabs;
     },
   },
   methods: {
-    //取消出库单
-    handleCancelBills(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      //var params = [];
-      var params = "";
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          //params.push(id);
-          params += id + ",";
-        });
-        myalert = "选中项";
-      }
-      this.listOutPutQuery.version = row.version;
-      this.listOutPutQuery.ids = params.substr(0, params.length - 1);
-
-      this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts(
-              "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Cancel",
-              this.listOutPutQuery
-            )
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "操作成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    //出库单
-    handleCreateBills(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      //var params = [];
-      var params = "";
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          //params.push(id);
-          params += id + ",";
-        });
-        myalert = "选中项";
-      }
-      this.listOutPutQuery.version = row.version;
-      this.listOutPutQuery.ids = params.substr(0, params.length - 1);
-
-      this.$confirm("是否确认出库" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts(
-              "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass",
-              this.listOutPutQuery
-            )
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "生成成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {
@@ -397,23 +276,17 @@ export default {
     },
     getList(data) {
       this.listLoading = true;
-      if (data != undefined) {
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
         this.listQuery.SkipCount = (this.page - 1) * data.limit;
       } else {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
-      let filter = {
-        logic: 0,
-        column: "wmsBillNum",
-        action: 6,
-        value: this.customerInfo.parentId,
-      };
-      this.listQuery.Filters.push(filter);
-      //this.listQuery.ParentId = this.customerInfo.parentId;
-      console.log("查询条件：" + JSON.stringify(this.listQuery));
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("奔腾发出未结算条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
-          "/api/settleaccount/wmsjitoutput/WmsJitDetailList",
+          "/api/settleaccount/bt-kb-not-consign/details/byfilter",
           this.listQuery
         )
         .then((response) => {
@@ -429,13 +302,21 @@ export default {
           this.listLoading = false;
         });
     },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/bt-kb-not-consign/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
     /** 筛选操作 */
     handleFilter() {
       this.page = 1;
       this.getList();
       this.listQuery.Filters = [];
       if (this.searchContent != "") {
-        var column = "materialCode";
+        var column = "itemCode";
         let filter = {
           logic: 0,
           column: column,
diff --git a/code/WebApp/vue/src/views/ux/benteng-out-data/btNotConsignReport/index.vue b/code/WebApp/vue/src/views/ux/benteng-out-data/btNotConsignReport/index.vue
new file mode 100644
index 00000000..dbae89b9
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/benteng-out-data/btNotConsignReport/index.vue
@@ -0,0 +1,564 @@
+<!--轿车看板-发出未结算-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照单据流水号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="250px"
+      >
+        <template slot-scope="scope">
+          <el-tooltip
+            :content="scope.row.documentNumber"
+            placement="bottom-end"
+          >
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.documentNumber
+            }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="开始时间：" />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="beginTime">
+              <el-date-picker
+                v-model="form.beginTime"
+                type="datetime"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="结束时间：" />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="endTime">
+              <el-date-picker
+                v-model="form.endTime"
+                type="datetime"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="24" :xs="24">
+            <div
+              class="sections__tips"
+              style="margin-left: 80px; color: #ff4d4d"
+            >
+              备注：日期不选择的话，将默认最小日期和最大日期！
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <Detail
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></Detail>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import Detail from "./detail";
+import moment from "moment";
+import { formatTimeToTimestamp } from "@/utils/index";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, Detail },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "sendUnsettledDiffReport",
+      rules: {
+        // version: [{ required: true, message: "必须输入！", trigger: "change" }],
+        // beginTime: [{ required: true, message: "选择日期！", trigger: "change" }],
+        // endTime: [{ required: true, message: "选择日期！", trigger: "change" }],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "",
+        customerName: "",
+        beginTime: "",
+        endTime: "",
+      },
+      versionValue: "",
+      versionList: [],
+      startTimeVale: "",
+      endTimeVale: "",
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "统计时间起",
+        prop: "beginTime",
+        width: 120,
+        formType: "datetime",
+      });
+      tempsTabs.push({
+        label: "统计时间止",
+        prop: "endTime",
+        width: 120,
+        formType: "datetime",
+      });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 110 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.form.beginTime && this.form.endTime) {
+            if (
+              formatTimeToTimestamp(this.form.beginTime) >=
+              formatTimeToTimestamp(this.form.endTime)
+            ) {
+              this.$message.error("开始时间必须小于结束时间!");
+              return false;
+            }
+          }
+          this.formLoading = true;
+          //以下两个值暂时写成固定值
+          this.form.customerCode = "T51Z40";
+          this.form.customerName = "一汽奔腾轿车有限公司";
+          console.log("轿车发出未结算保存条件：" + JSON.stringify(this.form));
+          this.$axios
+            .posts("/api/settleaccount/bt-kb-not-consign/report", this.form)
+            .then((response) => {
+              this.formLoading = false;
+              this.$notify({
+                title: "成功",
+                message: "统计成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .then((response) => {
+          this.versionList = [];
+          response.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      // this.formTitle = "报表统计";
+      // this.isEdit = false;
+      // this.form = {};
+      // this.dialogFormVisible = true;
+      this.$axios
+        .posts("/api/settleaccount/bt-kb-not-consign/report", this.form)
+        .then((response) => {
+          this.formLoading = false;
+          let fileNameOfProject = response;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            })
+            .catch((error) => {
+              this.listLoading = false;
+            });
+        })
+        .catch(() => {
+          this.formLoading = false;
+        });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.$axios
+        .posts("/api/settleaccount/bt-kb-not-consign/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/bt-kb-not-consign/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "documentNumber";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+    handleDelete(row) {
+      //批量删除
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+        myalert = "选中项";
+      }
+      this.$confirm("是否删除" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/settleaccount/bt-kb-not-consign/delete", params)
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/benteng-out-data/btSeqKBDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/benteng-out-data/btSeqKBDiffReport/detail.vue
new file mode 100644
index 00000000..778d7601
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/benteng-out-data/btSeqKBDiffReport/detail.vue
@@ -0,0 +1,424 @@
+<!--车序与看板差异-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出全部
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照看板物料号搜索..."
+        style="width: 230px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+import moment from "moment";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, CRMTableHead },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "stockFisDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "客户代码", prop: "customCode", width: 120 });
+      tempsTabs.push({
+        label: " 看板物料号",
+        prop: "materialCode",
+        width: 160,
+      });
+      tempsTabs.push({ label: "日期", prop: "dt", width: 80 });
+      tempsTabs.push({ label: "车序数量", prop: "seqQty", width: 80 });
+      tempsTabs.push({ label: "看板数量", prop: "kbQty", width: 100 });
+      tempsTabs.push({ label: "差异数量", prop: "diffQty", width: 80 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+       if (column.property == "dt") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD");
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    async handleDownload() {
+      //await this.getDownBoms();
+      this.listLoading = true;
+      this.$axios
+        .gets(
+          "/api/settleaccount/bt-seq-kb-diff/export/" +
+            this.customerInfo.parentId
+        )
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("轿车车序与看板差异：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/bt-seq-kb-diff/details/byfilter",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/bt-seq-kb-diff/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "materialCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/billManage/vwOutOrder/index.vue b/code/WebApp/vue/src/views/ux/benteng-out-data/btSeqKBDiffReport/index.vue
similarity index 50%
rename from code/WebApp/vue/src/views/ux/billManage/vwOutOrder/index.vue
rename to code/WebApp/vue/src/views/ux/benteng-out-data/btSeqKBDiffReport/index.vue
index 90727815..a7dac10b 100644
--- a/code/WebApp/vue/src/views/ux/billManage/vwOutOrder/index.vue
+++ b/code/WebApp/vue/src/views/ux/benteng-out-data/btSeqKBDiffReport/index.vue
@@ -1,7 +1,15 @@
-<!--轿车看板-发出未结算-->
+<!--车序与看板差异-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button>
       <el-input
         v-model="searchContent"
         clearable
@@ -39,16 +47,16 @@
       @row-click="handleRowClick"
     >
       <el-table-column
-        label="单据号"
-        prop="billNum"
+        label="单据流水号"
+        prop="documentNumber"
         sortable="custom"
         align="center"
-        width="250px"
+        width="260px"
       >
         <template slot-scope="scope">
-          <el-tooltip :content="scope.row.billNum" placement="bottom-end">
+          <el-tooltip :content="scope.row.documentNumber" placement="top">
             <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.billNum
+              scope.row.documentNumber
             }}</span>
           </el-tooltip>
         </template>
@@ -70,6 +78,54 @@
         </template>
       </el-table-column>
     </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="version">
+              <el-select
+                v-model="form.version"
+                filterable
+                clearable
+                style="width: 188px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
       <pagination
@@ -88,10 +144,10 @@
         :before-close="handleDrawerClose"
       >
         <div>
-          <Detail
+          <StockFisDiffReport
             v-bind:customerInfos="customerInfos"
             style="margin-top: -35px"
-          ></Detail>
+          ></StockFisDiffReport>
         </div>
       </el-drawer>
     </div>
@@ -101,37 +157,43 @@
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import Detail from "./detail";
+import StockFisDiffReport from "./detail";
 import moment from "moment";
-import { formatTimeToTimestamp } from "@/utils/index";
-
+import { downloadFile } from "@/utils/crmindex.js";
 
 export default {
   name: "sendUnsettledDiffReport",
-  components: { Pagination, Detail},
+  components: { Pagination, StockFisDiffReport },
   directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
   data() {
     return {
       crmType: "sendUnsettledDiffReport",
       rules: {
-        // version: [{ required: true, message: "必须输入！", trigger: "change" }],
-        // beginTime: [{ required: true, message: "选择日期！", trigger: "change" }],
-        // endTime: [{ required: true, message: "选择日期！", trigger: "change" }],
+        //前端定义的规则，后端也有验证
+        version: [
+          { required: true, message: "必须选择版本！", trigger: "change" },
+        ],
       },
       customerInfos: [],
       searchContent: "", // 输入内容
       drawer: false,
       form: {
         version: "",
-        customerCode: "",
-        customerName: "",
-        beginTime: "",
-        endTime: "",
+        customerCode: "T51Z40",
+        customerName: "一汽奔腾轿车有限公司",
       },
       versionValue: "",
       versionList: [],
-      startTimeVale: "",
-      endTimeVale: "",
       list: null,
       totalCount: 0,
       listLoading: true,
@@ -156,13 +218,26 @@ export default {
         SkipCount: 0,
         MaxResultCount: 15,
       },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
       page: 1,
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 200,
+      tableHeight: document.documentElement.clientHeight - 260,
       isEdit: false,
     };
   },
@@ -170,24 +245,30 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 200;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
     this.getList();
-    //this.getVersionInfo();
+    this.getVersionInfo();
   },
   computed: {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
       tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 120,
+        label: "年度",
+        prop: "year",
+        width: 70,
       });
-      //tempsTabs.push({ label: "单据号", prop: "billNum", width: 150 });
-      tempsTabs.push({ label: "创建人", prop: "creator", width: 160 });
+      tempsTabs.push({
+        label: "期间",
+        prop: "period",
+        width: 70,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 120 });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
       tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
       tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
       return tempsTabs;
@@ -197,12 +278,15 @@ export default {
     getVersionInfo() {
       //取版本列表信息
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
         .then((response) => {
           this.versionList = [];
-          response.forEach((element) => {
+          response.items.forEach((element) => {
             let options = {};
             options.value = element.version;
             options.label = element.version;
@@ -213,15 +297,83 @@ export default {
           this.listLoading = false;
         });
     },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form.version = "";
+      this.dialogFormVisible = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts("/api/settleaccount/bt-seq-kb-diff/report", this.form)
+            .then((res) => {
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              // this.formLoading = false;
+              // this.$notify({
+              //   title: "成功",
+              //   message: "统计成功！",
+              //   type: "success",
+              //   duration: 2000,
+              // });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
     //抽屉
     handleDrawerOpen(param) {
       this.drawer = true;
-      var parentId = param.billNum; //单据号
-      var version = param.version; //版本
+      var parentId = param.id; //主键id
       this.customerInfos = [
         {
           ParentId: parentId,
-          Version: version,
         },
       ];
     },
@@ -230,15 +382,22 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property == "creationTime") {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
         var date = row[column.property];
         if (date == undefined) {
           return "";
         }
         return moment(date).format("YYYY-MM-DD HH:mm:ss");
       }
-      if (column.property == "state") {
-        return { 0: "已提交", 1: "已出库", 2: "不能出库" }[
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
           row[column.property]
         ];
       }
@@ -251,13 +410,23 @@ export default {
     },
     getList(data) {
       this.listLoading = true;
-      if (data != undefined) {
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
         this.listQuery.SkipCount = (this.page - 1) * data.limit;
       } else {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
+
+      let customfilter = {
+        logic: 0,
+        column: "CustomCode",
+        action: 0,
+        value: this.form.customerCode,
+      };
+      this.listQuery.Filters.push(customfilter);
+
       this.$axios
-        .posts("/api/settleaccount/wmsjitoutput/WmsJitList", this.listQuery)
+        .posts("/api/settleaccount/bt-seq-kb-diff/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           //alert(JSON.stringify(response.Items))
@@ -271,6 +440,14 @@ export default {
           this.listLoading = false;
         });
     },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/bt-seq-kb-diff/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
     /** 筛选操作 */
     handleFilter() {
       this.page = 1;
@@ -281,7 +458,7 @@ export default {
         let filter = {
           logic: 0,
           column: column,
-          action: 0,
+          action: 6,
           value: this.searchContent,
         };
         this.listQuery.Filters.push(filter);
diff --git a/code/WebApp/vue/src/views/ux/benteng-out-data/secondaryActuralDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/benteng-out-data/secondaryActuralDiffReport/detail.vue
new file mode 100644
index 00000000..9bc240e5
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/benteng-out-data/secondaryActuralDiffReport/detail.vue
@@ -0,0 +1,452 @@
+<!--二配对比输出表-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出全部
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照客户总成物料号搜索..."
+        style="width: 250px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        style="margin-top: -25px;margin-bottom:-25px;float:right;"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, CRMTableHead },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "secondaryActuralDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 180,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "期间", prop: "version", width: 80 });
+      tempsTabs.push({
+        label: "客户总成物料号",
+        prop: "customItemCode",
+        width: 160,
+      });
+      tempsTabs.push({ label: "供应商代码", prop: "supplierCode", width: 120 });
+      tempsTabs.push({
+        label: "客户组件物料号",
+        prop: "customSubItemCode",
+        width: 160,
+      });
+      tempsTabs.push({
+        label: "标准零件数量（回款）",
+        prop: "staPaymentPartyQty",
+        width: 170,
+      });
+      tempsTabs.push({
+        label: "实际零件数量（回款）",
+        prop: "actPaymentPartyQty",
+        width: 170,
+      });
+      tempsTabs.push({ label: "数量差异", prop: "diffQty", width: 100 });
+      tempsTabs.push({
+        label: "标准金额（不含税）",
+        prop: "stdNoTaxAmount",
+        width: 160,
+      });
+      tempsTabs.push({
+        label: "实际金额（不含税）",
+        prop: "actNoTaxAmount",
+        width: 160,
+      });
+      tempsTabs.push({ label: "金额差异", prop: "diffAmount", width: 100 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    async handleDownload() {
+      //await this.getDownBoms();
+      this.listLoading = true;
+      this.$axios
+        .gets(
+          "/api/settleaccount/sec-act-diff-report/export/excel/actual-stand-diff/" +
+            this.customerInfo.parentId
+        )
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("二配对比输出表：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/sec-act-diff-report/details/byfilter",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/sec-act-diff-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "customItemCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if ( column.property === "staPaymentPartyQty" ||
+        column.property === "actPaymentPartyQty" ||
+        column.property === "diffQty" ||
+        column.property === "stdNoTaxAmount" ||
+        column.property === "actNoTaxAmount" ||
+        column.property === "diffAmount" ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "staPaymentPartyQty" ||
+        column.property === "actPaymentPartyQty" ||
+        column.property === "diffQty" ||
+        column.property === "stdNoTaxAmount" ||
+        column.property === "actNoTaxAmount" ||
+        column.property === "diffAmount" 
+      ) {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/benteng-out-data/secondaryActuralDiffReport/index.vue b/code/WebApp/vue/src/views/ux/benteng-out-data/secondaryActuralDiffReport/index.vue
new file mode 100644
index 00000000..8f01bd45
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/benteng-out-data/secondaryActuralDiffReport/index.vue
@@ -0,0 +1,643 @@
+<!--二配对比输出表-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+
+      <el-select
+        v-model="versionValue"
+        size="small"
+        filterable
+        placeholder="选择版本导出Excel..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select>
+      <el-dropdown
+        size="small"
+        class="filter-item"
+        split-button
+        type="primary"
+        @command="handleCommand"
+      >
+        更多导出菜单
+        <el-dropdown-menu slot="dropdown">
+
+          <el-dropdown-item command="actual-assembly" icon="el-icon-check"
+            >导出实际结算总成散件明细输出表</el-dropdown-item
+          >
+          <el-dropdown-item command="actual-detail" icon="el-icon-circle-check"
+            >导出实际二配明细输出表</el-dropdown-item
+          >
+          <el-dropdown-item command="actual-sum" icon="el-icon-circle-close"
+            >导出实际二配汇总输出表</el-dropdown-item
+          >
+
+        </el-dropdown-menu>
+      </el-dropdown>
+      <el-button
+        type="warning"
+        plain
+        icon="el-icon-download"
+        size="mini"
+        style="margin-left: 15px"
+        @click="handleDownload()"
+        >(选择版本)导出二配打印表
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 250px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="260px"
+      >
+        <template slot-scope="scope">
+          <el-tooltip :content="scope.row.documentNumber" placement="top">
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.documentNumber
+            }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="version">
+              <el-select
+                v-model="form.version"
+                clearable
+                style="width: 180px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="二配对比信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <StockFisDiffReport
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></StockFisDiffReport>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import StockFisDiffReport from "./detail";
+import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "SecondaryActuralDiffReportBT",
+  components: { Pagination, StockFisDiffReport },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "secondaryActuralDiffReport",
+      exportApi: "",
+      rules: {
+        //前端定义的规则，后端也有验证
+        version: [
+          { required: true, message: "必须选择版本！", trigger: "change" },
+        ],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "",
+        customerName: "",
+      },
+      versionValue: "",
+      versionList: [],
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      exportQuery: {
+        version: "",
+        customerCode: "",
+        customerName: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "年度",
+        prop: "year",
+        width: 75,
+      });
+      tempsTabs.push({
+        label: "期间",
+        prop: "period",
+        width: 75,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 85 });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 110 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 150 });
+      tempsTabs.push({ label: "状态", prop: "documentStatus", width: 55 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 250 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    //奔腾：二配打印表
+    handleDownload() {
+      if (this.versionValue === "") {
+        this.$message.error("请先选择版本！");
+        return;
+      }
+      this.listLoading = true;
+      this.exportQuery.version = this.versionValue;
+      this.exportQuery.customerCode = "T51Z40";
+      this.exportQuery.customerName = "一汽奔腾轿车有限公司";
+      console.log("奔腾二配打印表条件：" + JSON.stringify(this.exportQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/sec-act-diff-report/report/actual-adjust-sum/bt-list",
+          this.exportQuery
+        )
+        .then((res) => {
+          let zipName = res;
+          if (zipName.indexOf(" xlsx") != -1) {
+            //不成功，返回检验的excel
+            this.$axios
+              .BolbGets("/api/settleaccount/getblobfile/download/" + zipName)
+              .then((response) => {
+                if (zipName.indexOf("_") != -1) {
+                  let downName =
+                    zipName.slice(0, zipName.lastIndexOf("_")) +
+                    zipName.slice(zipName.lastIndexOf("."));
+                  downloadFile(response, downName);
+                  this.$notify({
+                    title: "成功",
+                    message: "数据-导出成功！",
+                    type: "success",
+                    duration: 2000,
+                  });
+                } else {
+                  downloadFile(response, zipName);
+                  this.$notify({
+                    title: "成功",
+                    message: "数据-导出成功！",
+                    type: "success",
+                    duration: 2000,
+                  });
+                }
+                this.listLoading = false;
+              });
+          } else if (zipName.indexOf("zip") != -1) {
+            //成功，返回zip压缩包
+            this.$axios
+              .BolbGets(
+                "/api/settleaccount/getblobBTzipfile/download/" + zipName
+              )
+              .then((response) => {
+                downloadFile(response, zipName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+
+                this.listLoading = false;
+              })
+              .catch((error) => {
+                this.listLoading = false;
+              });
+          }
+        })
+        .catch((error) => {
+          this.listLoading = false;
+        });
+    },
+    handleCommand(command) {
+      if (this.versionValue === "") {
+        this.$message.error("请先选择版本！");
+        return;
+      }
+      switch (command) {
+        // case "stand-assembly":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/export/excel/stand-assembly";
+        //   break;
+        // case "stand-detail":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/export/excel/stand-detail";
+        //   break;
+        // case "stand-sum":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/export/excel/stand-sum";
+        //   break;
+        case "actual-assembly":
+          this.exportApi =
+            "/api/settleaccount/sec-act-diff-report/export/excel/actual-assembly";
+          break;
+        case "actual-detail":
+          this.exportApi =
+            "/api/settleaccount/sec-act-diff-report/export/excel/actual-detail";
+          break;
+        case "actual-sum":
+          this.exportApi =
+            "/api/settleaccount/sec-act-diff-report/export/excel/actual-sum";
+          break;
+        // case "actual-adjust-sum":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/report/actual-adjust-sum";
+        //   break;
+        // case "actual-stand-diff":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/report/actual-stand-diff";
+        //   break;
+        default:
+          //这里是没有找到对应的值处理
+          break;
+      }
+      this.listLoading = true;
+      this.exportQuery.version = this.versionValue;
+      this.exportQuery.customerCode = "T51Z40";
+      this.exportQuery.customerName = "一汽奔腾轿车有限公司";
+      console.log("二配对比条件：" + JSON.stringify(this.exportQuery));
+      this.$axios.posts(this.exportApi, this.exportQuery).then((res) => {
+        let fileNameOfProject = res;
+        this.$axios
+          .BolbGets(
+            "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+          )
+          .then((response) => {
+            if (fileNameOfProject.indexOf("_") != -1) {
+              let downName =
+                fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
+                fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+              downloadFile(response, downName);
+              this.$notify({
+                title: "成功",
+                message: "数据-导出成功！",
+                type: "success",
+                duration: 2000,
+              });
+            } else {
+              downloadFile(response, fileNameOfProject);
+              this.$notify({
+                title: "成功",
+                message: "数据-导出成功！",
+                type: "success",
+                duration: 2000,
+              });
+            }
+            this.listLoading = false;
+          });
+      });
+    },
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form = {};
+      this.dialogFormVisible = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          //insert添加
+          this.form.customerCode = "T51Z40";
+          this.form.customerName = "一汽奔腾轿车有限公司";
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts("/api/settleaccount/sec-act-diff-report/report", this.form)
+            .then((response) => {
+              this.formLoading = false;
+              this.$notify({
+                title: "成功",
+                message: "统计成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property == "beginTime" || column.property == "endTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.$axios
+        .posts("/api/settleaccount/sec-act-diff-report/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/sec-act-diff-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/businessdata/deliverGoods/detail.vue b/code/WebApp/vue/src/views/ux/benteng-out-data/stockFisDiffReport/detail.vue
similarity index 63%
rename from code/WebApp/vue/src/views/ux/businessdata/deliverGoods/detail.vue
rename to code/WebApp/vue/src/views/ux/benteng-out-data/stockFisDiffReport/detail.vue
index 6301c0ac..1eed8d77 100644
--- a/code/WebApp/vue/src/views/ux/businessdata/deliverGoods/detail.vue
+++ b/code/WebApp/vue/src/views/ux/benteng-out-data/stockFisDiffReport/detail.vue
@@ -2,14 +2,7 @@
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
-      <!-- <el-button
-            class="filter-item"
-            type="danger"
-            icon="el-icon-delete"
-            size="mini"
-            @click="handleDelete()"
-          >批量删除
-          </el-button> -->
+
       <el-button
         class="filter-item"
         size="mini"
@@ -22,7 +15,7 @@
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照客户零件号搜索..."
+        placeholder="按照物料号搜索..."
         style="width: 230px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -62,8 +55,8 @@
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
       @row-click="handleRowClick"
-      @cell-dblclick="dblhandleCurrentChange"
     >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
       <el-table-column
         v-for="(item, index) in getDefaultField"
         :key="index"
@@ -79,67 +72,6 @@
           {{ scope.column.label }}
         </template>
       </el-table-column>
-      <el-table-column label="预发货数量" width="300" align="center">
-        <template slot-scope="scope">
-          <el-input
-            ref="inputRef"
-            v-if="scope.row.isEditCell"
-            v-model.number="scope.row.stockQty"
-            class="el-input"
-            v-focus
-            @blur="cellBlur(scope.row, scope.column)"
-          />
-          <span v-else>{{ scope.row.stockQty }}</span>
-          <el-button
-            style="margin-left: 5px"
-            v-if="scope.row.isEditCell"
-            type="success"
-            icon="el-icon-check"
-            size="small"
-            circle
-            @click="submitName(scope.row)"
-          ></el-button>
-          <!-- <el-button
-            v-show="scope.row.isEditCell"
-            type="danger"
-            icon="el-icon-close"
-            size="small"
-            circle
-            @click.native.prevent="handleCancel(scope.row)"
-          ></el-button> -->
-          <el-button
-            v-show="scope.row.isEditCell"
-            class="cancel-btn"
-            size="mini"
-            icon="el-icon-refresh"
-            type="warning"
-            @click.native.prevent="handleCancel(scope.row)"
-          >
-            cancel
-          </el-button>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column align="center" label="操作" width="120">
-        <template slot-scope="{row}">
-          <el-button
-            v-if="row.isEditCell"
-            type="success"
-            size="small"
-            icon="el-icon-circle-check-outline"
-            @click="confirmEdit(row)"
-          >
-            OK
-          </el-button>
-          <el-button
-            v-else
-            type="primary"
-            size="small"
-            icon="el-icon-edit"
-            @click="row.isEditCell=!row.isEditCell"
-          >
-          </el-button>
-        </template>
-      </el-table-column> -->
     </el-table>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@@ -159,19 +91,6 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 import permission from "@/directive/permission/index.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import { downloadFile } from "@/utils/crmindex.js";
-import moment from "moment";
-import {
-  regexIsInt,
-  regexIsNumber,
-  regexIsCRMNumber,
-  regexIsCRMNumber2,
-  regexIsCRMNumber4,
-  regexIsCRMMoneyNumber,
-  regexIsCRMMobile,
-  regexIsCRMEmail,
-  regexIsCRMRate,
-  objDeepCopy,
-} from "@/utils";
 
 export default {
   name: "sendUnsettledDiffReport",
@@ -198,7 +117,6 @@ export default {
   data() {
     return {
       crmType: "stockFisDiffReport",
-      focus: false,
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -249,16 +167,6 @@ export default {
       isEdit: false,
     };
   },
-  // directives: {
-  //   // 注册一个局部的自定义指令 v-focus
-  //   focus: {
-  //     // 指令的定义
-  //     inserted: function (el) {
-  //       // 聚焦元素
-  //       el.querySelector("input").focus();
-  //     },
-  //   },
-  // },
   mounted() {
     var self = this;
     window.onresize = function () {
@@ -291,89 +199,20 @@ export default {
     getDefaultField() {
       var tempsTabs = [];
       tempsTabs.push({
-        label: "预发货计划单号",
+        label: "单据流水号",
         prop: "documentNumber",
         width: 150,
       });
-      tempsTabs.push({ label: "销售订单号", prop: "itemCode", width: 160 });
-      tempsTabs.push({ label: "交付索引号", prop: "customCode", width: 120 });
-      tempsTabs.push({ label: "客户零件号", prop: "fisQty", width: 80 });
-      //tempsTabs.push({ label: "预发货数量", prop: "stockQty", width: 100 });
-      tempsTabs.push({ label: "客户零件描述", prop: "remark", width: 150 });
+         tempsTabs.push({ label: "客户代码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "物料号", prop: "itemCode", width: 160 });
+
+      tempsTabs.push({ label: "看板数量", prop: "fisQty", width: 80 });
+      tempsTabs.push({ label: "ERP库存数量", prop: "stockQty", width: 100 });
+      tempsTabs.push({ label: "差异数量", prop: "diffQty", width: 80 });
       return tempsTabs;
     },
   },
   methods: {
-    // 可以编辑框失去焦点
-    cellBlur(row, column) {
-      //alert("cellblur");
-      row.isEditCell = false;
-      this.$set(row, "isEditCell", false);
-      // this.$nextTick(() => {
-      //   row.isEditCell = false;
-      //   this.$set(row, "isEditCell", false);
-      // });
-    },
-    dblhandleCurrentChange(row, column, cell, event) {
-      if (column.label === "预发货数量") {
-        row.isEditCell = true;
-        this.$set(row, "isEditCell", true);
-        this.$nextTick(() => {
-          //自动获取焦点 element组件autofocus失效
-          //this.$refs.inputRef.focus();
-          this.$refs["inputRef"].focus();
-        });
-      }
-      this.list = this.list.filter((item) => {
-        return item;
-      });
-      //row.isEditCell = false;
-      // if (column.property == "remark") {
-      //   this.$nextTick(() => {
-      //     this.$refs.remarkRef.focus(); // 视图出现后使input获取焦点
-      //   });
-      // } else {
-      //   this.$nextTick(() => {
-      //     this.$refs.hitchRef.focus(); // 视图出现后使input获取焦点
-      //   });
-      // }
-    },
-    // 取消
-    handleCancel(row) {
-      row.isEditCell = false;
-      //row.stockQty = row.originalstockQty;
-      this.$set(row, "isEditCell", false);
-      // this.$message({
-      //   message: "取消后，恢复当前原值！",
-      //   type: "warning",
-      // });
-      this.getList();
-    },
-    // 提交
-    submitName(row) {
-      alert("修改成功");
-      //row.originalstockQty = row.stockQty;
-      alert(JSON.stringify(this.list));
-      this.getList();
-      // this.loading = true;
-      // let data = {
-      //   inspectId: this.inspectId,
-      //   result: this.tableData.toString(),
-      // };
-      // this.submitData.inspectId = this.inspectId;
-
-      // this.submitData.ext1 = JSON.stringify(this.tableData);
-      // updateInspect(this.submitData).then((response) => {
-      //   if (response.code === 200) {
-      //     this.loading = false;
-      //     this.msgSuccess("修改成功");
-      //     this.open = false;
-      //     this.getTableList(this.inspectId);
-      //   } else {
-      //     this.msgError(response.msg);
-      //   }
-      // });
-    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {
@@ -382,13 +221,6 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property == "creationTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
       return row[column.property] || "--";
     },
     importExcelData() {
@@ -438,9 +270,14 @@ export default {
             });
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.listQuery.ParentId = this.customerInfo.parentId;
       console.log("fis结算：" + JSON.stringify(this.listQuery));
       this.$axios
@@ -449,17 +286,8 @@ export default {
           this.listQuery
         )
         .then((response) => {
-          const items = response.items;
           this.list = response.items;
-          // this.list = items.map((v) => {
-          //   this.$set(v, "isEditCell", false);
-          //   v.originalstockQty = v.stockQty;
-          //   return v;
-          // });
-          //动态加一个是否编辑的标识
-          this.list.forEach((element) => {
-            element["isEditCell"] = false;
-          });
+          //alert(JSON.stringify(response.Items))
           this.totalCount = response.totalCount;
           setTimeout(() => {
             //大数据量加载时
@@ -587,9 +415,4 @@ export default {
 <style lang="scss" scoped>
 @import "../../styles/crmtable.scss";
 </style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
 
diff --git a/code/WebApp/vue/src/views/ux/benteng-out-data/stockFisDiffReport/index.vue b/code/WebApp/vue/src/views/ux/benteng-out-data/stockFisDiffReport/index.vue
new file mode 100644
index 00000000..4c79f6da
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/benteng-out-data/stockFisDiffReport/index.vue
@@ -0,0 +1,505 @@
+<!--轿车看板发运对比-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="260px"
+      >
+        <template slot-scope="scope">
+          <el-tooltip :content="scope.row.documentNumber" placement="top">
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.documentNumber
+            }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="version">
+              <el-select
+                v-model="form.version"
+                filterable
+                clearable
+                style="width: 188px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="详细信息页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <StockFisDiffReport
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></StockFisDiffReport>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import StockFisDiffReport from "./detail";
+import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, StockFisDiffReport },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "sendUnsettledDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        version: [
+          { required: true, message: "必须选择版本！", trigger: "change" },
+        ],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "T51Z40",
+        customerName: "一汽奔腾轿车有限公司",
+      },
+      versionValue: "",
+      versionList: [],
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "年度",
+        prop: "year",
+        width: 70,
+      });
+      tempsTabs.push({
+        label: "期间",
+        prop: "period",
+        width: 70,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 120 });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form.version = "";
+      this.dialogFormVisible = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts("/api/settleaccount/stock-fis-report/report/bt", this.form)
+            .then((res) => {
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              // this.formLoading = false;
+              // this.$notify({
+              //   title: "成功",
+              //   message: "统计成功！",
+              //   type: "success",
+              //   duration: 2000,
+              // });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      let customfilter = {
+        logic: 0,
+        column: "CustomCode",
+        action: 0,
+        value: this.form.customerCode,
+      };
+      this.listQuery.Filters.push(customfilter);
+
+      this.$axios
+        .posts("/api/settleaccount/stock-fis-report/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-fis-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+
+      let customfilter = {
+        logic: 0,
+        column: "CustomCode",
+        action: 0,
+        value: this.form.customerCode,
+      };
+      this.listQuery.Filters.push(customfilter);
+
+      if (this.searchContent != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/benteng-out-data/stockSettledDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/benteng-out-data/stockSettledDiffReport/detail.vue
new file mode 100644
index 00000000..538d2ce4
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/benteng-out-data/stockSettledDiffReport/detail.vue
@@ -0,0 +1,425 @@
+<!--R3结算数据对比输出表-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出全部
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照客户物料号搜索..."
+        style="width: 230px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "StockSettledDiffReport",
+  components: { Pagination, CRMTableHead },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "stockSettledDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "单据流水号",
+        prop: "documentNumber",
+        width: 140,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 80 });
+      tempsTabs.push({ label: "客户代码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "物料号", prop: "itemCode", width: 150 });
+      tempsTabs.push({
+        label: "看板结算数量",
+        prop: "r3SettledQty",
+        width: 65,
+      });
+      tempsTabs.push({
+        label: "出库数量",
+        prop: "stockQty",
+        width: 110,
+      });
+      tempsTabs.push({ label: "差异", prop: "diffQty", width: 50 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    async handleDownload() {
+      //await this.getDownBoms();
+      this.listLoading = true;
+      this.$axios
+        .gets(
+          "/api/settleaccount/stock-settled-report/export/" +
+            this.customerInfo.parentId
+        )
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("R3结算数据对比输出表：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/stock-settled-report/details/byfilter",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-settled-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "itemCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "r3SettledQty" ||
+        column.property === "stockQty" ||
+        column.property === "diffQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "r3SettledQty" ||
+        column.property === "stockQty" ||
+        column.property === "diffQty"
+      ) {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/benteng-out-data/stockSettledDiffReport/index.vue b/code/WebApp/vue/src/views/ux/benteng-out-data/stockSettledDiffReport/index.vue
new file mode 100644
index 00000000..819d1b2d
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/benteng-out-data/stockSettledDiffReport/index.vue
@@ -0,0 +1,500 @@
+<!--数据对比输出表-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="260px"
+      >
+        <template slot-scope="scope">
+          <el-tooltip :content="scope.row.documentNumber" placement="top">
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.documentNumber
+            }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="version">
+              <el-select
+                v-model="form.version"
+                filterable
+                clearable
+                style="width: 188px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="R3信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <SendUnsettledDiffReport
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></SendUnsettledDiffReport>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import SendUnsettledDiffReport from "./detail";
+import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, SendUnsettledDiffReport },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "sendUnsettledDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        version: [
+          { required: true, message: "必须选择版本！", trigger: "change" },
+        ],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "T51Z40",
+        customerName: "一汽奔腾轿车有限公司",
+      },
+      versionValue: "",
+      versionList: [],
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "年度",
+        prop: "year",
+        width: 70,
+      });
+      tempsTabs.push({
+        label: "期间",
+        prop: "period",
+        width: 70,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 120 });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form.version = "";
+      this.dialogFormVisible = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts(
+              "/api/settleaccount/stock-settled-report/report/bt",
+              this.form
+            )
+            .then((res) => {
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              // this.formLoading = false;
+              // this.$notify({
+              //   title: "成功",
+              //   message: "统计成功！",
+              //   type: "success",
+              //   duration: 2000,
+              // });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      let customfilter = {
+        logic: 0,
+        column: "CustomCode",
+        action: 0,
+        value: this.form.customerCode,
+      };
+      this.listQuery.Filters.push(customfilter);
+
+      this.$axios
+        .posts("/api/settleaccount/stock-settled-report/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-settled-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/benteng-out-data/stockUnsettledDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/benteng-out-data/stockUnsettledDiffReport/detail.vue
new file mode 100644
index 00000000..ec2a3f7e
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/benteng-out-data/stockUnsettledDiffReport/detail.vue
@@ -0,0 +1,420 @@
+<!--FIS未结数量与期末库存对比输出表-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出全部
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照客户物料号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "StockUnsettledDiffReport",
+  components: { Pagination, CRMTableHead },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "stockUnsettledDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "单据流水号",
+        prop: "documentNumber",
+        width: 200,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
+      tempsTabs.push({ label: "客户代码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "物料号", prop: "itemCode", width: 120 });
+      tempsTabs.push({ label: "物料号描述", prop: "itemDesc", width: 250 });
+      tempsTabs.push({
+        label: "看板未结数量",
+        prop: "fisUnSettledQty",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "库存数量",
+        prop: "stockQty",
+        width: 220,
+      });
+      tempsTabs.push({ label: "差异", prop: "diffQty", width: 100 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    async handleDownload() {
+      this.listLoading = true;
+      this.$axios
+        .gets(
+          "/api/settleaccount/stock-unsettled-report/export/" +
+            this.customerInfo.parentId
+        )
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              let downName =
+                fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
+                fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+              downloadFile(response, downName);
+              this.$notify({
+                title: "成功",
+                message: "FIS未结数量与期末库存对比输出表-下载成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.listLoading = false;
+            });
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("fis结算：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/stock-unsettled-report/details/byfilter",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-unsettled-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "itemCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisUnSettledQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisUnSettledQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/benteng-out-data/stockUnsettledDiffReport/index.vue b/code/WebApp/vue/src/views/ux/benteng-out-data/stockUnsettledDiffReport/index.vue
new file mode 100644
index 00000000..b425e18c
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/benteng-out-data/stockUnsettledDiffReport/index.vue
@@ -0,0 +1,506 @@
+<!--FIS未结数量与期末库存对比输出表-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="260px"
+      >
+        <template slot-scope="scope">
+          <el-tooltip :content="scope.row.documentNumber" placement="top">
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.documentNumber
+            }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="version">
+              <el-select
+                v-model="form.version"
+                filterable
+                clearable
+                style="width: 188px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <StockFisDiffReport
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></StockFisDiffReport>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import StockFisDiffReport from "./detail";
+import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, StockFisDiffReport },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "sendUnsettledDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        version: [
+          { required: true, message: "必须选择版本！", trigger: "change" },
+        ],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "T51Z40",
+        customerName: "一汽奔腾轿车有限公司",
+      },
+      versionValue: "",
+      versionList: [],
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "年度",
+        prop: "year",
+        width: 70,
+      });
+      tempsTabs.push({
+        label: "期间",
+        prop: "period",
+        width: 70,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 120 });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form.version = "";
+      this.dialogFormVisible = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts(
+              "/api/settleaccount/stock-unsettled-report/report/bt",
+              this.form
+            )
+            .then((res) => {
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              // this.formLoading = false;
+              // this.$notify({
+              //   title: "成功",
+              //   message: "统计成功！",
+              //   type: "success",
+              //   duration: 2000,
+              // });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.Filters = [];
+
+      let customfilter = {
+        logic: 0,
+        column: "CustomCode",
+        action: 0,
+        value: this.form.customerCode,
+      };
+      this.listQuery.Filters.push(customfilter);
+
+      this.$axios
+        .posts("/api/settleaccount/stock-unsettled-report/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-unsettled-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+
+      let customfilter = {
+        logic: 0,
+        column: "CustomCode",
+        action: 0,
+        value: this.form.customerCode,
+      };
+      this.listQuery.Filters.push(customfilter);
+
+      if (this.searchContent != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/businessdata/deliverGoods/index.vue b/code/WebApp/vue/src/views/ux/benteng/BTCarConsign/index.vue
similarity index 65%
rename from code/WebApp/vue/src/views/ux/businessdata/deliverGoods/index.vue
rename to code/WebApp/vue/src/views/ux/benteng/BTCarConsign/index.vue
index e24c7d0c..ee6fa357 100644
--- a/code/WebApp/vue/src/views/ux/businessdata/deliverGoods/index.vue
+++ b/code/WebApp/vue/src/views/ux/benteng/BTCarConsign/index.vue
@@ -1,38 +1,52 @@
-<!--R3明细数据-->
+<!--轿车结算数据输入表-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
-      <!-- <el-button
-            class="filter-item"
-            type="danger"
-            icon="el-icon-delete"
-            size="mini"
-            @click="handleDelete()"
-          >批量删除
-          </el-button> -->
-
+      <!-- <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select> -->
+      <XhJSSelect
+        :options="versionList"
+        style="width: 200px"
+        class="search-container"
+        @value-change="selectValue"
+      ></XhJSSelect>
       <el-button
         class="filter-item"
         size="mini"
         type="warning"
         icon="el-icon-upload2"
         @click="handleImportExcel()"
-        >一键生成预发货计划单
+        >导入Excel
       </el-button>
-      <el-button
+      <!-- <el-button
         class="filter-item"
         size="mini"
         type="info"
         icon="el-icon-download"
         @click="handleDownload()"
-        >导出Csv
-      </el-button>
+        >导出Excel
+      </el-button> -->
+
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照零件号搜索..."
-        style="width: 200px"
+        placeholder="按照物料号搜索..."
+        style="width: 250px"
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
@@ -51,7 +65,20 @@
         @filter="handleFilters"
       >
       </c-r-m-table-head>
-      <!-- <div class="right-container" style="margin-left: 240px">
+      <el-dropdown size="small" class="filter-item" @command="handleCommand">
+        <span class="el-dropdown-link">
+          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="excel" icon="el-icon-plus"
+            >导出Excel</el-dropdown-item
+          >
+          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
+            >导出Csv</el-dropdown-item
+          >
+        </el-dropdown-menu>
+      </el-dropdown>
+      <div class="right-container" style="margin-left: 260px">
         <el-dropdown
           v-if="MoreTypes.length > 0"
           trigger="click"
@@ -70,61 +97,47 @@
             >
           </el-dropdown-menu>
         </el-dropdown>
-      </div> -->
-            <el-select
-        v-model="versionValue"
+      </div>
+    </flexbox>
+    <div class="l-table">
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeight"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
         size="small"
-        placeholder="选择版本过滤..."
-        style="width: 200px"
-        class="search-container"
-        clearable
-        @change="selectOptionsChange"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
       >
-        <el-option
-          v-for="item in versionList"
-          :key="item.value"
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
           :label="item.label"
-          :value="item.value"
-        ></el-option>
-      </el-select>
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
       <pagination
@@ -146,60 +159,44 @@
 </template>
 
 <script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import Pagination from "@/components/Pagination";
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportTxt";
 import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
+import importExcel from "@/components/ImportExcel-benteng";
 import Lockr from "lockr";
 import { downloadFile } from "@/utils/crmindex.js";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
 
 export default {
-  name: "R3",
-  components: { Pagination, CRMTableHead, importExcel },
+  name: "BTCarConsign",
+  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
   data() {
     return {
-      crmType: "settleAccount",
+      crmType: "btcarconsign",
       versionValue: "",
       versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
       searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
+      showExcelImport: false,
+      form: {},
+      drawer: false,
       list: null,
       totalCount: 0,
       listLoading: true,
-      formLoading: false,
+      customerInfo: {
+        bomId: "",
+      },
       // 高级搜索
       filterObj: {
         type: Object,
@@ -207,50 +204,27 @@ export default {
           return {};
         },
       },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
       listQuery: {
         Filters: [
           {
             logic: 0,
-            column: "Enabled",
+            column: "enabled",
             action: 0,
             value: "true",
           }, //默认查询可用的
         ],
-        //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        ParentId: "",
+        ParentId: null,
         fileType: 0,
         userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        ParentId: "",
-        fileType: 0,
-        userId: "",
+        customerCode: "",
       },
       page: 1,
-      dialogFormVisible: false,
+      bomUnit,
       multipleSelection: [],
-      formTitle: "",
       drawer: false,
-      showExcelImport: false,
       tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
     };
   },
   mounted() {
@@ -264,123 +238,91 @@ export default {
     this.getVersionInfo();
     this.getList();
   },
-  //   watch: {
-  //     customerInfos: {
-  //       handler(newVal) {
-  //         if (newVal == "" || newVal == "undefined") {
-  //           //TODO
-  //         } else {
-  //           newVal.forEach((element) => {
-  //             this.customerInfo.settleAccountId = element.SettleAccountId;
-  //           });
-  //           if (this.customerInfo.settleAccountId != "") {
-  //             this.getList();
-  //           }
-  //         }
-  //       },
-  //     },
-  //   },
   computed: {
-    /** 列表字段 */
-       getDefaultField() {
+    getDefaultField() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "发货类型", prop: "state", width: 130 });
-      tempsTabs.push({ label: "最晚发货时间", prop: "cP7", width: 150 });
-      tempsTabs.push({ label: "交付索引号", prop: "kennCode", width: 130 });
-      tempsTabs.push({ label: "零件号", prop: "chassisNumber", width: 55 });
-      tempsTabs.push({ label: "数量", prop: "qty", width: 55 });
-      tempsTabs.push({ label: "未计划数量", prop: "qty", width: 80 });
-      tempsTabs.push({ label: "已计划数量", prop: "qty", width: 80 });
+      tempsTabs.push({ label: "版本", prop: "version", width: 85 });
+      // tempsTabs.push({
+      //   label: "客户代码",
+      //   prop: "customerCode",
+      //   width: 100,
+      // });
+      tempsTabs.push({
+        label: "物料号",
+        prop: "materialCode",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "物料号描述",
+        prop: "materialDesc",
+        width: 250,
+      });
+      tempsTabs.push({
+        label: "数量",
+        prop: "qty",
+        width: 55,
+      });
+      tempsTabs.push({
+        label: "看板号",
+        prop: "kbCode",
+        width: 150,
+      });
+      tempsTabs.push({ label: "状态", prop: "state", width: 100 });
       return tempsTabs;
     },
     MoreTypes() {
       var moreTypes = [];
-      moreTypes.push({ type: "updateFis", name: "更新FIS结算数据" });
+      moreTypes.push({ type: "updateBTCarConsign", name: "更新看板数据" });
       //moreTypes.push({ type: "enter", name: "新按钮" });
       return moreTypes;
     },
   },
   methods: {
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
     handleTypeDrop(command, params = {}) {
-      if (command == "updateFis") {
+      if (command == "updateBTCarConsign") {
         this.listLoading = true;
         //this.listQuery.SkipCount = (this.page - 1) * 10000;
         this.$axios
-          .posts("/api/settleaccount/SettleAccount/updateFis")
+          .posts("/api/settleaccount/BTCarConsign/btupdate")
           .then((res) => {
             if (res == true) {
               this.$notify({
                 title: "成功",
-                message: "FIS数据-更新成功！",
+                message: "数据-更新成功！",
                 type: "success",
                 duration: 2000,
               });
             } else {
               this.$message({
                 type: "warning",
-                message: "FIS数据-更新失败！",
+                message: "数据-更新失败！",
               });
             }
             this.listLoading = false;
           });
-      } else if (command == "enter") {
-      }
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    getVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 3000;
-      this.$axios
-        .posts("/api/settleaccount/SettleAccount/listVersion", this.listQuery)
-        .then((response) => {
-          this.versionList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.id;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    handleImportExcel() {
-      //导入
-      this.showExcelImport = true;
-      this.$refs.importexcel.handleImportExcelClick();
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
       }
     },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "state") {
-        return { 0: "索赔单", 2: "销售订单" }[row[column.property]];
+    handleCommand(command) {
+      if (this.versionValue === "") {
+        this.$message.error("请先选择版本！");
+        return;
       }
-      if (column.property == "cP5A" || column.property == "cP7") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      switch (command) {
+        case "excel":
+          this.listQuery.fileType = 1; //0是csv,1是excel
+          break;
+        case "csv":
+          this.listQuery.fileType = 0; //0是csv,1是excel
+          break;
+        default:
+          this.listQuery.fileType = 0;
+          break;
       }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-    //导出功能
-    async handleDownload() {
       this.listLoading = true;
       if (this.versionValue === "") {
         this.$message.error("必需选择版本！");
@@ -388,15 +330,14 @@ export default {
         return;
       }
       if (this.versionValue != "") {
-        this.listQuery.ParentId = "202112";
+        this.listQuery.ParentId = this.versionValue;
       } else {
         this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      this.listQuery.fileType = 0; //0是csv,1是excel
       this.listQuery.userId = Lockr.get("loginUserInfo").userId;
-      console.log("R3导出：" + JSON.stringify(this.listQuery));
+      console.log("轿车车序导出：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/SettleAccount/Export", this.listQuery)
+        .posts("/api/settleaccount/BTCarConsign/Export", this.listQuery)
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -431,19 +372,83 @@ export default {
             });
         });
     },
-    getList() {
+    selectOptionsChange(item) {
+      this.getList();
+    },
+    importExcelData(data) {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getVersionInfo();
+      //this.getList();
+    },
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/BTCarConsign/listVersion", this.listQuery)
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.id;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+          if (JSON.stringify(this.versionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.versionValue = this.versionList[0].value;
+            this.getList();
+          }
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property === "state") {
+        return { 0: "未结", 2: "已结" }[row[column.property]];
+      }
+      return row[column.property] || "--";
+    },
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
+    },
+    async handleDownload() {},
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
         this.listQuery.ParentId = this.versionValue;
       } else {
         this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
       this.$axios
-        .posts("/api/settleaccount/SettleAccount/list", this.listQuery)
+        .posts("/api/settleaccount/BTCarConsign/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
-          //alert(JSON.stringify(response.Items))
           this.totalCount = response.totalCount;
           setTimeout(() => {
             //大数据量加载时
@@ -457,28 +462,11 @@ export default {
     fetchData(id) {
       //循环动态
       this.$axios
-        .gets("/api/settleaccount/SettleAccount/" + id)
+        .gets("/api/settleaccount/BTCarConsign/" + id)
         .then((response) => {
           this.form = response;
         });
     },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "materialCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
     /** 多项筛选操作 */
     /** 筛选操作 */
     handleFilters(data) {
@@ -521,7 +509,24 @@ export default {
         this.getList();
       }
     },
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "materialCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
     resetQuery() {},
+
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
@@ -562,8 +567,4 @@ export default {
 <style lang="scss" scoped>
 @import "../../styles/crmtable.scss";
 </style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
+
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/wmsSparePart/index.vue b/code/WebApp/vue/src/views/ux/benteng/BTCarKB/index.vue
similarity index 52%
rename from code/WebApp/vue/src/views/ux/vw/dataInput/wmsSparePart/index.vue
rename to code/WebApp/vue/src/views/ux/benteng/BTCarKB/index.vue
index 20411337..af3d46a4 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/wmsSparePart/index.vue
+++ b/code/WebApp/vue/src/views/ux/benteng/BTCarKB/index.vue
@@ -1,36 +1,52 @@
-<!--大众备件发货功能-->
+<!--Bom详细信息页-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
+      <!-- <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select> -->
       <XhJSSelect
         :options="versionList"
         style="width: 200px"
         class="search-container"
         @value-change="selectValue"
       ></XhJSSelect>
-      <!--<el-button
+      <el-button
         class="filter-item"
         size="mini"
         type="warning"
         icon="el-icon-upload2"
         @click="handleImportExcel()"
-        >导入文件（Excel）
+        >导入Excel
       </el-button>
-       <el-button
+      <!-- <el-button
         class="filter-item"
         size="mini"
-        type="primary"
+        type="info"
         icon="el-icon-download"
         @click="handleDownload()"
         >导出Excel
       </el-button> -->
-     
+
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照零件号搜索..."
-        style="width: 200px"
+        placeholder="按照物料号搜索..."
+        style="width: 250px"
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
@@ -49,12 +65,7 @@
         @filter="handleFilters"
       >
       </c-r-m-table-head>
-       <el-dropdown
-        size="small"
-        class="filter-item"
-        style="margin-left: 15px; font-weight: bold"
-        @command="handleCommand"
-      >
+      <el-dropdown size="small" class="filter-item" @command="handleCommand">
         <span class="el-dropdown-link">
           导出数据<i class="el-icon-arrow-down el-icon--right"></i>
         </span>
@@ -68,57 +79,45 @@
         </el-dropdown-menu>
       </el-dropdown>
     </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
+    <div class="l-table">
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeight"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
       >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
       <pagination
@@ -140,61 +139,46 @@
 </template>
 
 <script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import Pagination from "@/components/Pagination";
 import permission from "@/directive/permission/index.js";
-//import importExcel from "@/components/ImportExcel-base";
-import CRMTableHead from "../../../components/CRMTableHead";
-import moment from "moment";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-benteng";
 import Lockr from "lockr";
 import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
+import moment from "moment";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
 
 export default {
-  name: "WMSSparePart",
-  components: { Pagination, CRMTableHead, XhJSSelect },
+  name: "Bomdatabase",
+  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
   data() {
     return {
-      crmType: "wmsSparePart",
+      crmType: "btcarkb",
       versionValue: "",
+      getfactoryValue: "",
       versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
       searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
+      showExcelImport: false,
+      form: {},
+      drawer: false,
       list: null,
       totalCount: 0,
       listLoading: true,
-      formLoading: false,
+      customerInfo: {
+        bomId: "",
+      },
       // 高级搜索
       filterObj: {
         type: Object,
@@ -202,133 +186,116 @@ export default {
           return {};
         },
       },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
       listQuery: {
         Filters: [
           {
             logic: 0,
-            column: "Enabled",
+            column: "enabled",
             action: 0,
             value: "true",
           }, //默认查询可用的
         ],
-        //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        version: "",
-        site: "TH",
-        userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
+        ParentId: null,
         fileType: 0,
-        userId: "",
+        userId: "00000000-0000-0000-0000-000000000000",
+        customerCode: "",
       },
       page: 1,
-      dialogFormVisible: false,
+      bomUnit,
       multipleSelection: [],
-      formTitle: "",
       drawer: false,
-      showExcelImport: false,
       tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
     };
   },
   mounted() {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
     this.getVersionInfo();
-    if (this.versionList == []) {
-      this.getList();
-    }
+    this.getList();
   },
   computed: {
-    /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
-      tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 });
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
       tempsTabs.push({
-        label: "采购订单号",
-        prop: "purchaseOrderNo",
-        width: 220,
+        label: "日期",
+        prop: "dateTime",
+        width: 95,
+        formType: "datetime",
       });
       tempsTabs.push({
-        label: "采购订单行项目",
-        prop: "purchaseOrderNoItem",
-        width: 170,
+        label: "客户代码",
+        prop: "customerCode",
+        width: 150,
       });
       tempsTabs.push({
-        label: "采购订单文本",
-        prop: "purchaseOrderNoText",
-        width: 170,
+        label: "物料号",
+        prop: "materialCode",
+        width: 150,
       });
-      tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 });
-      tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 });
-      tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 });
       tempsTabs.push({
-        label: "采购价格不含税",
-        prop: "purchasePriceNoTax",
-        width: 200,
+        label: "物料号描述",
+        prop: "materialDesc",
+        width: 250,
       });
-      tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 });
-      tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 });
-      tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 });
       tempsTabs.push({
-        label: "日期",
-        prop: "spareDate",
-        width: 150,
-        formType: "datetime",
+        label: "需求数",
+        prop: "needQty",
+        width: 100,
       });
-
       tempsTabs.push({
-        label: "交货单号",
-        prop: "deliveryOrderNo",
+        label: "订货看板编号",
+        prop: "orderKBCode",
         width: 150,
       });
       tempsTabs.push({
-        label: "交货行号",
-        prop: "deliveryLineNum",
+        label: "收货存储地点",
+        prop: "receiveAreaCode",
         width: 150,
       });
-      tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 });
-      tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 });
-      tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 });
       tempsTabs.push({
-        label: "德国发票号",
-        prop: "germanInvoiceNo",
+        label: "收货存储地点描述",
+        prop: "receiveAreaName",
+        width: 250,
+      });
+      tempsTabs.push({
+        label: "交货时间",
+        prop: "deliveryDateTime",
         width: 150,
+        formType: "datetime",
       });
-      tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
-      tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 150 });
+      tempsTabs.push({ label: "状态", prop: "state", width: 100 });
+      tempsTabs.push({ label: "结算数量", prop: "consignQty", width: 100 });
       return tempsTabs;
     },
   },
   methods: {
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
     handleCommand(command) {
       if (this.versionValue === "") {
         this.$message.error("请先选择版本！");
+        this.listLoading = false;
         return;
       }
+      console.log("选择的工厂:" + this.getfactoryValue);
+      let getCarKBApi = "";
+      if (this.getfactoryValue.indexOf("T51Z40-A") != -1) {
+        getCarKBApi = "/api/settleaccount/BTCarKBFirst/Export";
+      } else if (this.getfactoryValue.indexOf("T51Z40-B") != -1) {
+        getCarKBApi = "/api/settleaccount/BTCarKBSecond/Export";
+      }
+      console.log("kbapi:" + getCarKBApi);
       switch (command) {
         case "excel":
           this.listQuery.fileType = 1; //0是csv,1是excel
@@ -337,69 +304,71 @@ export default {
           this.listQuery.fileType = 0; //0是csv,1是excel
           break;
         default:
-          //这里是没有找到对应的值处理
+          this.listQuery.fileType = 0;
           break;
       }
       this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("大众看板导出：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/settleaccount/WMSSparePart/Export", this.listQuery)
-        .then((res) => {
-          let fileNameOfProject = res;
-          this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
-            .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
-                let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, fileNameOfProject);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log("轿车车序导出：" + JSON.stringify(this.listQuery));
+      this.$axios.posts(getCarKBApi, this.listQuery).then((res) => {
+        let fileNameOfProject = res;
+        this.$axios
+          .BolbGets(
+            "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+          )
+          .then((response) => {
+            if (fileNameOfProject.indexOf("_") != -1) {
+              let downName =
+                fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
+                fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+              downloadFile(response, downName);
+              this.$notify({
+                title: "成功",
+                message: "数据-导出成功！",
+                type: "success",
+                duration: 2000,
+              });
+            } else {
+              downloadFile(response, fileNameOfProject);
+              this.$notify({
+                title: "成功",
+                message: "数据-导出成功！",
+                type: "success",
+                duration: 2000,
+              });
+            }
+            this.listLoading = false;
+          });
+      });
     },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
+    selectOptionsChange(params) {
+      if (params != "") {
+        let obj = {};
+        obj = this.versionList.find((item) => {
+          return item.value === params; //筛选出匹配数据
+        });
+        this.getfactoryValue = obj.label;
+      }
       this.getList();
     },
-    selectOptionsChange(item) {
-      this.getList();
+
+    importExcelData(data) {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getVersionInfo();
+      //this.getList();
     },
     getVersionInfo() {
       //取版本列表信息
-      //this.listLoading = true;
+      this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/WMSSparePart/listVersion", this.listQuery)
+        .posts("/api/settleaccount/BTCarKBFirst/listVersion", this.listQuery)
         .then((response) => {
           this.versionList = [];
           response.items.forEach((element) => {
@@ -410,10 +379,14 @@ export default {
           });
           if (JSON.stringify(this.versionList) != "[]") {
             //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
+            this.versionValue = this.versionList[0].value;
             this.getList();
           }
-          this.listLoading = false;
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
         })
         .catch(() => {
           this.listLoading = false;
@@ -432,37 +405,52 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      // if (column.property === "state") {
-      //   return { 0: "其他", 2: "已结" }[row[column.property]];
-      // }
-      if (
-        column.property == "settleInputDate" ||
-        column.property == "settleDate"
-      ) {
+      if (column.property === "state") {
+        return { 0: "未结", 1: "部分结算", 2: "已结" }[row[column.property]];
+      }
+      if (column.property == "deliveryDateTime") {
         var date = row[column.property];
         if (date == undefined) {
           return "";
         }
         return moment(date).format("YYYY-MM-DD HH:mm:ss");
       }
+      if (column.property == "dateTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD");
+      }
       return row[column.property] || "--";
     },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
     },
-
-    getList() {
+    async handleDownload() {},
+    getDownBoms() {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      this.$axios
+        .gets("/api/settleaccount/BTCarKBFirst/ExcelExporte")
+        .then((response) => {
+          this.listLoading = false;
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/WMSSparePart/list", this.listQuery)
+        .posts("/api/settleaccount/BTCarKBFirst/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           this.totalCount = response.totalCount;
@@ -478,28 +466,11 @@ export default {
     fetchData(id) {
       //循环动态
       this.$axios
-        .gets("/api/settleaccount/WMSSparePart/" + id)
+        .gets("/api/settleaccount/BTCarKBFirst/" + id)
         .then((response) => {
           this.form = response;
         });
     },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "materialCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
     /** 多项筛选操作 */
     /** 筛选操作 */
     handleFilters(data) {
@@ -518,16 +489,20 @@ export default {
           let filter = {};
           if (item.formType === "datetime" || item.formType === "datetime") {
             //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
+            let filterStart = {};
+            let filterEnd = {};
+            filterStart["Column"] = item.fieldName;
+            filterStart["Logic"] = 0;
+            filterStart["Value"] = item.start;
+            filterStart["Action"] = 4;
+            Filter.push(filterStart);
 
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
+            if (item.end != null) {
+              filterEnd["Column"] = item.fieldName;
+              filterEnd["Logic"] = 0;
+              filterEnd["Value"] = item.end;
+              filterEnd["Action"] = 5;
+              Filter.push(filterEnd);
             }
           } else {
             filter["Column"] = item.fieldName;
@@ -542,7 +517,24 @@ export default {
         this.getList();
       }
     },
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "materialCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
     resetQuery() {},
+
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
@@ -550,7 +542,6 @@ export default {
         return;
       }
       this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
       this.handleFilter();
     },
     handleSelectionChange(val) {
@@ -558,16 +549,15 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      // if (column.property === "qty") {
-      //   return { textAlign: "right" };
-      // } else {
-      //   return { textAlign: "left" };
-      // }
-      return { textAlign: "left" };
+      if (column.property === "consignQty" || column.property === "needQty") {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
     },
     /** 通过回调控制表头style */
     headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
+      if (column.property === "consignQty" || column.property === "needQty") {
         return { textAlign: "right", background: "#FAFAFA" };
       } else {
         return { textAlign: "left", background: "#FAFAFA" };
@@ -583,12 +573,6 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../../styles/crmtable.scss";
+@import "../../styles/crmtable.scss";
 </style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
 
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/hq_h/index.vue b/code/WebApp/vue/src/views/ux/benteng/BTCarSeq/index.vue
similarity index 55%
rename from code/WebApp/vue/src/views/ux/vw/dataInput/hq_h/index.vue
rename to code/WebApp/vue/src/views/ux/benteng/BTCarSeq/index.vue
index e5d35866..e98efa3f 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/hq_h/index.vue
+++ b/code/WebApp/vue/src/views/ux/benteng/BTCarSeq/index.vue
@@ -1,7 +1,23 @@
-<!--红旗H平台导入功能-->
+<!--奔腾轿车看板-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
+      <!-- <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select> -->
       <XhJSSelect
         :options="versionList"
         style="width: 200px"
@@ -14,40 +30,23 @@
         type="warning"
         icon="el-icon-upload2"
         @click="handleImportExcel()"
-        >导入文件（Excel）
+        >导入Excel
       </el-button>
       <!-- <el-button
         class="filter-item"
         size="mini"
-        type="primary"
+        type="info"
         icon="el-icon-download"
         @click="handleDownload()"
         >导出Excel
       </el-button> -->
-      <el-dropdown
-        size="small"
-        class="filter-item"
-        style="margin-left: 15px; font-weight: bold"
-        @command="handleCommand"
-      >
-        <span class="el-dropdown-link">
-          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="excel" icon="el-icon-plus"
-            >导出Excel</el-dropdown-item
-          >
-          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
-            >导出Csv</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
+
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照采购订单号搜索..."
-        style="width: 200px"
+        placeholder="按照车型代码搜索..."
+        style="width: 250px"
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
@@ -66,58 +65,59 @@
         @filter="handleFilters"
       >
       </c-r-m-table-head>
+      <el-dropdown size="small" class="filter-item" @command="handleCommand">
+        <span class="el-dropdown-link">
+          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="excel" icon="el-icon-plus"
+            >导出Excel</el-dropdown-item
+          >
+          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
+            >导出Csv</el-dropdown-item
+          >
+        </el-dropdown-menu>
+      </el-dropdown>
     </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
+    <div class="l-table">
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeight"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
       >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
       <pagination
@@ -139,17 +139,28 @@
 </template>
 
 <script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import Pagination from "@/components/Pagination";
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-base";
-import CRMTableHead from "../../../components/CRMTableHead";
-import moment from "moment";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-benteng";
 import Lockr from "lockr";
 import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
+import moment from "moment";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
 
 export default {
-  name: "HQHPlatform",
+  name: "Bomdatabase",
   components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
   filters: {
@@ -172,28 +183,20 @@ export default {
   },
   data() {
     return {
-      crmType: "hqHPlatform",
+      crmType: "btcarseq",
       versionValue: "",
+      getfactoryValue: "",
       versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
       searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
+      showExcelImport: false,
+      form: {},
+      drawer: false,
       list: null,
       totalCount: 0,
       listLoading: true,
-      formLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
       // 高级搜索
       filterObj: {
         type: Object,
@@ -201,133 +204,122 @@ export default {
           return {};
         },
       },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
+      // listQuery: {
+      //    Filters: [
+      //    {
+      //         "logic": 0,
+      //         "column": "enabled",
+      //         "action": 0,
+      //         "value": "true"
+      //       }//默认查询可用的
+      //     ],
+      //     //OrgID:"",
+      //     "SkipCount": 0,
+      //     "MaxResultCount": 15
+      // },
       listQuery: {
         Filters: [
           {
             logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        site: "TH",
-        userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
+            column: "enabled",
             action: 0,
             value: "true",
           }, //默认查询可用的
         ],
-        //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        version: "",
+        ParentId: null,
         fileType: 0,
-        userId: "",
+        userId: "00000000-0000-0000-0000-000000000000",
+        customerCode: "",
       },
       page: 1,
-      dialogFormVisible: false,
+      bomUnit,
       multipleSelection: [],
-      formTitle: "",
       drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 220,
-      isEdit: false,
+      tableHeight: document.documentElement.clientHeight - 260,
     };
   },
   mounted() {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 220;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
     this.getVersionInfo();
-    if (this.versionList == []) {
-      this.getList();
-    }
+    this.getList();
   },
+  // watch: {
+  //   customerInfos: {
+  //     handler(newVal) {
+  //       if (newVal == "" || newVal == "undefined") {
+  //         //TODO
+  //       } else {
+  //         newVal.forEach((element) => {
+  //           this.customerInfo.bomId = element.BomId;
+  //         });
+  //         if (this.customerInfo.bomId != "") {
+  //           this.getList();
+  //         }
+  //       }
+  //     },
+  //   },
+  // },
   computed: {
-    /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
-      tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 });
-      tempsTabs.push({
-        label: "采购订单号",
-        prop: "purchaseOrderNo",
-        width: 220,
-      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
       tempsTabs.push({
-        label: "采购订单行项目",
-        prop: "purchaseOrderNoItem",
-        width: 170,
-      });
-      tempsTabs.push({
-        label: "采购订单文本",
-        prop: "purchaseOrderNoText",
-        width: 170,
-      });
-      tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 });
-      tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 });
-      tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 });
-      tempsTabs.push({
-        label: "采购价格不含税",
-        prop: "purchasePriceNoTax",
-        width: 200,
+        label: "日期",
+        prop: "dt",
+        width: 60,
+        formType: "datetime",
       });
-      tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 });
-      tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 });
-      tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 });
       tempsTabs.push({
-        label: "日期",
-        prop: "spareDate",
+        label: "客户代码",
+        prop: "customerCode",
         width: 150,
-        formType: "datetime",
       });
-
       tempsTabs.push({
-        label: "交货单号",
-        prop: "deliveryOrderNo",
+        label: "车型代码(车型系列备注)",
+        prop: "barCode",
         width: 150,
       });
       tempsTabs.push({
-        label: "交货行号",
-        prop: "deliveryLineNum",
+        label: "底盘号",
+        prop: "vin",
         width: 150,
       });
-      tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 });
-      tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 });
-      tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 });
       tempsTabs.push({
-        label: "德国发票号",
-        prop: "germanInvoiceNo",
+        label: "上线时间",
+        prop: "onLineDateTime",
         width: 150,
+        formType: "datetime",
       });
-      tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
-      tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 });
       return tempsTabs;
     },
   },
   methods: {
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
     handleCommand(command) {
       if (this.versionValue === "") {
         this.$message.error("请先选择版本！");
         return;
       }
+      console.log("选择的工厂:" + this.getfactoryValue);
+      let getCarSeqApi = "";
+      if (this.getfactoryValue.indexOf("T51Z40-A") != -1) {
+        getCarSeqApi = "/api/settleaccount/BTCarSeqFirst/Export";
+      } else if (this.getfactoryValue.indexOf("T51Z40-B") != -1) {
+        getCarSeqApi = "/api/settleaccount/BTCarSeqSecond/Export";
+      }
+      console.log("车序seqapi:" + getCarSeqApi);
       switch (command) {
         case "excel":
           this.listQuery.fileType = 1; //0是csv,1是excel
@@ -336,70 +328,75 @@ export default {
           this.listQuery.fileType = 0; //0是csv,1是excel
           break;
         default:
-          //这里是没有找到对应的值处理
+          this.listQuery.fileType = 0;
           break;
       }
       this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
+      // if (this.versionValue === "") {
+      //   this.$message.error("必需选择版本！");
+      //   this.listLoading = false;
+      //   return;
+      // }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("红旗H平台导出：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/settleaccount/HQHPlatform/Export", this.listQuery)
-        .then((res) => {
-          let fileNameOfProject = res;
-          this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
-            .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
-                let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, fileNameOfProject);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log("轿车车序导出：" + JSON.stringify(this.listQuery));
+      this.$axios.posts(getCarSeqApi, this.listQuery).then((res) => {
+        let fileNameOfProject = res;
+        this.$axios
+          .BolbGets(
+            "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+          )
+          .then((response) => {
+            if (fileNameOfProject.indexOf("_") != -1) {
+              let downName =
+                fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
+                fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+              downloadFile(response, downName);
+              this.$notify({
+                title: "成功",
+                message: "数据-导出成功！",
+                type: "success",
+                duration: 2000,
+              });
+            } else {
+              downloadFile(response, fileNameOfProject);
+              this.$notify({
+                title: "成功",
+                message: "数据-导出成功！",
+                type: "success",
+                duration: 2000,
+              });
+            }
+            this.listLoading = false;
+          });
+      });
     },
-
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
+    selectOptionsChange(params) {
+      if (params != "") {
+        let obj = {};
+        obj = this.versionList.find((item) => {
+          return item.value === params; //筛选出匹配数据
+        });
+        this.getfactoryValue = obj.label;
+      }
       this.getList();
     },
-    selectOptionsChange(item) {
-      this.getList();
+    importExcelData(data) {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getVersionInfo();
+      //this.getList();
     },
     getVersionInfo() {
       //取版本列表信息
-      //this.listLoading = true;
+      this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/HQHPlatform/listVersion", this.listQuery)
+        .posts("/api/settleaccount/BTCarSeqFirst/listVersion", this.listQuery)
         .then((response) => {
           this.versionList = [];
           response.items.forEach((element) => {
@@ -410,10 +407,14 @@ export default {
           });
           if (JSON.stringify(this.versionList) != "[]") {
             //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
+            this.versionValue = this.versionList[0].value;
             this.getList();
           }
-          this.listLoading = false;
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
         })
         .catch(() => {
           this.listLoading = false;
@@ -432,37 +433,52 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      // if (column.property === "state") {
-      //   return { 0: "其他", 2: "已结" }[row[column.property]];
-      // }
-      if (
-        column.property == "settleInputDate" ||
-        column.property == "settleDate"
-      ) {
+      if (column.property === "projectRole") {
+        return { 0: "是", 1: "否" }[row[column.property]];
+      }
+      if (column.property == "onLineDateTime") {
         var date = row[column.property];
         if (date == undefined) {
           return "";
         }
         return moment(date).format("YYYY-MM-DD HH:mm:ss");
       }
+      if (column.property == "dt") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD");
+      }
       return row[column.property] || "--";
     },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
     },
-
-    getList() {
+    async handleDownload() {},
+    getDownBoms() {
+      this.listLoading = true;
+      this.$axios
+        .gets("/api/settleaccount/BTCarSeqFirst/ExcelExporte")
+        .then((response) => {
+          this.listLoading = false;
+        });
+    },
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/HQHPlatform/list", this.listQuery)
+        .posts("/api/settleaccount/BTCarSeqFirst/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           this.totalCount = response.totalCount;
@@ -478,28 +494,11 @@ export default {
     fetchData(id) {
       //循环动态
       this.$axios
-        .gets("/api/settleaccount/HQHPlatform/" + id)
+        .gets("/api/settleaccount/BTCarSeqFirst/" + id)
         .then((response) => {
           this.form = response;
         });
     },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "purchaseOrderNo";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
     /** 多项筛选操作 */
     /** 筛选操作 */
     handleFilters(data) {
@@ -542,7 +541,24 @@ export default {
         this.getList();
       }
     },
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "barCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
     resetQuery() {},
+
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
@@ -550,7 +566,6 @@ export default {
         return;
       }
       this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
       this.handleFilter();
     },
     handleSelectionChange(val) {
@@ -558,12 +573,11 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      // if (column.property === "qty") {
-      //   return { textAlign: "right" };
-      // } else {
-      //   return { textAlign: "left" };
-      // }
-      return { textAlign: "left" };
+      if (column.property === "qty") {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
     },
     /** 通过回调控制表头style */
     headerRowStyle({ row, column, rowIndex, columnIndex }) {
@@ -583,12 +597,6 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../../styles/crmtable.scss";
+@import "../../styles/crmtable.scss";
 </style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
 
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/unSettleAccount/index.vue b/code/WebApp/vue/src/views/ux/benteng/secondaryAdjustment/index.vue
similarity index 82%
rename from code/WebApp/vue/src/views/ux/vw/dataInput/unSettleAccount/index.vue
rename to code/WebApp/vue/src/views/ux/benteng/secondaryAdjustment/index.vue
index 486bb762..a840b6ea 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/unSettleAccount/index.vue
+++ b/code/WebApp/vue/src/views/ux/benteng/secondaryAdjustment/index.vue
@@ -1,31 +1,7 @@
-<!--二配折扣调整输入表-->
+<!--二配调整输入表明细数据-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
-      <!-- <el-button
-            class="filter-item"
-            type="danger"
-            icon="el-icon-delete"
-            size="mini"
-            @click="handleDelete()"
-          >批量删除
-          </el-button> -->
-      <!-- <el-select
-        v-model="versionValue"
-        size="small"
-        placeholder="选择版本过滤..."
-        style="width: 200px"
-        class="search-container"
-        clearable
-        @change="selectOptionsChange"
-      >
-        <el-option
-          v-for="item in versionList"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        ></el-option>
-      </el-select> -->
       <XhJSSelect
         :options="versionList"
         style="width: 200px"
@@ -40,14 +16,7 @@
         @click="handleImportExcel()"
         >导入（Excel）
       </el-button>
-      <!-- <el-button
-        class="filter-item"
-        size="mini"
-        type="info"
-        icon="el-icon-download"
-        @click="handleDownload()"
-        >导出全部
-      </el-button> -->
+
       <el-input
         v-model="searchContent"
         clearable
@@ -146,14 +115,14 @@
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../../components/CRMTableHead";
+import CRMTableHead from "../../components/CRMTableHead";
 import importExcel from "@/components/ImportExcel-vw";
 import moment from "moment";
 import Lockr from "lockr";
 import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
 
 export default {
-  name: "UnSettleAccount",
+  name: "SecondaryAdjustmentBT",
   components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
   filters: {
@@ -176,7 +145,7 @@ export default {
   },
   data() {
     return {
-      crmType: "unSettleAccount",
+      crmType: "secondaryAdjustmentBT",
       versionValue: "",
       versionList: [], //版本列表
       rules: {
@@ -262,43 +231,30 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-      //   tempsTabs.push({ label: "年度", prop: "year", width: 120 });
-      //   tempsTabs.push({ label: "期间", prop: "period", width: 150 });
-      //tempsTabs.push({ label: "订单号", prop: "orderBillNum", width: 150 });
-      tempsTabs.push({
-        label: "开始时间",
-        prop: "beginTime",
-        width: 150,
-        formType: "datetime",
-      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
+      // tempsTabs.push({ label: "年度", prop: "year", width: 85 });
+      // tempsTabs.push({ label: "期间", prop: "period", width: 80 });
       tempsTabs.push({
-        label: "结束时间",
-        prop: "endTime",
-        width: 150,
-        formType: "datetime",
+        label: "客户总成物料号",
+        prop: "customerMaterialCode",
+        width: 180,
       });
-      tempsTabs.push({ label: "KENN号", prop: "kennCode", width: 150 });
-      tempsTabs.push({ label: "零件号", prop: "itemCode", width: 150 });
-      tempsTabs.push({ label: "用量", prop: "qty", width: 100 });
-      tempsTabs.push({ label: "车型", prop: "model", width: 120 });
       tempsTabs.push({
-        label: "CP5上线时间",
-        prop: "cP5Time",
-        width: 150,
-        formType: "datetime",
+        label: "客户组件物料号",
+        prop: "customerComponentCode",
+        width: 180,
       });
-      tempsTabs.push({ label: "顺序号", prop: "sequenceNumber", width: 120 });
-      tempsTabs.push({ label: "底盘号", prop: "chassisNumber", width: 180 });
-      tempsTabs.push({ label: "底盘号2", prop: "chassisNumber2", width: 150 });
-      tempsTabs.push({ label: "状态", prop: "state", width: 150 });
-      //tempsTabs.push({ label: "FIS年度", prop: "fISYear", width: 120 });
+      tempsTabs.push({ label: "供应商代码", prop: "supplierCode", width: 120 });
+      tempsTabs.push({ label: "零件数量（回款）", prop: "qty", width: 150 });
+      tempsTabs.push({ label: "金额（不含税）", prop: "amt", width: 150 });
+      tempsTabs.push({ label: "金额（含税）", prop: "total", width: 150 });
       tempsTabs.push({
-        label: "CP7时间",
-        prop: "cP7Time",
-        width: 150,
-        formType: "datetime",
+        label: "价格或零件号变动情况",
+        prop: "hasChanged",
+        width: 220,
       });
-      tempsTabs.push({ label: "结算数量", prop: "settledQty", width: 100 });
+      tempsTabs.push({ label: "二配采购员", prop: "buyer", width: 150 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 250 });
       return tempsTabs;
     },
   },
@@ -316,7 +272,10 @@ export default {
       //this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/UnSettleAccount/listVersion", this.listQuery)
+        .posts(
+          "/api/settleaccount/SecondaryAdjustmentBT/listVersion",
+          this.listQuery
+        )
         .then((response) => {
           this.versionList = [];
           response.items.forEach((element) => {
@@ -385,7 +344,7 @@ export default {
       this.listQuery.userId = Lockr.get("loginUserInfo").userId;
       console.log("二配调整输入表导出条件：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/UnSettleAccount/Export", this.listQuery)
+        .posts("/api/settleaccount/SecondaryAdjustmentBT/Export", this.listQuery)
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -434,9 +393,9 @@ export default {
       }
       this.listQuery.fileType = 0; //0是csv,1是excel
       this.listQuery.userId = Lockr.get("loginUserInfo").userId;
-      console.log("R3导出：" + JSON.stringify(this.listQuery));
+      console.log("奔腾二配导出：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/UnSettleAccount/Export", this.listQuery)
+        .posts("/api/settleaccount/SecondaryAdjustmentBT/Export", this.listQuery)
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -471,24 +430,29 @@ export default {
             });
         });
     },
-    getDownBoms() {
+    // getDownBoms() {
+    //   this.listLoading = true;
+    //   this.$axios
+    //     .gets("/api/settleaccount/SecondaryAdjustmentBT/ExcelExporte")
+    //     .then((response) => {
+    //       this.listLoading = false;
+    //     });
+    // },
+    getList(data) {
       this.listLoading = true;
-      this.$axios
-        .gets("/api/settleaccount/UnSettleAccount/ExcelExporte")
-        .then((response) => {
-          this.listLoading = false;
-        });
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
         this.listQuery.ParentId = this.versionValue;
       } else {
         this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
       this.$axios
-        .posts("/api/settleaccount/UnSettleAccount/list", this.listQuery)
+        .posts("/api/settleaccount/SecondaryAdjustmentBT/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           //alert(JSON.stringify(response.Items))
@@ -505,7 +469,7 @@ export default {
     fetchData(id) {
       //循环动态
       this.$axios
-        .gets("/api/settleaccount/UnSettleAccount/" + id)
+        .gets("/api/settleaccount/SecondaryAdjustmentBT/" + id)
         .then((response) => {
           this.form = response;
         });
@@ -616,7 +580,7 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../../styles/crmtable.scss";
+@import "../../styles/crmtable.scss";
 </style>
 <style lang="scss">
 .el-table .cell.el-tooltip {
diff --git a/code/WebApp/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue b/code/WebApp/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue
deleted file mode 100644
index d37088e2..00000000
--- a/code/WebApp/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue
+++ /dev/null
@@ -1,767 +0,0 @@
-<!--ERP总成开票报表-->
-<template>
-  <div class="cr-body-content">
-    <!--功能栏-->
-    <!-- 搜索 -->
-    <div style="float: left">
-      <flexbox class="content-header">
-        <!-- 统计 -->
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleCreate"
-          >统计
-        </el-button>
-
-        <!-- <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照零件号搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button> -->
-      </flexbox>
-    </div>
-    <!-- 刷新 -->
-    <div style="float: right">
-      <flexbox class="content-header">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="手动刷新"
-          placement="top"
-        >
-          <el-button
-            size="mini"
-            circle
-            icon="el-icon-refresh"
-            @click="refresh()"
-          />
-        </el-tooltip>
-
-        <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
-        >
-      </flexbox>
-    </div>
-
-    <!--主页面表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @row-click="handleRowClick"
-      @filter-change="filterChange"
-    >
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-
-      <!-- 操作名称 -->
-      <el-table-column
-        prop="actionName"
-        label="操作名称(单击箭头过滤)"
-        width="165"
-        column-key="actionName"
-        align="center"
-        :filters="[
-          { text: '导出', value: '导出' },
-          { text: '消息', value: '消息' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <div align="center">
-            <el-tag
-              v-for="(item, index) in menuCateMap"
-              v-show="scope.row.actionName == item.value"
-              :key="index"
-              :type="item.cssName"
-            >
-              {{ item.label }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column>
-      <!-- 状态 -->
-      <el-table-column
-        prop="stateName"
-        label="状态(单击箭头过滤)"
-        width="155"
-        column-key="stateName"
-        align="center"
-        :filters="[
-          { text: '执行完成(任务成功)', value: 'Succeeded' },
-          { text: '执行完成(任务失败)', value: 'Failed' },
-          { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: 'Scheduled' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            v-for="(item, index) in stateNameCateMap"
-            v-show="scope.row.stateName == item.value"
-            :key="index"
-            :type="item.cssName"
-          >
-            {{ item.label }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="180">
-        <template slot-scope="scope">
-          <div align="center">
-            <!-- <el-button
-              v-if="scope.row.actionName == '导出'"
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            > -->
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.stateName == 'Succeeded' &&
-                scope.row.downFileName != ''
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            >
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.error != '' &&
-                scope.row.stateName == 'Succeeded'
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >检验失败，下载</el-button
-            >
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-    <div class="table-footer">
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-
-    <!-- 任务日志详细 -->
-    <el-dialog
-      title="任务详细"
-      :visible.sync="openView"
-      width="700px"
-      append-to-body
-    >
-      <el-form ref="form" :model="form" label-width="120px" size="mini">
-        <el-row>
-          <el-col :span="24">
-            <div class="overall">
-              <!-- 步骤条 -->
-              <div class="steps-box">
-                <ul class="steps">
-                  <li
-                    v-for="(item, index) in stepList"
-                    :key="index"
-                    :class="{ active: activeIndex - 1 === index }"
-                  >
-                    <p :class="{ li_active: activeIndex > index }">
-                      <i :class="item.icon"></i>
-                    </p>
-                    <div
-                      class="text"
-                      :class="{ li_active: activeIndex > index }"
-                    >
-                      {{ item.title }}
-                    </div>
-                  </li>
-                </ul>
-              </div>
-              <!-- 步骤条对应内容 -->
-              <div class="Article-content">
-                <el-tabs v-model="activeName">
-                  <el-tab-pane label="基本信息" name="first">
-                    <div class="dialog-body">
-                      <div
-                        class="content"
-                        v-for="(item, index) in stepList"
-                        :key="index"
-                        v-show="activeIndex == index + 1"
-                      >
-                        <div>
-                          <el-card style="height: 300px; margin: 2px">
-                            <div
-                              v-if="activeIndex == 1"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：等待执行</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 2"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：执行中...</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 3"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <div id="chatarea">
-                                <div
-                                  style="display: inline; color: #71d87f"
-                                  v-if="form.stateName == 'Succeeded'"
-                                >
-                                  执行结果：执行成功
-                                </div>
-                                <div
-                                  style="display: inline; color: #ff5640"
-                                  v-else-if="form.stateName == 'Failed'"
-                                >
-                                  执行结果：执行失败
-                                </div>
-                              </div>
-                            </div>
-                            <div>
-                              <el-col :span="12">
-                                <el-form-item label="模块名称：">{{
-                                  form.name
-                                }}</el-form-item>
-                                <el-form-item label="操作名称：">{{
-                                  form.actionName
-                                }}</el-form-item>
-                              </el-col>
-                              <el-col :span="12">
-                                <el-form-item label="创建人：">{{
-                                  form.creator
-                                }}</el-form-item>
-                                <el-form-item label="创建时间：">
-                                  <el-date-picker
-                                    value-format="yyyy-MM-dd hh:mm:ss"
-                                    format="yyyy-MM-dd hh:mm:ss"
-                                    v-model="form.createdAt"
-                                    type="date"
-                                    class="picker"
-                                    disabled
-                                  ></el-date-picker>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="24">
-                                <el-form-item
-                                  label="异常信息："
-                                  style="color: #ff5640"
-                                  v-if="form.stateName == 'Failed'"
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.error)"
-                                    >下载错误数据</el-button
-                                  >
-                                </el-form-item>
-                                <el-form-item
-                                  label="生成数据："
-                                  style="color: #ff5640"
-                                  v-else-if="
-                                    form.stateName == 'Succeeded' &&
-                                    form.actionName == '导出'
-                                  "
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.downFileName)"
-                                    >下载生成数据</el-button
-                                  >
-                                </el-form-item>
-                              </el-col>
-                            </div>
-                          </el-card>
-                        </div>
-                      </div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="openView = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!--统计功能表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="550px"
-    >
-      <el-form ref="formCount" :inline="true" :model="formCount" size="mini">
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="选择版本" required />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="versionValue">
-              <el-select
-                v-model="formCount.versionValue"
-                size="medium"
-                clearable
-                style="width: 188px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in versionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-
-export default {
-  name: "FisUnSettledDiff",
-  components: { Pagination, CRMTableHead },
-  directives: { permission },
-
-  data() {
-    return {
-      crmType: "backJob",
-      selectValue: "",
-      selectNameValue: "",
-      valueSelect: "R0003",
-      versionList: [],
-      // 是否显示详细弹出层
-      openView: false,
-      versionValue: "",
-      formTitle: "",
-      timer: null, //定时器名称
-      //当前位置
-      activeIndex: 1,
-      //默认显示基本信息
-      activeName: "first",
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
-      //步骤条步数
-      stepList: [
-        {
-          title: "等待执行",
-          icon: "el-icon-sort",
-        },
-        {
-          title: "执行中",
-          icon: "el-icon-refresh",
-        },
-        {
-          title: "执行完成",
-          icon: "el-icon-check",
-        },
-      ],
-      customerInfos: "",
-      searchContent: "", // 输入内容
-      form: {},
-      formCount: { name: "ERP总成开票报表" },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listExportQuery: {
-        version: "",
-        customerCode: "TH",
-        //apply:"",
-      },
-      listQuery: {
-        taskId: "",
-        name: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      menuCateMap: [
-        { label: "导出", value: "导出", cssName: "warning" },
-        { label: "消息", value: "消息", cssName: "info" },
-      ],
-      stateNameCateMap: [
-        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
-        { label: "执行中...", value: "Processing", cssName: "primary" },
-        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
-        { label: "等待执行", value: "Scheduled", cssName: "primary" },
-      ],
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-    this.timer = setInterval(() => {
-      this.listQuery.taskId = "";
-      this.listQuery.stateName = "";
-      setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
-    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once("hook:beforeDestroy", () => {
-      clearInterval(timer);
-    });
-  },
-  created() {
-    this.getAllVersionList();
-    this.getList();
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-  computed: {
-    /* 主表头 */
-    getDefaultField() {
-      var tempsTabs = [];
-
-      tempsTabs.push({
-        label: "单据流水号",
-        prop: "taskId",
-        width: 130,
-      });
-      tempsTabs.push({
-        label: "当前版本",
-        prop: "version",
-        width: 100,
-      }); 
-      tempsTabs.push({
-        label: "模块名称",
-        prop: "name",
-        width: 155,
-      });
-      tempsTabs.push({
-        label: "创建人",
-        prop: "email",
-        width: 105,
-      });
-      tempsTabs.push({
-        label: "创建时间",
-        prop: "createdAt",
-        width: 140,
-      });
-      // tempsTabs.push({
-      //   label: "操作名称",
-      //   prop: "actionName",
-      //   width: 120,
-      // });
-      // tempsTabs.push({
-      //   label: "状态",
-      //   prop: "stateName",
-      //   width: 100,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    //取版本
-    getAllVersionList() {
-      this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
-        .then((response) => {
-          this.versionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /* 重置 */
-    resetForm(formName) {
-      this.formCount = {};
-    },
-    save() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          console.log("参数:" + JSON.stringify(this.formCount));
-          this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue;
-          //this.listExportQuery.customerCode = this.formCount.customerCode;
-          console.log(
-            "ERP总成物料号传入条件：" + JSON.stringify(this.listExportQuery)
-          );
-          this.$axios
-            .gets(
-              "/api/settleaccount/ReportMakeService/FisUnSettledDiff-Make",
-              this.listExportQuery
-            )
-            .then((res) => {
-              let taskid = res;
-              if (Number.isInteger(taskid)) {
-                this.$notify({
-                  title: "成功",
-                  message: "任务生成成功！任务号:" + taskid,
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.getList();
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            });
-        }
-      });
-    },
-    handleCreate() {
-      // this.$nextTick(() => {
-      //   this.$refs["formCount"].resetFields();
-      // });
-      this.formTitle = "报表统计";
-      this.isEdit = false;
-      this.form = {};
-      this.dialogFormVisible = true;
-    },
-    filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
-    },
-    /* 下载错误信息 */
-    handleView(row) {},
-    /*  刷新  */
-    refresh() {
-      this.list = [];
-      this.listQuery.taskId = "";
-      this.listQuery.name = "";
-      this.getList();
-    },
-    // 监听筛选项的变化
-    filterChange(filterObj) {
-      console.log(filterObj.actionName);
-      if (filterObj.actionName.length > 0) {
-        console.log("点击筛选");
-      } else {
-        console.log("点击重置");
-      }
-    },
-    /* 导出类型的文件 */
-    downloadErrData(param) {
-      let fileNameOfProject = param;
-      console.log("下载获取的文件名：" + fileNameOfProject);
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
-    },
-    /* 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /* 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "stateName") {
-        return {
-          Succeeded: "执行完成(成功)",
-          Processing: "执行中...",
-          Failed: "执行完成(失败)",
-          Enqueued: "等待执行",
-        }[row[column.property]];
-      }
-      if (column.property == "createdAt") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    handleDownload(row) {
-      if (row.stateName == "Succeeded") {
-        this.downloadErrData(row.downFileName);
-      } else if (row.stateName == "Failed") {
-        this.downloadErrData(row.error);
-      }
-    },
-    getList() {
-      this.listLoading = true;
-      //导入界面中超链接过来的参数
-      this.listQuery.name = "ERP总成开票报表";
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    // fetchData(id) {
-    //   //循环动态，取客户名称
-    //   this.$axios
-    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-    //     .then((response) => {
-    //       this.form = response;
-    //     });
-    // },
-    // resetQuery() {},
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      var item = this.list[rowIndex];
-      if (column.property === "stateName") {
-        if (item.stateName === "Succeeded") {
-          return { color: "#71d87f", cursor: "pointer" };
-        } else if (item.stateName === "Processing") {
-          return { color: "#d87171", cursor: "pointer" };
-        } else if (item.stateName === "Failed") {
-          return { color: "#ff5640", cursor: "pointer" };
-        }
-      }
-      return { textAlign: "left" };
-      //}
-    },
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "stateName") {
-        return { textAlign: "center" };
-      }
-      return { textAlign: "center" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-@import "../../styles/steps.scss";
-</style>
-
-</style>
diff --git a/code/WebApp/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/code/WebApp/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
deleted file mode 100644
index 0541e6fd..00000000
--- a/code/WebApp/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
+++ /dev/null
@@ -1,1569 +0,0 @@
-<!--发票与结算核对明细-->
-<template>
-  <div class="cr-body-content">
-    <!--功能栏-->
-    <!-- 搜索 -->
-    <div style="float: left">
-      <flexbox class="content-header">
-        <JobSelectVerson
-          :options="JobVersionList"
-          style="width: 150px; margin-left: -10px"
-          class="search-container"
-          @value-change="JobVersionValue"
-        ></JobSelectVerson>
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleCreate"
-          >统计明细
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete()"
-          >删除(支持批量)</el-button
-        >
-        <el-button
-          class="filter-item"
-          type="success"
-          icon="el-icon-check"
-          size="mini"
-          @click="handleCreateBills()"
-          >生成出库单(支持批量)</el-button
-        >
-        <el-button
-          class="filter-item"
-          type="success"
-          icon="el-icon-check"
-          size="mini"
-          @click="handleConfirm()"
-          >已确认</el-button
-        >
-      </flexbox>
-    </div>
-    <!-- 刷新 -->
-    <div style="float: right">
-      <flexbox class="content-header">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="手动刷新"
-          placement="top"
-        >
-          <el-button
-            size="mini"
-            circle
-            icon="el-icon-refresh"
-            @click="refresh()"
-          />
-        </el-tooltip>
-
-        <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
-        >
-      </flexbox>
-    </div>
-
-    <!--主页面表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @row-click="handleRowClick"
-      @selection-change="handleSelectionChange"
-      @filter-change="filterChange"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-
-      <!-- 操作名称 -->
-      <el-table-column
-        prop="actionName"
-        label="操作名称(单击箭头过滤)"
-        width="165"
-        column-key="actionName"
-        :filters="[
-          { text: '导出', value: '导出' },
-          { text: '消息', value: '消息' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <div align="center">
-            <el-tag
-              v-for="(item, index) in menuCateMap"
-              v-show="scope.row.actionName == item.value"
-              :key="index"
-              :type="item.cssName"
-            >
-              {{ item.label }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column>
-      <!-- 状态 -->
-      <el-table-column
-        prop="stateName"
-        label="状态(单击箭头过滤)"
-        width="165"
-        column-key="stateName"
-        align="center"
-        :filters="[
-          { text: '执行完成(任务成功)', value: 'Succeeded' },
-          { text: '执行完成(任务失败)', value: 'Failed' },
-          { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: 'Scheduled' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            v-for="(item, index) in stateNameCateMap"
-            v-show="scope.row.stateName == item.value"
-            :key="index"
-            :type="item.cssName"
-          >
-            {{ item.label }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="250">
-        <template slot-scope="scope">
-          <div align="center">
-            <!-- <el-button
-              v-if="scope.row.actionName == '导出'"
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            > -->
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.stateName == 'Succeeded' &&
-                scope.row.downFileName != ''
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            >
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.error != '' &&
-                scope.row.stateName == 'Succeeded'
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >检验失败，下载</el-button
-            >
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-    <div class="table-footer">
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-
-    <!-- 任务日志详细 -->
-    <el-dialog
-      title="任务详细"
-      :visible.sync="openView"
-      width="700px"
-      append-to-body
-    >
-      <el-form ref="form" :model="form" label-width="120px" size="mini">
-        <el-row>
-          <el-col :span="24">
-            <div class="overall">
-              <!-- 步骤条 -->
-              <div class="steps-box">
-                <ul class="steps">
-                  <li
-                    v-for="(item, index) in stepList"
-                    :key="index"
-                    :class="{ active: activeIndex - 1 === index }"
-                  >
-                    <p :class="{ li_active: activeIndex > index }">
-                      <i :class="item.icon"></i>
-                    </p>
-                    <div
-                      class="text"
-                      :class="{ li_active: activeIndex > index }"
-                    >
-                      {{ item.title }}
-                    </div>
-                  </li>
-                </ul>
-              </div>
-              <!-- 步骤条对应内容 -->
-              <div class="Article-content">
-                <el-tabs v-model="activeName">
-                  <el-tab-pane label="基本信息" name="first">
-                    <div class="dialog-body">
-                      <div
-                        class="content"
-                        v-for="(item, index) in stepList"
-                        :key="index"
-                        v-show="activeIndex == index + 1"
-                      >
-                        <div>
-                          <el-card style="height: 300px; margin: 2px">
-                            <div
-                              v-if="activeIndex == 1"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：等待执行</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 2"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：执行中...</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 3"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <div id="chatarea">
-                                <div
-                                  style="display: inline; color: #71d87f"
-                                  v-if="form.stateName == 'Succeeded'"
-                                >
-                                  执行结果：执行成功
-                                </div>
-                                <div
-                                  style="display: inline; color: #ff5640"
-                                  v-else-if="form.stateName == 'Failed'"
-                                >
-                                  执行结果：执行失败
-                                </div>
-                              </div>
-                            </div>
-                            <div>
-                              <el-col :span="12">
-                                <el-form-item label="模块名称：">{{
-                                  form.name
-                                }}</el-form-item>
-                                <el-form-item label="操作名称：">{{
-                                  form.actionName
-                                }}</el-form-item>
-                              </el-col>
-                              <el-col :span="12">
-                                <el-form-item label="创建人：">{{
-                                  form.creator
-                                }}</el-form-item>
-                                <el-form-item label="创建时间：">
-                                  <el-date-picker
-                                    value-format="yyyy-MM-dd hh:mm:ss"
-                                    format="yyyy-MM-dd hh:mm:ss"
-                                    v-model="form.createdAt"
-                                    type="date"
-                                    class="picker"
-                                    disabled
-                                  ></el-date-picker>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="24">
-                                <el-form-item
-                                  label="异常信息："
-                                  style="color: #ff5640"
-                                  v-if="form.stateName == 'Failed'"
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.error)"
-                                    >下载错误数据</el-button
-                                  >
-                                </el-form-item>
-                                <el-form-item
-                                  label="生成数据："
-                                  style="color: #ff5640"
-                                  v-else-if="
-                                    form.stateName == 'Succeeded' &&
-                                    form.actionName == '导出'
-                                  "
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.downFileName)"
-                                    >下载生成数据</el-button
-                                  >
-                                </el-form-item>
-                              </el-col>
-                            </div>
-                          </el-card>
-                        </div>
-                      </div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="openView = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!--统计功能表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="680px"
-    >
-      <el-form
-        ref="formCount"
-        :inline="true"
-        :rules="rules"
-        :model="formCount"
-        size="mini"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="选择版本" required />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="versionValue">
-              <el-select
-                v-model="formCount.versionValue"
-                size="medium"
-                clearable
-                style="width: 188px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in versionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="物料组(车型)" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialGroupValue">
-              <el-select
-                v-model="formCount.materialGroupValue"
-                size="medium"
-                multiple
-                filterable
-                clearable
-                style="width: 380px; margin-right: 15px"
-                @change="valueChange"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in materialGroupList"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value"
-                >
-                  <span style="float: left">{{ item.label }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                    item.value
-                  }}</span>
-                </el-option>
-              </el-select>
-              <!-- <el-select
-                v-model="formCount.materialGroupValue"
-                class="my-el-select"
-                style="width: 350px; margin-right: 15px"
-                size="medium"
-                multiple
-                clearable
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in materialGroupList"
-                  :key="item.label"
-                  :label="item.value"
-                  :value="item.label"
-                >
-                  <span style="float: left">{{ item.label }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                    item.value
-                  }}</span>
-                </el-option>
-              </el-select> -->
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP5时间：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-date-picker
-                v-model="cp5startTime"
-                :picker-options="pickerOptions2"
-                type="datetime"
-                size="small"
-                @change="getdateValueCp5"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item>
-              <el-date-picker
-                v-model="cp5endTime"
-                :picker-options="pickerOptions3"
-                type="datetime"
-                size="small"
-                @change="getdateValCp5"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP7时间：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="startTime">
-              <el-date-picker
-                v-model="formCount.startTime"
-                type="datetime"
-                size="small"
-                :picker-options="pickerOptions0"
-                @change="getdateValue"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item prop="endTime">
-              <el-date-picker
-                v-model="formCount.endTime"
-                type="datetime"
-                :picker-options="pickerOptions1"
-                size="small"
-                @change="getdateVal"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-collapse v-model="activeNames">
-          <el-collapse-item name="1">
-            <template slot="title">
-              其他搜索条件(单击折叠或伸展)<i
-                class="header-icon el-icon-info"
-                style="color: #37b328"
-              ></i>
-            </template>
-            <!-- <el-row>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="KEEN号" />
-              </el-col>
-              <el-col :md="18" :xs="24" style="margin-left: -80px">
-                <el-form-item prop="kennCode">
-                  <el-input
-                    type="textarea"
-                    v-model="formCount.kennCode"
-                    style="width: 380px"
-                    :rows="4"
-                    placeholder="多个KENN号，请以回车换行形式添加！"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="2" :xs="24">
-                <el-tooltip
-                  content="一键复制粘贴"
-                  placement="bottom"
-                  effect="light"
-                >
-                  <el-button
-                    type="primary"
-                    icon="el-icon-edit"
-                    circle
-                    @click="kennBtn"
-                  ></el-button>
-                </el-tooltip>
-              </el-col>
-            </el-row> -->
-
-            <el-row>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="KEEN号" />
-              </el-col>
-              <el-col :md="10" :xs="24" style="margin-left: -80px">
-                <el-form-item prop="kennCode">
-                  <el-input
-                    type="textarea"
-                    v-model="formCount.kennCode"
-                    style="width: 170px"
-                    :rows="4"
-                    placeholder="多个KENN号，请以回车换行形式添加！"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="底盘号" />
-              </el-col>
-              <el-col :md="10" :xs="24" style="margin-left: -95px">
-                <el-form-item prop="chassisNumber">
-                  <el-input
-                    v-model="formCount.chassisNumber"
-                    style="width: 170px"
-                    type="textarea"
-                    :rows="4"
-                    placeholder="多个底盘号，请以回车换行形式添加！"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="客户零件号" />
-              </el-col>
-              <el-col :md="10" :xs="24" style="margin-left: -80px">
-                <el-form-item prop="materialCode">
-                  <el-input
-                    v-model="formCount.materialCode"
-                    style="width: 170px"
-                    type="textarea"
-                    :rows="4"
-                    placeholder="多个客户零件号，请以回车换行形式添加！"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="厂内零件号" />
-              </el-col>
-              <el-col :md="10" :xs="24" style="margin-left: -95px">
-                <el-form-item prop="sapCode">
-                  <el-input
-                    v-model="formCount.sapCode"
-                    style="width: 170px"
-                    type="textarea"
-                    :rows="4"
-                    placeholder="多个厂内零件号，请以回车换行形式添加！"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-collapse-item>
-        </el-collapse>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
-
-    <el-dialog
-      title="批量录入KEEN号"
-      :visible.sync="showModal"
-      width="400px"
-      height="500px"
-      append-to-body
-    >
-      <flexbox class="content">
-        <div>
-          <el-input
-            type="textarea"
-            v-model="paster"
-            @paste.native="pasteMe"
-            :rows="6"
-          />
-          <el-table :data="tableData" max-height="400">
-            <el-table-column
-              prop="name"
-              label="说明：只支持从Excel上粘贴复制，不支持手输！"
-              width="300"
-            >
-            </el-table-column>
-          </el-table>
-        </div>
-      </flexbox>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submiteBillNo">确定录入</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import PasteExcel from "@/components/PasteExcel/index.vue";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
-
-export default {
-  name: "InvoiceSettledDetailDiff",
-  components: { Pagination, CRMTableHead, PasteExcel, JobSelectVerson },
-  directives: { permission },
-
-  data() {
-    return {
-      crmType: "backJob",
-      activeNames: ["1"],
-      tableData: [
-        {
-          name: "KEEN号",
-        },
-      ],
-      paster: "",
-      pasterValue: "",
-      JobVersionList: [],
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
-      showModal: false,
-      pickerOptionsCp5: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      pickerOptions0: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          //return  time.getTime() >= new Date(this.endTime).getTime();
-          return time.getTime() > new Date(this.endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions1: {
-        disabledDate: (time) => {
-          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
-          return time.getTime() <= new Date(this.startTime).getTime();
-        },
-      },
-
-      pickerOptions2: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          return time.getTime() > new Date(this.cp5endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions3: {
-        disabledDate: (time) => {
-          return time.getTime() <= new Date(this.cp5startTime).getTime();
-        },
-      },
-      pickerOptionsCp7: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      datetime5: [],
-      checkedCities: [0],
-      selectValue: "",
-      selectNameValue: "",
-      radio: "0", //结算状态：0未结 1部分结算
-      versionList: [],
-      materialGroupList: [],
-      // 是否显示详细弹出层
-      openView: false,
-      versionValue: "",
-      materialGroupValue: [],
-      formTitle: "",
-      timer: null, //定时器名称
-      //当前位置
-      activeIndex: 1,
-      //默认显示基本信息
-      activeName: "first",
-      //步骤条步数
-      stepList: [
-        {
-          title: "等待执行",
-          icon: "el-icon-sort",
-        },
-        {
-          title: "执行中",
-          icon: "el-icon-refresh",
-        },
-        {
-          title: "执行完成",
-          icon: "el-icon-check",
-        },
-      ],
-      customerInfos: "",
-      searchContent: "", // 输入内容
-      form: {},
-      formCount: {
-        startTime: "",
-        endTime: "",
-        cp5startTime: "",
-        cp5endTime: "",
-        // name: "未结算对比",
-        // settledate: "",
-        // materialCode: "",
-        // sapMaterialCode: "",
-        // chassisNumber: "",
-        // kennCode: "",
-        // version: "",
-      },
-      cp5startTime: "",
-      cp5endTime: "",
-      dataKenCode: "",
-      datachassisNumber: "",
-      datamaterialCode: "",
-      datasapCode: "",
-      getmaterialGroupValue: "",
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listExportQuery: {
-        version: "",
-        materialCode: undefined,
-        sapCode: undefined,
-        cp7begin: undefined,
-        cp7end: undefined,
-        kenncode: undefined,
-        chassisNumber: undefined,
-        materialGroup: undefined,
-        begin: undefined,
-        end: undefined,
-      },
-      listQuery: {
-        taskId: "",
-        name: "",
-        type: "",
-      },
-      listBillQuery: {
-        version: "",
-        guids: [],
-      },
-      page: 1,
-      JobversionValue: "",
-      JobversionValueVerson: "",
-      dialogFormVisible: false,
-      multipleSelection: [],
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      menuCateMap: [
-        { label: "导出", value: "导出", cssName: "warning" },
-        { label: "消息", value: "消息", cssName: "info" },
-      ],
-      stateNameCateMap: [
-        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
-        { label: "执行中...", value: "Processing", cssName: "primary" },
-        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
-        { label: "等待执行", value: "Scheduled", cssName: "primary" },
-      ],
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-    this.timer = setInterval(() => {
-      this.listQuery.taskId = "";
-      this.listQuery.stateName = "";
-      setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
-    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once("hook:beforeDestroy", () => {
-      clearInterval(timer);
-    });
-    //this.disabledDateCp5();
-  },
-  created() {
-    this.getAllVersionList();
-    this.getMaterialGroup();
-    this.getList();
-    this.getJobVersionInfo();
-    // this.getCurrentMonthFirst();
-    // this.getCurrentMonthLast();
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-  computed: {
-    /* 主表头 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "版本号",
-        prop: "type",
-        width: 85,
-      });
-      tempsTabs.push({
-        label: "单据流水号",
-        prop: "taskId",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "模块名称",
-        prop: "name",
-        width: 170,
-      });
-      tempsTabs.push({
-        label: "创建人",
-        prop: "email",
-        width: 110,
-      });
-      tempsTabs.push({
-        label: "创建时间",
-        prop: "createdAt",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "说明",
-        prop: "remark",
-        width: 220,
-      });
-      tempsTabs.push({
-        label: "审批状态",
-        prop: "fileName",
-        width: 150,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
-      this.handleFilter();
-    },
-        /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "taskId";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    handleConfirm(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否确认" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "操作成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    //出库单
-    handleCreateBills(row) {
-      // if (this.multipleSelection.length == 0) {
-      //   this.$message({
-      //     message: "至少选择一行！",
-      //     type: "warning",
-      //   });
-      //   return;
-      // }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.listBillQuery.guids = params;
-      this.listBillQuery.version = this.JobversionValue;
-      console.log("出库单条件：" + JSON.stringify(this.listBillQuery));
-      this.$confirm("是否确认出库" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts(
-              "/api/settleaccount/wmsjitoutput/WmsJitOutPut",
-              this.listBillQuery
-            )
-            .then((response) => {
-              console.log(
-                "检查柱护板-hostCheckQuery" + JSON.stringify(response)
-              );
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "生成成功",
-                type: "success",
-                duration: 2000,
-              });
-
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    //批量删除
-    handleDelete(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/Job/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.JobversionValue = params.value;
-      this.getList();
-    },
-    getJobVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
-        .then((response) => {
-          this.JobVersionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element;
-            options.label = element;
-            this.JobVersionList.push(options);
-          });
-          if (JSON.stringify(this.JobVersionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.JobversionValue = this.JobVersionList[0].value;
-            this.JobversionValueVerson = this.JobVersionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    submiteBillNo() {
-      var getkeenCodeNo = this.pasterValue.substring(
-        0,
-        this.pasterValue.length - 1
-      );
-      this.dataKenCode = getkeenCodeNo;
-      this.formCount.kennCode = this.dataKenCode;
-      this.showModal = false;
-    },
-    pasteMe(e) {
-      let source = e.clipboardData.getData("Text");
-      // 首先对源头进行解析
-      let rows = source.split("\r\n"); // 拆成很多行
-      this.pasterValue = "";
-      for (let i = 0; i < rows.length; i++) {
-        if (rows[i] != "") {
-          // 如果某一行不是空，再按列拆分
-          let columns = rows[i].split("\t"); // 已经按列划分
-          let dataone = {}; // 声明一行数组
-          for (let j = 0; j < columns.length; j++) {
-            // 读取tableData里的第j对应的key值
-            let keys = Object.keys(this.tableData[j]); // key的名
-            dataone[keys[j]] = columns[j];
-            this.pasterValue += columns[j] + ",";
-          }
-          this.tableData.push(dataone);
-          console.log(this.tableData);
-        }
-      }
-    },
-    //如果是要获得粘贴excel的内容，需要把粘贴的内容转换成二维数组
-    // pasteExcelToKennCode(e) {
-    //   let source = e.clipboardData.getData("Text");
-    //   // 首先对源头进行解析
-    //   let rows = source.split("\r\n"); // 拆成很多行
-    //   this.dataKenCode = "";
-    //   for (let i = 0; i < rows.length; i++) {
-    //     if (rows[i] != "") {
-    //       // 如果某一行不是空，再按列拆分
-    //       let columns = rows[i].split("\t"); // 已经按列划分
-
-    //       for (let j = 0; j < columns.length; j++) {
-    //         this.dataKenCode += columns[j] + ",";
-    //       }
-    //     }
-    //   }
-    // },
-    valueChange(data) {
-      this.getmaterialGroupValue = "";
-      this.getmaterialGroupValue += data + ",";
-      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
-        0,
-        this.getmaterialGroupValue.length - 1
-      );
-    },
-    getdateValue(val) {
-      this.startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateVal(val) {
-      this.endTime = val;
-      this.getbalanceIndexData();
-    },
-
-    //cp5
-    getdateValueCp5(val) {
-      this.cp5startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateValCp5(val) {
-      this.cp5endTime = val;
-      this.getbalanceIndexData();
-    },
-    getCurrentMonthFirst() {
-      var date = new Date();
-      date.setDate(1);
-      var month = parseInt(date.getMonth() + 1);
-      var day = date.getDate();
-      if (month < 10) month = "0" + month;
-      if (day < 10) day = "0" + day;
-      this.startTime = date.getFullYear() + "-" + month + "-" + day;
-    },
-    getCurrentMonthLast() {
-      var date = new Date();
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      month = month < 10 ? "0" + month : month;
-      var day = new Date(year, month, 0);
-      this.endTime = year + "-" + month + "-" + day.getDate();
-    },
-    handleCheckedCitiesChange(value) {
-      alert(value);
-    },
-
-    getAllVersionList() {
-      this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
-        .then((response) => {
-          this.versionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //获取物料组车型
-    // getMaterialGroup() {
-    //   this.$axios
-    //     .posts("/api/settleaccount/CodeSetting/list", {
-    //       project: "物料组",
-    //       maxResultCount: 1000,
-    //       skipCount: 0,
-    //     })
-    //     .then((response) => {
-    //       this.materialGroupList = [];
-    //       response.items.forEach((element) => {
-    //         let options = {};
-    //         options.value = element.description;
-    //         options.label = element.value;
-    //         this.materialGroupList.push(options);
-    //       });
-    //     })
-    //     .catch(() => {
-    //       this.listLoading = false;
-    //     });
-    // },
-    //获取物料组车型
-    getMaterialGroup() {
-      this.$axios
-        .posts("/api/settleaccount/CodeSetting/list", {
-          project: "物料组",
-          maxResultCount: 1000,
-          skipCount: 0,
-          sorting:"value ascending"
-        })
-        .then((response) => {
-          this.materialGroupList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.description;
-            options.label = element.value;
-            this.materialGroupList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /* 重置 */
-    resetForm(formName) {
-      this.formCount = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      this.cp5startTime = "";
-      this.cp5endTime = "";
-    },
-    save() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue; //版本
-          if (this.formCount.materialCode != "") {
-            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
-          }
-          if (this.formCount.sapCode != "") {
-            this.listExportQuery.sapCode = this.formCount.sapCode; //厂内物料号
-          }
-          if (this.formCount.kennCode != "") {
-            this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
-          }
-          this.listExportQuery.begin = this.cp5startTime
-            ? this.cp5startTime
-            : undefined;
-          this.listExportQuery.end = this.cp5endTime
-            ? this.cp5endTime
-            : undefined;
-          this.listExportQuery.cp7begin = this.startTime
-            ? this.startTime
-            : undefined;
-          this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
-          if (this.formCount.chassisNumber != "") {
-            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
-          }
-          // if (this.formCount.materialGroupValue != "") {
-          //   this.listExportQuery.materialGroup =
-          //     '"'+this.formCount.materialGroupValue+'"'; //物料组车型
-          // }
-          if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
-          }
-
-          console.log(
-            "大众发票与结算核对明细表-导出条件：" +
-              JSON.stringify(this.listExportQuery)
-          );
-          this.$axios
-            .gets(
-              "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
-              this.listExportQuery
-            )
-            .then((res) => {
-              let taskid = res;
-              if (Number.isInteger(taskid)) {
-                this.$notify({
-                  title: "成功",
-                  message: "任务生成成功！任务号:" + taskid,
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.getList();
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            });
-        }
-      });
-    },
-    handleCreate() {
-      this.$nextTick(() => {
-        this.$refs["formCount"].resetFields();
-      });
-      this.formTitle = "报表统计";
-      this.isEdit = false;
-      this.form = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      this.cp5startTime = "";
-      this.cp5endTime = "";
-      this.dialogFormVisible = true;
-    },
-    kennBtn() {
-      this.paster = "";
-      this.showModal = true;
-      this.tableData = [
-        {
-          name: "KEEN号",
-        },
-      ];
-    },
-    filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
-    },
-    /* 任务详细信息 */
-    handleView(row) {
-      this.listQuery.taskId = row.taskId;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.form = response[0];
-          switch (response[0].stateName) {
-            case "Succeeded":
-            case "Failed":
-              this.activeIndex = 3;
-              break;
-            case "Processing":
-              this.activeIndex = 2;
-              break;
-            case "Enqueued":
-              this.activeIndex = 1;
-              break;
-          }
-          this.openView = true;
-        });
-    },
-    /*  刷新  */
-    refresh() {
-      this.list = [];
-      this.listQuery.taskId = "";
-      this.listQuery.name = "";
-      this.getList();
-    },
-    // 监听筛选项的变化
-    filterChange(filterObj) {
-      console.log(filterObj.actionName);
-      if (filterObj.actionName.length > 0) {
-        console.log("点击筛选");
-      } else {
-        console.log("点击重置");
-      }
-    },
-    /* 导出类型的文件 */
-    downloadErrData(param) {
-      this.listLoading = true;
-      let fileNameOfProject = param;
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
-    },
-    /* 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /* 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "stateName") {
-        return {
-          Succeeded: "执行完成(成功)",
-          Processing: "执行中...",
-          Failed: "执行完成(失败)",
-          Enqueued: "等待执行",
-        }[row[column.property]];
-      }
-      if (column.property == "createdAt") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    handleDownload(row) {
-      if (row.stateName == "Succeeded") {
-        this.downloadErrData(row.downFileName);
-      } else if (row.stateName == "Failed") {
-        this.downloadErrData(row.error);
-      }
-    },
-    getList() {
-      this.listLoading = true;
-      //导入界面中超链接过来的参数
-      this.listQuery.name = "准时化结算核对明细";
-      this.listQuery.type = this.JobversionValue;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    // fetchData(id) {
-    //   //循环动态，取客户名称
-    //   this.$axios
-    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-    //     .then((response) => {
-    //       this.form = response;
-    //     });
-    // },
-    resetQuery() {},
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      var item = this.list[rowIndex];
-      if (column.property === "stateName") {
-        if (item.stateName === "Succeeded") {
-          return { color: "#71d87f", cursor: "pointer" };
-        } else if (item.stateName === "Processing") {
-          return { color: "#d87171", cursor: "pointer" };
-        } else if (item.stateName === "Failed") {
-          return { color: "#ff5640", cursor: "pointer" };
-        }
-      }
-      return { textAlign: "left" };
-      //}
-    },
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "stateName") {
-        return { textAlign: "center" };
-      }
-      return { textAlign: "center" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-@import "../../styles/steps.scss";
-
-/deep/ .el-checkbox input:focus {
-  outline: none !important;
-  border-color: gray;
-  border: 0px;
-  box-shadow: none !important;
-}
-</style>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/code/WebApp/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
deleted file mode 100644
index 53b6a364..00000000
--- a/code/WebApp/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
+++ /dev/null
@@ -1,1056 +0,0 @@
-<!--发票与结算核对汇总-->
-<template>
-  <div class="cr-body-content">
-    <!--功能栏-->
-    <!-- 搜索 -->
-    <div style="float: left">
-      <flexbox class="content-header">
-        <JobSelectVerson
-          :options="JobVersionList"
-          style="width: 150px; margin-left: -10px"
-          class="search-container"
-          @value-change="JobVersionValue"
-        ></JobSelectVerson>
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleCreate"
-          >统计
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete()"
-          >删除(支持批量)</el-button
-        >
-      </flexbox>
-    </div>
-    <!-- 刷新 -->
-    <div style="float: right">
-      <flexbox class="content-header">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="手动刷新"
-          placement="top"
-        >
-          <el-button
-            size="mini"
-            circle
-            icon="el-icon-refresh"
-            @click="refresh()"
-          />
-        </el-tooltip>
-
-        <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔15秒进行自动刷新！</span
-        >
-      </flexbox>
-    </div>
-
-    <!--主页面表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      @selection-change="handleSelectionChange"
-      style="width: 100%"
-      @row-click="handleRowClick"
-      @filter-change="filterChange"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-
-      <!-- 操作名称 -->
-      <el-table-column
-        prop="actionName"
-        label="操作名称(单击箭头过滤)"
-        width="165"
-        column-key="actionName"
-        :filters="[
-          { text: '导出', value: '导出' },
-          { text: '消息', value: '消息' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <div align="center">
-            <el-tag
-              v-for="(item, index) in menuCateMap"
-              v-show="scope.row.actionName == item.value"
-              :key="index"
-              :type="item.cssName"
-            >
-              {{ item.label }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column>
-      <!-- 状态 -->
-      <el-table-column
-        prop="stateName"
-        label="状态(单击箭头过滤)"
-        width="165"
-        column-key="stateName"
-        align="center"
-        :filters="[
-          { text: '执行完成(任务成功)', value: 'Succeeded' },
-          { text: '执行完成(任务失败)', value: 'Failed' },
-          { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: 'Scheduled' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            v-for="(item, index) in stateNameCateMap"
-            v-show="scope.row.stateName == item.value"
-            :key="index"
-            :type="item.cssName"
-          >
-            {{ item.label }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="250">
-        <template slot-scope="scope">
-          <div align="center">
-            <!-- <el-button
-              v-if="scope.row.actionName == '导出'"
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            > -->
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.stateName == 'Succeeded' &&
-                scope.row.downFileName != ''
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            >
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.error != '' &&
-                scope.row.stateName == 'Succeeded'
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >检验失败，下载</el-button
-            >
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-    <div class="table-footer">
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-
-    <!-- 任务日志详细 -->
-    <el-dialog
-      title="任务详细"
-      :visible.sync="openView"
-      width="700px"
-      append-to-body
-    >
-      <el-form ref="form" :model="form" label-width="120px" size="mini">
-        <el-row>
-          <el-col :span="24">
-            <div class="overall">
-              <!-- 步骤条 -->
-              <div class="steps-box">
-                <ul class="steps">
-                  <li
-                    v-for="(item, index) in stepList"
-                    :key="index"
-                    :class="{ active: activeIndex - 1 === index }"
-                  >
-                    <p :class="{ li_active: activeIndex > index }">
-                      <i :class="item.icon"></i>
-                    </p>
-                    <div
-                      class="text"
-                      :class="{ li_active: activeIndex > index }"
-                    >
-                      {{ item.title }}
-                    </div>
-                  </li>
-                </ul>
-              </div>
-              <!-- 步骤条对应内容 -->
-              <div class="Article-content">
-                <el-tabs v-model="activeName">
-                  <el-tab-pane label="基本信息" name="first">
-                    <div class="dialog-body">
-                      <div
-                        class="content"
-                        v-for="(item, index) in stepList"
-                        :key="index"
-                        v-show="activeIndex == index + 1"
-                      >
-                        <div>
-                          <el-card style="height: 300px; margin: 2px">
-                            <div
-                              v-if="activeIndex == 1"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：等待执行</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 2"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：执行中...</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 3"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <div id="chatarea">
-                                <div
-                                  style="display: inline; color: #71d87f"
-                                  v-if="form.stateName == 'Succeeded'"
-                                >
-                                  执行结果：执行成功
-                                </div>
-                                <div
-                                  style="display: inline; color: #ff5640"
-                                  v-else-if="form.stateName == 'Failed'"
-                                >
-                                  执行结果：执行失败
-                                </div>
-                              </div>
-                            </div>
-                            <div>
-                              <el-col :span="12">
-                                <el-form-item label="模块名称：">{{
-                                  form.name
-                                }}</el-form-item>
-                                <el-form-item label="操作名称：">{{
-                                  form.actionName
-                                }}</el-form-item>
-                              </el-col>
-                              <el-col :span="12">
-                                <el-form-item label="创建人：">{{
-                                  form.creator
-                                }}</el-form-item>
-                                <el-form-item label="创建时间：">
-                                  <el-date-picker
-                                    value-format="yyyy-MM-dd hh:mm:ss"
-                                    format="yyyy-MM-dd hh:mm:ss"
-                                    v-model="form.createdAt"
-                                    type="date"
-                                    class="picker"
-                                    disabled
-                                  ></el-date-picker>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="24">
-                                <el-form-item
-                                  label="异常信息："
-                                  style="color: #ff5640"
-                                  v-if="form.stateName == 'Failed'"
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.error)"
-                                    >下载错误数据</el-button
-                                  >
-                                </el-form-item>
-                                <el-form-item
-                                  label="生成数据："
-                                  style="color: #ff5640"
-                                  v-else-if="
-                                    form.stateName == 'Succeeded' &&
-                                    form.actionName == '导出'
-                                  "
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.downFileName)"
-                                    >下载生成数据</el-button
-                                  >
-                                </el-form-item>
-                              </el-col>
-                            </div>
-                          </el-card>
-                        </div>
-                      </div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="openView = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!--统计功能表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="680px"
-    >
-      <el-form
-        ref="formCount"
-        :inline="true"
-        :rules="rules"
-        :model="formCount"
-        size="mini"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="选择版本" required />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="versionValue">
-              <el-select
-                v-model="formCount.versionValue"
-                size="medium"
-                clearable
-                style="width: 188px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in versionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialCode">
-              <el-input
-                v-model="formCount.materialCode"
-                type="textarea"
-                style="width: 450px"
-                :rows="6"
-                placeholder="多个客户零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="sapCode">
-              <el-input
-                v-model="formCount.sapCode"
-                type="textarea"
-                style="width: 450px"
-                :rows="6"
-                placeholder="多个厂内零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
-
-export default {
-  name: "InvoiceSettledDiff",
-  components: { Pagination, CRMTableHead, JobSelectVerson },
-  directives: { permission },
-
-  data() {
-    return {
-      crmType: "backJob",
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
-      pickerOptionsCp5: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      pickerOptions0: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          //return  time.getTime() >= new Date(this.endTime).getTime();
-          return time.getTime() > new Date(this.endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions1: {
-        disabledDate: (time) => {
-          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
-          return time.getTime() <= new Date(this.startTime).getTime();
-        },
-      },
-      startTime: "",
-      endTime: "",
-      pickerOptionsCp7: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      datetime5: [],
-      datetime7: [],
-      checkedCities: [0],
-      JobVersionList: [],
-      selectValue: "",
-      selectNameValue: "",
-      radio: "0", //结算状态：0未结 1部分结算
-      versionList: [],
-      materialGroupList: [],
-      // 是否显示详细弹出层
-      openView: false,
-      versionValue: "",
-      materialGroupValue: "",
-      formTitle: "",
-      timer: null, //定时器名称
-      //当前位置
-      activeIndex: 1,
-      //默认显示基本信息
-      activeName: "first",
-      //步骤条步数
-      stepList: [
-        {
-          title: "等待执行",
-          icon: "el-icon-sort",
-        },
-        {
-          title: "执行中",
-          icon: "el-icon-refresh",
-        },
-        {
-          title: "执行完成",
-          icon: "el-icon-check",
-        },
-      ],
-      customerInfos: "",
-      searchContent: "", // 输入内容
-      getmaterialGroupValue: "",
-      form: {},
-      formCount: {
-        name: "未结算对比",
-        // datetime5: [],
-        // datetime7: [],
-        settledate: "",
-        materialCode: "",
-        sapMaterialCode: "",
-        sapCode: "",
-        chassisNumber: "",
-        kennCode: "",
-        version: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listExportQuery: {
-        version: "",
-        materialCode: undefined,
-        cp7begin: undefined,
-        cp7end: undefined,
-        kenncode: undefined,
-        chassisNumber: undefined,
-        materialGroup: undefined,
-        begin: undefined,
-        end: undefined,
-        sapCode: undefined,
-      },
-      listQuery: {
-        taskId: "",
-        name: "",
-        type: "",
-      },
-      page: 1,
-      JobversionValue: "",
-      JobversionValueVerson: "",
-      dialogFormVisible: false,
-      multipleSelection: [],
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      menuCateMap: [
-        { label: "导出", value: "导出", cssName: "warning" },
-        { label: "消息", value: "消息", cssName: "info" },
-      ],
-      stateNameCateMap: [
-        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
-        { label: "执行中...", value: "Processing", cssName: "primary" },
-        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
-        { label: "等待执行", value: "Scheduled", cssName: "primary" },
-      ],
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-    this.timer = setInterval(() => {
-      this.listQuery.taskId = "";
-      this.listQuery.stateName = "";
-      setTimeout(this.getList, 0);
-    }, 1000 * 15); //15秒刷新一次页面
-    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once("hook:beforeDestroy", () => {
-      clearInterval(timer);
-    });
-    //this.disabledDateCp5();
-  },
-  created() {
-    this.getAllVersionList();
-    this.getMaterialGroup();
-    this.getList();
-    this.getJobVersionInfo();
-    // this.getCurrentMonthFirst();
-    // this.getCurrentMonthLast();
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-  computed: {
-    /* 主表头 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "版本号",
-        prop: "type",
-        width: 85,
-      });
-      tempsTabs.push({
-        label: "单据流水号",
-        prop: "taskId",
-        width: 130,
-      });
-      tempsTabs.push({
-        label: "模块名称",
-        prop: "name",
-        width: 170,
-      });
-      tempsTabs.push({
-        label: "创建人",
-        prop: "email",
-        width: 110,
-      });
-      tempsTabs.push({
-        label: "创建时间",
-        prop: "createdAt",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "说明",
-        prop: "remark",
-        width: 220,
-      });
-      // tempsTabs.push({
-      //   label: "操作名称",
-      //   prop: "actionName",
-      //   width: 120,
-      // });
-      // tempsTabs.push({
-      //   label: "状态",
-      //   prop: "stateName",
-      //   width: 100,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    //批量删除
-    handleDelete(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/Job/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    valueChange(data) {
-      this.getmaterialGroupValue = "";
-      this.getmaterialGroupValue += data + ",";
-      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
-        0,
-        this.getmaterialGroupValue.length - 1
-      );
-    },
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.JobversionValue = params.value;
-      this.getList();
-    },
-    getJobVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
-        .then((response) => {
-          this.JobVersionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element;
-            options.label = element;
-            this.JobVersionList.push(options);
-          });
-          if (JSON.stringify(this.JobVersionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.JobversionValue = this.JobVersionList[0].value;
-            this.JobversionValueVerson = this.JobVersionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    getdateValue(val) {
-      this.startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateVal(val) {
-      this.endTime = val;
-      this.getbalanceIndexData();
-    },
-
-    getCurrentMonthFirst() {
-      var date = new Date();
-      date.setDate(1);
-      var month = parseInt(date.getMonth() + 1);
-      var day = date.getDate();
-      if (month < 10) month = "0" + month;
-      if (day < 10) day = "0" + day;
-      this.startTime = date.getFullYear() + "-" + month + "-" + day;
-    },
-    getCurrentMonthLast() {
-      var date = new Date();
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      month = month < 10 ? "0" + month : month;
-      var day = new Date(year, month, 0);
-      this.endTime = year + "-" + month + "-" + day.getDate();
-    },
-    handleCheckedCitiesChange(value) {
-      alert(value);
-    },
-
-    getAllVersionList() {
-      this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
-        .then((response) => {
-          this.versionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //获取物料组车型
-    getMaterialGroup() {
-      this.$axios
-        .posts("/api/settleaccount/CodeSetting/list", {
-          project: "物料组",
-          maxResultCount: 1000,
-          skipCount: 0,
-        })
-        .then((response) => {
-          this.materialGroupList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.description;
-            options.label = element.description;
-            this.materialGroupList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /* 重置 */
-    resetForm(formName) {
-      this.formCount = {};
-      //this.formCount.materialCode = "";
-    },
-    save() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue; //版本
-          //零件号
-          this.listExportQuery.matialCode = this.formCount.materialCode
-            ? this.formCount.materialCode
-            : undefined;
-          //厂内零件号
-          this.listExportQuery.sapCode = this.formCount.sapCode
-            ? this.formCount.sapCode
-            : undefined;
-          console.log(
-            "发票与结算核对汇总-导出条件：" +
-              JSON.stringify(this.listExportQuery)
-          );
-          this.$axios
-            .gets(
-              "/api/settleaccount/ReportMakeService/InvoiceSettledDiff-Make",
-              this.listExportQuery
-            )
-            .then((res) => {
-              let taskid = res;
-              if (Number.isInteger(taskid)) {
-                this.$notify({
-                  title: "成功",
-                  message: "任务生成成功！任务号:" + taskid,
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.getList();
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            });
-        }
-      });
-    },
-    handleCreate() {
-      this.$nextTick(() => {
-        this.$refs["formCount"].resetFields();
-      });
-      this.formTitle = "报表统计";
-      this.isEdit = false;
-      this.form = {};
-      this.dialogFormVisible = true;
-    },
-    filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
-    },
-    /* 任务详细信息 */
-    handleView(row) {
-      this.listQuery.taskId = row.taskId;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.form = response[0];
-          switch (response[0].stateName) {
-            case "Succeeded":
-            case "Failed":
-              this.activeIndex = 3;
-              break;
-            case "Processing":
-              this.activeIndex = 2;
-              break;
-            case "Enqueued":
-              this.activeIndex = 1;
-              break;
-          }
-          this.openView = true;
-        });
-    },
-    /*  刷新  */
-    refresh() {
-      this.list = [];
-      this.listQuery.taskId = "";
-      this.listQuery.name = "";
-      this.getList();
-    },
-    // 监听筛选项的变化
-    filterChange(filterObj) {
-      console.log(filterObj.actionName);
-      if (filterObj.actionName.length > 0) {
-        console.log("点击筛选");
-      } else {
-        console.log("点击重置");
-      }
-    },
-    /* 导出类型的文件 */
-    downloadErrData(param) {
-      this.listLoading = true;
-      let fileNameOfProject = param;
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
-    },
-    /* 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /* 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "stateName") {
-        return {
-          Succeeded: "执行完成(成功)",
-          Processing: "执行中...",
-          Failed: "执行完成(失败)",
-          Enqueued: "等待执行",
-        }[row[column.property]];
-      }
-      if (column.property == "createdAt") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    handleDownload(row) {
-      if (row.stateName == "Succeeded") {
-        this.downloadErrData(row.downFileName);
-      } else if (row.stateName == "Failed") {
-        this.downloadErrData(row.error);
-      }
-    },
-    getList() {
-      this.listLoading = true;
-      //导入界面中超链接过来的参数
-      this.listQuery.name = "发票与结算核对汇总";
-      this.listQuery.type = this.JobversionValue;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    // fetchData(id) {
-    //   //循环动态，取客户名称
-    //   this.$axios
-    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-    //     .then((response) => {
-    //       this.form = response;
-    //     });
-    // },
-    resetQuery() {},
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      var item = this.list[rowIndex];
-      if (column.property === "stateName") {
-        if (item.stateName === "Succeeded") {
-          return { color: "#71d87f", cursor: "pointer" };
-        } else if (item.stateName === "Processing") {
-          return { color: "#d87171", cursor: "pointer" };
-        } else if (item.stateName === "Failed") {
-          return { color: "#ff5640", cursor: "pointer" };
-        }
-      }
-      return { textAlign: "left" };
-      //}
-    },
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "stateName") {
-        return { textAlign: "center" };
-      }
-      return { textAlign: "center" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-@import "../../styles/steps.scss";
-
-/deep/ .el-checkbox input:focus {
-  outline: none !important;
-  border-color: gray;
-  border: 0px;
-  box-shadow: none !important;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/ux/billManage/IssuedUnsettled/index.vue b/code/WebApp/vue/src/views/ux/billManage/IssuedUnsettled/index.vue
deleted file mode 100644
index 6e6ac6a8..00000000
--- a/code/WebApp/vue/src/views/ux/billManage/IssuedUnsettled/index.vue
+++ /dev/null
@@ -1,1186 +0,0 @@
-<!--发出未结算明细页-->
-<template>
-  <div class="cr-body-content">
-    <!--功能栏-->
-    <!-- 搜索 -->
-    <div style="float: left">
-      <flexbox class="content-header">
-        <JobSelectVerson
-          :options="JobVersionList"
-          style="width: 150px; margin-left: -10px"
-          class="search-container"
-          @value-change="JobVersionValue"
-        ></JobSelectVerson>
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleCreate"
-          >统计
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete()"
-          >删除(支持批量)</el-button
-        >
-      </flexbox>
-    </div>
-    <!-- 刷新 -->
-    <div style="float: right">
-      <flexbox class="content-header">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="手动刷新"
-          placement="top"
-        >
-          <el-button
-            size="mini"
-            circle
-            icon="el-icon-refresh"
-            @click="refresh()"
-          />
-        </el-tooltip>
-
-        <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔15秒进行自动刷新！</span
-        >
-      </flexbox>
-    </div>
-
-    <!--主页面表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @row-click="handleRowClick"
-      @selection-change="handleSelectionChange"
-      @filter-change="filterChange"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-
-      <!-- 操作名称 -->
-      <el-table-column
-        prop="actionName"
-        label="操作名称(单击箭头过滤)"
-        width="165"
-        column-key="actionName"
-        :filters="[
-          { text: '导出', value: '导出' },
-          { text: '消息', value: '消息' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <div align="center">
-            <el-tag
-              v-for="(item, index) in menuCateMap"
-              v-show="scope.row.actionName == item.value"
-              :key="index"
-              :type="item.cssName"
-            >
-              {{ item.label }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column>
-      <!-- 状态 -->
-      <el-table-column
-        prop="stateName"
-        label="状态(单击箭头过滤)"
-        width="165"
-        column-key="stateName"
-        align="center"
-        :filters="[
-          { text: '执行完成(任务成功)', value: 'Succeeded' },
-          { text: '执行完成(任务失败)', value: 'Failed' },
-          { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: 'Scheduled' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            v-for="(item, index) in stateNameCateMap"
-            v-show="scope.row.stateName == item.value"
-            :key="index"
-            :type="item.cssName"
-          >
-            {{ item.label }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="250">
-        <template slot-scope="scope">
-          <div align="center">
-            <!-- <el-button
-              v-if="scope.row.actionName == '导出'"
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            > -->
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.stateName == 'Succeeded' &&
-                scope.row.downFileName != ''
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            >
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.error != '' &&
-                scope.row.stateName == 'Succeeded'
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >检验失败，下载</el-button
-            >
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-    <div class="table-footer">
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-
-    <!-- 任务日志详细 -->
-    <el-dialog
-      title="任务详细"
-      :visible.sync="openView"
-      width="700px"
-      append-to-body
-    >
-      <el-form ref="form" :model="form" label-width="120px" size="mini">
-        <el-row>
-          <el-col :span="24">
-            <div class="overall">
-              <!-- 步骤条 -->
-              <div class="steps-box">
-                <ul class="steps">
-                  <li
-                    v-for="(item, index) in stepList"
-                    :key="index"
-                    :class="{ active: activeIndex - 1 === index }"
-                  >
-                    <p :class="{ li_active: activeIndex > index }">
-                      <i :class="item.icon"></i>
-                    </p>
-                    <div
-                      class="text"
-                      :class="{ li_active: activeIndex > index }"
-                    >
-                      {{ item.title }}
-                    </div>
-                  </li>
-                </ul>
-              </div>
-              <!-- 步骤条对应内容 -->
-              <div class="Article-content">
-                <el-tabs v-model="activeName">
-                  <el-tab-pane label="基本信息" name="first">
-                    <div class="dialog-body">
-                      <div
-                        class="content"
-                        v-for="(item, index) in stepList"
-                        :key="index"
-                        v-show="activeIndex == index + 1"
-                      >
-                        <div>
-                          <el-card style="height: 300px; margin: 2px">
-                            <div
-                              v-if="activeIndex == 1"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：等待执行</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 2"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：执行中...</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 3"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <div id="chatarea">
-                                <div
-                                  style="display: inline; color: #71d87f"
-                                  v-if="form.stateName == 'Succeeded'"
-                                >
-                                  执行结果：执行成功
-                                </div>
-                                <div
-                                  style="display: inline; color: #ff5640"
-                                  v-else-if="form.stateName == 'Failed'"
-                                >
-                                  执行结果：执行失败
-                                </div>
-                              </div>
-                            </div>
-                            <div>
-                              <el-col :span="12">
-                                <el-form-item label="模块名称：">{{
-                                  form.name
-                                }}</el-form-item>
-                                <el-form-item label="操作名称：">{{
-                                  form.actionName
-                                }}</el-form-item>
-                              </el-col>
-                              <el-col :span="12">
-                                <el-form-item label="创建人：">{{
-                                  form.creator
-                                }}</el-form-item>
-                                <el-form-item label="创建时间：">
-                                  <el-date-picker
-                                    value-format="yyyy-MM-dd hh:mm:ss"
-                                    format="yyyy-MM-dd hh:mm:ss"
-                                    v-model="form.createdAt"
-                                    type="date"
-                                    class="picker"
-                                    disabled
-                                  ></el-date-picker>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="24">
-                                <el-form-item
-                                  label="异常信息："
-                                  style="color: #ff5640"
-                                  v-if="form.stateName == 'Failed'"
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.error)"
-                                    >下载错误数据</el-button
-                                  >
-                                </el-form-item>
-                                <el-form-item
-                                  label="生成数据："
-                                  style="color: #ff5640"
-                                  v-else-if="
-                                    form.stateName == 'Succeeded' &&
-                                    form.actionName == '导出'
-                                  "
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.downFileName)"
-                                    >下载生成数据</el-button
-                                  >
-                                </el-form-item>
-                              </el-col>
-                            </div>
-                          </el-card>
-                        </div>
-                      </div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="openView = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!--统计功能表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="680px"
-    >
-      <el-form
-        ref="formCount"
-        :inline="true"
-        :rules="rules"
-        :model="formCount"
-        size="mini"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="选择版本" required />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="versionValue">
-              <el-select
-                v-model="formCount.versionValue"
-                size="medium"
-                clearable
-                style="width: 188px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in versionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="物料组(车型)" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialGroupValue">
-              <el-select
-                v-model="formCount.materialGroupValue"
-                size="medium"
-                collapse-tags
-                multiple
-                filterable
-                clearable
-                @change="valueChange"
-                style="width: 350px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in materialGroupList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP5时间：" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-date-picker
-                v-model="datetime5"
-                type="datetimerange"
-                :picker-options="pickerOptionsCp5"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                :default-time="['00:00:00', '23:59:59']"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP5时间：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="startTime">
-              <el-date-picker
-                v-model="formCount.startTime"
-                type="datetime"
-                size="small"
-                :picker-options="pickerOptions0"
-                @change="getdateValue"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item prop="endTime">
-              <el-date-picker
-                v-model="formCount.endTime"
-                type="datetime"
-                :picker-options="pickerOptions1"
-                size="small"
-                @change="getdateVal"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="KEEN号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="kennCode">
-              <el-input
-                v-model="formCount.kennCode"
-                :rows="5"
-                type="textarea"
-                placeholder="多个KEEN号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="底盘号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="chassisNumber">
-              <el-input
-                v-model="formCount.chassisNumber"
-                :rows="5"
-                type="textarea"
-                placeholder="多个底盘号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialCode">
-              <el-input
-                type="textarea"
-                v-model="formCount.materialCode"
-                :rows="5"
-                placeholder="多个客户零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="sapMaterialCode">
-              <el-input
-                v-model="formCount.sapMaterialCode"
-                :rows="5"
-                type="textarea"
-                placeholder="多个厂内零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
-
-export default {
-  name: "UnsettledDetail",
-  components: { Pagination, CRMTableHead, JobSelectVerson },
-  directives: { permission },
-
-  data() {
-    return {
-      crmType: "backJob",
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
-      JobVersionList: [],
-      getmaterialGroupValue: "",
-      pickerOptionsCp5: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      pickerOptions0: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          //return  time.getTime() >= new Date(this.endTime).getTime();
-          return time.getTime() > new Date(this.endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions1: {
-        disabledDate: (time) => {
-          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
-          return time.getTime() <= new Date(this.startTime).getTime();
-        },
-      },
-      // startTime: "",
-      // endTime: "",
-      pickerOptionsCp7: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      datetime5: [],
-      checkedCities: [0],
-      selectValue: "",
-      selectNameValue: "",
-      radio: "0", //结算状态：0未结 1部分结算
-      versionList: [],
-      materialGroupList: [],
-      JobversionValue: "",
-      JobversionValueVerson: "",
-      // 是否显示详细弹出层
-      openView: false,
-      versionValue: "",
-      materialGroupValue: "",
-      formTitle: "",
-      timer: null, //定时器名称
-      //当前位置
-      activeIndex: 1,
-      //默认显示基本信息
-      activeName: "first",
-      //步骤条步数
-      stepList: [
-        {
-          title: "等待执行",
-          icon: "el-icon-sort",
-        },
-        {
-          title: "执行中",
-          icon: "el-icon-refresh",
-        },
-        {
-          title: "执行完成",
-          icon: "el-icon-check",
-        },
-      ],
-      customerInfos: "",
-      searchContent: "", // 输入内容
-      form: {},
-      formCount: {
-        startTime: "",
-        endTime: "",
-        // name: "未结算对比",
-        // settledate: "",
-        // materialCode: "",
-        // sapMaterialCode: "",
-        // chassisNumber: "",
-        // kennCode: "",
-        // version: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listExportQuery: {
-        version: "",
-        materialCode: undefined,
-        kenncode: undefined,
-        chassisNumber: undefined,
-        materialGroup: undefined,
-        begin: undefined,
-        end: undefined,
-        sapCode: undefined,
-      },
-      listQuery: {
-        taskId: "",
-        name: "",
-        type: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      menuCateMap: [
-        { label: "导出", value: "导出", cssName: "warning" },
-        { label: "消息", value: "消息", cssName: "info" },
-      ],
-      stateNameCateMap: [
-        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
-        { label: "执行中...", value: "Processing", cssName: "primary" },
-        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
-        { label: "等待执行", value: "Scheduled", cssName: "primary" },
-      ],
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-    this.timer = setInterval(() => {
-      this.listQuery.taskId = "";
-      this.listQuery.stateName = "";
-      setTimeout(this.getList, 0);
-    }, 1000 * 15); //15秒刷新一次页面
-    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once("hook:beforeDestroy", () => {
-      clearInterval(timer);
-    });
-    //this.disabledDateCp5();
-  },
-  created() {
-    this.getAllVersionList();
-    this.getMaterialGroup();
-    this.getList();
-    this.getJobVersionInfo();
-    // this.getCurrentMonthFirst();
-    // this.getCurrentMonthLast();
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-  computed: {
-    /* 主表头 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "版本号",
-        prop: "type",
-        width: 85,
-      });
-      tempsTabs.push({
-        label: "单据流水号",
-        prop: "taskId",
-        width: 130,
-      });
-      tempsTabs.push({
-        label: "模块名称",
-        prop: "name",
-        width: 170,
-      });
-      tempsTabs.push({
-        label: "创建人",
-        prop: "email",
-        width: 110,
-      });
-      tempsTabs.push({
-        label: "创建时间",
-        prop: "createdAt",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "说明",
-        prop: "remark",
-        width: 220,
-      });
-      // tempsTabs.push({
-      //   label: "状态",
-      //   prop: "stateName",
-      //   width: 100,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    //批量删除
-    handleDelete(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/Job/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.JobversionValue = params.value;
-      this.getList();
-    },
-    getJobVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
-        .then((response) => {
-          this.JobVersionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element;
-            options.label = element;
-            this.JobVersionList.push(options);
-          });
-          if (JSON.stringify(this.JobVersionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.JobversionValue = this.JobVersionList[0].value;
-            this.JobversionValueVerson = this.JobVersionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    valueChange(data) {
-      this.getmaterialGroupValue = "";
-      this.getmaterialGroupValue += data + ",";
-      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
-        0,
-        this.getmaterialGroupValue.length - 1
-      );
-    },
-    getdateValue(val) {
-      this.startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateVal(val) {
-      this.endTime = val;
-      this.getbalanceIndexData();
-    },
-
-    getCurrentMonthFirst() {
-      var date = new Date();
-      date.setDate(1);
-      var month = parseInt(date.getMonth() + 1);
-      var day = date.getDate();
-      if (month < 10) month = "0" + month;
-      if (day < 10) day = "0" + day;
-      this.startTime = date.getFullYear() + "-" + month + "-" + day;
-    },
-    getCurrentMonthLast() {
-      var date = new Date();
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      month = month < 10 ? "0" + month : month;
-      var day = new Date(year, month, 0);
-      this.endTime = year + "-" + month + "-" + day.getDate();
-    },
-    handleCheckedCitiesChange(value) {
-      alert(value);
-    },
-
-    getAllVersionList() {
-      this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
-        .then((response) => {
-          this.versionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //获取物料组车型
-    getMaterialGroup() {
-      this.$axios
-        .posts("/api/settleaccount/CodeSetting/list", {
-          project: "物料组",
-          maxResultCount: 1000,
-          skipCount: 0,
-        })
-        .then((response) => {
-          this.materialGroupList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.description;
-            options.label = element.description + "/" + element.value;
-            this.materialGroupList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /* 重置 */
-    resetForm(formName) {
-      this.formCount = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-    },
-    save() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue; //版本
-          if (this.formCount.materialCode != "") {
-            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
-          }
-          if (this.formCount.sapMaterialCode != "") {
-            this.listExportQuery.sapCode = this.formCount.sapMaterialCode; //厂内物料号
-          }
-          if (this.formCount.kennCode != "") {
-            this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
-          }
-          // var getdate5 = JSON.stringify(this.datetime5);
-          // if (getdate5 != "[]") {
-          //   this.listExportQuery.begin = this.datetime5
-          //     ? this.datetime5[0] || undefined
-          //     : undefined;
-          //   this.listExportQuery.end = this.datetime5
-          //     ? this.datetime5[1] || undefined
-          //     : undefined;
-          // } else {
-          //   this.listExportQuery.begin = undefined;
-          //   this.listExportQuery.end = undefined;
-          // }
-          //cp5
-          this.listExportQuery.begin = this.startTime
-            ? this.startTime
-            : undefined;
-          this.listExportQuery.end = this.endTime ? this.endTime : undefined;
-          if (this.formCount.chassisNumber != "") {
-            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
-          }
-          if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
-          }
-
-          console.log(
-            "大众准时化未结明细-导出条件：" +
-              JSON.stringify(this.listExportQuery)
-          );
-          this.$axios
-            .gets(
-              "/api/settleaccount/ReportMakeService/UnsettledDetailReportService-Make",
-              this.listExportQuery
-            )
-            .then((res) => {
-              let taskid = res;
-              if (Number.isInteger(taskid)) {
-                this.$notify({
-                  title: "成功",
-                  message: "任务生成成功！任务号:" + taskid,
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.getList();
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            });
-        }
-      });
-    },
-    handleCreate() {
-      this.$nextTick(() => {
-        this.$refs["formCount"].resetFields();
-      });
-      this.formTitle = "报表统计";
-      this.isEdit = false;
-      this.form = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      this.dialogFormVisible = true;
-    },
-
-    filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
-    },
-    /* 任务详细信息 */
-    handleView(row) {
-      this.listQuery.taskId = row.taskId;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.form = response[0];
-          switch (response[0].stateName) {
-            case "Succeeded":
-            case "Failed":
-              this.activeIndex = 3;
-              break;
-            case "Processing":
-              this.activeIndex = 2;
-              break;
-            case "Enqueued":
-              this.activeIndex = 1;
-              break;
-          }
-          this.openView = true;
-        });
-    },
-    /*  刷新  */
-    refresh() {
-      this.list = [];
-      this.listQuery.taskId = "";
-      this.listQuery.name = "";
-      this.getList();
-    },
-    // 监听筛选项的变化
-    filterChange(filterObj) {
-      console.log(filterObj.actionName);
-      if (filterObj.actionName.length > 0) {
-        console.log("点击筛选");
-      } else {
-        console.log("点击重置");
-      }
-    },
-    /* 导出类型的文件 */
-    downloadErrData(param) {
-      this.listLoading = true;
-      let fileNameOfProject = param;
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
-    },
-    /* 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /* 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "stateName") {
-        return {
-          Succeeded: "执行完成(成功)",
-          Processing: "执行中...",
-          Failed: "执行完成(失败)",
-          Enqueued: "等待执行",
-        }[row[column.property]];
-      }
-      if (column.property == "createdAt") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    handleDownload(row) {
-      if (row.stateName == "Succeeded") {
-        this.downloadErrData(row.downFileName);
-      } else if (row.stateName == "Failed") {
-        this.downloadErrData(row.error);
-      }
-    },
-    getList() {
-      this.listLoading = true;
-      //导入界面中超链接过来的参数
-      this.listQuery.name = "大众准时化未结明细表";
-      this.listQuery.type = this.JobversionValue;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    // fetchData(id) {
-    //   //循环动态，取客户名称
-    //   this.$axios
-    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-    //     .then((response) => {
-    //       this.form = response;
-    //     });
-    // },
-    resetQuery() {},
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      var item = this.list[rowIndex];
-      if (column.property === "stateName") {
-        if (item.stateName === "Succeeded") {
-          return { color: "#71d87f", cursor: "pointer" };
-        } else if (item.stateName === "Processing") {
-          return { color: "#d87171", cursor: "pointer" };
-        } else if (item.stateName === "Failed") {
-          return { color: "#ff5640", cursor: "pointer" };
-        }
-      }
-      return { textAlign: "left" };
-      //}
-    },
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "stateName") {
-        return { textAlign: "center" };
-      }
-      return { textAlign: "center" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-@import "../../styles/steps.scss";
-
-/deep/ .el-checkbox input:focus {
-  outline: none !important;
-  border-color: gray;
-  border: 0px;
-  box-shadow: none !important;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/ux/billManage/KanbanUnSettled/index.vue b/code/WebApp/vue/src/views/ux/billManage/KanbanUnSettled/index.vue
deleted file mode 100644
index 1bc667e9..00000000
--- a/code/WebApp/vue/src/views/ux/billManage/KanbanUnSettled/index.vue
+++ /dev/null
@@ -1,1053 +0,0 @@
-<!--大众看板未结明细-->
-<template>
-  <div class="cr-body-content">
-    <!--功能栏-->
-    <!-- 搜索 -->
-    <div style="float: left">
-      <flexbox class="content-header">
-        <JobSelectVerson
-          :options="JobVersionList"
-          style="width: 150px; margin-left: -10px"
-          class="search-container"
-          @value-change="JobVersionValue"
-        ></JobSelectVerson>
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleCreate"
-          >统计
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete()"
-          >删除(支持批量)</el-button
-        >
-      </flexbox>
-    </div>
-    <!-- 刷新 -->
-    <div style="float: right">
-      <flexbox class="content-header">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="手动刷新"
-          placement="top"
-        >
-          <el-button
-            size="mini"
-            circle
-            icon="el-icon-refresh"
-            @click="refresh()"
-          />
-        </el-tooltip>
-
-        <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔3分钟进行自动刷新！</span
-        >
-      </flexbox>
-    </div>
-
-    <!--主页面表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @row-click="handleRowClick"
-      @selection-change="handleSelectionChange"
-      @filter-change="filterChange"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-
-      <!-- 操作名称 -->
-      <!-- <el-table-column
-        prop="actionName"
-        label="操作名称(单击箭头过滤)"
-        width="165"
-        column-key="actionName"
-        :filters="[
-          { text: '导出', value: '导出' },
-          { text: '消息', value: '消息' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <div align="center">
-            <el-tag
-              v-for="(item, index) in menuCateMap"
-              v-show="scope.row.actionName == item.value"
-              :key="index"
-              :type="item.cssName"
-            >
-              {{ item.label }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column> -->
-      <!-- 状态 -->
-      <el-table-column
-        prop="stateName"
-        label="状态(单击箭头过滤)"
-        width="165"
-        column-key="stateName"
-        align="center"
-        :filters="[
-          { text: '执行完成(任务成功)', value: 'Succeeded' },
-          { text: '执行完成(任务失败)', value: 'Failed' },
-          { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: 'Scheduled' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            v-for="(item, index) in stateNameCateMap"
-            v-show="scope.row.stateName == item.value"
-            :key="index"
-            :type="item.cssName"
-          >
-            {{ item.label }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="250">
-        <template slot-scope="scope">
-          <div align="center">
-            <!-- <el-button
-              v-if="scope.row.actionName == '导出'"
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            > -->
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.stateName == 'Succeeded' &&
-                scope.row.downFileName != ''
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            >
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.error != '' &&
-                scope.row.stateName == 'Succeeded'
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >检验失败，下载</el-button
-            >
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-    <div class="table-footer">
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-
-    <!--统计功能表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="680px"
-    >
-      <el-form
-        ref="formCount"
-        :inline="true"
-        :rules="rules"
-        :model="formCount"
-        size="mini"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="选择版本" required />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="versionValue">
-              <el-select
-                v-model="formCount.versionValue"
-                size="medium"
-                clearable
-                style="width: 188px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in versionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="物料组(车型)" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialGroupValue">
-              <el-select
-                v-model="formCount.materialGroupValue"
-                size="medium"
-                multiple
-                filterable
-                clearable
-                style="width: 380px; margin-right: 15px"
-                @change="valueChange"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in materialGroupList"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value"
-                >
-                  <span style="float: left">{{ item.label }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                    item.value
-                  }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="日期查询：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="startTime">
-              <el-date-picker
-                v-model="formCount.startTime"
-                type="datetime"
-                size="small"
-                :picker-options="pickerOptions0"
-                @change="getdateValue"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item prop="endTime">
-              <el-date-picker
-                v-model="formCount.endTime"
-                type="datetime"
-                :picker-options="pickerOptions1"
-                size="small"
-                @change="getdateVal"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!--<el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialCode">
-              <el-input
-                type="textarea"
-                v-model="formCount.materialCode"
-                :rows="5"
-                style="width: 450px"
-                placeholder="多个客户零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-         <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="看板号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-input
-                type="textarea"
-                style="width: 170px"
-                v-model="formCount.kanBan"
-                :rows="5"
-                placeholder="多个看板号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="materialCode">
-              <el-input
-                type="textarea"
-                v-model="formCount.materialCode"
-                :rows="5"
-                style="width: 170px"
-                placeholder="多个客户零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="sapMaterialCode">
-              <el-input
-                v-model="formCount.sapMaterialCode"
-                :rows="5"
-                style="width: 450px"
-                type="textarea"
-                placeholder="多个厂内零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-input v-model="formCount.materialCode" />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item>
-              <el-input v-model="formCount.sapMaterialCode" />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
-
-export default {
-  name: "KanbanUnSettled",
-  components: { Pagination, CRMTableHead, JobSelectVerson },
-  directives: { permission },
-
-  data() {
-    return {
-      crmType: "backJob",
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
-      pickerOptionsCp5: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      pickerOptions0: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          //return  time.getTime() >= new Date(this.endTime).getTime();
-          return time.getTime() > new Date(this.endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions1: {
-        disabledDate: (time) => {
-          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
-          return time.getTime() <= new Date(this.startTime).getTime();
-        },
-      },
-      startTime: "",
-      endTime: "",
-      pickerOptionsCp7: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      datetime5: [],
-      datetime7: [],
-      checkedCities: [0],
-      JobVersionList: [],
-      getmaterialGroupValue: "",
-      selectValue: "",
-      selectNameValue: "",
-      radio: "0", //结算状态：0未结 1部分结算
-      versionList: [],
-      materialGroupList: [],
-      // 是否显示详细弹出层
-      openView: false,
-      versionValue: "",
-      materialGroupValue: "",
-      formTitle: "",
-      timer: null, //定时器名称
-      //当前位置
-      activeIndex: 1,
-      //默认显示基本信息
-      activeName: "first",
-      //步骤条步数
-      stepList: [
-        {
-          title: "等待执行",
-          icon: "el-icon-sort",
-        },
-        {
-          title: "执行中",
-          icon: "el-icon-refresh",
-        },
-        {
-          title: "执行完成",
-          icon: "el-icon-check",
-        },
-      ],
-      listBillQuery: {
-        version: "",
-        guids: [],
-      },
-      customerInfos: "",
-      searchContent: "", // 输入内容
-      JobversionValue: "",
-      JobversionValueVerson: "",
-      form: {},
-      formCount: {
-        name: "未结算对比",
-        // datetime5: [],
-        // datetime7: [],
-        kanBan: "", //看板
-        settledate: "",
-        materialCode: "", //客户物料号
-        sapMaterialCode: "", //厂内物料号
-        chassisNumber: "",
-        kennCode: "",
-        version: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listExportQuery: {
-        version: undefined,
-        kanBan: undefined, //看板
-        customerPartCode: undefined, //客户物料号
-        sapMaterialCode: undefined, //厂内物料号
-        cp7begin: undefined,
-        cp7end: undefined,
-        kenncode: undefined,
-        chassisNumber: undefined,
-        estimateTypeDesc: undefined, //物料组车型
-        begin: undefined,
-        end: undefined,
-      },
-      listQuery: {
-        taskId: "",
-        name: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      menuCateMap: [
-        { label: "导出", value: "导出", cssName: "warning" },
-        { label: "消息", value: "消息", cssName: "info" },
-      ],
-      stateNameCateMap: [
-        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
-        { label: "执行中...", value: "Processing", cssName: "primary" },
-        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
-        { label: "等待执行", value: "Scheduled", cssName: "primary" },
-      ],
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-    this.timer = setInterval(() => {
-      this.listQuery.taskId = "";
-      this.listQuery.stateName = "";
-      setTimeout(this.getList, 0);
-    }, 1000 * 180); //30秒刷新一次页面
-    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once("hook:beforeDestroy", () => {
-      clearInterval(timer);
-    });
-    //this.disabledDateCp5();
-  },
-  created() {
-    this.getAllVersionList();
-    this.getMaterialGroup();
-    this.getList();
-    this.getJobVersionInfo();
-    // this.getCurrentMonthFirst();
-    // this.getCurrentMonthLast();
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-  computed: {
-    /* 主表头 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "版本号",
-        prop: "type",
-        width: 85,
-      });
-      tempsTabs.push({
-        label: "单据流水号",
-        prop: "taskId",
-        width: 120,
-      });
-      // tempsTabs.push({
-      //   label: "模块名称",
-      //   prop: "name",
-      //   width: 170,
-      // });
-      tempsTabs.push({
-        label: "创建人",
-        prop: "email",
-        width: 110,
-      });
-      tempsTabs.push({
-        label: "创建时间",
-        prop: "createdAt",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "说明",
-        prop: "remark",
-        width: 220,
-      });
-      tempsTabs.push({
-        label: "审批状态",
-        prop: "fileName",
-        width: 350,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    //批量删除
-    handleDelete(row) {
-      this.isEdit = false;
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      } else {
-        var getbillNum = "";
-        //判断已经生成出库单的不能执行删除操作
-        this.multipleSelection.forEach((element) => {
-          let state = element.fileName;
-          if (state != "" && state != "已确认") {
-            this.isEdit = true;
-            getbillNum += state + ",";
-          }
-        });
-      }
-      if (this.isEdit == true) {
-        this.$message({
-          message:
-            "已经生成出库单的不能删除！单号：" +
-            getbillNum.substr(0, getbillNum.length - 1),
-          type: "warning",
-        });
-        return;
-      } else {
-        var params = [];
-        let myalert = ""; //声明变量，其变量必须在此声明后使用
-        if (row) {
-          //单行
-          params.push(row.id);
-          myalert = row.name;
-        } else {
-          //多选
-          this.multipleSelection.forEach((element) => {
-            let id = element.id;
-            params.push(id);
-          });
-          myalert = "选中项";
-        }
-        this.$confirm("是否删除" + myalert + "?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.$axios
-              .posts("/api/settleaccount/Job/delete", params)
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.$notify({
-                  title: "成功",
-                  message: "删除成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getList();
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消操作",
-            });
-          });
-      }
-    },
-    valueChange(data) {
-      this.getmaterialGroupValue = "";
-      this.getmaterialGroupValue += data + ",";
-      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
-        0,
-        this.getmaterialGroupValue.length - 1
-      );
-    },
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.JobversionValue = params.value;
-      this.getList();
-    },
-    getJobVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
-        .then((response) => {
-          this.JobVersionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element;
-            options.label = element;
-            this.JobVersionList.push(options);
-          });
-          if (JSON.stringify(this.JobVersionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.JobversionValue = this.JobVersionList[0].value;
-            this.JobversionValueVerson = this.JobVersionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    getdateValue(val) {
-      this.startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateVal(val) {
-      this.endTime = val;
-      this.getbalanceIndexData();
-    },
-
-    getCurrentMonthFirst() {
-      var date = new Date();
-      date.setDate(1);
-      var month = parseInt(date.getMonth() + 1);
-      var day = date.getDate();
-      if (month < 10) month = "0" + month;
-      if (day < 10) day = "0" + day;
-      this.startTime = date.getFullYear() + "-" + month + "-" + day;
-    },
-    getCurrentMonthLast() {
-      var date = new Date();
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      month = month < 10 ? "0" + month : month;
-      var day = new Date(year, month, 0);
-      this.endTime = year + "-" + month + "-" + day.getDate();
-    },
-    handleCheckedCitiesChange(value) {
-      alert(value);
-    },
-
-    getAllVersionList() {
-      this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
-        .then((response) => {
-          this.versionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //获取物料组车型
-    getMaterialGroup() {
-      this.$axios
-        .posts("/api/settleaccount/CodeSetting/list", {
-          project: "物料组",
-          maxResultCount: 1000,
-          skipCount: 0,
-          sorting: "value ascending",
-        })
-        .then((response) => {
-          this.materialGroupList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.description;
-            options.label = element.value;
-            this.materialGroupList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /* 重置 */
-    resetForm(formName) {
-      this.formCount = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      // this.datetime7 = [];
-    },
-    save() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue; //版本
-          // if (this.formCount.kanBan != "") {
-          //   this.listExportQuery.kanBan = this.formCount.kanBan; //看板
-          // }
-          // if (this.formCount.materialCode != "") {
-          //   this.listExportQuery.customerPartCode = this.formCount.materialCode; //物料号
-          // }
-          if (this.formCount.sapMaterialCode != "") {
-            this.listExportQuery.sapMaterialCode =
-              this.formCount.sapMaterialCode; //厂内物料号
-          }
-          if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
-          }
-          this.listExportQuery.begin = this.startTime
-            ? this.startTime
-            : undefined;
-          this.listExportQuery.end = this.endTime ? this.endTime : undefined;
-          console.log(
-            "大众看板未结明细-导出条件：" +
-              JSON.stringify(this.listExportQuery)
-          );
-          this.$axios
-            .posts(
-              "/api/settleaccount/ReportMakeService/KanbanUnSettledExport",
-              this.listExportQuery
-            )
-            .then((res) => {
-              let taskid = res;
-              if (Number.isInteger(taskid)) {
-                this.$notify({
-                  title: "成功",
-                  message: "任务生成成功！任务号:" + taskid,
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.getList();
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            });
-        }
-      });
-    },
-    handleCreate() {
-      // this.$nextTick(() => {
-      //   this.$refs["formCount"].resetFields();
-      // });
-      if (this.$refs["formCount"] !== undefined) {
-        this.$refs["formCount"].resetFields();
-      }
-      this.formTitle = "报表统计";
-      this.isEdit = false;
-      this.form = {};
-      this.dialogFormVisible = true;
-    },
-    filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
-    },
-    /* 任务详细信息 */
-    handleView(row) {
-      this.listQuery.taskId = row.taskId;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.form = response[0];
-          switch (response[0].stateName) {
-            case "Succeeded":
-            case "Failed":
-              this.activeIndex = 3;
-              break;
-            case "Processing":
-              this.activeIndex = 2;
-              break;
-            case "Enqueued":
-              this.activeIndex = 1;
-              break;
-          }
-          this.openView = true;
-        });
-    },
-    /*  刷新  */
-    refresh() {
-      this.list = [];
-      this.listQuery.taskId = "";
-      this.listQuery.name = "";
-      this.getList();
-    },
-    // 监听筛选项的变化
-    filterChange(filterObj) {
-      console.log(filterObj.actionName);
-      if (filterObj.actionName.length > 0) {
-        console.log("点击筛选");
-      } else {
-        console.log("点击重置");
-      }
-    },
-    /* 导出类型的文件 */
-    downloadErrData(param) {
-      this.listLoading = true;
-      let fileNameOfProject = param;
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
-    },
-    /* 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /* 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "stateName") {
-        return {
-          Succeeded: "执行完成(成功)",
-          Processing: "执行中...",
-          Failed: "执行完成(失败)",
-          Enqueued: "等待执行",
-        }[row[column.property]];
-      }
-      if (column.property == "createdAt") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    handleDownload(row) {
-      if (row.stateName == "Succeeded") {
-        this.downloadErrData(row.downFileName);
-      } else if (row.stateName == "Failed") {
-        this.downloadErrData(row.error);
-      }
-    },
-    getList() {
-      this.listLoading = true;
-      //导入界面中超链接过来的参数
-      this.listQuery.name = "看板未结明细";
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    // fetchData(id) {
-    //   //循环动态，取客户名称
-    //   this.$axios
-    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-    //     .then((response) => {
-    //       this.form = response;
-    //     });
-    // },
-    resetQuery() {},
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      var item = this.list[rowIndex];
-      if (column.property === "fileName") {
-        if (item.fileName === "已确认") {
-          return { color: "#13CE66", cursor: "pointer", fontWeight: 700 };
-        } else {
-          return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 };
-        }
-      }
-      return { textAlign: "left" };
-      //}
-    },
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "stateName") {
-        return { textAlign: "center" };
-      }
-      return { textAlign: "center" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-@import "../../styles/steps.scss";
-
-/deep/ .el-checkbox input:focus {
-  outline: none !important;
-  border-color: gray;
-  border: 0px;
-  box-shadow: none !important;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/ux/billManage/SettleDoorPanel/index.vue b/code/WebApp/vue/src/views/ux/billManage/SettleDoorPanel/index.vue
deleted file mode 100644
index c810301d..00000000
--- a/code/WebApp/vue/src/views/ux/billManage/SettleDoorPanel/index.vue
+++ /dev/null
@@ -1,1235 +0,0 @@
-<!--准时化结算门板价格差异-->
-<template>
-  <div class="cr-body-content">
-    <!--功能栏-->
-    <!-- 搜索 -->
-    <div style="float: left">
-      <flexbox class="content-header">
-        <JobSelectVerson
-          :options="JobVersionList"
-          style="width: 150px; margin-left: -10px"
-          class="search-container"
-          @value-change="JobVersionValue"
-        ></JobSelectVerson>
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleCreate"
-          >统计
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete()"
-          >删除(支持批量)</el-button
-        >
-      </flexbox>
-    </div>
-    <!-- 刷新 -->
-    <div style="float: right">
-      <flexbox class="content-header">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="手动刷新"
-          placement="top"
-        >
-          <el-button
-            size="mini"
-            circle
-            icon="el-icon-refresh"
-            @click="refresh()"
-          />
-        </el-tooltip>
-
-        <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
-        >
-      </flexbox>
-    </div>
-
-    <!--主页面表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @row-click="handleRowClick"
-      @selection-change="handleSelectionChange"
-      @filter-change="filterChange"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-
-      <!-- 操作名称 -->
-      <el-table-column
-        prop="actionName"
-        label="操作名称(单击箭头过滤)"
-        width="165"
-        column-key="actionName"
-        :filters="[
-          { text: '导出', value: '导出' },
-          { text: '消息', value: '消息' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <div align="center">
-            <el-tag
-              v-for="(item, index) in menuCateMap"
-              v-show="scope.row.actionName == item.value"
-              :key="index"
-              :type="item.cssName"
-            >
-              {{ item.label }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column>
-      <!-- 状态 -->
-      <el-table-column
-        prop="stateName"
-        label="状态(单击箭头过滤)"
-        width="165"
-        column-key="stateName"
-        align="center"
-        :filters="[
-          { text: '执行完成(任务成功)', value: 'Succeeded' },
-          { text: '执行完成(任务失败)', value: 'Failed' },
-          { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: 'Scheduled' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            v-for="(item, index) in stateNameCateMap"
-            v-show="scope.row.stateName == item.value"
-            :key="index"
-            :type="item.cssName"
-          >
-            {{ item.label }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="250">
-        <template slot-scope="scope">
-          <div align="center">
-            <!-- <el-button
-              v-if="scope.row.actionName == '导出'"
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            > -->
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.stateName == 'Succeeded' &&
-                scope.row.downFileName != ''
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            >
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.error != '' &&
-                scope.row.stateName == 'Succeeded'
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >检验失败，下载</el-button
-            >
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-    <div class="table-footer">
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-
-    <!-- 任务日志详细 -->
-    <el-dialog
-      title="任务详细"
-      :visible.sync="openView"
-      width="700px"
-      append-to-body
-    >
-      <el-form ref="form" :model="form" label-width="120px" size="mini">
-        <el-row>
-          <el-col :span="24">
-            <div class="overall">
-              <!-- 步骤条 -->
-              <div class="steps-box">
-                <ul class="steps">
-                  <li
-                    v-for="(item, index) in stepList"
-                    :key="index"
-                    :class="{ active: activeIndex - 1 === index }"
-                  >
-                    <p :class="{ li_active: activeIndex > index }">
-                      <i :class="item.icon"></i>
-                    </p>
-                    <div
-                      class="text"
-                      :class="{ li_active: activeIndex > index }"
-                    >
-                      {{ item.title }}
-                    </div>
-                  </li>
-                </ul>
-              </div>
-              <!-- 步骤条对应内容 -->
-              <div class="Article-content">
-                <el-tabs v-model="activeName">
-                  <el-tab-pane label="基本信息" name="first">
-                    <div class="dialog-body">
-                      <div
-                        class="content"
-                        v-for="(item, index) in stepList"
-                        :key="index"
-                        v-show="activeIndex == index + 1"
-                      >
-                        <div>
-                          <el-card style="height: 300px; margin: 2px">
-                            <div
-                              v-if="activeIndex == 1"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：等待执行</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 2"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：执行中...</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 3"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <div id="chatarea">
-                                <div
-                                  style="display: inline; color: #71d87f"
-                                  v-if="form.stateName == 'Succeeded'"
-                                >
-                                  执行结果：执行成功
-                                </div>
-                                <div
-                                  style="display: inline; color: #ff5640"
-                                  v-else-if="form.stateName == 'Failed'"
-                                >
-                                  执行结果：执行失败
-                                </div>
-                              </div>
-                            </div>
-                            <div>
-                              <el-col :span="12">
-                                <el-form-item label="模块名称：">{{
-                                  form.name
-                                }}</el-form-item>
-                                <el-form-item label="操作名称：">{{
-                                  form.actionName
-                                }}</el-form-item>
-                              </el-col>
-                              <el-col :span="12">
-                                <el-form-item label="创建人：">{{
-                                  form.creator
-                                }}</el-form-item>
-                                <el-form-item label="创建时间：">
-                                  <el-date-picker
-                                    value-format="yyyy-MM-dd hh:mm:ss"
-                                    format="yyyy-MM-dd hh:mm:ss"
-                                    v-model="form.createdAt"
-                                    type="date"
-                                    class="picker"
-                                    disabled
-                                  ></el-date-picker>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="24">
-                                <el-form-item
-                                  label="异常信息："
-                                  style="color: #ff5640"
-                                  v-if="form.stateName == 'Failed'"
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.error)"
-                                    >下载错误数据</el-button
-                                  >
-                                </el-form-item>
-                                <el-form-item
-                                  label="生成数据："
-                                  style="color: #ff5640"
-                                  v-else-if="
-                                    form.stateName == 'Succeeded' &&
-                                    form.actionName == '导出'
-                                  "
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.downFileName)"
-                                    >下载生成数据</el-button
-                                  >
-                                </el-form-item>
-                              </el-col>
-                            </div>
-                          </el-card>
-                        </div>
-                      </div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="openView = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!--统计功能表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="680px"
-    >
-      <el-form
-        ref="formCount"
-        :inline="true"
-        :rules="rules"
-        :model="formCount"
-        size="mini"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="选择版本" required />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="versionValue">
-              <el-select
-                v-model="formCount.versionValue"
-                size="medium"
-                clearable
-                style="width: 188px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in versionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="物料组(车型)" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialGroupValue">
-              <el-select
-                v-model="formCount.materialGroupValue"
-                size="medium"
-                collapse-tags
-                multiple
-                filterable
-                clearable
-                @change="valueChange"
-                style="width: 350px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in materialGroupList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP5时间：" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-date-picker
-                v-model="datetime5"
-                type="datetimerange"
-                :picker-options="pickerOptionsCp5"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                :default-time="['00:00:00', '23:59:59']"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP5时间：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-date-picker
-                v-model="cp5startTime"
-                :picker-options="pickerOptions2"
-                type="datetime"
-                size="small"
-                @change="getdateValueCp5"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item>
-              <el-date-picker
-                v-model="cp5endTime"
-                :picker-options="pickerOptions3"
-                type="datetime"
-                size="small"
-                @change="getdateValCp5"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP7时间：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-date-picker
-                v-model="startTime"
-                type="datetime"
-                size="small"
-                :picker-options="pickerOptions0"
-                @change="getdateValue"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item>
-              <el-date-picker
-                v-model="endTime"
-                type="datetime"
-                :picker-options="pickerOptions1"
-                size="small"
-                @change="getdateVal"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="KEEN号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="kennCode">
-              <el-input
-                v-model="formCount.kennCode"
-                :rows="5"
-                type="textarea"
-                placeholder="多个KEEN号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="底盘号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="chassisNumber">
-              <el-input
-                v-model="formCount.chassisNumber"
-                :rows="5"
-                type="textarea"
-                placeholder="多个底盘号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialCode">
-              <el-input
-                type="textarea"
-                v-model="formCount.materialCode"
-                :rows="5"
-                placeholder="多个客户零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="sapMaterialCode">
-              <el-input
-                v-model="formCount.sapMaterialCode"
-                :rows="5"
-                type="textarea"
-                placeholder="多个厂内零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
-
-export default {
-  name: "SettleDoorPanel",
-  components: { Pagination, CRMTableHead, JobSelectVerson },
-  directives: { permission },
-
-  data() {
-    return {
-      crmType: "backJob",
-      JobVersionList: [],
-      getmaterialGroupValue: "",
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
-      JobversionValue: "",
-      JobversionValueVerson: "",
-      pickerOptionsCp5: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      pickerOptions0: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          //return  time.getTime() >= new Date(this.endTime).getTime();
-          return time.getTime() > new Date(this.endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions1: {
-        disabledDate: (time) => {
-          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
-          return time.getTime() <= new Date(this.startTime).getTime();
-        },
-      },
-      pickerOptions2: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          return time.getTime() > new Date(this.cp5endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions3: {
-        disabledDate: (time) => {
-          return time.getTime() <= new Date(this.cp5startTime).getTime();
-        },
-      },
-      startTime: "",
-      endTime: "",
-      cp5startTime: "",
-      cp5endTime: "",
-      pickerOptionsCp7: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      datetime5: [],
-      datetime7: [],
-      checkedCities: [0],
-      selectValue: "",
-      selectNameValue: "",
-      radio: "0", //结算状态：0未结 1部分结算
-      versionList: [],
-      materialGroupList: [],
-      // 是否显示详细弹出层
-      openView: false,
-      versionValue: "",
-      materialGroupValue: "",
-      formTitle: "",
-      timer: null, //定时器名称
-      //当前位置
-      activeIndex: 1,
-      //默认显示基本信息
-      activeName: "first",
-      //步骤条步数
-      stepList: [
-        {
-          title: "等待执行",
-          icon: "el-icon-sort",
-        },
-        {
-          title: "执行中",
-          icon: "el-icon-refresh",
-        },
-        {
-          title: "执行完成",
-          icon: "el-icon-check",
-        },
-      ],
-      customerInfos: "",
-      searchContent: "", // 输入内容
-      form: {},
-      formCount: {
-        startTime: "",
-        endTime: "",
-        cp5startTime: "",
-        cp5endTime: "",
-        materialCode: "",
-        sapMaterialCode: "",
-        chassisNumber: "",
-        kennCode: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listExportQuery: {
-        version: "",
-        materialCode: undefined,
-        cp7begin: undefined,
-        cp7end: undefined,
-        kenncode: undefined,
-        chassisNumber: undefined,
-        materialGroup: undefined,
-        begin: undefined,
-        end: undefined,
-      },
-      listQuery: {
-        taskId: "",
-        name: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      menuCateMap: [
-        { label: "导出", value: "导出", cssName: "warning" },
-        { label: "消息", value: "消息", cssName: "info" },
-      ],
-      stateNameCateMap: [
-        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
-        { label: "执行中...", value: "Processing", cssName: "primary" },
-        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
-        { label: "等待执行", value: "Scheduled", cssName: "primary" },
-      ],
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-    this.timer = setInterval(() => {
-      this.listQuery.taskId = "";
-      this.listQuery.stateName = "";
-      setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
-    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once("hook:beforeDestroy", () => {
-      clearInterval(timer);
-    });
-    //this.disabledDateCp5();
-  },
-  created() {
-    this.getAllVersionList();
-    this.getMaterialGroup();
-    this.getList();
-    this.getJobVersionInfo();
-    // this.getCurrentMonthFirst();
-    // this.getCurrentMonthLast();
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-  computed: {
-    /* 主表头 */
-    getDefaultField() {
-      var tempsTabs = [];
-
-      tempsTabs.push({
-        label: "单据流水号",
-        prop: "taskId",
-        width: 130,
-      });
-      tempsTabs.push({
-        label: "模块名称",
-        prop: "name",
-        width: 170,
-      });
-      tempsTabs.push({
-        label: "创建人",
-        prop: "email",
-        width: 110,
-      });
-      tempsTabs.push({
-        label: "创建时间",
-        prop: "createdAt",
-        width: 150,
-      });
-      // tempsTabs.push({
-      //   label: "操作名称",
-      //   prop: "actionName",
-      //   width: 120,
-      // });
-      // tempsTabs.push({
-      //   label: "状态",
-      //   prop: "stateName",
-      //   width: 100,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    //批量删除
-    handleDelete(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/Job/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    valueChange(data) {
-      this.getmaterialGroupValue = "";
-      this.getmaterialGroupValue += data + ",";
-      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
-        0,
-        this.getmaterialGroupValue.length - 1
-      );
-    },
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.JobversionValue = params.value;
-      this.getList();
-    },
-    getJobVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
-        .then((response) => {
-          this.JobVersionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element;
-            options.label = element;
-            this.JobVersionList.push(options);
-          });
-          if (JSON.stringify(this.JobVersionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.JobversionValue = this.JobVersionList[0].value;
-            this.JobversionValueVerson = this.JobVersionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    //cp7
-    getdateValue(val) {
-      this.startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateVal(val) {
-      this.endTime = val;
-      this.getbalanceIndexData();
-    },
-    //cp5
-    getdateValueCp5(val) {
-      this.cp5startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateValCp5(val) {
-      this.cp5endTime = val;
-      this.getbalanceIndexData();
-    },
-
-    getCurrentMonthFirst() {
-      var date = new Date();
-      date.setDate(1);
-      var month = parseInt(date.getMonth() + 1);
-      var day = date.getDate();
-      if (month < 10) month = "0" + month;
-      if (day < 10) day = "0" + day;
-      this.startTime = date.getFullYear() + "-" + month + "-" + day;
-    },
-    getCurrentMonthLast() {
-      var date = new Date();
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      month = month < 10 ? "0" + month : month;
-      var day = new Date(year, month, 0);
-      this.endTime = year + "-" + month + "-" + day.getDate();
-    },
-    handleCheckedCitiesChange(value) {
-      alert(value);
-    },
-
-    getAllVersionList() {
-      this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
-        .then((response) => {
-          this.versionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //获取物料组车型
-    getMaterialGroup() {
-      this.$axios
-        .posts("/api/settleaccount/CodeSetting/list", {
-          project: "物料组",
-          maxResultCount: 1000,
-          skipCount: 0,
-        })
-        .then((response) => {
-          this.materialGroupList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.description;
-            options.label = element.description + "/" + element.value;
-            this.materialGroupList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /* 重置 */
-    resetForm(formName) {
-      this.formCount = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      this.cp5startTime = "";
-      this.cp5endTime = "";
-    },
-    save() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue; //版本
-          if (this.formCount.materialCode != "") {
-            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
-          }
-          if (this.formCount.sapMaterialCode != "") {
-            this.listExportQuery.sapMaterialCode =
-              this.formCount.sapMaterialCode; //厂内物料号
-          }
-          if (this.formCount.kennCode != "") {
-            this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
-          }
-          this.listExportQuery.begin = this.cp5startTime
-            ? this.cp5startTime
-            : undefined;
-          this.listExportQuery.end = this.cp5endTime
-            ? this.cp5endTime
-            : undefined;
-          if (this.startTime != "") {
-            this.listExportQuery.cp7begin = this.startTime; //CP7开始时间
-          }
-          if (this.endTime != "") {
-            this.listExportQuery.cp7end = this.endTime; //CP5结束日期
-          }
-          if (this.formCount.chassisNumber != "") {
-            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
-          }
-          if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
-          }
-          console.log(
-            "大众准时化结算门板价格差异比对报表-导出条件：" +
-              JSON.stringify(this.listExportQuery)
-          );
-          this.$axios
-            .gets(
-              "/api/settleaccount/ReportMakeService/SettleDoorPanel",
-              this.listExportQuery
-            )
-            .then((res) => {
-              let taskid = res;
-              if (Number.isInteger(taskid)) {
-                this.$notify({
-                  title: "成功",
-                  message: "任务生成成功！任务号:" + taskid,
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.getList();
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            });
-        }
-      });
-    },
-    handleCreate() {
-      this.$nextTick(() => {
-        this.$refs["formCount"].resetFields();
-      });
-      this.formTitle = "报表统计";
-      this.isEdit = false;
-      this.form = {};
-      this.startTime = "";
-      this.endTime = "";
-      this.cp5startTime = "";
-      this.cp5endTime = "";
-      this.dialogFormVisible = true;
-    },
-    filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
-    },
-    /* 任务详细信息 */
-    handleView(row) {
-      this.listQuery.taskId = row.taskId;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.form = response[0];
-          switch (response[0].stateName) {
-            case "Succeeded":
-            case "Failed":
-              this.activeIndex = 3;
-              break;
-            case "Processing":
-              this.activeIndex = 2;
-              break;
-            case "Enqueued":
-              this.activeIndex = 1;
-              break;
-          }
-          this.openView = true;
-        });
-    },
-    /*  刷新  */
-    refresh() {
-      this.list = [];
-      this.listQuery.taskId = "";
-      this.listQuery.name = "";
-      this.getList();
-    },
-    // 监听筛选项的变化
-    filterChange(filterObj) {
-      console.log(filterObj.actionName);
-      if (filterObj.actionName.length > 0) {
-        console.log("点击筛选");
-      } else {
-        console.log("点击重置");
-      }
-    },
-    /* 导出类型的文件 */
-    downloadErrData(param) {
-      this.listLoading = true;
-      let fileNameOfProject = param;
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
-    },
-    /* 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /* 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "stateName") {
-        return {
-          Succeeded: "执行完成(成功)",
-          Processing: "执行中...",
-          Failed: "执行完成(失败)",
-          Enqueued: "等待执行",
-        }[row[column.property]];
-      }
-      if (column.property == "createdAt") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    handleDownload(row) {
-      if (row.stateName == "Succeeded") {
-        this.downloadErrData(row.downFileName);
-      } else if (row.stateName == "Failed") {
-        this.downloadErrData(row.error);
-      }
-    },
-    getList() {
-      this.listLoading = true;
-      //导入界面中超链接过来的参数
-      this.listQuery.name = "大众准时化结算门板价格差异比对报表";
-      this.listQuery.type = this.JobversionValue;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    // fetchData(id) {
-    //   //循环动态，取客户名称
-    //   this.$axios
-    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-    //     .then((response) => {
-    //       this.form = response;
-    //     });
-    // },
-    resetQuery() {},
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      var item = this.list[rowIndex];
-      if (column.property === "stateName") {
-        if (item.stateName === "Succeeded") {
-          return { color: "#71d87f", cursor: "pointer" };
-        } else if (item.stateName === "Processing") {
-          return { color: "#d87171", cursor: "pointer" };
-        } else if (item.stateName === "Failed") {
-          return { color: "#ff5640", cursor: "pointer" };
-        }
-      }
-      return { textAlign: "left" };
-      //}
-    },
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "stateName") {
-        return { textAlign: "center" };
-      }
-      return { textAlign: "center" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-@import "../../styles/steps.scss";
-
-/deep/ .el-checkbox input:focus {
-  outline: none !important;
-  border-color: gray;
-  border: 0px;
-  box-shadow: none !important;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue b/code/WebApp/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue
deleted file mode 100644
index 068ea053..00000000
--- a/code/WebApp/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue
+++ /dev/null
@@ -1,1250 +0,0 @@
-<!--准时化结算数量差异比对-->
-<template>
-  <div class="cr-body-content">
-    <!--功能栏-->
-    <!-- 搜索 -->
-    <div style="float: left">
-      <flexbox class="content-header">
-        <JobSelectVerson
-          :options="JobVersionList"
-          style="width: 150px; margin-left: -10px"
-          class="search-container"
-          @value-change="JobVersionValue"
-        ></JobSelectVerson>
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleCreate"
-          >统计
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete()"
-          >删除(支持批量)</el-button
-        >
-      </flexbox>
-    </div>
-    <!-- 刷新 -->
-    <div style="float: right">
-      <flexbox class="content-header">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="手动刷新"
-          placement="top"
-        >
-          <el-button
-            size="mini"
-            circle
-            icon="el-icon-refresh"
-            @click="refresh()"
-          />
-        </el-tooltip>
-
-        <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔15秒进行自动刷新！</span
-        >
-      </flexbox>
-    </div>
-
-    <!--主页面表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @row-click="handleRowClick"
-      @selection-change="handleSelectionChange"
-      @filter-change="filterChange"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-
-      <!-- 操作名称 -->
-      <el-table-column
-        prop="actionName"
-        label="操作名称(单击箭头过滤)"
-        width="165"
-        column-key="actionName"
-        :filters="[
-          { text: '导出', value: '导出' },
-          { text: '消息', value: '消息' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <div align="center">
-            <el-tag
-              v-for="(item, index) in menuCateMap"
-              v-show="scope.row.actionName == item.value"
-              :key="index"
-              :type="item.cssName"
-            >
-              {{ item.label }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column>
-      <!-- 状态 -->
-      <el-table-column
-        prop="stateName"
-        label="状态(单击箭头过滤)"
-        width="165"
-        column-key="stateName"
-        align="center"
-        :filters="[
-          { text: '执行完成(任务成功)', value: 'Succeeded' },
-          { text: '执行完成(任务失败)', value: 'Failed' },
-          { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: 'Scheduled' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            v-for="(item, index) in stateNameCateMap"
-            v-show="scope.row.stateName == item.value"
-            :key="index"
-            :type="item.cssName"
-          >
-            {{ item.label }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="250">
-        <template slot-scope="scope">
-          <div align="center">
-            <!-- <el-button
-              v-if="scope.row.actionName == '导出'"
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            > -->
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.stateName == 'Succeeded' &&
-                scope.row.downFileName != ''
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            >
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.error != '' &&
-                scope.row.stateName == 'Succeeded'
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >检验失败，下载</el-button
-            >
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-    <div class="table-footer">
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-
-    <!-- 任务日志详细 -->
-    <el-dialog
-      title="任务详细"
-      :visible.sync="openView"
-      width="700px"
-      append-to-body
-    >
-      <el-form ref="form" :model="form" label-width="120px" size="mini">
-        <el-row>
-          <el-col :span="24">
-            <div class="overall">
-              <!-- 步骤条 -->
-              <div class="steps-box">
-                <ul class="steps">
-                  <li
-                    v-for="(item, index) in stepList"
-                    :key="index"
-                    :class="{ active: activeIndex - 1 === index }"
-                  >
-                    <p :class="{ li_active: activeIndex > index }">
-                      <i :class="item.icon"></i>
-                    </p>
-                    <div
-                      class="text"
-                      :class="{ li_active: activeIndex > index }"
-                    >
-                      {{ item.title }}
-                    </div>
-                  </li>
-                </ul>
-              </div>
-              <!-- 步骤条对应内容 -->
-              <div class="Article-content">
-                <el-tabs v-model="activeName">
-                  <el-tab-pane label="基本信息" name="first">
-                    <div class="dialog-body">
-                      <div
-                        class="content"
-                        v-for="(item, index) in stepList"
-                        :key="index"
-                        v-show="activeIndex == index + 1"
-                      >
-                        <div>
-                          <el-card style="height: 300px; margin: 2px">
-                            <div
-                              v-if="activeIndex == 1"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：等待执行</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 2"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：执行中...</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 3"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <div id="chatarea">
-                                <div
-                                  style="display: inline; color: #71d87f"
-                                  v-if="form.stateName == 'Succeeded'"
-                                >
-                                  执行结果：执行成功
-                                </div>
-                                <div
-                                  style="display: inline; color: #ff5640"
-                                  v-else-if="form.stateName == 'Failed'"
-                                >
-                                  执行结果：执行失败
-                                </div>
-                              </div>
-                            </div>
-                            <div>
-                              <el-col :span="12">
-                                <el-form-item label="模块名称：">{{
-                                  form.name
-                                }}</el-form-item>
-                                <el-form-item label="操作名称：">{{
-                                  form.actionName
-                                }}</el-form-item>
-                              </el-col>
-                              <el-col :span="12">
-                                <el-form-item label="创建人：">{{
-                                  form.creator
-                                }}</el-form-item>
-                                <el-form-item label="创建时间：">
-                                  <el-date-picker
-                                    value-format="yyyy-MM-dd hh:mm:ss"
-                                    format="yyyy-MM-dd hh:mm:ss"
-                                    v-model="form.createdAt"
-                                    type="date"
-                                    class="picker"
-                                    disabled
-                                  ></el-date-picker>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="24">
-                                <el-form-item
-                                  label="异常信息："
-                                  style="color: #ff5640"
-                                  v-if="form.stateName == 'Failed'"
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.error)"
-                                    >下载错误数据</el-button
-                                  >
-                                </el-form-item>
-                                <el-form-item
-                                  label="生成数据："
-                                  style="color: #ff5640"
-                                  v-else-if="
-                                    form.stateName == 'Succeeded' &&
-                                    form.actionName == '导出'
-                                  "
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.downFileName)"
-                                    >下载生成数据</el-button
-                                  >
-                                </el-form-item>
-                              </el-col>
-                            </div>
-                          </el-card>
-                        </div>
-                      </div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="openView = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!--统计功能表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="680px"
-    >
-      <el-form
-        ref="formCount"
-        :inline="true"
-        :rules="rules"
-        :model="formCount"
-        size="mini"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="选择版本" required />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="versionValue">
-              <el-select
-                v-model="formCount.versionValue"
-                size="medium"
-                clearable
-                style="width: 188px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in versionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="物料组(车型)" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialGroupValue">
-              <el-select
-                v-model="formCount.materialGroupValue"
-                size="medium"
-                multiple
-                filterable
-                clearable
-                style="width: 380px; margin-right: 15px"
-                @change="valueChange"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in materialGroupList"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value"
-                >
-                  <span style="float: left">{{ item.label }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                    item.value
-                  }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP5时间：" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-date-picker
-                v-model="datetime5"
-                type="datetimerange"
-                :picker-options="pickerOptionsCp5"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                :default-time="['00:00:00', '23:59:59']"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP5时间：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-date-picker
-                v-model="cp5startTime"
-                :picker-options="pickerOptions2"
-                type="datetime"
-                size="small"
-                @change="getdateValueCp5"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item>
-              <el-date-picker
-                v-model="cp5endTime"
-                :picker-options="pickerOptions3"
-                type="datetime"
-                size="small"
-                @change="getdateValCp5"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP7时间：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="startTime">
-              <el-date-picker
-                v-model="formCount.startTime"
-                type="datetime"
-                size="small"
-                :picker-options="pickerOptions0"
-                @change="getdateValue"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item prop="endTime">
-              <el-date-picker
-                v-model="formCount.endTime"
-                type="datetime"
-                :picker-options="pickerOptions1"
-                size="small"
-                @change="getdateVal"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="KEEN号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="kennCode">
-              <el-input
-                v-model="formCount.kennCode"
-                :rows="5"
-                type="textarea"
-                placeholder="多个KEEN号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="底盘号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="chassisNumber">
-              <el-input
-                v-model="formCount.chassisNumber"
-                :rows="5"
-                type="textarea"
-                placeholder="多个底盘号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialCode">
-              <el-input
-                type="textarea"
-                v-model="formCount.materialCode"
-                :rows="5"
-                placeholder="多个客户零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="sapMaterialCode">
-              <el-input
-                v-model="formCount.sapMaterialCode"
-                :rows="5"
-                type="textarea"
-                placeholder="多个厂内零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
-
-export default {
-  name: "UnInvoiceSettledDetailDiff",
-  components: { Pagination, CRMTableHead, JobSelectVerson },
-  directives: { permission },
-
-  data() {
-    return {
-      crmType: "backJob",
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
-      getmaterialGroupValue: "",
-      pickerOptionsCp5: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      pickerOptions0: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          //return  time.getTime() >= new Date(this.endTime).getTime();
-          return time.getTime() > new Date(this.endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions1: {
-        disabledDate: (time) => {
-          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
-          return time.getTime() <= new Date(this.startTime).getTime();
-        },
-      },
-
-      pickerOptions2: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          return time.getTime() > new Date(this.cp5endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions3: {
-        disabledDate: (time) => {
-          return time.getTime() <= new Date(this.cp5startTime).getTime();
-        },
-      },
-      // startTime: "",
-      // endTime: "",
-      pickerOptionsCp7: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      datetime5: [],
-      checkedCities: [0],
-      JobVersionList: [],
-      selectValue: "",
-      selectNameValue: "",
-      radio: "0", //结算状态：0未结 1部分结算
-      versionList: [],
-      materialGroupList: [],
-      // 是否显示详细弹出层
-      openView: false,
-      versionValue: "",
-      materialGroupValue: "",
-      formTitle: "",
-      timer: null, //定时器名称
-      //当前位置
-      activeIndex: 1,
-      //默认显示基本信息
-      activeName: "first",
-      //步骤条步数
-      stepList: [
-        {
-          title: "等待执行",
-          icon: "el-icon-sort",
-        },
-        {
-          title: "执行中",
-          icon: "el-icon-refresh",
-        },
-        {
-          title: "执行完成",
-          icon: "el-icon-check",
-        },
-      ],
-      customerInfos: "",
-      searchContent: "", // 输入内容
-      form: {},
-      formCount: {
-        startTime: "",
-        endTime: "",
-        cp5startTime: "",
-        cp5endTime: "",
-        materialCode: "",
-        sapMaterialCode: "",
-        chassisNumber: "",
-        kennCode: "",
-      },
-      cp5startTime: "",
-      cp5endTime: "",
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listExportQuery: {
-        version: "",
-        materialCode: undefined,
-        cp7begin: undefined,
-        cp7end: undefined,
-        kenncode: undefined,
-        chassisNumber: undefined,
-        materialGroup: undefined,
-        begin: undefined,
-        end: undefined,
-        sapCode: undefined,
-      },
-      listQuery: {
-        taskId: "",
-        name: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      menuCateMap: [
-        { label: "导出", value: "导出", cssName: "warning" },
-        { label: "消息", value: "消息", cssName: "info" },
-      ],
-      stateNameCateMap: [
-        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
-        { label: "执行中...", value: "Processing", cssName: "primary" },
-        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
-        { label: "等待执行", value: "Scheduled", cssName: "primary" },
-      ],
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-    this.timer = setInterval(() => {
-      this.listQuery.taskId = "";
-      this.listQuery.stateName = "";
-      setTimeout(this.getList, 0);
-    }, 1000 * 15); //15秒刷新一次页面
-    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once("hook:beforeDestroy", () => {
-      clearInterval(timer);
-    });
-    //this.disabledDateCp5();
-  },
-  created() {
-    this.getAllVersionList();
-    this.getMaterialGroup();
-    this.getList();
-    this.getJobVersionInfo();
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-  computed: {
-    /* 主表头 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "版本号",
-        prop: "type",
-        width: 85,
-      });
-      tempsTabs.push({
-        label: "单据流水号",
-        prop: "taskId",
-        width: 130,
-      });
-      tempsTabs.push({
-        label: "模块名称",
-        prop: "name",
-        width: 170,
-      });
-      tempsTabs.push({
-        label: "创建人",
-        prop: "email",
-        width: 110,
-      });
-      tempsTabs.push({
-        label: "创建时间",
-        prop: "createdAt",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "说明",
-        prop: "remark",
-        width: 220,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    //批量删除
-    handleDelete(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/Job/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    valueChange(data) {
-      this.getmaterialGroupValue = "";
-      this.getmaterialGroupValue += data + ",";
-      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
-        0,
-        this.getmaterialGroupValue.length - 1
-      );
-    },
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.JobversionValue = params.value;
-      this.getList();
-    },
-    getJobVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
-        .then((response) => {
-          this.JobVersionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element;
-            options.label = element;
-            this.JobVersionList.push(options);
-          });
-          if (JSON.stringify(this.JobVersionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.JobversionValue = this.JobVersionList[0].value;
-            this.JobversionValueVerson = this.JobVersionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    getdateValue(val) {
-      this.startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateVal(val) {
-      this.endTime = val;
-      this.getbalanceIndexData();
-    },
-
-    //cp5
-    getdateValueCp5(val) {
-      this.cp5startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateValCp5(val) {
-      this.cp5endTime = val;
-      this.getbalanceIndexData();
-    },
-
-    getCurrentMonthFirst() {
-      var date = new Date();
-      date.setDate(1);
-      var month = parseInt(date.getMonth() + 1);
-      var day = date.getDate();
-      if (month < 10) month = "0" + month;
-      if (day < 10) day = "0" + day;
-      this.startTime = date.getFullYear() + "-" + month + "-" + day;
-    },
-    getCurrentMonthLast() {
-      var date = new Date();
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      month = month < 10 ? "0" + month : month;
-      var day = new Date(year, month, 0);
-      this.endTime = year + "-" + month + "-" + day.getDate();
-    },
-    handleCheckedCitiesChange(value) {
-      alert(value);
-    },
-
-    getAllVersionList() {
-      this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
-        .then((response) => {
-          this.versionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //获取物料组车型
-    getMaterialGroup() {
-      this.$axios
-        .posts("/api/settleaccount/CodeSetting/list", {
-          project: "物料组",
-          maxResultCount: 1000,
-          skipCount: 0,
-          sorting: "value ascending",
-        })
-        .then((response) => {
-          this.materialGroupList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.description;
-            options.label = element.value;
-            this.materialGroupList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /* 重置 */
-    resetForm(formName) {
-      this.formCount = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      this.cp5startTime = "";
-      this.cp5endTime = "";
-    },
-    // var getdate5 = JSON.stringify(this.datetime5);
-    // if (getdate5 != "[]") {
-    //   this.listExportQuery.begin = this.datetime5
-    //     ? this.datetime5[0] || undefined
-    //     : undefined;
-    //   this.listExportQuery.end = this.datetime5
-    //     ? this.datetime5[1] || undefined
-    //     : undefined;
-    // } else {
-    //   this.listExportQuery.begin = undefined;
-    //   this.listExportQuery.end = undefined;
-    // }
-    save() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue; //版本
-          if (this.formCount.materialCode != "") {
-            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
-          }
-          if (this.formCount.sapMaterialCode != "") {
-            this.listExportQuery.sapCode = this.formCount.sapMaterialCode; //厂内物料号
-          }
-          if (this.formCount.kennCode != "") {
-            this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
-          }
-          //cp5
-          this.listExportQuery.begin = this.cp5startTime
-            ? this.cp5startTime
-            : undefined;
-          this.listExportQuery.end = this.cp5endTime
-            ? this.cp5endTime
-            : undefined;
-          this.listExportQuery.cp7begin = this.startTime
-            ? this.startTime
-            : undefined;
-          this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
-          if (this.formCount.chassisNumber != "") {
-            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
-          }
-          if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
-          }
-          console.log(
-            "准时化结算数量差异比对-导出条件：" +
-              JSON.stringify(this.listExportQuery)
-          );
-          this.$axios
-            .gets(
-              "/api/settleaccount/ReportMakeService/UnInvoiceSettledDetailDiff-Make",
-              this.listExportQuery
-            )
-            .then((res) => {
-              let taskid = res;
-              if (Number.isInteger(taskid)) {
-                this.$notify({
-                  title: "成功",
-                  message: "任务生成成功！任务号:" + taskid,
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.getList();
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            });
-        }
-      });
-    },
-    handleCreate() {
-      this.$nextTick(() => {
-        this.$refs["formCount"].resetFields();
-      });
-      this.formTitle = "报表统计";
-      this.isEdit = false;
-      this.form = {};
-      //this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      this.cp5startTime = "";
-      this.cp5endTime = "";
-      this.dialogFormVisible = true;
-    },
-
-    filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
-    },
-    /* 任务详细信息 */
-    handleView(row) {
-      this.listQuery.taskId = row.taskId;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.form = response[0];
-          switch (response[0].stateName) {
-            case "Succeeded":
-            case "Failed":
-              this.activeIndex = 3;
-              break;
-            case "Processing":
-              this.activeIndex = 2;
-              break;
-            case "Enqueued":
-              this.activeIndex = 1;
-              break;
-          }
-          this.openView = true;
-        });
-    },
-    /*  刷新  */
-    refresh() {
-      this.list = [];
-      this.listQuery.taskId = "";
-      this.listQuery.name = "";
-      this.getList();
-    },
-    // 监听筛选项的变化
-    filterChange(filterObj) {
-      console.log(filterObj.actionName);
-      if (filterObj.actionName.length > 0) {
-        console.log("点击筛选");
-      } else {
-        console.log("点击重置");
-      }
-    },
-    /* 导出类型的文件 */
-    downloadErrData(param) {
-      this.listLoading = true;
-      let fileNameOfProject = param;
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
-    },
-    /* 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /* 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "stateName") {
-        return {
-          Succeeded: "执行完成(成功)",
-          Processing: "执行中...",
-          Failed: "执行完成(失败)",
-          Enqueued: "等待执行",
-        }[row[column.property]];
-      }
-      if (column.property == "createdAt") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    handleDownload(row) {
-      if (row.stateName == "Succeeded") {
-        this.downloadErrData(row.downFileName);
-      } else if (row.stateName == "Failed") {
-        this.downloadErrData(row.error);
-      }
-    },
-    getList() {
-      this.listLoading = true;
-      //导入界面中超链接过来的参数
-      this.listQuery.name = "准时化量差输出";
-      this.listQuery.type = this.JobversionValue;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    // fetchData(id) {
-    //   //循环动态，取客户名称
-    //   this.$axios
-    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-    //     .then((response) => {
-    //       this.form = response;
-    //     });
-    // },
-    resetQuery() {},
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      var item = this.list[rowIndex];
-      if (column.property === "stateName") {
-        if (item.stateName === "Succeeded") {
-          return { color: "#71d87f", cursor: "pointer" };
-        } else if (item.stateName === "Processing") {
-          return { color: "#d87171", cursor: "pointer" };
-        } else if (item.stateName === "Failed") {
-          return { color: "#ff5640", cursor: "pointer" };
-        }
-      }
-      return { textAlign: "left" };
-      //}
-    },
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "stateName") {
-        return { textAlign: "center" };
-      }
-      return { textAlign: "center" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-@import "../../styles/steps.scss";
-
-/deep/ .el-checkbox input:focus {
-  outline: none !important;
-  border-color: gray;
-  border: 0px;
-  box-shadow: none !important;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue b/code/WebApp/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue
deleted file mode 100644
index bfd56ab4..00000000
--- a/code/WebApp/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue
+++ /dev/null
@@ -1,1193 +0,0 @@
-<!--准时化未结差异比对-->
-
-<template>
-  <div class="cr-body-content">
-    <!--功能栏-->
-    <!-- 搜索 -->
-    <div style="float: left">
-      <flexbox class="content-header">
-        <JobSelectVerson
-          :options="JobVersionList"
-          style="width: 150px; margin-left: -10px"
-          class="search-container"
-          @value-change="JobVersionValue"
-        ></JobSelectVerson>
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleCreate"
-          >统计
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete()"
-          >删除(支持批量)</el-button
-        >
-      </flexbox>
-    </div>
-    <!-- 刷新 -->
-    <div style="float: right">
-      <flexbox class="content-header">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="手动刷新"
-          placement="top"
-        >
-          <el-button
-            size="mini"
-            circle
-            icon="el-icon-refresh"
-            @click="refresh()"
-          />
-        </el-tooltip>
-
-        <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔15秒进行自动刷新！</span
-        >
-      </flexbox>
-    </div>
-
-    <!--主页面表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @row-click="handleRowClick"
-      @selection-change="handleSelectionChange"
-      @filter-change="filterChange"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-
-      <!-- 操作名称 -->
-      <el-table-column
-        prop="actionName"
-        label="操作名称(单击箭头过滤)"
-        width="165"
-        column-key="actionName"
-        :filters="[
-          { text: '导出', value: '导出' },
-          { text: '消息', value: '消息' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <div align="center">
-            <el-tag
-              v-for="(item, index) in menuCateMap"
-              v-show="scope.row.actionName == item.value"
-              :key="index"
-              :type="item.cssName"
-            >
-              {{ item.label }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column>
-      <!-- 状态 -->
-      <el-table-column
-        prop="stateName"
-        label="状态(单击箭头过滤)"
-        width="165"
-        column-key="stateName"
-        align="center"
-        :filters="[
-          { text: '执行完成(任务成功)', value: 'Succeeded' },
-          { text: '执行完成(任务失败)', value: 'Failed' },
-          { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: 'Scheduled' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            v-for="(item, index) in stateNameCateMap"
-            v-show="scope.row.stateName == item.value"
-            :key="index"
-            :type="item.cssName"
-          >
-            {{ item.label }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="250">
-        <template slot-scope="scope">
-          <div align="center">
-            <!-- <el-button
-              v-if="scope.row.actionName == '导出'"
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            > -->
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.stateName == 'Succeeded' &&
-                scope.row.downFileName != ''
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            >
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.error != '' &&
-                scope.row.stateName == 'Succeeded'
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >检验失败，下载</el-button
-            >
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-    <div class="table-footer">
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-
-    <!-- 任务日志详细 -->
-    <el-dialog
-      title="任务详细"
-      :visible.sync="openView"
-      width="700px"
-      append-to-body
-    >
-      <el-form ref="form" :model="form" label-width="120px" size="mini">
-        <el-row>
-          <el-col :span="24">
-            <div class="overall">
-              <!-- 步骤条 -->
-              <div class="steps-box">
-                <ul class="steps">
-                  <li
-                    v-for="(item, index) in stepList"
-                    :key="index"
-                    :class="{ active: activeIndex - 1 === index }"
-                  >
-                    <p :class="{ li_active: activeIndex > index }">
-                      <i :class="item.icon"></i>
-                    </p>
-                    <div
-                      class="text"
-                      :class="{ li_active: activeIndex > index }"
-                    >
-                      {{ item.title }}
-                    </div>
-                  </li>
-                </ul>
-              </div>
-              <!-- 步骤条对应内容 -->
-              <div class="Article-content">
-                <el-tabs v-model="activeName">
-                  <el-tab-pane label="基本信息" name="first">
-                    <div class="dialog-body">
-                      <div
-                        class="content"
-                        v-for="(item, index) in stepList"
-                        :key="index"
-                        v-show="activeIndex == index + 1"
-                      >
-                        <div>
-                          <el-card style="height: 300px; margin: 2px">
-                            <div
-                              v-if="activeIndex == 1"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：等待执行</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 2"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：执行中...</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 3"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <div id="chatarea">
-                                <div
-                                  style="display: inline; color: #71d87f"
-                                  v-if="form.stateName == 'Succeeded'"
-                                >
-                                  执行结果：执行成功
-                                </div>
-                                <div
-                                  style="display: inline; color: #ff5640"
-                                  v-else-if="form.stateName == 'Failed'"
-                                >
-                                  执行结果：执行失败
-                                </div>
-                              </div>
-                            </div>
-                            <div>
-                              <el-col :span="12">
-                                <el-form-item label="模块名称：">{{
-                                  form.name
-                                }}</el-form-item>
-                                <el-form-item label="操作名称：">{{
-                                  form.actionName
-                                }}</el-form-item>
-                              </el-col>
-                              <el-col :span="12">
-                                <el-form-item label="创建人：">{{
-                                  form.creator
-                                }}</el-form-item>
-                                <el-form-item label="创建时间：">
-                                  <el-date-picker
-                                    value-format="yyyy-MM-dd hh:mm:ss"
-                                    format="yyyy-MM-dd hh:mm:ss"
-                                    v-model="form.createdAt"
-                                    type="date"
-                                    class="picker"
-                                    disabled
-                                  ></el-date-picker>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="24">
-                                <el-form-item
-                                  label="异常信息："
-                                  style="color: #ff5640"
-                                  v-if="form.stateName == 'Failed'"
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.error)"
-                                    >下载错误数据</el-button
-                                  >
-                                </el-form-item>
-                                <el-form-item
-                                  label="生成数据："
-                                  style="color: #ff5640"
-                                  v-else-if="
-                                    form.stateName == 'Succeeded' &&
-                                    form.actionName == '导出'
-                                  "
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.downFileName)"
-                                    >下载生成数据</el-button
-                                  >
-                                </el-form-item>
-                              </el-col>
-                            </div>
-                          </el-card>
-                        </div>
-                      </div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="openView = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!--统计功能表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="680px"
-    >
-      <el-form
-        ref="formCount"
-        :inline="true"
-        :rules="rules"
-        :model="formCount"
-        size="mini"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="选择版本" required />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="versionValue">
-              <el-select
-                v-model="formCount.versionValue"
-                size="medium"
-                clearable
-                style="width: 188px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in versionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="物料组(车型)" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialGroupValue">
-              <el-select
-                v-model="formCount.materialGroupValue"
-                size="medium"
-                multiple
-                filterable
-                clearable
-                style="width: 380px; margin-right: 15px"
-                @change="valueChange"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in materialGroupList"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value"
-                >
-                  <span style="float: left">{{ item.label }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                    item.value
-                  }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP5时间：" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-date-picker
-                v-model="datetime5"
-                type="datetimerange"
-                :picker-options="pickerOptionsCp5"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                :default-time="['00:00:00', '23:59:59']"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP5时间：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="startTime">
-              <el-date-picker
-                v-model="formCount.startTime"
-                type="datetime"
-                size="small"
-                :picker-options="pickerOptions0"
-                @change="getdateValue"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item prop="endTime">
-              <el-date-picker
-                v-model="formCount.endTime"
-                type="datetime"
-                :picker-options="pickerOptions1"
-                size="small"
-                @change="getdateVal"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="KEEN号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="kennCode">
-              <el-input
-                type="textarea"
-                v-model="formCount.kennCode"
-                :rows="4"
-                placeholder="多个KENN号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="底盘号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="chassisNumber">
-              <el-input
-                v-model="formCount.chassisNumber"
-                type="textarea"
-                :rows="4"
-                placeholder="多个底盘号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialCode">
-              <el-input
-                v-model="formCount.materialCode"
-                type="textarea"
-                :rows="4"
-                placeholder="多个客户零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="sapMaterialCode">
-              <el-input
-                v-model="formCount.sapMaterialCode"
-                type="textarea"
-                :rows="4"
-                placeholder="多个厂内零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
-
-export default {
-  name: "UnSettleDiffExport",
-  components: { Pagination, CRMTableHead, JobSelectVerson },
-  directives: { permission },
-
-  data() {
-    return {
-      crmType: "backJob",
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
-      pickerOptionsCp5: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      pickerOptions0: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          //return  time.getTime() >= new Date(this.endTime).getTime();
-          return time.getTime() > new Date(this.endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions1: {
-        disabledDate: (time) => {
-          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
-          return time.getTime() <= new Date(this.startTime).getTime();
-        },
-      },
-      // startTime: "",
-      // endTime: "",
-      pickerOptionsCp7: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      datetime5: [],
-      JobVersionList: [],
-      getmaterialGroupValue: "",
-      checkedCities: [0],
-      selectValue: "",
-      selectNameValue: "",
-      radio: "0", //结算状态：0未结 1部分结算
-      versionList: [],
-      materialGroupList: [],
-      // 是否显示详细弹出层
-      openView: false,
-      versionValue: "",
-      materialGroupValue: "",
-      formTitle: "",
-      timer: null, //定时器名称
-      //当前位置
-      activeIndex: 1,
-      //默认显示基本信息
-      activeName: "first",
-      //步骤条步数
-      stepList: [
-        {
-          title: "等待执行",
-          icon: "el-icon-sort",
-        },
-        {
-          title: "执行中",
-          icon: "el-icon-refresh",
-        },
-        {
-          title: "执行完成",
-          icon: "el-icon-check",
-        },
-      ],
-      customerInfos: "",
-      searchContent: "", // 输入内容
-      form: {},
-      formCount: {
-        startTime: "",
-        endTime: "",
-        // name: "未结算对比",
-        // settledate: "",
-        // materialCode: "",
-        // sapMaterialCode: "",
-        // chassisNumber: "",
-        // kennCode: "",
-        // version: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listExportQuery: {
-        version: "",
-        materialCode: undefined,
-        kenncode: undefined,
-        chassisNumber: undefined,
-        materialGroup: undefined,
-        begin: undefined,
-        end: undefined,
-        sapCode: undefined,
-      },
-      listQuery: {
-        taskId: "",
-        name: "",
-      },
-      page: 1,
-      JobversionValue: "",
-      JobversionValueVerson: "",
-      dialogFormVisible: false,
-      multipleSelection: [],
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      menuCateMap: [
-        { label: "导出", value: "导出", cssName: "warning" },
-        { label: "消息", value: "消息", cssName: "info" },
-      ],
-      stateNameCateMap: [
-        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
-        { label: "执行中...", value: "Processing", cssName: "primary" },
-        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
-        { label: "等待执行", value: "Scheduled", cssName: "primary" },
-      ],
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-    this.timer = setInterval(() => {
-      this.listQuery.taskId = "";
-      this.listQuery.stateName = "";
-      setTimeout(this.getList, 0);
-    }, 1000 * 15); //15秒刷新一次页面
-    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once("hook:beforeDestroy", () => {
-      clearInterval(timer);
-    });
-    //this.disabledDateCp5();
-  },
-  created() {
-    this.getAllVersionList();
-    this.getMaterialGroup();
-    this.getList();
-    this.getJobVersionInfo();
-    // this.getCurrentMonthFirst();
-    // this.getCurrentMonthLast();
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-  computed: {
-    /* 主表头 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "版本号",
-        prop: "type",
-        width: 85,
-      });
-      tempsTabs.push({
-        label: "单据流水号",
-        prop: "taskId",
-        width: 130,
-      });
-      tempsTabs.push({
-        label: "模块名称",
-        prop: "name",
-        width: 170,
-      });
-      tempsTabs.push({
-        label: "创建人",
-        prop: "email",
-        width: 110,
-      });
-      tempsTabs.push({
-        label: "创建时间",
-        prop: "createdAt",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "说明",
-        prop: "remark",
-        width: 220,
-      });
-      // tempsTabs.push({
-      //   label: "状态",
-      //   prop: "stateName",
-      //   width: 100,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    //批量删除
-    handleDelete(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/Job/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    valueChange(data) {
-      this.getmaterialGroupValue = "";
-      this.getmaterialGroupValue += data + ",";
-      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
-        0,
-        this.getmaterialGroupValue.length - 1
-      );
-    },
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.JobversionValue = params.value;
-      this.getList();
-    },
-    getJobVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
-        .then((response) => {
-          this.JobVersionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element;
-            options.label = element;
-            this.JobVersionList.push(options);
-          });
-          if (JSON.stringify(this.JobVersionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.JobversionValue = this.JobVersionList[0].value;
-            this.JobversionValueVerson = this.JobVersionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    getdateValue(val) {
-      this.startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateVal(val) {
-      this.endTime = val;
-      this.getbalanceIndexData();
-    },
-
-    getCurrentMonthFirst() {
-      var date = new Date();
-      date.setDate(1);
-      var month = parseInt(date.getMonth() + 1);
-      var day = date.getDate();
-      if (month < 10) month = "0" + month;
-      if (day < 10) day = "0" + day;
-      this.startTime = date.getFullYear() + "-" + month + "-" + day;
-    },
-    getCurrentMonthLast() {
-      var date = new Date();
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      month = month < 10 ? "0" + month : month;
-      var day = new Date(year, month, 0);
-      this.endTime = year + "-" + month + "-" + day.getDate();
-    },
-    handleCheckedCitiesChange(value) {
-      alert(value);
-    },
-
-    getAllVersionList() {
-      this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
-        .then((response) => {
-          this.versionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //获取物料组车型
-    getMaterialGroup() {
-      this.$axios
-        .posts("/api/settleaccount/CodeSetting/list", {
-          project: "物料组",
-          maxResultCount: 1000,
-          skipCount: 0,
-          sorting: "value ascending",
-        })
-        .then((response) => {
-          this.materialGroupList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.description;
-            options.label = element.value;
-            this.materialGroupList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /* 重置 */
-    resetForm(formName) {
-      this.formCount = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-    },
-    save() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue; //版本
-          if (this.formCount.materialCode != "") {
-            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
-          }
-          if (this.formCount.sapMaterialCode != "") {
-            this.listExportQuery.sapCode = this.formCount.sapMaterialCode; //厂内物料号
-          }
-          if (this.formCount.kennCode != "") {
-            this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
-          }
-          //CP5
-          // var getdate5 = JSON.stringify(this.datetime5);
-          // if (getdate5 != "[]") {
-          //   this.listExportQuery.begin = this.datetime5
-          //     ? this.datetime5[0] || undefined
-          //     : undefined;
-          //   this.listExportQuery.end = this.datetime5
-          //     ? this.datetime5[1] || undefined
-          //     : undefined;
-          // } else {
-          //   this.listExportQuery.begin = undefined;
-          //   this.listExportQuery.end = undefined;
-          // }
-          //CP5
-          this.listExportQuery.begin = this.startTime
-            ? this.startTime
-            : undefined;
-          this.listExportQuery.end = this.endTime ? this.endTime : undefined;
-          if (this.formCount.chassisNumber != "") {
-            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
-          }
-          if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
-          }
-
-          console.log(
-            "大众准时化未结差异比结-导出条件：" +
-              JSON.stringify(this.listExportQuery)
-          );
-          this.$axios
-            .gets(
-              "/api/settleaccount/ReportMakeService/UnSettleDiffExport-Make",
-              this.listExportQuery
-            )
-            .then((res) => {
-              let taskid = res;
-              if (Number.isInteger(taskid)) {
-                this.$notify({
-                  title: "成功",
-                  message: "任务生成成功！任务号:" + taskid,
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.getList();
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            });
-        }
-      });
-    },
-    handleCreate() {
-      this.$nextTick(() => {
-        this.$refs["formCount"].resetFields();
-      });
-      this.formTitle = "报表统计";
-      this.isEdit = false;
-      this.form = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      this.dialogFormVisible = true;
-    },
-
-    filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
-    },
-    /* 任务详细信息 */
-    handleView(row) {
-      this.listQuery.taskId = row.taskId;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.form = response[0];
-          switch (response[0].stateName) {
-            case "Succeeded":
-            case "Failed":
-              this.activeIndex = 3;
-              break;
-            case "Processing":
-              this.activeIndex = 2;
-              break;
-            case "Enqueued":
-              this.activeIndex = 1;
-              break;
-          }
-          this.openView = true;
-        });
-    },
-    /*  刷新  */
-    refresh() {
-      this.list = [];
-      this.listQuery.taskId = "";
-      this.listQuery.name = "";
-      this.getList();
-    },
-    // 监听筛选项的变化
-    filterChange(filterObj) {
-      console.log(filterObj.actionName);
-      if (filterObj.actionName.length > 0) {
-        console.log("点击筛选");
-      } else {
-        console.log("点击重置");
-      }
-    },
-    /* 导出类型的文件 */
-    downloadErrData(param) {
-      this.listLoading = true;
-      let fileNameOfProject = param;
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
-    },
-    /* 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /* 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "stateName") {
-        return {
-          Succeeded: "执行完成(成功)",
-          Processing: "执行中...",
-          Failed: "执行完成(失败)",
-          Enqueued: "等待执行",
-        }[row[column.property]];
-      }
-      if (column.property == "createdAt") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    handleDownload(row) {
-      if (row.stateName == "Succeeded") {
-        this.downloadErrData(row.downFileName);
-      } else if (row.stateName == "Failed") {
-        this.downloadErrData(row.error);
-      }
-    },
-    getList() {
-      this.listLoading = true;
-      //导入界面中超链接过来的参数
-      this.listQuery.name = "准时化未结差异比对输出";
-      this.listQuery.type = this.JobversionValue;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    // fetchData(id) {
-    //   //循环动态，取客户名称
-    //   this.$axios
-    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-    //     .then((response) => {
-    //       this.form = response;
-    //     });
-    // },
-    resetQuery() {},
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      var item = this.list[rowIndex];
-      if (column.property === "stateName") {
-        if (item.stateName === "Succeeded") {
-          return { color: "#71d87f", cursor: "pointer" };
-        } else if (item.stateName === "Processing") {
-          return { color: "#d87171", cursor: "pointer" };
-        } else if (item.stateName === "Failed") {
-          return { color: "#ff5640", cursor: "pointer" };
-        }
-      }
-      return { textAlign: "left" };
-      //}
-    },
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "stateName") {
-        return { textAlign: "center" };
-      }
-      return { textAlign: "center" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-@import "../../styles/steps.scss";
-
-/deep/ .el-checkbox input:focus {
-  outline: none !important;
-  border-color: gray;
-  border: 0px;
-  box-shadow: none !important;
-}
-</style>
-
diff --git a/code/WebApp/vue/src/views/ux/billManage/UnSettledDiff/index.vue b/code/WebApp/vue/src/views/ux/billManage/UnSettledDiff/index.vue
deleted file mode 100644
index c3602e58..00000000
--- a/code/WebApp/vue/src/views/ux/billManage/UnSettledDiff/index.vue
+++ /dev/null
@@ -1,1183 +0,0 @@
-<!--发出未结算比对页-->
-<template>
-  <div class="cr-body-content">
-    <!--功能栏-->
-    <!-- 搜索 -->
-    <div style="float: left">
-      <flexbox class="content-header">
-        <JobSelectVerson
-          :options="JobVersionList"
-          style="width: 150px; margin-left: -10px"
-          class="search-container"
-          @value-change="JobVersionValue"
-        ></JobSelectVerson>
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleCreate"
-          >统计
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete()"
-          >删除(支持批量)</el-button
-        >
-      </flexbox>
-    </div>
-    <!-- 刷新 -->
-    <div style="float: right">
-      <flexbox class="content-header">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="手动刷新"
-          placement="top"
-        >
-          <el-button
-            size="mini"
-            circle
-            icon="el-icon-refresh"
-            @click="refresh()"
-          />
-        </el-tooltip>
-
-        <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔15秒进行自动刷新！</span
-        >
-      </flexbox>
-    </div>
-
-    <!--主页面表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-      @filter-change="filterChange"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-
-      <!-- 操作名称 -->
-      <el-table-column
-        prop="actionName"
-        label="操作名称(单击箭头过滤)"
-        width="165"
-        column-key="actionName"
-        :filters="[
-          { text: '导出', value: '导出' },
-          { text: '消息', value: '消息' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <div align="center">
-            <el-tag
-              v-for="(item, index) in menuCateMap"
-              v-show="scope.row.actionName == item.value"
-              :key="index"
-              :type="item.cssName"
-            >
-              {{ item.label }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column>
-      <!-- 状态 -->
-      <el-table-column
-        prop="stateName"
-        label="状态(单击箭头过滤)"
-        width="165"
-        column-key="stateName"
-        align="center"
-        :filters="[
-          { text: '执行完成(任务成功)', value: 'Succeeded' },
-          { text: '执行完成(任务失败)', value: 'Failed' },
-          { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: 'Scheduled' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            v-for="(item, index) in stateNameCateMap"
-            v-show="scope.row.stateName == item.value"
-            :key="index"
-            :type="item.cssName"
-          >
-            {{ item.label }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="250">
-        <template slot-scope="scope">
-          <div align="center">
-            <!-- <el-button
-              v-if="scope.row.actionName == '导出'"
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            > -->
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.stateName == 'Succeeded' &&
-                scope.row.downFileName != ''
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            >
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.error != '' &&
-                scope.row.stateName == 'Succeeded'
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >检验失败，下载</el-button
-            >
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-    <div class="table-footer">
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-
-    <!-- 任务日志详细 -->
-    <el-dialog
-      title="任务详细"
-      :visible.sync="openView"
-      width="700px"
-      append-to-body
-    >
-      <el-form ref="form" :model="form" label-width="120px" size="mini">
-        <el-row>
-          <el-col :span="24">
-            <div class="overall">
-              <!-- 步骤条 -->
-              <div class="steps-box">
-                <ul class="steps">
-                  <li
-                    v-for="(item, index) in stepList"
-                    :key="index"
-                    :class="{ active: activeIndex - 1 === index }"
-                  >
-                    <p :class="{ li_active: activeIndex > index }">
-                      <i :class="item.icon"></i>
-                    </p>
-                    <div
-                      class="text"
-                      :class="{ li_active: activeIndex > index }"
-                    >
-                      {{ item.title }}
-                    </div>
-                  </li>
-                </ul>
-              </div>
-              <!-- 步骤条对应内容 -->
-              <div class="Article-content">
-                <el-tabs v-model="activeName">
-                  <el-tab-pane label="基本信息" name="first">
-                    <div class="dialog-body">
-                      <div
-                        class="content"
-                        v-for="(item, index) in stepList"
-                        :key="index"
-                        v-show="activeIndex == index + 1"
-                      >
-                        <div>
-                          <el-card style="height: 300px; margin: 2px">
-                            <div
-                              v-if="activeIndex == 1"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：等待执行</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 2"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：执行中...</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 3"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <div id="chatarea">
-                                <div
-                                  style="display: inline; color: #71d87f"
-                                  v-if="form.stateName == 'Succeeded'"
-                                >
-                                  执行结果：执行成功
-                                </div>
-                                <div
-                                  style="display: inline; color: #ff5640"
-                                  v-else-if="form.stateName == 'Failed'"
-                                >
-                                  执行结果：执行失败
-                                </div>
-                              </div>
-                            </div>
-                            <div>
-                              <el-col :span="12">
-                                <el-form-item label="模块名称：">{{
-                                  form.name
-                                }}</el-form-item>
-                                <el-form-item label="操作名称：">{{
-                                  form.actionName
-                                }}</el-form-item>
-                              </el-col>
-                              <el-col :span="12">
-                                <el-form-item label="创建人：">{{
-                                  form.creator
-                                }}</el-form-item>
-                                <el-form-item label="创建时间：">
-                                  <el-date-picker
-                                    value-format="yyyy-MM-dd hh:mm:ss"
-                                    format="yyyy-MM-dd hh:mm:ss"
-                                    v-model="form.createdAt"
-                                    type="date"
-                                    class="picker"
-                                    disabled
-                                  ></el-date-picker>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="24">
-                                <el-form-item
-                                  label="异常信息："
-                                  style="color: #ff5640"
-                                  v-if="form.stateName == 'Failed'"
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.error)"
-                                    >下载错误数据</el-button
-                                  >
-                                </el-form-item>
-                                <el-form-item
-                                  label="生成数据："
-                                  style="color: #ff5640"
-                                  v-else-if="
-                                    form.stateName == 'Succeeded' &&
-                                    form.actionName == '导出'
-                                  "
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.downFileName)"
-                                    >下载生成数据</el-button
-                                  >
-                                </el-form-item>
-                              </el-col>
-                            </div>
-                          </el-card>
-                        </div>
-                      </div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="openView = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!--统计功能表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="680px"
-    >
-      <el-form
-        ref="formCount"
-        :inline="true"
-        :rules="rules"
-        :model="formCount"
-        size="mini"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="选择版本" required />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="versionValue">
-              <el-select
-                v-model="formCount.versionValue"
-                size="medium"
-                clearable
-                style="width: 188px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in versionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="物料组(车型)" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialGroupValue">
-              <el-select
-                v-model="formCount.materialGroupValue"
-                size="medium"
-                collapse-tags
-                multiple
-                filterable
-                clearable
-                @change="valueChange"
-                style="width: 350px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in materialGroupList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP5时间：" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-date-picker
-                v-model="datetime5"
-                type="datetimerange"
-                :picker-options="pickerOptionsCp5"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                :default-time="['00:00:00', '23:59:59']"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP5时间：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="startTime">
-              <el-date-picker
-                v-model="formCount.startTime"
-                type="datetime"
-                size="small"
-                :picker-options="pickerOptions0"
-                @change="getdateValue"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item prop="endTime">
-              <el-date-picker
-                v-model="formCount.endTime"
-                type="datetime"
-                :picker-options="pickerOptions1"
-                size="small"
-                @change="getdateVal"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="KEEN号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="kennCode">
-              <el-input
-                v-model="formCount.kennCode"
-                type="textarea"
-                :rows="6"
-                placeholder="多个KENN号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="底盘号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="chassisNumber">
-              <el-input
-                v-model="formCount.chassisNumber"
-                type="textarea"
-                :rows="6"
-                placeholder="多个底盘号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialCode">
-              <el-input
-                v-model="formCount.materialCode"
-                type="textarea"
-                :rows="6"
-                placeholder="多个客户零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="sapMaterialCode">
-              <el-input
-                v-model="formCount.sapMaterialCode"
-                type="textarea"
-                :rows="6"
-                placeholder="多个厂内零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
-
-export default {
-  name: "UnSettledDiff",
-  components: { Pagination, CRMTableHead, JobSelectVerson },
-  directives: { permission },
-
-  data() {
-    return {
-      crmType: "backJob",
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
-      pickerOptionsCp5: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      pickerOptions0: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          //return  time.getTime() >= new Date(this.endTime).getTime();
-          return time.getTime() > new Date(this.endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions1: {
-        disabledDate: (time) => {
-          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
-          return time.getTime() <= new Date(this.startTime).getTime();
-        },
-      },
-      // startTime: "",
-      // endTime: "",
-      pickerOptionsCp7: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      datetime5: [],
-      JobVersionList: [],
-      checkedCities: [0],
-      selectValue: "",
-      selectNameValue: "",
-      getmaterialGroupValue: "",
-      radio: "0", //结算状态：0未结 1部分结算
-      versionList: [],
-      materialGroupList: [],
-      // 是否显示详细弹出层
-      openView: false,
-      versionValue: "",
-      materialGroupValue: "",
-      formTitle: "",
-      timer: null, //定时器名称
-      //当前位置
-      activeIndex: 1,
-      //默认显示基本信息
-      activeName: "first",
-      //步骤条步数
-      stepList: [
-        {
-          title: "等待执行",
-          icon: "el-icon-sort",
-        },
-        {
-          title: "执行中",
-          icon: "el-icon-refresh",
-        },
-        {
-          title: "执行完成",
-          icon: "el-icon-check",
-        },
-      ],
-      customerInfos: "",
-      searchContent: "", // 输入内容
-      form: {},
-      formCount: {
-        startTime: "",
-        endTime: "",
-        // name: "未结算对比",
-        // settledate: "",
-        // materialCode: "",
-        // sapMaterialCode: "",
-        // chassisNumber: "",
-        // kennCode: "",
-        // version: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listExportQuery: {
-        version: "",
-        materialCode: undefined,
-        sapCode: undefined,
-        kenncode: undefined,
-        chassisNumber: undefined,
-        materialGroup: undefined,
-        begin: undefined,
-        end: undefined,
-      },
-      listQuery: {
-        taskId: "",
-        name: "",
-      },
-      page: 1,
-      JobversionValue: "",
-      JobversionValueVerson: "",
-      dialogFormVisible: false,
-      multipleSelection: [],
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      menuCateMap: [
-        { label: "导出", value: "导出", cssName: "warning" },
-        { label: "消息", value: "消息", cssName: "info" },
-      ],
-      stateNameCateMap: [
-        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
-        { label: "执行中...", value: "Processing", cssName: "primary" },
-        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
-        { label: "等待执行", value: "Scheduled", cssName: "primary" },
-      ],
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-    this.timer = setInterval(() => {
-      this.listQuery.taskId = "";
-      this.listQuery.stateName = "";
-      setTimeout(this.getList, 0);
-    }, 1000 * 15); //15秒刷新一次页面
-    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once("hook:beforeDestroy", () => {
-      clearInterval(timer);
-    });
-    //this.disabledDateCp5();
-  },
-  created() {
-    this.getAllVersionList();
-    this.getMaterialGroup();
-    this.getList();
-    this.getJobVersionInfo();
-    // this.getCurrentMonthFirst();
-    // this.getCurrentMonthLast();
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-  computed: {
-    /* 主表头 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "版本号",
-        prop: "type",
-        width: 85,
-      });
-      tempsTabs.push({
-        label: "单据流水号",
-        prop: "taskId",
-        width: 130,
-      });
-      tempsTabs.push({
-        label: "模块名称",
-        prop: "name",
-        width: 170,
-      });
-      tempsTabs.push({
-        label: "创建人",
-        prop: "email",
-        width: 110,
-      });
-      tempsTabs.push({
-        label: "创建时间",
-        prop: "createdAt",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "说明",
-        prop: "remark",
-        width: 220,
-      });
-      // tempsTabs.push({
-      //   label: "状态",
-      //   prop: "stateName",
-      //   width: 100,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    //批量删除
-    handleDelete(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/Job/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    valueChange(data) {
-      this.getmaterialGroupValue = "";
-      this.getmaterialGroupValue += data + ",";
-      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
-        0,
-        this.getmaterialGroupValue.length - 1
-      );
-    },
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.JobversionValue = params.value;
-      this.getList();
-    },
-    getJobVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
-        .then((response) => {
-          this.JobVersionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element;
-            options.label = element;
-            this.JobVersionList.push(options);
-          });
-          if (JSON.stringify(this.JobVersionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.JobversionValue = this.JobVersionList[0].value;
-            this.JobversionValueVerson = this.JobVersionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    getdateValue(val) {
-      this.startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateVal(val) {
-      this.endTime = val;
-      this.getbalanceIndexData();
-    },
-
-    getCurrentMonthFirst() {
-      var date = new Date();
-      date.setDate(1);
-      var month = parseInt(date.getMonth() + 1);
-      var day = date.getDate();
-      if (month < 10) month = "0" + month;
-      if (day < 10) day = "0" + day;
-      this.startTime = date.getFullYear() + "-" + month + "-" + day;
-    },
-    getCurrentMonthLast() {
-      var date = new Date();
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      month = month < 10 ? "0" + month : month;
-      var day = new Date(year, month, 0);
-      this.endTime = year + "-" + month + "-" + day.getDate();
-    },
-    handleCheckedCitiesChange(value) {
-      alert(value);
-    },
-
-    getAllVersionList() {
-      this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
-        .then((response) => {
-          this.versionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //获取物料组车型
-    getMaterialGroup() {
-      this.$axios
-        .posts("/api/settleaccount/CodeSetting/list", {
-          project: "物料组",
-          maxResultCount: 1000,
-          skipCount: 0,
-        })
-        .then((response) => {
-          this.materialGroupList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.description;
-            options.label = element.description + "/" + element.value;
-            this.materialGroupList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /* 重置 */
-    resetForm(formName) {
-      this.formCount = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-    },
-    save() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue; //版本
-          if (this.formCount.materialCode != "") {
-            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
-          }
-          if (this.formCount.sapMaterialCode != "") {
-            this.listExportQuery.sapCode = this.formCount.sapMaterialCode; //厂内物料号
-          }
-          if (this.formCount.kennCode != "") {
-            this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
-          }
-          // var getdate5 = JSON.stringify(this.datetime5);
-          // if (getdate5 != "[]") {
-          //   this.listExportQuery.begin = this.datetime5
-          //     ? this.datetime5[0] || undefined
-          //     : undefined;
-          //   this.listExportQuery.end = this.datetime5
-          //     ? this.datetime5[1] || undefined
-          //     : undefined;
-          // } else {
-          //   this.listExportQuery.begin = undefined;
-          //   this.listExportQuery.end = undefined;
-          // }
-          this.listExportQuery.begin = this.startTime
-            ? this.startTime
-            : undefined;
-          this.listExportQuery.end = this.endTime ? this.endTime : undefined;
-          if (this.formCount.chassisNumber != "") {
-            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
-          }
-          if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
-          }
-
-          console.log(
-            "大众准时化未结比对-导出条件：" +
-              JSON.stringify(this.listExportQuery)
-          );
-          this.$axios
-            .gets(
-              "/api/settleaccount/ReportMakeService/UnSettledDiff-Make",
-              this.listExportQuery
-            )
-            .then((res) => {
-              let taskid = res;
-              if (Number.isInteger(taskid)) {
-                this.$notify({
-                  title: "成功",
-                  message: "任务生成成功！任务号:" + taskid,
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.getList();
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            });
-        }
-      });
-    },
-    handleCreate() {
-      this.$nextTick(() => {
-        this.$refs["formCount"].resetFields();
-      });
-      this.formTitle = "报表统计";
-      this.isEdit = false;
-      this.form = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      this.dialogFormVisible = true;
-    },
-
-    filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
-    },
-    /* 任务详细信息 */
-    handleView(row) {
-      this.listQuery.taskId = row.taskId;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.form = response[0];
-          switch (response[0].stateName) {
-            case "Succeeded":
-            case "Failed":
-              this.activeIndex = 3;
-              break;
-            case "Processing":
-              this.activeIndex = 2;
-              break;
-            case "Enqueued":
-              this.activeIndex = 1;
-              break;
-          }
-          this.openView = true;
-        });
-    },
-    /*  刷新  */
-    refresh() {
-      this.list = [];
-      this.listQuery.taskId = "";
-      this.listQuery.name = "";
-      this.getList();
-    },
-    // 监听筛选项的变化
-    filterChange(filterObj) {
-      console.log(filterObj.actionName);
-      if (filterObj.actionName.length > 0) {
-        console.log("点击筛选");
-      } else {
-        console.log("点击重置");
-      }
-    },
-    /* 导出类型的文件 */
-    downloadErrData(param) {
-      this.listLoading = true;
-      let fileNameOfProject = param;
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
-    },
-    /* 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /* 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "stateName") {
-        return {
-          Succeeded: "执行完成(成功)",
-          Processing: "执行中...",
-          Failed: "执行完成(失败)",
-          Enqueued: "等待执行",
-        }[row[column.property]];
-      }
-      if (column.property == "createdAt") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    handleDownload(row) {
-      if (row.stateName == "Succeeded") {
-        this.downloadErrData(row.downFileName);
-      } else if (row.stateName == "Failed") {
-        this.downloadErrData(row.error);
-      }
-    },
-    getList() {
-      this.listLoading = true;
-      //导入界面中超链接过来的参数
-      this.listQuery.name = "未结算对比";
-      this.listQuery.type = this.JobversionValue;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    // fetchData(id) {
-    //   //循环动态，取客户名称
-    //   this.$axios
-    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-    //     .then((response) => {
-    //       this.form = response;
-    //     });
-    // },
-    resetQuery() {},
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      var item = this.list[rowIndex];
-      if (column.property === "stateName") {
-        if (item.stateName === "Succeeded") {
-          return { color: "#71d87f", cursor: "pointer" };
-        } else if (item.stateName === "Processing") {
-          return { color: "#d87171", cursor: "pointer" };
-        } else if (item.stateName === "Failed") {
-          return { color: "#ff5640", cursor: "pointer" };
-        }
-      }
-      return { textAlign: "left" };
-      //}
-    },
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "stateName") {
-        return { textAlign: "center" };
-      }
-      return { textAlign: "center" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-@import "../../styles/steps.scss";
-
-/deep/ .el-checkbox input:focus {
-  outline: none !important;
-  border-color: gray;
-  border: 0px;
-  box-shadow: none !important;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/ux/billManage/claimDemage/detail.vue b/code/WebApp/vue/src/views/ux/billManage/claimDemage/detail.vue
deleted file mode 100644
index f4d273ed..00000000
--- a/code/WebApp/vue/src/views/ux/billManage/claimDemage/detail.vue
+++ /dev/null
@@ -1,1312 +0,0 @@
-<template>
-  <flexbox direction="column" align="stretch" class="d-container">
-    <div class="crm-create-flex">
-      <!--表单渲染-->
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        width="580px"
-        append-to-body="ture"
-      >
-        <div class="crm-create-body" v-if="stepsActive == 1">
-          <el-form ref="form" :inline="true" size="small" label-width="80px">
-            <el-row>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="上传附件" />
-              </el-col>
-              <el-col :md="20" :xs="24">
-                <el-form-item>
-                  <el-upload
-                    ref="upload"
-                    class="avatar-uploader"
-                    drag
-                    action="#"
-                    :http-request="httpRequestfiles"
-                    :on-change="handleChangefiles"
-                    :headers="httpHeader"
-                    :file-list="fileuploadList"
-                    :before-upload="beforeAvatarUpload"
-                    :before-remove="beforeRemove"
-                    :on-remove="handleRemove"
-                    multiple
-                    :limit="5"
-                    :on-exceed="handleExceedfiles"
-                  >
-                    <i class="el-icon-upload"></i>
-                    <div class="el-upload__text">
-                      将文件拖到此处，或
-                      <em>点击上传</em>
-                    </div>
-                  </el-upload>
-                </el-form-item>
-                <el-form-item>
-                  <div style="margin: 10px; margin-top: 1px">
-                    <span style="color: #ccc; font-size: 13px"
-                      >说明：单个附件大小不能超过2M，单次最多一起上传5个，请上传后缀名为jpg、png、gif、jpeg、txt、pdf、doc、docx、xlsx、zip或rar的附件！!</span
-                    >
-                  </div>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-        <div
-          v-loading="formLoading"
-          v-else-if="stepsActive == 2"
-          element-loading-text="数据上传中,请耐心等待..."
-          element-loading-spinner="el-icon-loading"
-          class="step-section"
-        />
-        <div slot="footer" class="dialog-footer">
-          <el-button
-            v-if="stepsActive == 1"
-            type="text"
-            @click="dialogFormVisible = false"
-            >取消</el-button
-          >
-          <!-- <el-button  type="primary" @click="LoadSave">确认</el-button> -->
-          <el-button v-if="sureTitle" type="primary" @click="sureClick">{{
-            sureTitle
-          }}</el-button>
-        </div>
-      </el-dialog>
-    </div>
-
-    <div class="tabs">
-      <el-row>
-        <div style="margin: 10px; margin-top: 1px">
-          <el-button
-            class="filter-item"
-            size="mini"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleCreate()"
-            >上传附件</el-button
-          >
-        </div>
-      </el-row>
-      <el-row>
-        <div style="margin: 10px; margin-top: 1px">
-          <span style="color: #ccc; font-size: 13px"
-            >说明：单个附件大小不能超过2M,单次最多一起上传5个，请上传后缀名为jpg、png、gif、jpeg、txt、pdf、doc、docx、xlsx、zip或rar的附件!</span
-          >
-        </div>
-      </el-row>
-      <el-row>
-        <el-card shadow="always">
-          <!-- <div style="margin-top: -25px;" >  -->
-          <div
-            v-loading="listLoading"
-            element-loading-text="数据加载中,请耐心等待..."
-            element-loading-spinner="el-icon-loading"
-            class="step-section"
-          >
-            <flexbox :gutter="0" wrap="wrap" style="padding: 10px 8px 0">
-              <flexbox-item
-                v-for="(item, index) in fileList"
-                :span="0.5"
-                :key="index"
-                class="b-cell"
-              >
-                <flexbox
-                  v-if="item.fileType === 'png'"
-                  align="stretch"
-                  class="b-cell-b"
-                >
-                  <div class="b-cell-name">PNG文件</div>
-                  <div class="b-cell-value">
-                    <flexbox class="f-item">
-                      <img
-                        class="f-img"
-                        src="@/assets/img/relevance_file.png"
-                      />
-                      <div class="f-name">
-                        {{ item | getfilesize1
-                        }}<span style="color: #ccc">{{
-                          item | getfilesize2
-                        }}</span>
-                      </div>
-                      <img
-                        src="@/assets/img/chakan.png"
-                        @click="handleFile('preview', item, index)"
-                      />
-                      <img
-                        src="@/assets/img/xiazai.png"
-                        @click="handleImgFile(item, index)"
-                      />
-                      <img
-                        src="@/assets/img/shanchu.png"
-                        @click="handleFile('delete', item, index)"
-                      />
-                    </flexbox>
-                  </div>
-                </flexbox>
-                <flexbox
-                  v-else-if="item.fileType === 'jpg'"
-                  align="stretch"
-                  class="b-cell-b"
-                >
-                  <div class="b-cell-name">JPG文件</div>
-                  <div class="b-cell-value">
-                    <flexbox class="f-item">
-                      <img
-                        class="f-img"
-                        src="@/assets/img/relevance_file.png"
-                      />
-                      <div class="f-name">
-                        {{ item | getfilesize1
-                        }}<span style="color: #ccc">{{
-                          item | getfilesize2
-                        }}</span>
-                      </div>
-                      <img
-                        src="@/assets/img/chakan.png"
-                        @click="handleFile('preview', item, index)"
-                      />
-                      <img
-                        src="@/assets/img/xiazai.png"
-                        @click="handleImgFile(item, index)"
-                      />
-                      <img
-                        src="@/assets/img/shanchu.png"
-                        @click="handleFile('delete', item, index)"
-                      />
-                    </flexbox>
-                  </div>
-                </flexbox>
-                <flexbox
-                  v-else-if="item.fileType === 'gif'"
-                  align="stretch"
-                  class="b-cell-b"
-                >
-                  <div class="b-cell-name">GIF文件</div>
-                  <div class="b-cell-value">
-                    <flexbox class="f-item">
-                      <img
-                        class="f-img"
-                        src="@/assets/img/relevance_file.png"
-                      />
-                      <div class="f-name">
-                        {{ item | getfilesize1
-                        }}<span style="color: #ccc">{{
-                          item | getfilesize2
-                        }}</span>
-                      </div>
-                      <img
-                        src="@/assets/img/chakan.png"
-                        @click="handleFile('preview', item, index)"
-                      />
-                      <img
-                        src="@/assets/img/xiazai.png"
-                        @click="handleImgFile(item, index)"
-                      />
-                      <img
-                        src="@/assets/img/shanchu.png"
-                        @click="handleFile('delete', item, index)"
-                      />
-                    </flexbox>
-                  </div>
-                </flexbox>
-                <flexbox
-                  v-else-if="item.fileType === 'jpeg'"
-                  align="stretch"
-                  class="b-cell-b"
-                >
-                  <div class="b-cell-name">JPEG文件</div>
-                  <div class="b-cell-value">
-                    <flexbox class="f-item">
-                      <img
-                        class="f-img"
-                        src="@/assets/img/relevance_file.png"
-                      />
-                      <div class="f-name">
-                        {{ item | getfilesize1
-                        }}<span style="color: #ccc">{{
-                          item | getfilesize2
-                        }}</span>
-                      </div>
-                      <img
-                        src="@/assets/img/chakan.png"
-                        @click="handleFile('preview', item, index)"
-                      />
-                      <img
-                        src="@/assets/img/xiazai.png"
-                        @click="handleImgFile(item, index)"
-                      />
-                      <img
-                        src="@/assets/img/shanchu.png"
-                        @click="handleFile('delete', item, index)"
-                      />
-                    </flexbox>
-                  </div>
-                </flexbox>
-                <flexbox v-else align="stretch" class="b-cell-b">
-                  <div class="b-cell-name">{{ item.fileType }}文件</div>
-                  <div class="b-cell-value">
-                    <flexbox class="f-item">
-                      <img
-                        class="f-img"
-                        src="@/assets/img/relevance_file.png"
-                      />
-                      <div class="f-name">
-                        {{ item | getfilesize1
-                        }}<span style="color: #ccc">{{
-                          item | getfilesize2
-                        }}</span>
-                      </div>
-                      <img
-                        src="@/assets/img/xiazai.png"
-                        @click="handleFile('download', item, index)"
-                      />
-                      <img
-                        src="@/assets/img/shanchu.png"
-                        @click="handleFile('delete', item, index)"
-                      />
-                    </flexbox>
-                  </div>
-                </flexbox>
-              </flexbox-item>
-            </flexbox>
-
-            <pagination
-              v-show="totalFileCount > 0"
-              :total="totalFileCount"
-              :page.sync="pageFiles"
-              :limit.sync="listQuery.MaxResultCount"
-              style="margin-top: -25px; margin-bottom: -18px; float: right"
-              @pagination="getFileList"
-            />
-          </div>
-        </el-card>
-      </el-row>
-    </div>
-  </flexbox>
-</template>
-
-<script>
-import { isvalidPhone } from "@/utils/validate";
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import qs from "qs";
-import {
-  downloadImage,
-  downloadFile,
-  fileSize,
-  downloadFileHttpRequest,
-  getFileTypeIcon,
-} from "@/utils/crmindex.js";
-import { getToken } from "@/utils/auth"; // get token from cookie
-
-export default {
-  name: "project",
-  components: { Pagination },
-  directives: { permission },
-  props: {
-    /** 模块ID：客户模块、项目模块、合同模块 */
-    modid: [String, Number],
-  },
-  filters: {
-    getfilesize1(file) {
-      const name =
-        file.fileName && file.fileName.length > 5
-          ? file.fileName.substring(0, 5) + "..."
-          : file.fileName;
-      return name;
-    },
-    getfilesize2(file) {
-      return "(" + fileSize(file.fileLength) + ")";
-    },
-  },
-  data() {
-    return {
-      elementLoadingText: "正在加载...",
-      value: "0",
-      newsList: [],
-      paginationLog: {
-        total: 0,
-        page: 1,
-        pageSize: 10,
-      },
-      form: {},
-      list: null,
-      fileList: [],
-      fileuploadList: [],
-      fileFormData: null, // 将要上传的formdata数据
-      customerList: [],
-      totalCount: 0,
-      dialogFormVisible: false,
-      totalFileCount: 0,
-      listLoading: false,
-      formLoading: false,
-      propsCustomerId: "",
-      listQuery: {
-        CustomerId: "",
-        Sorting: "",
-        SkipCount: 0,
-        MaxResultCount: 10,
-      },
-      page: 1,
-      pageFiles: 1,
-      pageImg: 1,
-      multipleSelection: [],
-      customerInfo: {
-        parentId: "",
-      },
-      isLt2M: "",
-      isFileType: "",
-      stepsActive: 1,
-      tableHeight: document.documentElement.clientHeight - 350,
-    };
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  watch: {
-    customerInfos: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.parentId = element.ParentId;
-          });
-          if (this.customerInfo.parentId != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-
-  mounted() {
-    var self = this;
-    /** 控制table的高度 */
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 350;
-    };
-  },
-  computed: {
-    sureTitle() {
-      return {
-        1: "立即上传",
-        2: "上传中...",
-      }[this.stepsActive];
-    },
-    httpHeader() {
-      //文件上传时，带token认证信息，提高安全性
-      return {
-        Authorization: "Bearer " + getToken(),
-      };
-    },
-  },
-  created() {
-    this.fileuploadList = [];
-    this.fileFormData = new FormData();
-  },
-  methods: {
-    handleCreate() {
-      this.stepsActive = 1;
-      this.fileuploadList = [];
-      this.dialogFormVisible = true;
-      this.$refs.upload.clearFiles();
-    },
-    getFileList() {
-      //附件列表
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.pageFiles - 1) * 10;
-      this.listQuery.CustomerId = this.modid; //alert(this.modid)
-      this.$axios
-        .gets("/api/abpvnext_master/uploadfile/allofcustomers", this.listQuery)
-        .then((response) => {
-          this.fileList = [];
-          this.fileList = response.items;
-          this.totalFileCount = response.totalCount;
-          this.listLoading = false;
-          // setTimeout(() => {
-          //     //大数据量加载时
-          //     this.listLoading = false;
-          //   }, 1000);
-        });
-    },
-    httpRequestfiles(data) {
-      // this.fileuploadList=[]
-      let _this = this;
-      let rd = new FileReader(); // 创建文件读取对象
-      let file = data.file;
-      this.fileuploadList.push(file);
-      //this.fileFormData.append("files", file);
-      rd.readAsDataURL(file); // 文件读取装换为base64类型
-    },
-    handleChangefiles(file, fileList) {
-      //上传时解发
-      //   this.fileuploadList=[]
-      //   this.fileuploadList = fileList;
-    },
-    // 上传之前的格式设置
-    beforeAvatarUpload(file) {
-      var FileExt = file.name.replace(/.+\./, "");
-      if (
-        [
-          "jpg",
-          "png",
-          "png",
-          "jpeg",
-          "txt",
-          "zip",
-          "rar",
-          "pdf",
-          "docx",
-          "doc",
-          "xlsx",
-          "xls",
-        ].indexOf(FileExt.toLowerCase()) === -1
-      ) {
-        this.$message({
-          type: "warning",
-          message:
-            "请上传后缀名为jpg、png、gif、jpeg、txt、pdf、doc、docx、xlsx、xls、zip或rar的附件！",
-        });
-        this.isFileType = "0";
-        return false;
-      } else {
-        this.isFileType = "1";
-      }
-      this.isLt2M = file.size / 1024 / 1024 < 2 ? "1" : "0";
-      if (this.isLt2M === "0") {
-        this.$message.error("上传文件大小不能超过 2MB!");
-      }
-      return this.isLt2M === "1" ? true : false;
-    },
-    beforeRemove(file, fileList) {
-      if (this.isLt2M === "1" && this.isFileType === "1") {
-        return this.$confirm(`确定移除 ${file.name}？`);
-      }
-    },
-    handleRemove(file, fileList) {
-      //附件列表删除操作
-      const index = this.fileuploadList.indexOf(file.originFileObj);
-      const newFileList = this.fileuploadList.slice();
-      newFileList.splice(index, 1);
-      this.fileuploadList = newFileList;
-    },
-    handleExceedfiles(files, fileList) {
-      this.$message.warning(
-        `当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
-          files.length + fileList.length
-        } 个文件`
-      );
-    },
-    showCancel() {
-      return this.stepsActive != 2;
-    },
-    sureClick() {
-      if (
-        this.fileuploadList === [] ||
-        JSON.stringify(this.fileuploadList) === "[]"
-      ) {
-        this.$message.error("请选择上传文件");
-        return false;
-      }
-      if (this.stepsActive == 1) {
-        this.stepsActive = 2;
-        this.formLoading = true;
-        setTimeout(() => {
-          this.save();
-        }, 2000);
-      }
-    },
-    save() {
-      //this.formLoading = true;
-      //--上传附件，批量或拖拽
-      if (JSON.stringify(this.fileuploadList) != "[]") {
-        let fd = new FormData();
-        //   var outfd = this.fileFormData.getAll("files");
-        //   alert("outfd"+outfd)
-        //   for (let i = 0; i < outfd.length; i++) {
-        //     fd.append("files", outfd[i]); // 添加文件
-        //   }
-        const { fileuploadList } = this;
-        fileuploadList.forEach((file) => {
-          fd.append("files", file); // 添加文件
-        });
-        fd.append("customerId", this.modid); //模块ID
-        this.$axios
-          .posts("/api/abpvnext_master/getblobfile/UploadFilesPost", fd)
-          .then((response) => {
-            this.formLoading = false;
-            this.getFileList();
-            if (this.isLt2M === "1" && this.isFileType === "1") {
-              this.$notify({
-                title: "成功",
-                message: "附件上传成功！",
-                type: "success",
-                duration: 2000,
-              });
-            }
-          })
-          .catch(() => {
-            this.formLoading = false;
-          });
-      } else {
-        this.formLoading = false;
-        this.$message({
-          message: "未上传任何附件，请查检！",
-          type: "warning",
-        });
-      }
-      //-end-上传附件完成
-
-      this.dialogFormVisible = false;
-    },
-    /**
-     * 附件查看
-     */
-    handleFile(type, item, index) {
-      if (type === "preview") {
-        var down_fileName = item.fileName + "." + item.fileType; //下载时附件名
-        var previewList = [];
-        previewList.push({
-          url: item.fileUrl,
-          id: item.id,
-          fileType: item.fileType,
-          name: down_fileName,
-        });
-        this.$bus.emit("preview-image-bus", {
-          index: 0,
-          data: previewList,
-        });
-      } else if (type === "download") {
-        var param_fileName = item.id + "." + item.fileType; //传入的参数（后端接口接收）
-        var down_fileName = item.fileName + "." + item.fileType || "文件"; //下载时附件名
-        this.$axios
-          .BolbGets(
-            "/api/abpvnext_master/getblobfile/download/" + param_fileName
-          )
-          .then((response) => {
-            //方法一(插件下载)
-            downloadFile(response, down_fileName);
-            //方法二（a标签下载）
-            //  var blob = new Blob([response], {
-            //    type: 'application/octet-stream'
-            // })
-            // if (window.navigator.msSaveBlob) {  // IE 10+以及IE内核的浏览器
-            //   try {
-            //     window.navigator.msSaveOrOpenBlob(blob,down_fileName );
-            //   } catch (e) {
-            //     console.log(e)
-            //   }
-            // } else {//chrome/firefox浏览器
-            //   //alert("chrome/firefox浏览器")
-            //   let url = window.URL.createObjectURL(blob)
-            //   let link = document.createElement('a')
-            //   link.style.display = 'none'
-            //   link.href = url
-            //   link.setAttribute('download', down_fileName)// 文件名
-            //   document.body.appendChild(link)
-            //   link.click()
-            //   document.body.removeChild(link) // 下载完成移除元素
-            //   window.URL.revokeObjectURL(url) // 释放掉blob对象
-            // }
-          });
-      } else if (type === "delete") {
-        var params = [];
-        let myalert = ""; //声明变量，其变量必须在此声明后使用
-        params.push(item.id);
-        myalert = item.fileName;
-        this.$confirm("是否删除" + myalert + "?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.$axios
-              .posts("/api/abpvnext_master/uploadfile/DeleteFile", params)
-              .then((response) => {
-                this.$notify({
-                  title: "成功",
-                  message: "删除成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getFileList();
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消删除",
-            });
-          });
-      }
-    },
-    // 下载图片
-    handleImgFile(item, index) {
-      var param_fileName = item.id + "." + item.fileType; //传入的参数（后端接口接收）
-      var down_fileName = item.fileName + "." + item.fileType; //下载时附件名
-      this.$axios
-        .BolbGets(
-          "/api/abpvnext_master/getblobfile/downloadImg/" + param_fileName
-        )
-        .then((response) => {
-          downloadFile(response, down_fileName);
-        });
-    },
-    getStatusStyle(status) {
-      if (status == 0) {
-        return {
-          "border-color": "#E6A23C",
-          "background-color": "#FDF6EC",
-          color: "#E6A23C",
-        };
-      } else if (status == 1) {
-        return {
-          "border-color": "#409EFF",
-          "background-color": "#ECF5FF",
-          color: "#409EFF",
-        };
-      } else if (status == 3) {
-        return {
-          "border-color": "#67C23A",
-          "background-color": "#F0F9EB",
-          color: "#67C23A",
-        };
-      } else if (status == 2) {
-        return {
-          "border-color": "#F56C6B",
-          "background-color": "#FEF0F0",
-          color: "#F56C6B",
-        };
-      } else if (status == 4) {
-        return {
-          "background-color": "#E4E7ED",
-        };
-      }
-    },
-    getHTStatusStyle(status) {
-      if (status == 0) {
-        //新增
-        return {
-          "border-color": "#E6A23C",
-          "background-color": "#FDF6EC",
-          color: "#E6A23C",
-        };
-      } else if (status == 1 || status == 2) {
-        //审核中
-        return {
-          "border-color": "#409EFF",
-          "background-color": "#ECF5FF",
-          color: "#409EFF",
-        };
-      } else if (status == 3 || status == 6) {
-        //已签定和完成
-        return {
-          "border-color": "#67C23A",
-          "background-color": "#F0F9EB",
-          color: "#67C23A",
-        };
-      } else if (status == 4) {
-        return {
-          "border-color": "#E9E9EB",
-          "background-color": "#F4F4F5",
-          color: "#909399",
-        };
-      } else if (status == 5) {
-        //执行
-        return {
-          "border-color": "#F56C6B",
-          "background-color": "#FEF0F0",
-          color: "#F56C6B",
-        };
-      } else if (status == 7) {
-        //中止
-        return {
-          "border-color": "#E9E9EB",
-          "background-color": "#F4F4F5",
-          color: "#909399",
-        };
-      }
-    },
-    handleFilter() {
-      this.page = 1;
-      this.pageFiles = 1;
-      this.pageImg = 1;
-      this.getFileList();
-    },
-    resetQuery() {},
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    handleCollapseChange(val) {},
-    handleLogChange(val) {
-      this.value = val;
-      this.paginationLog.total = 0;
-      this.paginationLog.page = 1;
-      this.paginationLog.pageSize = 2;
-      //this.fetchData();
-    },
-    handleSizeChange(val) {
-      this.paginationLog.pageSize = val;
-      this.fetchData();
-    },
-    handleCurrentChange(val) {
-      this.paginationLog.page = val;
-      this.fetchData();
-    },
-  },
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.is-hidden {
-  visibility: hidden;
-}
-.opts {
-  padding: 6px 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-.el-timeline {
-  margin-top: 20px;
-
-  &-item {
-    padding-bottom: 1px;
-  }
-}
-.el-drawer {
-  overflow: scroll;
-}
-.box {
-  height: 100%; //如高度等于网页高度
-  overflow: auto;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-around;
-}
-
-.goods-list-container {
-  .goods-list-card-body {
-    position: relative;
-    text-align: center;
-    vertical-align: middle;
-    cursor: pointer;
-
-    .goods-list-tag-group {
-      position: absolute;
-      top: 10px;
-      right: 5px;
-      z-index: 9;
-    }
-
-    .goods-list-image-group {
-      height: 80px;
-      overflow: hidden;
-
-      .goods-list-image {
-        width: 80px;
-        height: 80px;
-        transition: all ease-in-out 0.3s;
-
-        &:hover {
-          transform: scale(1.1);
-        }
-      }
-    }
-
-    .goods-list-title {
-      margin: 8px 0;
-      font-size: 14px;
-      font-weight: bold;
-    }
-
-    .goods-list-description {
-      font-size: 14px;
-      color: #808695;
-    }
-
-    .goods-list-price {
-      margin: 8px 0;
-      font-size: 14px;
-      color: #ff6700;
-      s {
-        color: #c5c8ce;
-      }
-    }
-  }
-}
-</style>
-
-<style>
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  content: "";
-}
-.clearfix:after {
-  clear: both;
-}
-.el-col {
-  border-radius: 2px;
-}
-.bg-purple-dark {
-  background: #99a9bf;
-}
-.bg-purple {
-  background: #d3dce6;
-}
-.bg-purple-light {
-  background: hsl(221, 31%, 14%);
-}
-.grid-content {
-  border-radius: 2px;
-  min-height: 30px;
-}
-.status_button {
-  padding: 1px 6px;
-  border: 1px solid #e6e6e6;
-  border-radius: 4px;
-  display: inline-block;
-  font-size: 12px;
-  margin: 0 auto;
-}
-</style>
-
-
-<style type="text/css">
-* {
-  margin: 0;
-  padding: 0;
-}
-.div11 {
-  width: 150px;
-  height: 100px;
-  display: table-cell;
-  vertical-align: middle;
-  text-align: center;
-  border: 1px solid #000;
-}
-.img11 {
-  width: 50px;
-  height: 50px;
-}
-</style>
-
-
-
-<style lang="scss" scoped>
-//客户相关详情 头部类似布局
-.el-tabs /deep/ .el-tabs__nav-wrap::after {
-  display: none !important;
-}
-
-.el-tabs /deep/ .el-tabs__header {
-  background-color: #f5f6f9;
-  padding: 0 17px;
-  margin: 0 0 15px !important;
-}
-
-.el-tabs /deep/ .el-tabs__item {
-  font-size: 13px !important;
-  height: 40px !important;
-  line-height: 40px !important;
-}
-
-.d-container {
-  position: relative;
-  height: 100%;
-}
-
-/** 让element 查询到的标签 */
-.t-loading-content {
-  position: relative;
-  overflow-y: scroll;
-  flex: 1;
-}
-
-/** 审核信息 */
-.examine-info {
-  padding: 0 17px 17px 17px;
-
-  .examine-info-border {
-    border: 1px solid #e6e6e6;
-    border-radius: 3px;
-    padding: 17px;
-  }
-}
-.t-section {
-  position: relative;
-  padding: 10px 17px;
-  min-height: 60px;
-  .t-img {
-    display: block;
-    width: 45px;
-    height: 45px;
-    margin-right: 10px;
-  }
-  .t-name {
-    font-size: 14px;
-    color: #333333;
-    flex: 1;
-  }
-  .t-more {
-    border: 1px solid #dcdfe6;
-    font-size: 12px;
-    color: #606266;
-    padding: 0 10px 0 12px;
-    border-radius: 2px;
-    font-weight: 500;
-    height: 25px;
-    cursor: pointer;
-  }
-  .t-close {
-    display: block;
-    width: 40px;
-    height: 40px;
-    margin-left: 20px;
-    padding: 10px;
-    cursor: pointer;
-  }
-}
-
-.h-section {
-  position: relative;
-  padding: 8px 17px 15px 17px;
-  min-height: 58px;
-  .h-item {
-    .h-title {
-      font-size: 12px;
-      color: #777;
-    }
-    .h-value {
-      min-height: 14px;
-      margin-top: 8px;
-      font-size: 13px;
-      color: #333333;
-    }
-  }
-}
-.head-handle-button {
-  padding: 5px 15px;
-  margin-right: 10px;
-}
-</style>
-
-<style scoped>
-.business-list {
-  margin-bottom: 15px;
-}
-.business-label {
-  display: inline-block;
-  width: 100px;
-}
-.business-des {
-  display: inline-block;
-  color: #999;
-  font-size: 12px;
-  width: 60px;
-}
-.business-setting-content {
-  border: 1px solid #e6e6e6;
-  margin-top: 10px;
-}
-.business-setting-table-header {
-  background: #f5f5f5;
-}
-.business-setting-table,
-.business-setting-table-header {
-  display: flex;
-  text-align: center;
-  height: 50px;
-  line-height: 50px;
-}
-.business-setting-table-body {
-  height: 250px;
-  overflow-y: auto;
-}
-.business-setting-table > span,
-.business-setting-table-header > span,
-.business-setting-table > .el-input {
-  flex: 1;
-}
-.business-setting-table > span > .el-input {
-  width: 70%;
-}
-.business-setting-table > .icon-span > .el-input {
-  width: 50%;
-}
-.business-setting-table > span .el-icon-circle-plus {
-  color: #3e84e9;
-  width: 20px;
-  height: 20px;
-  cursor: pointer;
-}
-.business-setting-table > span .el-icon-remove {
-  color: #ff6767;
-  width: 20px;
-  height: 20px;
-  cursor: pointer;
-}
-.business-setting-table:nth-child(2n + 1) {
-  background: #f7f8fa;
-}
-.icon-box {
-  width: 50px;
-  display: inline-block;
-  text-align: left;
-  margin-left: 10px;
-}
-</style>
-
-<style lang="scss" scoped>
-@import "../../styles/file.scss";
-
-.step-section {
-  min-height: 300px;
-
-  /deep/ .el-loading-spinner {
-    top: 45%;
-    .el-icon-loading {
-      font-size: 40px;
-      color: #999;
-    }
-
-    .el-loading-text {
-      color: #333;
-    }
-  }
-}
-.busi-line {
-  position: absolute;
-  bottom: 0;
-  left: 17px;
-  right: 17px;
-  height: 1px;
-  background-color: #e6e6e6;
-}
-
-.busi-state {
-  position: relative;
-  padding-left: 20px;
-  overflow-x: auto;
-  overflow-y: hidden;
-  a {
-    flex-shrink: 0;
-  }
-}
-
-.busi-state-item {
-  padding: 10px 30px;
-  margin: 5px 0;
-  height: 38px;
-  position: relative;
-  margin-right: 5px;
-  border-top: 2px solid #ebebeb;
-  border-bottom: 2px solid #ebebeb;
-  .state-circle {
-    width: 38px;
-    height: 38px;
-    border-radius: 19px;
-    background-color: white;
-    transform: rotate(45deg);
-    position: absolute;
-    z-index: -1;
-  }
-  .state-arrow {
-    width: 38px;
-    height: 38px;
-    transform: scale(0.707) rotate(45deg);
-    border-top: 2px solid #ebebeb;
-    border-right: 2px solid #ebebeb;
-    background-color: white;
-    position: absolute;
-  }
-}
-
-.state-undo {
-  border-top: 2px solid #ebebeb;
-  border-bottom: 2px solid #ebebeb;
-  background-color: white;
-  color: #666;
-  .state-circle {
-    border-color: #ebebeb;
-    background-color: white;
-  }
-  .state-arrow {
-    border-color: #ebebeb;
-    background-color: white;
-  }
-}
-
-.state-doing {
-  border-top: 2px solid #34cecf;
-  border-bottom: 2px solid #34cecf;
-  background-color: white;
-  color: #34cecf;
-  .circle-left {
-    border-color: #34cecf;
-    background-color: white;
-  }
-  .circle-right {
-    border-color: #34cecf;
-    background-color: white;
-  }
-  .arrow-left {
-    border-color: #34cecf;
-    background-color: white;
-  }
-  .arrow-right {
-    border-color: #34cecf;
-    background-color: white;
-  }
-}
-
-.state-suc {
-  border-top: 2px solid #34cecf;
-  border-bottom: 2px solid #34cecf;
-  background-color: #34cecf;
-  color: white;
-  .circle-left {
-    border-color: #a07988;
-    background-color: #34cecf;
-  }
-  .circle-right {
-    border-color: #34cecf;
-    background-color: #34cecf;
-  }
-  .arrow-left {
-    border-color: #34cecf;
-    background-color: white;
-  }
-  .arrow-right {
-    border-color: #34cecf;
-    background-color: #34cecf;
-  }
-}
-
-.state-fail {
-  border-top: 2px solid #ff6767;
-  border-bottom: 2px solid #ff6767;
-  background-color: #ff6767;
-  color: white;
-  .circle-left {
-    border-color: #ff6767;
-    background-color: #ff6767;
-  }
-  .circle-right {
-    border-color: #ff6767;
-    background-color: #ff6767;
-  }
-  .arrow-left {
-    border-color: #ff6767;
-    background-color: white;
-  }
-  .arrow-right {
-    border-color: #ff6767;
-    background-color: #ff6767;
-  }
-}
-
-.state-invalid {
-  border-top: 2px solid #ebebeb;
-  border-bottom: 2px solid #ebebeb;
-  background-color: #ebebeb;
-  color: #666;
-  .state-circle {
-    border-color: #ebebeb;
-    background-color: #ebebeb;
-  }
-  .state-arrow {
-    border-color: #ebebeb;
-    background-color: #ebebeb;
-  }
-
-  .circle-left {
-    border-color: #ebebeb;
-    background-color: #ebebeb;
-  }
-  .circle-right {
-    border-color: #ebebeb;
-    background-color: #ebebeb;
-  }
-  .arrow-left {
-    border-color: #ebebeb;
-    background-color: white;
-  }
-  .arrow-right {
-    border-color: #ebebeb;
-    background-color: #807676;
-  }
-}
-
-.arrow-right {
-  z-index: 1;
-  top: -2px;
-  right: -19px;
-}
-.arrow-left {
-  top: -2px;
-  left: -18px;
-}
-.circle-right {
-  border-top: 2px solid #ebebeb;
-  border-right: 2px solid #ebebeb;
-  z-index: 1;
-  top: -2px;
-  right: -15.5px;
-}
-.circle-left {
-  border-left: 2px solid #ebebeb;
-  border-bottom: 2px solid #ebebeb;
-  top: -2px;
-  left: -17px;
-}
-
-/** 状态操作布局 */
-.state-handel-cont {
-  font-size: 13px;
-  color: #333;
-  .state-handel-item {
-    padding: 10px 0;
-    cursor: pointer;
-    .state-handel-item-img {
-      width: 16px;
-      height: 16px;
-      border-radius: 8px;
-      margin-right: 8px;
-      flex-shrink: 0;
-      display: block;
-    }
-    .state-handel-item-name {
-      flex: 1;
-    }
-    .state-handel-item-value {
-      flex-shrink: 0;
-    }
-  }
-  .state-handel-item:hover {
-    background-color: #f7f8fa;
-  }
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/code/WebApp/vue/src/views/ux/billManage/kanBanWithCode/index.vue
deleted file mode 100644
index 8c051717..00000000
--- a/code/WebApp/vue/src/views/ux/billManage/kanBanWithCode/index.vue
+++ /dev/null
@@ -1,1272 +0,0 @@
-<!--大众看板结算与交货核对-->
-<template>
-  <div class="cr-body-content">
-    <!--功能栏-->
-    <!-- 搜索 -->
-    <div style="float: left">
-      <flexbox class="content-header">
-        <JobSelectVerson
-          :options="JobVersionList"
-          style="width: 150px; margin-left: -10px"
-          class="search-container"
-          @value-change="JobVersionValue"
-        ></JobSelectVerson>
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleCreate"
-          >统计
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete()"
-          >删除(支持批量)</el-button
-        >
-        <el-button
-          class="filter-item"
-          type="success"
-          icon="el-icon-check"
-          size="mini"
-          @click="handleCreateBills()"
-          >生成出库单(支持批量)</el-button
-        >
-        <el-button
-          class="filter-item"
-          type="success"
-          icon="el-icon-check"
-          size="mini"
-          @click="handleConfirm()"
-          >已确认</el-button
-        >
-      </flexbox>
-    </div>
-    <!-- 刷新 -->
-    <div style="float: right">
-      <flexbox class="content-header">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="手动刷新"
-          placement="top"
-        >
-          <el-button
-            size="mini"
-            circle
-            icon="el-icon-refresh"
-            @click="refresh()"
-          />
-        </el-tooltip>
-
-        <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
-        >
-      </flexbox>
-    </div>
-
-    <!--主页面表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @row-click="handleRowClick"
-      @selection-change="handleSelectionChange"
-      @filter-change="filterChange"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-
-      <!-- 操作名称 -->
-      <el-table-column
-        prop="actionName"
-        label="操作名称(单击箭头过滤)"
-        width="165"
-        column-key="actionName"
-        :filters="[
-          { text: '导出', value: '导出' },
-          { text: '消息', value: '消息' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <div align="center">
-            <el-tag
-              v-for="(item, index) in menuCateMap"
-              v-show="scope.row.actionName == item.value"
-              :key="index"
-              :type="item.cssName"
-            >
-              {{ item.label }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column>
-      <!-- 状态 -->
-      <el-table-column
-        prop="stateName"
-        label="状态(单击箭头过滤)"
-        width="165"
-        column-key="stateName"
-        align="center"
-        :filters="[
-          { text: '执行完成(任务成功)', value: 'Succeeded' },
-          { text: '执行完成(任务失败)', value: 'Failed' },
-          { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: 'Scheduled' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            v-for="(item, index) in stateNameCateMap"
-            v-show="scope.row.stateName == item.value"
-            :key="index"
-            :type="item.cssName"
-          >
-            {{ item.label }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="250">
-        <template slot-scope="scope">
-          <div align="center">
-            <!-- <el-button
-              v-if="scope.row.actionName == '导出'"
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            > -->
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.stateName == 'Succeeded' &&
-                scope.row.downFileName != ''
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            >
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.error != '' &&
-                scope.row.stateName == 'Succeeded'
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >检验失败，下载</el-button
-            >
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-    <div class="table-footer">
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-
-    <!-- 任务日志详细 -->
-    <el-dialog
-      title="任务详细"
-      :visible.sync="openView"
-      width="700px"
-      append-to-body
-    >
-      <el-form ref="form" :model="form" label-width="120px" size="mini">
-        <el-row>
-          <el-col :span="24">
-            <div class="overall">
-              <!-- 步骤条 -->
-              <div class="steps-box">
-                <ul class="steps">
-                  <li
-                    v-for="(item, index) in stepList"
-                    :key="index"
-                    :class="{ active: activeIndex - 1 === index }"
-                  >
-                    <p :class="{ li_active: activeIndex > index }">
-                      <i :class="item.icon"></i>
-                    </p>
-                    <div
-                      class="text"
-                      :class="{ li_active: activeIndex > index }"
-                    >
-                      {{ item.title }}
-                    </div>
-                  </li>
-                </ul>
-              </div>
-              <!-- 步骤条对应内容 -->
-              <div class="Article-content">
-                <el-tabs v-model="activeName">
-                  <el-tab-pane label="基本信息" name="first">
-                    <div class="dialog-body">
-                      <div
-                        class="content"
-                        v-for="(item, index) in stepList"
-                        :key="index"
-                        v-show="activeIndex == index + 1"
-                      >
-                        <div>
-                          <el-card style="height: 300px; margin: 2px">
-                            <div
-                              v-if="activeIndex == 1"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：等待执行</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 2"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：执行中...</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 3"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <div id="chatarea">
-                                <div
-                                  style="display: inline; color: #71d87f"
-                                  v-if="form.stateName == 'Succeeded'"
-                                >
-                                  执行结果：执行成功
-                                </div>
-                                <div
-                                  style="display: inline; color: #ff5640"
-                                  v-else-if="form.stateName == 'Failed'"
-                                >
-                                  执行结果：执行失败
-                                </div>
-                              </div>
-                            </div>
-                            <div>
-                              <el-col :span="12">
-                                <el-form-item label="模块名称：">{{
-                                  form.name
-                                }}</el-form-item>
-                                <el-form-item label="操作名称：">{{
-                                  form.actionName
-                                }}</el-form-item>
-                              </el-col>
-                              <el-col :span="12">
-                                <el-form-item label="创建人：">{{
-                                  form.creator
-                                }}</el-form-item>
-                                <el-form-item label="创建时间：">
-                                  <el-date-picker
-                                    value-format="yyyy-MM-dd hh:mm:ss"
-                                    format="yyyy-MM-dd hh:mm:ss"
-                                    v-model="form.createdAt"
-                                    type="date"
-                                    class="picker"
-                                    disabled
-                                  ></el-date-picker>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="24">
-                                <el-form-item
-                                  label="异常信息："
-                                  style="color: #ff5640"
-                                  v-if="form.stateName == 'Failed'"
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.error)"
-                                    >下载错误数据</el-button
-                                  >
-                                </el-form-item>
-                                <el-form-item
-                                  label="生成数据："
-                                  style="color: #ff5640"
-                                  v-else-if="
-                                    form.stateName == 'Succeeded' &&
-                                    form.actionName == '导出'
-                                  "
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.downFileName)"
-                                    >下载生成数据</el-button
-                                  >
-                                </el-form-item>
-                              </el-col>
-                            </div>
-                          </el-card>
-                        </div>
-                      </div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="openView = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!--统计功能表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="680px"
-    >
-      <el-form
-        ref="formCount"
-        :inline="true"
-        :rules="rules"
-        :model="formCount"
-        size="mini"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="选择版本" required />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="versionValue">
-              <el-select
-                v-model="formCount.versionValue"
-                size="medium"
-                clearable
-                style="width: 188px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in versionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="物料组(车型)" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialGroupValue">
-              <el-select
-                v-model="formCount.materialGroupValue"
-                size="medium"
-                multiple
-                filterable
-                clearable
-                style="width: 380px; margin-right: 15px"
-                @change="valueChange"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in materialGroupList"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value"
-                >
-                  <span style="float: left">{{ item.label }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                    item.value
-                  }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="日期查询：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="startTime">
-              <el-date-picker
-                v-model="formCount.startTime"
-                type="datetime"
-                size="small"
-                :picker-options="pickerOptions0"
-                @change="getdateValue"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item prop="endTime">
-              <el-date-picker
-                v-model="formCount.endTime"
-                type="datetime"
-                :picker-options="pickerOptions1"
-                size="small"
-                @change="getdateVal"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="看板号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-input
-                type="textarea"
-                style="width: 170px"
-                v-model="formCount.kanBan"
-                :rows="5"
-                placeholder="多个看板号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="materialCode">
-              <el-input
-                type="textarea"
-                v-model="formCount.materialCode"
-                :rows="5"
-                style="width: 170px"
-                placeholder="多个客户零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="sapMaterialCode">
-              <el-input
-                v-model="formCount.sapMaterialCode"
-                :rows="5"
-                style="width: 450px"
-                type="textarea"
-                placeholder="多个厂内零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-input v-model="formCount.materialCode" />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item>
-              <el-input v-model="formCount.sapMaterialCode" />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
-
-export default {
-  name: "KanBanWithCode",
-  components: { Pagination, CRMTableHead, JobSelectVerson },
-  directives: { permission },
-
-  data() {
-    return {
-      crmType: "backJob",
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
-      pickerOptionsCp5: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      pickerOptions0: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          //return  time.getTime() >= new Date(this.endTime).getTime();
-          return time.getTime() > new Date(this.endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions1: {
-        disabledDate: (time) => {
-          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
-          return time.getTime() <= new Date(this.startTime).getTime();
-        },
-      },
-      startTime: "",
-      endTime: "",
-      pickerOptionsCp7: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      datetime5: [],
-      datetime7: [],
-      checkedCities: [0],
-      JobVersionList: [],
-      getmaterialGroupValue: "",
-      selectValue: "",
-      selectNameValue: "",
-      radio: "0", //结算状态：0未结 1部分结算
-      versionList: [],
-      materialGroupList: [],
-      // 是否显示详细弹出层
-      openView: false,
-      versionValue: "",
-      materialGroupValue: "",
-      formTitle: "",
-      timer: null, //定时器名称
-      //当前位置
-      activeIndex: 1,
-      //默认显示基本信息
-      activeName: "first",
-      //步骤条步数
-      stepList: [
-        {
-          title: "等待执行",
-          icon: "el-icon-sort",
-        },
-        {
-          title: "执行中",
-          icon: "el-icon-refresh",
-        },
-        {
-          title: "执行完成",
-          icon: "el-icon-check",
-        },
-      ],
-      customerInfos: "",
-      searchContent: "", // 输入内容
-      JobversionValue: "",
-      JobversionValueVerson: "",
-      form: {},
-      formCount: {
-        name: "未结算对比",
-        // datetime5: [],
-        // datetime7: [],
-        kanBan: "", //看板
-        settledate: "",
-        materialCode: "", //客户物料号
-        sapMaterialCode: "", //厂内物料号
-        chassisNumber: "",
-        kennCode: "",
-        version: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listExportQuery: {
-        version: "",
-        kanBan: "", //看板
-        customerPartCode: undefined, //客户物料号
-        sapMaterialCode: undefined, //厂内物料号
-        cp7begin: undefined,
-        cp7end: undefined,
-        kenncode: undefined,
-        chassisNumber: undefined,
-        estimateTypeDesc: undefined, //物料组车型
-        begin: undefined,
-        end: undefined,
-      },
-      listQuery: {
-        taskId: "",
-        name: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      menuCateMap: [
-        { label: "导出", value: "导出", cssName: "warning" },
-        { label: "消息", value: "消息", cssName: "info" },
-      ],
-      stateNameCateMap: [
-        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
-        { label: "执行中...", value: "Processing", cssName: "primary" },
-        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
-        { label: "等待执行", value: "Scheduled", cssName: "primary" },
-      ],
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-    this.timer = setInterval(() => {
-      this.listQuery.taskId = "";
-      this.listQuery.stateName = "";
-      setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
-    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once("hook:beforeDestroy", () => {
-      clearInterval(timer);
-    });
-    //this.disabledDateCp5();
-  },
-  created() {
-    this.getAllVersionList();
-    this.getMaterialGroup();
-    this.getList();
-    this.getJobVersionInfo();
-    // this.getCurrentMonthFirst();
-    // this.getCurrentMonthLast();
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-  computed: {
-    /* 主表头 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "版本号",
-        prop: "type",
-        width: 85,
-      });
-      tempsTabs.push({
-        label: "单据流水号",
-        prop: "taskId",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "模块名称",
-        prop: "name",
-        width: 170,
-      });
-      tempsTabs.push({
-        label: "创建人",
-        prop: "email",
-        width: 110,
-      });
-      tempsTabs.push({
-        label: "创建时间",
-        prop: "createdAt",
-        width: 150,
-      });
-       tempsTabs.push({
-        label: "说明",
-        prop: "remark",
-        width: 220,
-      });
-      tempsTabs.push({
-        label: "审批状态",
-        prop: "fileName",
-        width: 150,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    //批量删除
-    handleDelete(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/Job/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    handleConfirm(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否确认" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/wms/WmsJitOutPut", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "生成成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    //出库单
-    handleCreateBills(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否确认出库" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/wms/WmsJitOutPut", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "生成成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    valueChange(data) {
-      this.getmaterialGroupValue = "";
-      this.getmaterialGroupValue += data + ",";
-      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
-        0,
-        this.getmaterialGroupValue.length - 1
-      );
-    },
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.JobversionValue = params.value;
-      this.getList();
-    },
-    getJobVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
-        .then((response) => {
-          this.JobVersionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element;
-            options.label = element;
-            this.JobVersionList.push(options);
-          });
-          if (JSON.stringify(this.JobVersionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.JobversionValue = this.JobVersionList[0].value;
-            this.JobversionValueVerson = this.JobVersionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    getdateValue(val) {
-      this.startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateVal(val) {
-      this.endTime = val;
-      this.getbalanceIndexData();
-    },
-
-    getCurrentMonthFirst() {
-      var date = new Date();
-      date.setDate(1);
-      var month = parseInt(date.getMonth() + 1);
-      var day = date.getDate();
-      if (month < 10) month = "0" + month;
-      if (day < 10) day = "0" + day;
-      this.startTime = date.getFullYear() + "-" + month + "-" + day;
-    },
-    getCurrentMonthLast() {
-      var date = new Date();
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      month = month < 10 ? "0" + month : month;
-      var day = new Date(year, month, 0);
-      this.endTime = year + "-" + month + "-" + day.getDate();
-    },
-    handleCheckedCitiesChange(value) {
-      alert(value);
-    },
-
-    getAllVersionList() {
-      this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
-        .then((response) => {
-          this.versionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //获取物料组车型
-    getMaterialGroup() {
-      this.$axios
-        .posts("/api/settleaccount/CodeSetting/list", {
-          project: "物料组",
-          maxResultCount: 1000,
-          skipCount: 0,
-          sorting: "value ascending",
-        })
-        .then((response) => {
-          this.materialGroupList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.description;
-            options.label = element.value;
-            this.materialGroupList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /* 重置 */
-    resetForm(formName) {
-      this.formCount = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      // this.datetime7 = [];
-    },
-    save() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue; //版本
-          if (this.formCount.kanBan != "") {
-            this.listExportQuery.kanBan = this.formCount.kanBan; //看板
-          }
-          if (this.formCount.materialCode != "") {
-            this.listExportQuery.customerPartCode = this.formCount.materialCode; //物料号
-          }
-          if (this.formCount.sapMaterialCode != "") {
-            this.listExportQuery.sapMaterialCode =
-              this.formCount.sapMaterialCode; //厂内物料号
-          }
-          if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
-          }
-          this.listExportQuery.begin = this.startTime
-            ? this.startTime
-            : undefined;
-          this.listExportQuery.end = this.endTime ? this.endTime : undefined;
-          console.log(
-            "大众看板结算与交货核对明细表-导出条件：" +
-              JSON.stringify(this.listExportQuery)
-          );
-          this.$axios
-            .gets(
-              "/api/settleaccount/ReportMakeService/SettleKanBan-WithCode",
-              this.listExportQuery
-            )
-            .then((res) => {
-              let taskid = res;
-              if (Number.isInteger(taskid)) {
-                this.$notify({
-                  title: "成功",
-                  message: "任务生成成功！任务号:" + taskid,
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.getList();
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            });
-        }
-      });
-    },
-    handleCreate() {
-      this.$nextTick(() => {
-        this.$refs["formCount"].resetFields();
-      });
-      this.formTitle = "报表统计";
-      this.isEdit = false;
-      this.form = {};
-      this.dialogFormVisible = true;
-    },
-    filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
-    },
-    /* 任务详细信息 */
-    handleView(row) {
-      this.listQuery.taskId = row.taskId;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.form = response[0];
-          switch (response[0].stateName) {
-            case "Succeeded":
-            case "Failed":
-              this.activeIndex = 3;
-              break;
-            case "Processing":
-              this.activeIndex = 2;
-              break;
-            case "Enqueued":
-              this.activeIndex = 1;
-              break;
-          }
-          this.openView = true;
-        });
-    },
-    /*  刷新  */
-    refresh() {
-      this.list = [];
-      this.listQuery.taskId = "";
-      this.listQuery.name = "";
-      this.getList();
-    },
-    // 监听筛选项的变化
-    filterChange(filterObj) {
-      console.log(filterObj.actionName);
-      if (filterObj.actionName.length > 0) {
-        console.log("点击筛选");
-      } else {
-        console.log("点击重置");
-      }
-    },
-    /* 导出类型的文件 */
-    downloadErrData(param) {
-      this.listLoading = true;
-      let fileNameOfProject = param;
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
-    },
-    /* 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /* 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "stateName") {
-        return {
-          Succeeded: "执行完成(成功)",
-          Processing: "执行中...",
-          Failed: "执行完成(失败)",
-          Enqueued: "等待执行",
-        }[row[column.property]];
-      }
-      if (column.property == "createdAt") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    handleDownload(row) {
-      if (row.stateName == "Succeeded") {
-        this.downloadErrData(row.downFileName);
-      } else if (row.stateName == "Failed") {
-        this.downloadErrData(row.error);
-      }
-    },
-    getList() {
-      this.listLoading = true;
-      //导入界面中超链接过来的参数
-      this.listQuery.name = "看板结算数量差异输出";
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    // fetchData(id) {
-    //   //循环动态，取客户名称
-    //   this.$axios
-    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-    //     .then((response) => {
-    //       this.form = response;
-    //     });
-    // },
-    resetQuery() {},
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      var item = this.list[rowIndex];
-      if (column.property === "stateName") {
-        if (item.stateName === "Succeeded") {
-          return { color: "#71d87f", cursor: "pointer" };
-        } else if (item.stateName === "Processing") {
-          return { color: "#d87171", cursor: "pointer" };
-        } else if (item.stateName === "Failed") {
-          return { color: "#ff5640", cursor: "pointer" };
-        }
-      }
-      return { textAlign: "left" };
-      //}
-    },
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "stateName") {
-        return { textAlign: "center" };
-      }
-      return { textAlign: "center" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-@import "../../styles/steps.scss";
-
-/deep/ .el-checkbox input:focus {
-  outline: none !important;
-  border-color: gray;
-  border: 0px;
-  box-shadow: none !important;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue b/code/WebApp/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue
deleted file mode 100644
index 1ac96886..00000000
--- a/code/WebApp/vue/src/views/ux/billManage/kanBanWithOutCode/index.vue
+++ /dev/null
@@ -1,1357 +0,0 @@
-<!--大众看板-无条码-结算与交货核对-->
-<template>
-  <div class="cr-body-content">
-    <!--功能栏-->
-    <!-- 搜索 -->
-    <div style="float: left">
-      <flexbox class="content-header">
-        <JobSelectVerson
-          :options="JobVersionList"
-          style="width: 150px; margin-left: -10px"
-          class="search-container"
-          @value-change="JobVersionValue"
-        ></JobSelectVerson>
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleCreate"
-          >统计
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete()"
-          >删除(支持批量)</el-button
-        >
-        <el-button
-          class="filter-item"
-          type="success"
-          icon="el-icon-check"
-          size="mini"
-          @click="handleConfirm()"
-          >已确认(支持批量)</el-button
-        >
-        <el-button
-          class="filter-item"
-          type="warning"
-          icon="el-icon-edit"
-          size="mini"
-          v-loading="formLoading"
-          @click="handleCreateBills()"
-          >生成出库单(支持批量)</el-button
-        >
-      </flexbox>
-    </div>
-    <!-- 刷新 -->
-    <div style="float: right">
-      <flexbox class="content-header">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="手动刷新"
-          placement="top"
-        >
-          <el-button
-            size="mini"
-            circle
-            icon="el-icon-refresh"
-            @click="refresh()"
-          />
-        </el-tooltip>
-
-        <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔3分钟进行自动刷新！</span
-        >
-      </flexbox>
-    </div>
-
-    <!--主页面表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @row-click="handleRowClick"
-      @selection-change="handleSelectionChange"
-      @filter-change="filterChange"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-
-      <!-- 操作名称 -->
-      <!-- <el-table-column
-        prop="actionName"
-        label="操作名称(单击箭头过滤)"
-        width="165"
-        column-key="actionName"
-        :filters="[
-          { text: '导出', value: '导出' },
-          { text: '消息', value: '消息' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <div align="center">
-            <el-tag
-              v-for="(item, index) in menuCateMap"
-              v-show="scope.row.actionName == item.value"
-              :key="index"
-              :type="item.cssName"
-            >
-              {{ item.label }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column> -->
-      <!-- 状态 -->
-      <el-table-column
-        prop="stateName"
-        label="状态(单击箭头过滤)"
-        width="165"
-        column-key="stateName"
-        align="center"
-        :filters="[
-          { text: '执行完成(任务成功)', value: 'Succeeded' },
-          { text: '执行完成(任务失败)', value: 'Failed' },
-          { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: 'Scheduled' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            v-for="(item, index) in stateNameCateMap"
-            v-show="scope.row.stateName == item.value"
-            :key="index"
-            :type="item.cssName"
-          >
-            {{ item.label }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="250">
-        <template slot-scope="scope">
-          <div align="center">
-            <!-- <el-button
-              v-if="scope.row.actionName == '导出'"
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            > -->
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.stateName == 'Succeeded' &&
-                scope.row.downFileName != ''
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            >
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.error != '' &&
-                scope.row.stateName == 'Succeeded'
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >检验失败，下载</el-button
-            >
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-    <div class="table-footer">
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-
-    <!-- 任务日志详细 -->
-    <el-dialog
-      title="任务详细"
-      :visible.sync="openView"
-      width="700px"
-      append-to-body
-    >
-      <el-form ref="form" :model="form" label-width="120px" size="mini">
-        <el-row>
-          <el-col :span="24">
-            <div class="overall">
-              <!-- 步骤条 -->
-              <div class="steps-box">
-                <ul class="steps">
-                  <li
-                    v-for="(item, index) in stepList"
-                    :key="index"
-                    :class="{ active: activeIndex - 1 === index }"
-                  >
-                    <p :class="{ li_active: activeIndex > index }">
-                      <i :class="item.icon"></i>
-                    </p>
-                    <div
-                      class="text"
-                      :class="{ li_active: activeIndex > index }"
-                    >
-                      {{ item.title }}
-                    </div>
-                  </li>
-                </ul>
-              </div>
-              <!-- 步骤条对应内容 -->
-              <div class="Article-content">
-                <el-tabs v-model="activeName">
-                  <el-tab-pane label="基本信息" name="first">
-                    <div class="dialog-body">
-                      <div
-                        class="content"
-                        v-for="(item, index) in stepList"
-                        :key="index"
-                        v-show="activeIndex == index + 1"
-                      >
-                        <div>
-                          <el-card style="height: 300px; margin: 2px">
-                            <div
-                              v-if="activeIndex == 1"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：等待执行</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 2"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：执行中...</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 3"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <div id="chatarea">
-                                <div
-                                  style="display: inline; color: #71d87f"
-                                  v-if="form.stateName == 'Succeeded'"
-                                >
-                                  执行结果：执行成功
-                                </div>
-                                <div
-                                  style="display: inline; color: #ff5640"
-                                  v-else-if="form.stateName == 'Failed'"
-                                >
-                                  执行结果：执行失败
-                                </div>
-                              </div>
-                            </div>
-                            <div>
-                              <el-col :span="12">
-                                <el-form-item label="模块名称：">{{
-                                  form.name
-                                }}</el-form-item>
-                                <el-form-item label="操作名称：">{{
-                                  form.actionName
-                                }}</el-form-item>
-                              </el-col>
-                              <el-col :span="12">
-                                <el-form-item label="创建人：">{{
-                                  form.creator
-                                }}</el-form-item>
-                                <el-form-item label="创建时间：">
-                                  <el-date-picker
-                                    value-format="yyyy-MM-dd hh:mm:ss"
-                                    format="yyyy-MM-dd hh:mm:ss"
-                                    v-model="form.createdAt"
-                                    type="date"
-                                    class="picker"
-                                    disabled
-                                  ></el-date-picker>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="24">
-                                <el-form-item
-                                  label="异常信息："
-                                  style="color: #ff5640"
-                                  v-if="form.stateName == 'Failed'"
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.error)"
-                                    >下载错误数据</el-button
-                                  >
-                                </el-form-item>
-                                <el-form-item
-                                  label="生成数据："
-                                  style="color: #ff5640"
-                                  v-else-if="
-                                    form.stateName == 'Succeeded' &&
-                                    form.actionName == '导出'
-                                  "
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.downFileName)"
-                                    >下载生成数据</el-button
-                                  >
-                                </el-form-item>
-                              </el-col>
-                            </div>
-                          </el-card>
-                        </div>
-                      </div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="openView = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!--统计功能表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="680px"
-    >
-      <el-form
-        ref="formCount"
-        :inline="true"
-        :rules="rules"
-        :model="formCount"
-        size="mini"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="选择版本" required />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="versionValue">
-              <el-select
-                v-model="formCount.versionValue"
-                size="medium"
-                clearable
-                style="width: 188px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in versionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="物料组(车型)" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialGroupValue">
-              <el-select
-                v-model="formCount.materialGroupValue"
-                size="medium"
-                multiple
-                filterable
-                clearable
-                style="width: 380px; margin-right: 15px"
-                @change="valueChange"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in materialGroupList"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value"
-                >
-                  <span style="float: left">{{ item.label }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                    item.value
-                  }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="日期查询：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="startTime">
-              <el-date-picker
-                v-model="formCount.startTime"
-                type="datetime"
-                size="small"
-                :picker-options="pickerOptions0"
-                @change="getdateValue"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item prop="endTime">
-              <el-date-picker
-                v-model="formCount.endTime"
-                type="datetime"
-                :picker-options="pickerOptions1"
-                size="small"
-                @change="getdateVal"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="看板号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-input
-                type="textarea"
-                style="width: 170px"
-                v-model="formCount.kanBan"
-                :rows="5"
-                placeholder="多个看板号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="materialCode">
-              <el-input
-                type="textarea"
-                v-model="formCount.materialCode"
-                :rows="5"
-                style="width: 170px"
-                placeholder="多个客户零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="sapMaterialCode">
-              <el-input
-                v-model="formCount.sapMaterialCode"
-                :rows="5"
-                style="width: 450px"
-                type="textarea"
-                placeholder="多个厂内零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-input v-model="formCount.materialCode" />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item>
-              <el-input v-model="formCount.sapMaterialCode" />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
-
-export default {
-  name: "KanBanWithOutCode",
-  components: { Pagination, CRMTableHead, JobSelectVerson },
-  directives: { permission },
-
-  data() {
-    return {
-      crmType: "backJob",
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
-      pickerOptionsCp5: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      pickerOptions0: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          //return  time.getTime() >= new Date(this.endTime).getTime();
-          return time.getTime() > new Date(this.endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions1: {
-        disabledDate: (time) => {
-          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
-          return time.getTime() <= new Date(this.startTime).getTime();
-        },
-      },
-      startTime: "",
-      endTime: "",
-      pickerOptionsCp7: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      datetime5: [],
-      datetime7: [],
-      checkedCities: [0],
-      JobVersionList: [],
-      getmaterialGroupValue: "",
-      selectValue: "",
-      selectNameValue: "",
-      radio: "0", //结算状态：0未结 1部分结算
-      versionList: [],
-      materialGroupList: [],
-      // 是否显示详细弹出层
-      openView: false,
-      versionValue: "",
-      materialGroupValue: "",
-      formTitle: "",
-      timer: null, //定时器名称
-      //当前位置
-      activeIndex: 1,
-      //默认显示基本信息
-      activeName: "first",
-      //步骤条步数
-      stepList: [
-        {
-          title: "等待执行",
-          icon: "el-icon-sort",
-        },
-        {
-          title: "执行中",
-          icon: "el-icon-refresh",
-        },
-        {
-          title: "执行完成",
-          icon: "el-icon-check",
-        },
-      ],
-      listBillQuery: {
-        version: "",
-        guids: [],
-      },
-      customerInfos: "",
-      searchContent: "", // 输入内容
-      JobversionValue: "",
-      JobversionValueVerson: "",
-      form: {},
-      formCount: {
-        name: "未结算对比",
-        // datetime5: [],
-        // datetime7: [],
-        kanBan: "", //看板
-        settledate: "",
-        materialCode: "", //客户物料号
-        sapMaterialCode: "", //厂内物料号
-        chassisNumber: "",
-        kennCode: "",
-        version: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listExportQuery: {
-        version: undefined,
-        kanBan: undefined, //看板
-        customerPartCode: undefined, //客户物料号
-        sapMaterialCode: undefined, //厂内物料号
-        cp7begin: undefined,
-        cp7end: undefined,
-        kenncode: undefined,
-        chassisNumber: undefined,
-        estimateTypeDesc: undefined, //物料组车型
-        begin: undefined,
-        end: undefined,
-      },
-      listQuery: {
-        taskId: "",
-        name: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      menuCateMap: [
-        { label: "导出", value: "导出", cssName: "warning" },
-        { label: "消息", value: "消息", cssName: "info" },
-      ],
-      stateNameCateMap: [
-        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
-        { label: "执行中...", value: "Processing", cssName: "primary" },
-        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
-        { label: "等待执行", value: "Scheduled", cssName: "primary" },
-      ],
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-    this.timer = setInterval(() => {
-      this.listQuery.taskId = "";
-      this.listQuery.stateName = "";
-      setTimeout(this.getList, 0);
-    }, 1000 * 180); //30秒刷新一次页面
-    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once("hook:beforeDestroy", () => {
-      clearInterval(timer);
-    });
-    //this.disabledDateCp5();
-  },
-  created() {
-    this.getAllVersionList();
-    this.getMaterialGroup();
-    this.getList();
-    this.getJobVersionInfo();
-    // this.getCurrentMonthFirst();
-    // this.getCurrentMonthLast();
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-  computed: {
-    /* 主表头 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "版本号",
-        prop: "type",
-        width: 85,
-      });
-      tempsTabs.push({
-        label: "单据流水号",
-        prop: "taskId",
-        width: 120,
-      });
-      // tempsTabs.push({
-      //   label: "模块名称",
-      //   prop: "name",
-      //   width: 170,
-      // });
-      tempsTabs.push({
-        label: "创建人",
-        prop: "email",
-        width: 110,
-      });
-      tempsTabs.push({
-        label: "创建时间",
-        prop: "createdAt",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "说明",
-        prop: "remark",
-        width: 220,
-      });
-      tempsTabs.push({
-        label: "审批状态",
-        prop: "fileName",
-        width: 350,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    //批量删除
-    handleDelete(row) {
-      this.isEdit = false;
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      } else {
-        var getbillNum = "";
-        //判断已经生成出库单的不能执行删除操作
-        this.multipleSelection.forEach((element) => {
-          let state = element.fileName;
-          if (state != "" && state != "已确认") {
-            this.isEdit = true;
-            getbillNum += state + ",";
-          }
-        });
-      }
-      if (this.isEdit == true) {
-        this.$message({
-          message:
-            "已经生成出库单的不能删除！单号：" +
-            getbillNum.substr(0, getbillNum.length - 1),
-          type: "warning",
-        });
-        return;
-      } else {
-        var params = [];
-        let myalert = ""; //声明变量，其变量必须在此声明后使用
-        if (row) {
-          //单行
-          params.push(row.id);
-          myalert = row.name;
-        } else {
-          //多选
-          this.multipleSelection.forEach((element) => {
-            let id = element.id;
-            params.push(id);
-          });
-          myalert = "选中项";
-        }
-        this.$confirm("是否删除" + myalert + "?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.$axios
-              .posts("/api/settleaccount/Job/delete", params)
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.$notify({
-                  title: "成功",
-                  message: "删除成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getList();
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消操作",
-            });
-          });
-      }
-    },
-    //已确认
-    handleConfirm(row) {
-      this.isEdit = false;
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      } else {
-        var getbillNum = "";
-        //判断已经生成出库单的不能再生成出库操作
-        this.multipleSelection.forEach((element) => {
-          let state = element.fileName;
-          if (state != "" && state != "已确认") {
-            this.isEdit = true;
-            getbillNum += state + ",";
-          }
-        });
-      }
-      if (this.isEdit == true) {
-        this.$message({
-          message:
-            "已经生成出库单的不能再确认！单号：" +
-            getbillNum.substr(0, getbillNum.length - 1),
-          type: "warning",
-        });
-        return;
-      } else {
-        var params = [];
-        let myalert = ""; //声明变量，其变量必须在此声明后使用
-        if (row) {
-          //单行
-          params.push(row.id);
-          myalert = row.name;
-        } else {
-          //多选
-          this.multipleSelection.forEach((element) => {
-            let id = element.id;
-            params.push(id);
-          });
-          myalert = "选中项";
-        }
-        this.$confirm("是否确认" + myalert + "?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.$axios
-              .posts(
-                "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPutAudit",
-                params
-              )
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.$notify({
-                  title: "成功",
-                  message: "操作成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getList();
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消操作",
-            });
-          });
-      }
-    },
-    //出库单
-    handleCreateBills(row) {
-      this.isEdit = false;
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      } else {
-        var getbillNum = "";
-        //判断已经生成出库单的不能再生成出库操作
-        this.multipleSelection.forEach((element) => {
-          let state = element.fileName;
-          if (state != "" && state != "已确认") {
-            this.isEdit = true;
-            getbillNum += state + ",";
-          }
-        });
-      }
-      if (this.isEdit == true) {
-        this.$message({
-          message:
-            "已经生成出库单的不能再重新生成！单号：" +
-            getbillNum.substr(0, getbillNum.length - 1),
-          type: "warning",
-        });
-        return;
-      } else {
-        var params = [];
-        let myalert = ""; //声明变量，其变量必须在此声明后使用
-        if (row) {
-          //单行
-          params.push(row.id);
-          myalert = row.name;
-        } else {
-          //多选
-          this.multipleSelection.forEach((element) => {
-            let id = element.id;
-            params.push(id);
-          });
-          myalert = "选中项";
-        }
-        this.listBillQuery.guids = params;
-        this.listBillQuery.version = this.JobversionValue;
-        console.log("出库单条件：" + JSON.stringify(this.listBillQuery));
-        this.$confirm("是否确认出库" + myalert + "?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.formLoading = true;
-            this.$axios
-              .posts(
-                "/api/settleaccount/wmskanbanoutput/WmsWithOutKanbanOutPut",
-                this.listBillQuery
-              )
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.$notify({
-                  title: "成功",
-                  message: "生成成功",
-                  type: "success",
-                  duration: 2000,
-                });
-
-                this.getList();
-                this.formLoading = false;
-              })
-              .catch(() => {
-                this.formLoading = false;
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消操作",
-            });
-          });
-      }
-    },
-    valueChange(data) {
-      this.getmaterialGroupValue = "";
-      this.getmaterialGroupValue += data + ",";
-      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
-        0,
-        this.getmaterialGroupValue.length - 1
-      );
-    },
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.JobversionValue = params.value;
-      this.getList();
-    },
-    getJobVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
-        .then((response) => {
-          this.JobVersionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element;
-            options.label = element;
-            this.JobVersionList.push(options);
-          });
-          if (JSON.stringify(this.JobVersionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.JobversionValue = this.JobVersionList[0].value;
-            this.JobversionValueVerson = this.JobVersionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    getdateValue(val) {
-      this.startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateVal(val) {
-      this.endTime = val;
-      this.getbalanceIndexData();
-    },
-
-    getCurrentMonthFirst() {
-      var date = new Date();
-      date.setDate(1);
-      var month = parseInt(date.getMonth() + 1);
-      var day = date.getDate();
-      if (month < 10) month = "0" + month;
-      if (day < 10) day = "0" + day;
-      this.startTime = date.getFullYear() + "-" + month + "-" + day;
-    },
-    getCurrentMonthLast() {
-      var date = new Date();
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      month = month < 10 ? "0" + month : month;
-      var day = new Date(year, month, 0);
-      this.endTime = year + "-" + month + "-" + day.getDate();
-    },
-    handleCheckedCitiesChange(value) {
-      alert(value);
-    },
-
-    getAllVersionList() {
-      this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
-        .then((response) => {
-          this.versionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //获取物料组车型
-    getMaterialGroup() {
-      this.$axios
-        .posts("/api/settleaccount/CodeSetting/list", {
-          project: "物料组",
-          maxResultCount: 1000,
-          skipCount: 0,
-          sorting: "value ascending",
-        })
-        .then((response) => {
-          this.materialGroupList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.description;
-            options.label = element.value;
-            this.materialGroupList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /* 重置 */
-    resetForm(formName) {
-      this.formCount = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      // this.datetime7 = [];
-    },
-    save() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue; //版本
-          if (this.formCount.kanBan != "") {
-            this.listExportQuery.kanBan = this.formCount.kanBan; //看板
-          }
-          if (this.formCount.materialCode != "") {
-            this.listExportQuery.customerPartCode = this.formCount.materialCode; //物料号
-          }
-          if (this.formCount.sapMaterialCode != "") {
-            this.listExportQuery.sapMaterialCode =
-              this.formCount.sapMaterialCode; //厂内物料号
-          }
-          if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
-          }
-          this.listExportQuery.begin = this.startTime
-            ? this.startTime
-            : undefined;
-          this.listExportQuery.end = this.endTime ? this.endTime : undefined;
-          console.log(
-            "大众看板结算与交货核对明细表-导出条件：" +
-              JSON.stringify(this.listExportQuery)
-          );
-          this.$axios
-            .posts(
-              "/api/settleaccount/ReportMakeService/SettleKanBan-WithOutCode",
-              this.listExportQuery
-            )
-            .then((res) => {
-              let taskid = res;
-              if (Number.isInteger(taskid)) {
-                this.$notify({
-                  title: "成功",
-                  message: "任务生成成功！任务号:" + taskid,
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.getList();
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            });
-        }
-      });
-    },
-    handleCreate() {
-      // this.$nextTick(() => {
-      //   this.$refs["formCount"].resetFields();
-      // });
-      if (this.$refs["formCount"] !== undefined) {
-        this.$refs["formCount"].resetFields();
-      }
-      this.formTitle = "报表统计";
-      this.isEdit = false;
-      this.form = {};
-      this.dialogFormVisible = true;
-    },
-    filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
-    },
-    /* 任务详细信息 */
-    handleView(row) {
-      this.listQuery.taskId = row.taskId;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.form = response[0];
-          switch (response[0].stateName) {
-            case "Succeeded":
-            case "Failed":
-              this.activeIndex = 3;
-              break;
-            case "Processing":
-              this.activeIndex = 2;
-              break;
-            case "Enqueued":
-              this.activeIndex = 1;
-              break;
-          }
-          this.openView = true;
-        });
-    },
-    /*  刷新  */
-    refresh() {
-      this.list = [];
-      this.listQuery.taskId = "";
-      this.listQuery.name = "";
-      this.getList();
-    },
-    // 监听筛选项的变化
-    filterChange(filterObj) {
-      console.log(filterObj.actionName);
-      if (filterObj.actionName.length > 0) {
-        console.log("点击筛选");
-      } else {
-        console.log("点击重置");
-      }
-    },
-    /* 导出类型的文件 */
-    downloadErrData(param) {
-      this.listLoading = true;
-      let fileNameOfProject = param;
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
-    },
-    /* 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /* 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "stateName") {
-        return {
-          Succeeded: "执行完成(成功)",
-          Processing: "执行中...",
-          Failed: "执行完成(失败)",
-          Enqueued: "等待执行",
-        }[row[column.property]];
-      }
-      if (column.property == "createdAt") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    handleDownload(row) {
-      if (row.stateName == "Succeeded") {
-        this.downloadErrData(row.downFileName);
-      } else if (row.stateName == "Failed") {
-        this.downloadErrData(row.error);
-      }
-    },
-    getList() {
-      this.listLoading = true;
-      //导入界面中超链接过来的参数
-      this.listQuery.name = "无条码看板结算输出";
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    // fetchData(id) {
-    //   //循环动态，取客户名称
-    //   this.$axios
-    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-    //     .then((response) => {
-    //       this.form = response;
-    //     });
-    // },
-    resetQuery() {},
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      var item = this.list[rowIndex];
-      if (column.property === "fileName") {
-        if (item.fileName === "已确认") {
-          return { color: "#13CE66", cursor: "pointer", fontWeight: 700 };
-        } else {
-          return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 };
-        }
-      }
-      return { textAlign: "left" };
-      //}
-    },
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "stateName") {
-        return { textAlign: "center" };
-      }
-      return { textAlign: "center" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-@import "../../styles/steps.scss";
-
-/deep/ .el-checkbox input:focus {
-  outline: none !important;
-  border-color: gray;
-  border: 0px;
-  box-shadow: none !important;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/ux/billManage/sparePart/index.vue b/code/WebApp/vue/src/views/ux/billManage/sparePart/index.vue
deleted file mode 100644
index 567066e5..00000000
--- a/code/WebApp/vue/src/views/ux/billManage/sparePart/index.vue
+++ /dev/null
@@ -1,1344 +0,0 @@
-<!--大众备件结算核对-->
-<template>
-  <div class="cr-body-content">
-    <!--功能栏-->
-    <!-- 搜索 -->
-    <div style="float: left">
-      <flexbox class="content-header">
-        <JobSelectVerson
-          :options="JobVersionList"
-          style="width: 150px; margin-left: -10px"
-          class="search-container"
-          @value-change="JobVersionValue"
-        ></JobSelectVerson>
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleCreate"
-          >统计
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete()"
-          >删除(支持批量)</el-button
-        >
-        <el-button
-          class="filter-item"
-          type="success"
-          icon="el-icon-check"
-          size="mini"
-          @click="handleCreateBills()"
-          >生成出库单(支持批量)</el-button
-        >
-        <el-button
-          class="filter-item"
-          type="success"
-          icon="el-icon-check"
-          size="mini"
-          @click="handleConfirm()"
-          >已确认</el-button
-        >
-      </flexbox>
-    </div>
-    <!-- 刷新 -->
-    <div style="float: right">
-      <flexbox class="content-header">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="手动刷新"
-          placement="top"
-        >
-          <el-button
-            size="mini"
-            circle
-            icon="el-icon-refresh"
-            @click="refresh()"
-          />
-        </el-tooltip>
-
-        <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
-        >
-      </flexbox>
-    </div>
-
-    <!--主页面表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @row-click="handleRowClick"
-      @selection-change="handleSelectionChange"
-      @filter-change="filterChange"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-
-      <!-- 操作名称 -->
-      <el-table-column
-        prop="actionName"
-        label="操作名称(单击箭头过滤)"
-        width="165"
-        column-key="actionName"
-        :filters="[
-          { text: '导出', value: '导出' },
-          { text: '消息', value: '消息' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <div align="center">
-            <el-tag
-              v-for="(item, index) in menuCateMap"
-              v-show="scope.row.actionName == item.value"
-              :key="index"
-              :type="item.cssName"
-            >
-              {{ item.label }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column>
-      <!-- 状态 -->
-      <el-table-column
-        prop="stateName"
-        label="状态(单击箭头过滤)"
-        width="165"
-        column-key="stateName"
-        align="center"
-        :filters="[
-          { text: '执行完成(任务成功)', value: 'Succeeded' },
-          { text: '执行完成(任务失败)', value: 'Failed' },
-          { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: 'Scheduled' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            v-for="(item, index) in stateNameCateMap"
-            v-show="scope.row.stateName == item.value"
-            :key="index"
-            :type="item.cssName"
-          >
-            {{ item.label }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="250">
-        <template slot-scope="scope">
-          <div align="center">
-            <!-- <el-button
-              v-if="scope.row.actionName == '导出'"
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            > -->
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.stateName == 'Succeeded' &&
-                scope.row.downFileName != ''
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            >
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.error != '' &&
-                scope.row.stateName == 'Succeeded'
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >检验失败，下载</el-button
-            >
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-    <div class="table-footer">
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-
-    <!-- 任务日志详细 -->
-    <el-dialog
-      title="任务详细"
-      :visible.sync="openView"
-      width="700px"
-      append-to-body
-    >
-      <el-form ref="form" :model="form" label-width="120px" size="mini">
-        <el-row>
-          <el-col :span="24">
-            <div class="overall">
-              <!-- 步骤条 -->
-              <div class="steps-box">
-                <ul class="steps">
-                  <li
-                    v-for="(item, index) in stepList"
-                    :key="index"
-                    :class="{ active: activeIndex - 1 === index }"
-                  >
-                    <p :class="{ li_active: activeIndex > index }">
-                      <i :class="item.icon"></i>
-                    </p>
-                    <div
-                      class="text"
-                      :class="{ li_active: activeIndex > index }"
-                    >
-                      {{ item.title }}
-                    </div>
-                  </li>
-                </ul>
-              </div>
-              <!-- 步骤条对应内容 -->
-              <div class="Article-content">
-                <el-tabs v-model="activeName">
-                  <el-tab-pane label="基本信息" name="first">
-                    <div class="dialog-body">
-                      <div
-                        class="content"
-                        v-for="(item, index) in stepList"
-                        :key="index"
-                        v-show="activeIndex == index + 1"
-                      >
-                        <div>
-                          <el-card style="height: 300px; margin: 2px">
-                            <div
-                              v-if="activeIndex == 1"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：等待执行</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 2"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <span>当前状态：执行中...</span>
-                            </div>
-                            <div
-                              v-else-if="activeIndex == 3"
-                              slot="header"
-                              class="clearfix"
-                            >
-                              <div id="chatarea">
-                                <div
-                                  style="display: inline; color: #71d87f"
-                                  v-if="form.stateName == 'Succeeded'"
-                                >
-                                  执行结果：执行成功
-                                </div>
-                                <div
-                                  style="display: inline; color: #ff5640"
-                                  v-else-if="form.stateName == 'Failed'"
-                                >
-                                  执行结果：执行失败
-                                </div>
-                              </div>
-                            </div>
-                            <div>
-                              <el-col :span="12">
-                                <el-form-item label="模块名称：">{{
-                                  form.name
-                                }}</el-form-item>
-                                <el-form-item label="操作名称：">{{
-                                  form.actionName
-                                }}</el-form-item>
-                              </el-col>
-                              <el-col :span="12">
-                                <el-form-item label="创建人：">{{
-                                  form.creator
-                                }}</el-form-item>
-                                <el-form-item label="创建时间：">
-                                  <el-date-picker
-                                    value-format="yyyy-MM-dd hh:mm:ss"
-                                    format="yyyy-MM-dd hh:mm:ss"
-                                    v-model="form.createdAt"
-                                    type="date"
-                                    class="picker"
-                                    disabled
-                                  ></el-date-picker>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="24">
-                                <el-form-item
-                                  label="异常信息："
-                                  style="color: #ff5640"
-                                  v-if="form.stateName == 'Failed'"
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.error)"
-                                    >下载错误数据</el-button
-                                  >
-                                </el-form-item>
-                                <el-form-item
-                                  label="生成数据："
-                                  style="color: #ff5640"
-                                  v-else-if="
-                                    form.stateName == 'Succeeded' &&
-                                    form.actionName == '导出'
-                                  "
-                                >
-                                  <el-button
-                                    class="result-info__btn--err"
-                                    type="text"
-                                    @click="downloadErrData(form.downFileName)"
-                                    >下载生成数据</el-button
-                                  >
-                                </el-form-item>
-                              </el-col>
-                            </div>
-                          </el-card>
-                        </div>
-                      </div>
-                    </div>
-                  </el-tab-pane>
-                </el-tabs>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="openView = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!--统计功能表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="680px"
-    >
-      <el-form
-        ref="formCount"
-        :inline="true"
-        :rules="rules"
-        :model="formCount"
-        size="mini"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="选择版本" required />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="versionValue">
-              <el-select
-                v-model="formCount.versionValue"
-                size="medium"
-                clearable
-                style="width: 188px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in versionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="物料组(车型)" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialGroupValue">
-              <el-select
-                v-model="formCount.materialGroupValue"
-                size="medium"
-                multiple
-                filterable
-                clearable
-                style="width: 380px; margin-right: 15px"
-                @change="valueChange"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in materialGroupList"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value"
-                >
-                  <span style="float: left">{{ item.label }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                    item.value
-                  }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP5时间：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-date-picker
-                v-model="cp5startTime"
-                :picker-options="pickerOptions2"
-                type="datetime"
-                size="small"
-                @change="getdateValueCp5"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item>
-              <el-date-picker
-                v-model="cp5endTime"
-                :picker-options="pickerOptions3"
-                type="datetime"
-                size="small"
-                @change="getdateValCp5"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP7时间：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-date-picker
-                v-model="startTime"
-                type="datetime"
-                size="small"
-                :picker-options="pickerOptions0"
-                @change="getdateValue"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item>
-              <el-date-picker
-                v-model="endTime"
-                type="datetime"
-                :picker-options="pickerOptions1"
-                size="small"
-                @change="getdateVal"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="KEEN号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="kennCode">
-              <el-input
-                type="textarea"
-                v-model="formCount.kennCode"
-                style="width: 170px"
-                :rows="4"
-                placeholder="多个KENN号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="底盘号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="chassisNumber">
-              <el-input
-                v-model="formCount.chassisNumber"
-                style="width: 170px"
-                type="textarea"
-                :rows="4"
-                placeholder="多个底盘号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialCode">
-              <el-input
-                v-model="formCount.materialCode"
-                style="width: 170px"
-                type="textarea"
-                :rows="4"
-                placeholder="多个客户零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="sapCode">
-              <el-input
-                v-model="formCount.sapCode"
-                style="width: 170px"
-                type="textarea"
-                :rows="4"
-                placeholder="多个厂内零件号，请以回车换行形式添加！"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import moment from "moment";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
-
-export default {
-  name: "SparePartReport",
-  components: { Pagination, CRMTableHead, JobSelectVerson },
-  directives: { permission },
-
-  data() {
-    return {
-      crmType: "backJob",
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
-      pickerOptionsCp5: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      pickerOptions0: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          //return  time.getTime() >= new Date(this.endTime).getTime();
-          return time.getTime() > new Date(this.endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions1: {
-        disabledDate: (time) => {
-          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
-          return time.getTime() <= new Date(this.startTime).getTime();
-        },
-      },
-      pickerOptions1: {
-        disabledDate: (time) => {
-          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
-          return time.getTime() <= new Date(this.startTime).getTime();
-        },
-      },
-
-      pickerOptions2: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          return time.getTime() > new Date(this.cp5endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions3: {
-        disabledDate: (time) => {
-          return time.getTime() <= new Date(this.cp5startTime).getTime();
-        },
-      },
-      startTime: "",
-      endTime: "",
-      pickerOptionsCp7: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      datetime5: [],
-      JobVersionList: [],
-      datetime7: [],
-      checkedCities: [0],
-      selectValue: "",
-      selectNameValue: "",
-      radio: "0", //结算状态：0未结 1部分结算
-      versionList: [],
-      materialGroupList: [],
-      getmaterialGroupValue: "",
-      // 是否显示详细弹出层
-      openView: false,
-      versionValue: "",
-      materialGroupValue: "",
-      formTitle: "",
-      timer: null, //定时器名称
-      //当前位置
-      activeIndex: 1,
-      //默认显示基本信息
-      activeName: "first",
-      //步骤条步数
-      stepList: [
-        {
-          title: "等待执行",
-          icon: "el-icon-sort",
-        },
-        {
-          title: "执行中",
-          icon: "el-icon-refresh",
-        },
-        {
-          title: "执行完成",
-          icon: "el-icon-check",
-        },
-      ],
-      customerInfos: "",
-      searchContent: "", // 输入内容
-      form: {},
-      formCount: {
-        startTime: "",
-        endTime: "",
-        cp5startTime: "",
-        cp5endTime: "",
-        // name: "未结算对比",
-        // settledate: "",
-        // materialCode: "",
-        // sapMaterialCode: "",
-        // chassisNumber: "",
-        // kennCode: "",
-        // version: "",
-      },
-      cp5startTime: "",
-      cp5endTime: "",
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listExportQuery: {
-        version: "",
-        materialCode: undefined,
-        cp7begin: undefined,
-        cp7end: undefined,
-        kenncode: undefined,
-        chassisNumber: undefined,
-        materialGroup: undefined,
-        begin: undefined,
-        end: undefined,
-      },
-      listQuery: {
-        taskId: "",
-        name: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      menuCateMap: [
-        { label: "导出", value: "导出", cssName: "warning" },
-        { label: "消息", value: "消息", cssName: "info" },
-      ],
-      stateNameCateMap: [
-        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
-        { label: "执行中...", value: "Processing", cssName: "primary" },
-        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
-        { label: "等待执行", value: "Scheduled", cssName: "primary" },
-      ],
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-    this.timer = setInterval(() => {
-      this.listQuery.taskId = "";
-      this.listQuery.stateName = "";
-      setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
-    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once("hook:beforeDestroy", () => {
-      clearInterval(timer);
-    });
-    //this.disabledDateCp5();
-  },
-  created() {
-    this.getAllVersionList();
-    this.getMaterialGroup();
-    this.getList();
-    this.getJobVersionInfo();
-    // this.getCurrentMonthFirst();
-    // this.getCurrentMonthLast();
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-  computed: {
-    /* 主表头 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "版本号",
-        prop: "type",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "单据流水号",
-        prop: "taskId",
-        width: 130,
-      });
-      tempsTabs.push({
-        label: "模块名称",
-        prop: "name",
-        width: 170,
-      });
-      tempsTabs.push({
-        label: "创建人",
-        prop: "email",
-        width: 110,
-      });
-      tempsTabs.push({
-        label: "创建时间",
-        prop: "createdAt",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "说明",
-        prop: "remark",
-        width: 220,
-      });
-      tempsTabs.push({
-        label: "审批状态",
-        prop: "fileName",
-        width: 150,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    //cp5
-    getdateValueCp5(val) {
-      this.cp5startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateValCp5(val) {
-      this.cp5endTime = val;
-      this.getbalanceIndexData();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    //批量删除
-    handleDelete(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/Job/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    handleConfirm(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否确认" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccounWmsJitOutPutt/wms/", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "生成成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    //出库单
-    handleCreateBills(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否确认出库" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/wms/WmsJitOutPut", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "生成成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    valueChange(data) {
-      this.getmaterialGroupValue = "";
-      this.getmaterialGroupValue += data + ",";
-      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
-        0,
-        this.getmaterialGroupValue.length - 1
-      );
-    },
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.JobversionValue = params.value;
-      this.getList();
-    },
-    getJobVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
-        .then((response) => {
-          this.JobVersionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element;
-            options.label = element;
-            this.JobVersionList.push(options);
-          });
-          if (JSON.stringify(this.JobVersionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.JobversionValue = this.JobVersionList[0].value;
-            this.JobversionValueVerson = this.JobVersionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    getdateValue(val) {
-      this.startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateVal(val) {
-      this.endTime = val;
-      this.getbalanceIndexData();
-    },
-
-    getCurrentMonthFirst() {
-      var date = new Date();
-      date.setDate(1);
-      var month = parseInt(date.getMonth() + 1);
-      var day = date.getDate();
-      if (month < 10) month = "0" + month;
-      if (day < 10) day = "0" + day;
-      this.startTime = date.getFullYear() + "-" + month + "-" + day;
-    },
-    getCurrentMonthLast() {
-      var date = new Date();
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      month = month < 10 ? "0" + month : month;
-      var day = new Date(year, month, 0);
-      this.endTime = year + "-" + month + "-" + day.getDate();
-    },
-    handleCheckedCitiesChange(value) {
-      alert(value);
-    },
-
-    getAllVersionList() {
-      this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
-        .then((response) => {
-          this.versionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    getMaterialGroup() {
-      this.$axios
-        .posts("/api/settleaccount/CodeSetting/list", {
-          project: "物料组",
-          maxResultCount: 1000,
-          skipCount: 0,
-          sorting: "value ascending",
-        })
-        .then((response) => {
-          this.materialGroupList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.description;
-            options.label = element.value;
-            this.materialGroupList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /* 重置 */
-    resetForm(formName) {
-      this.formCount = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      this.cp5startTime = "";
-      this.cp5endTime = "";
-    },
-    save() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue; //版本
-          if (this.formCount.materialCode != "") {
-            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
-          }
-          if (this.formCount.sapCode != "") {
-            this.listExportQuery.sapCode = this.formCount.sapCode; //厂内物料号
-          }
-          if (this.formCount.kennCode != "") {
-            this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
-          }
-          this.listExportQuery.begin = this.cp5startTime
-            ? this.cp5startTime
-            : undefined;
-          this.listExportQuery.end = this.cp5endTime
-            ? this.cp5endTime
-            : undefined;
-          if (this.startTime != "") {
-            this.listExportQuery.cp7begin = this.startTime; //CP7开始时间
-          }
-          if (this.endTime != "") {
-            this.listExportQuery.cp7end = this.endTime; //CP5结束日期
-          }
-          if (this.formCount.chassisNumber != "") {
-            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
-          }
-          if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
-          }
-          console.log(
-            "大众备件结算核对-导出条件：" + JSON.stringify(this.listExportQuery)
-          );
-          this.$axios
-            .gets(
-              "/api/settleaccount/ReportMakeService/SettleDoorPanel",
-              this.listExportQuery
-            )
-            .then((res) => {
-              let taskid = res;
-              if (Number.isInteger(taskid)) {
-                this.$notify({
-                  title: "成功",
-                  message: "任务生成成功！任务号:" + taskid,
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.getList();
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            });
-        }
-      });
-    },
-    handleCreate() {
-      this.$nextTick(() => {
-        this.$refs["formCount"].resetFields();
-      });
-      this.formTitle = "报表统计";
-      this.isEdit = false;
-      this.form = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      this.cp5startTime = "";
-      this.cp5endTime = "";
-      this.dialogFormVisible = true;
-    },
-    filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
-    },
-    /* 任务详细信息 */
-    handleView(row) {
-      this.listQuery.taskId = row.taskId;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.form = response[0];
-          switch (response[0].stateName) {
-            case "Succeeded":
-            case "Failed":
-              this.activeIndex = 3;
-              break;
-            case "Processing":
-              this.activeIndex = 2;
-              break;
-            case "Enqueued":
-              this.activeIndex = 1;
-              break;
-          }
-          this.openView = true;
-        });
-    },
-    /*  刷新  */
-    refresh() {
-      this.list = [];
-      this.listQuery.taskId = "";
-      this.listQuery.name = "";
-      this.getList();
-    },
-    // 监听筛选项的变化
-    filterChange(filterObj) {
-      console.log(filterObj.actionName);
-      if (filterObj.actionName.length > 0) {
-        console.log("点击筛选");
-      } else {
-        console.log("点击重置");
-      }
-    },
-    /* 导出类型的文件 */
-    downloadErrData(param) {
-      this.listLoading = true;
-      let fileNameOfProject = param;
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
-    },
-    /* 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /* 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "stateName") {
-        return {
-          Succeeded: "执行完成(成功)",
-          Processing: "执行中...",
-          Failed: "执行完成(失败)",
-          Enqueued: "等待执行",
-        }[row[column.property]];
-      }
-      if (column.property == "createdAt") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    handleDownload(row) {
-      if (row.stateName == "Succeeded") {
-        this.downloadErrData(row.downFileName);
-      } else if (row.stateName == "Failed") {
-        this.downloadErrData(row.error);
-      }
-    },
-    getList() {
-      this.listLoading = true;
-      //导入界面中超链接过来的参数
-      this.listQuery.name = "备件结算数量差异输出";
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    // fetchData(id) {
-    //   //循环动态，取客户名称
-    //   this.$axios
-    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-    //     .then((response) => {
-    //       this.form = response;
-    //     });
-    // },
-    resetQuery() {},
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      var item = this.list[rowIndex];
-      if (column.property === "stateName") {
-        if (item.stateName === "Succeeded") {
-          return { color: "#71d87f", cursor: "pointer" };
-        } else if (item.stateName === "Processing") {
-          return { color: "#d87171", cursor: "pointer" };
-        } else if (item.stateName === "Failed") {
-          return { color: "#ff5640", cursor: "pointer" };
-        }
-      }
-      return { textAlign: "left" };
-      //}
-    },
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "stateName") {
-        return { textAlign: "center" };
-      }
-      return { textAlign: "center" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-@import "../../styles/steps.scss";
-
-/deep/ .el-checkbox input:focus {
-  outline: none !important;
-  border-color: gray;
-  border: 0px;
-  box-shadow: none !important;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/ux/billManage/vwOutOrder/detail.vue b/code/WebApp/vue/src/views/ux/billManage/vwOutOrder/detail.vue
deleted file mode 100644
index b3bea7bf..00000000
--- a/code/WebApp/vue/src/views/ux/billManage/vwOutOrder/detail.vue
+++ /dev/null
@@ -1,616 +0,0 @@
-<!--FIS发运数据对比输出表-明细数据-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <!-- <el-button
-        class="filter-item"
-        size="mini"
-        type="info"
-        icon="el-icon-download"
-        @click="handleDownload()"
-        >导出全部
-      </el-button> -->
-      <JobSelectVerson
-        :options="JobVersionList"
-        style="width: 150px; margin-left: -10px"
-        class="search-container"
-        @value-change="JobVersionValue"
-      ></JobSelectVerson>
-      <el-button
-        class="filter-item"
-        type="success"
-        icon="el-icon-check"
-        size="mini"
-        @click="handleCreateBills()"
-        >确认出库单(支持批量)</el-button
-      >
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-download"
-        @click="handleCancelBills()"
-        >取消出库(支持批量)
-      </el-button>
-      <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照零件号搜索..."
-        style="width: 230px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button>
-      <!--表格头组件，filter查询-->
-      <c-r-m-table-head
-        ref="crmTableHead"
-        :crm-type="crmType"
-        @handle="handleHandle"
-        @filter="handleFilters"
-      >
-      </c-r-m-table-head>
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import { downloadFile } from "@/utils/crmindex.js";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
-
-export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, CRMTableHead, JobSelectVerson },
-  directives: { permission },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "vwOutOrder",
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        parentId: "",
-        version: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      JobVersionList: [
-        { value: "0", label: "未处理" },
-        { value: "1", label: "申请出库" },
-        { value: "2", label: "确认出库" },
-        { value: "3", label: "不能出库" },
-        { value: "4", label: "取消出库" },
-      ],
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: "",
-      },
-      listOutPutQuery: {
-        version: "",
-        guids: "",
-        billNum: "",
-      },
-      page: 1,
-      JobversionValue: "",
-      JobversionValueVerson: "",
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 230,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfos: {
-      handler(newVal) {
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.parentId = element.ParentId;
-            this.customerInfo.version = element.Version;
-          });
-          if (this.customerInfo.parentId != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 110,
-      });
-      tempsTabs.push({
-        label: "零件号",
-        prop: "materialCode",
-        width: 150,
-      });
-      tempsTabs.push({ label: "KEEN号", prop: "kennCode", width: 170 });
-      tempsTabs.push({ label: "底盘号", prop: "chassisNumber", width: 190 });
-      tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 });
-      tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 });
-      tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 100 });
-      tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
-      tempsTabs.push({ label: "状态", prop: "state", width: 100 });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.listQuery.Filters = [];
-      var column = "state";
-      let filter = {
-        logic: 0,
-        column: column,
-        action: 0,
-        value: params.value,
-      };
-      this.listQuery.Filters.push(filter);
-      this.getList();
-    },
-    //取消出库单
-    handleCancelBills(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.listOutPutQuery.version = this.customerInfo.version;
-      this.listOutPutQuery.guids = params;
-      this.listOutPutQuery.billNum = this.customerInfo.parentId;
-      console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
-
-      this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts(
-              "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Cancel",
-              this.listOutPutQuery
-            )
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "操作成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    //出库单
-    handleCreateBills(row) {
-      if (this.multipleSelection.length == 0) {
-        this.listLoading = true;
-        this.listOutPutQuery.guids = [];
-        this.listOutPutQuery.version = this.customerInfo.version;
-        this.listOutPutQuery.billNum = this.customerInfo.parentId;
-        console.log(
-          "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
-        );
-        this.$confirm("是否全部确认出库?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.$axios
-              .posts(
-                "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass",
-                this.listOutPutQuery
-              )
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.$notify({
-                  title: "成功",
-                  message: "生成成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getList();
-                this.listLoading = false;
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消操作",
-            });
-            this.listLoading = false;
-          });
-      } else {
-        this.listLoading = true;
-        var params = [];
-        let myalert = ""; //声明变量，其变量必须在此声明后使用
-        if (row) {
-          //单行
-          params.push(row.id);
-          myalert = row.name;
-        } else {
-          //多选
-          this.multipleSelection.forEach((element) => {
-            let id = element.id;
-            params.push(id);
-          });
-          myalert = "选中项";
-        }
-        this.listOutPutQuery.version = this.customerInfo.version;
-        this.listOutPutQuery.guids = params;
-        this.listOutPutQuery.billNum = this.customerInfo.parentId;
-        console.log(
-          "部分选择时确认出库条件：" + JSON.stringify(this.listOutPutQuery)
-        );
-        this.$confirm("是否确认将选中的出库" + myalert + "?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.$axios
-              .posts(
-                "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass",
-                this.listOutPutQuery
-              )
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.$notify({
-                  title: "成功",
-                  message: "生成成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getList();
-                this.listLoading = false;
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消操作",
-            });
-            this.listLoading = false;
-          });
-      }
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property == "state") {
-        return {
-          0: "未处理",
-          1: "申请出库",
-          2: "确认出库",
-          3: "不能出库",
-          4: "取消出库",
-        }[row[column.property]];
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    async handleDownload() {
-      //await this.getDownBoms();
-      this.listLoading = true;
-      this.$axios
-        .gets(
-          "/api/settleaccount/bt-kb-not-consign/export/" +
-            this.customerInfo.parentId
-        )
-        .then((res) => {
-          let fileNameOfProject = res;
-          this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
-            .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
-                let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, fileNameOfProject);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      this.listQuery.billNum = this.customerInfo.parentId;
-      console.log("查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/settleaccount/wmsjitoutput/WmsJitDetailList",
-          this.listQuery
-        )
-        .then((response) => {
-          this.list = response.items;
-          //alert(JSON.stringify(response.Items))
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "materialCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 6,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    /** 多项筛选操作 */
-    /** 筛选操作 */
-    handleFilters(data) {
-      if (data === null) {
-        this.listQuery.Filters = [];
-        this.getList(); //查询所有
-      } else {
-        this.filterObj = data;
-        console.log("筛选" + JSON.stringify(data));
-        var offsetHei = document.documentElement.clientHeight;
-        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
-        this.tableHeight = offsetHei - removeHeight;
-        this.currentPage = 1;
-        let Filter = [];
-        data.forEach((item) => {
-          let filter = {};
-          if (item.formType === "datetime" || item.formType === "datetime") {
-            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
-
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
-            }
-          } else {
-            filter["Column"] = item.fieldName;
-            filter["Value"] = item.value;
-            filter["Logic"] = 0;
-            filter["Action"] = item.action;
-            Filter.push(filter);
-          }
-        });
-        console.log("筛选条件" + JSON.stringify(Filter));
-        this.listQuery.Filters = Filter;
-        this.getList();
-      }
-    },
-    resetQuery() {},
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/ux/businessdata/components/newDialog.vue b/code/WebApp/vue/src/views/ux/businessdata/components/newDialog.vue
deleted file mode 100644
index e4c36eb5..00000000
--- a/code/WebApp/vue/src/views/ux/businessdata/components/newDialog.vue
+++ /dev/null
@@ -1,510 +0,0 @@
-<template>
-  <div class="my-task-dialog">
-    <el-dialog
-      v-loading="loading"
-      :visible.sync="visible"
-      :show-close="false"
-      :close-on-click-modal="false"
-      :before-close="handleClose"
-      title="新建任务"
-      width="700px">
-      <img
-        class="el-icon-close"
-        src="@/assets/img/project/task_close.png"
-        alt=""
-        @click="handleClose">
-      <el-form
-        ref="form"
-        :model="formData"
-        :rules="rules">
-        <el-form-item
-          v-for="(item, index) in formList"
-          :class="'el-form-item'+ '-' + item.field"
-          :label="item.label"
-          :prop="item.field"
-          :key="index">
-          <el-input
-            v-if="item.type == 'textarea'"
-            :autosize="{ minRows: 4}"
-            v-model="formData[item.field]"
-            type="textarea"/>
-          <el-date-picker
-            v-else-if="item.type == 'time'"
-            v-model="formData[item.field]"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期"/>
-          <div
-            v-else-if="item.type == 'priority'"
-            class="priority-box">
-            <el-radio-group
-              v-model="formData[item.field]"
-              fill="red"
-              text-color="#FFF">
-              <el-radio :label="3">高</el-radio>
-              <el-radio :label="2">中</el-radio>
-              <el-radio :label="1">低</el-radio>
-              <el-radio :label="0">无</el-radio>
-            </el-radio-group>
-          </div>
-          <div
-            v-else-if="item.type == 'popover'"
-            class="type-popover">
-            <el-popover
-              placement="bottom-end"
-              width="280"
-              trigger="click">
-              <xh-user
-                ref="xhuser"
-                :radio="radio"
-                :selected-data="colleaguesList"
-                @changeCheckout="changeCheckout"/>
-              <div
-                slot="reference"
-                class="select-box">
-                <span
-                  v-for="(item, index) in colleaguesList"
-                  :key="index"
-                  class="select-box-span">
-                  {{ item.realname }}
-                  <span
-                    class="el-icon-close"
-                    @click.stop="selectDelect(item, index)"/>
-                </span>
-                <span class="el-icon-plus"/>
-              </div>
-            </el-popover>
-          </div>
-          <el-input
-            v-else
-            v-model="formData[item.field]"/>
-        </el-form-item>
-        <related-business
-          :all-data="allData"
-          :margin-left="'0'"
-          @checkInfos="checkInfos"/>
-      </el-form>
-      <span
-        slot="footer"
-        class="dialog-footer">
-        <el-button
-          type="primary"
-          @click="dialogVisibleSubmit">保存</el-button>
-        <el-button @click="handleClose">取消</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-// 关联业务 - 选中列表
-//import relatedBusiness from '@/components/relatedBusiness'
-import XhUser from '@/components/CreateCom/XhUser'
-//import { workTaskSaveAPI } from '@/api/projectManagement/task'
-import { formatTimeToTimestamp } from '@/utils/index'
-
-export default {
-  components: {
-    //relatedBusiness,
-    XhUser
-  },
-
-  props: {
-    visible: Boolean,
-    params: Object, // 附加参数
-    action: {
-      type: Object,
-      default: () => {
-        return {
-          type: 'create'
-        }
-      }
-    }
-  },
-
-  data() {
-    var validateTime = (rule, value, callback) => {
-      if (this.formData.startTime && this.formData.stopTime) {
-        if (
-          formatTimeToTimestamp(this.formData.startTime) >
-          formatTimeToTimestamp(this.formData.stopTime)
-        ) {
-          callback(new Error('开始时间必须小于结束时间'))
-        }
-      }
-      callback()
-    }
-    return {
-      loading: false,
-      formData: {
-        priority: 0
-      },
-      formList: [
-        { label: '任务名称', field: 'name' },
-        { label: '负责人', field: 'mainUserName', type: 'popover' },
-        { label: '开始时间', field: 'startTime', type: 'time' },
-        { label: '结束时间', field: 'stopTime', type: 'time' },
-        { label: '优先级', field: 'priority', type: 'priority' },
-        { label: '任务描述', field: 'description', type: 'textarea' }
-      ],
-      // 负责人弹出框
-      colleaguesList: [],
-      popoverModel: false,
-      rules: {
-        name: [
-          { required: true, message: '任务名称不能为空', trigger: 'blur' },
-          { max: 50, message: '任务名称长度最多为50个字符', trigger: 'blur' }
-        ],
-        startTime: [{ validator: validateTime, trigger: 'blur' }],
-        stopTime: [{ validator: validateTime, trigger: 'blur' }]
-      },
-      // 获取选择的数据id数组
-      relevanceAll: {},
-      allData: {},
-      radio: true
-    }
-  },
-
-  watch: {
-    visible(value) {
-      if (value) {
-        if (this.action.type == 'create') {
-          if (this.action.data) {
-            this.formData = Object.assign(
-              {
-                priority: 0
-              },
-              this.action.data
-            )
-          } else {
-            this.formData = {
-              priority: 0
-            }
-            this.colleaguesList = []
-            this.relevanceAll = {}
-            this.allData = {}
-          }
-        }
-      }
-    }
-  },
-
-  methods: {
-    /**
-     * 关闭窗口
-     */
-    handleClose() {
-      this.formData = {
-        priority: 0
-      }
-      this.$emit('handleClose')
-    },
-
-    /**
-     * 保存
-     */
-    dialogVisibleSubmit() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          var formDataCopy = Object.assign({}, this.formData)
-          formDataCopy = {
-            mainUserId:
-              this.colleaguesList.length == 0
-                ? ''
-                : this.colleaguesList[0].userId,
-            startTime: this.formData.startTime || '',
-            stopTime: this.formData.stopTime || '',
-            description: this.formData.description,
-            priority: this.formData.priority,
-            name: this.formData.name,
-            customerIds: this.relevanceAll.customerIds
-              ? ',' + this.relevanceAll.customerIds.join(',') + ','
-              : '',
-            contactsIds: this.relevanceAll.contactsIds
-              ? ',' + this.relevanceAll.contactsIds.join(',') + ','
-              : '',
-            businessIds: this.relevanceAll.businessIds
-              ? ',' + this.relevanceAll.businessIds.join(',') + ','
-              : '',
-            contractIds: this.relevanceAll.contractIds
-              ? ',' + this.relevanceAll.contractIds.join(',') + ','
-              : ''
-          }
-
-          if (this.params) {
-            Object.assign(formDataCopy, this.params)
-          }
-
-          this.loading = true
-          workTaskSaveAPI(formDataCopy)
-            .then(res => {
-              this.$message.success('创建成功')
-              this.loading = false
-              this.handleClose()
-              this.$emit('submit')
-            })
-            .catch(() => {
-              this.loading = false
-            })
-        } else {
-          return false
-        }
-      })
-    },
-
-    /**
-     * 选择相关
-     */
-    checkInfos(val) {
-      this.relevanceAll = val
-    },
-
-    /**
-     * 选择人员
-     */
-    changeCheckout(data) {
-      this.colleaguesList = data.data
-    },
-
-    /**
-     * 删除人员
-     */
-    selectDelect(value, index) {
-      if (this.radio) {
-        // 如果单选告知删除
-        this.$refs.xhuser[0].changeCheckout([])
-      }
-      this.colleaguesList.splice(index, 1)
-    }
-  }
-}
-</script>
-<style scoped lang="scss">
-.my-task-dialog /deep/ .el-dialog {
-  padding: 20px;
-  .el-dialog__header {
-    padding: 0 0 0 10px;
-    .el-dialog__title {
-      display: inline-block;
-      height: 40px;
-      line-height: 40px;
-      font-size: 17px;
-    }
-    .el-dialog__headerbtn {
-      display: none;
-    }
-  }
-  .el-dialog__body {
-    img.el-icon-close {
-      position: absolute;
-      top: 20px;
-      right: 20px;
-      width: 40px;
-      height: 40px;
-      padding: 10px;
-    }
-    .el-form {
-      overflow: auto;
-      flex: 1;
-      padding: 20px;
-      .el-date-editor {
-        vertical-align: bottom;
-      }
-      .el-radio-group {
-        vertical-align: super;
-      }
-      .el-textarea {
-        margin-top: 7px;
-      }
-      .el-form-item-name,
-      .el-form-item-startTime {
-        padding-right: 25px;
-      }
-      .el-form-item-mainUserName,
-      .el-form-item-stopTime {
-        padding-left: 25px;
-      }
-      .el-form-item-priority,
-      .el-form-item-description,
-      .el-form-item-time {
-        width: 100%;
-      }
-    }
-  }
-}
-</style>
-
-<style lang="scss" scoped>
-.my-task-dialog /deep/ .el-dialog__wrapper {
-  background: #f5f6f9;
-  padding: 40px 0;
-  overflow: hidden;
-}
-.my-task-dialog /deep/ .el-dialog {
-  height: 100%;
-  margin-top: 0 !important;
-  /* margin-bottom: 40px; */
-  display: flex;
-  flex-direction: column;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-}
-.my-task-dialog /deep/ .el-dialog .el-dialog__body {
-  padding: 0;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-}
-.my-task-dialog /deep/ .el-dialog .el-dialog__footer {
-  margin-right: 20px;
-}
-.colleagues-list p {
-  height: 34px;
-  line-height: 34px;
-  padding-left: 20px;
-  cursor: pointer;
-  margin: 0 -12px;
-}
-.colleagues-list p:hover {
-  -webkit-box-shadow: 0 0 8px 2px #eee;
-  box-shadow: 0 0 8px 2px #eee;
-  background: 0 0;
-}
-.el-form /deep/ .el-form-item {
-  margin-bottom: 10px;
-  padding-bottom: 6px;
-  width: 50%;
-  display: inline-block;
-}
-.my-task-dialog /deep/ .el-form-item__content > .el-date-editor {
-  width: 100%;
-}
-.my-task-dialog /deep/ .el-form-item__content .el-input .el-input__inner {
-  vertical-align: middle;
-}
-.my-task-dialog /deep/ .el-form-item__content .el-select {
-  width: 100%;
-}
-.my-task-dialog /deep/ .el-form-item__content .el-textarea .el-textarea__inner {
-  resize: none;
-}
-.select-box {
-  border: 1px solid #e6e6e6;
-  height: 34px;
-  line-height: 34px;
-  border-radius: 3px;
-  cursor: pointer;
-  display: inline-block;
-  width: 100%;
-  vertical-align: middle;
-}
-
-.select-box > .el-icon-plus {
-  float: right;
-  line-height: 34px;
-  font-size: 16px;
-  font-weight: 600;
-  color: #aaa;
-  padding-right: 10px;
-}
-.select-box > .select-box-span {
-  background: #eff3fc;
-  margin: 0 5px;
-  height: 27px;
-  line-height: 28px;
-  font-size: 12px;
-  color: #333;
-  padding: 0 5px;
-  display: inline-block;
-}
-.my-task-dialog /deep/ .el-form-item__label {
-  display: block;
-  width: 100%;
-  text-align: left;
-  font-size: 12px;
-}
-.my-task-dialog /deep/ .el-range-separator {
-  width: auto;
-}
-.priority-box /deep/ .el-radio {
-  margin-left: 0;
-  width: 34px;
-  height: 34px;
-  line-height: 32px;
-  margin-right: 14px;
-  text-align: center;
-}
-.priority-box /deep/ .el-radio .el-radio__input {
-  display: none;
-}
-.priority-box /deep/ .el-radio .el-radio__label {
-  padding: 0;
-  width: 100%;
-  height: 100%;
-  display: inline-block;
-  text-align: center;
-  border-radius: 50%;
-  font-size: 12px;
-  cursor: pointer;
-  border: 1px solid #ccc;
-  color: #cccccc;
-}
-.priority-box /deep/ .el-radio:nth-child(2) .el-radio__label {
-  border: 1px solid #ff9668;
-  color: #ff9668;
-}
-.priority-box /deep/ .el-radio:nth-child(3) .el-radio__label {
-  border: 1px solid #8bb5f0;
-  color: #8bb5f0;
-}
-.priority-box /deep/ .el-radio:nth-child(1) .el-radio__label {
-  border: 1px solid #ed6363;
-  color: #ed6363;
-}
-.priority-box
-  /deep/
-  .el-radio:nth-child(4)
-  .el-radio__input.is-checked
-  + .el-radio__label {
-  color: #fff;
-  background: #cccccc;
-  border-color: #cccccc;
-}
-.priority-box
-  /deep/
-  .el-radio:nth-child(2)
-  .el-radio__input.is-checked
-  + .el-radio__label {
-  color: #fff;
-  background: #ff9668;
-  border-color: #ff9668;
-}
-.priority-box
-  /deep/
-  .el-radio:nth-child(3)
-  .el-radio__input.is-checked
-  + .el-radio__label {
-  color: #fff;
-  background: #8bb5f0;
-  border-color: #8bb5f0;
-}
-.priority-box
-  /deep/
-  .el-radio:nth-child(1)
-  .el-radio__input.is-checked
-  + .el-radio__label {
-  color: #fff;
-  background: #ed6363;
-  border-color: #ed6363;
-}
-.upload-demo {
-  display: inline-block;
-}
-.img-text-color {
-  margin-top: 20px;
-  color: #3e84e9;
-}
-.img-center {
-  vertical-align: middle;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/ux/businessdata/components/particulars.vue b/code/WebApp/vue/src/views/ux/businessdata/components/particulars.vue
deleted file mode 100644
index 8b209e77..00000000
--- a/code/WebApp/vue/src/views/ux/businessdata/components/particulars.vue
+++ /dev/null
@@ -1,2323 +0,0 @@
-<template>
-  <transition name="slide-fade">
-    <el-card
-      v-loading="loading"
-      :style="{ 'z-index': zIndex }"
-      class="particulars-common">
-      <!-- 头部信息 -->
-      <div
-        v-if="taskData"
-        slot="header"
-        class="clear-fix">
-        <div
-          v-if="taskData && taskData.workName"
-          class="work-name">{{ taskData.workName }}</div>
-        <div class="img-box-grop">
-          <div>
-            <el-popover
-              v-model="priorityVisible"
-              placement="bottom-start"
-              width="200"
-              trigger="click">
-              <div class="particulars-priority-box">
-                <p
-                  v-for="(item, index) in particularsList"
-                  :key="index"
-                  @click="priorityBtn(item, taskData.priority)">
-                  <span :style="{'border-color': item.color, 'background': item.id == taskData.priority ? item.color: 'transparent', 'color': item.id == taskData.priority ? '#fff': item.color}">{{ item.label }}</span>
-                </p>
-              </div>
-              <span slot="reference">
-                <i class="wukong wukong-lightning"/>
-                <span>优先级</span>
-              </span>
-            </el-popover>
-          </div>
-          <div>
-            <tag-index
-              :placement="'bottom'"
-              :task-data="taskData">
-              <div slot="editIndex">
-                <i class="wukong wukong-label"/>
-                <span>标签</span>
-              </div>
-            </tag-index>
-          </div>
-          <div
-            v-if="taskData.pid == 0"
-            @click="addSubtasksBtn">
-            <i class="wukong wukong-sub-task"/>
-            <span>子任务</span>
-          </div>
-          <div>
-            <el-upload
-              :http-request="httpRequest"
-              class="upload-demo"
-              action="https://jsonplaceholder.typicode.com/posts/"
-              multiple
-              list-type="picture">
-              <i class="wukong wukong-file"/>
-              <span>附件</span>
-            </el-upload>
-          </div>
-          <div v-if="taskData.ishidden != 1">
-            <el-popover
-              placement="bottom"
-              width="80"
-              trigger="click">
-              <div class="more-btn-group">
-                <p
-                  v-if="taskData.isArchive != 1 && taskData.ishidden != 1"
-                  @click="moreArchive">归 档</p>
-                <p
-                  v-if="taskData.ishidden != 1"
-                  @click="moreDelete">删 除</p>
-              </div>
-              <span slot="reference">
-                <img src="@/assets/img/task_ellipsis.png">
-              </span>
-            </el-popover>
-          </div>
-          <div class="task-close-img">
-            <img
-              src="@/assets/img/task_close.png"
-              @click="closeBtn">
-          </div>
-        </div>
-      </div>
-      <div
-        v-if="taskData"
-        class="body-content">
-        <!-- 归档 -->
-        <div
-          v-if="taskData.isArchive == 1 && taskData.ishidden != 1"
-          class="particulars-extraContent">
-          <span class="text">该任务已于 {{ taskData.archiveTime }} 被归档。</span>
-          <el-button
-            type="primary"
-            class="border-radius"
-            size="mini"
-            @click="activateTask">激活</el-button>
-        </div>
-        <!-- 回收站 -->
-        <div
-          v-if="taskData.ishidden == 1"
-          class="particulars-extraContent">
-          <span class="text">该任务已于 {{ taskData.hiddenTime }} 被放入回收站。</span>
-          <el-button
-            type="primary"
-            class="border-radius"
-            size="mini"
-            @click="recoverTask">恢 复</el-button>
-          <el-button
-            type="text"
-            @click="thoroughDeleteTask">彻底删除</el-button>
-        </div>
-        <div class="card-content-box">
-          <div class="card-content">
-            <div class="card-content-row margin-bottom-15">
-              <el-checkbox
-                v-model="taskData.checked"
-                @change="titleCheckbox"/>
-              <div class="priority-data-name">
-                <div
-                  v-show="!nameVinput"
-                  :style="{'text-decoration': taskData.checked ? 'line-through' : 'none'}"
-                  class="title-text">{{ taskData.name }}<span
-                    class="el-icon-edit-outline"
-                    @click="nameVinput = true, taskDataName = taskData.name"/></div>
-                <div
-                  v-show="nameVinput"
-                  class="show-input">
-                  <el-input
-                    v-model="taskDataName"
-                    :maxlength="50"
-                    size="medium"/>
-                  <div class="btn-box">
-                    <el-button
-                      type="primary"
-                      size="mini"
-                      @click="nameVShow(taskDataName)">保 存</el-button>
-                    <el-button
-                      size="mini"
-                      @click="nameVinput = false">取 消</el-button>
-                  </div>
-                </div>
-              </div>
-              <div class="card-row-right">
-                <flexbox class="text-right">
-                  <div class="color-label user-name-label"> 负责人： </div>
-                  <div
-                    v-if="taskData.mainUser"
-                    class="bg-position">
-                    <el-tooltip
-                      placement="bottom"
-                      effect="light"
-                      popper-class="tooltip-change-border">
-                      <div slot="content">
-                        <span>{{ taskData.mainUser.realname }}</span>
-                      </div>
-                      <div
-                        v-photo="taskData.mainUser"
-                        v-lazy:background-image="$options.filters.filterUserLazyImg(taskData.mainUser.img)"
-                        :key="taskData.main_user_img"
-                        class="div-photo main-user-name"/>
-                    </el-tooltip>
-                    <img
-                      src="@/assets/img/delete_task.png"
-                      class="el-icon-close"
-                      alt=""
-                      @click="editMainUser('')">
-                  </div>
-                  <template v-else>
-                    <el-popover
-                      placement="bottom"
-                      width="280"
-                      trigger="click">
-                      <xh-user
-                        ref="xhuser"
-                        :info-request="ownerListRequest"
-                        :info-params="{ workId: workId }"
-                        radio
-                        @changeCheckout="editMainUser"/>
-                      <i
-                        slot="reference"
-                        class="wukong wukong-addition-task"/>
-                    </el-popover>
-                  </template>
-                </flexbox>
-              </div>
-            </div>
-            <div
-              v-if="taskData.labelList"
-              class="card-content-row  margin-bottom-25">
-              <div class="particulars-priority-copy">
-                <template v-show="taskData.labelList.length != 0">
-                  <span
-                    v-for="(item, index) in taskData.labelList"
-                    :style="{'background': item.color ? item.color : '#ccc'}"
-                    :key="index"
-                    class="item-color">
-                    {{ item.labelName }}
-                  </span>
-                </template>
-                <div class="add-tag">
-                  <tag-index
-                    :placement="'right'"
-                    :task-data="taskData">
-                    <div slot="editIndex">
-                      <span class="el-icon-plus"/>
-                      <span class="label">标签</span>
-                    </div>
-                  </tag-index>
-                </div>
-              </div>
-              <div class="card-row-right">
-                <div class="text-right">
-                  <span class="color-label"> 截止日期： </span>
-                  <div class="time-top">
-                    <el-date-picker
-                      ref="endTime"
-                      :class="{ 'no-time-top': !taskData.stopTime }"
-                      v-model="taskData.stopTime"
-                      :clearable="false"
-                      type="date"
-                      format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd"
-                      placeholder=""
-                      @change="endTimeChange"/>
-                    <img
-                      v-if="taskData.stopTime"
-                      src="@/assets/img/delete_task.png"
-                      class="el-icon-close time-top-close"
-                      alt=""
-                      @click.stop="deleteTimeTop(taskData.stopTime)">
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div class="add-description">
-              <div v-show="!addDescriptionShow">
-                <div
-                  v-if="taskData.description"
-                  class="description-content"
-                  @click="addDescriptionShow = true; addDescriptionTextarea = taskData.description">{{ taskData.description }}</div>
-                <div
-                  v-else
-                  class="no-description">
-                  <span class="color-label">暂无描述</span>
-                  <el-button
-                    type="text"
-                    icon="el-icon-plus"
-                    @click="addDescriptionShow = true">添加描述</el-button>
-                </div>
-              </div>
-              <div v-show="addDescriptionShow">
-                <el-input
-                  :autosize="{ minRows: 2}"
-                  v-model="addDescriptionTextarea"
-                  type="textarea"
-                  placeholder="请输入内容"/>
-                <div class="btn-box">
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    @click="addDescriptionSubmit">保 存</el-button>
-                  <el-button
-                    type="text"
-                    size="mini"
-                    @click="addDescriptionShow = false">取 消</el-button>
-                </div>
-              </div>
-            </div>
-            <div class="card-content-row card-content-row-column">
-              <flexbox>
-                <div class="color-label participant">
-                  <i class="wukong wukong-user"/>
-                  <span>参与人： </span>
-                </div>
-                <div
-                  v-if="taskData.ownerUserList"
-                  class="participant-class">
-                  <span
-                    v-for="(item, index) in taskData.ownerUserList"
-                    :key="index"
-                    class="owner-list">
-                    <el-tooltip
-                      placement="bottom"
-                      effect="light"
-                      popper-class="tooltip-change-border">
-                      <div slot="content">
-                        <span>{{ item.realname }}</span>
-                      </div>
-                      <div
-                        v-photo="item"
-                        v-lazy:background-image="$options.filters.filterUserLazyImg(item.img)"
-                        :key="item.img"
-                        class="div-photo item-img"/>
-                    </el-tooltip>
-                    <img
-                      src="@/assets/img/delete_task.png"
-                      class="el-icon-close"
-                      @click="deleteOwnerList(item, index)">
-                  </span>
-                </div>
-                <members-dep
-                  :close-dep="true"
-                  :content-block="false"
-                  :user-checked-data="taskData.ownerUserList"
-                  :user-request="ownerListRequest"
-                  :user-params="{ workId: workId }"
-                  @popoverSubmit="editOwnerList">
-                  <i
-                    slot="membersDep"
-                    class="wukong wukong-addition-task"/>
-                </members-dep>
-              </flexbox>
-            </div>
-            <div class="card-content-row card-content-row-column margin-bottom-30">
-              <span class="color-label participant">
-                <i class="wukong wukong-relevance"/>
-                <span>关联业务</span>
-              </span>
-              <!-- 关联业务 -->
-              <related-business
-                :margin-left="'0'"
-                :is-task="true"
-                :all-data="allData"
-                :task-id="taskData.taskId"
-                @checkRelatedDetail="checkRelatedDetail"
-                @checkInfos="checkInfos"/>
-            </div>
-            <div
-              v-if="taskData.pid == 0"
-              class="card-content-row card-content-row-column">
-              <div class="display-flex sub-task margin-bottom-7">
-                <span class="color-label participant">
-                  <i class="wukong wukong-sub-task"/>
-                  <span>子任务</span>
-                </span>
-                <template v-if="taskData.childTask.length != 0">
-                  <span class="color-label sub-task-progress"> ({{ subTaskProgress }}/{{ taskData.childTask.length }}) </span>
-                  <el-progress
-                    :percentage="subTaskProgress/taskData.childTask.length*100"
-                    :stroke-width="10"/>
-                </template>
-                <template v-else>
-                  <span class="color-label sub-task-progress"> ({{ subTaskProgress }}/{{ taskData.childTask.length }}) </span>
-                  <el-progress :percentage="0"/>
-                </template>
-              </div>
-              <template v-if="taskData.childTask.length != 0">
-                <div
-                  v-for="(item, index) in taskData.childTask"
-                  :key="index"
-                  class="card-related-matters subtasks-box">
-                  <div
-                    v-if="!item.showEdit"
-                    class="show-edit">
-                    <div
-                      style="display: inline-block;"
-                      @click.stop>
-                      <el-checkbox
-                        v-model="item.checked"
-                        @change="subtasksCheckbox(item, $event)"/>
-                    </div>
-                    <span
-                      :style="{'text-decoration': item.checked ? 'line-through' : 'none'}"
-                      class="item-name">{{ item.name }}</span>
-                    <!-- 编辑和删除 -->
-                    <div class="edit-del-box">
-                      <i
-                        class="wukong wukong-edit-task"
-                        @click="editSubTask(item)"/>
-                      <i
-                        class="wukong wukong-delete-task"
-                        @click="deleteSubTask(item)"/>
-                    </div>
-                    <div class="rt">
-                      <flexbox class="rt-box">
-                        <div
-                          v-if="item.stopTime"
-                          class="bg-color task-bg-color">{{ item.stopTime | moment("MM-DD") }} 截止</div>
-                        <div
-                          v-photo="item.mainUser"
-                          v-lazy:background-image="$options.filters.filterUserLazyImg(item.mainUser.img)"
-                          v-if="item.mainUser"
-                          :key="item.mainUser.img"
-                          class="div-photo"/>
-                      </flexbox>
-                    </div>
-                  </div>
-                  <sub-task
-                    v-else
-                    :sub-task-com="'edit'"
-                    :time="item.stopTime"
-                    :sub-data="item"
-                    :text="item.name"
-                    :task-id="subTaskID"
-                    :checkbox-data="item.checked"
-                    :task-data="taskData"
-                    @on-handle="handleSubTasksBlock($event, item)"/>
-                </div>
-              </template>
-              <div
-                v-if="addSubtasks"
-                class="add-subtasks"
-                @click="addSubtasks = false">
-                <span class="el-icon-plus"/>
-                <span>添加子任务</span>
-              </div>
-              <sub-task
-                v-else
-                :sub-task-com="'new'"
-                :task-data="taskData"
-                @on-handle="handleSubTasksBlock"/>
-            </div>
-            <div
-              v-if="fileList.length != 0"
-              class="card-content-row card-content-row-column">
-              <span class="color-label participant class-file">
-                <i class="wukong wukong-file"/>
-                <span>附件</span>
-              </span>
-              <div class="accessory-box">
-                <file-cell
-                  v-for="(file, fileIndex) in fileList"
-                  :key="fileIndex"
-                  :data="file"
-                  :cell-index="fileIndex"
-                  :module-id="id"
-                  :show-delete="true"
-                  @delete="accessoryDeleteFun"/>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="border"/>
-        <!-- 底部内容 -->
-        <div class="card-footers">
-          <div class="footer-title">
-            <span @click="footerTitle(0)">
-              <i
-                v-if="isComment"
-                class="wukong wukong-comment-task"
-                style="color: #3E84E9;"/>
-              <i
-                v-else
-                class="wukong wukong-comment-task"/>
-              <span
-                :style="{'color': isComment ? '#3E84E9' : '#666'}"
-                class="cursor-pointer">评论</span>
-            </span>
-            <span class="title-border"/>
-            <span @click="footerTitle(1)">
-              <i
-                v-if="isComment"
-                class="wukong wukong-activity-task"
-                style="font-size: 18px;"/>
-              <i
-                v-else
-                class="wukong wukong-activity-task"
-                style="color: #3E84E9; font-size: 18px;"/>
-              <span
-                :style="{'color': isComment ? '#666' : '#3E84E9'}"
-                class="cursor-pointer"
-                @click="footerTitle(isComment)">活动</span>
-            </span>
-          </div>
-          <div
-            v-loading="commentsLoading"
-            class="footer-content-box">
-            <div class="footer-content">
-              <div
-                v-if="commentsActivities"
-                class="add-comments">
-                <div class="footer-img">
-                  <div
-                    v-photo="userInfo"
-                    v-lazy:background-image="$options.filters.filterUserLazyImg(userInfo.img)"
-                    :key="userInfo.img"
-                    class="div-photo"/>
-                </div>
-                <div class="comments-con">
-                  <div
-                    v-clickoutside="commentsSubmit"
-                    v-if="addComments"
-                    class="comments-box">
-                    <el-input
-                      ref="commentsTextareaRef"
-                      :rows="4"
-                      v-model="commentsTextarea"
-                      type="textarea"
-                      placeholder="添加评论"
-                      @blur="blurFun"/>
-                    <div class="btn-group">
-                      <el-popover
-                        v-model="commentsPopover"
-                        placement="top"
-                        width="400"
-                        trigger="click">
-                        <!-- 表情 -->
-                        <emoji @select="selectEmoji"/>
-                        <img
-                          slot="reference"
-                          src="@/assets/img/smiling_face.png"
-                          class="smiling-img">
-                      </el-popover>
-                      <el-button
-                        type="primary"
-                        class="rt"
-                        @click="commentsSub">发布</el-button>
-                    </div>
-                  </div>
-                  <div
-                    v-else
-                    class="footer-bg"
-                    @click="addCommentsClick">添加评论</div>
-
-                  <!-- 评论 -->
-                  <div
-                    v-if="replyList && replyList.length != 0"
-                    class="discuss">
-                    <div
-                      v-for="(discussItem, k) in replyList"
-                      :key="k"
-                      class="discuss-list">
-                      <div
-                        v-photo="discussItem.user"
-                        v-lazy:background-image="$options.filters.filterUserLazyImg(discussItem.user.img)"
-                        :key="discussItem.user.img"
-                        class="div-photo head-img header-circle"/>
-                      <span class="name">{{ discussItem.user.realname }}</span>
-                      <span class="time">{{ discussItem.createTime }}</span>
-                      <div class="rt">
-                        <span @click="discussDelete(discussItem, replyList, k)">删除</span>
-                        <span @click="discussBtn(discussItem, -1)">回复</span>
-                      </div>
-
-                      <p class="reply-title">
-                        <span v-html="emoji(discussItem.content)"/>
-                      </p>
-
-                      <!-- <p class="discuss-content"
-                         v-html="emoji(discussItem.reply_content)"></p> -->
-
-                      <div
-                        v-if="discussItem.childCommentList && discussItem.childCommentList.length > 0"
-                        class="children-reply">
-                        <div
-                          v-for="(childDiscussItem, k) in discussItem.childCommentList"
-                          :key="k"
-                          class="discuss-list">
-                          <div
-                            v-photo="childDiscussItem.user"
-                            v-lazy:background-image="$options.filters.filterUserLazyImg(childDiscussItem.user.img)"
-                            :key="childDiscussItem.user.img"
-                            class="div-photo head-img header-circle"/>
-                          <span class="name">{{ childDiscussItem.user.realname }}</span>
-                          <span class="time">{{ childDiscussItem.createTime }}</span>
-                          <div class="rt">
-                            <span @click="discussDelete(childDiscussItem, discussItem.childCommentList, k)">删除</span>
-                            <span @click="discussBtn(discussItem, k)">回复</span>
-                          </div>
-                          <p class="reply-title">
-                            <template>
-                              <span>回复</span>
-                              <span
-                                v-if="childDiscussItem.replyUser"
-                                class="reply">@{{ childDiscussItem.replyUser.realname }}：</span>
-                            </template>
-                            <span v-html="emoji(childDiscussItem.content)"/>
-                          </p>
-                        </div>
-                      </div>
-
-                      <!-- 评论 -- 回复  -->
-                      <div
-                        v-if="discussItem.show"
-                        class="comment-box">
-                        <el-input
-                          ref="childCommentsTextareaRef"
-                          :rows="2"
-                          v-model="childCommentsTextarea"
-                          type="textarea"
-                          placeholder="请输入内容"
-                          @blur="blurFun"/>
-                        <div class="btn-group">
-                          <el-popover
-                            v-model="childCommentsPopover"
-                            placement="top"
-                            width="400"
-                            trigger="click">
-                            <!-- 表情 -->
-                            <emoji @select="selectEmojiChild"/>
-                            <img
-                              slot="reference"
-                              src="@/assets/img/smiling_face.png"
-                              class="smiling-img">
-                          </el-popover>
-                          <div class="btn-box">
-                            <el-button
-                              :loading="contentLoading"
-                              type="primary"
-                              @click="childCommentSubmit()">回复</el-button>
-                            <el-button @click="discussItem.show= false">取消</el-button>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                v-else
-                class="activity-box">
-                <template v-if="activityList.length != 0">
-                  <flexbox
-                    v-for="(item, index) in activityList"
-                    :key="index"
-                    align="stretch"
-                    class="activity-list">
-                    <div
-                      v-photo="item"
-                      v-lazy:background-image="$options.filters.filterUserLazyImg(item.img)"
-                      :key="item.img"
-                      class="div-photo"/>
-                    <div class="activity-name">{{ item.realname }}</div>
-                    <div class="activity-content">{{ item.content }}</div>
-                    <div class="activity-time">{{ item.createTime }}</div>
-                  </flexbox>
-                </template>
-              </div>
-            </div>
-          </div>
-        </div>
-        <slot/>
-      </div>
-      <div
-        v-if="taskData && taskData.createUser"
-        class="tip">
-        <span>{{ taskData.createUser.realname }} 创建于 {{ taskData.createTime }}</span>
-      </div>
-
-      <c-r-m-full-screen-detail
-        :visible.sync="showRelatedDetail"
-        :crm-type="relatedCRMType"
-        :id="relatedID"/>
-    </el-card>
-  </transition>
-</template>
-
-<script type="text/javascript">
-import xss from 'xss'
-// import {
-//   workTaskSaveAPI,
-//   taskSvaeTaskRelationAPI,
-//   workTaskDeleteAPI,
-//   workTaskArchiveAPI,
-//   queryCommentListAPI,
-//   workTaskcommentSaveAPI,
-//   workTaskcommentDeleteAPI,
-//   workTaskReadAPI,
-//   workTaskReadLoglistAPI,
-//   workTaskRecoverAPI // 激活任务
-// } from '@/api/projectManagement/task'
-//import { workWorkOwnerListAPI } from '@/api/projectManagement/project'
-//import { crmFileSave } from '@/api/common'
-// import {
-//   workTrashRecoverAPI,
-//   workTrashDeleteAPI
-// } from '@/api/projectManagement/recycle'
-
-import membersDep from '@/components/selectEmployee/membersDep'
-import TagIndex from './tag/tagIndex'
-//import SubTask from './subTask'
-// emoji
-import emoji from '@/components/emoji'
-// 关联业务 - 选中列表
-// import relatedBusiness from '@/components/relatedBusiness'
-// import XhUser from '@/components/CreateCom/XhUser'
-// import FileCell from '@/views/OAManagement/components/fileCell'
-// import CRMFullScreenDetail from '@/views/customermanagement/components/CRMFullScreenDetail'
-import { mapGetters } from 'vuex'
-import { getMaxIndex } from '@/utils'
-
-export default {
-  components: {
-    membersDep,
-    emoji,
-    relatedBusiness,
-    XhUser,
-    TagIndex,
-    CRMFullScreenDetail,
-    //SubTask,
-    FileCell
-  },
-  props: {
-    id: [String, Number],
-    detailIndex: Number,
-    detailSection: Number,
-    appendToBody: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      zIndex: getMaxIndex(),
-      // 评论 - 活动
-      // 评论 - 活动显示的内容
-      commentsActivities: true,
-      // 评论框
-      commentsTextarea: '',
-      // 回复
-      childCommentsTextarea: '',
-      // 评论 - 是否弹出表情
-      // 回复的一行用户数据
-      replyChildComment: null, // 被评论对象
-      replyChildIndex: -1, // -1 是主评论 0以上为子评论
-      contentLoading: false, // 回复按钮loading
-      commentsPopover: false,
-      // 回复弹出框
-      childCommentsPopover: false,
-      // 紧急弹出框
-      priorityVisible: false,
-      // 优先级列表
-      particularsList: [
-        { id: 3, label: '高', color: '#ED6363' },
-        { id: 2, label: '中', color: '#FF9668' },
-        { id: 1, label: '低', color: '#8bb5f0' },
-        { id: 0, label: '无', color: '#ccc' }
-      ],
-      // 是否显示子任务
-      addSubtasks: true,
-      // 任务名称和编辑切换
-      nameVinput: false,
-      // 任务名
-      taskDataName: '',
-      // 是否显示描述
-      addDescriptionShow: false,
-      // 描述内容
-      addDescriptionTextarea: '',
-      // 子任务进度
-      subTaskProgress: 0,
-      blurIndex: 0,
-      // 是否显示评论框
-      addComments: false,
-      allData: {},
-      isComment: true,
-      commentsLoading: false,
-      // 相关详情的查看
-      relatedID: '',
-      relatedCRMType: '',
-      showRelatedDetail: false,
-      // 子任务ID
-      subTaskID: null,
-      // 任务详情
-      loading: false,
-      taskData: null,
-      activityList: [],
-      fileList: [],
-      // 评论列表
-      replyList: []
-    }
-  },
-  computed: {
-    ...mapGetters(['userInfo']),
-    ownerListRequest() {
-      return workWorkOwnerListAPI
-    },
-    workId() {
-      return this.taskData.workId
-    },
-    labelList() {
-      if (!this.taskData) {
-        return []
-      }
-      return this.taskData.labelList || []
-    }
-  },
-  watch: {
-    id: function(val) {
-      this.initInfo()
-      this.getDetail()
-      this.getCommentList()
-      this.getActivityList()
-    },
-
-    labelList(val) {
-      this.$emit('on-handle', {
-        type: 'change-label',
-        value: val,
-        index: this.detailIndex,
-        section: this.detailSection
-      })
-    }
-  },
-  mounted() {
-    if (this.appendToBody) {
-      document.body.appendChild(this.$el)
-    }
-    if (this.id) {
-      this.getDetail()
-      this.getCommentList()
-      this.getActivityList()
-    }
-  },
-
-  beforeDestroy() {
-    if (this.appendToBody && this.$el && this.$el.parentNode) {
-      this.$el.parentNode.removeChild(this.$el)
-    }
-  },
-  methods: {
-    initInfo() {
-      this.taskData = null
-      this.subTaskProgress = 0
-      // 设置关联项列表
-      this.allData = {
-        business: [],
-        contacts: [],
-        contract: [],
-        customer: []
-      }
-
-      this.taskData = null
-      this.activityList = []
-      this.fileList = []
-    },
-    // 基础详情
-    getDetail() {
-      this.loading = true
-      workTaskReadAPI({ taskId: this.id })
-        .then(res => {
-          const taskData = res.data
-          taskData.checked = taskData.status == 5
-
-          if (taskData.childTask) {
-            for (const item of taskData.childTask) {
-              if (item.status == 5) {
-                item.checked = true
-                this.subTaskProgress++
-              } else {
-                item.checked = false
-              }
-            }
-          }
-
-          this.fileList = res.data.file
-
-          this.allData = {
-            business: taskData.businessList || [],
-            contacts: taskData.contactsList || [],
-            contract: taskData.contractList || [],
-            customer: taskData.customerList || []
-          }
-          this.taskData = taskData
-          this.loading = false
-        })
-        .catch(() => {
-          this.loading = false
-          this.closeBtn()
-        })
-    },
-    // 获取活动信息
-    getActivityList() {
-      workTaskReadLoglistAPI({
-        taskId: this.id
-      })
-        .then(res => {
-          this.activityList = res.data
-        })
-        .catch(() => {})
-    },
-
-    // 获取评论信息
-    getCommentList() {
-      queryCommentListAPI({
-        typeId: this.id,
-        type: 1
-      })
-        .then(res => {
-          this.replyList = res.data
-        })
-        .catch(() => {})
-    },
-
-    // 主题勾选
-    titleCheckbox(val) {
-      this.taskData.checked = val
-      workTaskSaveAPI({
-        taskId: this.id,
-        status: this.taskData.checked ? 5 : 1
-      })
-        .then(res => {
-          this.$emit('on-handle', {
-            type: 'title-check',
-            value: val,
-            index: this.detailIndex,
-            section: this.detailSection
-          })
-          this.$store.dispatch('GetOAMessageNum', 'task')
-        })
-        .catch(() => {
-          this.$emit('on-handle', {
-            type: 'title-check',
-            value: !this.taskData.checked,
-            index: this.detailIndex,
-            section: this.detailSection
-          })
-          this.taskData.checked = !this.taskData.checked
-        })
-    },
-    closeBtn() {
-      this.$emit('close')
-    },
-    // 评论 - 活动 切换功能
-    footerTitle(key) {
-      switch (key) {
-        case 0:
-          this.commentsActivities = true
-          this.isComment = true
-          break
-        case 1:
-          this.commentsActivities = false
-          this.isComment = false
-          break
-      }
-    },
-    // 紧急按钮
-    priorityBtn(value, def) {
-      this.taskData.priority = value.id
-      workTaskSaveAPI({
-        taskId: this.id,
-        priority: value.id
-      })
-        .then(res => {
-          this.$emit('on-handle', {
-            type: 'change-priority',
-            value: value,
-            index: this.detailIndex,
-            section: this.detailSection
-          })
-          this.priorityVisible = false
-        })
-        .catch(() => {
-          this.$message.error('编辑失败')
-          this.taskData.priority = def
-        })
-    },
-    // 更多 ———— 删除和规定按钮
-    moreDelete() {
-      this.$confirm('确定删除?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        customClass: 'is-particulars'
-      })
-        .then(() => {
-          workTaskDeleteAPI({
-            taskId: this.id
-          })
-            .then(res => {
-              this.$message.success('删除成功')
-              this.$emit('on-handle', {
-                type: 'delete',
-                index: this.detailIndex,
-                section: this.detailSection
-              })
-              this.$emit('close')
-            })
-            .catch(() => {})
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
-    },
-    moreArchive() {
-      this.$confirm('此操作将归档该任务, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        customClass: 'is-particulars'
-      })
-        .then(() => {
-          workTaskArchiveAPI({
-            taskId: this.id
-          })
-            .then(res => {
-              this.$message.success('操作成功')
-              this.$emit('on-handle', {
-                type: 'delete',
-                index: this.detailIndex,
-                section: this.detailSection
-              })
-              this.$emit('close')
-            })
-            .catch(() => {})
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
-    },
-    // 附件 -- 上传
-    httpRequest(val) {
-      crmFileSave({
-        file: val.file,
-        batchId: this.taskData.batchId
-      })
-        .then(res => {
-          res.filePath = res.url
-          this.fileList.push(res)
-          // this.$emit('httpRequest', this.taskData)
-          this.$message.success('上传成功')
-        })
-        .catch(() => {})
-    },
-    // 附件删除
-    accessoryDeleteFun(index, item) {
-      this.fileList.splice(index, 1)
-    },
-    // 子任务添加
-    addSubtasksBtn() {
-      this.addSubtasks = !this.addSubtasks
-    },
-    // 子任务 -- 勾选
-    subtasksCheckbox(val, e) {
-      if (e) {
-        this.$set(val, 'checked', true)
-        this.subTaskProgress++
-      } else {
-        this.$set(val, 'checked', false)
-        this.subTaskProgress--
-      }
-      this.$emit('on-handle', {
-        type: 'change-sub-task',
-        value: {
-          subdonecount: this.subTaskProgress,
-          allcount: this.taskData.childTask.length
-        },
-        index: this.detailIndex,
-        section: this.detailSection
-      })
-      workTaskSaveAPI({
-        taskId: val.taskId,
-        status: e ? 5 : 1
-      })
-        .then(res => {})
-        .catch(() => {
-          this.$message.error('子任务标记失败')
-          if (e) {
-            this.$set(val, 'checked', false)
-            this.subTaskProgress--
-          } else {
-            this.$set(val, 'checked', true)
-            this.subTaskProgress++
-          }
-          this.$emit('on-handle', {
-            type: 'change-sub-task',
-            value: {
-              subdonecount: this.subTaskProgress,
-              allcount: this.taskData.childTask.length
-            },
-            index: this.detailIndex,
-            section: this.detailSection
-          })
-          // this.$emit('', val, e)
-        })
-    },
-    /**
-     * 参与人操作
-     */
-    // 提交按钮
-    editOwnerList(users, dep) {
-      workTaskSaveAPI({
-        taskId: this.id,
-        ownerUserId: users
-          .map(item => {
-            return item.userId
-          })
-          .join(',')
-      })
-        .then(res => {
-          this.taskData.ownerUserList = users
-        })
-        .catch(() => {})
-    },
-    // 参与人删除按钮
-    deleteOwnerList(item, index) {
-      workTaskSaveAPI({
-        taskId: this.id,
-        ownerUserId: this.taskData.ownerUserList
-          .filter(userItem => {
-            return userItem.userId != item.userId
-          })
-          .map(item => {
-            return item.userId
-          })
-          .join(',')
-      })
-        .then(res => {
-          this.taskData.ownerUserList.splice(index, 1)
-        })
-        .catch(() => {})
-    },
-    // 编辑负责人
-    editMainUser(val) {
-      workTaskSaveAPI({
-        taskId: this.id,
-        mainUserId: val ? val.data[0].userId : ''
-      })
-        .then(res => {
-          if (val) {
-            this.$set(this.taskData, 'mainUser', val.data[0])
-          } else {
-            this.$set(this.taskData, 'mainUser', null)
-          }
-
-          this.$emit('on-handle', {
-            type: 'change-main-user',
-            value: val ? val.data[0] : null,
-            index: this.detailIndex,
-            section: this.detailSection
-          })
-        })
-        .catch(() => {})
-    },
-    // 编辑任务名
-    nameVShow(val) {
-      workTaskSaveAPI({
-        name: val,
-        taskId: this.id
-      })
-        .then(res => {
-          this.nameVinput = false
-          // this.$emit('saveName', val)
-          this.$emit('on-handle', {
-            type: 'change-name',
-            value: val,
-            index: this.detailIndex,
-            section: this.detailSection
-          })
-          this.taskData.name = val
-        })
-        .catch(() => {})
-    },
-    // 截至日期API
-    endTimeChange(val) {
-      workTaskSaveAPI({
-        stopTime: val,
-        taskId: this.id
-      })
-        .then(res => {
-          this.$emit('on-handle', {
-            type: 'change-stop-time',
-            value: val,
-            index: this.detailIndex,
-            section: this.detailSection
-          })
-        })
-        .catch(() => {})
-    },
-    // 描述提交按钮
-    addDescriptionSubmit() {
-      workTaskSaveAPI({
-        taskId: this.id,
-        description: this.addDescriptionTextarea
-      })
-        .then(res => {
-          this.addDescriptionShow = false
-          this.$set(this.taskData, 'description', this.addDescriptionTextarea)
-        })
-        .catch(() => {})
-    },
-    // 评论选中功能
-    selectEmoji(val) {
-      const list = this.commentsTextarea.split('')
-      list.splice(this.blurIndex, 0, val)
-      this.commentsTextarea = list.join('')
-      this.commentsPopover = false
-    },
-    // 评论回复 -- 选中功能
-    selectEmojiChild(val) {
-      const list = this.childCommentsTextarea.split('')
-      list.splice(this.blurIndex, 0, val)
-      this.childCommentsTextarea = list.join('')
-      this.childCommentsPopover = false
-    },
-
-    /**
-     * 点击添加回复
-     */
-    addCommentsClick() {
-      this.addComments = true
-      this.$nextTick(() => {
-        this.$refs.commentsTextareaRef.focus()
-      })
-    },
-
-    // 评论发布
-    commentsSub() {
-      if (this.commentsTextarea) {
-        this.commentsLoading = true
-        workTaskcommentSaveAPI({
-          typeId: this.id,
-          type: 1,
-          content: xss(this.commentsTextarea)
-        })
-          .then(res => {
-            res.data.childCommentList = []
-            res.data.show = false
-            res.data.user = this.userInfo
-            this.replyList.push(res.data)
-            this.commentsTextarea = ''
-            this.$emit('on-handle', {
-              type: 'change-comments',
-              value: 'add',
-              index: this.detailIndex,
-              section: this.detailSection
-            })
-            this.commentsLoading = false
-          })
-          .catch(() => {
-            this.commentsLoading = false
-          })
-      }
-    },
-    // 回复评论
-    childCommentSubmit() {
-      if (this.replyChildComment && this.childCommentsTextarea) {
-        var item =
-          this.replyChildIndex == -1
-            ? this.replyChildComment
-            : this.replyChildComment.childCommentList[this.replyChildIndex]
-        workTaskcommentSaveAPI({
-          pid: item.userId,
-          typeId: item.typeId,
-          mainId: item.mainId == 0 ? item.commentId : item.mainId,
-          type: 1,
-          content: xss(this.childCommentsTextarea)
-        })
-          .then(res => {
-            this.childCommentsPopover = false
-            res.data.user = this.userInfo
-            res.data.replyUser = item.user
-            this.replyChildComment.childCommentList.push(res.data)
-            this.replyChildComment.show = false
-            this.replyChildComment = null
-            this.childCommentsTextarea = ''
-            this.$emit('on-handle', {
-              type: 'change-comments',
-              value: 'add',
-              index: this.detailIndex,
-              section: this.detailSection
-            })
-          })
-          .catch(() => {})
-      }
-    },
-    // 删除评论
-    discussDelete(val, items, index) {
-      this.$confirm('确定删除?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        customClass: 'is-particulars'
-      })
-        .then(() => {
-          workTaskcommentDeleteAPI({
-            commentId: val.commentId
-          })
-            .then(res => {
-              items.splice(index, 1)
-              this.$emit('on-handle', {
-                type: 'change-comments',
-                value: 'delete',
-                index: this.detailIndex,
-                section: this.detailSection
-              })
-            })
-            .catch(() => {})
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
-    },
-    // 点击回复按钮
-    discussBtn(item, index) {
-      if (item.show) {
-        this.$set(item, 'show', false)
-        this.replyChildComment = null
-      } else {
-        this.$set(item, 'show', true)
-        this.replyChildComment = item
-        this.replyChildIndex = index
-        this.$nextTick(() => {
-          this.$refs.childCommentsTextareaRef[0].focus()
-        })
-      }
-    },
-    blurFun(eve) {
-      this.blurIndex = eve.target.selectionEnd
-    },
-    // 关联业务提交按钮
-    checkInfos(val) {
-      taskSvaeTaskRelationAPI({
-        taskId: this.id,
-        customerIds:
-          val.customerIds && val.customerIds.length
-            ? ',' + val.customerIds.join(',') + ','
-            : '',
-        contactsIds:
-          val.contactsIds && val.contactsIds.length
-            ? ',' + val.contactsIds.join(',') + ','
-            : '',
-        businessIds:
-          val.businessIds && val.businessIds.length
-            ? ',' + val.businessIds.join(',') + ','
-            : '',
-        contractIds:
-          val.contractIds && val.contractIds.length
-            ? ',' + val.contractIds.join(',') + ','
-            : ''
-      })
-        .then(res => {
-          this.$message.success('关联成功')
-        })
-        .catch(() => {})
-    },
-    commentsSubmit(event) {
-      this.addComments = false
-    },
-    checkRelatedDetail(crmType, item) {
-      this.relatedID = item.key
-      this.relatedCRMType = crmType
-      this.showRelatedDetail = true
-    },
-    deleteSubTask(val) {
-      this.$confirm('此操作将删除该任务, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        customClass: 'is-particulars'
-      })
-        .then(() => {
-          workTaskDeleteAPI({
-            taskId: val.taskId
-          })
-            .then(res => {
-              const subData = this.taskData.childTask
-              for (const i in subData) {
-                if (subData[i].taskId == val.taskId) {
-                  subData.splice(i, 1)
-                  break
-                }
-              }
-              if (val.checked) {
-                this.subTaskProgress--
-                this.$emit('on-handle', {
-                  type: 'change-sub-task',
-                  value: {
-                    subdonecount: this.subTaskProgress,
-                    allcount: this.taskData.childTask.length
-                  },
-                  index: this.detailIndex,
-                  section: this.detailSection
-                })
-              }
-              this.$message.success('子任务删除成功')
-            })
-            .catch(() => {
-              this.$message.error('子任务删除失败')
-            })
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
-    },
-    editSubTask(val) {
-      this.subTaskID = val.taskId
-      const dataList = this.taskData.childTask
-      for (const i in dataList) {
-        if (dataList[i].taskId == val.taskId) {
-          this.$set(dataList[i], 'showEdit', true)
-        } else {
-          this.$set(dataList[i], 'showEdit', false)
-        }
-      }
-    },
-    handleSubTasksBlock(data, item) {
-      if (data.type == 'edit') {
-        this.$set(item, 'showEdit', false)
-      } else if (data.type == 'add') {
-        this.addSubtasks = true
-        if (data.result == 'success') {
-          this.$emit('on-handle', {
-            type: 'change-sub-task',
-            value: {
-              subdonecount: this.subTaskProgress,
-              allcount: this.taskData.childTask.length + 1
-            },
-            index: this.detailIndex,
-            section: this.detailSection
-          })
-        } else {
-          this.$emit('on-handle', {
-            type: 'change-sub-task',
-            value: {
-              subdonecount: this.subTaskProgress,
-              allcount: this.taskData.childTask.length - 1
-            },
-            index: this.detailIndex,
-            section: this.detailSection
-          })
-        }
-      } else if (data.type == 'cancel') {
-        if (item) {
-          this.$set(item, 'showEdit', false)
-        } else {
-          this.addSubtasks = true
-        }
-      }
-    },
-    // 删除截止时间
-    deleteTimeTop() {
-      workTaskSaveAPI({
-        taskId: this.id,
-        stopTime: ''
-      })
-        .then(res => {
-          this.$set(this.taskData, 'stopTime', '')
-        })
-        .catch(() => {})
-    },
-
-    /**
-     * 激活任务
-     */
-    activateTask() {
-      this.loading = true
-      workTaskRecoverAPI({
-        taskId: this.taskData.taskId
-      })
-        .then(res => {
-          this.loading = false
-          this.$emit('on-handle', {
-            type: 'activate-task',
-            index: this.detailIndex,
-            section: this.detailSection
-          })
-          this.closeBtn()
-        })
-        .catch(() => {
-          this.loading = false
-        })
-    },
-
-    /**
-     * 激活任务
-     */
-    recoverTask() {
-      this.loading = true
-      workTrashRecoverAPI({
-        taskId: this.taskData.taskId
-      })
-        .then(res => {
-          this.loading = false
-          this.$message.success('恢复成功')
-          this.$emit('on-handle', {
-            type: 'recover-task',
-            index: this.detailIndex,
-            section: this.detailSection
-          })
-          this.closeBtn()
-        })
-        .catch(() => {
-          this.loading = false
-        })
-    },
-
-    /**
-     * 激活任务
-     */
-    thoroughDeleteTask() {
-      this.$confirm('确定删除?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.loading = true
-          workTrashDeleteAPI({
-            taskId: this.taskData.taskId
-          })
-            .then(res => {
-              this.loading = false
-              this.$emit('on-handle', {
-                type: 'thorough-delete-task',
-                index: this.detailIndex,
-                section: this.detailSection
-              })
-              this.closeBtn()
-            })
-            .catch(() => {
-              this.loading = false
-            })
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.wukong {
-  vertical-align: middle;
-  color: #666;
-}
-.slide-fade-enter-active,
-.slide-fade-leave-active {
-  will-change: transform;
-  transition: all 0.35s ease;
-}
-.slide-fade-enter,
-.slide-fade-leave-to {
-  transform: translateX(100%);
-}
-.display-flex {
-  display: flex;
-}
-// 小手抓
-.cursor-pointer {
-  cursor: pointer;
-}
-// 时间背景
-.bg-color {
-  background: #f5f5f5;
-  padding: 4px 8px;
-  border-radius: 14px;
-}
-.task-bg-color {
-  background: #e6e6e6;
-}
-.border {
-  border-top: 1px solid #e6e6e6;
-  margin: 0 -20px;
-}
-
-.particulars-priority-box {
-  display: flex;
-  p {
-    flex: 1;
-    cursor: pointer;
-    display: inline-block;
-    text-align: center;
-    span {
-      color: #aaa;
-      font-size: 12px;
-      padding: 7px 10px;
-      text-align: center;
-      display: inline-block;
-      border-radius: 50%;
-      border: 1px solid transparent;
-    }
-  }
-}
-// 更多按钮
-.more-btn-group {
-  line-height: 34px;
-  font-size: 14px;
-  margin: 0 -12px;
-  p {
-    padding-left: 22px;
-    cursor: pointer;
-  }
-  p:hover {
-    background: #f7f8fa;
-    color: #3e84e9;
-  }
-}
-// 负责人
-.particulars-colleagues-list {
-  margin: 0 -12px;
-  p {
-    height: 34px;
-    line-height: 34px;
-    padding-left: 22px;
-    cursor: pointer;
-  }
-  p:hover {
-    -webkit-box-shadow: 0 0 8px 2px #eee;
-    box-shadow: 0 0 8px 2px #eee;
-    background: 0 0;
-  }
-}
-.particulars-common /deep/ .el-card__body {
-  flex: 1;
-  overflow: auto;
-  display: flex;
-  flex-direction: column;
-}
-.tip {
-  position: fixed;
-  right: 0px;
-  width: 926px;
-  bottom: 0;
-  overflow: hidden;
-  margin-top: 50px;
-  height: 40px;
-  line-height: 40px;
-  border-top: 1px solid #e6e6e6;
-  background: #fff;
-  color: #999;
-  z-index: 9;
-  span {
-    margin-left: 55px;
-  }
-}
-.particulars-common {
-  position: fixed;
-  top: 60px;
-  right: 0px;
-  width: 926px;
-  bottom: 0;
-  display: flex;
-  flex-direction: column;
-  .clear-fix {
-    overflow: auto;
-  }
-
-  .work-name {
-    position: absolute;
-    top: 17px;
-    left: 20px;
-    font-size: 18px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    width: 300px;
-    color: #666;
-  }
-  .img-box-grop {
-    float: right;
-    color: #999;
-    .task-close-img {
-      padding-left: 30px;
-      img {
-        width: 18px;
-      }
-    }
-
-    .wukong {
-      color: #999;
-    }
-  }
-  .img-box-grop > div {
-    display: inline-block;
-    margin-right: 20px;
-    cursor: pointer;
-    img {
-      vertical-align: middle;
-    }
-    .upload-demo /deep/ .el-upload-list--picture {
-      display: none;
-    }
-  }
-  .card-content-box {
-    img {
-      vertical-align: middle;
-    }
-    .el-checkbox {
-      height: 20px;
-      margin-right: 8px;
-    }
-    // 解决多选框样式
-    .el-checkbox /deep/ .el-checkbox__inner {
-      width: 20px;
-      height: 20px;
-    }
-    .el-checkbox /deep/ .el-checkbox__inner::after {
-      border-width: 2px;
-      height: 12px;
-      width: 5px;
-      left: 5px;
-    }
-    .card-content {
-      padding: 0 15px;
-      .card-content-row {
-        margin-bottom: 35px;
-        display: flex;
-        .priority-data-name {
-          flex: 1;
-          .title-text {
-            white-space: pre-wrap;
-            word-wrap: break-word;
-            line-height: 22px;
-            font-size: 17px;
-            color: #333;
-            .el-icon-edit-outline {
-              margin: 0 10px;
-              color: #3e84e9;
-              opacity: 0;
-              cursor: pointer;
-            }
-          }
-          .title-text:hover {
-            .el-icon-edit-outline {
-              opacity: 1;
-            }
-          }
-          .show-input {
-            flex: 1;
-            padding-right: 8px;
-            .btn-box {
-              margin-top: 10px;
-            }
-          }
-        }
-        .el-icon-circle-plus-outline {
-          width: 30px;
-          height: 30px;
-          color: #ccc;
-        }
-        .card-row-right {
-          width: 200px;
-          .text-right {
-            min-height: 28px;
-            position: relative;
-            .el-icon-close {
-              opacity: 0;
-              margin-left: 10px;
-              color: #ccc;
-              cursor: pointer;
-            }
-            .el-popover__reference {
-              width: 20px;
-            }
-            .main-user-name {
-              width: 25px;
-              height: 25px;
-              border-radius: 12.5px;
-            }
-            .user-name-label {
-              width: 73px;
-              display: inline-block;
-            }
-
-            .bg-position {
-              position: relative;
-              display: inline-block;
-              .el-icon-close {
-                opacity: 0;
-                border-radius: 50%;
-                cursor: pointer;
-                position: absolute;
-                z-index: 3;
-                top: -7px;
-                right: -5px;
-              }
-            }
-            .wukong-addition-task {
-              cursor: pointer;
-            }
-
-            .time-top {
-              position: relative;
-              display: inline-block;
-              .time-top-close {
-                opacity: 0;
-                border-radius: 50%;
-                cursor: pointer;
-                position: absolute;
-                z-index: 3;
-                top: -7px;
-                right: -5px;
-              }
-            }
-
-            .time-top /deep/ .el-date-editor {
-              width: 115px;
-              input {
-                background-color: #f5f5f5;
-                border: none;
-                border-radius: 15px;
-                line-height: 30px;
-                height: 30px;
-                padding-right: 0;
-              }
-            }
-            .time-top /deep/ .no-time-top.el-date-editor {
-              width: 30px;
-              .el-input__prefix {
-                left: 2px;
-              }
-            }
-          }
-
-          .text-right:hover {
-            .el-icon-close {
-              opacity: 1;
-            }
-          }
-          .color-label {
-            margin-right: 10px;
-            vertical-align: middle;
-          }
-        }
-        .card-row-right:hover {
-          .el-icon-close {
-            opacity: 1;
-          }
-        }
-        .particulars-priority-copy {
-          flex: 1;
-          white-space: normal;
-          .item-color {
-            padding: 0 10px;
-            color: #fff;
-            font-size: 12px;
-            margin-right: 5px;
-            border-radius: 3px;
-            display: inline-block;
-            height: 22px;
-            line-height: 22px;
-            margin-bottom: 5px;
-          }
-          .el-icon-plus,
-          .add-tag {
-            color: #999;
-          }
-          .el-icon-plus {
-            font-size: 13px;
-            padding-left: 6px;
-          }
-          .add-tag {
-            display: inline-block;
-            width: 83px;
-            height: 24px;
-            line-height: 24px;
-            background: rgba(245, 245, 245, 1);
-            border-radius: 3px;
-            cursor: pointer;
-            text-align: center;
-            font-size: 12px;
-          }
-          .label {
-            padding-right: 10px;
-          }
-        }
-        .class-file {
-          img {
-            margin: 0 5px;
-          }
-        }
-      }
-      .card-content-row-column {
-        flex-direction: column;
-        margin-right: 20px;
-        .accessory-box {
-          margin-top: 10px;
-        }
-        .participant {
-          color: #666;
-          img,
-          span {
-            vertical-align: middle;
-          }
-        }
-        .participant-class {
-          margin-left: 10px;
-          min-height: 28px;
-          .owner-list {
-            position: relative;
-            margin-right: 10px;
-            display: inline-block;
-            .item-img {
-              width: 25px;
-              height: 25px;
-              border-radius: 12.5px;
-            }
-            .el-icon-close {
-              opacity: 0;
-              color: #fff;
-              background: #ccc;
-              border-radius: 50%;
-              cursor: pointer;
-              position: absolute;
-              z-index: 3;
-              top: -7px;
-              right: -5px;
-            }
-          }
-          .owner-list:hover {
-            .el-icon-close {
-              opacity: 1;
-            }
-          }
-        }
-        .task-add-png {
-          display: inline-block;
-        }
-        .show-edit {
-          background: #f5f7fa;
-          height: 40px;
-          line-height: 40px;
-          // color: #3E84E9;
-          padding: 0 10px;
-          font-size: 13px;
-          .card-related-matters-right {
-            float: right;
-            margin-top: 8px;
-          }
-          .rt {
-            margin-right: 0;
-            .bg-color {
-              font-size: 12px;
-              padding: 0 8px !important;
-              vertical-align: middle;
-              height: 30px;
-              line-height: 30px;
-            }
-            .div-photo {
-              margin-top: 0 !important;
-            }
-            .rt-box {
-              height: 41.5px;
-            }
-          }
-        }
-        .display-flex {
-          margin-bottom: 10px;
-          span {
-            margin-right: 10px;
-          }
-        }
-        .el-progress {
-          flex: 1;
-          margin-left: 10px;
-        }
-        .el-progress /deep/ .el-progress-bar {
-          padding-right: 0;
-          .el-progress-bar__outer {
-            background: #f5f5f5;
-          }
-        }
-        .el-progress /deep/ .el-progress__text {
-          display: none;
-        }
-        .subtasks-box {
-          color: #333;
-          border-radius: 3px;
-          margin: 3px 0;
-          height: 40px;
-          // line-height: 40px;
-          // cursor: pointer;
-          // 解决多选框样式
-          .el-checkbox /deep/ .el-checkbox__inner {
-            width: 16px;
-            height: 16px;
-          }
-          .el-checkbox /deep/ .el-checkbox__inner::after {
-            border-width: 2px;
-            height: 10px;
-            width: 4px;
-            left: 4px;
-            top: 0;
-          }
-          .rt {
-            .div-photo {
-              margin-top: 7px;
-              width: 25px;
-              height: 25px;
-              border-radius: 12.5px;
-              margin-left: 10px;
-            }
-          }
-          .edit-del-box {
-            display: inline-block;
-            padding-left: 10px;
-            opacity: 0;
-            .wukong {
-              padding-left: 10px;
-              cursor: pointer;
-            }
-            .wukong:hover {
-              color: #3e84e9;
-            }
-          }
-          .item-name {
-            padding-left: 5px;
-          }
-        }
-        .subtasks-box:hover {
-          box-shadow: 0px 1px 4px 0px rgba(223, 227, 234, 1);
-          .edit-del-box {
-            opacity: 1;
-          }
-        }
-      }
-
-      .card-content-row /deep/ .related-business {
-        margin: 10px 0;
-        .list {
-          margin: 0;
-          .item-list {
-            margin-bottom: 5px;
-            background: #f5f7fa;
-            border: 0;
-          }
-        }
-        .add-file {
-          display: inline-block;
-          background: #f5f7fa;
-          width: 100%;
-          height: 40px;
-          line-height: 40px;
-          padding-left: 8px;
-          margin: 0;
-        }
-      }
-      .add-subtasks {
-        color: #3e84e9;
-        cursor: pointer;
-        background: #f5f7fa;
-        height: 40px;
-        line-height: 40px;
-        margin-top: 10px;
-        padding-left: 12px;
-        font-size: 13px;
-      }
-      .add-description /deep/ {
-        margin-bottom: 20px;
-        position: relative;
-        cursor: pointer;
-        .description-content {
-          white-space: pre-wrap;
-          word-wrap: break-word;
-          line-height: 18px;
-        }
-        .no-description {
-          color: #3e84e9;
-          .color-label {
-            color: #999;
-          }
-          button {
-            margin-left: 5px;
-          }
-        }
-        .btn-box {
-          margin-top: 10px;
-        }
-        .el-textarea /deep/.el-textarea__inner {
-          resize: none;
-        }
-      }
-      .margin-bottom-15 {
-        margin-bottom: 15px;
-      }
-      .margin-bottom-25 {
-        margin-bottom: 25px;
-      }
-      .margin-bottom-30 {
-        margin-bottom: 30px;
-      }
-      .margin-bottom-7 {
-        margin-bottom: 7px;
-      }
-    }
-    .color-label {
-      color: #666;
-    }
-    .sub-task {
-      .sub-task-progress {
-        line-height: 22px;
-      }
-      .el-progress {
-        line-height: 22px;
-      }
-    }
-  }
-  .card-footers {
-    margin: 20px 0 60px 0;
-    .footer-title {
-      margin-bottom: 40px;
-      margin-left: 35px;
-      img,
-      span {
-        vertical-align: middle;
-        cursor: pointer;
-      }
-      .title-border {
-        border-right: 2px solid #ccc;
-        margin: 0 20px;
-      }
-    }
-    .footer-content-box {
-      .footer-content {
-        .activity-box {
-          margin-left: 35px;
-          margin-right: 35px;
-          .activity-list {
-            margin-bottom: 15px;
-            color: #333;
-            .activity-time {
-              color: #999;
-              font-size: 12px;
-            }
-            .activity-name {
-              color: #666;
-              margin: 0 8px;
-            }
-            .activity-content {
-              color: #333;
-              flex: 1;
-              margin: 0 8px;
-              white-space: pre-wrap;
-              word-wrap: break-word;
-              line-height: 18px;
-            }
-            .div-photo {
-              width: 25px;
-              height: 25px;
-              border-radius: 12.5px;
-              margin-right: 10px;
-            }
-          }
-        }
-        .comments-con > .comments-box {
-          margin-bottom: 10px;
-        }
-        .comments-box {
-          border: 1px solid #e6e6e6;
-          .el-textarea /deep/ .el-textarea__inner {
-            border: 0;
-            resize: none;
-          }
-          .btn-group {
-            overflow: hidden;
-            margin: 10px;
-            .smiling-img {
-              margin-top: 7px;
-            }
-            .rt {
-              margin-right: 10px;
-            }
-          }
-        }
-
-        .add-comments {
-          display: flex;
-          .footer-img {
-            margin-left: 35px;
-            margin-right: 20px;
-            .div-photo {
-              width: 42px;
-              height: 42px;
-              border-radius: 21px;
-              margin-top: 4px;
-            }
-          }
-          .comments-con {
-            flex: 1;
-            margin-right: 35px;
-            .footer-bg {
-              background: #f5f5f5;
-              height: 50px;
-              line-height: 50px;
-              padding-left: 24px;
-              color: #666;
-              cursor: pointer;
-              margin-bottom: 5px;
-            }
-          }
-        }
-      }
-    }
-  }
-  .title {
-    color: #333333;
-    font-size: 18px;
-  }
-  // 回到父任务
-  .parent-task {
-    margin-bottom: 15px;
-    .p-name {
-      margin-left: 10px;
-    }
-    .back {
-      margin-left: 35px;
-      color: #3e84e9;
-      cursor: pointer;
-    }
-  }
-}
-
-// 评论列表
-.discuss {
-  padding: 10px 0;
-  .discuss-list {
-    .name,
-    .time,
-    .head-img {
-      vertical-align: middle;
-    }
-    .head-img {
-      width: 25px;
-      height: 25px;
-      display: inline-block;
-      border-radius: 12.5px;
-    }
-    .name {
-      margin: 0 10px;
-      font-size: 15px;
-    }
-    .time {
-      color: #999;
-      font-size: 12px;
-      display: inline-block;
-      margin-top: 3px;
-    }
-
-    .reply-title {
-      color: #333;
-      font-size: 13px;
-      margin: 10px 0 10px 40px;
-      word-wrap: break-word;
-      white-space: pre-wrap;
-      line-height: 18px;
-      .reply {
-        color: #3e84e9;
-      }
-    }
-    .reply-title /deep/ img {
-      vertical-align: text-bottom;
-      margin: 0 2px;
-    }
-
-    .children-reply {
-      margin: 10px 0 10px 40px;
-    }
-
-    .rt {
-      margin-top: 4px;
-      color: #999;
-      margin-right: 0;
-      span {
-        margin-left: 10px;
-        cursor: pointer;
-      }
-    }
-    .discuss-content {
-      background: #f5f7fa;
-      color: #777;
-      line-height: 36px;
-      margin-left: 40px;
-      padding-left: 15px;
-    }
-    .discuss-content /deep/ img {
-      vertical-align: middle;
-      margin: 0 3px;
-    }
-    .border {
-      margin: 15px 0 15px 40px;
-    }
-    .comment-box {
-      margin-left: 40px;
-      padding: 0;
-      background: transparent;
-      margin-top: 15px;
-    }
-  }
-}
-
-// 评论框
-.comment-box {
-  margin: 20px;
-  border: 1px solid #e6e6e6;
-  .btn-group {
-    padding: 0 20px 10px 10px;
-    overflow: hidden;
-    .btn-box {
-      float: right;
-    }
-  }
-  .btn-group /deep/ img {
-    cursor: pointer;
-  }
-  .el-textarea /deep/ .el-textarea__inner {
-    resize: none;
-    border: 0;
-  }
-}
-
-// 归档
-.particulars-extraContent {
-  margin: -20px -20px 20px -20px;
-  background: #eee;
-  height: 40px;
-  line-height: 40px;
-  text-align: center;
-  .border-radius {
-    border-radius: 11px;
-    padding: 5px 15px;
-  }
-}
-</style>
-
diff --git a/code/WebApp/vue/src/views/ux/businessdata/components/tag/editTag.vue b/code/WebApp/vue/src/views/ux/businessdata/components/tag/editTag.vue
deleted file mode 100644
index becc3d11..00000000
--- a/code/WebApp/vue/src/views/ux/businessdata/components/tag/editTag.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-  <div class="edit-tag-dialog">
-    <div class="title">
-      <span
-        class="el-icon-arrow-left"
-        @click="back"/>
-      <span>标签管理</span>
-      <span
-        class="el-icon-close rt"
-        @click="close"/>
-    </div>
-    <div class="search">
-      <el-input
-        v-model="inputModel"
-        :maxlength="10"
-        size="mini"
-        placeholder="输入标签名，最多十个字符"/>
-    </div>
-    <div class="content">
-      <div
-        v-for="(item, index) in list"
-        :key="index"
-        class="tag-list">
-        <span
-          :style="{'background': item.color ? item.color: '#ccc'}"
-          class="tag-name">
-          {{ item.name.length > 10 ? item.name.substring(0, 10) + '...' : item.name }}
-        </span>
-        <div class="rt">
-          <span
-            class="el-icon-edit"
-            @click="editBtn(item)"/>
-          <span
-            class="el-icon-delete"
-            @click="deleteBtn(item)"/>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    editTagList: Array
-  },
-  data() {
-    return {
-      inputModel: '',
-      list: this.editTagList
-    }
-  },
-  watch: {
-    inputModel: function(newVal) {
-      this.list = this.editTagList.filter(item => {
-        return item.name.indexOf(newVal) > -1
-      })
-    }
-  },
-  methods: {
-    back() {
-      this.$emit('back')
-    },
-    close() {
-      this.$emit('close')
-    },
-    deleteBtn(item) {
-      this.$emit('deleteBtn', item)
-    },
-    editBtn(item) {
-      this.$emit('editBtn', item)
-    }
-  }
-}
-</script>
-
-
-<style scoped lang="scss">
-.edit-tag-dialog {
-  overflow: hidden;
-  // position: absolute;
-  // top: 0;
-  // left: -110px;
-  // right: 0;
-  background: #fff;
-  min-height: 200px;
-  // box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
-  .title {
-    padding: 10px;
-    border-bottom: 1px solid#E6E6E6;
-    margin-bottom: 20px;
-    .el-icon-close {
-      margin-right: 0;
-      cursor: pointer;
-    }
-    .el-icon-arrow-left {
-      cursor: pointer;
-    }
-  }
-  .search {
-    .el-input {
-      width: 90%;
-      margin: 0 5%;
-    }
-    .el-input /deep/ .el-input__inner {
-      border-radius: 15px;
-    }
-  }
-  .content {
-    margin: 10px 0;
-    height: 196px;
-    overflow: auto;
-    .tag-list {
-      padding: 5px 5%;
-      .rt {
-        margin-right: 0;
-        color: #aaa;
-        span {
-          margin-right: 10px;
-          cursor: pointer;
-        }
-      }
-      .tag-name {
-        font-size: 12px;
-        border-radius: 3px;
-        padding: 3px 10px;
-        color: #fff;
-      }
-    }
-    .tag-list:hover {
-      background: #f7f8fa;
-    }
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/ux/businessdata/components/tag/newTag.vue b/code/WebApp/vue/src/views/ux/businessdata/components/tag/newTag.vue
deleted file mode 100644
index c0c9ebec..00000000
--- a/code/WebApp/vue/src/views/ux/businessdata/components/tag/newTag.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<template>
-  <div class="new-tag-dialog">
-    <div class="title">
-      <span
-        class="el-icon-arrow-left"
-        @click="back"/>
-      <span>{{ newTagTitle }}</span>
-      <span
-        class="el-icon-close rt"
-        @click="close"/>
-    </div>
-    <div class="search">
-      <el-input
-        v-model="input"
-        :maxlength="10"
-        size="mini"
-        placeholder="输入标签名，最多十个字符"/>
-      <span
-        :style="{'background': showBgColor}"
-        class="checked-color"/>
-    </div>
-    <div class="color-box">
-      <span
-        v-for="(item, index) in colorList"
-        :key="index"
-        :style="{'background': item}"
-        @click="changeColor(item)"/>
-    </div>
-    <div class="footer">
-      <el-button
-        type="primary"
-        size="medium"
-        @click="tagCreateSubmit">保存</el-button>
-      <el-button
-        size="medium"
-        @click="tagCancel">取消</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    newTagTitle: String,
-    newTagInput: String,
-    bgColorProps: String
-  },
-  data() {
-    return {
-      colorList: [
-        '#53D397',
-        '#20C1BD',
-        '#58DADA',
-        '#0FC9E7',
-        '#3498DB',
-        '#4586FF',
-        '#8983F3',
-        '#AEA1EA',
-        '#FF6699',
-        '#F24D70',
-        '#FF6F6F'
-      ],
-      input: this.newTagInput,
-      showBgColor: ''
-    }
-  },
-  watch: {
-    bgColorProps: function(color) {
-      this.showBgColor = color || '#53D397'
-    }
-  },
-  mounted() {
-    this.showBgColor = this.bgColorProps || '#53D397'
-  },
-  methods: {
-    back() {
-      this.$emit('back')
-    },
-    close() {
-      this.$emit('close')
-    },
-    // 点击变色
-    changeColor(val) {
-      this.$emit('changeColor', val)
-    },
-    // 创建按钮
-    tagCreateSubmit() {
-      this.$emit('tagCreateSubmit', this.input, this.showBgColor)
-    },
-    // 取消按钮
-    tagCancel() {
-      this.$emit('tagCancel')
-    }
-  }
-}
-</script>
-
-
-<style scoped lang="scss">
-.new-tag-dialog {
-  overflow: hidden;
-  // position: absolute;
-  // top: 0;
-  // left: -110px;
-  // bottom: 0;
-  // right: 0;
-  background: #fff;
-  min-height: 200px;
-  // box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
-  margin: 0 -12px -12px;
-  .title {
-    padding: 10px;
-    border-bottom: 1px solid#E6E6E6;
-    margin-bottom: 20px;
-    .el-icon-close {
-      margin-right: 0;
-      cursor: pointer;
-    }
-    .el-icon-arrow-left {
-      cursor: pointer;
-    }
-  }
-  .search {
-    position: relative;
-    .el-input {
-      width: 90%;
-      margin: 0 5%;
-    }
-    .el-input /deep/ .el-input__inner {
-      padding-left: 40px;
-    }
-    .checked-color {
-      position: absolute;
-      left: 5%;
-      top: 0;
-      display: inline-block;
-      width: 20px;
-      height: 20px;
-      border-radius: 50%;
-      margin: 4px 10px;
-    }
-  }
-  .footer {
-    text-align: right;
-    margin: 20px;
-  }
-  .color-box {
-    margin: 10px 5%;
-    span {
-      display: inline-block;
-      width: 20px;
-      height: 20px;
-      margin-right: 5px;
-      border-radius: 50%;
-      cursor: pointer;
-    }
-  }
-}
-</style>
diff --git a/code/WebApp/vue/src/views/ux/businessdata/components/tag/tagIndex.vue b/code/WebApp/vue/src/views/ux/businessdata/components/tag/tagIndex.vue
deleted file mode 100644
index 1aa27c8c..00000000
--- a/code/WebApp/vue/src/views/ux/businessdata/components/tag/tagIndex.vue
+++ /dev/null
@@ -1,397 +0,0 @@
-<template>
-  <div class="edit-index">
-    <el-popover
-      :placement="placement"
-      :width="popoverWidth"
-      v-model="tagShow"
-      trigger="click">
-      <div
-        v-if="tagContent == 0"
-        class="tag-popover-box">
-        <div class="tag-top">
-          <span>选择标签</span>
-          <span
-            class="el-icon-close rt cursor-pointer"
-            @click="tagShow = false"/>
-        </div>
-        <el-input
-          v-model="tagInputChange"
-          placeholder="搜索标签"
-          prefix-icon="el-icon-search"
-          size="small"/>
-        <div class="tag-content">
-          <div
-            v-for="(item, index) in particularsTagList"
-            :key="index"
-            class="tag-list"
-            @click="tagBtn(item, particularsTagList)">
-            <i
-              :style="{ 'color': item.color}"
-              class="wukong wukong-black-label"/>
-            <span class="item-label">{{ item.name }}</span>
-            <span
-              v-if="item.check"
-              class="el-icon-check rt"/>
-          </div>
-        </div>
-        <div class="tag-footer">
-          <p
-            class="footer-row cursor-pointer"
-            @click="createTagFun">
-            <span class="el-icon-plus"/>
-            <span>创建新标签</span>
-          </p>
-          <p
-            class="footer-row cursor-pointer"
-            @click="managementTag">
-            <span class="el-icon-setting"/>
-            <span>标签管理</span>
-          </p>
-        </div>
-      </div>
-      <!-- 新建标签页 -->
-      <new-tag
-        v-else-if="tagContent == 1"
-        :new-tag-title="newTagTitle"
-        :new-tag-input="newTagInput"
-        :bg-color-props="bgColorProps"
-        @changeColor="changeColor"
-        @close="tagClose"
-        @tagCreateSubmit="tagCreateSubmit"
-        @tagCancel="tagCancel"
-        @back="back"/>
-      <!-- 标签管理 -->
-      <editTag
-        v-else-if="tagContent == 2"
-        :edit-tag-list="editTagList"
-        @back="back"
-        @close="tagClose"
-        @editBtn="editBtn"
-        @deleteBtn="deleteBtn"/>
-      <!-- 标签管理 - 编辑 -->
-      <new-tag
-        v-else-if="tagContent == 3"
-        :new-tag-title="newTagTitle"
-        :new-tag-input="newTagInput"
-        :bg-color-props="bgColorProps"
-        @changeColor="changeColor"
-        @close="tagClose"
-        @tagCreateSubmit="tagCreateSubmit"
-        @tagCancel="tagCancel"
-        @back="back"/>
-      <span
-        slot="reference"
-        @click="referenceFun">
-        <slot name="editIndex"/>
-      </span>
-    </el-popover>
-  </div>
-</template>
-
-<script>
-import NewTag from './newTag'
-import EditTag from './editTag'
-// import { workTasklableIndexAPI } from '@/api/projectManagement/tag'
-// import { workTaskSaveAPI } from '@/api/projectManagement/task'
-// import {
-//   workTasklableDeleteAPI,
-//   workTasklableSaveAPI
-// } from '@/api/projectManagement/tag'
-
-export default {
-  components: {
-    NewTag,
-    EditTag
-  },
-  props: {
-    taskData: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    placement: String
-  },
-  data() {
-    return {
-      // 标签弹出框
-      tagShow: false,
-      // 显示tag页面
-      tagContent: 0,
-      // 标签筛选框
-      tagInputChange: '',
-      // 标签数据
-      editTagList: [],
-      particularsTagList: [],
-      particularsTagListCopy: [],
-      // 新增、编辑标签标题
-      newTagTitle: '',
-      // 创建-编辑标签的输入框
-      newTagInput: '',
-      // 标签颜色
-      bgColorProps: '',
-      // 标签编辑ID
-      editTagId: '',
-      popoverWidth: '220'
-    }
-  },
-  watch: {
-    // 搜索标签
-    tagInputChange: function(newVal) {
-      this.particularsTagList = this.particularsTagListCopy.filter(item => {
-        return item.name.indexOf(newVal) > -1
-      })
-    }
-  },
-  mounted() {},
-  methods: {
-    // 创建新标签
-    createTagFun() {
-      this.newTagTitle = '创建新标签'
-      this.newTagInput = ''
-      this.tagContent = 1
-      this.popoverWidth = '330'
-    },
-    // 标签管理 -- 编辑
-    editBtn(val) {
-      this.editTagId = val.labelId
-      this.newTagTitle = '编辑标签'
-      this.tagContent = 3
-      this.bgColorProps = val.color
-      this.newTagInput = val.name
-    },
-    // 标签管理弹出框
-    managementTag() {
-      this.popoverWidth = '400'
-      this.tagContent = 2
-    },
-    // 标签点击变色
-    tagBtn(value, values) {
-      // 标签点击关联页面
-      const labelIds = values.filter(item => {
-        if (value.check) {
-          return item.check && item.labelId != value.labelId
-        } else {
-          return item.check || item.labelId == value.labelId
-        }
-      })
-      if (value.check) {
-        workTaskSaveAPI({
-          taskId: this.taskData.taskId,
-          labelId: labelIds
-            .map(item => {
-              return item.labelId
-            })
-            .join(',')
-        }).then(res => {
-          const list = this.taskData.labelList
-          for (const item in list) {
-            if (value.labelId == list[item].labelId) {
-              list.splice(item, 1)
-              break
-            }
-          }
-          value.check = false
-        })
-      } else {
-        workTaskSaveAPI({
-          taskId: this.taskData.taskId,
-          labelId: labelIds
-            .map(item => {
-              return item.labelId
-            })
-            .join(',')
-        }).then(res => {
-          value.check = true
-          value.labelName = value.name
-          this.taskData.labelList.push(value)
-        })
-      }
-      // value.check = value.check ? false : true
-      for (const item in values) {
-        if (values[item].labelId == value.labelId) {
-          document.getElementsByClassName('tag-list')[item].style.background =
-            '#F7F8FA'
-        } else {
-          document.getElementsByClassName('tag-list')[item].style.background =
-            '#FFF'
-        }
-      }
-    },
-    // 标签点击变色
-    changeColor(val) {
-      this.bgColorProps = val
-    },
-    // 标签管理 -- 关闭按钮
-    tagClose() {
-      this.tagShow = false
-    },
-    // 创建新标签 -- 提交
-    tagCreateSubmit(val, color) {
-      const _this = this
-      if (this.newTagTitle == '创建新标签') {
-        workTasklableSaveAPI({
-          name: val,
-          color: color
-        }).then(res => {
-          // 关闭标签页
-          this.tagClose()
-          // 刷新标签列表
-          this.tagListFun()
-          this.$message.success('创建成功')
-        })
-      } else {
-        workTasklableSaveAPI({
-          name: val,
-          labelId: this.editTagId,
-          color: color
-        }).then(res => {
-          for (const item of _this.editTagList) {
-            if (item.labelId == _this.editTagId) {
-              item.name = val
-              item.color = color
-            }
-          }
-          this.tagContent = 2
-        })
-      }
-    },
-    // 创建新标签 -- 取消
-    tagCancel() {
-      if (this.newTagTitle == '创建新标签') {
-        // 关闭标签页
-        this.tagClose()
-        this.$message.info('已取消创建')
-      } else {
-        this.tagContent = 2
-      }
-    },
-    // 标签管理 ——— 返回上一页
-    back() {
-      if (this.newTagTitle == '创建新标签') {
-        this.tagContent = 0
-        this.popoverWidth = '220'
-      } else if (this.newTagTitle == '编辑标签' && this.tagContent == 3) {
-        this.tagContent = 2
-      } else if (this.tagContent == 2) {
-        this.tagContent = 0
-        this.popoverWidth = '220'
-      }
-    },
-    // 标签管理 ——— 删除按钮
-    deleteBtn(val) {
-      this.$confirm('确定删除?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        customClass: 'is-particulars'
-      })
-        .then(() => {
-          this.tagShow = true
-          this.managementTag()
-          workTasklableDeleteAPI({
-            labelId: val.labelId
-          }).then(res => {
-            for (const i in this.editTagList) {
-              if (this.editTagList[i].labelId == val.labelId) {
-                this.editTagList.splice(i, 1)
-              }
-            }
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            })
-          })
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-          this.tagShow = true
-          this.managementTag()
-        })
-    },
-    tagListFun() {
-      // 标签列表
-      workTasklableIndexAPI().then(res => {
-        for (const item of res.data) {
-          if (this.taskData.labelList) {
-            for (const i of this.taskData.labelList) {
-              if (i.labelId == item.labelId) {
-                item.check = true
-                break
-              } else {
-                item.check = false
-              }
-            }
-          }
-        }
-        // 标签管理数据
-        this.editTagList = res.data
-        this.particularsTagList = res.data
-        // 用作搜索功能
-        this.particularsTagListCopy = res.data
-      })
-    },
-    referenceFun() {
-      this.tagContent = 0
-      if (this.editTagList && !this.editTagList.length) {
-        this.tagListFun()
-      }
-    }
-  }
-}
-</script>
-
-
-<style scoped lang="scss">
-// 标签按钮
-.tag-popover-box {
-  margin: 0 -12px;
-  .tag-top {
-    margin-bottom: 10px;
-    .el-icon-close {
-      margin-right: 0;
-    }
-  }
-  .el-input /deep/ .el-input__inner {
-    border-radius: 15px;
-  }
-  .tag-content {
-    margin-top: 10px;
-    height: 196px;
-    overflow: auto;
-    border-bottom: 1px solid #e6e6e6;
-    .tag-list {
-      cursor: pointer;
-      padding: 10px;
-      .el-icon-check {
-        margin-right: 0;
-      }
-    }
-    .tag-list:hover {
-      background: #f7f8fa;
-    }
-  }
-  .tag-footer {
-    color: #3e84e9;
-    .footer-row {
-      margin: 13px 0;
-    }
-  }
-}
-.tag-top,
-.tag-content,
-.tag-footer {
-  padding: 0 12px;
-}
-.tag-popover-box > .el-input {
-  width: auto;
-  margin: 0 12px;
-}
-
-.cursor-pointer {
-  cursor: pointer;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/ux/businessdata/deliverGoodsDrag/index-p.vue b/code/WebApp/vue/src/views/ux/businessdata/deliverGoodsDrag/index-p.vue
deleted file mode 100644
index f3e86e4d..00000000
--- a/code/WebApp/vue/src/views/ux/businessdata/deliverGoodsDrag/index-p.vue
+++ /dev/null
@@ -1,811 +0,0 @@
-<template>
-  <div class="my-task">
-    <div class="my-task-header">我的任务</div>
-    <div class="my-task-body">
-      <div
-        v-loading="loading"
-        v-scrollx="{ ignoreClass: ['ignoreClass'] }"
-        class="content-box"
-      >
-        <div
-          v-for="(item, index) in taskList"
-          :key="index"
-          class="board-column"
-        >
-          <flexbox
-            orient="vertical"
-            align="stretch"
-            class="board-column-wrapper ignoreClass"
-          >
-            <div class="board-column-header">
-              <div>
-                <span class="text"> {{ item.title }} </span>
-                <!-- <span class="text-num"
-                  >{{ item.checkedNum }} / {{ item.list.length }}</span
-                > -->
-              </div>
-              <el-progress v-if="item.checkedNum == 0" :percentage="0" />
-              <!-- <el-progress
-                v-else
-                :percentage="(item.checkedNum / item.list.length) * 100"
-              /> -->
-            </div>
-            <draggable
-              :list="item.list"
-              :options="{
-                group: 'mission',
-                forceFallback: false,
-                dragClass: 'sortable-drag',
-              }"
-              :id="index"
-              class="board-column-content"
-              @end="moveEndTask"
-            >
-              <div
-                v-for="(element, i) in item.list"
-                ref="taskRow"
-                :key="i"
-                :class="
-                  element.checked
-                    ? 'board-item board-item-active'
-                    : 'board-item'
-                "
-                :style="{
-                  'border-color':
-                    element.priority == 1
-                      ? '#8bb5f0'
-                      : element.priority == 2
-                      ? '#FF9668'
-                      : element.priority == 3
-                      ? '#ED6363'
-                      : '',
-                }"
-                @click="showDetailView(element, index, i)"
-              >
-                <flexbox align="stretch">
-                  <div @click.stop>
-                    <el-checkbox
-                      v-model="element.checked"
-                      @change="checkboxChange(element, item)"
-                    />
-                  </div>
-                  <div class="element-label">
-                    {{ element.name
-                    }}<span v-if="element.workName"
-                      >（{{ element.workName }}）</span
-                    >
-                  </div>
-                  <div
-                    v-photo="element.mainUser"
-                    v-lazy:background-image="
-                      $options.filters.filterUserLazyImg(element.mainUser.img)
-                    "
-                    v-if="element.mainUser"
-                    :key="element.mainUser.img"
-                    class="head-png div-photo"
-                  />
-                </flexbox>
-                <div class="img-group">
-                  <div v-if="element.stopTime" class="img-box">
-                    <i
-                      :style="{
-                        color:
-                          element.isEnd == 1 && !element.checked
-                            ? 'red'
-                            : '#999',
-                      }"
-                      class="wukong wukong-time-task"
-                    />
-                    <span
-                      :style="{
-                        color:
-                          element.isEnd == 1 && !element.checked
-                            ? 'red'
-                            : '#999',
-                      }"
-                      >{{
-                        new Date(element.stopTime).getTime()
-                          | filterTimestampToFormatTime("MM-DD")
-                      }}
-                      截止</span
-                    >
-                  </div>
-                  <div v-if="element.childAllCount > 0" class="img-box">
-                    <i class="wukong wukong-sub-task" />
-                    <span
-                      >{{ element.childWCCount }}/{{
-                        element.childAllCount
-                      }}</span
-                    >
-                  </div>
-                  <div v-if="element.fileCount" class="img-box">
-                    <i class="wukong wukong-file" />
-                    <span>{{ element.fileCount }}</span>
-                  </div>
-                  <div v-if="element.commentCount" class="img-box">
-                    <i class="wukong wukong-comment-task" />
-                    <span>{{ element.commentCount }}</span>
-                  </div>
-
-                  <!-- <template v-if="element.labelList.length <= 2">
-                    <div
-                      v-for="(k, j) in element.labelList"
-                      :key="j"
-                      :style="{ background: k.color }"
-                      class="item-label"
-                    >
-                      {{ k.labelName }}
-                    </div>
-                  </template>
-                  <template v-else>
-                    <div
-                      :style="{ background: element.labelList[0].color }"
-                      class="item-label"
-                    >
-                      {{ element.labelList[0].labelName }}
-                    </div>
-                    <div
-                      :style="{ background: element.labelList[1].color }"
-                      class="item-label"
-                    >
-                      {{ element.labelList[1].labelName }}
-                    </div>
-                    <el-tooltip
-                      placement="top"
-                      effect="light"
-                      popper-class="tooltip-change-border task-tooltip"
-                    >
-                      <div slot="content" style="margin: 10px 10px 10px 0">
-                        <div
-                          v-for="(k, j) in element.labelList"
-                          :key="j"
-                          style="display: inline-block; margin-right: 10px"
-                        >
-                          <span
-                            v-if="j >= 2"
-                            :style="{ background: k.color ? k.color : '#ccc' }"
-                            class="k-name"
-                            style="
-                              border-radius: 3px;
-                              color: #fff;
-                              padding: 3px 10px;
-                            "
-                            >{{ k.labelName }}</span
-                          >
-                        </div>
-                      </div>
-                      <div class="color-label-more">
-                        <i>...</i>
-                      </div>
-                    </el-tooltip>
-                  </template> -->
-                </div>
-              </div>
-            </draggable>
-            <div class="new-task" @click="createTaskByTop(item.isTop)">
-              <span class="el-icon-plus" />
-              <span>新建任务</span>
-            </div>
-          </flexbox>
-        </div>
-      </div>
-    </div>
-    <!-- 新建任务弹出框 newDialog-->
-    <new-dialog
-      :visible="taskCreateShow"
-      :params="{ isTop: topId }"
-      @handleClose="handleClose"
-      @submit="getList"
-    />
-    <!-- 详情 -->
-    <particulars
-      v-if="taskDetailShow"
-      ref="particulars"
-      :id="taskID"
-      :detail-index="detailIndex"
-      :detail-section="detailSection"
-      @on-handle="detailHandle"
-      @close="closeBtn"
-    />
-  </div>
-</template>
-<script>
-import newDialog from "../components/newDialog";
-//import particulars from '../components/particulars'
-import draggable from "vuedraggable";
-import scrollx from "@/directive/scrollx";
-// import {
-//   workTaskMyTaskAPI,
-//   workTaskUpdateTopAPI,
-//   workTaskSaveAPI
-// } from '@/api/projectManagement/task'
-
-export default {
-  components: {
-    draggable,
-    newDialog,
-    //particulars
-  },
-
-  directives: {
-    scrollx,
-  },
-
-  data() {
-    return {
-      taskList: [
-        {
-          title: "收件箱",
-          is_top: 0,
-          list: [
-            {
-              task_id: 332,
-              name: "123fffffffffffffffff",
-              main_user_id: 1,
-              is_top: 0,
-              work_id: 37,
-              lable_id: ",2,",
-              priority: 0,
-              stop_time: 0,
-              status: 1,
-              pid: 0,
-              create_time: 1617775756,
-              owner_user_id: ",1,",
-              main_user_name: "一个好人",
-              thumb_img:
-                "http://demo9.5kcrm.net/public/uploads/20210510/thumb_94c3d6aa3332742b1a5d00cd9b65f2fb.jpeg",
-              work_name: "斤斤计较",
-              color: "#53D397",
-              pname: "",
-              subcount: 0,
-              subdonecount: 0,
-              commentcount: 3,
-              filecount: 0,
-              lableList: [
-                {
-                  lable_id: 2,
-                  name: "价格偏贵",
-                  color: "#0FC9E7",
-                },
-              ],
-              main_user: {
-                id: 1,
-                username: "18888888888",
-                salt: "34cd",
-                img: "http://demo9.5kcrm.net/public/uploads/20210510/94c3d6aa3332742b1a5d00cd9b65f2fb.jpeg",
-                thumb_img:
-                  "http://demo9.5kcrm.net/public/uploads/20210510/thumb_94c3d6aa3332742b1a5d00cd9b65f2fb.jpeg",
-                create_time: 1579254522,
-                realname: "一个好人",
-                num: "",
-                email: "123@qq.com",
-                mobile: "18888888888",
-                sex: "男",
-                structure_id: 1,
-                post: "CEO",
-                status: 1,
-                parent_id: 0,
-                authkey_time: 1623544206,
-                type: 1,
-                structure_name: "总公司",
-                parent_name: "暂无",
-              },
-              relationCount: 0,
-              is_end: 0,
-              checked: false,
-            },
-          ],
-          count: 1,
-        },
-        {
-          title: "今天要做",
-          is_top: 1,
-          list: [],
-          count: [],
-        },
-        {
-          title: "下一步要做",
-          is_top: 2,
-          list: [],
-          count: [],
-        },
-        {
-          title: "以后要做",
-          is_top: 3,
-          list: [
-            {
-              task_id: 428,
-              name: "1212",
-              main_user_id: 2,
-              is_top: 3,
-              work_id: 0,
-              lable_id: "",
-              priority: 0,
-              stop_time: 1624464000,
-              status: 1,
-              pid: 0,
-              create_time: 1623288843,
-              owner_user_id: ",2,",
-              main_user_name: "123",
-              thumb_img: "",
-              work_name: null,
-              color: null,
-              pname: "",
-              subcount: 0,
-              subdonecount: 0,
-              commentcount: 0,
-              filecount: 0,
-              lableList: [],
-              main_user: {
-                id: 2,
-                username: "19999999999",
-                salt: "e8bb",
-                img: "",
-                thumb_img: "",
-                create_time: 1579420509,
-                realname: "123",
-                num: "",
-                email: "",
-                mobile: "19999999999",
-                sex: "",
-                structure_id: 1,
-                post: "",
-                status: 1,
-                parent_id: 1,
-                authkey_time: 1622946426,
-                type: 1,
-                structure_name: "总公司",
-                parent_name: "一个好人",
-              },
-              relationCount: 0,
-              is_end: 0,
-              checked: false,
-            },
-          ],
-          count: 1,
-        },
-      ],
-      // 新建任务弹出框
-      taskCreateShow: false,
-      // 加载中
-      loading: true,
-      // 拖拽的任务列表id
-      topId: "",
-      // 详情数据
-      taskID: "",
-      detailIndex: -1,
-      detailSection: -1,
-      taskDetailShow: false,
-    };
-  },
-
-  created() {
-    this.getList();
-  },
-
-  mounted() {
-    // 为了防止火狐浏览器拖拽的时候以新标签打开，此代码真实有效
-    document.body.ondrop = function (event) {
-      event.preventDefault();
-      event.stopPropagation();
-    };
-
-    // document
-    //   .getElementById("project-main-container")
-    //   .addEventListener("click", this.taskShowHandle, false);
-  },
-
-  methods: {
-    /**
-     * 获取数据列表
-     */
-    getList() {
-      //   this.loading = true
-      //   workTaskMyTaskAPI()
-      //     .then(res => {
-      //       for (const item of res.data) {
-      //         item.checkedNum = 0
-      //         for (const i of item.list) {
-      //           if (i.status == 5) {
-      //             i.checked = true
-      //             item.checkedNum += 1
-      //           } else {
-      //             i.checked = false
-      //           }
-      //         }
-      //       }
-      //       this.taskList = res.data
-      //       this.loading = false
-      //     })
-      //     .catch(() => {
-      //       this.loading = false
-      //     })
-    },
-
-    /**
-     * 移动任务
-     */
-    moveEndTask(evt) {
-      if (evt) {
-        const fromTop = evt.from.id;
-        const toTop = evt.to.id;
-
-        // 如果没有进行移动 不做处理
-        if (fromTop == toTop && evt.oldIndex == evt.newIndex) {
-          return;
-        }
-
-        const fromTask = this.taskList[fromTop];
-        const fromList = fromTask.list;
-        this.updateTaskListCheckNum(fromTask);
-
-        const toTask = this.taskList[toTop];
-        const toList = toTask.list;
-        this.updateTaskListCheckNum(toTask);
-
-        let params = {};
-        if (fromTop == toTop) {
-          params = {
-            toList: toList.map((item) => {
-              return item.taskId;
-            }),
-            toTopId: toTop,
-          };
-        } else {
-          params = {
-            fromList: fromList.map((item) => {
-              return item.taskId;
-            }),
-            fromTopId: fromTop,
-            toList: toList.map((item) => {
-              return item.taskId;
-            }),
-            toTopId: toTop,
-          };
-        }
-        workTaskUpdateTopAPI(params)
-          .then((res) => {})
-          .catch(() => {});
-      }
-    },
-
-    /**
-     * 更新勾选数字
-     */
-    updateTaskListCheckNum(task) {
-      task.checkedNum = task.list.filter((item) => {
-        return item.checked;
-      }).length;
-    },
-
-    /**
-     * 勾选完成任务
-     */
-    checkboxChange(element, value) {
-      if (element.checked) {
-        value.checkedNum++;
-      } else {
-        value.checkedNum--;
-      }
-      workTaskSaveAPI({
-        taskId: element.taskId,
-        status: element.checked ? 5 : 1,
-      })
-        .then((res) => {})
-        .catch(() => {
-          if (element.checked) {
-            value.checkedNum--;
-          } else {
-            value.checkedNum++;
-          }
-          element.checked = !element.checked;
-        });
-    },
-
-    /**
-     * 新增按钮
-     */
-    createTaskByTop(isTop) {
-      this.topId = isTop;
-      this.taskCreateShow = true;
-    },
-
-    /**
-     * 关闭新建窗口
-     */
-    handleClose() {
-      this.taskCreateShow = false;
-    },
-
-    /**
-     * 点击显示详情
-     */
-    showDetailView(val, seciton, index) {
-      this.topId = val.isTop;
-      this.taskID = val.taskId;
-      this.detailIndex = index;
-      this.detailSection = seciton;
-      this.taskDetailShow = true;
-    },
-
-    /**
-     * 详情操作
-     */
-    detailHandle(data) {
-      if (data.index == 0 || data.index) {
-        // 是否完成勾选
-        if (data.type == "title-check") {
-          const sectionItem = this.taskList[data.section];
-          this.$set(sectionItem.list[data.index], "checked", data.value);
-          if (data.value) {
-            sectionItem.checkedNum++;
-          } else {
-            sectionItem.checkedNum--;
-          }
-          this.$set(sectionItem, "checkedNum", sectionItem.checkedNum);
-        } else if (data.type == "delete") {
-          this.taskList[data.section].list.splice(data.index, 1);
-        } else if (data.type == "change-stop-time") {
-          const stopTime = parseInt(data.value) + 86399;
-          if (stopTime > new Date(new Date()).getTime() / 1000) {
-            this.taskList[data.section].list[data.index].isEnd = false;
-          } else {
-            this.taskList[data.section].list[data.index].isEnd = true;
-          }
-          this.taskList[data.section].list[data.index].stopTime = data.value;
-        } else if (data.type == "change-priority") {
-          this.taskList[data.section].list[data.index].priority = data.value.id;
-        } else if (data.type == "change-name") {
-          this.taskList[data.section].list[data.index].name = data.value;
-        } else if (data.type == "change-comments") {
-          const commentCount =
-            this.taskList[data.section].list[data.index].commentCount;
-          if (data.value == "add") {
-            this.taskList[data.section].list[data.index].commentCount =
-              commentCount + 1;
-          } else {
-            this.taskList[data.section].list[data.index].commentCount =
-              commentCount - 1;
-          }
-        } else if (data.type == "change-sub-task") {
-          this.taskList[data.section].list[data.index].childWCCount =
-            data.value.subdonecount;
-          this.taskList[data.section].list[data.index].childAllCount =
-            data.value.allcount;
-        } else if (data.type == "change-main-user") {
-          this.taskList[data.section].list[data.index].mainUser = data.value;
-        } else if (data.type == "change-label") {
-          this.taskList[data.section].list[data.index].labelList = data.value;
-        }
-      }
-    },
-
-    /**
-     * 关闭详情页
-     */
-    closeBtn() {
-      this.taskDetailShow = false;
-    },
-
-    /**
-     * 点击空白处关闭详情
-     */
-    taskShowHandle(e) {
-      if (
-        this.$refs.particulars &&
-        !this.$refs.particulars.$el.contains(e.target)
-      ) {
-        let hidden = true;
-        const items = document.getElementsByClassName("board-item");
-        for (let index = 0; index < items.length; index++) {
-          const element = items[index];
-          if (element.contains(e.target)) {
-            hidden = false;
-            break;
-          }
-        }
-        this.taskDetailShow = !hidden;
-      }
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.my-task {
-  height: 100%;
-  overflow: hidden;
-  .my-task-header {
-    height: 60px;
-    line-height: 60px;
-    position: relative;
-    z-index: 100;
-    padding: 0 20px;
-    font-size: 18px;
-  }
-}
-
-.my-task-body {
-  padding-left: 15px;
-  height: calc(100% - 60px);
-  position: relative;
-  overflow-y: hidden;
-  overflow-x: auto;
-  white-space: nowrap;
-}
-
-.content-box {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  overflow-y: hidden;
-  overflow-x: auto;
-}
-
-.content-box > div:last-child {
-  margin-right: 0;
-}
-.board-column {
-  width: 280px;
-  height: 100%;
-  display: inline-block;
-  margin: 0 7px;
-  overflow: hidden;
-
-  .board-column-wrapper {
-    max-height: 100%;
-    padding: 10px;
-    vertical-align: top;
-    border-radius: 4px;
-    background: #fff;
-    margin-right: 14px;
-    position: relative;
-    .board-column-header {
-      padding: 10px 3px 17px 3px;
-      color: #333;
-      .text {
-        font-size: 15px;
-        display: inline-block;
-        padding-bottom: 5px;
-      }
-      .el-progress /deep/ .el-progress-bar {
-        padding-right: 0;
-      }
-      .el-progress /deep/ .el-progress__text {
-        display: none;
-      }
-      .text-num {
-        margin-left: 10px;
-        color: #999;
-      }
-    }
-    .board-column-content {
-      min-height: 20px;
-      margin-right: -10px;
-      padding-right: 14px;
-      padding-left: 7px;
-      max-height: calc(100% - 90px);
-      overflow: auto;
-      .board-item {
-        box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-        padding: 10px 35px 0 10px;
-        margin-bottom: 10px;
-        margin-top: 1px;
-        margin-left: 1px;
-        border-radius: 3px;
-        border-left: 2px solid transparent;
-        cursor: pointer;
-        overflow: hidden;
-        position: relative;
-        .img-group {
-          padding: 10px 0 0 20px;
-          white-space: normal;
-          word-wrap: break-word;
-          .img-box {
-            display: inline-block;
-            margin-bottom: 7px;
-            margin-right: 5px;
-            font-size: 12px;
-            color: #999;
-            font-size: 12px;
-            img {
-              width: 15px;
-              vertical-align: middle;
-            }
-          }
-        }
-        .head-png {
-          vertical-align: middle;
-          position: absolute;
-          top: 8px;
-          right: 5px;
-          width: 24px;
-          height: 24px;
-          border-radius: 50%;
-        }
-        .element-label {
-          width: 180px;
-          padding-left: 8px;
-          white-space: pre-wrap;
-          word-wrap: break-word;
-          line-height: 18px;
-          cursor: pointer;
-          span {
-            color: #999;
-            font-size: 12px;
-          }
-          img {
-            vertical-align: middle;
-          }
-        }
-      }
-      .board-item-active {
-        border: 0;
-        color: #8f8f8f;
-        background: #f3f3f3;
-        .element-label {
-          text-decoration: line-through;
-        }
-      }
-    }
-    .new-task {
-      cursor: pointer;
-      color: #999999;
-      padding-top: 10px;
-      font-size: 13px;
-      padding-left: 4px;
-      .el-icon-plus {
-        color: #3e84e9;
-        font-weight: 700;
-      }
-    }
-  }
-}
-
-.sortable-drag {
-  background-color: white;
-}
-
-.wukong {
-  font-size: 14px;
-}
-
-.item-label {
-  display: inline-block;
-  display: inline-block;
-  height: 20px;
-  line-height: 20px;
-  padding: 0 10px;
-  border-radius: 3px;
-  color: #fff;
-  margin-right: 6px;
-  font-size: 12px;
-  margin-bottom: 6px;
-}
-
-.color-label-more {
-  background: #eee;
-  width: 34px;
-  height: 20px;
-  line-height: 20px;
-  text-align: center;
-  display: inline-block;
-  font-size: inherit;
-  font-weight: 700;
-  border-radius: 3px;
-  vertical-align: middle;
-  position: relative;
-  margin-bottom: 6px;
-  i {
-    position: absolute;
-    left: 50%;
-    line-height: 36px;
-    top: 0%;
-    height: 20px;
-    transform: translate(-50%, -50%);
-  }
-}
-</style>
-
diff --git a/code/WebApp/vue/src/views/ux/businessdata/deliverGoodsDrag/index.vue b/code/WebApp/vue/src/views/ux/businessdata/deliverGoodsDrag/index.vue
deleted file mode 100644
index e70adc5d..00000000
--- a/code/WebApp/vue/src/views/ux/businessdata/deliverGoodsDrag/index.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <div>
-    <el-tabs type="border-card">
-      <el-tab-pane>
-        <span slot="label"><i class="el-icon-date"></i>任务看板</span>
-        <!--使用draggable组件-->
-        <div class="itxst">
-          <!-- <span>6.1、6.2看板可以相互拖动，无法拖到6.3看板</span> -->
-          <div class="col">
-            <div class="title">2021.06.01看板</div>
-            <draggable
-              v-model="arr1"
-              group="site"
-              animation="300"
-              dragClass="dragClass"
-              ghostClass="ghostClass"
-              chosenClass="chosenClass"
-              @start="onStart"
-              @end="onEnd"
-            >
-              <transition-group>
-                <div class="item" v-for="item in arr1" :key="item.id">
-                  {{ item.name }}
-                </div>
-              </transition-group>
-            </draggable>
-          </div>
-          <div class="col">
-            <div class="title">2021.06.02看板</div>
-            <draggable
-              v-model="arr2"
-              group="site"
-              animation="300"
-              dragClass="dragClass"
-              ghostClass="ghostClass"
-              chosenClass="chosenClass"
-              @start="onStart"
-              @end="onEnd"
-            >
-              <transition-group>
-                <div class="item" v-for="item in arr2" :key="item.id">
-                  {{ item.name }}
-                </div>
-              </transition-group>
-            </draggable>
-          </div>
-          <div class="col">
-            <div class="title">2021.06.03看板</div>
-            <draggable
-              v-model="arr2"
-              group="c"
-              animation="300"
-              dragClass="dragClass"
-              ghostClass="ghostClass"
-              chosenClass="chosenClass"
-              @start="onStart"
-              @end="onEnd"
-            >
-              <transition-group>
-                <div class="item" v-for="item in arr3" :key="item.id">
-                  {{ item.name }}
-                </div>
-              </transition-group>
-            </draggable>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="预发货管理"> <DNData ref="dndata" /></el-tab-pane>
-      <el-tab-pane label="预发货计划报表"> <Report ref="dndata" /></el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-
-
-<script>
-//导入draggable组件
-import draggable from "vuedraggable";
-import DNData from "../deliverGoods/index.vue";
-import Report from './report.vue'
-export default {
-  //注册draggable组件
-  components: {
-    draggable,
-    DNData,
-    Report
-  },
-  data() {
-    return {
-      drag: false,
-      //定义要被拖拽对象的数组
-      arr1: [
-        { id: 1, name: "车次A" },
-        { id: 2, name: "车次B" },
-        { id: 3, name: "车次C" },
-        { id: 4, name: "车次D" },
-      ],
-      arr2: [
-        { id: 1, name: "车次E" },
-        { id: 2, name: "车次B" },
-        { id: 3, name: "车次F" },
-        { id: 4, name: "车次D" },
-      ],
-      arr3: [
-        { id: 1, name: "车次G" },
-        { id: 2, name: "车次H" },
-        { id: 3, name: "车次J" },
-        { id: 4, name: "车次D" },
-      ],
-    };
-  },
-  methods: {
-    //开始拖拽事件
-    onStart() {
-      this.drag = true;
-    },
-    //拖拽结束事件
-    onEnd() {
-      this.drag = false;
-    },
-  },
-};
-</script>
-<style scoped>
-/*定义要拖拽元素的样式*/
-.ghostClass {
-  background-color: blue !important;
-}
-.chosenClass {
-  background-color: red !important;
-  opacity: 1 !important;
-}
-.dragClass {
-  background-color: blueviolet !important;
-  opacity: 1 !important;
-  box-shadow: none !important;
-  outline: none !important;
-  background-image: none !important;
-}
-.itxst {
-  margin: 10px;
-}
-.title {
-  padding: 6px 12px;
-}
-.col {
-  width: 40%;
-  flex: 1;
-  padding: 10px;
-  border: solid 1px #eee;
-  border-radius: 5px;
-  float: left;
-}
-.col + .col {
-  margin-left: 10px;
-}
-
-.item {
-  padding: 6px 12px;
-  margin: 0px 10px 0px 10px;
-  border: solid 1px #eee;
-  background-color: #f1f1f1;
-}
-.item:hover {
-  background-color: #fdfdfd;
-  cursor: move;
-}
-.item + .item {
-  border-top: none;
-  margin-top: 6px;
-}
-</style>
diff --git a/code/WebApp/vue/src/views/ux/businessdata/deliverGoodsDrag/report.vue b/code/WebApp/vue/src/views/ux/businessdata/deliverGoodsDrag/report.vue
deleted file mode 100644
index 391e8c04..00000000
--- a/code/WebApp/vue/src/views/ux/businessdata/deliverGoodsDrag/report.vue
+++ /dev/null
@@ -1,490 +0,0 @@
-<!--客户结算单表-->
-<template>
- <div class="cr-body-content">
-    <flexbox class="content-header">
-      <!-- <el-button
-            class="filter-item"
-            type="danger"
-            icon="el-icon-delete"
-            size="mini"
-            @click="handleDelete()"
-          >批量删除
-          </el-button> -->
-      <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button>
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-
-      class="cr-table"
-      :data="tableData"
-      :render-header="labelHead"
-      :span-method="cellMerge"
-       show-summary
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-    >
-      <el-table-column prop="id" label="类型" width="100" fixed>
-      </el-table-column>
-      <el-table-column prop="name" label="零件编号" width="150" fixed>
-      </el-table-column>
-      <el-table-column prop="desc" label="描述" width="180" fixed>
-      </el-table-column>
-       <el-table-column prop="amount2" label="总库存" width="90" fixed>
-      </el-table-column>
-      <el-table-column prop="amount1" label="总订单数" width="90" fixed>
-      </el-table-column>
-      <el-table-column prop="amount2" label="预计划合计" width="100">
-      </el-table-column>
-      <el-table-column
-        :label="item"
-        v-for="(item, index) in header"
-        :key="item"
-        align="center"
-      >
-        <template slot-scope="scope">
-          <span
-            v-for="(item2, index2) in scope.row.transportNumByDistance"
-            :key="index2"
-          >
-            <div v-if="index2 == index">
-              {{ scope.row.transportNumByDistance[index2].transportNum }}
-            </div>
-          </span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-      </el-drawer>
-    </div>
-  </div>
- 
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import moment from "moment";
-
-export default {
-  name: "SecondaryActuralAdjustmentReport",
-  components: { Pagination },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    return {
-      crmType: "deliveGoods",
-      header: [
-        "2/1",
-        "2/2",
-        "2/3",
-        "2/4",
-        "2/5",
-        "2/6",
-        "2/7",
-        "2/8",
-        "2/9",
-        "2/10",
-        "2/11",
-        "2/12",
-      ], //动态列头header
-      tableData: [
-        {
-          id: "保险杠",
-          name: "A1568804340 9999",
-          desc: "V205 AMG 前保蒙皮_无PTS",
-          amount1: "234",
-          amount2: "32",
-          amount3: 10,
-        },
-        {
-          id: "保险杠",
-          name: "A2538850001 9999",
-          amount1: "165",
-          desc: "V205 AMG 前保蒙皮_PTS",
-          amount2: "443",
-          amount3: 12,
-        },
-        {
-          id: "保险杠",
-          name: "A2538851101 9999",
-          desc: "V205 AMG 前保蒙皮_PTS&Camera（ 高配）",
-          amount1: "324",
-          amount2: "19",
-          amount3: 9,
-        },
-        {
-          id: "小件",
-          name: "A1568859400 9999",
-          desc: "X156 MOPF AMG 前保蒙皮",
-          amount1: "621",
-          amount2: "22",
-          amount3: 17,
-        },
-        {
-          id: "小件",
-          name: "A1568803740 9999",
-          desc: "X156 AMG 前保蒙皮_PTS(高配)",
-          amount1: "539",
-          amount2: "41",
-          amount3: 15,
-        },
-      ],
-      mergerItems: [
-        { columnIndex: 0, spanArr: [], pos: 0, prop: "id" },
-        { columnIndex: 1, spanArr: [], pos: 0, prop: "name" },
-      ],
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      customerInfos: [],
-      searchContent: "", // 输入内容
-      drawer: false,
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-  },
-  created() {
-    //this.getList();
-    this.getSpanArr(this.tableData, this.mergerItems);
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "预发货计划单号",
-        prop: "customCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "预计发货日期",
-        prop: "beginTime",
-        width: 110,
-        formType: "datetime",
-      });
-      tempsTabs.push({ label: "车次", prop: "customName", width: 130 });
-      tempsTabs.push({ label: "零件类型", prop: "documentStatus", width: 55 });
-      tempsTabs.push({ label: "发货类型", prop: "remark", width: 250 });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    // labelHead(h, { column, index }) {
-    //   //动态表头渲染
-    //   //let l = column.label.length;
-    //   //let f = 12; //每个字大小,其实是每个字的比例值,大概会比字体大小打差不多大
-    //   //column.minWidth = f * l; //字大小乘个数即长度 ,注意不要加px像素，这里minWidth只是一个比例值，不是真正的长度
-    //   //然后将列标题放在一个div块中，注意块的宽度一定要100%，否则表格显示不完全
-    //   //h即为cerateElement的简写，具体可看vue官方文档
-    //   return h("span", { class: "table-head", style: { width: "100%" } }, [
-    //     column.label,
-    //   ]);
-    // },
-
-    // labelHead(h, { column }) {
-    //   // h即为cerateElement的简写，具体可看vue官方文档
-    //   return h("div", [
-    //     h("span", column.label),
-    //     h("i", {
-    //       class: "el-icon-question",
-    //     }),
-    //   ]);
-    // },
-
-    labelHead(h, { column }) {
-      return h("div", [
-        h("span", column.label),
-        h(
-          "el-tooltip",
-          {
-            props: {
-              effect: "dark",
-              content: "这是一个提示",
-              placement: "top",
-            },
-          },
-          [
-            h("i", {
-              class: "el-icon-question",
-              style: "color:#409eff;margin-left:5px;",
-            }),
-          ]
-        ),
-      ]);
-    },
-    cellMerge({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 0 || columnIndex === 1) {
-        //这里判断第几列需要合并
-        let item = this.mergerItems.find(
-          (item) => item.columnIndex === columnIndex
-        );
-        const _row = item.spanArr[rowIndex];
-        const _col = _row > 0 ? 1 : 0;
-        return {
-          rowspan: _row,
-          colspan: _col,
-        };
-      }
-    },
-    getSpanArr(data, array) {
-      //循环数据处理
-      for (let n = 0; n < array.length; n++) {
-        array[n].spanArr = []; //数据清空(重新调此方法的时候需要清空上一次的数据)
-        for (let i = 0; i < data.length; i++) {
-          if (i === 0) {
-            array[n].spanArr.push(1);
-            array[n].pos = 0;
-          } else {
-            // 判断当前元素与上一个元素是否相同
-            if (data[i][array[n].prop] === data[i - 1][array[n].prop]) {
-              array[n].spanArr[array[n].pos] += 1;
-              array[n].spanArr.push(0);
-            } else {
-              array[n].spanArr.push(1);
-              array[n].pos = i;
-            }
-          }
-        }
-      }
-    },
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      var parentId = param.id; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property == "beginTime" || column.property == "endTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      // if(column.property=="documentType"){
-      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
-      // }
-      if (column.property == "documentStatus") {
-        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
-          row[column.property]
-        ];
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      this.$axios
-        .posts("/api/settleaccount/sec-act-adjust-report/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          //alert(JSON.stringify(response.Items))
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/settleaccount/sec-act-adjust-report/" + id)
-        .then((response) => {
-          this.form = response;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "documentNumber";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    resetQuery() {},
-    handleDelete(row) {
-      //批量删除
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/sec-act-adjust-report/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/ux/businessdata/supplyGap/detail.vue b/code/WebApp/vue/src/views/ux/businessdata/supplyGap/detail.vue
deleted file mode 100644
index 88c283c6..00000000
--- a/code/WebApp/vue/src/views/ux/businessdata/supplyGap/detail.vue
+++ /dev/null
@@ -1,576 +0,0 @@
-<!--客户结算单表-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <!-- <el-button
-            class="filter-item"
-            type="danger"
-            icon="el-icon-delete"
-            size="mini"
-            @click="handleDelete()"
-          >批量删除
-          </el-button> -->
-      <!-- <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      /> -->
-      <el-date-picker
-        v-model="value2"
-        align="right"
-        type="date"
-        style="width: 300px; margin-right: 5px"
-        placeholder="选择日期"
-        :picker-options="pickerOptions"
-      >
-      </el-date-picker>
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >查询
-      </el-button>
-      <el-button
-        class="filter-item addbutton"
-        size="mini"
-        icon="el-icon-plus"
-        @click="handleCreate"
-        >生成装配计划</el-button
-      >
-      <el-button
-        class="filter-item modifybutton"
-        size="mini"
-        icon="el-icon-edit"
-        @click="handleUpdate()"
-        >生成喷图计划</el-button
-      >
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload2"
-        @click="handleImportExcel()"
-        >生成采购看板
-      </el-button>
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      class="cr-table"
-      :data="tableData"
-      :span-method="cellMerge"
-      show-summary
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @cell-dblclick="dblhandleCurrentChange"
-    >
-      <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="id" label="喷涂" width="100" fixed>
-      </el-table-column>
-      <el-table-column prop="name" label="零件编号" width="180" fixed>
-      </el-table-column>
-      <el-table-column prop="desc" label="描述" width="280" fixed>
-      </el-table-column>
-      <el-table-column prop="amount1" label="类型" width="90" fixed>
-      </el-table-column>
-      <el-table-column prop="amount2" label="原始值" width="90" fixed>
-      </el-table-column>
-
-      <!-- <el-table-column prop="amount2" label="原始值" width="100">
-      </el-table-column> -->
-      <el-table-column label="调整值" width="300" align="center">
-        <template slot-scope="scope">
-          <el-input
-            ref="inputRef"
-            v-if="scope.row.isEditCell"
-            v-model.number="scope.row.amount2"
-            class="el-input"
-            v-focus
-            @blur="cellBlur(scope.row, scope.column)"
-          />
-          <span v-else>{{ scope.row.amount2 }}</span>
-          <el-button
-            style="margin-left: 5px"
-            v-if="scope.row.isEditCell"
-            type="success"
-            icon="el-icon-check"
-            size="small"
-            circle
-            @click="submitName(scope.row)"
-          ></el-button>
-          <el-button
-            v-show="scope.row.isEditCell"
-            class="cancel-btn"
-            size="mini"
-            icon="el-icon-refresh"
-            type="warning"
-            @click.native.prevent="handleCancel(scope.row)"
-          >
-            cancel
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import moment from "moment";
-
-export default {
-  name: "SecondaryActuralAdjustmentReport",
-  components: { Pagination },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    return {
-      crmType: "deliveGoods",
-
-      tableData: [
-        {
-          id: "保险杠",
-          name: "A1568804340 9999",
-          desc: "V205 AMG 前保蒙皮_无PTS",
-          amount1: "制造件缺口",
-          amount2: "32",
-          amount3: 10,
-          isEditCell: false,
-        },
-        {
-          id: "保险杠",
-          name: "A2538850001 9999",
-          amount1: "油漆件缺口",
-          desc: "V205 AMG 前保蒙皮_PTS",
-          amount2: "443",
-          amount3: 12,
-          isEditCell: false,
-        },
-        {
-          id: "保险杠",
-          name: "A2538851101 9999",
-          desc: "V205 AMG 前保蒙皮_PTS&Camera（ 高配）",
-          amount1: "外购件缺口",
-          amount2: "19",
-          amount3: 9,
-          isEditCell: false,
-        },
-        {
-          id: "小件",
-          name: "A1568859400 9999",
-          desc: "X156 MOPF AMG 前保蒙皮",
-          amount1: "外购件缺口",
-          amount2: "22",
-          amount3: 17,
-          isEditCell: false,
-        },
-        {
-          id: "小件",
-          name: "A1568803740 9999",
-          desc: "X156 AMG 前保蒙皮_PTS(高配)",
-          amount1: "油漆件缺口",
-          amount2: "41",
-          amount3: 15,
-          isEditCell: false,
-        },
-      ],
-      mergerItems: [
-        { columnIndex: 1, spanArr: [], pos: 0, prop: "id" },
-        { columnIndex: 2, spanArr: [], pos: 0, prop: "name" },
-      ],
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      customerInfos: [],
-      pickerOptions: {
-        // disabledDate(time) {
-        //   return time.getTime() > Date.now();
-        // },
-        shortcuts: [
-          {
-            text: "今天",
-            onClick(picker) {
-              picker.$emit("pick", new Date());
-            },
-          },
-          {
-            text: "昨天",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
-            },
-          },
-          {
-            text: "一周前",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
-            },
-          },
-        ],
-      },
-      value2: "",
-      searchContent: "", // 输入内容
-      drawer: false,
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-  },
-  created() {
-    //this.getList();
-    this.getSpanArr(this.tableData, this.mergerItems);
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "预发货计划单号",
-        prop: "customCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "预计发货日期",
-        prop: "beginTime",
-        width: 110,
-        formType: "datetime",
-      });
-      tempsTabs.push({ label: "车次", prop: "customName", width: 130 });
-      tempsTabs.push({ label: "零件类型", prop: "documentStatus", width: 55 });
-      tempsTabs.push({ label: "发货类型", prop: "remark", width: 250 });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    // 可以编辑框失去焦点
-    cellBlur(row, column) {
-      //alert("cellblur");
-      row.isEditCell = false;
-      this.$set(row, "isEditCell", false);
-      // this.$nextTick(() => {
-      //   row.isEditCell = false;
-      //   this.$set(row, "isEditCell", false);
-      // });
-    },
-    dblhandleCurrentChange(row, column, cell, event) {
-      if (column.label === "调整值") {
-        row.isEditCell = true;
-        this.$set(row, "isEditCell", true);
-        this.$nextTick(() => {
-          //自动获取焦点 element组件autofocus失效
-          //this.$refs.inputRef.focus();
-          this.$refs["inputRef"].focus();
-        });
-      }
-      this.list = this.list.filter((item) => {
-        return item;
-      });
-      //row.isEditCell = false;
-      // if (column.property == "remark") {
-      //   this.$nextTick(() => {
-      //     this.$refs.remarkRef.focus(); // 视图出现后使input获取焦点
-      //   });
-      // } else {
-      //   this.$nextTick(() => {
-      //     this.$refs.hitchRef.focus(); // 视图出现后使input获取焦点
-      //   });
-      // }
-    },
-    // 取消
-    handleCancel(row) {
-      row.isEditCell = false;
-      //row.stockQty = row.originalstockQty;
-      this.$set(row, "isEditCell", false);
-      // this.$message({
-      //   message: "取消后，恢复当前原值！",
-      //   type: "warning",
-      // });
-      this.getList();
-    },
-    // 提交
-    submitName(row) {
-      alert("修改成功");
-      //row.originalstockQty = row.stockQty;
-      alert(JSON.stringify(this.list));
-      this.getList();
-      // this.loading = true;
-      // let data = {
-      //   inspectId: this.inspectId,
-      //   result: this.tableData.toString(),
-      // };
-      // this.submitData.inspectId = this.inspectId;
-
-      // this.submitData.ext1 = JSON.stringify(this.tableData);
-      // updateInspect(this.submitData).then((response) => {
-      //   if (response.code === 200) {
-      //     this.loading = false;
-      //     this.msgSuccess("修改成功");
-      //     this.open = false;
-      //     this.getTableList(this.inspectId);
-      //   } else {
-      //     this.msgError(response.msg);
-      //   }
-      // });
-    },
-    cellMerge({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 1 || columnIndex === 2) {
-        //这里判断第几列需要合并
-        let item = this.mergerItems.find(
-          (item) => item.columnIndex === columnIndex
-        );
-        const _row = item.spanArr[rowIndex];
-        const _col = _row > 0 ? 1 : 0;
-        return {
-          rowspan: _row,
-          colspan: _col,
-        };
-      }
-    },
-    getSpanArr(data, array) {
-      //循环数据处理
-      for (let n = 0; n < array.length; n++) {
-        array[n].spanArr = []; //数据清空(重新调此方法的时候需要清空上一次的数据)
-        for (let i = 0; i < data.length; i++) {
-          if (i === 0) {
-            array[n].spanArr.push(1);
-            array[n].pos = 0;
-          } else {
-            // 判断当前元素与上一个元素是否相同
-            if (data[i][array[n].prop] === data[i - 1][array[n].prop]) {
-              array[n].spanArr[array[n].pos] += 1;
-              array[n].spanArr.push(0);
-            } else {
-              array[n].spanArr.push(1);
-              array[n].pos = i;
-            }
-          }
-        }
-      }
-    },
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      var parentId = param.id; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property == "beginTime" || column.property == "endTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      // if(column.property=="documentType"){
-      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
-      // }
-      if (column.property == "documentStatus") {
-        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
-          row[column.property]
-        ];
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      this.$axios
-        .posts("/api/settleaccount/sec-act-adjust-report/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          //alert(JSON.stringify(response.Items))
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/settleaccount/sec-act-adjust-report/" + id)
-        .then((response) => {
-          this.form = response;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "documentNumber";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    resetQuery() {},
-    handleDelete(row) {
-      //批量删除
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/sec-act-adjust-report/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/ux/businessdata/supplyGap/index.vue b/code/WebApp/vue/src/views/ux/businessdata/supplyGap/index.vue
deleted file mode 100644
index 03210bb0..00000000
--- a/code/WebApp/vue/src/views/ux/businessdata/supplyGap/index.vue
+++ /dev/null
@@ -1,521 +0,0 @@
-<!--客户结算单表-->
-<template>
-<div>
-  <el-tabs type="border-card">
-  <el-tab-pane>
-    <span slot="label"><i class="el-icon-date"></i> 缺口分析报表</span>
-    <div class="cr-body-content">
-    <flexbox class="content-header">
-      <!-- <el-button
-            class="filter-item"
-            type="danger"
-            icon="el-icon-delete"
-            size="mini"
-            @click="handleDelete()"
-          >批量删除
-          </el-button> -->
-      <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button>
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-
-      class="cr-table"
-      :data="tableData"
-      :render-header="labelHead"
-      :span-method="cellMerge"
-       show-summary
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-    >
-      <el-table-column prop="id" label="喷涂" width="100" fixed>
-      </el-table-column>
-      <el-table-column prop="name" label="零件编号" width="150" fixed>
-      </el-table-column>
-      <el-table-column prop="desc" label="描述" width="180" fixed>
-      </el-table-column>
-      <el-table-column prop="amount1" label="总订单数" width="90" fixed>
-      </el-table-column>
-      <el-table-column prop="amount2" label="总库存" width="90" fixed>
-      </el-table-column>
-      <el-table-column label="库存" align="center">
-        <el-table-column
-          prop="province"
-          align="center"
-          label="唐山"
-          width="120"
-        >
-        </el-table-column>
-        <el-table-column prop="city" label="厂内" align="center" width="120">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="英纳法"
-          width="120"
-        >
-        </el-table-column>
-        <el-table-column prop="zip" label="外库" align="center" width="120">
-        </el-table-column>
-        <el-table-column prop="zip" label="在途" align="center" width="120">
-        </el-table-column>
-      </el-table-column>
-      <el-table-column prop="amount2" label="计划" width="100">
-      </el-table-column>
-      <el-table-column
-        :label="item"
-        v-for="(item, index) in header"
-        :key="item"
-        align="center"
-      >
-        <template slot-scope="scope">
-          <span
-            v-for="(item2, index2) in scope.row.transportNumByDistance"
-            :key="index2"
-          >
-            <div v-if="index2 == index">
-              {{ scope.row.transportNumByDistance[index2].transportNum }}
-            </div>
-          </span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-      </el-drawer>
-    </div>
-  </div>
-  </el-tab-pane>
-  <el-tab-pane label="生成缺口分析数据"> <Detail ref="dndata" /></el-tab-pane>
-</el-tabs>
-</div>
- 
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import moment from "moment";
-import Detail from "./detail.vue";
-
-export default {
-  name: "SecondaryActuralAdjustmentReport",
-  components: { Pagination,Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  data() {
-    return {
-      crmType: "deliveGoods",
-      header: [
-        "2/1",
-        "2/2",
-        "2/3",
-        "2/4",
-        "2/5",
-        "2/6",
-        "2/7",
-        "2/8",
-        "2/9",
-        "2/10",
-        "2/11",
-        "2/12",
-      ], //动态列头header
-      tableData: [
-        {
-          id: "保险杠",
-          name: "A1568804340 9999",
-          desc: "V205 AMG 前保蒙皮_无PTS",
-          amount1: "234",
-          amount2: "32",
-          amount3: 10,
-        },
-        {
-          id: "保险杠",
-          name: "A2538850001 9999",
-          amount1: "165",
-          desc: "V205 AMG 前保蒙皮_PTS",
-          amount2: "443",
-          amount3: 12,
-        },
-        {
-          id: "保险杠",
-          name: "A2538851101 9999",
-          desc: "V205 AMG 前保蒙皮_PTS&Camera（ 高配）",
-          amount1: "324",
-          amount2: "19",
-          amount3: 9,
-        },
-        {
-          id: "小件",
-          name: "A1568859400 9999",
-          desc: "X156 MOPF AMG 前保蒙皮",
-          amount1: "621",
-          amount2: "22",
-          amount3: 17,
-        },
-        {
-          id: "小件",
-          name: "A1568803740 9999",
-          desc: "X156 AMG 前保蒙皮_PTS(高配)",
-          amount1: "539",
-          amount2: "41",
-          amount3: 15,
-        },
-      ],
-      mergerItems: [
-        { columnIndex: 0, spanArr: [], pos: 0, prop: "id" },
-        { columnIndex: 1, spanArr: [], pos: 0, prop: "name" },
-      ],
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      customerInfos: [],
-      searchContent: "", // 输入内容
-      drawer: false,
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-  },
-  created() {
-    //this.getList();
-    this.getSpanArr(this.tableData, this.mergerItems);
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "预发货计划单号",
-        prop: "customCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "预计发货日期",
-        prop: "beginTime",
-        width: 110,
-        formType: "datetime",
-      });
-      tempsTabs.push({ label: "车次", prop: "customName", width: 130 });
-      tempsTabs.push({ label: "零件类型", prop: "documentStatus", width: 55 });
-      tempsTabs.push({ label: "发货类型", prop: "remark", width: 250 });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    // labelHead(h, { column, index }) {
-    //   //动态表头渲染
-    //   //let l = column.label.length;
-    //   //let f = 12; //每个字大小,其实是每个字的比例值,大概会比字体大小打差不多大
-    //   //column.minWidth = f * l; //字大小乘个数即长度 ,注意不要加px像素，这里minWidth只是一个比例值，不是真正的长度
-    //   //然后将列标题放在一个div块中，注意块的宽度一定要100%，否则表格显示不完全
-    //   //h即为cerateElement的简写，具体可看vue官方文档
-    //   return h("span", { class: "table-head", style: { width: "100%" } }, [
-    //     column.label,
-    //   ]);
-    // },
-
-    // labelHead(h, { column }) {
-    //   // h即为cerateElement的简写，具体可看vue官方文档
-    //   return h("div", [
-    //     h("span", column.label),
-    //     h("i", {
-    //       class: "el-icon-question",
-    //     }),
-    //   ]);
-    // },
-
-    labelHead(h, { column }) {
-      return h("div", [
-        h("span", column.label),
-        h(
-          "el-tooltip",
-          {
-            props: {
-              effect: "dark",
-              content: "这是一个提示",
-              placement: "top",
-            },
-          },
-          [
-            h("i", {
-              class: "el-icon-question",
-              style: "color:#409eff;margin-left:5px;",
-            }),
-          ]
-        ),
-      ]);
-    },
-    cellMerge({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 0 || columnIndex === 1) {
-        //这里判断第几列需要合并
-        let item = this.mergerItems.find(
-          (item) => item.columnIndex === columnIndex
-        );
-        const _row = item.spanArr[rowIndex];
-        const _col = _row > 0 ? 1 : 0;
-        return {
-          rowspan: _row,
-          colspan: _col,
-        };
-      }
-    },
-    getSpanArr(data, array) {
-      //循环数据处理
-      for (let n = 0; n < array.length; n++) {
-        array[n].spanArr = []; //数据清空(重新调此方法的时候需要清空上一次的数据)
-        for (let i = 0; i < data.length; i++) {
-          if (i === 0) {
-            array[n].spanArr.push(1);
-            array[n].pos = 0;
-          } else {
-            // 判断当前元素与上一个元素是否相同
-            if (data[i][array[n].prop] === data[i - 1][array[n].prop]) {
-              array[n].spanArr[array[n].pos] += 1;
-              array[n].spanArr.push(0);
-            } else {
-              array[n].spanArr.push(1);
-              array[n].pos = i;
-            }
-          }
-        }
-      }
-    },
-    //抽屉
-    handleDrawerOpen(param) {
-      this.drawer = true;
-      var parentId = param.id; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-        },
-      ];
-    },
-    handleDrawerClose(done) {
-      done();
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property == "beginTime" || column.property == "endTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      // if(column.property=="documentType"){
-      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
-      // }
-      if (column.property == "documentStatus") {
-        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
-          row[column.property]
-        ];
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      this.$axios
-        .posts("/api/settleaccount/sec-act-adjust-report/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          //alert(JSON.stringify(response.Items))
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/settleaccount/sec-act-adjust-report/" + id)
-        .then((response) => {
-          this.form = response;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "documentNumber";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    resetQuery() {},
-    handleDelete(row) {
-      //批量删除
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否删除" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/settleaccount/sec-act-adjust-report/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
-</style>
-
diff --git a/code/WebApp/vue/src/views/ux/components/CRMBaseInfo.vue b/code/WebApp/vue/src/views/ux/components/CRMBaseInfo.vue
new file mode 100644
index 00000000..e06b57f3
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/components/CRMBaseInfo.vue
@@ -0,0 +1,475 @@
+<template>
+  <div class="b-cont">
+    <div>
+      <sections
+        class="b-cells"
+        title="基本信息"
+        m-color="#46CDCF"
+        content-height="auto">
+        <flexbox
+          :gutter="0"
+          wrap="wrap"
+          style="padding: 10px 8px 0;">
+          <flexbox-item
+            v-for="(item, index) in fifterList"
+            :span="0.5"
+            :key="index"
+            class="b-cell">
+            <flexbox
+              v-if="item.formType === 'file'"
+              align="stretch"
+              class="b-cell-b">
+              <div class="b-cell-name">{{ item.name }}</div>
+              <div class="b-cell-value">
+                <flexbox
+                  v-for="(file, index) in item.value"
+                  :key="index"
+                  class="f-item">
+                  <img
+                    class="f-img"
+                    src="@/assets/img/relevance_file.png" >
+                  <div class="f-name">{{ file | fileName }}</div>
+                  <el-button
+                    type="text"
+                    @click.native="handleFile('preview', item, index)">预览</el-button>
+                  <el-button
+                    type="text"
+                    @click.native="handleFile('download', file, index)">下载</el-button>
+                </flexbox>
+              </div>
+            </flexbox>
+             <flexbox
+              v-else-if="item.fieldType === 'true'"
+              align="stretch"
+              class="b-cell-b">
+             <div class="b-cell-name">{{$t(crmType+'.'+item.name)}}</div>
+             <div class="b-cell-value">{{ item.value  | IsCustomerSignFilter}}</div>
+            </flexbox>
+             <flexbox
+              v-else-if="item.fieldType === 'false'"
+              align="stretch"
+              class="b-cell-b">
+             <div class="b-cell-name">{{$t(crmType+'.'+item.name)}}</div>
+             <div class="b-cell-value">{{ item.value  | IsCustomerSignFilter}}</div>
+            </flexbox>
+            <flexbox
+              v-else
+              align="stretch"
+              class="b-cell-b">
+              <div class="b-cell-name">{{$t(crmType+'.'+item.name)}}</div>
+              <div class="b-cell-value">{{ item.value }}</div>
+            </flexbox>
+          </flexbox-item>
+        </flexbox>
+      </sections>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import loading from '../mixins/loading'
+import crmTypeModel from '@/views/ux/model/crmTypeModel'
+import Sections from '../components/Sections'
+import {crmLeadsRead} from '@/api/ux/clue'
+import {crmDictsRead} from '@/api/dict/dict'
+// import { fileSize, downloadFile, moneyFormat } from '@/utils'
+import { crmTransactionRead} from '@/api/transaction/transaction'
+import { crmStrategyRead} from '@/api/strategy/strategy'
+import { crmRuleRead} from '@/api/rule/rule'
+import { crmStrategyRulesRead} from '@/api/strategyRules/strategyRules'
+import { crmStageRead} from '@/api/stage/stage'
+import {crmCustomerRead} from "@/api/customer/customer";
+import {crmSlgItemRead} from '@/api/slgItem/slgItem'
+//引入bom-add-fdw
+import {crmBomRead} from '@/api/bom/bom'
+import {crmVerificationRead} from '@/api/verification/verification'
+import {crmUomGroupRead} from '@/api/uomGroup/uomGroup' 
+import {crmUomRead} from '@/api/uom/uom'
+import {crmInterfaceCalendarRead} from '@/api/interfaceCalendar/interfaceCalendar'
+import {crmVerificationStagesRead} from '@/api/verificationStages/verificationStages'
+import {crmAreaRead} from '@/api/area/area'        // 区域
+import {crmAreaItemRead} from '@/api/areaItem/areaItem'        // 区域-物品
+import {crmCurrencyRead} from '@/api/currency/currency'        // 货币
+import {crmCurrencyExchangeRead} from '@/api/currencyExchange/currencyExchange'        // 货币换算
+import {crmCustomerBomRead} from '@/api/customerBom/customerBom'        // 客户物品产品结构
+import {crmCustomerItemRead} from '@/api/customerItem/customerItem'        // 客户物品
+import {crmEqptTypeRead} from '@/api/eqptType/eqptType'        // 器具类型
+import {crmEqptTypeItemRead} from '@/api/eqptTypeItem/eqptTypeItem'        // 器具类型-物品
+import {crmItemRead} from '@/api/item/item'        // 物品
+import {crmItemTransTypeInventoryRouteRead} from '@/api/itemTransTypeInventoryRoute/itemTransTypeInventoryRoute'        // 物品-事务类型-物流路线分配
+import {crmItemTransTypeOpStrategyRead} from '@/api/itemTransTypeOpStrategy/itemTransTypeOpStrategy'        // 物品-事务类型-工序-策略分配
+import {crmLocRead} from '@/api/loc/loc'        // 库位
+import {crmMachineRead} from '@/api/machine/machine'        // 机器
+import {crmParamRead} from '@/api/param/param'        // 参数
+import {crmPortRead} from '@/api/port/port'        // 收货口
+import {crmProdLineRead} from '@/api/prodLine/prodLine'        // 生产线
+import {crmProdLineItemRead} from '@/api/prodLineItem/prodLineItem'        // 生产线-物品
+import {crmProjectRead} from '@/api/project/project'        // 项目
+import {crmShiftRead} from '@/api/shift/shift'        // 班次
+import {crmSlgRead} from '@/api/slg/slg'        // 库位组
+import {crmSupplierRead} from '@/api/supplier/supplier'        // 供应商
+import {crmSupplierItemRead} from '@/api/supplierItem/supplierItem'        // 供应商物品
+import {crmTeamRead} from '@/api/team/team'        // 班组
+import {crmUomConversionRead} from '@/api/uomConversion/uomConversion'        // 计量单位转换
+import {crmWlgRead} from '@/api/wlg/wlg'        // 工作组
+import {crmWlgItemRead} from '@/api/wlgItem/wlgItem'        // 工作组-物品
+import {crmWorkCalendarRead} from '@/api/workCalendar/workCalendar'        // 工作日历
+import {crmWorkCenterRead} from '@/api/workCenter/workCenter'        // 工作中心
+
+import {crmStdCostPriceSheetRead} from '@/api/stdCostPriceSheet/stdCostPriceSheet'        // 标准成本价格单管理
+import {crmInventoryRouteRead} from '@/api/inventoryRoute/inventoryRoute'        // 物流路线管理
+import {crmPurchasePriceSheetRead} from '@/api/purchasePriceSheet/purchasePriceSheet'        // 采购价格单管理
+import {crmRouteRead} from '@/api/route/route'        // 工艺路线管理
+import {crmSalePriceSheetRead} from '@/api/salePriceSheet/salePriceSheet'        // 销售价格单管理
+
+export default {
+  /** 客户管理 的 基本信息*/
+  name: 'CRMBaseInfo',
+  components: {
+    Sections,
+    // MapView
+  },
+  filters: {
+    addressShow: function(list) {
+      // return list ? list.join(' ') : ''
+      return list.replace(/,/g, ' ')
+    },
+    fileName(file) {
+      const name = file.name && file.name.length > 10 ? (file.name.substring(0, 10) + '...') : file.name
+      return name + '(' + fileSize(file.size) + ')'
+    },
+    IsCustomerSignFilter(status) {//翻译是否
+      const statusMap = {
+        true: '是',
+        false: '否'
+      }
+      return statusMap[status]
+    },
+  },
+  mixins: [loading],
+  props: {
+    /** 模块ID */
+    id: [String, Number],
+    detail: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    /** 没有值就是全部类型 有值就是当个类型 */
+    crmType: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      list: [],
+      fifterList: [],
+      showMapView: false, // 控制展示地图详情
+      mapViewInfo: {}, // 地图详情信息
+      address: {
+        value: {
+          location: '',
+          address: '',
+          detailAddress: ''
+        }
+      }
+    }
+  },
+  computed: {},
+  watch: {
+    // id: function(val) {
+    //   this.getBaseInfo()
+    // },
+    detail:function(val)
+    {
+      this.refreshBaseInfoValue(val);
+    }
+  },
+  mounted() {
+    this.getBaseInfo()
+  },
+  activated: function() {},
+  deactivated: function() {},
+  methods: {
+    // 获取基础信息
+    getBaseInfo() {
+      this.loading = true
+      let crmRequest = this.getRequest()
+      crmRequest(this.id).then(res=>{
+        this.refreshBaseInfoValue(res);
+      }) .catch(() => {
+        this.loading = false
+      })
+    },
+
+    refreshBaseInfoValue(res)
+    {
+      this.list=[]
+      Object.keys(res).forEach((key)=>{
+        // if(typeof res[key]!="object"&&!key.includes('Id')&&key!=='ConcurrencyStamp'&&!key.includes('ID') && !key.includes('ItemName') )
+        //目前不显示物品名称,只显示物品编码
+        if(typeof res[key]!="object"&&!key.includes('Id')&&key!=='ConcurrencyStamp'&&!key.endsWith('ID') ){
+          if(key!='ItemName')
+          {
+            let JSONmess={ //fieldType 主要用来判断是否，进行格式化操作
+              "formType": key.includes('TIME')?"datetime":"text",
+              "name":key,
+              "value":res[key],
+              "fieldType":JSON.stringify(res[key])
+            }
+            this.list.push(JSONmess)
+          }
+        }
+      })
+      this.fifterList = []
+      this.list.forEach(item => {
+         this.fifterList.push(item)
+        //  this.filtersData(item)
+      })
+      this.loading = false
+    },
+    /**
+     * 附件查看
+     */
+    handleFile(type, item, index) {
+      if (type === 'preview') {
+        var previewList = item.value.map(element => {
+          element.url = element.filePath
+          return element
+        })
+        this.$bus.emit('preview-image-bus', {
+          index: index,
+          data: previewList
+        })
+      } else if (type === 'download') {
+        downloadFile({ path: item.filePath, name: item.name })
+      }
+    },
+    /**
+     * 查看地图详情
+     */
+    checkMapView(item) {
+      if (item.value && item.value !== '') {
+        this.mapViewInfo = {
+          title: item.value.location,
+          lat: Number(item.value.lat),
+          lng: Number(item.value.lng)
+        }
+        this.showMapView = true
+      }
+    },
+    /** 处理数据 */
+    filtersData(item) {
+      if (item.formType == 'user') {
+        if (item.value.length) {
+          this.fifterList.push({
+            name: item.name,
+            value: item.value[0].realname
+          })
+        } else {
+          this.fifterList.push({
+            name: item.name,
+            value: ''
+          })
+        }
+      } else if (item.formType == 'structure') {
+        this.fifterList.push({
+          name: item.name,
+          value: item.value[0].deptName
+        })
+      } else if (['customer', 'contacts', 'business'].includes(item.formType)) {
+        this.fifterList.push({
+          name: item.name,
+          value: item.value[item.formType + 'Name']
+        })
+      } else if (['typeName', 'statusName'].includes(item.formType)) {
+        this.fifterList.push({
+          name: item.name,
+          value: item.value[item.formType]
+        })
+      } else if (item.formType == 'contract') {
+        this.fifterList.push({
+          name: item.name,
+          value: item.value.contractNum
+        })
+      } else if (item.formType == 'floatnumber') {
+        this.fifterList.push({
+          name: item.name,
+          value: moneyFormat(item.value)
+        })
+      } else if (item.formType == 'category') {
+        // 产品类别
+        this.fifterList.push({
+          name: item.name,
+          value: this.detail.categoryName// 查不到值在this.detail中获取
+        })
+      } else if (item.formType == 'map_address') {
+        this.address = item
+      } else {
+        this.fifterList.push(item)
+      }
+    },
+    /** 获取上传url */
+    getRequest() {
+      console.log('------------- getRequest : this.crmType -----------')
+      console.log(this.crmType)
+      if (this.crmType == 'leads') {
+        return crmLeadsRead
+      } else if (this.crmType == 'dicts') {
+        return crmDictsRead
+      }else if (this.crmType == 'transaction') {
+        return crmTransactionRead
+      }else if (this.crmType == 'strategy') {
+        return crmStrategyRead
+      }else if (this.crmType == 'rule') {
+        return crmRuleRead
+      } else if (this.crmType == 'strategyRules') {
+        return crmStrategyRulesRead
+      }else if (this.crmType == 'stage') {
+        return crmStageRead
+      }else if (this.crmType == 'customer') {
+        return crmCustomerRead
+      }else if(this.crmType=='slgItem'){
+        return crmSlgItemRead
+      }else if(this.crmType=='bom'){
+        return crmBomRead
+      }else if(this.crmType=='verification'){
+        return crmVerificationRead
+      }else if(this.crmType=='uomGroup'){//add-fdw
+        return crmUomGroupRead
+      }else if(this.crmType=='uom'){//add-fdw
+        return crmUomRead
+      }else if(this.crmType=='interfaceCalendar'){
+        return crmInterfaceCalendarRead
+      }else if(this.crmType=='verificationStages'){
+        return crmVerificationStagesRead
+      }else if(this.crmType=='area'){
+        return crmAreaRead        // 区域
+      }else if(this.crmType=='areaItem'){
+        return crmAreaItemRead        // 区域-物品
+      }else if(this.crmType=='currency'){
+        return crmCurrencyRead        // 货币
+      }else if(this.crmType=='currencyExchange'){
+        return crmCurrencyExchangeRead        // 货币换算
+      }else if(this.crmType=='customerBom'){
+        return crmCustomerBomRead        // 客户物品产品结构
+      }else if(this.crmType=='customerItem'){
+        return crmCustomerItemRead        // 客户物品
+      }else if(this.crmType=='eqptType'){
+        return crmEqptTypeRead        // 器具类型
+      }else if(this.crmType=='eqptTypeItem'){
+        return crmEqptTypeItemRead        // 器具类型-物品
+      }else if(this.crmType=='item'){
+        return crmItemRead        // 物品
+      }else if(this.crmType=='itemTransTypeInventoryRoute'){
+        return crmItemTransTypeInventoryRouteRead        // 物品-事务类型-物流路线分配
+      }else if(this.crmType=='itemTransTypeOpStrategy'){
+        return crmItemTransTypeOpStrategyRead        // 物品-事务类型-工序-策略分配
+      }else if(this.crmType=='loc'){
+        return crmLocRead        // 库位
+      }else if(this.crmType=='machine'){
+        return crmMachineRead        // 机器
+      }else if(this.crmType=='param'){
+        return crmParamRead        // 参数
+      }else if(this.crmType=='port'){
+        return crmPortRead        // 收货口
+      }else if(this.crmType=='prodLine'){
+        return crmProdLineRead        // 生产线
+      }else if(this.crmType=='prodLineItem'){
+        return crmProdLineItemRead        // 生产线-物品
+      }else if(this.crmType=='project'){
+        return crmProjectRead        // 项目
+      }else if(this.crmType=='shift'){
+        return crmShiftRead        // 班次
+      }else if(this.crmType=='slg'){
+        return crmSlgRead        // 库位组
+      }else if(this.crmType=='supplier'){
+        return crmSupplierRead        // 供应商
+      }else if(this.crmType=='supplierItem'){
+        return crmSupplierItemRead        // 供应商物品
+      }else if(this.crmType=='team'){
+        return crmTeamRead        // 班组
+      }else if(this.crmType=='uomConversion'){
+        return crmUomConversionRead        // 计量单位转换
+      }else if(this.crmType=='wlg'){
+        return crmWlgRead        // 工作组
+      }else if(this.crmType=='wlgItem'){
+        return crmWlgItemRead        // 工作组-物品
+      }else if(this.crmType=='workCalendar'){
+        return crmWorkCalendarRead        // 工作日历
+      }else if(this.crmType=='workCenter'){
+        return crmWorkCenterRead        // 工作中心
+      }else if(this.crmType=='inventoryRoute'){
+        return crmInventoryRouteRead        // 物流路线
+      }else if(this.crmType=='purchasePriceSheet'){
+        return crmPurchasePriceSheetRead        // 采购价格单
+      }else if(this.crmType=='route'){
+        return crmRouteRead        // 工艺路线
+      }else if(this.crmType=='salePriceSheet'){
+        return crmSalePriceSheetRead        // 销售价格单
+      }else if(this.crmType=='stdCostPriceSheet'){
+        return crmStdCostPriceSheetRead        // 标准成本价格单
+      }
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.b-cont {
+  position: relative;
+  padding: 0 50px 20px 20px;
+}
+
+.b-cells {
+  margin-top: 25px;
+}
+
+.b-cell {
+  padding: 0 10px;
+  .b-cell-b {
+    width: auto;
+    padding: 8px;
+    .b-cell-name {
+      width: 100px;
+      margin-right: 10px;
+      font-size: 13px;
+      flex-shrink: 0;
+      color: #777;
+    }
+    .b-cell-value {
+      font-size: 13px;
+      color: #333;
+      white-space: pre-wrap;
+      word-wrap: break-word;
+    }
+    .b-cell-foot {
+      flex-shrink: 0;
+      display: block;
+      width: 15px;
+      height: 15px;
+      margin-left: 8px;
+    }
+  }
+}
+
+.f-item {
+  padding: 3px 0;
+  height: 25px;
+  .f-img {
+    position: block;
+    width: 15px;
+    height: 15px;
+    padding: 0 1px;
+    margin-right: 8px;
+  }
+  .f-name {
+    color: #666;
+    font-size: 12px;
+    margin-right: 10px;
+  }
+}
+</style>
diff --git a/code/WebApp/vue/src/views/ux/components/CRMCreateView.rar b/code/WebApp/vue/src/views/ux/components/CRMCreateView.rar
new file mode 100644
index 00000000..87264947
Binary files /dev/null and b/code/WebApp/vue/src/views/ux/components/CRMCreateView.rar differ
diff --git a/code/WebApp/vue/src/views/ux/faw-out-data/jfNotConsignReport/detail.vue b/code/WebApp/vue/src/views/ux/faw-out-data/jfNotConsignReport/detail.vue
new file mode 100644
index 00000000..23b5e2e3
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/faw-out-data/jfNotConsignReport/detail.vue
@@ -0,0 +1,422 @@
+<!--FIS发运数据对比输出表-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出全部
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照物料号搜索..."
+        style="width: 230px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, CRMTableHead },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "stockFisDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "单据流水号",
+        prop: "documentNumber",
+        width: 150,
+      });
+      tempsTabs.push({ label: "版本", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户代码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "单据编号", prop: "billNum", width: 160 });
+      tempsTabs.push({ label: "物料编号", prop: "materialCode", width: 160 });
+      tempsTabs.push({ label: "物料名称", prop: "materialDesc", width: 160 });
+
+      tempsTabs.push({ label: "入库数量", prop: "inStockQty", width: 80 });
+      tempsTabs.push({ label: "结算数量", prop: "consignQty", width: 80 });
+      tempsTabs.push({ label: "上线时间", prop: "onLineDateTime", width: 100 });
+      tempsTabs.push({ label: "状态", prop: "state", width: 80 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    async handleDownload() {
+      //await this.getDownBoms();
+      this.listLoading = true;
+      this.$axios
+        .gets(
+          "/api/settleaccount/jf-kb-not-consign/export/" +
+            this.customerInfo.parentId
+        )
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("fis已发未结算：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/jf-kb-not-consign/details/byfilter",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/jf-kb-not-consign/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "itemCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/billManage/sparepartOutOrder/index.vue b/code/WebApp/vue/src/views/ux/faw-out-data/jfNotConsignReport/index-old.vue
similarity index 51%
rename from code/WebApp/vue/src/views/ux/billManage/sparepartOutOrder/index.vue
rename to code/WebApp/vue/src/views/ux/faw-out-data/jfNotConsignReport/index-old.vue
index 31ba8485..ea5de4b5 100644
--- a/code/WebApp/vue/src/views/ux/billManage/sparepartOutOrder/index.vue
+++ b/code/WebApp/vue/src/views/ux/faw-out-data/jfNotConsignReport/index-old.vue
@@ -1,12 +1,28 @@
-<!--大众备件出库单-->
+<!--FIS发出未结算输出表-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button>
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照版本号搜索..."
+        placeholder="按照单据流水号搜索..."
         style="width: 200px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -18,14 +34,6 @@
         @click="handleFilter"
         >搜索
       </el-button>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload2"
-        @click="handleImportExcel()"
-        >导入文件（Excel）
-      </el-button>
     </flexbox>
     <!--表格渲染-->
     <el-table
@@ -47,16 +55,16 @@
       @row-click="handleRowClick"
     >
       <el-table-column
-        label="单据号"
-        prop="billNum"
+        label="单据流水号"
+        prop="documentNumber"
         sortable="custom"
         align="center"
         width="250px"
       >
         <template slot-scope="scope">
-          <el-tooltip :content="scope.row.billNum" placement="bottom-end">
+          <el-tooltip :content="scope.row.documentNumber" placement="top">
             <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.billNum
+              scope.row.documentNumber
             }}</span>
           </el-tooltip>
         </template>
@@ -78,6 +86,71 @@
         </template>
       </el-table-column>
     </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="开始时间：" />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="beginTime">
+              <el-date-picker
+                v-model="form.beginTime"
+                type="datetime"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="结束时间：" />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="endTime">
+              <el-date-picker
+                v-model="form.endTime"
+                type="datetime"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="24" :xs="24">
+            <div
+              class="sections__tips"
+              style="margin-left: 80px; color: #ff4d4d"
+            >
+              备注：日期不选择的话，将默认最小日期和最大日期！
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
       <pagination
@@ -86,13 +159,6 @@
         :page.sync="page"
         :limit.sync="listQuery.MaxResultCount"
         @pagination="getList"
-      />
-       <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
       />
       <!-- 抽屉控件 -->
       <el-drawer
@@ -103,10 +169,10 @@
         :before-close="handleDrawerClose"
       >
         <div>
-          <Detail
+          <SendUnsettledDiffReport
             v-bind:customerInfos="customerInfos"
             style="margin-top: -35px"
-          ></Detail>
+          ></SendUnsettledDiffReport>
         </div>
       </el-drawer>
     </div>
@@ -116,18 +182,27 @@
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import Detail from "./detail";
+import SendUnsettledDiffReport from "./detail";
 import moment from "moment";
-import importExcel from "@/components/ImportExcel-base";
 import { formatTimeToTimestamp } from "@/utils/index";
 
 export default {
   name: "sendUnsettledDiffReport",
-  components: { Pagination, Detail,importExcel },
+  components: { Pagination, SendUnsettledDiffReport },
   directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
   data() {
     return {
-      crmType: "sparepartoutorder",
+      crmType: "sendUnsettledDiffReport",
       rules: {
         // version: [{ required: true, message: "必须输入！", trigger: "change" }],
         // beginTime: [{ required: true, message: "选择日期！", trigger: "change" }],
@@ -177,7 +252,7 @@ export default {
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 200,
+      tableHeight: document.documentElement.clientHeight - 260,
       isEdit: false,
     };
   },
@@ -185,34 +260,72 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 200;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
     this.getList();
-    //this.getVersionInfo();
+    this.getVersionInfo();
   },
   computed: {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
       tempsTabs.push({
-        label: "版本",
-        prop: "version",
+        label: "统计时间起",
+        prop: "beginTime",
+        width: 120,
+        formType: "datetime",
+      });
+      tempsTabs.push({
+        label: "统计时间止",
+        prop: "endTime",
         width: 120,
+        formType: "datetime",
       });
-      //tempsTabs.push({ label: "单据号", prop: "billNum", width: 150 });
-      tempsTabs.push({ label: "创建人", prop: "creator", width: 160 });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 110 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
       tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
       tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
       return tempsTabs;
     },
   },
   methods: {
-    handleImportExcel() {
-      //导入
-      this.showExcelImport = true;
-      this.$refs.importexcel.handleImportExcelClick();
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.form.beginTime && this.form.endTime) {
+            if (
+              formatTimeToTimestamp(this.form.beginTime) >=
+              formatTimeToTimestamp(this.form.endTime)
+            ) {
+              this.$message.error("开始时间必须小于结束时间!");
+              return false;
+            }
+          }
+          this.formLoading = true;
+          // //以下两个值暂时写成固定值
+          this.form.customerCode = "V85Z27";
+          this.form.customerName = "一汽解放汽车有限公司计划财务部";
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts("/api/settleaccount/jf-kb-not-consign/report", this.form)
+            .then((response) => {
+              this.formLoading = false;
+              this.$notify({
+                title: "成功",
+                message: "统计成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
     },
     getVersionInfo() {
       //取版本列表信息
@@ -233,15 +346,22 @@ export default {
           this.listLoading = false;
         });
     },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form.version = "";
+      this.dialogFormVisible = true;
+    },
     //抽屉
     handleDrawerOpen(param) {
       this.drawer = true;
-      var parentId = param.billNum; //单据号
-      var version = param.version; //版本
+      var parentId = param.id; //主键id
       this.customerInfos = [
         {
           ParentId: parentId,
-          Version: version,
         },
       ];
     },
@@ -250,15 +370,18 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property == "creationTime") {
+      if (column.property == "beginTime" || column.property == "endTime" || column.property == "creationTime") {
         var date = row[column.property];
         if (date == undefined) {
           return "";
         }
         return moment(date).format("YYYY-MM-DD HH:mm:ss");
       }
-      if (column.property == "state") {
-        return { 0: "已提交", 1: "已出库", 2: "不能出库" }[
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
           row[column.property]
         ];
       }
@@ -269,15 +392,11 @@ export default {
       this.showExcelImport = false;
       this.getList();
     },
-    getList(data) {
+    getList() {
       this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
+      this.listQuery.SkipCount = (this.page - 1) * 10;
       this.$axios
-        .posts("/api/settleaccount/wmsSharePartoutput/WmsSharePartList", this.listQuery)
+        .posts("/api/settleaccount/jf-kb-not-consign/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           //alert(JSON.stringify(response.Items))
@@ -291,13 +410,21 @@ export default {
           this.listLoading = false;
         });
     },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/jf-kb-not-consign/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
     /** 筛选操作 */
     handleFilter() {
       this.page = 1;
       this.getList();
       this.listQuery.Filters = [];
       if (this.searchContent != "") {
-        var column = "version";
+        var column = "documentNumber";
         let filter = {
           logic: 0,
           column: column,
@@ -309,6 +436,48 @@ export default {
       this.getList();
     },
     resetQuery() {},
+    handleDelete(row) {
+      //批量删除
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+        myalert = "选中项";
+      }
+      this.$confirm("是否删除" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/settleaccount/jf-kb-not-consign/delete", params)
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
diff --git a/code/WebApp/vue/src/views/ux/faw-out-data/jfNotConsignReport/index.vue b/code/WebApp/vue/src/views/ux/faw-out-data/jfNotConsignReport/index.vue
new file mode 100644
index 00000000..7bfeb083
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/faw-out-data/jfNotConsignReport/index.vue
@@ -0,0 +1,558 @@
+<!--解放看板发出未结算-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button>
+      <!-- <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照单据流水号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button> -->
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="250px"
+      >
+        <template slot-scope="scope">
+          <el-tooltip
+            :content="scope.row.documentNumber"
+            placement="bottom-end"
+          >
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.documentNumber
+            }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="开始时间：" />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="beginTime">
+              <el-date-picker
+                v-model="form.beginTime"
+                type="datetime"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="结束时间：" />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="endTime">
+              <el-date-picker
+                v-model="form.endTime"
+                type="datetime"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="24" :xs="24">
+            <div
+              class="sections__tips"
+              style="margin-left: 80px; color: #ff4d4d"
+            >
+              备注：日期不选择的话，将默认最小日期和最大日期！
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <Detail
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></Detail>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import Detail from "./detail";
+import moment from "moment";
+import { formatTimeToTimestamp } from "@/utils/index";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, Detail },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "jfNotConsignReport",
+      rules: {
+        // version: [{ required: true, message: "必须输入！", trigger: "change" }],
+        // beginTime: [{ required: true, message: "选择日期！", trigger: "change" }],
+        // endTime: [{ required: true, message: "选择日期！", trigger: "change" }],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "",
+        customerName: "",
+        beginTime: "",
+        endTime: "",
+      },
+      versionValue: "",
+      versionList: [],
+      startTimeVale: "",
+      endTimeVale: "",
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "统计时间起",
+        prop: "beginTime",
+        width: 120,
+        formType: "datetime",
+      });
+      tempsTabs.push({
+        label: "统计时间止",
+        prop: "endTime",
+        width: 120,
+        formType: "datetime",
+      });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 110 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.form.beginTime && this.form.endTime) {
+            if (
+              formatTimeToTimestamp(this.form.beginTime) >=
+              formatTimeToTimestamp(this.form.endTime)
+            ) {
+              this.$message.error("开始时间必须小于结束时间!");
+              return false;
+            }
+          }
+          this.formLoading = true;
+          //以下两个值暂时写成固定值
+          this.form.customerCode = "V85Z27";
+          this.form.customerName = "一汽解放汽车有限公司计划财务部";
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts("/api/settleaccount/jf-kb-not-consign/report", this.form)
+            .then((res) => {
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              // this.formLoading = false;
+              // this.$notify({
+              //   title: "成功",
+              //   message: "统计成功！",
+              //   type: "success",
+              //   duration: 2000,
+              // });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .then((response) => {
+          this.versionList = [];
+          response.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form = {};
+      this.dialogFormVisible = true;
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.$axios
+        .posts("/api/settleaccount/jf-kb-not-consign/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/jf-kb-not-consign/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "documentNumber";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+    handleDelete(row) {
+      //批量删除
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+        myalert = "选中项";
+      }
+      this.$confirm("是否删除" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/settleaccount/jf-kb-not-consign/delete", params)
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/newJit/baseData/assemblyCfg/detail.vue b/code/WebApp/vue/src/views/ux/faw-out-data/stockFisDiffReport/detail.vue
similarity index 56%
rename from code/WebApp/vue/src/views/newJit/baseData/assemblyCfg/detail.vue
rename to code/WebApp/vue/src/views/ux/faw-out-data/stockFisDiffReport/detail.vue
index ade1d148..5e43f2e2 100644
--- a/code/WebApp/vue/src/views/newJit/baseData/assemblyCfg/detail.vue
+++ b/code/WebApp/vue/src/views/ux/faw-out-data/stockFisDiffReport/detail.vue
@@ -2,7 +2,8 @@
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
-      <!-- <el-button
+
+      <el-button
         class="filter-item"
         size="mini"
         type="info"
@@ -14,7 +15,7 @@
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="支持模糊搜索..."
+        placeholder="按照物料号搜索..."
         style="width: 230px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -25,7 +26,15 @@
         icon="el-icon-search"
         @click="handleFilter"
         >搜索
-      </el-button> -->
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
     </flexbox>
     <!--表格渲染-->
     <el-table
@@ -48,19 +57,21 @@
       @row-click="handleRowClick"
     >
       <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column prop="partCode" label="客户零件代码"> </el-table-column>
-      <el-table-column prop="partNum" label="客户零件数量"> </el-table-column>
-      <el-table-column prop="isKey" label="是否Key件">
-        <template slot-scope="scope">
-          <span v-if="scope.row.isKey == true">
-            <span style="color: #00b46d">是</span>
-          </span>
-          <span v-else>
-            <span style="color: #d75c89">否</span>
-          </span>
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
         </template>
       </el-table-column>
-      <el-table-column prop="description" label="描述"> </el-table-column>
     </el-table>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@@ -80,11 +91,10 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 import permission from "@/directive/permission/index.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import { downloadFile } from "@/utils/crmindex.js";
-import Detail from "./detail";
 
 export default {
   name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, Detail },
+  components: { Pagination, CRMTableHead },
   directives: { permission },
   filters: {
     IsCustomerSignFilter(status) {
@@ -145,7 +155,7 @@ export default {
         //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        assemblyProductID: "",
+        ParentId: "",
       },
       page: 1,
       dialogFormVisible: false,
@@ -177,7 +187,7 @@ export default {
             this.customerInfo.parentId = element.ParentId;
           });
           if (this.customerInfo.parentId != "") {
-            this.getList(this.searchContent);
+            this.getList();
           }
         }
       },
@@ -188,10 +198,17 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "客户零件代码", prop: "partCode ", width: 120 });
-      tempsTabs.push({ label: "客户零件数量", prop: "partNum", width: 160 });
-      tempsTabs.push({ label: "是否Key件", prop: "isKey", width: 95 });
-      tempsTabs.push({ label: "描述", prop: "description", width: 280 });
+      tempsTabs.push({
+        label: "单据流水号",
+        prop: "documentNumber",
+        width: 150,
+      });
+      tempsTabs.push({ label: "客户代码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "物料号", prop: "itemCode", width: 160 });
+
+      tempsTabs.push({ label: "看板数量", prop: "fisQty", width: 80 });
+      tempsTabs.push({ label: "ERP库存数量", prop: "stockQty", width: 100 });
+      tempsTabs.push({ label: "差异数量", prop: "diffQty", width: 80 });
       return tempsTabs;
     },
   },
@@ -204,9 +221,6 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property === "isKey") {
-        return { 0: "未生效", 1: "已生效" }[row[column.property]];
-      }
       return row[column.property] || "--";
     },
     importExcelData() {
@@ -214,24 +228,67 @@ export default {
       this.showExcelImport = false;
       this.getList();
     },
-    getList(partCode) {
+    async handleDownload() {
+      //await this.getDownBoms();
+      this.listLoading = true;
+      this.$axios
+        .gets(
+          "/api/settleaccount/stock-fis-report/export/" +
+            this.customerInfo.parentId
+        )
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    getList(data) {
       this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("fis结算：" + JSON.stringify(this.listQuery));
       this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
+        .posts(
+          "/api/settleaccount/stock-fis-report/details/byfilter",
+          this.listQuery
+        )
         .then((response) => {
-          console.log(partCode)
-          if(partCode !== "" && partCode !== undefined)
-          {
-            //console.log(partCode)
-            this.list = response.item.details.filter(u => u.partCode === partCode);
-          }
-          else
-          {
-            this.list = response.item.details;
-          }
+          this.list = response.items;
           //alert(JSON.stringify(response.Items))
-          //this.totalCount = response.totalCount;
+          this.totalCount = response.totalCount;
           setTimeout(() => {
             //大数据量加载时
             this.listLoading = false;
@@ -241,13 +298,21 @@ export default {
           this.listLoading = false;
         });
     },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-fis-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
     /** 筛选操作 */
     handleFilter() {
       this.page = 1;
       this.getList();
       this.listQuery.Filters = [];
       if (this.searchContent != "") {
-        var column = "partCode";
+        var column = "itemCode";
         let filter = {
           logic: 0,
           column: column,
@@ -256,8 +321,49 @@ export default {
         };
         this.listQuery.Filters.push(filter);
       }
-      //console.log(this.searchContent)
-      this.getList(this.searchContent);
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
     },
     resetQuery() {},
 
diff --git a/code/WebApp/vue/src/views/ux/faw-out-data/stockFisDiffReport/index.vue b/code/WebApp/vue/src/views/ux/faw-out-data/stockFisDiffReport/index.vue
new file mode 100644
index 00000000..a863d1aa
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/faw-out-data/stockFisDiffReport/index.vue
@@ -0,0 +1,497 @@
+<!--FIS发运数据对比输出表-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="260px"
+      >
+        <template slot-scope="scope">
+          <el-tooltip :content="scope.row.documentNumber" placement="top">
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.documentNumber
+            }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="version">
+              <el-select
+                v-model="form.version"
+                filterable
+                clearable
+                style="width: 188px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="FIS信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <StockFisDiffReport
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></StockFisDiffReport>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import StockFisDiffReport from "./detail";
+import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, StockFisDiffReport },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "sendUnsettledDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        version: [
+          { required: true, message: "必须选择版本！", trigger: "change" },
+        ],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "V85Z27",
+        customerName: "一汽解放汽车有限公司计划财务部",
+      },
+      versionValue: "",
+      versionList: [],
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "年度",
+        prop: "year",
+        width: 70,
+      });
+      tempsTabs.push({
+        label: "期间",
+        prop: "period",
+        width: 70,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 120 });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form.version = "";
+      this.dialogFormVisible = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts("/api/settleaccount/stock-fis-report/report/jf", this.form)
+            .then((res) => {
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              // this.formLoading = false;
+              // this.$notify({
+              //   title: "成功",
+              //   message: "统计成功！",
+              //   type: "success",
+              //   duration: 2000,
+              // });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+
+      let customfilter = {
+        logic: 0,
+        column: "CustomCode",
+        action: 0,
+        value: this.form.customerCode,
+      };
+      this.listQuery.Filters.push(customfilter);
+
+      this.$axios
+        .posts("/api/settleaccount/stock-fis-report/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-fis-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/faw-out-data/stockSettledDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/faw-out-data/stockSettledDiffReport/detail.vue
new file mode 100644
index 00000000..538d2ce4
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/faw-out-data/stockSettledDiffReport/detail.vue
@@ -0,0 +1,425 @@
+<!--R3结算数据对比输出表-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出全部
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照客户物料号搜索..."
+        style="width: 230px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "StockSettledDiffReport",
+  components: { Pagination, CRMTableHead },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "stockSettledDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "单据流水号",
+        prop: "documentNumber",
+        width: 140,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 80 });
+      tempsTabs.push({ label: "客户代码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "物料号", prop: "itemCode", width: 150 });
+      tempsTabs.push({
+        label: "看板结算数量",
+        prop: "r3SettledQty",
+        width: 65,
+      });
+      tempsTabs.push({
+        label: "出库数量",
+        prop: "stockQty",
+        width: 110,
+      });
+      tempsTabs.push({ label: "差异", prop: "diffQty", width: 50 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    async handleDownload() {
+      //await this.getDownBoms();
+      this.listLoading = true;
+      this.$axios
+        .gets(
+          "/api/settleaccount/stock-settled-report/export/" +
+            this.customerInfo.parentId
+        )
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("R3结算数据对比输出表：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/stock-settled-report/details/byfilter",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-settled-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "itemCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "r3SettledQty" ||
+        column.property === "stockQty" ||
+        column.property === "diffQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "r3SettledQty" ||
+        column.property === "stockQty" ||
+        column.property === "diffQty"
+      ) {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/faw-out-data/stockSettledDiffReport/index.vue b/code/WebApp/vue/src/views/ux/faw-out-data/stockSettledDiffReport/index.vue
new file mode 100644
index 00000000..a019d06b
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/faw-out-data/stockSettledDiffReport/index.vue
@@ -0,0 +1,501 @@
+<!--结算数据对比输出表-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="260px"
+      >
+        <template slot-scope="scope">
+          <el-tooltip :content="scope.row.documentNumber" placement="top">
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.documentNumber
+            }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="version">
+              <el-select
+                v-model="form.version"
+                filterable
+                clearable
+                style="width: 188px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="R3信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <SendUnsettledDiffReport
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></SendUnsettledDiffReport>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import SendUnsettledDiffReport from "./detail";
+import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, SendUnsettledDiffReport },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "sendUnsettledDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        version: [
+          { required: true, message: "必须选择版本！", trigger: "change" },
+        ],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "V85Z27",
+        customerName: "一汽解放汽车有限公司计划财务部",
+      },
+      versionValue: "",
+      versionList: [],
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "年度",
+        prop: "year",
+        width: 70,
+      });
+      tempsTabs.push({
+        label: "期间",
+        prop: "period",
+        width: 70,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 120 });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form.version = "";
+      this.dialogFormVisible = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts(
+              "/api/settleaccount/stock-settled-report/report/jf",
+              this.form
+            )
+            .then((res) => {
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              // this.formLoading = false;
+              // this.$notify({
+              //   title: "成功",
+              //   message: "统计成功！",
+              //   type: "success",
+              //   duration: 2000,
+              // });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+
+      let customfilter = {
+        logic: 0,
+        column: "CustomCode",
+        action: 0,
+        value: this.form.customerCode,
+      };
+      this.listQuery.Filters.push(customfilter);
+
+      this.$axios
+        .posts("/api/settleaccount/stock-settled-report/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-settled-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/faw-out-data/stockUnsettledDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/faw-out-data/stockUnsettledDiffReport/detail.vue
new file mode 100644
index 00000000..e29c6b7e
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/faw-out-data/stockUnsettledDiffReport/detail.vue
@@ -0,0 +1,420 @@
+<!--FIS未结数量与期末库存对比输出表-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出全部
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照客户物料号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "StockUnsettledDiffReport",
+  components: { Pagination, CRMTableHead },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "stockUnsettledDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "单据流水号",
+        prop: "documentNumber",
+        width: 200,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
+      tempsTabs.push({ label: "客户代码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "物料号", prop: "itemCode", width: 120 });
+      tempsTabs.push({ label: "物料号描述", prop: "itemDesc", width: 250 });
+      tempsTabs.push({
+        label: "看板未结数量",
+        prop: "fisUnSettledQty",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "库存数量",
+        prop: "stockQty",
+        width: 220,
+      });
+      tempsTabs.push({ label: "差异", prop: "diffQty", width: 100 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    async handleDownload() {
+      this.listLoading = true;
+      this.$axios
+        .gets(
+          "/api/settleaccount/stock-unsettled-report/export/" +
+            this.customerInfo.parentId
+        )
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              let downName =
+                fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
+                fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+              downloadFile(response, downName);
+              this.$notify({
+                title: "成功",
+                message: "FIS未结数量与期末库存对比输出表-下载成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.listLoading = false;
+            });
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("fis结算：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/stock-unsettled-report/details/byfilter",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-unsettled-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "itemCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisUnSettledQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisUnSettledQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue b/code/WebApp/vue/src/views/ux/faw-out-data/stockUnsettledDiffReport/index.vue
similarity index 50%
rename from code/WebApp/vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue
rename to code/WebApp/vue/src/views/ux/faw-out-data/stockUnsettledDiffReport/index.vue
index 27a0eb82..0ae11191 100644
--- a/code/WebApp/vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue
+++ b/code/WebApp/vue/src/views/ux/faw-out-data/stockUnsettledDiffReport/index.vue
@@ -1,7 +1,15 @@
-<!--大众无条码看板-出库单-->
+<!--FIS未结数量与期末库存对比输出表-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button>
       <el-input
         v-model="searchContent"
         clearable
@@ -18,14 +26,6 @@
         @click="handleFilter"
         >搜索
       </el-button>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload2"
-        @click="handleImportExcel()"
-        >导入文件（Excel）
-      </el-button>
     </flexbox>
     <!--表格渲染-->
     <el-table
@@ -47,16 +47,16 @@
       @row-click="handleRowClick"
     >
       <el-table-column
-        label="单据号"
-        prop="billNum"
+        label="单据流水号"
+        prop="documentNumber"
         sortable="custom"
         align="center"
-        width="250px"
+        width="260px"
       >
         <template slot-scope="scope">
-          <el-tooltip :content="scope.row.billNum" placement="bottom-end">
+          <el-tooltip :content="scope.row.documentNumber" placement="top">
             <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.billNum
+              scope.row.documentNumber
             }}</span>
           </el-tooltip>
         </template>
@@ -78,6 +78,54 @@
         </template>
       </el-table-column>
     </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="version">
+              <el-select
+                v-model="form.version"
+                filterable
+                clearable
+                style="width: 188px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
       <pagination
@@ -86,13 +134,6 @@
         :page.sync="page"
         :limit.sync="listQuery.MaxResultCount"
         @pagination="getList"
-      />
-       <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
       />
       <!-- 抽屉控件 -->
       <el-drawer
@@ -103,10 +144,10 @@
         :before-close="handleDrawerClose"
       >
         <div>
-          <Detail
+          <StockFisDiffReport
             v-bind:customerInfos="customerInfos"
             style="margin-top: -35px"
-          ></Detail>
+          ></StockFisDiffReport>
         </div>
       </el-drawer>
     </div>
@@ -116,37 +157,43 @@
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import Detail from "./detail";
+import StockFisDiffReport from "./detail";
 import moment from "moment";
-import importExcel from "@/components/ImportExcel-base";
-import { formatTimeToTimestamp } from "@/utils/index";
+import { downloadFile } from "@/utils/crmindex.js";
 
 export default {
   name: "sendUnsettledDiffReport",
-  components: { Pagination, Detail,importExcel },
+  components: { Pagination, StockFisDiffReport },
   directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
   data() {
     return {
-      crmType: "kanbanoutorder",
+      crmType: "sendUnsettledDiffReport",
       rules: {
-        // version: [{ required: true, message: "必须输入！", trigger: "change" }],
-        // beginTime: [{ required: true, message: "选择日期！", trigger: "change" }],
-        // endTime: [{ required: true, message: "选择日期！", trigger: "change" }],
+        //前端定义的规则，后端也有验证
+        version: [
+          { required: true, message: "必须选择版本！", trigger: "change" },
+        ],
       },
       customerInfos: [],
       searchContent: "", // 输入内容
       drawer: false,
       form: {
         version: "",
-        customerCode: "",
-        customerName: "",
-        beginTime: "",
-        endTime: "",
+        customerCode: "V85Z27",
+        customerName: "一汽解放汽车有限公司计划财务部",
       },
       versionValue: "",
       versionList: [],
-      startTimeVale: "",
-      endTimeVale: "",
       list: null,
       totalCount: 0,
       listLoading: true,
@@ -171,13 +218,26 @@ export default {
         SkipCount: 0,
         MaxResultCount: 15,
       },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
       page: 1,
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 200,
+      tableHeight: document.documentElement.clientHeight - 260,
       isEdit: false,
     };
   },
@@ -185,44 +245,48 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 200;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
     this.getList();
-    //this.getVersionInfo();
+    this.getVersionInfo();
   },
   computed: {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
       tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 120,
+        label: "年度",
+        prop: "year",
+        width: 70,
+      });
+      tempsTabs.push({
+        label: "期间",
+        prop: "period",
+        width: 70,
       });
-      //tempsTabs.push({ label: "单据号", prop: "billNum", width: 150 });
-      tempsTabs.push({ label: "创建人", prop: "creator", width: 160 });
+      tempsTabs.push({ label: "版本", prop: "version", width: 120 });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
       tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
       tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
       return tempsTabs;
     },
   },
   methods: {
-    handleImportExcel() {
-      //导入
-      this.showExcelImport = true;
-      this.$refs.importexcel.handleImportExcelClick();
-    },
     getVersionInfo() {
       //取版本列表信息
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
         .then((response) => {
           this.versionList = [];
-          response.forEach((element) => {
+          response.items.forEach((element) => {
             let options = {};
             options.value = element.version;
             options.label = element.version;
@@ -233,15 +297,85 @@ export default {
           this.listLoading = false;
         });
     },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form.version = "";
+      this.dialogFormVisible = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts(
+              "/api/settleaccount/stock-unsettled-report/report/jf",
+              this.form
+            )
+            .then((res) => {
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              // this.formLoading = false;
+              // this.$notify({
+              //   title: "成功",
+              //   message: "统计成功！",
+              //   type: "success",
+              //   duration: 2000,
+              // });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
     //抽屉
     handleDrawerOpen(param) {
       this.drawer = true;
-      var parentId = param.billNum; //单据号
-      var version = param.version; //版本
+      var parentId = param.id; //主键id
       this.customerInfos = [
         {
           ParentId: parentId,
-          Version: version,
         },
       ];
     },
@@ -250,15 +384,19 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property == "creationTime") {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
         var date = row[column.property];
         if (date == undefined) {
           return "";
         }
         return moment(date).format("YYYY-MM-DD HH:mm:ss");
       }
-      if (column.property == "state") {
-        return { 0: "已提交", 1: "已出库", 2: "不能出库" }[
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
           row[column.property]
         ];
       }
@@ -271,13 +409,24 @@ export default {
     },
     getList(data) {
       this.listLoading = true;
-      if (data != undefined) {
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
         this.listQuery.SkipCount = (this.page - 1) * data.limit;
       } else {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
+      //this.listQuery.Filters = [];
+
+      // let customfilter = {
+      //   logic: 0,
+      //   column: "CustomCode",
+      //   action: 0,
+      //   value: this.form.customerCode,
+      // };
+      // this.listQuery.Filters.push(customfilter);
+
       this.$axios
-        .posts("/api/settleaccount/wmskanbanoutput/WmsKanbanList", this.listQuery)
+        .posts("/api/settleaccount/stock-unsettled-report/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           //alert(JSON.stringify(response.Items))
@@ -291,6 +440,14 @@ export default {
           this.listLoading = false;
         });
     },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-unsettled-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
     /** 筛选操作 */
     handleFilter() {
       this.page = 1;
@@ -301,7 +458,7 @@ export default {
         let filter = {
           logic: 0,
           column: column,
-          action: 0,
+          action: 6,
           value: this.searchContent,
         };
         this.listQuery.Filters.push(filter);
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/itemInvoicePrice/index.vue b/code/WebApp/vue/src/views/ux/fawdata/JFCarConsign/index.vue
similarity index 62%
rename from code/WebApp/vue/src/views/ux/vw/dataInput/itemInvoicePrice/index.vue
rename to code/WebApp/vue/src/views/ux/fawdata/JFCarConsign/index.vue
index 0dfab57a..dfe1ca4d 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/itemInvoicePrice/index.vue
+++ b/code/WebApp/vue/src/views/ux/fawdata/JFCarConsign/index.vue
@@ -1,7 +1,24 @@
-<!--QAD出库单数据-->
+<!--结算数据输入表-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
+      <!-- <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select> -->
+
       <XhJSSelect
         :options="versionList"
         style="width: 200px"
@@ -14,22 +31,23 @@
         type="warning"
         icon="el-icon-upload2"
         @click="handleImportExcel()"
-        >导入文件（Excel）
+        >导入Excel
       </el-button>
-      <el-button
+      <!-- <el-button
         class="filter-item"
         size="mini"
         type="info"
         icon="el-icon-download"
         @click="handleDownload()"
-        >导出Csv
-      </el-button>
+        >导出Excel
+      </el-button> -->
+
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照零件号搜索..."
-        style="width: 200px"
+        placeholder="按照物料号搜索..."
+        style="width: 250px"
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
@@ -48,58 +66,79 @@
         @filter="handleFilters"
       >
       </c-r-m-table-head>
+      <el-dropdown size="small" class="filter-item" @command="handleCommand">
+        <span class="el-dropdown-link">
+          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="excel" icon="el-icon-plus"
+            >导出Excel</el-dropdown-item
+          >
+          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
+            >导出Csv</el-dropdown-item
+          >
+        </el-dropdown-menu>
+      </el-dropdown>
+      <div class="right-container" style="margin-left: 260px">
+        <el-dropdown
+          v-if="MoreTypes.length > 0"
+          trigger="click"
+          @command="handleTypeDrop"
+        >
+          <flexbox class="right-more-item">
+            <div>更多</div>
+            <i class="el-icon-arrow-down el-icon--right" style="color: #777" />
+          </flexbox>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              v-for="(item, index) in MoreTypes"
+              :key="index"
+              :command="item.type"
+              >{{ item.name }}</el-dropdown-item
+            >
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
     </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
+    <div class="l-table">
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeight"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
       >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
       <pagination
@@ -121,61 +160,45 @@
 </template>
 
 <script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import Pagination from "@/components/Pagination";
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-qad";
-import CRMTableHead from "../../../components/CRMTableHead";
-import moment from "moment";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-faw";
 import Lockr from "lockr";
 import { downloadFile } from "@/utils/crmindex.js";
+import moment from "moment";
 import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
 
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
+
 export default {
-  name: "ItemInvoicePrice",
+  name: "JFCarConsign",
   components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
   data() {
     return {
-      crmType: "ItemInvoicePrice",
+      crmType: "jfcarconsign",
       versionValue: "",
       versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
       searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
+      showExcelImport: false,
+      form: {},
+      drawer: false,
       list: null,
       totalCount: 0,
       listLoading: true,
-      formLoading: false,
+      customerInfo: {
+        bomId: "",
+      },
       // 高级搜索
       filterObj: {
         type: Object,
@@ -183,145 +206,180 @@ export default {
           return {};
         },
       },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
       listQuery: {
         Filters: [
           {
             logic: 0,
-            column: "Enabled",
+            column: "enabled",
             action: 0,
             value: "true",
           }, //默认查询可用的
         ],
-        //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        ParentId: "",
-        Version: "",
+        ParentId: null,
         fileType: 0,
         userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        ParentId: "",
-        fileType: 0,
-        userId: "",
+        customerCode: "",
       },
       page: 1,
-      dialogFormVisible: false,
+      bomUnit,
       multipleSelection: [],
-      formTitle: "",
       drawer: false,
-      showExcelImport: false,
       tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
     };
   },
   mounted() {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
     this.getVersionInfo();
-    if (this.versionList == []) {
-      this.getList();
-    }
+    this.getList();
   },
   computed: {
-    /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "零件号", prop: "materialCode", width: 180 });
-      tempsTabs.push({ label: "零件名称", prop: "materialDesc", width: 200 });
-      tempsTabs.push({ label: "单位", prop: "um", width: 100 });
+      tempsTabs.push({ label: "版本", prop: "version", width: 80 });
       tempsTabs.push({
-        label: "销售订单",
-        prop: "sales",
+        label: "客户代码",
+        prop: "customerCode",
+        width: 80,
+      });
+      tempsTabs.push({
+        label: "物料号",
+        prop: "materialCode",
         width: 150,
-        //formType: "datetime",
       });
-
-      // tempsTabs.push({
-      //   label: "CP7时间",
-      //   prop: "cP7",
-      //   width: 150,
-      //   //formType: "datetime",
-      // });
-      tempsTabs.push({ label: "分账户", prop: "subAcct", width: 130 });
-      tempsTabs.push({ label: "销售客户", prop: "cc", width: 100 });
-      tempsTabs.push({ label: "开票数量", prop: "backorder", width: 120 });
-      tempsTabs.push({ label: "开票单价", prop: "price", width: 120 });
+      tempsTabs.push({ label: "数量", prop: "qty", width: 50 });
       tempsTabs.push({
-        label: "总金额",
-        prop: "extendedPrice",
+        label: "PA清单号",
+        prop: "paBillNum",
         width: 150,
       });
-      //tempsTabs.push({ label: "ExtendedMargin", prop: "extendedMargin", width: 120 });
+      tempsTabs.push({ label: "状态", prop: "state", width: 55 });
       return tempsTabs;
     },
+    MoreTypes() {
+      var moreTypes = [];
+      moreTypes.push({ type: "updateJFCarConsign", name: "更新看板数据" });
+      //moreTypes.push({ type: "enter", name: "新按钮" });
+      return moreTypes;
+    },
   },
   methods: {
     selectValue(params) {
       //版本下拉选择
       this.versionValue = params.value;
-      this.listQuery.Version = params.data.filter(
-        (u) => u.value === this.versionValue
-      )[0].label;
       this.getList();
     },
     handleTypeDrop(command, params = {}) {
-      if (command == "updateFis") {
+      if (command == "updateJFCarConsign") {
         this.listLoading = true;
         //this.listQuery.SkipCount = (this.page - 1) * 10000;
         this.$axios
-          .posts("/api/settleaccount/ItemInvoicePrice/updateFis")
+          .posts("/api/settleaccount/JFCarConsign/jfupdate")
           .then((res) => {
             if (res == true) {
               this.$notify({
                 title: "成功",
-                message: "FIS数据-更新成功！",
+                message: "数据-更新成功！",
                 type: "success",
                 duration: 2000,
               });
             } else {
               this.$message({
                 type: "warning",
-                message: "FIS数据-更新失败！",
+                message: "数据-更新失败！",
               });
             }
             this.listLoading = false;
           });
-      } else if (command == "enter") {
       }
     },
+    handleCommand(command) {
+      if (this.versionValue === "") {
+        this.$message.error("请先选择版本！");
+        return;
+      }
+      switch (command) {
+        case "excel":
+          this.listQuery.fileType = 1; //0是csv,1是excel
+          break;
+        case "csv":
+          this.listQuery.fileType = 0; //0是csv,1是excel
+          break;
+        default:
+          this.listQuery.fileType = 0;
+          break;
+      }
+      this.listLoading = true;
+      if (this.versionValue === "") {
+        this.$message.error("必需选择版本！");
+        this.listLoading = false;
+        return;
+      }
+      if (this.versionValue != "") {
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
+      }
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log("解放看板导出：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts("/api/settleaccount/JFCarConsign/Export", this.listQuery)
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
     selectOptionsChange(item) {
       this.getList();
     },
+    importExcelData(data) {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getVersionInfo();
+      //this.getList();
+    },
     getVersionInfo() {
       //取版本列表信息
-      //this.listLoading = true;
-      this.listVersionQuery.SkipCount = (this.page - 1) * 1000;
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts(
-          "/api/settleaccount/ItemInvoicePrice/versionlist",
-          this.listVersionQuery
-        )
+        .posts("/api/settleaccount/JFCarConsign/listVersion", this.listQuery)
         .then((response) => {
           this.versionList = [];
           response.items.forEach((element) => {
@@ -333,19 +391,18 @@ export default {
           if (JSON.stringify(this.versionList) != "[]") {
             //因版本下拉有默认值，所以详表要自动绑定子表数据
             this.versionValue = this.versionList[0].value;
-            this.listQuery.Version = this.versionList[0].label; //版本号
             this.getList();
           }
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
         })
         .catch(() => {
-          //this.listLoading = false;
+          this.listLoading = false;
         });
     },
-    handleImportExcelClick() {
-      //父组件中，初始化此子组件时调用
-      this.fileuploadList = [];
-      //this.$refs.upload.clearFiles();
-    },
     handleImportExcel() {
       //导入
       this.showExcelImport = true;
@@ -360,9 +417,9 @@ export default {
     /** 格式化字段 */
     fieldFormatter(row, column) {
       if (column.property === "state") {
-        return { 0: "其他", 2: "已结" }[row[column.property]];
+        return { 0: "未结", 1: "部分结算", 2: "已结" }[row[column.property]];
       }
-      if (column.property == "cP5A" || column.property == "cP7") {
+      if (column.property == "onLineDateTime") {
         var date = row[column.property];
         if (date == undefined) {
           return "";
@@ -371,85 +428,35 @@ export default {
       }
       return row[column.property] || "--";
     },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
     },
-    //导出功能
-    async handleDownload() {
+    async handleDownload() {},
+    getDownBoms() {
       this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
-      if (this.versionValue != "") {
-        this.listQuery.ParentId = this.versionValue;
-      } else {
-        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
-      }
-      this.listQuery.fileType = 0; //0是csv,1是excel
-      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
-      var version = this.listQuery.Version;
-      let filter = {
-        logic: 0,
-        column: "Version",
-        action: 0,
-        value: version,
-      };
-      this.listQuery.Filters.push(filter);
-      console.log("导出：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/ItemInvoicePrice/Export", this.listQuery)
-        .then((res) => {
-          let fileNameOfProject = res;
-          this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
-            .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
-                let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, fileNameOfProject);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
+        .gets("/api/settleaccount/JFCarConsign/ExcelExporte")
+        .then((response) => {
+          this.listLoading = false;
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
         this.listQuery.ParentId = this.versionValue;
       } else {
         this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
       this.$axios
-        .posts("/api/settleaccount/ItemInvoicePrice/list", this.listQuery)
+        .posts("/api/settleaccount/JFCarConsign/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
-          //alert(JSON.stringify(response.Items))
           this.totalCount = response.totalCount;
           setTimeout(() => {
             //大数据量加载时
@@ -463,28 +470,11 @@ export default {
     fetchData(id) {
       //循环动态
       this.$axios
-        .gets("/api/settleaccount/ItemInvoicePrice/" + id)
+        .gets("/api/settleaccount/JFCarConsign/" + id)
         .then((response) => {
           this.form = response;
         });
     },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "materialCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
     /** 多项筛选操作 */
     /** 筛选操作 */
     handleFilters(data) {
@@ -527,7 +517,24 @@ export default {
         this.getList();
       }
     },
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "materialCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
     resetQuery() {},
+
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
@@ -535,7 +542,6 @@ export default {
         return;
       }
       this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
       this.handleFilter();
     },
     handleSelectionChange(val) {
@@ -567,12 +573,6 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../../styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
+@import "../../styles/crmtable.scss";
 </style>
 
-
diff --git a/code/WebApp/vue/src/views/ux/basedata/priceList/index.vue b/code/WebApp/vue/src/views/ux/fawdata/JFCarKB/index.vue
similarity index 79%
rename from code/WebApp/vue/src/views/ux/basedata/priceList/index.vue
rename to code/WebApp/vue/src/views/ux/fawdata/JFCarKB/index.vue
index 89361616..11a36c38 100644
--- a/code/WebApp/vue/src/views/ux/basedata/priceList/index.vue
+++ b/code/WebApp/vue/src/views/ux/fawdata/JFCarKB/index.vue
@@ -1,20 +1,52 @@
-<!--价格管理信息页-->
+<!--解放看板输入表-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
+      <!-- <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select> -->
       <XhJSSelect
         :options="versionList"
         style="width: 200px"
         class="search-container"
         @value-change="selectValue"
       ></XhJSSelect>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload2"
+        @click="handleImportExcel()"
+        >导入Excel
+      </el-button>
+      <!-- <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出Excel
+      </el-button> -->
 
       <el-input
         v-model="searchContent"
         clearable
         size="small"
         placeholder="按照物料编号搜索..."
-        style="width: 200px"
+        style="width: 250px"
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
@@ -25,14 +57,6 @@
         @click="handleFilter"
         >搜索
       </el-button>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-bottom"
-        @click="handleCommand()"
-        >导出Excel
-      </el-button>
       <!--表格头组件，filter查询-->
       <c-r-m-table-head
         ref="crmTableHead"
@@ -41,8 +65,7 @@
         @filter="handleFilters"
       >
       </c-r-m-table-head>
-
-      <!-- <el-dropdown size="small" class="filter-item" @command="handleCommand">
+      <el-dropdown size="small" class="filter-item" @command="handleCommand">
         <span class="el-dropdown-link">
           导出数据<i class="el-icon-arrow-down el-icon--right"></i>
         </span>
@@ -54,7 +77,7 @@
             >导出Csv</el-dropdown-item
           >
         </el-dropdown-menu>
-      </el-dropdown> -->
+      </el-dropdown>
     </flexbox>
     <div class="l-table">
       <!--表格渲染-->
@@ -119,11 +142,11 @@
 import Pagination from "@/components/Pagination";
 import permission from "@/directive/permission/index.js";
 import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
+import importExcel from "@/components/ImportExcel-faw";
 import Lockr from "lockr";
 import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
 import moment from "moment";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
 
 //组件计量单位
 const bomUnit = [
@@ -137,30 +160,12 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
 }, {});
 
 export default {
-  name: "PriceList",
+  name: "JFCarKB",
   components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
   data() {
     return {
-      crmType: "priceList",
+      crmType: "jfcarkb",
       versionValue: "",
       versionList: [], //版本列表
       searchContent: "", // 输入内容
@@ -180,19 +185,6 @@ export default {
           return {};
         },
       },
-      // listQuery: {
-      //    Filters: [
-      //    {
-      //         "logic": 0,
-      //         "column": "enabled",
-      //         "action": 0,
-      //         "value": "true"
-      //       }//默认查询可用的
-      //     ],
-      //     //OrgID:"",
-      //     "SkipCount": 0,
-      //     "MaxResultCount": 15
-      // },
       listQuery: {
         Filters: [
           {
@@ -207,20 +199,8 @@ export default {
         ParentId: null,
         fileType: 0,
         userId: "00000000-0000-0000-0000-000000000000",
+        customerCode: "",
       },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        fileType: 0,
-      },
-      // listVersionQuery: {
-
-      //   SkipCount: 0,
-      //   MaxResultCount: 15,
-      //   ParentId: null,
-      //   fileType: 0,
-      //   userId: "00000000-0000-0000-0000-000000000000",
-      // },
       page: 1,
       bomUnit,
       multipleSelection: [],
@@ -239,43 +219,34 @@ export default {
     this.getVersionInfo();
     this.getList();
   },
-  // watch: {
-  //   customerInfos: {
-  //     handler(newVal) {
-  //       if (newVal == "" || newVal == "undefined") {
-  //         //TODO
-  //       } else {
-  //         newVal.forEach((element) => {
-  //           this.customerInfo.bomId = element.BomId;
-  //         });
-  //         if (this.customerInfo.bomId != "") {
-  //           this.getList();
-  //         }
-  //       }
-  //     },
-  //   },
-  // },
   computed: {
     getDefaultField() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "版本", prop: "version", width: 120 });
+      tempsTabs.push({ label: "版本", prop: "version", width: 80 });
       tempsTabs.push({
-        label: "物料编号",
-        prop: "materialCode",
-        width: 230,
+        label: "客户代码",
+        prop: "customerCode",
+        width: 80,
+      });
+      tempsTabs.push({
+        label: "单据编号",
+        prop: "billNum",
+        width: 150,
       });
-      // tempsTabs.push({
-      //   label: "价格类型",
-      //   prop: "type",
-      //   width: 100,
-      // });
       tempsTabs.push({
-        label: "价格",
-        prop: "price",
+        label: "上线时间",
+        prop: "onLineDateTime",
         width: 100,
+        formType: "datetime",
+      });
+      tempsTabs.push({
+        label: "物料编号",
+        prop: "materialCode",
+        width: 150,
       });
-      // tempsTabs.push({ label: "开始日期", prop: "beginDate", width: 120 });
-      // tempsTabs.push({ label: "结束日期", prop: "endDate", width: 120 });
+      tempsTabs.push({ label: "入库数量", prop: "inStockQty", width: 60 });
+      tempsTabs.push({ label: "状态", prop: "state", width: 55 });
+      tempsTabs.push({ label: "结算数量", prop: "consignQty", width: 70 });
       return tempsTabs;
     },
   },
@@ -290,8 +261,7 @@ export default {
         this.$message.error("请先选择版本！");
         return;
       }
-      this.listQuery.fileType = 1; //0是csv,1是excel
-      /* switch (command) {
+      switch (command) {
         case "excel":
           this.listQuery.fileType = 1; //0是csv,1是excel
           break;
@@ -299,24 +269,24 @@ export default {
           this.listQuery.fileType = 0; //0是csv,1是excel
           break;
         default:
-          //这里是没有找到对应的值处理
+          this.listQuery.fileType = 0;
           break;
-      } */
+      }
       this.listLoading = true;
-      /* if (this.versionValue === "") {
+      if (this.versionValue === "") {
         this.$message.error("必需选择版本！");
         this.listLoading = false;
         return;
-      } */
+      }
       if (this.versionValue != "") {
         this.listQuery.ParentId = this.versionValue;
       } else {
         this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
       this.listQuery.userId = Lockr.get("loginUserInfo").userId;
-      console.log("产品结构导出：" + JSON.stringify(this.listQuery));
+      console.log("解放看板导出：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/PriceList/Export", this.listQuery)
+        .posts("/api/settleaccount/JFCarKB/Export", this.listQuery)
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -354,7 +324,7 @@ export default {
     selectOptionsChange(item) {
       this.getList();
     },
-    importExcelData() {
+    importExcelData(data) {
       //关闭导入窗体时调用
       this.showExcelImport = false;
       this.getVersionInfo();
@@ -363,12 +333,9 @@ export default {
     getVersionInfo() {
       //取版本列表信息
       this.listLoading = true;
-      this.listVersionQuery.SkipCount = (this.page - 1) * 1000;
+      this.listQuery.SkipCount = (this.page - 1) * 500;
       this.$axios
-        .posts(
-          "/api/settleaccount/PriceList/versionlist",
-          this.listVersionQuery
-        )
+        .posts("/api/settleaccount/JFCarKB/listVersion", this.listQuery)
         .then((response) => {
           this.versionList = [];
           response.items.forEach((element) => {
@@ -405,10 +372,10 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property === "projectRole") {
-        return { 0: "是", 1: "否" }[row[column.property]];
+      if (column.property === "state") {
+        return { 0: "未结", 1: "部分结算", 2: "已结" }[row[column.property]];
       }
-      if (column.property == "beginDate" || column.property == "endDate") {
+      if (column.property == "onLineDateTime") {
         var date = row[column.property];
         if (date == undefined) {
           return "";
@@ -420,11 +387,22 @@ export default {
     roleFilter(type) {
       return projectTypeKeyValue[type];
     },
-    getList() {
+    async handleDownload() {},
+    getDownBoms() {
+      this.listLoading = true;
+      this.$axios
+        .gets("/api/settleaccount/JFCarKB/ExcelExporte")
+        .then((response) => {
+          this.listLoading = false;
+        });
+    },
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.listQuery.Sorting === "") {
-        this.listQuery.Sorting = "materialCode ascending";
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       if (this.versionValue != "") {
         this.listQuery.ParentId = this.versionValue;
@@ -432,11 +410,10 @@ export default {
         this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
       this.$axios
-        .posts("/api/settleaccount/PriceList/list", this.listQuery)
+        .posts("/api/settleaccount/JFCarKB/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           this.totalCount = response.totalCount;
-          this.listQuery.Sorting = "";
           setTimeout(() => {
             //大数据量加载时
             this.listLoading = false;
@@ -448,11 +425,9 @@ export default {
     },
     fetchData(id) {
       //循环动态
-      this.$axios
-        .gets("/api/settleaccount/PriceList/" + id)
-        .then((response) => {
-          this.form = response;
-        });
+      this.$axios.gets("/api/settleaccount/JFCarKB/" + id).then((response) => {
+        this.form = response;
+      });
     },
     /** 多项筛选操作 */
     /** 筛选操作 */
@@ -528,7 +503,10 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
+      if (
+        column.property === "inStockQty" ||
+        column.property === "consignQty"
+      ) {
         return { textAlign: "right" };
       } else {
         return { textAlign: "left" };
@@ -536,7 +514,10 @@ export default {
     },
     /** 通过回调控制表头style */
     headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
+      if (
+        column.property === "inStockQty" ||
+        column.property === "consignQty"
+      ) {
         return { textAlign: "right", background: "#FAFAFA" };
       } else {
         return { textAlign: "left", background: "#FAFAFA" };
diff --git a/code/WebApp/vue/src/views/ux/hq-out-data/HqSecondaryActuralDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/hq-out-data/HqSecondaryActuralDiffReport/detail.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/code/WebApp/vue/src/views/ux/hq-out-data/HqSecondaryActuralDiffReport/index.vue b/code/WebApp/vue/src/views/ux/hq-out-data/HqSecondaryActuralDiffReport/index.vue
new file mode 100644
index 00000000..95ea97c2
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/hq-out-data/HqSecondaryActuralDiffReport/index.vue
@@ -0,0 +1,641 @@
+<!--红旗--二配对比输出表-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <!-- <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button> -->
+      <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本导出Excel..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select>
+      <el-dropdown
+        size="small"
+        class="filter-item"
+        split-button
+        type="primary"
+        @command="handleCommand"
+      >
+        更多导出菜单
+        <el-dropdown-menu slot="dropdown">
+          <!-- <el-dropdown-item command="stand-assembly" icon="el-icon-plus"
+            >导出标准结算总成散件明细输出表</el-dropdown-item
+          >
+          <el-dropdown-item command="stand-detail" icon="el-icon-circle-plus"
+            >导出标准二配明细输出表</el-dropdown-item
+          >
+          <el-dropdown-item
+            command="stand-sum"
+            icon="el-icon-circle-plus-outline"
+            >导出标准二配汇总输出表</el-dropdown-item
+          > -->
+          <el-dropdown-item command="actual-assembly" icon="el-icon-check"
+            >导出实际结算总成散件明细输出表</el-dropdown-item
+          >
+          <el-dropdown-item command="actual-detail" icon="el-icon-circle-check"
+            >导出实际二配明细输出表</el-dropdown-item
+          >
+          <el-dropdown-item command="actual-sum" icon="el-icon-circle-close"
+            >导出实际二配汇总输出表</el-dropdown-item
+          >
+          <!-- <el-dropdown-item
+            command="actual-adjust-sum"
+            icon="el-icon-circle-close"
+            >实际调整后输出表</el-dropdown-item
+          >
+          <el-dropdown-item
+            command="actual-stand-diff"
+            icon="el-icon-circle-close"
+            >二配对比输出表</el-dropdown-item
+          > -->
+        </el-dropdown-menu>
+      </el-dropdown>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 250px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="260px"
+        fixed="left"
+      >
+        <template slot-scope="scope">
+          <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+            scope.row.documentNumber
+          }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="version">
+              <el-select
+                v-model="form.version"
+                clearable
+                style="width: 180px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="二配对比信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <StockFisDiffReport
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></StockFisDiffReport>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import StockFisDiffReport from "./detail";
+import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "HqSecondaryActuralDiffReport",
+  components: { Pagination, StockFisDiffReport },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "HqSecondaryActuralDiffReport",
+      exportApi: "",
+      rules: {
+        //前端定义的规则，后端也有验证
+        version: [
+          { required: true, message: "必须选择版本！", trigger: "change" },
+        ],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "",
+        customerName: "",
+      },
+      versionValue: "",
+      versionList: [],
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      exportQuery: {
+        version: "",
+        customerCode: "",
+        customerName: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "期间",
+        prop: "period",
+        width: 75,
+      });
+      tempsTabs.push({ label: "客户代码", prop: "version", width: 120 });
+      tempsTabs.push({ label: "看板物料号", prop: "customCode", width: 110 });
+      tempsTabs.push({
+        label: "ERP总成物料号",
+        prop: "customName",
+        width: 150,
+      });
+      tempsTabs.push({ label: "ERP总成描述", prop: "customName", width: 150 });
+      tempsTabs.push({ label: "下线数量", prop: "customName", width: 150 });
+      tempsTabs.push({
+        label: "ERP组件物料号",
+        prop: "documentStatus",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "每个总成用量",
+        prop: "documentStatus",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "客户组件物料号",
+        prop: "documentStatus",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "客户组成物料描述",
+        prop: "documentStatus",
+        width: 150,
+      });
+      tempsTabs.push({ label: "零件属性", prop: "documentStatus", width: 150 });
+      tempsTabs.push({
+        label: "供应商代码",
+        prop: "documentStatus",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "供应商描述",
+        prop: "documentStatus",
+        width: 250,
+      });
+      tempsTabs.push({
+        label: "客户组件结算单价",
+        prop: "documentStatus",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "零件数量（回款）",
+        prop: "documentStatus",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "金额（不含税）",
+        prop: "documentStatus",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "金额（含税）",
+        prop: "documentStatus",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "价格或零件号变动情况",
+        prop: "documentStatus",
+        width: 250,
+      });
+      tempsTabs.push({
+        label: "二配采购员",
+        prop: "documentStatus",
+        width: 150,
+      });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 250 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    handleCommand(command) {
+      if (this.versionValue === "") {
+        this.$message.error("请先选择版本！");
+        return;
+      }
+      switch (command) {
+        // case "stand-assembly":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/export/excel/stand-assembly";
+        //   break;
+        // case "stand-detail":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/export/excel/stand-detail";
+        //   break;
+        // case "stand-sum":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/export/excel/stand-sum";
+        //   break;
+        case "actual-assembly":
+          this.exportApi =
+            "/api/settleaccount/sec-act-diff-report/export/excel/actual-assembly";
+          break;
+        case "actual-detail":
+          this.exportApi =
+            "/api/settleaccount/sec-act-diff-report/export/excel/actual-detail";
+          break;
+        case "actual-sum":
+          this.exportApi =
+            "/api/settleaccount/sec-act-diff-report/export/excel/actual-sum";
+          break;
+        // case "actual-adjust-sum":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/report/actual-adjust-sum";
+        //   break;
+        // case "actual-stand-diff":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/report/actual-stand-diff";
+        //   break;
+        default:
+          //这里是没有找到对应的值处理
+          break;
+      }
+      this.listLoading = true;
+      this.exportQuery.version = this.versionValue;
+      this.exportQuery.customerCode = "T51Z40";
+      this.exportQuery.customerName = "一汽奔腾轿车有限公司";
+      console.log("二配对比条件：" + JSON.stringify(this.exportQuery));
+      this.$axios.posts(this.exportApi, this.exportQuery).then((res) => {
+        let fileNameOfProject = res;
+        this.$axios
+          .BolbGets(
+            "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+          )
+          .then((response) => {
+            if (fileNameOfProject.indexOf("_") != -1) {
+              let downName =
+                fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
+                fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+              downloadFile(response, downName);
+              this.$notify({
+                title: "成功",
+                message: "数据-导出成功！",
+                type: "success",
+                duration: 2000,
+              });
+            } else {
+              downloadFile(response, fileNameOfProject);
+              this.$notify({
+                title: "成功",
+                message: "数据-导出成功！",
+                type: "success",
+                duration: 2000,
+              });
+            }
+            this.listLoading = false;
+          });
+      });
+    },
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .then((response) => {
+          this.versionList = [];
+          response.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form = {};
+      this.dialogFormVisible = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          //insert添加
+          this.form.customerCode = "T51Z40";
+          this.form.customerName = "一汽奔腾轿车有限公司";
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts("/api/settleaccount/sec-act-diff-report/report", this.form)
+            .then((response) => {
+              this.formLoading = false;
+              this.$notify({
+                title: "成功",
+                message: "统计成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property == "beginTime" || column.property == "endTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.$axios
+        .posts("/api/settleaccount/sec-act-diff-report/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/sec-act-diff-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/hq-out-data/secondaryActuralDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/hq-out-data/secondaryActuralDiffReport/detail.vue
new file mode 100644
index 00000000..9bc240e5
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/hq-out-data/secondaryActuralDiffReport/detail.vue
@@ -0,0 +1,452 @@
+<!--二配对比输出表-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出全部
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照客户总成物料号搜索..."
+        style="width: 250px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        style="margin-top: -25px;margin-bottom:-25px;float:right;"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, CRMTableHead },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "secondaryActuralDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 180,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "期间", prop: "version", width: 80 });
+      tempsTabs.push({
+        label: "客户总成物料号",
+        prop: "customItemCode",
+        width: 160,
+      });
+      tempsTabs.push({ label: "供应商代码", prop: "supplierCode", width: 120 });
+      tempsTabs.push({
+        label: "客户组件物料号",
+        prop: "customSubItemCode",
+        width: 160,
+      });
+      tempsTabs.push({
+        label: "标准零件数量（回款）",
+        prop: "staPaymentPartyQty",
+        width: 170,
+      });
+      tempsTabs.push({
+        label: "实际零件数量（回款）",
+        prop: "actPaymentPartyQty",
+        width: 170,
+      });
+      tempsTabs.push({ label: "数量差异", prop: "diffQty", width: 100 });
+      tempsTabs.push({
+        label: "标准金额（不含税）",
+        prop: "stdNoTaxAmount",
+        width: 160,
+      });
+      tempsTabs.push({
+        label: "实际金额（不含税）",
+        prop: "actNoTaxAmount",
+        width: 160,
+      });
+      tempsTabs.push({ label: "金额差异", prop: "diffAmount", width: 100 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    async handleDownload() {
+      //await this.getDownBoms();
+      this.listLoading = true;
+      this.$axios
+        .gets(
+          "/api/settleaccount/sec-act-diff-report/export/excel/actual-stand-diff/" +
+            this.customerInfo.parentId
+        )
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("二配对比输出表：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/sec-act-diff-report/details/byfilter",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/sec-act-diff-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "customItemCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if ( column.property === "staPaymentPartyQty" ||
+        column.property === "actPaymentPartyQty" ||
+        column.property === "diffQty" ||
+        column.property === "stdNoTaxAmount" ||
+        column.property === "actNoTaxAmount" ||
+        column.property === "diffAmount" ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "staPaymentPartyQty" ||
+        column.property === "actPaymentPartyQty" ||
+        column.property === "diffQty" ||
+        column.property === "stdNoTaxAmount" ||
+        column.property === "actNoTaxAmount" ||
+        column.property === "diffAmount" 
+      ) {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/hq-out-data/secondaryActuralDiffReport/index.vue b/code/WebApp/vue/src/views/ux/hq-out-data/secondaryActuralDiffReport/index.vue
new file mode 100644
index 00000000..2c920901
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/hq-out-data/secondaryActuralDiffReport/index.vue
@@ -0,0 +1,643 @@
+<!--二配对比输出表-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+
+      <el-select
+        v-model="versionValue"
+        size="small"
+        filterable
+        placeholder="选择版本导出Excel..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select>
+      <el-dropdown
+        size="small"
+        class="filter-item"
+        split-button
+        type="primary"
+        @command="handleCommand"
+      >
+        更多导出菜单
+        <el-dropdown-menu slot="dropdown">
+
+          <el-dropdown-item command="actual-assembly" icon="el-icon-check"
+            >导出实际结算总成散件明细输出表</el-dropdown-item
+          >
+          <el-dropdown-item command="actual-detail" icon="el-icon-circle-check"
+            >导出实际二配明细输出表</el-dropdown-item
+          >
+          <el-dropdown-item command="actual-sum" icon="el-icon-circle-close"
+            >导出实际二配汇总输出表</el-dropdown-item
+          >
+
+        </el-dropdown-menu>
+      </el-dropdown>
+      <!-- <el-button
+        type="warning"
+        plain
+        icon="el-icon-download"
+        size="mini"
+        style="margin-left: 15px"
+        @click="handleDownload()"
+        >(选择版本)导出二配打印表
+      </el-button> -->
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 250px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="260px"
+      >
+        <template slot-scope="scope">
+          <el-tooltip :content="scope.row.documentNumber" placement="top">
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.documentNumber
+            }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="version">
+              <el-select
+                v-model="form.version"
+                clearable
+                style="width: 180px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="二配对比信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <StockFisDiffReport
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></StockFisDiffReport>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import StockFisDiffReport from "./detail";
+import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "SecondaryActuralDiffReportHQ",
+  components: { Pagination, StockFisDiffReport },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "secondaryActuralDiffReport",
+      exportApi: "",
+      rules: {
+        //前端定义的规则，后端也有验证
+        version: [
+          { required: true, message: "必须选择版本！", trigger: "change" },
+        ],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "",
+        customerName: "",
+      },
+      versionValue: "",
+      versionList: [],
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      exportQuery: {
+        version: "",
+        customerCode: "",
+        customerName: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "年度",
+        prop: "year",
+        width: 75,
+      });
+      tempsTabs.push({
+        label: "期间",
+        prop: "period",
+        width: 75,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 85 });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 110 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 150 });
+      tempsTabs.push({ label: "状态", prop: "documentStatus", width: 55 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 250 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    //红旗：二配打印表
+    handleDownload() {
+      if (this.versionValue === "") {
+        this.$message.error("请先选择版本！");
+        return;
+      }
+      this.listLoading = true;
+      this.exportQuery.version = this.versionValue;
+      this.exportQuery.customerCode = "T51Z59";
+      this.exportQuery.customerName = "红旗轿车有限公司";
+      console.log("红旗二配打印表条件：" + JSON.stringify(this.exportQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/sec-act-diff-report/report/actual-adjust-sum/bt-list",
+          this.exportQuery
+        )
+        .then((res) => {
+          let zipName = res;
+          if (zipName.indexOf(" xlsx") != -1) {
+            //不成功，返回检验的excel
+            this.$axios
+              .BolbGets("/api/settleaccount/getblobfile/download/" + zipName)
+              .then((response) => {
+                if (zipName.indexOf("_") != -1) {
+                  let downName =
+                    zipName.slice(0, zipName.lastIndexOf("_")) +
+                    zipName.slice(zipName.lastIndexOf("."));
+                  downloadFile(response, downName);
+                  this.$notify({
+                    title: "成功",
+                    message: "数据-导出成功！",
+                    type: "success",
+                    duration: 2000,
+                  });
+                } else {
+                  downloadFile(response, zipName);
+                  this.$notify({
+                    title: "成功",
+                    message: "数据-导出成功！",
+                    type: "success",
+                    duration: 2000,
+                  });
+                }
+                this.listLoading = false;
+              });
+          } else if (zipName.indexOf("zip") != -1) {
+            //成功，返回zip压缩包
+            this.$axios
+              .BolbGets(
+                "/api/settleaccount/getblobBTzipfile/download/" + zipName
+              )
+              .then((response) => {
+                downloadFile(response, zipName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+
+                this.listLoading = false;
+              })
+              .catch((error) => {
+                this.listLoading = false;
+              });
+          }
+        })
+        .catch((error) => {
+          this.listLoading = false;
+        });
+    },
+    handleCommand(command) {
+      if (this.versionValue === "") {
+        this.$message.error("请先选择版本！");
+        return;
+      }
+      switch (command) {
+        // case "stand-assembly":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/export/excel/stand-assembly";
+        //   break;
+        // case "stand-detail":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/export/excel/stand-detail";
+        //   break;
+        // case "stand-sum":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/export/excel/stand-sum";
+        //   break;
+        case "actual-assembly":
+          this.exportApi =
+            "/api/settleaccount/sec-act-diff-report/export/excel/actual-assembly";
+          break;
+        case "actual-detail":
+          this.exportApi =
+            "/api/settleaccount/sec-act-diff-report/export/excel/actual-detail";
+          break;
+        case "actual-sum":
+          this.exportApi =
+            "/api/settleaccount/sec-act-diff-report/export/excel/actual-sum";
+          break;
+        // case "actual-adjust-sum":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/report/actual-adjust-sum";
+        //   break;
+        // case "actual-stand-diff":
+        //   this.exportApi =
+        //     "/api/settleaccount/sec-act-diff-report/report/actual-stand-diff";
+        //   break;
+        default:
+          //这里是没有找到对应的值处理
+          break;
+      }
+      this.listLoading = true;
+      this.exportQuery.version = this.versionValue;
+      this.exportQuery.customerCode = "T51Z59";
+      this.exportQuery.customerName = "红旗轿车有限公司";
+      console.log("二配对比条件：" + JSON.stringify(this.exportQuery));
+      this.$axios.posts(this.exportApi, this.exportQuery).then((res) => {
+        let fileNameOfProject = res;
+        this.$axios
+          .BolbGets(
+            "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+          )
+          .then((response) => {
+            if (fileNameOfProject.indexOf("_") != -1) {
+              let downName =
+                fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
+                fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+              downloadFile(response, downName);
+              this.$notify({
+                title: "成功",
+                message: "数据-导出成功！",
+                type: "success",
+                duration: 2000,
+              });
+            } else {
+              downloadFile(response, fileNameOfProject);
+              this.$notify({
+                title: "成功",
+                message: "数据-导出成功！",
+                type: "success",
+                duration: 2000,
+              });
+            }
+            this.listLoading = false;
+          });
+      });
+    },
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form = {};
+      this.dialogFormVisible = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          //insert添加
+          this.form.customerCode = "T51Z59";
+          this.form.customerName = "红旗轿车有限公司";
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts("/api/settleaccount/sec-act-diff-report/report", this.form)
+            .then((response) => {
+              this.formLoading = false;
+              this.$notify({
+                title: "成功",
+                message: "统计成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property == "beginTime" || column.property == "endTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.$axios
+        .posts("/api/settleaccount/sec-act-diff-report/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/sec-act-diff-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue b/code/WebApp/vue/src/views/ux/hq-out-data/specialUnConsign/detail.vue
similarity index 56%
rename from code/WebApp/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
rename to code/WebApp/vue/src/views/ux/hq-out-data/specialUnConsign/detail.vue
index 571affd4..bf9f345f 100644
--- a/code/WebApp/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
+++ b/code/WebApp/vue/src/views/ux/hq-out-data/specialUnConsign/detail.vue
@@ -1,42 +1,20 @@
-<!--FIS发运数据对比输出表-明细数据-->
+<!--红旗-标准看板发出未结算数据输出表-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
-      <!-- <el-button
+      <el-button
         class="filter-item"
         size="mini"
         type="info"
         icon="el-icon-download"
         @click="handleDownload()"
         >导出全部
-      </el-button> -->
-      <JobSelectVerson
-        :options="JobVersionList"
-        style="width: 150px; margin-left: -10px"
-        class="search-container"
-        @value-change="JobVersionValue"
-      ></JobSelectVerson>
-      <el-button
-        class="filter-item"
-        type="success"
-        icon="el-icon-check"
-        size="mini"
-        @click="handleCreateBills()"
-        >确认出库单(支持批量)</el-button
-      >
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-download"
-        @click="handleCancelBills()"
-        >取消出库(支持批量)
       </el-button>
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照零件号搜索..."
+        placeholder="按照物料号搜索..."
         style="width: 230px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -77,7 +55,7 @@
       @selection-change="handleSelectionChange"
       @row-click="handleRowClick"
     >
-      <el-table-column type="selection" width="44px"></el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
       <el-table-column
         v-for="(item, index) in getDefaultField"
         :key="index"
@@ -112,12 +90,21 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 import permission from "@/directive/permission/index.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import { downloadFile } from "@/utils/crmindex.js";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
 
 export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, CRMTableHead, JobSelectVerson },
+  name: "SpecialUnConsign",
+  components: { Pagination, CRMTableHead },
   directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
   props: {
     customerInfos: {
       type: Array,
@@ -128,7 +115,7 @@ export default {
   },
   data() {
     return {
-      crmType: "kanbanOutOrder",
+      crmType: "specialUnConsign",
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -138,7 +125,6 @@ export default {
       searchContent: "", // 输入内容
       customerInfo: {
         parentId: "",
-        version: "",
       },
       form: {
         dicDetailID: "",
@@ -149,13 +135,6 @@ export default {
       totalCount: 0,
       listLoading: true,
       formLoading: false,
-      JobVersionList: [
-        { value: "0", label: "未处理" },
-        { value: "1", label: "申请出库" },
-        { value: "2", label: "确认出库" },
-        { value: "3", label: "不能出库" },
-        { value: "4", label: "取消出库" },
-      ],
       // 高级搜索
       filterObj: {
         type: Object,
@@ -172,24 +151,18 @@ export default {
             value: "true",
           }, //默认查询可用的
         ],
+        //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        billNum: "",
-      },
-      listOutPutQuery: {
-        version: "",
-        guids: "",
-        billNum: "",
+        ParentId: "",
       },
       page: 1,
-      JobversionValue: "",
-      JobversionValueVerson: "",
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 230,
+      tableHeight: document.documentElement.clientHeight - 260,
       isEdit: false,
     };
   },
@@ -211,7 +184,6 @@ export default {
         } else {
           newVal.forEach((element) => {
             this.customerInfo.parentId = element.ParentId;
-            this.customerInfo.version = element.Version;
           });
           if (this.customerInfo.parentId != "") {
             this.getList();
@@ -225,190 +197,37 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
+      tempsTabs.push({
+        label: "期间",
+        prop: "needQty",
+        width: 100,
+      });
+      tempsTabs.push({
+        label: "客户代码",
+        prop: "materialCode",
+        width: 150,
+      });
       tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 110,
+        label: "订货看板编号",
+        prop: "materialCode",
+        width: 150,
       });
       tempsTabs.push({
-        label: "零件号",
+        label: "物料号",
         prop: "materialCode",
         width: 150,
       });
-      tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 });
-      tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 });
-      tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 100 });
-      tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
+      tempsTabs.push({
+        label: "数量",
+        prop: "needQty",
+        width: 100,
+      });
       tempsTabs.push({ label: "状态", prop: "state", width: 100 });
       return tempsTabs;
     },
   },
   methods: {
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.listQuery.Filters = [];
-      var column = "state";
-      let filter = {
-        logic: 0,
-        column: column,
-        action: 0,
-        value: params.value,
-      };
-      this.listQuery.Filters.push(filter);
-      this.getList();
-    },
-    //取消出库单
-    handleCancelBills(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.listOutPutQuery.version = this.customerInfo.version;
-      this.listOutPutQuery.guids = params;
-      this.listOutPutQuery.billNum = this.customerInfo.parentId;
-      console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
-
-      this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts(
-              "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel",
-              this.listOutPutQuery
-            )
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "操作成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    //出库单
-    handleCreateBills(row) {
-      if (this.multipleSelection.length == 0) {
-        this.listLoading = true;
-        this.listOutPutQuery.guids = [];
-        this.listOutPutQuery.version = this.customerInfo.version;
-        this.listOutPutQuery.billNum = this.customerInfo.parentId;
-        console.log(
-          "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
-        );
-        this.$confirm("是否全部确认出库?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.$axios
-              .posts(
-                "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Pass",
-                this.listOutPutQuery
-              )
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.$notify({
-                  title: "成功",
-                  message: "生成成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getList();
-                this.listLoading = false;
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消操作",
-            });
-            this.listLoading = false;
-          });
-      } else {
-        this.listLoading = true;
-        var params = [];
-        let myalert = ""; //声明变量，其变量必须在此声明后使用
-        if (row) {
-          //单行
-          params.push(row.id);
-          myalert = row.name;
-        } else {
-          //多选
-          this.multipleSelection.forEach((element) => {
-            let id = element.id;
-            params.push(id);
-          });
-          myalert = "选中项";
-        }
-        this.listOutPutQuery.version = this.customerInfo.version;
-        this.listOutPutQuery.guids = params;
-        this.listOutPutQuery.billNum = this.customerInfo.parentId;
-        console.log(
-          "部分选择时确认出库条件：" + JSON.stringify(this.listOutPutQuery)
-        );
-        this.$confirm("是否确认将选中的出库" + myalert + "?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.$axios
-              .posts(
-                "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Pass",
-                this.listOutPutQuery
-              )
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.$notify({
-                  title: "成功",
-                  message: "生成成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getList();
-                this.listLoading = false;
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消操作",
-            });
-            this.listLoading = false;
-          });
-      }
-    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {
@@ -417,15 +236,6 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property == "state") {
-        return {
-          0: "未处理",
-          1: "申请出库",
-          2: "确认出库",
-          3: "不能出库",
-          4: "取消出库",
-        }[row[column.property]];
-      }
       return row[column.property] || "--";
     },
     importExcelData() {
@@ -438,7 +248,7 @@ export default {
       this.listLoading = true;
       this.$axios
         .gets(
-          "/api/settleaccount/bt-kb-not-consign/export/" +
+          "/api/settleaccount/stock-fis-report/export/" +
             this.customerInfo.parentId
         )
         .then((res) => {
@@ -477,16 +287,17 @@ export default {
     },
     getList(data) {
       this.listLoading = true;
-      if (data != undefined) {
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
         this.listQuery.SkipCount = (this.page - 1) * data.limit;
       } else {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
-      this.listQuery.billNum = this.customerInfo.parentId;
-      console.log("查询条件：" + JSON.stringify(this.listQuery));
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("hq结算：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
-          "/api/settleaccount/wmskanbanoutput/WmsKanbanDetailList",
+          "/api/settleaccount/stock-fis-report/details/byfilter",
           this.listQuery
         )
         .then((response) => {
@@ -502,13 +313,21 @@ export default {
           this.listLoading = false;
         });
     },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-fis-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
     /** 筛选操作 */
     handleFilter() {
       this.page = 1;
       this.getList();
       this.listQuery.Filters = [];
       if (this.searchContent != "") {
-        var column = "materialCode";
+        var column = "itemCode";
         let filter = {
           logic: 0,
           column: column,
@@ -612,3 +431,4 @@ export default {
 @import "../../styles/crmtable.scss";
 </style>
 
+
diff --git a/code/WebApp/vue/src/views/ux/hq-out-data/specialUnConsign/index.vue b/code/WebApp/vue/src/views/ux/hq-out-data/specialUnConsign/index.vue
new file mode 100644
index 00000000..818cde7a
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/hq-out-data/specialUnConsign/index.vue
@@ -0,0 +1,557 @@
+<!--红旗-特殊看板-发出未结算-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计（自动生成Excel）
+      </el-button>
+      <!-- <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照单据流水号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button> -->
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="250px"
+      >
+        <template slot-scope="scope">
+          <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+            scope.row.documentNumber
+          }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="开始时间：" />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="beginTime">
+              <el-date-picker
+                v-model="form.beginTime"
+                type="datetime"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="结束时间：" />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="endTime">
+              <el-date-picker
+                v-model="form.endTime"
+                type="datetime"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="24" :xs="24">
+            <div
+              class="sections__tips"
+              style="margin-left: 80px; color: #ff4d4d"
+            >
+              备注：日期不选择的话，将默认最小日期和最大日期！
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <Detail
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></Detail>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import Detail from "./detail";
+import moment from "moment";
+import { formatTimeToTimestamp } from "@/utils/index";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, Detail },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "sendUnsettledDiffReport",
+      rules: {
+        // version: [{ required: true, message: "必须输入！", trigger: "change" }],
+        // beginTime: [{ required: true, message: "选择日期！", trigger: "change" }],
+        // endTime: [{ required: true, message: "选择日期！", trigger: "change" }],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "",
+        customerName: "",
+        beginTime: "",
+        endTime: "",
+      },
+      versionValue: "",
+      versionList: [],
+      startTimeVale: "",
+      endTimeVale: "",
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    //this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "统计时间起",
+        prop: "beginTime",
+        width: 120,
+        formType: "datetime",
+      });
+      tempsTabs.push({
+        label: "统计时间止",
+        prop: "endTime",
+        width: 120,
+        formType: "datetime",
+      });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 110 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          // if (this.form.beginTime && this.form.endTime) {
+          //   if (
+          //     formatTimeToTimestamp(this.form.beginTime) >=
+          //     formatTimeToTimestamp(this.form.endTime)
+          //   ) {
+          //     this.$message.error("开始时间必须小于结束时间!");
+          //     return false;
+          //   }
+          // }
+          this.formLoading = true;
+          //以下两个值暂时写成固定值
+          //this.form.customerCode = "T51Z59";
+          this.form.customerName = "一汽红旗有限公司";
+          console.log(
+            "红旗-特殊-发出未结算保存条件：" + JSON.stringify(this.form)
+          );
+          this.$axios
+            .posts("/api/settleaccount/hqsp-kb-not-consign/report", this.form)
+            .then((response) => {
+              this.formLoading = false;
+              this.$notify({
+                title: "成功",
+                message: "统计成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.dialogFormVisible = false;
+              //this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .then((response) => {
+          this.versionList = [];
+          response.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      // this.formTitle = "报表统计";
+      // this.isEdit = false;
+      // this.form = {};
+      // this.dialogFormVisible = true;
+      this.$axios
+        .posts("/api/settleaccount/hqsp-kb-not-consign/report", this.form)
+        .then((response) => {
+          this.formLoading = false;
+          let fileNameOfProject = response;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            })
+            .catch((error) => {
+              this.listLoading = false;
+            });
+        })
+        .catch(() => {
+          this.formLoading = false;
+        });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      //this.getList();
+    },
+    getList() {
+      this.listLoading = false;
+      // this.listLoading = true;
+      // this.listQuery.SkipCount = (this.page - 1) * 10;
+      // this.$axios
+      //   .posts("/api/settleaccount/hqsp-kb-not-consign/list", this.listQuery)
+      //   .then((response) => {
+      //     this.list = response.items;
+      //     //alert(JSON.stringify(response.Items))
+      //     this.totalCount = response.totalCount;
+      //     setTimeout(() => {
+      //       //大数据量加载时
+      //       this.listLoading = false;
+      //     }, 500);
+      //   })
+      //   .catch(() => {
+      //     this.listLoading = false;
+      //   });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/hqsp-kb-not-consign/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      //this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "documentNumber";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      //this.getList();
+    },
+    resetQuery() {},
+    handleDelete(row) {
+      //批量删除
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+        myalert = "选中项";
+      }
+      this.$confirm("是否删除" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/settleaccount/hqsp-kb-not-consign/delete", params)
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000,
+              });
+              //this.getList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/code/WebApp/vue/src/views/ux/hq-out-data/standardUnConsign/detail.vue
similarity index 56%
rename from code/WebApp/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
rename to code/WebApp/vue/src/views/ux/hq-out-data/standardUnConsign/detail.vue
index 2fe0925e..fbd77f1f 100644
--- a/code/WebApp/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
+++ b/code/WebApp/vue/src/views/ux/hq-out-data/standardUnConsign/detail.vue
@@ -1,42 +1,21 @@
-<!--FIS发运数据对比输出表-明细数据-->
+<!--红旗-标准看板发出未结算数据输出表-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
-      <!-- <el-button
+
+      <el-button
         class="filter-item"
         size="mini"
         type="info"
         icon="el-icon-download"
         @click="handleDownload()"
         >导出全部
-      </el-button> -->
-      <JobSelectVerson
-        :options="JobVersionList"
-        style="width: 150px; margin-left: -10px"
-        class="search-container"
-        @value-change="JobVersionValue"
-      ></JobSelectVerson>
-      <el-button
-        class="filter-item"
-        type="success"
-        icon="el-icon-check"
-        size="mini"
-        @click="handleCreateBills()"
-        >确认出库单(支持批量)</el-button
-      >
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-download"
-        @click="handleCancelBills()"
-        >取消出库(支持批量)
       </el-button>
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照零件号搜索..."
+        placeholder="按照物料号搜索..."
         style="width: 230px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -77,7 +56,7 @@
       @selection-change="handleSelectionChange"
       @row-click="handleRowClick"
     >
-      <el-table-column type="selection" width="44px"></el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
       <el-table-column
         v-for="(item, index) in getDefaultField"
         :key="index"
@@ -112,12 +91,21 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 import permission from "@/directive/permission/index.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import { downloadFile } from "@/utils/crmindex.js";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
 
 export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, CRMTableHead, JobSelectVerson },
+  name: "StandardUnConsign",
+  components: { Pagination, CRMTableHead },
   directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
   props: {
     customerInfos: {
       type: Array,
@@ -128,7 +116,7 @@ export default {
   },
   data() {
     return {
-      crmType: "sparepartOutOrder",
+      crmType: "standardUnConsign",
       rules: {
         //前端定义的规则，后端也有验证
         erpMaterialCode: [
@@ -138,7 +126,6 @@ export default {
       searchContent: "", // 输入内容
       customerInfo: {
         parentId: "",
-        version: "",
       },
       form: {
         dicDetailID: "",
@@ -149,13 +136,6 @@ export default {
       totalCount: 0,
       listLoading: true,
       formLoading: false,
-      JobVersionList: [
-        { value: "0", label: "未处理" },
-        { value: "1", label: "申请出库" },
-        { value: "2", label: "确认出库" },
-        { value: "3", label: "不能出库" },
-        { value: "4", label: "取消出库" },
-      ],
       // 高级搜索
       filterObj: {
         type: Object,
@@ -172,24 +152,18 @@ export default {
             value: "true",
           }, //默认查询可用的
         ],
+        //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        billNum: "",
-      },
-      listOutPutQuery: {
-        version: "",
-        guids: "",
-        billNum: "",
+        ParentId: "",
       },
       page: 1,
-      JobversionValue: "",
-      JobversionValueVerson: "",
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 230,
+      tableHeight: document.documentElement.clientHeight - 260,
       isEdit: false,
     };
   },
@@ -211,7 +185,6 @@ export default {
         } else {
           newVal.forEach((element) => {
             this.customerInfo.parentId = element.ParentId;
-            this.customerInfo.version = element.Version;
           });
           if (this.customerInfo.parentId != "") {
             this.getList();
@@ -223,192 +196,39 @@ export default {
   },
   computed: {
     /** 列表字段 */
-    getDefaultField() {
+     getDefaultField() {
       var tempsTabs = [];
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
       tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 110,
+        label: "期间",
+        prop: "materialCode",
+        width: 150,
       });
       tempsTabs.push({
-        label: "零件号",
-        prop: "materialCode",
+        label: "客户代码",
+        prop: "needQty",
+        width: 100,
+      });
+      tempsTabs.push({
+        label: "底盘号",
+        prop: "orderKBCode",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "物料号",
+        prop: "orderKBCode",
         width: 150,
       });
-      tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 });
-      tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 });
-      tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 100 });
-      tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
+      tempsTabs.push({
+        label: "数量",
+        prop: "orderKBCode",
+        width: 100,
+      });
       tempsTabs.push({ label: "状态", prop: "state", width: 100 });
       return tempsTabs;
     },
   },
   methods: {
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.listQuery.Filters = [];
-      var column = "state";
-      let filter = {
-        logic: 0,
-        column: column,
-        action: 0,
-        value: params.value,
-      };
-      this.listQuery.Filters.push(filter);
-      this.getList();
-    },
-    //取消出库单
-    handleCancelBills(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.listOutPutQuery.version = this.customerInfo.version;
-      this.listOutPutQuery.guids = params;
-      this.listOutPutQuery.billNum = this.customerInfo.parentId;
-      console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
-
-      this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts(
-              "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut-Cancel",
-              this.listOutPutQuery
-            )
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "操作成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    //出库单
-    handleCreateBills(row) {
-      if (this.multipleSelection.length == 0) {
-        this.listLoading = true;
-        this.listOutPutQuery.guids = [];
-        this.listOutPutQuery.version = this.customerInfo.version;
-        this.listOutPutQuery.billNum = this.customerInfo.parentId;
-        console.log(
-          "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
-        );
-        this.$confirm("是否全部确认出库?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.$axios
-              .posts(
-                "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut-Pass",
-                this.listOutPutQuery
-              )
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.$notify({
-                  title: "成功",
-                  message: "生成成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getList();
-                this.listLoading = false;
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消操作",
-            });
-            this.listLoading = false;
-          });
-      } else {
-        this.listLoading = true;
-        var params = [];
-        let myalert = ""; //声明变量，其变量必须在此声明后使用
-        if (row) {
-          //单行
-          params.push(row.id);
-          myalert = row.name;
-        } else {
-          //多选
-          this.multipleSelection.forEach((element) => {
-            let id = element.id;
-            params.push(id);
-          });
-          myalert = "选中项";
-        }
-        this.listOutPutQuery.version = this.customerInfo.version;
-        this.listOutPutQuery.guids = params;
-        this.listOutPutQuery.billNum = this.customerInfo.parentId;
-        console.log(
-          "部分选择时确认出库条件：" + JSON.stringify(this.listOutPutQuery)
-        );
-        this.$confirm("是否确认将选中的出库" + myalert + "?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.$axios
-              .posts(
-                "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass",
-                this.listOutPutQuery
-              )
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.$notify({
-                  title: "成功",
-                  message: "生成成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getList();
-                this.listLoading = false;
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消操作",
-            });
-            this.listLoading = false;
-          });
-      }
-    },
     /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {
@@ -417,15 +237,6 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property == "state") {
-        return {
-          0: "未处理",
-          1: "申请出库",
-          2: "确认出库",
-          3: "不能出库",
-          4: "取消出库",
-        }[row[column.property]];
-      }
       return row[column.property] || "--";
     },
     importExcelData() {
@@ -438,7 +249,7 @@ export default {
       this.listLoading = true;
       this.$axios
         .gets(
-          "/api/settleaccount/bt-kb-not-consign/export/" +
+          "/api/settleaccount/stock-fis-report/export/" +
             this.customerInfo.parentId
         )
         .then((res) => {
@@ -477,16 +288,17 @@ export default {
     },
     getList(data) {
       this.listLoading = true;
-      if (data != undefined) {
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
         this.listQuery.SkipCount = (this.page - 1) * data.limit;
       } else {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
-      this.listQuery.billNum = this.customerInfo.parentId;
-      console.log("查询条件：" + JSON.stringify(this.listQuery));
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("hq结算：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
-          "/api/settleaccount/wmsjitoutput/WmsJitDetailList",
+          "/api/settleaccount/stock-fis-report/details/byfilter",
           this.listQuery
         )
         .then((response) => {
@@ -502,13 +314,21 @@ export default {
           this.listLoading = false;
         });
     },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-fis-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
     /** 筛选操作 */
     handleFilter() {
       this.page = 1;
       this.getList();
       this.listQuery.Filters = [];
       if (this.searchContent != "") {
-        var column = "materialCode";
+        var column = "itemCode";
         let filter = {
           logic: 0,
           column: column,
@@ -612,3 +432,4 @@ export default {
 @import "../../styles/crmtable.scss";
 </style>
 
+
diff --git a/code/WebApp/vue/src/views/ux/hq-out-data/standardUnConsign/index.vue b/code/WebApp/vue/src/views/ux/hq-out-data/standardUnConsign/index.vue
new file mode 100644
index 00000000..7aaad017
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/hq-out-data/standardUnConsign/index.vue
@@ -0,0 +1,560 @@
+<!--红旗看板-发出未结算-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计（自动生成Excel）
+      </el-button>
+      <!-- <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照单据流水号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button> -->
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="250px"
+      >
+        <template slot-scope="scope">
+          <el-tooltip
+            :content="scope.row.documentNumber"
+            placement="bottom-end"
+          >
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.documentNumber
+            }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="开始时间：" />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="beginTime">
+              <el-date-picker
+                v-model="form.beginTime"
+                type="datetime"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="结束时间：" />
+          </el-col>
+          <el-col :md="8" :xs="24">
+            <el-form-item prop="endTime">
+              <el-date-picker
+                v-model="form.endTime"
+                type="datetime"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="24" :xs="24">
+            <div
+              class="sections__tips"
+              style="margin-left: 80px; color: #ff4d4d"
+            >
+              备注：日期不选择的话，将默认最小日期和最大日期！
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <Detail
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></Detail>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import Detail from "./detail";
+import moment from "moment";
+import { formatTimeToTimestamp } from "@/utils/index";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, Detail },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "sendUnsettledDiffReport",
+      rules: {
+        // version: [{ required: true, message: "必须输入！", trigger: "change" }],
+        // beginTime: [{ required: true, message: "选择日期！", trigger: "change" }],
+        // endTime: [{ required: true, message: "选择日期！", trigger: "change" }],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "",
+        customerName: "",
+        beginTime: "",
+        endTime: "",
+      },
+      versionValue: "",
+      versionList: [],
+      startTimeVale: "",
+      endTimeVale: "",
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    //this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "统计时间起",
+        prop: "beginTime",
+        width: 120,
+        formType: "datetime",
+      });
+      tempsTabs.push({
+        label: "统计时间止",
+        prop: "endTime",
+        width: 120,
+        formType: "datetime",
+      });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 110 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          // if (this.form.beginTime && this.form.endTime) {
+          //   if (
+          //     formatTimeToTimestamp(this.form.beginTime) >=
+          //     formatTimeToTimestamp(this.form.endTime)
+          //   ) {
+          //     this.$message.error("开始时间必须小于结束时间!");
+          //     return false;
+          //   }
+          // }
+          this.formLoading = true;
+          //以下两个值暂时写成固定值
+          //this.form.customerCode = "T51Z59";
+          this.form.customerName = "一汽红旗有限公司";
+          console.log("红旗-标准-发出未结算保存条件：" + JSON.stringify(this.form));
+          this.$axios
+            .posts("/api/settleaccount/hq-kb-not-consign/report", this.form)
+            .then((response) => {
+              this.formLoading = false;
+              this.$notify({
+                title: "成功",
+                message: "统计成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.dialogFormVisible = false;
+              //this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .then((response) => {
+          this.versionList = [];
+          response.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      // this.formTitle = "报表统计";
+      // this.isEdit = false;
+      // this.form = {};
+      // this.dialogFormVisible = true;
+      this.$axios
+        .posts("/api/settleaccount/hq-kb-not-consign/report", this.form)
+        .then((response) => {
+          this.formLoading = false;
+          let fileNameOfProject = response;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            })
+            .catch((error) => {
+              this.listLoading = false;
+            });
+        })
+        .catch(() => {
+          this.formLoading = false;
+        });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      //this.getList();
+    },
+    getList() {
+       this.listLoading = false;
+      // this.listLoading = true;
+      // this.listQuery.SkipCount = (this.page - 1) * 10;
+      // this.$axios
+      //   .posts("/api/settleaccount/hq-kb-not-consign/list", this.listQuery)
+      //   .then((response) => {
+      //     this.list = response.items;
+      //     //alert(JSON.stringify(response.Items))
+      //     this.totalCount = response.totalCount;
+      //     setTimeout(() => {
+      //       //大数据量加载时
+      //       this.listLoading = false;
+      //     }, 500);
+      //   })
+      //   .catch(() => {
+      //     this.listLoading = false;
+      //   });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/hq-kb-not-consign/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      //this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "documentNumber";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      //this.getList();
+    },
+    resetQuery() {},
+    handleDelete(row) {
+      //批量删除
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+        myalert = "选中项";
+      }
+      this.$confirm("是否删除" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/settleaccount/hq-kb-not-consign/delete", params)
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000,
+              });
+              //this.getList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/hq-out-data/stockFisDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/hq-out-data/stockFisDiffReport/detail.vue
new file mode 100644
index 00000000..10de36d4
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/hq-out-data/stockFisDiffReport/detail.vue
@@ -0,0 +1,417 @@
+<!--红旗-看板发运对比-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出全部
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照物料号搜索..."
+        style="width: 230px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, CRMTableHead },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "stockFisDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "期间",
+        prop: "documentNumber",
+        width: 100,
+      });
+      tempsTabs.push({ label: "客户代码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "看板物料号", prop: "itemCode", width: 160 });
+
+      tempsTabs.push({ label: "看板数量", prop: "fisQty", width: 80 });
+      tempsTabs.push({ label: "入库数量", prop: "stockQty", width: 100 });
+      tempsTabs.push({ label: "差异", prop: "diffQty", width: 80 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    async handleDownload() {
+      //await this.getDownBoms();
+      this.listLoading = true;
+      this.$axios
+        .gets(
+          "/api/settleaccount/stock-fis-report/export/" +
+            this.customerInfo.parentId
+        )
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("红旗-看板发运对比：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/stock-fis-report/details/byfilter",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-fis-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "itemCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/hq-out-data/stockFisDiffReport/index.vue b/code/WebApp/vue/src/views/ux/hq-out-data/stockFisDiffReport/index.vue
new file mode 100644
index 00000000..dfe03084
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/hq-out-data/stockFisDiffReport/index.vue
@@ -0,0 +1,504 @@
+<!--红旗-看板发运对比-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="260px"
+      >
+        <template slot-scope="scope">
+          <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+            scope.row.documentNumber
+          }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="version">
+              <el-select
+                v-model="form.version"
+                filterable
+                clearable
+                style="width: 188px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="详细信息页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <StockFisDiffReport
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></StockFisDiffReport>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import StockFisDiffReport from "./detail";
+import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, StockFisDiffReport },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "sendUnsettledDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        version: [
+          { required: true, message: "必须选择版本！", trigger: "change" },
+        ],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "",
+        customerName: "一汽红旗有限公司",
+      },
+      versionValue: "",
+      versionList: [],
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "年度",
+        prop: "year",
+        width: 70,
+      });
+      tempsTabs.push({
+        label: "期间",
+        prop: "period",
+        width: 70,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 120 });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form.version = "";
+      this.dialogFormVisible = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts("/api/settleaccount/stock-fis-report/report/hq", this.form)
+            .then((res) => {
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              // this.formLoading = false;
+              // this.$notify({
+              //   title: "成功",
+              //   message: "统计成功！",
+              //   type: "success",
+              //   duration: 2000,
+              // });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+
+      let customfilter = {
+        logic: 0,
+        column: "CustomCode",
+        action: 0,
+        value: this.form.customerCode,
+      };
+      this.listQuery.Filters.push(customfilter);
+
+      this.$axios
+        .posts("/api/settleaccount/stock-fis-report/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-fis-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+
+      let customfilter = {
+        logic: 0,
+        column: "CustomCode",
+        action: 0,
+        value: this.form.customerCode,
+      };
+      this.listQuery.Filters.push(customfilter);
+
+      if (this.searchContent != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/hq-out-data/stockSettledDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/hq-out-data/stockSettledDiffReport/detail.vue
new file mode 100644
index 00000000..e8f12e00
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/hq-out-data/stockSettledDiffReport/detail.vue
@@ -0,0 +1,425 @@
+<!--红旗-结算数据对比输出表-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出全部
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照客户物料号搜索..."
+        style="width: 230px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "StockSettledDiffReport",
+  components: { Pagination, CRMTableHead },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "stockSettledDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "期间",
+        prop: "documentNumber",
+        width: 100,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 80 });
+      tempsTabs.push({ label: "客户代码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "结算物料号", prop: "itemCode", width: 150 });
+      tempsTabs.push({
+        label: "结算看板数量",
+        prop: "r3SettledQty",
+        width: 65,
+      });
+      tempsTabs.push({
+        label: "出库数量",
+        prop: "stockQty",
+        width: 110,
+      });
+      tempsTabs.push({ label: "差异", prop: "diffQty", width: 50 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    async handleDownload() {
+      //await this.getDownBoms();
+      this.listLoading = true;
+      this.$axios
+        .gets(
+          "/api/settleaccount/stock-settled-report/export/" +
+            this.customerInfo.parentId
+        )
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("红旗-结算数据对比输出表：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/stock-settled-report/details/byfilter",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-settled-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "itemCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "r3SettledQty" ||
+        column.property === "stockQty" ||
+        column.property === "diffQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "r3SettledQty" ||
+        column.property === "stockQty" ||
+        column.property === "diffQty"
+      ) {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/hq-out-data/stockSettledDiffReport/index.vue b/code/WebApp/vue/src/views/ux/hq-out-data/stockSettledDiffReport/index.vue
new file mode 100644
index 00000000..711e2634
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/hq-out-data/stockSettledDiffReport/index.vue
@@ -0,0 +1,499 @@
+<!--红旗-数据对比输出表-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="260px"
+      >
+        <template slot-scope="scope">
+          <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+            scope.row.documentNumber
+          }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="version">
+              <el-select
+                v-model="form.version"
+                filterable
+                clearable
+                style="width: 188px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="R3信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <SendUnsettledDiffReport
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></SendUnsettledDiffReport>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import SendUnsettledDiffReport from "./detail";
+import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, SendUnsettledDiffReport },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "sendUnsettledDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        version: [
+          { required: true, message: "必须选择版本！", trigger: "change" },
+        ],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "",
+        customerName: "一汽红旗有限公司",
+      },
+      versionValue: "",
+      versionList: [],
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "年度",
+        prop: "year",
+        width: 70,
+      });
+      tempsTabs.push({
+        label: "期间",
+        prop: "period",
+        width: 70,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 120 });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form.version = "";
+      this.dialogFormVisible = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts(
+              "/api/settleaccount/stock-settled-report/report/hq",
+              this.form
+            )
+            .then((res) => {
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              // this.formLoading = false;
+              // this.$notify({
+              //   title: "成功",
+              //   message: "统计成功！",
+              //   type: "success",
+              //   duration: 2000,
+              // });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+
+      let customfilter = {
+        logic: 0,
+        column: "CustomCode",
+        action: 0,
+        value: this.form.customerCode,
+      };
+      this.listQuery.Filters.push(customfilter);
+
+      this.$axios
+        .posts("/api/settleaccount/stock-settled-report/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-settled-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/hq-out-data/stockUnsettledDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/hq-out-data/stockUnsettledDiffReport/detail.vue
new file mode 100644
index 00000000..31c10945
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/hq-out-data/stockUnsettledDiffReport/detail.vue
@@ -0,0 +1,420 @@
+<!--红旗-看板未结数量与期末库存对比输出表-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出全部
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照客户物料号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "StockUnsettledDiffReport",
+  components: { Pagination, CRMTableHead },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "stockUnsettledDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "期间",
+        prop: "documentNumber",
+        width: 80,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
+      tempsTabs.push({ label: "客户代码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户物料号", prop: "itemCode", width: 120 });
+      tempsTabs.push({ label: "物料号描述", prop: "itemDesc", width: 250 });
+      tempsTabs.push({
+        label: "看板未结数量",
+        prop: "fisUnSettledQty",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "客户库位期末库存数量",
+        prop: "stockQty",
+        width: 250,
+      });
+      tempsTabs.push({ label: "差异", prop: "diffQty", width: 100 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    async handleDownload() {
+      this.listLoading = true;
+      this.$axios
+        .gets(
+          "/api/settleaccount/stock-unsettled-report/export/" +
+            this.customerInfo.parentId
+        )
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              let downName =
+                fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
+                fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+              downloadFile(response, downName);
+              this.$notify({
+                title: "成功",
+                message: "FIS未结数量与期末库存对比输出表-下载成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.listLoading = false;
+            });
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("fis结算：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/stock-unsettled-report/details/byfilter",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-unsettled-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "itemCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisUnSettledQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisUnSettledQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/hq-out-data/stockUnsettledDiffReport/index.vue b/code/WebApp/vue/src/views/ux/hq-out-data/stockUnsettledDiffReport/index.vue
new file mode 100644
index 00000000..f61cbddf
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/hq-out-data/stockUnsettledDiffReport/index.vue
@@ -0,0 +1,504 @@
+<!--红旗-看板未结数量与期末库存对比输出表-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照版本号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <el-table-column
+        label="单据流水号"
+        prop="documentNumber"
+        sortable="custom"
+        align="center"
+        width="260px"
+      >
+        <template slot-scope="scope">
+          <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+            scope.row.documentNumber
+          }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="version">
+              <el-select
+                v-model="form.version"
+                filterable
+                clearable
+                style="width: 188px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <StockFisDiffReport
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></StockFisDiffReport>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import StockFisDiffReport from "./detail";
+import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, StockFisDiffReport },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      crmType: "sendUnsettledDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        version: [
+          { required: true, message: "必须选择版本！", trigger: "change" },
+        ],
+      },
+      customerInfos: [],
+      searchContent: "", // 输入内容
+      drawer: false,
+      form: {
+        version: "",
+        customerCode: "",
+        customerName: "一汽红旗有限公司",
+      },
+      versionValue: "",
+      versionList: [],
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+    this.getVersionInfo();
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "年度",
+        prop: "year",
+        width: 70,
+      });
+      tempsTabs.push({
+        label: "期间",
+        prop: "period",
+        width: 70,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 120 });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.version;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form.version = "";
+      this.dialogFormVisible = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts(
+              "/api/settleaccount/stock-unsettled-report/report/hq",
+              this.form
+            )
+            .then((res) => {
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              // this.formLoading = false;
+              // this.$notify({
+              //   title: "成功",
+              //   message: "统计成功！",
+              //   type: "success",
+              //   duration: 2000,
+              // });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      if (column.property == "documentStatus") {
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+          row[column.property]
+        ];
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.Filters = [];
+
+      let customfilter = {
+        logic: 0,
+        column: "CustomCode",
+        action: 0,
+        value: this.form.customerCode,
+      };
+      this.listQuery.Filters.push(customfilter);
+
+      this.$axios
+        .posts("/api/settleaccount/stock-unsettled-report/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/stock-unsettled-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+
+      let customfilter = {
+        logic: 0,
+        column: "CustomCode",
+        action: 0,
+        value: this.form.customerCode,
+      };
+      this.listQuery.Filters.push(customfilter);
+
+      if (this.searchContent != "") {
+        var column = "version";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/basedata/index.vue b/code/WebApp/vue/src/views/ux/hqdata/index.vue
similarity index 100%
rename from code/WebApp/vue/src/views/ux/basedata/index.vue
rename to code/WebApp/vue/src/views/ux/hqdata/index.vue
diff --git a/code/WebApp/vue/src/views/ux/billManage/index.vue b/code/WebApp/vue/src/views/ux/hqdata/jiesuan/index.vue
similarity index 100%
rename from code/WebApp/vue/src/views/ux/billManage/index.vue
rename to code/WebApp/vue/src/views/ux/hqdata/jiesuan/index.vue
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/r3-open/index.vue b/code/WebApp/vue/src/views/ux/hqdata/jiesuan/specialConsign/index.vue
similarity index 57%
rename from code/WebApp/vue/src/views/ux/vw/dataInput/r3-open/index.vue
rename to code/WebApp/vue/src/views/ux/hqdata/jiesuan/specialConsign/index.vue
index d246d7a1..fb74374a 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/r3-open/index.vue
+++ b/code/WebApp/vue/src/views/ux/hqdata/jiesuan/specialConsign/index.vue
@@ -1,10 +1,27 @@
-<!--R3未结数据-->
+<!--红旗-特殊结算数据输入表-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
+      <!-- <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select> -->
+
       <XhJSSelect
         :options="versionList"
-        style="width: 150px; margin-left: -10px"
+        style="width: 200px"
         class="search-container"
         @value-change="selectValue"
       ></XhJSSelect>
@@ -14,23 +31,23 @@
         type="warning"
         icon="el-icon-upload2"
         @click="handleImportExcel()"
-        >导入文件（Excel）
+        >导入Excel
       </el-button>
-
-      <el-button
+      <!-- <el-button
         class="filter-item"
         size="mini"
-        type="primary"
+        type="info"
         icon="el-icon-download"
         @click="handleDownload()"
-        >导出Csv
-      </el-button>
+        >导出Excel
+      </el-button> -->
+
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照零件号搜索..."
-        style="width: 180px"
+        placeholder="按照物料号搜索..."
+        style="width: 250px"
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
@@ -49,7 +66,20 @@
         @filter="handleFilters"
       >
       </c-r-m-table-head>
-      <!-- <div class="right-container" style="margin-left: 180px">
+      <el-dropdown size="small" class="filter-item" @command="handleCommand">
+        <span class="el-dropdown-link">
+          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="excel" icon="el-icon-plus"
+            >导出Excel</el-dropdown-item
+          >
+          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
+            >导出Csv</el-dropdown-item
+          >
+        </el-dropdown-menu>
+      </el-dropdown>
+      <div class="right-container" style="margin-left: 240px">
         <el-dropdown
           v-if="MoreTypes.length > 0"
           trigger="click"
@@ -68,59 +98,46 @@
             >
           </el-dropdown-menu>
         </el-dropdown>
-      </div>-->
+      </div>
     </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
+    <div class="l-table">
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeight"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
       >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
 
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@@ -143,70 +160,46 @@
 </template>
 
 <script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import Pagination from "@/components/Pagination";
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-vw";
 import CRMTableHead from "../../../components/CRMTableHead";
-import moment from "moment";
+import importExcel from "@/components/ImportExcel-hq";
 import Lockr from "lockr";
 import { downloadFile } from "@/utils/crmindex.js";
+import moment from "moment";
 import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
-import XhJSSelectVerson from "@/components/CreateCom/Xh-JS-Select-Label.vue";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
 
 export default {
-  name: "UnSettleAccount",
-  components: {
-    Pagination,
-    CRMTableHead,
-    importExcel,
-    XhJSSelect,
-    XhJSSelectVerson,
-  },
+  name: "SpecialConsign",
+  components: { Pagination, CRMTableHead, importExcel ,XhJSSelect},
   directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
   data() {
     return {
-      crmType: "unSettleAccount",
+      crmType: "specialConsign",
       versionValue: "",
-      versionValueVerson: "",
+      getfactoryValue: "",
       versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
       searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        version: "",
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
+      showExcelImport: false,
+      form: {},
+      drawer: false,
       list: null,
       totalCount: 0,
       listLoading: true,
-      formLoading: false,
+      customerInfo: {
+        bomId: "",
+      },
       // 高级搜索
       filterObj: {
         type: Object,
@@ -214,105 +207,71 @@ export default {
           return {};
         },
       },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
       listQuery: {
         Filters: [
           {
             logic: 0,
-            column: "Enabled",
+            column: "enabled",
             action: 0,
             value: "true",
           }, //默认查询可用的
         ],
-        //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        ParentId: "",
+        ParentId: null,
         fileType: 0,
         userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        ParentId: "",
-        fileType: 0,
-        userId: "",
+        customerCode: "",
       },
       page: 1,
-      dialogFormVisible: false,
+      bomUnit,
       multipleSelection: [],
-      formTitle: "",
       drawer: false,
-      showExcelImport: false,
       tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
     };
   },
   mounted() {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
     this.getVersionInfo();
-    //if (this.versionList == []) {
     this.getList();
-    //}
   },
   computed: {
-    /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "KENN号", prop: "kennCode", width: 150 });
-      tempsTabs.push({ label: "底盘号", prop: "chassisNumber", width: 120 });
-      tempsTabs.push({ label: "车型", prop: "model", width: 90 });
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
       tempsTabs.push({
-        label: "CP5时间",
-        prop: "cP5A",
+        label: "物料号",
+        prop: "materialCode",
         width: 150,
-        formType: "datetime",
       });
-
       tempsTabs.push({
-        label: "CP7时间",
-        prop: "cP7",
-        width: 150,
-        formType: "datetime",
+        label: "数量",
+        prop: "qty",
+        width: 100,
       });
-      tempsTabs.push({ label: "零件号", prop: "materialCode", width: 200 });
-      tempsTabs.push({ label: "数量", prop: "qty", width: 90 });
       tempsTabs.push({
-        label: "未结算原因",
-        prop: "unsettledReason",
-        width: 280,
+        label: "看板编号",
+        prop: "kbCodeExtend",
+        width: 150,
       });
-      tempsTabs.push({ label: "结算标识", prop: "settlementID", width: 120 });
       tempsTabs.push({
-        label: "结算供应商",
-        prop: "settlementSupplier",
+        label: "看板号",
+        prop: "kbCode",
         width: 150,
       });
-      // tempsTabs.push({ label: "状态", prop: "state", width: 120 });
+      tempsTabs.push({ label: "状态", prop: "state", width: 100 });
       return tempsTabs;
     },
     MoreTypes() {
       var moreTypes = [];
-      moreTypes.push({ type: "updateFis", name: "刷新FIS结算状态" });
-      moreTypes.push({ type: "enter", name: "刷新数据开票状态" });
+      moreTypes.push({ type: "updateFis", name: "更新结算数据" });
+      //moreTypes.push({ type: "enter", name: "新按钮" });
       return moreTypes;
     },
   },
@@ -322,20 +281,117 @@ export default {
       this.versionValue = params.value;
       this.getList();
     },
-    selectValueVerson(params) {
-      //版本下拉选择
-      this.versionValueVerson = params.value;
+    handleTypeDrop(command, params = {}) {
+      if (command == "updateFis") {
+        this.listLoading = true;
+        //this.listQuery.SkipCount = (this.page - 1) * 10000;
+        this.$axios
+          .posts("/api/settleaccount/HQSpecConsign/updatesphq")
+          .then((res) => {
+            if (res == true) {
+              this.$notify({
+                title: "成功",
+                message: "数据-更新成功！",
+                type: "success",
+                duration: 2000,
+              });
+            } else {
+              this.$message({
+                type: "warning",
+                message: "数据-更新失败！",
+              });
+            }
+            this.listLoading = false;
+          });
+      } else if (command == "enter") {
+      }
     },
-    handleTypeDrop(command, params = {}) {},
-    selectOptionsChange(item) {
+    handleCommand(command) {
+      if (this.versionValue === "") {
+        this.$message.error("请先选择版本！");
+        this.listLoading = false;
+        return;
+      }
+      switch (command) {
+        case "excel":
+          this.listQuery.fileType = 1; //0是csv,1是excel
+          break;
+        case "csv":
+          this.listQuery.fileType = 0; //0是csv,1是excel
+          break;
+        default:
+          this.listQuery.fileType = 0;
+          break;
+      }
+      this.listLoading = true;
+      if (this.versionValue != "") {
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
+      }
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log(
+        "红旗特殊结算数据输入表导出：" + JSON.stringify(this.listQuery)
+      );
+      this.$axios
+        .posts("/api/settleaccount/HQSpecConsign/Export", this.listQuery)
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    selectOptionsChange(params) {
+      if (params != "") {
+        let obj = {};
+        obj = this.versionList.find((item) => {
+          return item.value === params; //筛选出匹配数据
+        });
+        this.getfactoryValue = obj.label;
+      }
       this.getList();
     },
+
+    importExcelData(data) {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getVersionInfo();
+      //this.getList();
+    },
     getVersionInfo() {
       //取版本列表信息
-      //this.listLoading = true;
+      this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/UnSettleAccount/listVersion", this.listQuery)
+        .posts("/api/settleaccount/HQSpecConsign/listVersion", this.listQuery)
         .then((response) => {
           this.versionList = [];
           response.items.forEach((element) => {
@@ -347,12 +403,16 @@ export default {
           if (JSON.stringify(this.versionList) != "[]") {
             //因版本下拉有默认值，所以详表要自动绑定子表数据
             this.versionValue = this.versionList[0].value;
-            this.versionValueVerson = this.versionList[0].label;
             this.getList();
           }
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
         })
         .catch(() => {
-          //this.listLoading = false;
+          this.listLoading = false;
         });
     },
     handleImportExcel() {
@@ -368,99 +428,54 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property == "cP5A") {
+      if (column.property === "state") {
+        return { 0: "其他", 2: "已结" }[row[column.property]];
+      }
+      if (column.property == "deliveryDateTime") {
         var date = row[column.property];
         if (date == undefined) {
-          return "-";
+          return "";
         }
         return moment(date).format("YYYY-MM-DD HH:mm:ss");
       }
-      if (column.property == "cP7") {
+      if (column.property == "dateTime") {
         var date = row[column.property];
-        if (
-          date == undefined ||
-          JSON.stringify(date).indexOf("0001-01-01") != -1 ) {
-          return "--";
+        if (date == undefined) {
+          return "";
         }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+        return moment(date).format("YYYY-MM-DD");
       }
       return row[column.property] || "--";
     },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
     },
-
-    async handleDownload() {
+    async handleDownload() {},
+    getDownBoms() {
       this.listLoading = true;
-      if (this.versionValueVerson === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
-      //根据ParentId条件导出
-      if (this.versionValue != "") {
-        this.listQuery.ParentId = this.versionValue;
-      } else {
-        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
-      }
-      console.log("R3未结导出：" + JSON.stringify(this.listQuery.ParentId));
       this.$axios
-        .posts("/api/settleaccount/UnSettleAccount/Export", {
-          parentId: this.listQuery.ParentId,
-        })
-        .then((res) => {
-          let fileNameOfProject = res;
-          this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
-            .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
-                let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, fileNameOfProject);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        })
-        .catch(() => {
+        .gets("/api/settleaccount/HQSpecConsign/Export")
+        .then((response) => {
           this.listLoading = false;
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
         this.listQuery.ParentId = this.versionValue;
       } else {
         this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
       this.$axios
-        .posts("/api/settleaccount/UnSettleAccount/list", this.listQuery)
+        .posts("/api/settleaccount/HQSpecConsign/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
-          //alert(JSON.stringify(response.Items))
           this.totalCount = response.totalCount;
           setTimeout(() => {
             //大数据量加载时
@@ -474,28 +489,11 @@ export default {
     fetchData(id) {
       //循环动态
       this.$axios
-        .gets("/api/settleaccount/UnSettleAccount/" + id)
+        .gets("/api/settleaccount/HQSpecConsign/" + id)
         .then((response) => {
           this.form = response;
         });
     },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "materialCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
     /** 多项筛选操作 */
     /** 筛选操作 */
     handleFilters(data) {
@@ -514,16 +512,20 @@ export default {
           let filter = {};
           if (item.formType === "datetime" || item.formType === "datetime") {
             //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
+            let filterStart = {};
+            let filterEnd = {};
+            filterStart["Column"] = item.fieldName;
+            filterStart["Logic"] = 0;
+            filterStart["Value"] = item.start;
+            filterStart["Action"] = 4;
+            Filter.push(filterStart);
 
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
+            if (item.end != null) {
+              filterEnd["Column"] = item.fieldName;
+              filterEnd["Logic"] = 0;
+              filterEnd["Value"] = item.end;
+              filterEnd["Action"] = 5;
+              Filter.push(filterEnd);
             }
           } else {
             filter["Column"] = item.fieldName;
@@ -538,7 +540,24 @@ export default {
         this.getList();
       }
     },
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "materialCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
     resetQuery() {},
+
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
@@ -546,7 +565,6 @@ export default {
         return;
       }
       this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
       this.handleFilter();
     },
     handleSelectionChange(val) {
@@ -554,7 +572,15 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
+      var item = this.list[rowIndex];
+      if (column.property === "state") {
+        if (item.state === 0) {
+          return { color: "#ff5640", cursor: "pointer" };
+        } else {
+          return { color: "#71d87f", cursor: "pointer" };
+        }
+      }
+      if (column.property === "consignQty" || column.property === "needQty") {
         return { textAlign: "right" };
       } else {
         return { textAlign: "left" };
@@ -562,7 +588,7 @@ export default {
     },
     /** 通过回调控制表头style */
     headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
+      if (column.property === "consignQty" || column.property === "needQty") {
         return { textAlign: "right", background: "#FAFAFA" };
       } else {
         return { textAlign: "left", background: "#FAFAFA" };
@@ -580,10 +606,4 @@ export default {
 <style lang="scss" scoped>
 @import "../../../styles/crmtable.scss";
 </style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
 
diff --git a/code/WebApp/vue/src/views/ux/hqdata/jiesuan/standardConsign/index.vue b/code/WebApp/vue/src/views/ux/hqdata/jiesuan/standardConsign/index.vue
new file mode 100644
index 00000000..9893b5a5
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/hqdata/jiesuan/standardConsign/index.vue
@@ -0,0 +1,597 @@
+<!--红旗标准结算数据输入表-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload2"
+        @click="handleImportExcel()"
+        >导入Excel
+      </el-button>
+      <!-- <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出Excel
+      </el-button> -->
+
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照物料号搜索..."
+        style="width: 250px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+      <el-dropdown size="small" class="filter-item" @command="handleCommand">
+        <span class="el-dropdown-link">
+          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="excel" icon="el-icon-plus"
+            >导出Excel</el-dropdown-item
+          >
+          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
+            >导出Csv</el-dropdown-item
+          >
+        </el-dropdown-menu>
+      </el-dropdown>
+      <div class="right-container" style="margin-left: 240px">
+        <el-dropdown
+          v-if="MoreTypes.length > 0"
+          trigger="click"
+          @command="handleTypeDrop"
+        >
+          <flexbox class="right-more-item">
+            <div>更多</div>
+            <i class="el-icon-arrow-down el-icon--right" style="color: #777" />
+          </flexbox>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              v-for="(item, index) in MoreTypes"
+              :key="index"
+              :command="item.type"
+              >{{ item.name }}</el-dropdown-item
+            >
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+    </flexbox>
+    <div class="l-table">
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="n-table--border"
+        :data="list"
+        :height="tableHeight"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+      >
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 导入Excel组件 -->
+      <importExcel
+        ref="importexcel"
+        :show="showExcelImport"
+        :crmType="crmType"
+        @close="importExcelData"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination";
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-hq";
+import Lockr from "lockr";
+import { downloadFile } from "@/utils/crmindex.js";
+import moment from "moment";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
+
+export default {
+  name: "StandardConsign",
+  components: { Pagination, CRMTableHead, importExcel , XhJSSelect },
+  directives: { permission },
+  data() {
+    return {
+      crmType: "standardConsign",
+      versionValue: "",
+      getfactoryValue: "",
+      versionList: [], //版本列表
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: null,
+        fileType: 0,
+        userId: "00000000-0000-0000-0000-000000000000",
+        customerCode: "",
+      },
+      page: 1,
+      bomUnit,
+      multipleSelection: [],
+      drawer: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+     this.getVersionInfo();
+  },
+  created() {
+   
+    this.getList();
+  },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
+      tempsTabs.push({
+        label: "物料号",
+        prop: "materialCode",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "底盘号",
+        prop: "vin",
+        width: 150,
+      });
+      tempsTabs.push({ label: "状态", prop: "state", width: 100 });
+      return tempsTabs;
+    },
+    MoreTypes() {
+      var moreTypes = [];
+      moreTypes.push({ type: "updateFis", name: "更新结算数据" });
+      //moreTypes.push({ type: "enter", name: "新按钮" });
+      return moreTypes;
+    },
+  },
+  methods: {
+        selectValue(params) {//版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
+    handleTypeDrop(command, params = {}) {
+      if (command == "updateFis") {
+        this.listLoading = true;
+        //this.listQuery.SkipCount = (this.page - 1) * 10000;
+        this.$axios
+          .posts("/api/settleaccount/HQConsign/updatehq")
+          .then((res) => {
+            if (res == true) {
+              this.$notify({
+                title: "成功",
+                message: "数据-更新成功！",
+                type: "success",
+                duration: 2000,
+              });
+            } else {
+              this.$message({
+                type: "warning",
+                message: "数据-更新失败！",
+              });
+            }
+            this.listLoading = false;
+          });
+      } else if (command == "enter") {
+      }
+    },
+    handleCommand(command) {
+      if (this.versionValue === "") {
+        this.$message.error("请先选择版本！");
+        this.listLoading = false;
+        return;
+      }
+      switch (command) {
+        case "excel":
+          this.listQuery.fileType = 1; //0是csv,1是excel
+          break;
+        case "csv":
+          this.listQuery.fileType = 0; //0是csv,1是excel
+          break;
+        default:
+          this.listQuery.fileType = 0;
+          break;
+      }
+      this.listLoading = true;
+      if (this.versionValue != "") {
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
+      }
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log("红旗-标准结算输入表导出：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts("/api/settleaccount/HQConsign/Export", this.listQuery)
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    selectOptionsChange(params) {
+      if (params != "") {
+        let obj = {};
+        obj = this.versionList.find((item) => {
+          return item.value === params; //筛选出匹配数据
+        });
+        this.getfactoryValue = obj.label;
+      }
+      this.getList();
+    },
+
+    importExcelData(data) {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getVersionInfo();
+      //this.getList();
+    },
+    getVersionInfo() {
+      //取版本列表信息
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/HQConsign/listVersion", this.listQuery)
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.id;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+           if (JSON.stringify(this.versionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+             this.versionValue = this.versionList[0].value;
+             this.getList();
+          }
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property === "state") {
+        return { 0: "其他", 2: "已结" }[row[column.property]];
+      }
+      if (column.property == "deliveryDateTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      if (column.property == "dateTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD");
+      }
+      return row[column.property] || "--";
+    },
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
+    },
+    async handleDownload() {},
+    getDownBoms() {
+      this.listLoading = true;
+      this.$axios
+        .gets("/api/settleaccount/HQConsign/Export")
+        .then((response) => {
+          this.listLoading = false;
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      if (this.versionValue != "") {
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
+      }
+      this.$axios
+        .posts("/api/settleaccount/HQConsign/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/HQConsign/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            let filterStart = {};
+            let filterEnd = {};
+            filterStart["Column"] = item.fieldName;
+            filterStart["Logic"] = 0;
+            filterStart["Value"] = item.start;
+            filterStart["Action"] = 4;
+            Filter.push(filterStart);
+
+            if (item.end != null) {
+              filterEnd["Column"] = item.fieldName;
+              filterEnd["Logic"] = 0;
+              filterEnd["Value"] = item.end;
+              filterEnd["Action"] = 5;
+              Filter.push(filterEnd);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "materialCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      //  var item = this.spanList[rowIndex]
+      // if (item.isSum == true) {
+      //   return { backgroundColor: '#FFF9F2' }
+      // } else if (item.isAllSum == true) {
+      //   return { backgroundColor: '#FFF3E8' }
+      // } else
+      var item = this.list[rowIndex];
+      if (column.property === "state") {
+        if (item.state === 0) {
+          return { color: "#ff5640", cursor: "pointer" };
+        } else {
+          return { color: "#71d87f", cursor: "pointer" };
+        }
+      }
+      if (column.property === "consignQty" || column.property === "needQty") {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "consignQty" || column.property === "needQty") {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../../styles/crmtable.scss";
+</style>
+
+
diff --git a/code/WebApp/vue/src/views/ux/hqdata/kanban/index.vue b/code/WebApp/vue/src/views/ux/hqdata/kanban/index.vue
new file mode 100644
index 00000000..509198d1
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/hqdata/kanban/index.vue
@@ -0,0 +1,7 @@
+ <!-- 父级路由组件  -->
+<template>
+  <div>
+    <!-- xxx html 内容  -->
+    <router-view />
+  </div>
+</template>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/hq_f/index.vue b/code/WebApp/vue/src/views/ux/hqdata/kanban/specialKanban/index.vue
similarity index 58%
rename from code/WebApp/vue/src/views/ux/vw/dataInput/hq_f/index.vue
rename to code/WebApp/vue/src/views/ux/hqdata/kanban/specialKanban/index.vue
index e5d35866..8850b3cd 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/hq_f/index.vue
+++ b/code/WebApp/vue/src/views/ux/hqdata/kanban/specialKanban/index.vue
@@ -1,53 +1,53 @@
-<!--红旗H平台导入功能-->
+<!--红旗--特殊看板输入表-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
+      <!-- <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select> -->
       <XhJSSelect
         :options="versionList"
         style="width: 200px"
         class="search-container"
         @value-change="selectValue"
       ></XhJSSelect>
+
       <el-button
         class="filter-item"
         size="mini"
         type="warning"
         icon="el-icon-upload2"
         @click="handleImportExcel()"
-        >导入文件（Excel）
+        >导入Excel
       </el-button>
       <!-- <el-button
         class="filter-item"
         size="mini"
-        type="primary"
+        type="info"
         icon="el-icon-download"
         @click="handleDownload()"
         >导出Excel
       </el-button> -->
-      <el-dropdown
-        size="small"
-        class="filter-item"
-        style="margin-left: 15px; font-weight: bold"
-        @command="handleCommand"
-      >
-        <span class="el-dropdown-link">
-          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="excel" icon="el-icon-plus"
-            >导出Excel</el-dropdown-item
-          >
-          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
-            >导出Csv</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
+
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照采购订单号搜索..."
-        style="width: 200px"
+        placeholder="按照物料号搜索..."
+        style="width: 250px"
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
@@ -66,58 +66,59 @@
         @filter="handleFilters"
       >
       </c-r-m-table-head>
+      <el-dropdown size="small" class="filter-item" @command="handleCommand">
+        <span class="el-dropdown-link">
+          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="excel" icon="el-icon-plus"
+            >导出Excel</el-dropdown-item
+          >
+          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
+            >导出Csv</el-dropdown-item
+          >
+        </el-dropdown-menu>
+      </el-dropdown>
     </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
+    <div class="l-table">
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeight"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
       >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
       <pagination
@@ -139,61 +140,46 @@
 </template>
 
 <script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import Pagination from "@/components/Pagination";
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-base";
 import CRMTableHead from "../../../components/CRMTableHead";
-import moment from "moment";
+import importExcel from "@/components/ImportExcel-hq";
 import Lockr from "lockr";
 import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
+import moment from "moment";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
 
 export default {
-  name: "HQHPlatform",
+  name: "SpecialKanban",
   components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
   data() {
     return {
-      crmType: "hqHPlatform",
+      crmType: "specialKanban",
       versionValue: "",
+      getfactoryValue: "",
       versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
       searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
+      showExcelImport: false,
+      form: {},
+      drawer: false,
       list: null,
       totalCount: 0,
       listLoading: true,
-      formLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
       // 高级搜索
       filterObj: {
         type: Object,
@@ -201,131 +187,90 @@ export default {
           return {};
         },
       },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
       listQuery: {
         Filters: [
           {
             logic: 0,
-            column: "Enabled",
+            column: "enabled",
             action: 0,
             value: "true",
           }, //默认查询可用的
         ],
-        //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        version: "",
-        site: "TH",
-        userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
+        ParentId: null,
         fileType: 0,
-        userId: "",
+        userId: "00000000-0000-0000-0000-000000000000",
+        customerCode: "",
       },
       page: 1,
-      dialogFormVisible: false,
+      bomUnit,
       multipleSelection: [],
-      formTitle: "",
       drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 220,
-      isEdit: false,
+      tableHeight: document.documentElement.clientHeight - 260,
     };
   },
   mounted() {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 220;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
     this.getVersionInfo();
-    if (this.versionList == []) {
-      this.getList();
-    }
+    this.getList();
   },
   computed: {
-    /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
-      tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 });
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
       tempsTabs.push({
-        label: "采购订单号",
-        prop: "purchaseOrderNo",
-        width: 220,
-      });
-      tempsTabs.push({
-        label: "采购订单行项目",
-        prop: "purchaseOrderNoItem",
-        width: 170,
-      });
-      tempsTabs.push({
-        label: "采购订单文本",
-        prop: "purchaseOrderNoText",
-        width: 170,
+        label: "零件号",
+        prop: "materialCode",
+        width: 150,
       });
-      tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 });
-      tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 });
-      tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 });
       tempsTabs.push({
-        label: "采购价格不含税",
-        prop: "purchasePriceNoTax",
-        width: 200,
+        label: "零件中文名称",
+        prop: "materialDesc",
+        width: 250,
       });
-      tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 });
-      tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 });
-      tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 });
       tempsTabs.push({
-        label: "日期",
-        prop: "spareDate",
-        width: 150,
-        formType: "datetime",
+        label: "单位",
+        prop: "unit",
+        width: 100,
       });
-
       tempsTabs.push({
-        label: "交货单号",
-        prop: "deliveryOrderNo",
-        width: 150,
+        label: "需求数",
+        prop: "needQty",
+        width: 100,
       });
       tempsTabs.push({
-        label: "交货行号",
-        prop: "deliveryLineNum",
+        label: "订货看板编号",
+        prop: "kbCode",
         width: 150,
       });
-      tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 });
-      tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 });
-      tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 });
       tempsTabs.push({
-        label: "德国发票号",
-        prop: "germanInvoiceNo",
+        label: "创建时间",
+        prop: "createTime",
         width: 150,
+        formType: "datetime",
       });
-      tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
-      tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 });
+      tempsTabs.push({ label: "状态", prop: "state", width: 100 });
+      tempsTabs.push({ label: "结算数量", prop: "consignQty", width: 100 });
       return tempsTabs;
     },
   },
   methods: {
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
     handleCommand(command) {
       if (this.versionValue === "") {
         this.$message.error("请先选择版本！");
+        this.listLoading = false;
         return;
       }
       switch (command) {
@@ -336,21 +281,19 @@ export default {
           this.listQuery.fileType = 0; //0是csv,1是excel
           break;
         default:
-          //这里是没有找到对应的值处理
+          this.listQuery.fileType = 0;
           break;
       }
       this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("红旗H平台导出：" + JSON.stringify(this.listQuery));
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log("红旗特殊看板导出：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/HQHPlatform/Export", this.listQuery)
+        .posts("/api/settleaccount/HQSpecKBs/Export", this.listQuery)
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -385,21 +328,29 @@ export default {
             });
         });
     },
-
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
+    selectOptionsChange(params) {
+      if (params != "") {
+        let obj = {};
+        obj = this.versionList.find((item) => {
+          return item.value === params; //筛选出匹配数据
+        });
+        this.getfactoryValue = obj.label;
+      }
       this.getList();
     },
-    selectOptionsChange(item) {
-      this.getList();
+
+    importExcelData(data) {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getVersionInfo();
+      //this.getList();
     },
     getVersionInfo() {
       //取版本列表信息
-      //this.listLoading = true;
+      this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/HQHPlatform/listVersion", this.listQuery)
+        .posts("/api/settleaccount/HQSpecKBs/listversion", this.listQuery)
         .then((response) => {
           this.versionList = [];
           response.items.forEach((element) => {
@@ -410,10 +361,14 @@ export default {
           });
           if (JSON.stringify(this.versionList) != "[]") {
             //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
+            this.versionValue = this.versionList[0].value;
             this.getList();
           }
-          this.listLoading = false;
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
         })
         .catch(() => {
           this.listLoading = false;
@@ -432,13 +387,10 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      // if (column.property === "state") {
-      //   return { 0: "其他", 2: "已结" }[row[column.property]];
-      // }
-      if (
-        column.property == "settleInputDate" ||
-        column.property == "settleDate"
-      ) {
+      if (column.property === "state") {
+        return { 0: "未结", 1: "部分结算", 2: "已结" }[row[column.property]];
+      }
+      if (column.property == "createTime") {
         var date = row[column.property];
         if (date == undefined) {
           return "";
@@ -447,22 +399,33 @@ export default {
       }
       return row[column.property] || "--";
     },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
     },
-
-    getList() {
+    async handleDownload() {},
+    getDownBoms() {
+      this.listLoading = true;
+      this.$axios
+        .gets("/api/settleaccount/HQSpecKBs/Export")
+        .then((response) => {
+          this.listLoading = false;
+        });
+    },
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/HQHPlatform/list", this.listQuery)
+        .posts("/api/settleaccount/HQSpecKBs/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           this.totalCount = response.totalCount;
@@ -478,28 +441,11 @@ export default {
     fetchData(id) {
       //循环动态
       this.$axios
-        .gets("/api/settleaccount/HQHPlatform/" + id)
+        .gets("/api/settleaccount/HQSpecKBs/" + id)
         .then((response) => {
           this.form = response;
         });
     },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "purchaseOrderNo";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
     /** 多项筛选操作 */
     /** 筛选操作 */
     handleFilters(data) {
@@ -518,16 +464,20 @@ export default {
           let filter = {};
           if (item.formType === "datetime" || item.formType === "datetime") {
             //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
+            let filterStart = {};
+            let filterEnd = {};
+            filterStart["Column"] = item.fieldName;
+            filterStart["Logic"] = 0;
+            filterStart["Value"] = item.start;
+            filterStart["Action"] = 4;
+            Filter.push(filterStart);
 
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
+            if (item.end != null) {
+              filterEnd["Column"] = item.fieldName;
+              filterEnd["Logic"] = 0;
+              filterEnd["Value"] = item.end;
+              filterEnd["Action"] = 5;
+              Filter.push(filterEnd);
             }
           } else {
             filter["Column"] = item.fieldName;
@@ -542,7 +492,24 @@ export default {
         this.getList();
       }
     },
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "materialCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
     resetQuery() {},
+
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
@@ -550,7 +517,6 @@ export default {
         return;
       }
       this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
       this.handleFilter();
     },
     handleSelectionChange(val) {
@@ -558,16 +524,25 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      // if (column.property === "qty") {
-      //   return { textAlign: "right" };
-      // } else {
-      //   return { textAlign: "left" };
-      // }
-      return { textAlign: "left" };
+      var item = this.list[rowIndex];
+      if (column.property === "state") {
+        if (item.state === 0) {
+          return { color: "#ff5640", cursor: "pointer" };
+        } else if (item.state === 1) {
+          return { color: "#d87171", cursor: "pointer" };
+        } else {
+          return { color: "#71d87f", cursor: "pointer" };
+        }
+      }
+      if (column.property === "consignQty" || column.property === "needQty") {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
     },
     /** 通过回调控制表头style */
     headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
+      if (column.property === "consignQty" || column.property === "needQty") {
         return { textAlign: "right", background: "#FAFAFA" };
       } else {
         return { textAlign: "left", background: "#FAFAFA" };
@@ -585,10 +560,4 @@ export default {
 <style lang="scss" scoped>
 @import "../../../styles/crmtable.scss";
 </style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
 
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/hq_m/index.vue b/code/WebApp/vue/src/views/ux/hqdata/kanban/standardKanban/index.vue
similarity index 57%
rename from code/WebApp/vue/src/views/ux/vw/dataInput/hq_m/index.vue
rename to code/WebApp/vue/src/views/ux/hqdata/kanban/standardKanban/index.vue
index f4c47c4e..2e3bfa1e 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/hq_m/index.vue
+++ b/code/WebApp/vue/src/views/ux/hqdata/kanban/standardKanban/index.vue
@@ -1,53 +1,53 @@
-<!--红旗M平台导入功能-->
+<!--Bom详细信息页-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
+      <!-- <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select> -->
       <XhJSSelect
         :options="versionList"
         style="width: 200px"
         class="search-container"
         @value-change="selectValue"
       ></XhJSSelect>
+
       <el-button
         class="filter-item"
         size="mini"
         type="warning"
         icon="el-icon-upload2"
         @click="handleImportExcel()"
-        >导入文件（Excel）
+        >导入Excel
       </el-button>
       <!-- <el-button
         class="filter-item"
         size="mini"
-        type="primary"
+        type="info"
         icon="el-icon-download"
         @click="handleDownload()"
         >导出Excel
       </el-button> -->
-      <el-dropdown
-        size="small"
-        class="filter-item"
-        style="margin-left: 15px; font-weight: bold"
-        @command="handleCommand"
-      >
-        <span class="el-dropdown-link">
-          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="excel" icon="el-icon-plus"
-            >导出Excel</el-dropdown-item
-          >
-          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
-            >导出Csv</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
+
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照采购订单号搜索..."
-        style="width: 200px"
+        placeholder="按照物料号搜索..."
+        style="width: 250px"
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
@@ -66,58 +66,79 @@
         @filter="handleFilters"
       >
       </c-r-m-table-head>
+      <el-dropdown size="small" class="filter-item" @command="handleCommand">
+        <span class="el-dropdown-link">
+          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="excel" icon="el-icon-plus"
+            >导出Excel</el-dropdown-item
+          >
+          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
+            >导出Csv</el-dropdown-item
+          >
+        </el-dropdown-menu>
+      </el-dropdown>
     </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
+    <div class="l-table">
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeight"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
       >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column
+          prop="state"
+          label="状态"
+          width="100"
+          :filter-method="filterTag"
+          :filters="[
+            { text: '未结', value: '0' },
+            { text: '部分结算', value: '1' },
+            { text: '已结', value: '2' },
+          ]"
+          filter-placement="bottom-end"
+        >
+          <template slot-scope="scope">
+            <el-tag
+       
+              disable-transitions
+              >{{ scope.row.state }}</el-tag
+            >
+          </template>
+        </el-table-column> -->
+      </el-table>
+    </div>
+
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
       <pagination
@@ -139,61 +160,46 @@
 </template>
 
 <script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import Pagination from "@/components/Pagination";
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-base";
 import CRMTableHead from "../../../components/CRMTableHead";
-import moment from "moment";
+import importExcel from "@/components/ImportExcel-hq";
 import Lockr from "lockr";
 import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
+import moment from "moment";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
 
 export default {
-  name: "HQMPlatform",
+  name: "StandardKanban",
   components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
   data() {
     return {
-      crmType: "hqMPlatform",
+      crmType: "standardKanban",
       versionValue: "",
+      getfactoryValue: "",
       versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
       searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
+      showExcelImport: false,
+      form: {},
+      drawer: false,
       list: null,
       totalCount: 0,
       listLoading: true,
-      formLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
       // 高级搜索
       filterObj: {
         type: Object,
@@ -201,131 +207,85 @@ export default {
           return {};
         },
       },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
       listQuery: {
         Filters: [
           {
             logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        site: "TH",
-        userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
+            column: "enabled",
             action: 0,
             value: "true",
           }, //默认查询可用的
         ],
-        //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        version: "",
+        ParentId: null,
         fileType: 0,
-        userId: "",
+        userId: "00000000-0000-0000-0000-000000000000",
+        customerCode: "",
       },
       page: 1,
-      dialogFormVisible: false,
+      bomUnit,
       multipleSelection: [],
-      formTitle: "",
       drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 220,
-      isEdit: false,
+      tableHeight: document.documentElement.clientHeight - 260,
     };
   },
   mounted() {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 220;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
     this.getVersionInfo();
-    if (this.versionList == []) {
-      this.getList();
-    }
+    this.getList();
   },
   computed: {
-    /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
-      tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 });
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
       tempsTabs.push({
-        label: "采购订单号",
-        prop: "purchaseOrderNo",
-        width: 220,
-      });
-      tempsTabs.push({
-        label: "采购订单行项目",
-        prop: "purchaseOrderNoItem",
-        width: 170,
-      });
-      tempsTabs.push({
-        label: "采购订单文本",
-        prop: "purchaseOrderNoText",
-        width: 170,
-      });
-      tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 });
-      tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 });
-      tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 });
-      tempsTabs.push({
-        label: "采购价格不含税",
-        prop: "purchasePriceNoTax",
-        width: 200,
+        label: "外部看板号",
+        prop: "kbCode",
+        width: 150,
       });
-      tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 });
-      tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 });
-      tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 });
       tempsTabs.push({
-        label: "日期",
-        prop: "spareDate",
+        label: "物料号",
+        prop: "materialCode",
         width: 150,
-        formType: "datetime",
       });
-
       tempsTabs.push({
-        label: "交货单号",
-        prop: "deliveryOrderNo",
-        width: 150,
+        label: "数量",
+        prop: "needQty",
+        width: 100,
       });
+
       tempsTabs.push({
-        label: "交货行号",
-        prop: "deliveryLineNum",
+        label: "底盘号",
+        prop: "vin",
         width: 150,
       });
-      tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 });
-      tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 });
-      tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 });
       tempsTabs.push({
-        label: "德国发票号",
-        prop: "germanInvoiceNo",
-        width: 150,
+        label: "创建时间",
+        prop: "createTime",
+        width: 85,
+        formType: "datetime",
       });
-      tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
-      tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 });
+      tempsTabs.push({ label: "状态", prop: "state", width: 100 });
+      tempsTabs.push({ label: "结算数量", prop: "consignQty", width: 100 });
       return tempsTabs;
     },
   },
   methods: {
+    selectValue(params) {//版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
     handleCommand(command) {
       if (this.versionValue === "") {
         this.$message.error("请先选择版本！");
+        this.listLoading = false;
         return;
       }
       switch (command) {
@@ -336,21 +296,19 @@ export default {
           this.listQuery.fileType = 0; //0是csv,1是excel
           break;
         default:
-          //这里是没有找到对应的值处理
+          this.listQuery.fileType = 0;
           break;
       }
       this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("红旗H平台导出：" + JSON.stringify(this.listQuery));
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log("红旗标准看板导出：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/HQMPlatform/Export", this.listQuery)
+        .posts("/api/settleaccount/HQKBs/Export", this.listQuery)
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -385,21 +343,29 @@ export default {
             });
         });
     },
-
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
+    selectOptionsChange(params) {
+      if (params != "") {
+        let obj = {};
+        obj = this.versionList.find((item) => {
+          return item.value === params; //筛选出匹配数据
+        });
+        this.getfactoryValue = obj.label;
+      }
       this.getList();
     },
-    selectOptionsChange(item) {
-      this.getList();
+
+    importExcelData(data) {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getVersionInfo();
+      //this.getList();
     },
     getVersionInfo() {
       //取版本列表信息
-      //this.listLoading = true;
+      this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/HQMPlatform/listVersion", this.listQuery)
+        .posts("/api/settleaccount/HQKBs/listversion", this.listQuery)
         .then((response) => {
           this.versionList = [];
           response.items.forEach((element) => {
@@ -410,10 +376,14 @@ export default {
           });
           if (JSON.stringify(this.versionList) != "[]") {
             //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
-            this.getList();
+             this.versionValue = this.versionList[0].value;
+             this.getList();
           }
-          this.listLoading = false;
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
         })
         .catch(() => {
           this.listLoading = false;
@@ -432,13 +402,10 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      // if (column.property === "state") {
-      //   return { 0: "其他", 2: "已结" }[row[column.property]];
-      // }
-      if (
-        column.property == "settleInputDate" ||
-        column.property == "settleDate"
-      ) {
+      if (column.property === "state") {
+        return { 0: "未结", 1: "部分结算", 2: "已结" }[row[column.property]];
+      }
+      if (column.property == "createTime") {
         var date = row[column.property];
         if (date == undefined) {
           return "";
@@ -447,22 +414,31 @@ export default {
       }
       return row[column.property] || "--";
     },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
     },
-
-    getList() {
+    async handleDownload() {},
+    getDownBoms() {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      this.$axios.gets("/api/settleaccount/HQKBs/Export").then((response) => {
+        this.listLoading = false;
+      });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/HQMPlatform/list", this.listQuery)
+        .posts("/api/settleaccount/HQKBs/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           this.totalCount = response.totalCount;
@@ -477,28 +453,9 @@ export default {
     },
     fetchData(id) {
       //循环动态
-      this.$axios
-        .gets("/api/settleaccount/HQMPlatform/" + id)
-        .then((response) => {
-          this.form = response;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "purchaseOrderNo";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
+      this.$axios.gets("/api/settleaccount/HQKBs/" + id).then((response) => {
+        this.form = response;
+      });
     },
     /** 多项筛选操作 */
     /** 筛选操作 */
@@ -518,16 +475,20 @@ export default {
           let filter = {};
           if (item.formType === "datetime" || item.formType === "datetime") {
             //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
+            let filterStart = {};
+            let filterEnd = {};
+            filterStart["Column"] = item.fieldName;
+            filterStart["Logic"] = 0;
+            filterStart["Value"] = item.start;
+            filterStart["Action"] = 4;
+            Filter.push(filterStart);
 
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
+            if (item.end != null) {
+              filterEnd["Column"] = item.fieldName;
+              filterEnd["Logic"] = 0;
+              filterEnd["Value"] = item.end;
+              filterEnd["Action"] = 5;
+              Filter.push(filterEnd);
             }
           } else {
             filter["Column"] = item.fieldName;
@@ -542,7 +503,24 @@ export default {
         this.getList();
       }
     },
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "materialCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
     resetQuery() {},
+
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
@@ -550,7 +528,6 @@ export default {
         return;
       }
       this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
       this.handleFilter();
     },
     handleSelectionChange(val) {
@@ -558,16 +535,29 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      // if (column.property === "qty") {
-      //   return { textAlign: "right" };
-      // } else {
-      //   return { textAlign: "left" };
-      // }
-      return { textAlign: "left" };
+      var item = this.list[rowIndex];
+      if (column.property === "state") {
+        if (item.state === 0) {
+          return { color: "#ff5640", cursor: "pointer" };
+        } else if (item.state === 1) {
+          return { color: "#d87171", cursor: "pointer" };
+        } else {
+          return { color: "#71d87f", cursor: "pointer" };
+        }
+      }
+
+      if (column.property === "consignQty" || column.property === "needQty") {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    filterTag(value, row) {
+      return row.state === value;
     },
     /** 通过回调控制表头style */
     headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
+      if (column.property === "consignQty" || column.property === "needQty") {
         return { textAlign: "right", background: "#FAFAFA" };
       } else {
         return { textAlign: "left", background: "#FAFAFA" };
@@ -585,10 +575,4 @@ export default {
 <style lang="scss" scoped>
 @import "../../../styles/crmtable.scss";
 </style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
 
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/wmsKanban/index.vue b/code/WebApp/vue/src/views/ux/hqdata/secondaryAdjustment/index.vue
similarity index 74%
rename from code/WebApp/vue/src/views/ux/vw/dataInput/wmsKanban/index.vue
rename to code/WebApp/vue/src/views/ux/hqdata/secondaryAdjustment/index.vue
index bbebc908..c9db7c9c 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/wmsKanban/index.vue
+++ b/code/WebApp/vue/src/views/ux/hqdata/secondaryAdjustment/index.vue
@@ -1,4 +1,4 @@
-<!--大众看板发货功能-->
+<!--二配调整输入表明细数据-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
@@ -8,23 +8,15 @@
         class="search-container"
         @value-change="selectValue"
       ></XhJSSelect>
-      <!-- <el-button
+      <el-button
         class="filter-item"
         size="mini"
         type="warning"
         icon="el-icon-upload2"
         @click="handleImportExcel()"
-        >导入文件（Excel）
+        >导入（Excel）
       </el-button>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-download"
-        @click="handleDownload()"
-        >导出Excel
-      </el-button> -->
- 
+
       <el-input
         v-model="searchContent"
         clearable
@@ -49,7 +41,7 @@
         @filter="handleFilters"
       >
       </c-r-m-table-head>
-           <el-dropdown size="small" class="filter-item" style="margin-left:15px;font-weight:bold" @command="handleCommand">
+      <el-dropdown size="small" class="filter-item" @command="handleCommand">
         <span class="el-dropdown-link">
           导出数据<i class="el-icon-arrow-down el-icon--right"></i>
         </span>
@@ -66,7 +58,7 @@
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
+      v-loading="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
@@ -84,20 +76,6 @@
       @row-click="handleRowClick"
     >
       <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
       <el-table-column
         v-for="(item, index) in getDefaultField"
         :key="index"
@@ -137,15 +115,14 @@
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-base";
-import CRMTableHead from "../../../components/CRMTableHead";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-vw";
 import moment from "moment";
 import Lockr from "lockr";
-import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
 
 export default {
-  name: "WMSVWKanBan",
+  name: "SecondaryAdjustmentHQ",
   components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
   filters: {
@@ -168,7 +145,7 @@ export default {
   },
   data() {
     return {
-      crmType: "WMSKanBan",
+      crmType: "secondaryAdjustmentHQ",
       versionValue: "",
       versionList: [], //版本列表
       rules: {
@@ -197,10 +174,6 @@ export default {
           return {};
         },
       },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
       listQuery: {
         Filters: [
           {
@@ -213,27 +186,10 @@ export default {
         //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        version: "",
-        site: "TH",
+        ParentId: "",
         fileType: 0,
         userId: "00000000-0000-0000-0000-000000000000",
       },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        fileType: 0,
-        userId: "",
-      },
       page: 1,
       dialogFormVisible: false,
       multipleSelection: [],
@@ -248,53 +204,116 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
     this.getVersionInfo();
-    if (this.versionList == []) {
-      this.getList();
-    }
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.settleAccountId = element.SettleAccountId;
+          });
+          if (this.customerInfo.settleAccountId != "") {
+            this.getList();
+          }
+        }
+      },
+    },
   },
   computed: {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "看板条码号", prop: "kanban", width: 200 });
-      tempsTabs.push({ label: "入库关联号", prop: "relation", width: 200 });
-      tempsTabs.push({ label: "工厂", prop: "factory", width: 120 });
-      tempsTabs.push({ label: "零件号", prop: "materialCode", width: 220 });
-      tempsTabs.push({ label: "零件类型", prop: "partType", width: 100 });
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
+      // tempsTabs.push({ label: "年度", prop: "year", width: 85 });
+      // tempsTabs.push({ label: "期间", prop: "period", width: 80 });
       tempsTabs.push({
-        label: "R3入库时间",
-        prop: "settleInputDate",
-        width: 150,
-        formType: "datetime",
+        label: "客户总成物料号",
+        prop: "customerMaterialCode",
+        width: 180,
       });
-      tempsTabs.push({ label: "供应商编码", prop: "supplierCode", width: 140 });
-      tempsTabs.push({ label: "数量", prop: "qty", width: 90 });
-      tempsTabs.push({ label: "批次", prop: "batch", width: 100 });
-
-      tempsTabs.push({ label: "入库结算标识", prop: "flag", width: 150 });
       tempsTabs.push({
-        label: "结算日期",
-        prop: "settleDate",
-        width: 150,
-        formType: "datetime",
+        label: "客户组件物料号",
+        prop: "customerComponentCode",
+        width: 180,
       });
-      tempsTabs.push({ label: "结算状态", prop: "state", width: 150 });
-
+      tempsTabs.push({ label: "供应商代码", prop: "supplierCode", width: 120 });
+      tempsTabs.push({ label: "零件数量（回款）", prop: "qty", width: 150 });
+      tempsTabs.push({ label: "金额（不含税）", prop: "amt", width: 150 });
+      tempsTabs.push({ label: "金额（含税）", prop: "total", width: 150 });
+      tempsTabs.push({
+        label: "价格或零件号变动情况",
+        prop: "hasChanged",
+        width: 220,
+      });
+      tempsTabs.push({ label: "二配采购员", prop: "buyer", width: 150 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 250 });
       return tempsTabs;
     },
-    MoreTypes() {
-      var moreTypes = [];
-      moreTypes.push({ type: "updateFis", name: "更新FIS结算数据" });
-      //moreTypes.push({ type: "enter", name: "新按钮" });
-      return moreTypes;
-    },
   },
   methods: {
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
+    selectOptionsChange(item) {
+      this.getList();
+    },
+    getVersionInfo() {
+      //取版本列表信息
+      //this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts(
+          "/api/settleaccount/SecondaryAdjustmentHQ/listVersion",
+          this.listQuery
+        )
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.id;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+          if (JSON.stringify(this.versionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.versionValue = this.versionList[0].value;
+            this.getList();
+          }
+        })
+        .catch(() => {
+          //this.listLoading = false;
+        });
+    },
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getVersionInfo();
+    },
     handleCommand(command) {
       if (this.versionValue === "") {
         this.$message.error("请先选择版本！");
@@ -318,11 +337,14 @@ export default {
         return;
       }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("大众看板导出：" + JSON.stringify(this.listQuery));
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log("二配调整输入表导出条件：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/WMSVWKanBan/Export", this.listQuery)
+        .posts("/api/settleaccount/SecondaryAdjustmentHQ/Export", this.listQuery)
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -357,7 +379,6 @@ export default {
             });
         });
     },
-    //导出功能
     async handleDownload() {
       this.listLoading = true;
       if (this.versionValue === "") {
@@ -366,11 +387,15 @@ export default {
         return;
       }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("大众看板导出：" + JSON.stringify(this.listQuery));
+      this.listQuery.fileType = 0; //0是csv,1是excel
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log("奔腾二配导出：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/WMSVWKanBan/Export", this.listQuery)
+        .posts("/api/settleaccount/SecondaryAdjustmentHQ/Export", this.listQuery)
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -405,85 +430,32 @@ export default {
             });
         });
     },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    getVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/WMSVWKanBan/listVersion", this.listQuery)
-        .then((response) => {
-          this.versionList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.id;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-          if (JSON.stringify(this.versionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
-            this.getList();
-          }
-          this.listLoading = false;
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    handleImportExcel() {
-      //导入
-      this.showExcelImport = true;
-      this.$refs.importexcel.handleImportExcelClick();
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      // if (column.property === "state") {
-      //   return { 0: "其他", 2: "已结" }[row[column.property]];
-      // }
-      if (
-        column.property == "settleInputDate" ||
-        column.property == "settleDate"
-      ) {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-
-    getList() {
+    // getDownBoms() {
+    //   this.listLoading = true;
+    //   this.$axios
+    //     .gets("/api/settleaccount/SecondaryAdjustmentHQ/ExcelExporte")
+    //     .then((response) => {
+    //       this.listLoading = false;
+    //     });
+    // },
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/WMSVWKanBan/list", this.listQuery)
+        .posts("/api/settleaccount/SecondaryAdjustmentHQ/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
+          //alert(JSON.stringify(response.Items))
           this.totalCount = response.totalCount;
           setTimeout(() => {
             //大数据量加载时
@@ -496,9 +468,11 @@ export default {
     },
     fetchData(id) {
       //循环动态
-      this.$axios.gets("/api/settleaccount/WMSVWKanBan/" + id).then((response) => {
-        this.form = response;
-      });
+      this.$axios
+        .gets("/api/settleaccount/SecondaryAdjustmentHQ/" + id)
+        .then((response) => {
+          this.form = response;
+        });
     },
     /** 筛选操作 */
     handleFilter() {
@@ -567,7 +541,6 @@ export default {
         return;
       }
       this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
       this.handleFilter();
     },
     handleSelectionChange(val) {
@@ -575,16 +548,23 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      // if (column.property === "qty") {
-      //   return { textAlign: "right" };
-      // } else {
-      //   return { textAlign: "left" };
-      // }
-      return { textAlign: "left" };
+      if (
+        column.property === "qty" ||
+        column.property === "total" ||
+        column.property === "amt"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
     },
     /** 通过回调控制表头style */
     headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
+      if (
+        column.property === "qty" ||
+        column.property === "total" ||
+        column.property === "amt"
+      ) {
         return { textAlign: "right", background: "#FAFAFA" };
       } else {
         return { textAlign: "left", background: "#FAFAFA" };
@@ -600,12 +580,10 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../../styles/crmtable.scss";
+@import "../../styles/crmtable.scss";
 </style>
 <style lang="scss">
 .el-table .cell.el-tooltip {
   white-space: pre-wrap;
 }
 </style>
-
-
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/ScrapClaims/index.vue b/code/WebApp/vue/src/views/ux/vw/dataInput/ScrapClaims/index.vue
deleted file mode 100644
index b839c795..00000000
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/ScrapClaims/index.vue
+++ /dev/null
@@ -1,591 +0,0 @@
-<!--CP7和索赔导入功能-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <XhJSSelect
-        :options="versionList"
-        style="width: 200px"
-        class="search-container"
-        @value-change="selectValue"
-      ></XhJSSelect>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload2"
-        @click="handleImportExcel()"
-        >导入文件（Excel）
-      </el-button>
-      <!-- <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-download"
-        @click="handleDownload()"
-        >导出Excel
-      </el-button> -->
-      <el-dropdown
-        size="small"
-        class="filter-item"
-        style="margin-left: 15px; font-weight: bold"
-        @command="handleCommand"
-      >
-        <span class="el-dropdown-link">
-          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="excel" icon="el-icon-plus"
-            >导出Excel</el-dropdown-item
-          >
-          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
-            >导出Csv</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
-      <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照零件号搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button>
-      <!--表格头组件，filter查询-->
-      <c-r-m-table-head
-        ref="crmTableHead"
-        :crm-type="crmType"
-        @handle="handleHandle"
-        @filter="handleFilters"
-      >
-      </c-r-m-table-head>
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-base";
-import CRMTableHead from "../../../components/CRMTableHead";
-import moment from "moment";
-import Lockr from "lockr";
-import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
-
-export default {
-  name: "ScrapClaims",
-  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "scrapClaims",
-      versionValue: "",
-      versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        site: "TH",
-        userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        fileType: 0,
-        userId: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
-    };
-  },
-  created() {
-    this.getVersionInfo();
-    if (this.versionList == []) {
-      this.getList();
-    }
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "类型(报废和索赔)", prop: "type", width: 170 });
-      tempsTabs.push({ label: "零件号", prop: "materialCode", width: 220 });
-      tempsTabs.push({ label: "零件名称", prop: "materialDesc", width: 220 });
-      tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
-      tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    handleCommand(command) {
-      if (this.versionValue === "") {
-        this.$message.error("请先选择版本！");
-        return;
-      }
-      switch (command) {
-        case "excel":
-          this.listQuery.fileType = 1; //0是csv,1是excel
-          break;
-        case "csv":
-          this.listQuery.fileType = 0; //0是csv,1是excel
-          break;
-        default:
-          //这里是没有找到对应的值处理
-          break;
-      }
-      this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("CP7报废与索赔导出：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/settleaccount/ScrapClaims/Export", this.listQuery)
-        .then((res) => {
-          let fileNameOfProject = res;
-          this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
-            .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
-                let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, fileNameOfProject);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    // //导出功能
-    // async handleDownload() {
-    //   this.listLoading = true;
-    //   if (this.versionValue === "") {
-    //     this.$message.error("必需选择版本！");
-    //     this.listLoading = false;
-    //     return;
-    //   }
-    //   if (this.versionValue != "") {
-    //     this.listQuery.version = this.versionValue;
-    //   }
-    //   console.log("大众看板导出：" + JSON.stringify(this.listQuery));
-    //   this.$axios
-    //     .posts("/api/settleaccount/ScrapClaims/Export", this.listQuery)
-    //     .then((res) => {
-    //       let fileNameOfProject = res;
-    //       this.$axios
-    //         .BolbGets(
-    //           "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-    //         )
-    //         .then((response) => {
-    //           if (fileNameOfProject.indexOf("_") != -1) {
-    //             let downName =
-    //               fileNameOfProject.slice(
-    //                 0,
-    //                 fileNameOfProject.lastIndexOf("_")
-    //               ) +
-    //               fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-    //             downloadFile(response, downName);
-    //             this.$notify({
-    //               title: "成功",
-    //               message: "数据-导出成功！",
-    //               type: "success",
-    //               duration: 2000,
-    //             });
-    //           } else {
-    //             downloadFile(response, fileNameOfProject);
-    //             this.$notify({
-    //               title: "成功",
-    //               message: "数据-导出成功！",
-    //               type: "success",
-    //               duration: 2000,
-    //             });
-    //           }
-    //           this.listLoading = false;
-    //         });
-    //     });
-    // },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    getVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/ScrapClaims/listVersion", this.listQuery)
-        .then((response) => {
-          this.versionList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.id;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-          if (JSON.stringify(this.versionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
-            this.getList();
-          }
-          this.listLoading = false;
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    handleImportExcel() {
-      //导入
-      this.showExcelImport = true;
-      this.$refs.importexcel.handleImportExcelClick();
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      // if (column.property === "state") {
-      //   return { 0: "其他", 2: "已结" }[row[column.property]];
-      // }
-      if (
-        column.property == "settleInputDate" ||
-        column.property == "settleDate"
-      ) {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/settleaccount/ScrapClaims/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/settleaccount/ScrapClaims/" + id)
-        .then((response) => {
-          this.form = response;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "materialCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    /** 多项筛选操作 */
-    /** 筛选操作 */
-    handleFilters(data) {
-      if (data === null) {
-        this.listQuery.Filters = [];
-        this.getList(); //查询所有
-      } else {
-        this.filterObj = data;
-        console.log("筛选" + JSON.stringify(data));
-        var offsetHei = document.documentElement.clientHeight;
-        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
-        this.tableHeight = offsetHei - removeHeight;
-        this.currentPage = 1;
-        let Filter = [];
-        data.forEach((item) => {
-          let filter = {};
-          if (item.formType === "datetime" || item.formType === "datetime") {
-            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
-
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
-            }
-          } else {
-            filter["Column"] = item.fieldName;
-            filter["Value"] = item.value;
-            filter["Logic"] = 0;
-            filter["Action"] = item.action;
-            Filter.push(filter);
-          }
-        });
-        console.log("筛选条件" + JSON.stringify(Filter));
-        this.listQuery.Filters = Filter;
-        this.getList();
-      }
-    },
-    resetQuery() {},
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      // if (column.property === "qty") {
-      //   return { textAlign: "right" };
-      // } else {
-      //   return { textAlign: "left" };
-      // }
-      return { textAlign: "left" };
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/SettlementCrossReference/index.vue b/code/WebApp/vue/src/views/ux/vw/dataInput/SettlementCrossReference/index.vue
deleted file mode 100644
index b831383c..00000000
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/SettlementCrossReference/index.vue
+++ /dev/null
@@ -1,640 +0,0 @@
-<!--R3明细数据-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <XhJSSelect
-        :options="versionList"
-        style="width: 200px"
-        class="search-container"
-        @value-change="selectValue"
-      ></XhJSSelect>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload2"
-        @click="handleImportExcel()"
-        >导入文件（EXCEL）
-      </el-button>
-      
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="info"
-        icon="el-icon-download"
-        @click="handleDownload()"
-        >导出Csv
-      </el-button>
-      <!-- <el-button
-        class="filter-item"
-        size="mini"
-        type="info"
-        icon="el-icon-download"
-        @click="handleDownload()"
-        >导出预批量数据
-      </el-button> -->
-      <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照总成结算号搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button>
-      <!--表格头组件，filter查询-->
-      <c-r-m-table-head
-        ref="crmTableHead"
-        :crm-type="crmType"
-        @handle="handleHandle"
-        @filter="handleFilters"
-      >
-      </c-r-m-table-head>
-      <!-- <div class="right-container" style="margin-left: 240px">
-        <el-dropdown
-          v-if="MoreTypes.length > 0"
-          trigger="click"
-          @command="handleTypeDrop"
-        >
-          <flexbox class="right-more-item">
-            <div>更多</div>
-            <i class="el-icon-arrow-down el-icon--right" style="color: #777" />
-          </flexbox>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item
-              v-for="(item, index) in MoreTypes"
-              :key="index"
-              :command="item.type"
-              >{{ item.name }}</el-dropdown-item
-            >
-          </el-dropdown-menu>
-        </el-dropdown>
-      </div> -->
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-expend";
-import CRMTableHead from "../../../components/CRMTableHead";
-import moment from "moment";
-import Lockr from "lockr";
-import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
-
-export default {
-  name: "SettlementCrossReference",
-  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "SettlementCrossReference",
-      versionValue: "",
-      versionLabel: "",
-      versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        ParentId: "",
-        fileType: 0,
-        userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listVersionQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        SkipCount: 0,
-        Period: "",
-        Version: "",
-        branchId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        ParentId: "",
-        fileType: 0,
-        userId: "",
-        branchId: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
-    };
-  },
-  created() {
-    this.getVersionInfo();
-    this.getList();
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      /* tempsTabs.push({ label: "期间", prop: "period", width: 120 }); */
-      /* tempsTabs.push({ label: "工厂", prop: "factory", width: 120 }); */
-      tempsTabs.push({ label: "车型", prop: "model", width: 100 });
-      tempsTabs.push({ label: "零件类型", prop: "partType", width: 120 });
-      tempsTabs.push({ label: "总成结算号", prop: "settlementMaterialCode", width: 120 });
-      tempsTabs.push({ label: "BOM清单零件号", prop: "bomMaterialCode", width: 140 });
-      /* tempsTabs.push({ label: "零件名称", prop: "materialDesc", width: 150 }); */
-      tempsTabs.push({ label: "供应商代码", prop: "supplierCode", width: 100 });
-      /* tempsTabs.push({ label: "供应商名称", prop: "supplierDesc", width: 150 }); */
-      tempsTabs.push({ label: "采购员", prop: "buyer", width: 100 });
-      tempsTabs.push({ label: "适用功能", prop: "customerCode", width: 120 });
-      return tempsTabs;
-    },
-    MoreTypes() {
-      var moreTypes = [];
-      moreTypes.push({ type: "updateFis", name: "刷新FIS结算状态" });
-      moreTypes.push({ type: "enter", name: "刷新数据开票状态" });
-      return moreTypes;
-    },
-  },
-  methods: {
-    selectValue(params) {
-      //console.log(params);
-      //alert(JSON.stringify(params))
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.versionLabel = this.versionList.filter(u => u.value === this.versionValue)[0].id;
-      this.getList();
-    },
-    handleTypeDrop(command, params = {}) {
-      if (command == "updateFis") {
-        this.listLoading = true;
-        //this.listQuery.SkipCount = (this.page - 1) * 10000;
-        this.$axios
-          .posts("/api/settleaccount/SettleAccount/updateFis")
-          .then((res) => {
-            if (res == true) {
-              this.$notify({
-                title: "成功",
-                message: "FIS数据-更新成功！",
-                type: "success",
-                duration: 2000,
-              });
-            } else {
-              this.$message({
-                type: "warning",
-                message: "FIS数据-更新失败！",
-              });
-            }
-            this.listLoading = false;
-          });
-      } else if (command == "enter") {
-      }
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    getVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/SettlementCrossReference/versionlist", this.listQuery)
-        .then((response) => {
-          //console.log(response)
-          this.versionList = [];
-          response.items.forEach((element) => {
-            //console.log(element)
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            options.id = element.branchId;
-            this.versionList.push(options);
-            /* let options2 = {};
-            options2.value = "202109";
-            options2.label = "202109";
-            options2.id = "00000000-0000-0000-0000-000000000000";
-            this.versionList.push(options2); */
-          });
-          if (JSON.stringify(this.versionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].value;
-            this.versionLabel = this.versionList[0].id;
-            //this.listQuery.Filters = [];
-            this.getList();
-          }
-          /* else//暂无数据临时处理
-          {
-            let options = {};
-            options.value = "00000000-0000-0000-0000-000000000000";
-            options.label = "202108";
-            this.versionList.push(options);
-            let options2 = {};
-            options2.value = "00000000-0000-0000-0000-000000000001";
-            options2.label = "202109";
-            this.versionList.push(options2);
-            this.versionValue = this.versionList[0].value;
-            this.versionLabel = this.versionList[0].id;
-            this.getList();
-          } */
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    handleImportExcel() {
-      //导入
-      this.showExcelImport = true;
-      this.$refs.importexcel.handleImportExcelClick();
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if(column.property === 'customerCode')
-      {
-        if(row[column.property] === 'R0001')
-        {
-          var vname = '二配';
-          return vname;
-        }
-        else if(row[column.property] === 'R0003')
-        {
-          var vname = '结算';
-          return vname;
-        }
-        else
-        {
-          return row[column.property];
-        }
-      }
-      if (column.property === "state") {
-        return { 0: "其他", 2: "已结" }[row[column.property]];
-      }
-      if (column.property == "cP5A" || column.property == "cP7") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-    ExportPreBatch() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-    //导出功能
-    async handleDownload() {
-      this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
-      console.log("结算件对照关系导出：" + JSON.stringify(this.versionLabel));
-      this.listExportQuery.Filters = [];
-      this.listExportQuery.userId = "00000000-0000-0000-0000-000000000000"
-      this.listExportQuery.ParentId = "00000000-0000-0000-0000-000000000000"
-      this.listExportQuery.branchId = "00000000-0000-0000-0000-000000000000"
-      this.$axios
-        .posts("/api/settleaccount/SettlementCrossReference/Export", this.listExportQuery)
-        .then((res) => {
-          let fileNameOfProject = res;
-          this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
-            .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
-                let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, fileNameOfProject);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.versionValue != "") {
-        this.listQuery.ParentId = this.versionLabel;
-        this.listQuery.Version = this.versionValue;
-      } else {
-        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
-        this.listQuery.Version = "202109";
-      }
-      this.$axios
-        .posts("/api/settleaccount/SettlementCrossReference/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          //alert(JSON.stringify(response.Items))
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/settleaccount/SettleAccount/" + id)
-        .then((response) => {
-          this.form = response;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "settlementMaterialCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    /** 多项筛选操作 */
-    /** 筛选操作 */
-    handleFilters(data) {
-      if (data === null) {
-        this.listQuery.Filters = [];
-        this.getList(); //查询所有
-      } else {
-        this.filterObj = data;
-        console.log("筛选" + JSON.stringify(data));
-        var offsetHei = document.documentElement.clientHeight;
-        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
-        this.tableHeight = offsetHei - removeHeight;
-        this.currentPage = 1;
-        let Filter = [];
-        data.forEach((item) => {
-          let filter = {};
-          if (item.formType === "datetime" || item.formType === "datetime") {
-            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
-
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
-            }
-          } else {
-            filter["Column"] = item.fieldName;
-            filter["Value"] = item.value;
-            filter["Logic"] = 0;
-            filter["Action"] = item.action;
-            Filter.push(filter);
-          }
-        });
-        console.log("筛选条件" + JSON.stringify(Filter));
-        this.listQuery.Filters = Filter;
-        this.getList();
-      }
-    },
-    resetQuery() {},
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-       console.log(this.listQuery.Sorting)
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/SparePart/index.vue b/code/WebApp/vue/src/views/ux/vw/dataInput/SparePart/index.vue
deleted file mode 100644
index 2f693cca..00000000
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/SparePart/index.vue
+++ /dev/null
@@ -1,641 +0,0 @@
-<!--大众备件导入功能-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <XhJSSelect
-        :options="versionList"
-        style="width: 200px"
-        class="search-container"
-        @value-change="selectValue"
-      ></XhJSSelect>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload2"
-        @click="handleImportExcel()"
-        >导入文件（Excel）
-      </el-button>
-      <!-- <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-download"
-        @click="handleDownload()"
-        >导出Excel
-      </el-button> -->
-      <el-dropdown
-        size="small"
-        class="filter-item"
-        style="margin-left: 15px; font-weight: bold"
-        @command="handleCommand"
-      >
-        <span class="el-dropdown-link">
-          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="excel" icon="el-icon-plus"
-            >导出Excel</el-dropdown-item
-          >
-          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
-            >导出Csv</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
-      <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照采购订单号搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button>
-      <!--表格头组件，filter查询-->
-      <c-r-m-table-head
-        ref="crmTableHead"
-        :crm-type="crmType"
-        @handle="handleHandle"
-        @filter="handleFilters"
-      >
-      </c-r-m-table-head>
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-base";
-import CRMTableHead from "../../../components/CRMTableHead";
-import moment from "moment";
-import Lockr from "lockr";
-import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
-
-export default {
-  name: "SparePart",
-  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "sparePart",
-      versionValue: "",
-      versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: true,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        site: "TH",
-        userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        fileType: 0,
-        userId: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
-    };
-  },
-  created() {
-    this.getVersionInfo();
-    if (this.versionList == []) {
-      this.getList();
-    }
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
-      tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 });
-      tempsTabs.push({
-        label: "采购订单号",
-        prop: "purchaseOrderNo",
-        width: 220,
-      });
-      tempsTabs.push({
-        label: "采购订单行项目",
-        prop: "purchaseOrderNoItem",
-        width: 170,
-      });
-      tempsTabs.push({
-        label: "采购订单文本",
-        prop: "purchaseOrderNoText",
-        width: 170,
-      });
-      tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 });
-      tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 });
-      tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 });
-      tempsTabs.push({
-        label: "采购价格不含税",
-        prop: "purchasePriceNoTax",
-        width: 200,
-      });
-      tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 });
-      tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 });
-      tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 });
-      tempsTabs.push({
-        label: "日期",
-        prop: "spareDate",
-        width: 150,
-        formType: "datetime",
-      });
-
-      tempsTabs.push({
-        label: "交货单号",
-        prop: "deliveryOrderNo",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "交货行号",
-        prop: "deliveryLineNum",
-        width: 150,
-      });
-      tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 });
-      tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 });
-      tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 });
-      tempsTabs.push({
-        label: "德国发票号",
-        prop: "germanInvoiceNo",
-        width: 150,
-      });
-      tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
-      tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    handleCommand(command) {
-      if (this.versionValue === "") {
-        this.$message.error("请先选择版本！");
-        return;
-      }
-      switch (command) {
-        case "excel":
-          this.listQuery.fileType = 1; //0是csv,1是excel
-          break;
-        case "csv":
-          this.listQuery.fileType = 0; //0是csv,1是excel
-          break;
-        default:
-          //这里是没有找到对应的值处理
-          break;
-      }
-      this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("大众看板导出：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/settleaccount/SparePart/Export", this.listQuery)
-        .then((res) => {
-          let fileNameOfProject = res;
-          this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
-            .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
-                let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, fileNameOfProject);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-    // //导出功能
-    // async handleDownload() {
-    //   this.listLoading = true;
-    //   if (this.versionValue === "") {
-    //     this.$message.error("必需选择版本！");
-    //     this.listLoading = false;
-    //     return;
-    //   }
-    //   if (this.versionValue != "") {
-    //     this.listQuery.version = this.versionValue;
-    //   }
-    //   console.log("大众看板导出：" + JSON.stringify(this.listQuery));
-    //   this.$axios
-    //     .posts("/api/settleaccount/SparePart/Export", this.listQuery)
-    //     .then((res) => {
-    //       let fileNameOfProject = res;
-    //       this.$axios
-    //         .BolbGets(
-    //           "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-    //         )
-    //         .then((response) => {
-    //           if (fileNameOfProject.indexOf("_") != -1) {
-    //             let downName =
-    //               fileNameOfProject.slice(
-    //                 0,
-    //                 fileNameOfProject.lastIndexOf("_")
-    //               ) +
-    //               fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-    //             downloadFile(response, downName);
-    //             this.$notify({
-    //               title: "成功",
-    //               message: "数据-导出成功！",
-    //               type: "success",
-    //               duration: 2000,
-    //             });
-    //           } else {
-    //             downloadFile(response, fileNameOfProject);
-    //             this.$notify({
-    //               title: "成功",
-    //               message: "数据-导出成功！",
-    //               type: "success",
-    //               duration: 2000,
-    //             });
-    //           }
-    //           this.listLoading = false;
-    //         });
-    //     });
-    // },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    getVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/SparePart/listVersion", this.listQuery)
-        .then((response) => {
-          this.versionList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.id;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-          if (JSON.stringify(this.versionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
-            this.getList();
-          }
-          this.listLoading = false;
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    handleImportExcel() {
-      //导入
-      this.showExcelImport = true;
-      this.$refs.importexcel.handleImportExcelClick();
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      // if (column.property === "state") {
-      //   return { 0: "其他", 2: "已结" }[row[column.property]];
-      // }
-      if (
-        column.property == "settleInputDate" ||
-        column.property == "settleDate"
-      ) {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/settleaccount/SparePart/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/settleaccount/SparePart/" + id)
-        .then((response) => {
-          this.form = response;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "purchaseOrderNo";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    /** 多项筛选操作 */
-    /** 筛选操作 */
-    handleFilters(data) {
-      if (data === null) {
-        this.listQuery.Filters = [];
-        this.getList(); //查询所有
-      } else {
-        this.filterObj = data;
-        console.log("筛选" + JSON.stringify(data));
-        var offsetHei = document.documentElement.clientHeight;
-        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
-        this.tableHeight = offsetHei - removeHeight;
-        this.currentPage = 1;
-        let Filter = [];
-        data.forEach((item) => {
-          let filter = {};
-          if (item.formType === "datetime" || item.formType === "datetime") {
-            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
-
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
-            }
-          } else {
-            filter["Column"] = item.fieldName;
-            filter["Value"] = item.value;
-            filter["Logic"] = 0;
-            filter["Action"] = item.action;
-            Filter.push(filter);
-          }
-        });
-        console.log("筛选条件" + JSON.stringify(Filter));
-        this.listQuery.Filters = Filter;
-        this.getList();
-      }
-    },
-    resetQuery() {},
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      // if (column.property === "qty") {
-      //   return { textAlign: "right" };
-      // } else {
-      //   return { textAlign: "left" };
-      // }
-      return { textAlign: "left" };
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/erpei/index.vue b/code/WebApp/vue/src/views/ux/vw/dataInput/erpei/index.vue
deleted file mode 100644
index 1d43be43..00000000
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/erpei/index.vue
+++ /dev/null
@@ -1,768 +0,0 @@
-<!--R3明细数据-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <XhJSSelect
-        :options="versionList"
-        style="width: 200px"
-        class="search-container"
-        @value-change="selectValue"
-      ></XhJSSelect>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="handleCreate"
-        >统计二配结算汇总表
-      </el-button>
-
-      <!-- <el-button
-        class="filter-item"
-        size="mini"
-        type="info"
-        icon="el-icon-download"
-        @click="handleDownload()"
-        >导出二配结算汇总表
-      </el-button> -->
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="info"
-        icon="el-icon-download"
-        @click="handleDownload()"
-        >导出二配结算供应商清单
-      </el-button>
-
-      <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照零件号搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button>
-      <!--表格头组件，filter查询-->
-      <c-r-m-table-head
-        ref="crmTableHead"
-        :crm-type="crmType"
-        @handle="handleHandle"
-        @filter="handleFilters"
-      >
-      </c-r-m-table-head>
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!--表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      width="450px"
-    >
-      <el-form
-        ref="form"
-        :inline="true"
-        :model="form"
-        :rules="rules"
-        size="small"
-        label-width="120px"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="版本" required />
-          </el-col>
-          <el-col :md="20" :xs="24">
-            <el-form-item prop="version">
-              <XhJSSelectVerson
-                :options="OpenVersionList"
-                style="width: 130px"
-                class="search-container"
-                @value-change="selectValueVerson"
-              ></XhJSSelectVerson>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        >
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-vw";
-import CRMTableHead from "../../../components/CRMTableHead";
-import moment from "moment";
-import Lockr from "lockr";
-import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
-import XhJSSelectVerson from "@/components/CreateCom/Xh-JS-Select-Label.vue";
-
-export default {
-  name: "SettleAccount",
-  components: {
-    Pagination,
-    CRMTableHead,
-    importExcel,
-    XhJSSelect,
-    XhJSSelectVerson,
-  },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "EP",
-      versionValue: "",
-      versionValueVerson: "",
-      versionLabel: "",
-      versionList: [], //版本列表
-      OpenVersionList: [], //存储期间设置的版本信息
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        version: "",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        ParentId: "",
-        fileType: 0,
-        userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        ParentId: "",
-        fileType: 0,
-        userId: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
-    };
-  },
-  created() {
-    this.getVersionInfo();
-    this.getList();
-    this.getAllVersions(); //取期间设置的版本数据
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "索引", prop: "index", width: 100 });
-      tempsTabs.push({ label: "工厂", prop: "factory", width: 120 });
-      tempsTabs.push({ label: "车型", prop: "model", width: 100 });
-      tempsTabs.push({ label: "零件类型", prop: "partType", width: 150 });
-      tempsTabs.push({
-        label: "总成结算号",
-        prop: "settleMentPartCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "BOM清单零件号",
-        prop: "materialPartCode",
-        width: 150,
-      });
-      tempsTabs.push({ label: "零件名称", prop: "materialDesc", width: 150 });
-      tempsTabs.push({ label: "供应商代码", prop: "supplierCode", width: 120 });
-      tempsTabs.push({ label: "供应商名称", prop: "supplierDesc", width: 150 });
-      tempsTabs.push({ label: "BOM用量", prop: "usedNumber", width: 100 });
-      tempsTabs.push({
-        label: "供货比例[%]",
-        prop: "supplyProportion",
-        width: 120,
-      });
-      tempsTabs.push({ label: "采购员", prop: "buyer", width: 100 });
-      tempsTabs.push({ label: "价格", prop: "price", width: 100 });
-      tempsTabs.push({
-        label: "结算价格",
-        prop: "settlementPrice",
-        width: 100,
-      });
-      tempsTabs.push({ label: "单价差", prop: "diffPrice", width: 100 });
-      tempsTabs.push({
-        label: "结算件下线数量",
-        prop: "settlementNumber",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "理论结算数量",
-        prop: "theoreticalSettlementNumber",
-        width: 140,
-      });
-      tempsTabs.push({
-        label: "实际结算数量",
-        prop: "realSettlementNumber",
-        width: 140,
-      });
-      tempsTabs.push({
-        label: "实际结算金额",
-        prop: "realSettlementPrice",
-        width: 140,
-      });
-      tempsTabs.push({ label: "是否量差", prop: "isDiffNumber", width: 100 });
-      tempsTabs.push({ label: "差异金额", prop: "diffAmount", width: 100 });
-      tempsTabs.push({ label: "差异原因", prop: "remark", width: 120 });
-      return tempsTabs;
-    },
-    MoreTypes() {
-      var moreTypes = [];
-      moreTypes.push({ type: "updateFis", name: "刷新FIS结算状态" });
-      moreTypes.push({ type: "enter", name: "刷新数据开票状态" });
-      return moreTypes;
-    },
-  },
-  methods: {
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    selectValueVerson(params) {
-      //版本下拉选择
-      this.versionValueVerson = params.value;
-    },
-    // selectValue(params) {
-    //   //版本下拉选择
-    //   this.versionValue = params.label;
-    //   this.versionLabel = this.versionList.filter(
-    //     (u) => u.value === this.versionValue
-    //   )[0].label;
-    //   this.getList();
-    // },
-    handleTypeDrop(command, params = {}) {
-      if (command == "updateFis") {
-        this.listLoading = true;
-        //this.listQuery.SkipCount = (this.page - 1) * 10000;
-        this.$axios
-          .posts("/api/settleaccount/SettleAccount/updateFis")
-          .then((res) => {
-            if (res == true) {
-              this.$notify({
-                title: "成功",
-                message: "FIS数据-更新成功！",
-                type: "success",
-                duration: 2000,
-              });
-            } else {
-              this.$message({
-                type: "warning",
-                message: "FIS数据-更新失败！",
-              });
-            }
-            this.listLoading = false;
-          });
-      } else if (command == "enter") {
-      }
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    getVersionInfo() {
-      //取版本列表信息
-      this.listLoading = true;
-      this.listVersionQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts(
-          "/api/settleaccount/SettlementPakAndSpareParts/versionList",
-          this.listVersionQuery
-        )
-        .then((response) => {
-          this.versionList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.id;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-          if (JSON.stringify(this.versionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValueVerson = this.versionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    handleImportExcel() {
-      //导入
-      this.showExcelImport = true;
-      this.$refs.importexcel.handleImportExcelClick();
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "state") {
-        return { 0: "其他", 2: "已结" }[row[column.property]];
-      }
-      if (column.property == "cP5A" || column.property == "cP7") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-    ExportPreBatch() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-    
-    getAllVersions() {
-      this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
-        .then((response) => {
-          this.OpenVersionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            this.OpenVersionList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //导出功能
-    async handleDownload() {
-      this.formTitle = "大众二配结算供应商汇总";
-      this.isEdit = true;
-      this.form.version = "";
-      this.dialogFormVisible = true;
-    },
-    handleCreate() {
-      this.formTitle = "大众二配结算供应商清单";
-      this.isEdit = false;
-      this.form.version = "";
-      this.dialogFormVisible = true;
-    },
-    save() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.listLoading = true;
-          if (this.isEdit) {
-            //二配结算供应商清单
-            if (this.versionValueVerson === "") {
-              this.$message.error("必需选择版本！");
-              this.listLoading = false;
-              return;
-            }
-            console.log(
-              "二配结算供应商清单条件：" + JSON.stringify(this.versionValueVerson)
-            );
-            this.$axios
-              .posts("/api/settleaccount/SecMatch/ExportSummary", {
-                version: this.versionValueVerson,
-              })
-              .then((res) => {
-                let fileNameOfProject = res;
-                this.$axios
-                  .BolbGets(
-                    "/api/settleaccount/getblobzipfile/download/" +
-                      fileNameOfProject
-                  )
-                  .then((response) => {
-                    if (fileNameOfProject.indexOf("_") != -1) {
-                      let downName =
-                        fileNameOfProject.slice(
-                          0,
-                          fileNameOfProject.lastIndexOf("_")
-                        ) +
-                        fileNameOfProject.slice(
-                          fileNameOfProject.lastIndexOf(".")
-                        );
-                      downloadFile(response, downName);
-                      this.$notify({
-                        title: "成功",
-                        message: "数据-导出成功！",
-                        type: "success",
-                        duration: 2000,
-                      });
-                    } else {
-                      downloadFile(response, fileNameOfProject);
-                      this.$notify({
-                        title: "成功",
-                        message: "数据-导出成功！",
-                        type: "success",
-                        duration: 2000,
-                      });
-                    }
-                    this.listLoading = false;
-                  })
-                  .catch(() => {
-                    this.listLoading = false;
-                  });
-              });
-            this.dialogFormVisible = false; //关闭窗口
-          } else {
-            //二配结算汇总表
-            if (this.versionValueVerson === "") {
-              this.$message.error("必需选择版本！");
-              this.listLoading = false;
-              return;
-            }
-            console.log(
-              "二配结算清单：" + JSON.stringify(this.versionValueVerson)
-            );
-            this.$axios
-              .posts("/api/settleaccount/SecMatch/Export", {
-                version: this.versionValueVerson,
-              })
-              .then((res) => {
-                let fileNameOfProject = res;
-                this.$axios
-                  .BolbGets(
-                    "/api/settleaccount/getblobBTzipfile/download/" +
-                      fileNameOfProject
-                  )
-                  .then((response) => {
-                    if (fileNameOfProject.indexOf("_") != -1) {
-                      let downName =
-                        fileNameOfProject.slice(
-                          0,
-                          fileNameOfProject.lastIndexOf("_")
-                        ) +
-                        fileNameOfProject.slice(
-                          fileNameOfProject.lastIndexOf(".")
-                        );
-                      downloadFile(response, downName);
-                      this.$notify({
-                        title: "成功",
-                        message: "数据-导出成功！",
-                        type: "success",
-                        duration: 2000,
-                      });
-                    } else {
-                      downloadFile(response, fileNameOfProject);
-                      this.$notify({
-                        title: "成功",
-                        message: "数据-导出成功！",
-                        type: "success",
-                        duration: 2000,
-                      });
-                    }
-                    this.listLoading = false;
-                  })
-                  .catch(() => {
-                    this.listLoading = false;
-                  });
-              });
-            this.dialogFormVisible = false; //关闭窗口
-          }
-        }
-      });
-    },
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.versionValue != "") {
-        //this.listQuery.ParentId = this.versionValue;
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("二配结算导出条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/settleaccount/SecMatch/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          //alert(JSON.stringify(response.Items))
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/settleaccount/SettleAccount/" + id)
-        .then((response) => {
-          this.form = response;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "materialCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    /** 多项筛选操作 */
-    /** 筛选操作 */
-    handleFilters(data) {
-      if (data === null) {
-        this.listQuery.Filters = [];
-        this.getList(); //查询所有
-      } else {
-        this.filterObj = data;
-        console.log("筛选" + JSON.stringify(data));
-        var offsetHei = document.documentElement.clientHeight;
-        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
-        this.tableHeight = offsetHei - removeHeight;
-        this.currentPage = 1;
-        let Filter = [];
-        data.forEach((item) => {
-          let filter = {};
-          if (item.formType === "datetime" || item.formType === "datetime") {
-            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
-
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
-            }
-          } else {
-            filter["Column"] = item.fieldName;
-            filter["Value"] = item.value;
-            filter["Logic"] = 0;
-            filter["Action"] = item.action;
-            Filter.push(filter);
-          }
-        });
-        console.log("筛选条件" + JSON.stringify(Filter));
-        this.listQuery.Filters = Filter;
-        this.getList();
-      }
-    },
-    resetQuery() {},
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/fis/index.vue b/code/WebApp/vue/src/views/ux/vw/dataInput/fis/index.vue
index df4b3bb4..abdc0b5e 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/fis/index.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataInput/fis/index.vue
@@ -2,98 +2,102 @@
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
-      <el-form
-        :model="listQuery"
-        ref="queryForm"
-        v-show="showSearch"
-        :inline="true"
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <!-- <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
       >
-      <!-- 选择版本：
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select> -->
       <XhJSSelect
         :options="versionList"
-        style="width: 200px; margin-left: 5px"
+        style="width: 200px"
         class="search-container"
         @value-change="selectValue"
-      ></XhJSSelect> -->
-      <!-- <el-input
+      ></XhJSSelect>
+
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload2"
+        @click="handleImportExcel()"
+        >导入文本（TXT）
+      </el-button>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出Csv
+      </el-button>
+      <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照订单号全字匹配搜索..."
+        placeholder="按照订单号搜索..."
         style="width: 220px"
         class="search-container"
         @keyup.enter.native="handleFilter"
-      /> -->
-      <!-- <label>底盘号：</label> -->
-        <el-form-item label="底盘号：" prop="chassisNumber">
-          <el-input v-model="chassisNumber" style="width: 220px" size="small" placeholder="请输入底盘号" />
-        </el-form-item>
-        <!-- <label style="padding-left:10px;">CP5时间：</label> -->
-        <el-form-item label="CP5时间：" prop="cP5Time">
-          <el-date-picker
-                    v-model="cP5Time"
-                    type="datetimerange"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    :default-time="['00:00:00', '23:59:59']"
-                  >
-          </el-date-picker>
-        </el-form-item>
-        <!-- <label style="padding-left:10px;">CP7时间：</label> -->
-        <el-form-item label="CP7时间：" prop="cP7Time">
-          <el-date-picker
-                    v-model="cP7Time"
-                    type="datetimerange"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    :default-time="['00:00:00', '23:59:59']"
-                  >
-          </el-date-picker>
-        </el-form-item>
-        <!-- <label style="padding-left:10px;">结算包：</label> -->
-        <el-form-item label="结算包：" prop="itemCode">
-          <el-input v-model="itemCode" style="width: 220px" size="small"  placeholder="请输入结算包" />
-        </el-form-item>
-
-        <el-form-item>
-          <el-button
-            size="mini"
-            type="success"
-            icon="el-icon-search"
-            @click="handleFilter"
-            >搜索
-          </el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            class="filter-item"
-            size="mini"
-            type="info"
-            icon="el-icon-download"
-            @click="handleDownload()"
-            >导出Excel
-          </el-button>
-        </el-form-item>
-        <el-form-item>
-          <!--表格头组件，filter查询-->
-          <c-r-m-table-head
-            ref="crmTableHead"
-            :crm-type="crmType"
-            @handle="handleHandle"
-            @filter="handleFilters"
-          >
-          </c-r-m-table-head>
-        </el-form-item>
-      </el-form>
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+      <div class="right-container">
+        <el-dropdown
+          v-if="MoreTypes.length > 0"
+          trigger="click"
+          @command="handleTypeDrop"
+        >
+          <flexbox class="right-more-item">
+            <div>更多</div>
+            <i class="el-icon-arrow-down el-icon--right" style="color: #777" />
+          </flexbox>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              v-for="(item, index) in MoreTypes"
+              :key="index"
+              :command="item.type"
+              >{{ item.name }}</el-dropdown-item
+            >
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
     </flexbox>
-    <!-- <flexbox class="content-header">
-    </flexbox> -->
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading="listLoading"
+      v-loading.fullscreen.lock="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
@@ -110,6 +114,21 @@
       @selection-change="handleSelectionChange"
       @row-click="handleRowClick"
     >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        label="版本"
+        prop="version"
+        sortable="custom"
+        align="center"
+        width="100px"
+        fixed
+      >
+        <template slot-scope="scope">
+          <el-tooltip :content="scope.row.version" placement="top">
+            <span class="link-type">{{ scope.row.version }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
       <el-table-column
         v-for="(item, index) in getDefaultField"
         :key="index"
@@ -154,10 +173,10 @@ import importExcel from "@/components/ImportTxt";
 import moment from "moment";
 import Lockr from "lockr";
 import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
 
 export default {
-  name: "Bomdatabase",
+  name: "FIS",
   components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
   filters: {
@@ -221,23 +240,17 @@ export default {
         //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
-        version: "",
+        ParentId: "",
         fileType: 0,
         userId: "00000000-0000-0000-0000-000000000000",
       },
-      chassisNumber: '',
-      cP5Time: '',
-      cP7Time: '',
-      itemCode: '',
-     
       page: 1,
-      showSearch: true,
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 295,
+      tableHeight: document.documentElement.clientHeight - 260,
       isEdit: false,
     };
   },
@@ -245,19 +258,35 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 295;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
     this.getVersionInfo();
-    if (this.versionList == [] || this.versionList == "") {
-      this.getList();
-    }
+    this.getList();
   },
+  //   watch: {
+  //     customerInfos: {
+  //       handler(newVal) {
+  //         if (newVal == "" || newVal == "undefined") {
+  //           //TODO
+  //         } else {
+  //           newVal.forEach((element) => {
+  //             this.customerInfo.fisId = element.FisId;
+  //           });
+  //           if (this.customerInfo.fisId != "") {
+  //             this.getList();
+  //           }
+  //         }
+  //       },
+  //     },
+  //   },
   computed: {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
+      //   tempsTabs.push({ label: "年度", prop: "year", width: 120 });
+      //   tempsTabs.push({ label: "期间", prop: "period", width: 150 });
       tempsTabs.push({ label: "订单号", prop: "orderBillNum", width: 150 });
       tempsTabs.push({
         label: "开始时间",
@@ -284,7 +313,7 @@ export default {
       tempsTabs.push({ label: "顺序号", prop: "sequenceNumber", width: 120 });
       tempsTabs.push({ label: "底盘号", prop: "chassisNumber", width: 180 });
       tempsTabs.push({ label: "底盘号2", prop: "chassisNumber2", width: 150 });
-      tempsTabs.push({ label: "底盘开票状态", prop: "state", width: 150 });
+      tempsTabs.push({ label: "状态", prop: "state", width: 150 });
       //tempsTabs.push({ label: "FIS年度", prop: "fISYear", width: 120 });
       tempsTabs.push({
         label: "CP7时间",
@@ -293,9 +322,14 @@ export default {
         formType: "datetime",
       });
       tempsTabs.push({ label: "结算数量", prop: "settledQty", width: 100 });
-      tempsTabs.push({ label: "底盘结算状态", prop: "settleState", width: 140 });
       return tempsTabs;
     },
+    MoreTypes() {
+      var moreTypes = [];
+      moreTypes.push({ type: "examine", name: "审核通过" });
+      //moreTypes.push({ type: "enter", name: "新按钮" });
+      return moreTypes;
+    },
   },
   methods: {
     selectValue(params) {
@@ -331,7 +365,7 @@ export default {
     getVersionInfo() {
       //取版本列表信息
       //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 3000;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
       this.$axios
         .posts("/api/settleaccount/fis/listVersion", this.listQuery)
         .then((response) => {
@@ -344,7 +378,7 @@ export default {
           });
           if (JSON.stringify(this.versionList) != "[]") {
             //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
+            this.versionValue = this.versionList[0].value;
             this.getList();
           }
         })
@@ -366,12 +400,7 @@ export default {
     /** 格式化字段 */
     fieldFormatter(row, column) {
       if (column.property === "state") {
-        return { 0: "未结", 1: "部分结算", 2: "已结"}[
-          row[column.property]
-        ];
-      }
-      if (column.property === "settleState") {
-        return { 0: "底盘未结", 1: "底盘部分结算", 2: "底盘已结"}[
+        return { 0: "未结", 1: "部分结算", 2: "已结", 3: "预批量" }[
           row[column.property]
         ];
       }
@@ -403,9 +432,13 @@ export default {
         return;
       }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("FIS导出：" + JSON.stringify(this.listQuery));
+      this.listQuery.fileType = 0; //0是csv,1是excel
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log("R3导出：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts("/api/settleaccount/fis/Export", this.listQuery)
         .then((res) => {
@@ -465,16 +498,22 @@ export default {
           this.listLoading = false;
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
+        this.listQuery.ParentId = this.versionValue;
+      } else {
+        this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "Enabled")
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
+      console.log("fis:" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/fis/list_th", this.listQuery)
+        .posts("/api/settleaccount/fis/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           //alert(JSON.stringify(response.Items))
@@ -497,72 +536,16 @@ export default {
     /** 筛选操作 */
     handleFilter() {
       this.page = 1;
-      //this.getList();
+      this.getList();
       this.listQuery.Filters = [];
-      //this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "Enabled")
-      if (this.chassisNumber != "") {
-        var column = "chassisNumber";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.chassisNumber,
-        };
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "chassisNumber")
-        this.listQuery.Filters.push(filter);
-      }
-      if (this.cP5Time != "") {
-        var column = "cP5Time";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 4,
-          value: this.cP5Time[0],
-        };
-            
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "cP5Time");
-        this.listQuery.Filters.push(filter);
-
-        if (this.cP5Time[1] != null) {
-          let filter2 = {
-          logic: 0,
-          column: column,
-          action: 5,
-          value: this.cP5Time[1],
-          };
-          this.listQuery.Filters.push(filter2);
-        };
-      }
-      if (this.cP7Time != "") {
-        var column = "cP7Time";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 4,
-          value: this.cP7Time[0],
-        };
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "cP7Time")
-        this.listQuery.Filters.push(filter);
-
-        if (this.cP7Time[1] != null) {
-          let filter2 = {
-          logic: 0,
-          column: column,
-          action: 5,
-          value: this.cP7Time[1],
-          };
-          this.listQuery.Filters.push(filter2);
-        };
-      }
-      if (this.itemCode != "") {
-        var column = "itemCode";
+      if (this.searchContent != "") {
+        var column = "orderBillNum";
         let filter = {
           logic: 0,
           column: column,
-          action: 0,
-          value: this.itemCode,
+          action: 6,
+          value: this.searchContent,
         };
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "itemCode")
         this.listQuery.Filters.push(filter);
       }
       this.getList();
@@ -581,35 +564,30 @@ export default {
         this.tableHeight = offsetHei - removeHeight;
         this.currentPage = 1;
         let Filter = [];
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "Enabled")
         data.forEach((item) => {
           let filter = {};
           if (item.formType === "datetime" || item.formType === "datetime") {
             //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["column"] = item.fieldName;
-            filter["logic"] = 0;
-            filter["value"] = item.value[0];
-            filter["action"] = item.action;
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
             Filter.push(filter);
 
             if (item.value[1] != null) {
-              filter["value"] = item.value[1];
-              filter["action"] = 5;
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
               Filter.push(filter);
             }
           } else {
-            filter["column"] = item.fieldName;
-            filter["value"] = item.value;
-            filter["logic"] = 0;
-            filter["action"] = item.action;
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
             Filter.push(filter);
           }
         });
         console.log("筛选条件" + JSON.stringify(Filter));
-        /* Filter.forEach(element => {
-          this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== element.column);
-          this.listQuery.Filters.push(element);
-        }); */
         this.listQuery.Filters = Filter;
         this.getList();
       }
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/hq_bt/index.vue b/code/WebApp/vue/src/views/ux/vw/dataInput/hq_bt/index.vue
deleted file mode 100644
index e5d35866..00000000
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/hq_bt/index.vue
+++ /dev/null
@@ -1,594 +0,0 @@
-<!--红旗H平台导入功能-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <XhJSSelect
-        :options="versionList"
-        style="width: 200px"
-        class="search-container"
-        @value-change="selectValue"
-      ></XhJSSelect>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload2"
-        @click="handleImportExcel()"
-        >导入文件（Excel）
-      </el-button>
-      <!-- <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-download"
-        @click="handleDownload()"
-        >导出Excel
-      </el-button> -->
-      <el-dropdown
-        size="small"
-        class="filter-item"
-        style="margin-left: 15px; font-weight: bold"
-        @command="handleCommand"
-      >
-        <span class="el-dropdown-link">
-          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="excel" icon="el-icon-plus"
-            >导出Excel</el-dropdown-item
-          >
-          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
-            >导出Csv</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
-      <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照采购订单号搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button>
-      <!--表格头组件，filter查询-->
-      <c-r-m-table-head
-        ref="crmTableHead"
-        :crm-type="crmType"
-        @handle="handleHandle"
-        @filter="handleFilters"
-      >
-      </c-r-m-table-head>
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-base";
-import CRMTableHead from "../../../components/CRMTableHead";
-import moment from "moment";
-import Lockr from "lockr";
-import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
-
-export default {
-  name: "HQHPlatform",
-  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "hqHPlatform",
-      versionValue: "",
-      versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: true,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        site: "TH",
-        userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        fileType: 0,
-        userId: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 220,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 220;
-    };
-  },
-  created() {
-    this.getVersionInfo();
-    if (this.versionList == []) {
-      this.getList();
-    }
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
-      tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 });
-      tempsTabs.push({
-        label: "采购订单号",
-        prop: "purchaseOrderNo",
-        width: 220,
-      });
-      tempsTabs.push({
-        label: "采购订单行项目",
-        prop: "purchaseOrderNoItem",
-        width: 170,
-      });
-      tempsTabs.push({
-        label: "采购订单文本",
-        prop: "purchaseOrderNoText",
-        width: 170,
-      });
-      tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 });
-      tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 });
-      tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 });
-      tempsTabs.push({
-        label: "采购价格不含税",
-        prop: "purchasePriceNoTax",
-        width: 200,
-      });
-      tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 });
-      tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 });
-      tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 });
-      tempsTabs.push({
-        label: "日期",
-        prop: "spareDate",
-        width: 150,
-        formType: "datetime",
-      });
-
-      tempsTabs.push({
-        label: "交货单号",
-        prop: "deliveryOrderNo",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "交货行号",
-        prop: "deliveryLineNum",
-        width: 150,
-      });
-      tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 });
-      tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 });
-      tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 });
-      tempsTabs.push({
-        label: "德国发票号",
-        prop: "germanInvoiceNo",
-        width: 150,
-      });
-      tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
-      tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    handleCommand(command) {
-      if (this.versionValue === "") {
-        this.$message.error("请先选择版本！");
-        return;
-      }
-      switch (command) {
-        case "excel":
-          this.listQuery.fileType = 1; //0是csv,1是excel
-          break;
-        case "csv":
-          this.listQuery.fileType = 0; //0是csv,1是excel
-          break;
-        default:
-          //这里是没有找到对应的值处理
-          break;
-      }
-      this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("红旗H平台导出：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/settleaccount/HQHPlatform/Export", this.listQuery)
-        .then((res) => {
-          let fileNameOfProject = res;
-          this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
-            .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
-                let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, fileNameOfProject);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    getVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/HQHPlatform/listVersion", this.listQuery)
-        .then((response) => {
-          this.versionList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.id;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-          if (JSON.stringify(this.versionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
-            this.getList();
-          }
-          this.listLoading = false;
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    handleImportExcel() {
-      //导入
-      this.showExcelImport = true;
-      this.$refs.importexcel.handleImportExcelClick();
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      // if (column.property === "state") {
-      //   return { 0: "其他", 2: "已结" }[row[column.property]];
-      // }
-      if (
-        column.property == "settleInputDate" ||
-        column.property == "settleDate"
-      ) {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/settleaccount/HQHPlatform/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/settleaccount/HQHPlatform/" + id)
-        .then((response) => {
-          this.form = response;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "purchaseOrderNo";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    /** 多项筛选操作 */
-    /** 筛选操作 */
-    handleFilters(data) {
-      if (data === null) {
-        this.listQuery.Filters = [];
-        this.getList(); //查询所有
-      } else {
-        this.filterObj = data;
-        console.log("筛选" + JSON.stringify(data));
-        var offsetHei = document.documentElement.clientHeight;
-        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
-        this.tableHeight = offsetHei - removeHeight;
-        this.currentPage = 1;
-        let Filter = [];
-        data.forEach((item) => {
-          let filter = {};
-          if (item.formType === "datetime" || item.formType === "datetime") {
-            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
-
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
-            }
-          } else {
-            filter["Column"] = item.fieldName;
-            filter["Value"] = item.value;
-            filter["Logic"] = 0;
-            filter["Action"] = item.action;
-            Filter.push(filter);
-          }
-        });
-        console.log("筛选条件" + JSON.stringify(Filter));
-        this.listQuery.Filters = Filter;
-        this.getList();
-      }
-    },
-    resetQuery() {},
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      // if (column.property === "qty") {
-      //   return { textAlign: "right" };
-      // } else {
-      //   return { textAlign: "left" };
-      // }
-      return { textAlign: "left" };
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue b/code/WebApp/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue
deleted file mode 100644
index 6e1f5941..00000000
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue
+++ /dev/null
@@ -1,1408 +0,0 @@
-<!--发票与结算核对明细-->
-<template>
-  <div class="cr-body-content">
-    <!--功能栏-->
-    <!-- 搜索 -->
-    <div style="float: left">
-      <flexbox class="content-header">
-        <JobSelectVerson
-          :options="JobVersionList"
-          style="width: 150px; margin-left: -10px"
-          class="search-container"
-          @value-change="JobVersionValue"
-        ></JobSelectVerson>
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleCreate"
-          >统计明细
-        </el-button>
-        <el-button
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete()"
-          >删除(支持批量)</el-button
-        >
-        <el-button
-          class="filter-item"
-          type="success"
-          icon="el-icon-check"
-          size="mini"
-          @click="handleConfirm()"
-          >已确认(支持批量)</el-button
-        >
-        <el-button
-          class="filter-item"
-          type="warning"
-          icon="el-icon-edit"
-          size="mini"
-          v-loading="formLoading"
-          @click="handleCreateBills()"
-          >生成出库单(支持批量)</el-button
-        >
-      </flexbox>
-    </div>
-    <!-- 刷新 -->
-    <div style="float: right">
-      <flexbox class="content-header">
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="手动刷新"
-          placement="top"
-        >
-          <el-button
-            size="mini"
-            circle
-            icon="el-icon-refresh"
-            @click="refresh()"
-          />
-        </el-tooltip>
-
-        <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔3分钟进行自动刷新！</span
-        >
-      </flexbox>
-    </div>
-
-    <!--主页面表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @row-click="handleRowClick"
-      @selection-change="handleSelectionChange"
-      @filter-change="filterChange"
-    >
-      <el-table-column type="selection" width="44px"></el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-
-      <el-table-column
-        prop="stateName"
-        label="状态(单击箭头过滤)"
-        width="165"
-        column-key="stateName"
-        align="center"
-        :filters="[
-          { text: '执行完成(任务成功)', value: 'Succeeded' },
-          { text: '执行完成(任务失败)', value: 'Failed' },
-          { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: 'Scheduled' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <el-tag
-            v-for="(item, index) in stateNameCateMap"
-            v-show="scope.row.stateName == item.value"
-            :key="index"
-            :type="item.cssName"
-          >
-            {{ item.label }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="250">
-        <template slot-scope="scope">
-          <div align="center">
-            <!-- <el-button
-              v-if="scope.row.actionName == '导出'"
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            > -->
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.stateName == 'Succeeded' &&
-                scope.row.downFileName != ''
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >下载</el-button
-            >
-            <el-button
-              v-if="
-                scope.row.actionName == '导出' &&
-                scope.row.error != '' &&
-                scope.row.stateName == 'Succeeded'
-              "
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
-              icon="el-icon-edit"
-              >检验失败，下载</el-button
-            >
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-    <div class="table-footer">
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-
-    <!--统计功能表单渲染-->
-    <el-dialog
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="680px"
-    >
-      <el-form
-        ref="formCount"
-        :inline="true"
-        :rules="rules"
-        :model="formCount"
-        size="mini"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="选择版本" required />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="versionValue">
-              <el-select
-                v-model="formCount.versionValue"
-                size="medium"
-                clearable
-                style="width: 188px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in versionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="发货状态" style="margin-left: 10px" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -110px">
-            <el-form-item prop="BillStatus">
-              <el-select
-                size="medium"
-                v-model="formCount.BillStatus"
-                placeholder="请选择"
-                style="width: 188px; margin-right: 25px"
-              >
-                <el-option label="未发货" :value="1"></el-option>
-                <el-option label="已发货" :value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="物料组(车型)" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialGroupValue">
-              <el-select
-                v-model="formCount.materialGroupValue"
-                size="medium"
-                multiple
-                filterable
-                clearable
-                style="width: 450px; margin-right: 15px"
-                @change="valueChange"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in materialGroupList"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value"
-                >
-                  <span style="float: left">{{ item.label }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                    item.value
-                  }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="收货仓库描述" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialGroupValue">
-              <el-select
-                v-model="formCount.materialGroupValue"
-                size="medium"
-                multiple
-                filterable
-                clearable
-                style="width: 450px; margin-right: 15px"
-                @change="valueChange"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in materialGroupList"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value"
-                >
-                  <span style="float: left">{{ item.label }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                    item.value
-                  }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="交货日期" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="startTime">
-              <el-date-picker
-                v-model="formCount.startTime"
-                type="datetime"
-                size="small"
-                :picker-options="pickerOptions0"
-                @change="getdateValue"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item prop="endTime">
-              <el-date-picker
-                v-model="formCount.endTime"
-                type="datetime"
-                :picker-options="pickerOptions1"
-                size="small"
-                @change="getdateVal"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-collapse v-model="activeNames">
-          <el-collapse-item name="1">
-            <template slot="title">
-              其他搜索条件(单击折叠或展开)<i
-                class="header-icon el-icon-info"
-                style="color: #37b328"
-              ></i>
-            </template>
-
-            <el-row>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="订货看板编号" />
-              </el-col>
-              <el-col :md="10" :xs="24" style="margin-left: -80px">
-                <el-form-item prop="kennCode">
-                  <el-input
-                    type="textarea"
-                    v-model="formCount.kennCode"
-                    style="width: 170px"
-                    :rows="4"
-                    placeholder="多个订货看板编号，请以回车换行形式添加！"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="发货零件号" />
-              </el-col>
-              <el-col :md="10" :xs="24" style="margin-left: -95px">
-                <el-form-item prop="chassisNumber">
-                  <el-input
-                    v-model="formCount.chassisNumber"
-                    style="width: 170px"
-                    type="textarea"
-                    :rows="4"
-                    placeholder="多个发货零件号，请以回车换行形式添加！"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="结算验收单号" />
-              </el-col>
-              <el-col :md="10" :xs="24" style="margin-left: -80px">
-                <el-form-item prop="materialCode">
-                  <el-input
-                    v-model="formCount.materialCode"
-                    style="width: 170px"
-                    type="textarea"
-                    :rows="4"
-                    placeholder="多个结算验收单号，请以回车换行形式添加！"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="结算零件号" />
-              </el-col>
-              <el-col :md="10" :xs="24" style="margin-left: -95px">
-                <el-form-item prop="sapCode">
-                  <el-input
-                    v-model="formCount.sapCode"
-                    style="width: 170px"
-                    type="textarea"
-                    :rows="4"
-                    placeholder="多个结算零件号，请以回车换行形式添加！"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="SAP编号" />
-              </el-col>
-              <el-col :md="10" :xs="24" style="margin-left: -80px">
-                <el-form-item prop="sapCode">
-                  <el-input
-                    v-model="formCount.sapCode"
-                    style="width: 450px"
-                    type="textarea"
-                    :rows="4"
-                    placeholder="多个厂内零件号，请以回车换行形式添加！"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-collapse-item>
-        </el-collapse>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="text" @click="dialogFormVisible = false"
-          >取消</el-button
-        > -->
-        <el-button @click="resetForm('formCount')">重置</el-button>
-        <el-button v-loading="formLoading" type="primary" @click="save"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
-
-    <el-dialog
-      title="批量录入KEEN号"
-      :visible.sync="showModal"
-      width="400px"
-      height="500px"
-      append-to-body
-    >
-      <flexbox class="content">
-        <div>
-          <el-input
-            type="textarea"
-            v-model="paster"
-            @paste.native="pasteMe"
-            :rows="6"
-          />
-          <el-table :data="tableData" max-height="400">
-            <el-table-column
-              prop="name"
-              label="说明：只支持从Excel上粘贴复制，不支持手输！"
-              width="300"
-            >
-            </el-table-column>
-          </el-table>
-        </div>
-      </flexbox>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submiteBillNo">确定录入</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../../components/CRMTableHead";
-import moment from "moment";
-import PasteExcel from "@/components/PasteExcel/index.vue";
-import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
-
-export default {
-  name: "HQH",
-  components: { Pagination, CRMTableHead, PasteExcel, JobSelectVerson },
-  directives: { permission },
-
-  data() {
-    return {
-      crmType: "backJob",
-      activeNames: ["1"],
-      tableData: [
-        {
-          name: "KEEN号",
-        },
-      ],
-      paster: "",
-      pasterValue: "",
-      JobVersionList: [],
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
-      showModal: false,
-      pickerOptionsCp5: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      pickerOptions0: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          //return  time.getTime() >= new Date(this.endTime).getTime();
-          return time.getTime() > new Date(this.endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions1: {
-        disabledDate: (time) => {
-          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
-          return time.getTime() <= new Date(this.startTime).getTime();
-        },
-      },
-      pickerOptionsCp7: {
-        disabledDate: (time) => {
-          let now = new Date();
-          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
-          let timeEnd = Date.parse(monthEndDate);
-          if (timeEnd) {
-            return (
-              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
-              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
-            ); //能选上最后一天
-          }
-        },
-      },
-      datetime5: [],
-      checkedCities: [0],
-      selectValue: "",
-      selectNameValue: "",
-      radio: "0", //结算状态：0未结 1部分结算
-      versionList: [],
-      materialGroupList: [],
-      // 是否显示详细弹出层
-      openView: false,
-      versionValue: "",
-      materialGroupValue: [],
-      formTitle: "",
-      timer: null, //定时器名称
-      //当前位置
-      activeIndex: 1,
-      //默认显示基本信息
-      activeName: "first",
-      //步骤条步数
-      stepList: [
-        {
-          title: "等待执行",
-          icon: "el-icon-sort",
-        },
-        {
-          title: "执行中",
-          icon: "el-icon-refresh",
-        },
-        {
-          title: "执行完成",
-          icon: "el-icon-check",
-        },
-      ],
-      customerInfos: "",
-      searchContent: "", // 输入内容
-      form: {},
-      formCount: {
-        startTime: "",
-        endTime: "",
-        // name: "未结算对比",
-        // settledate: "",
-        // materialCode: "",
-        // sapMaterialCode: "",
-        // chassisNumber: "",
-        // kennCode: "",
-        // version: "",
-      },
-      dataKenCode: "",
-      datachassisNumber: "",
-      datamaterialCode: "",
-      datasapCode: "",
-      getmaterialGroupValue: "",
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listExportQuery: {
-        version: "",
-        materialCode: undefined,
-        sapCode: undefined,
-        cp7Begin: undefined,
-        cp7End: undefined,
-        kenncode: undefined,
-        chassisNumber: undefined,
-        materialGroup: undefined,
-        begin: undefined,
-        end: undefined,
-      },
-      listQuery: {
-        taskId: "",
-        name: "",
-        type: "",
-      },
-      listBillQuery: {
-        version: "",
-        guids: [],
-      },
-      page: 1,
-      JobversionValue: "",
-      JobversionValueVerson: "",
-      dialogFormVisible: false,
-      multipleSelection: [],
-      tableHeight: document.documentElement.clientHeight - 260,
-      isEdit: false,
-      menuCateMap: [
-        { label: "导出", value: "导出", cssName: "warning" },
-        { label: "消息", value: "消息", cssName: "info" },
-      ],
-      stateNameCateMap: [
-        { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
-        { label: "执行中...", value: "Processing", cssName: "primary" },
-        { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
-        { label: "等待执行", value: "Scheduled", cssName: "primary" },
-      ],
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
-    this.timer = setInterval(() => {
-      this.listQuery.taskId = "";
-      this.listQuery.stateName = "";
-      setTimeout(this.getList, 0);
-    }, 1000 * 180); //30秒刷新一次页面
-    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once("hook:beforeDestroy", () => {
-      clearInterval(timer);
-    });
-    //this.disabledDateCp5();
-  },
-  created() {
-    this.getAllVersionList();
-    this.getMaterialGroup();
-    this.getList();
-    this.getJobVersionInfo();
-    // this.getCurrentMonthFirst();
-    // this.getCurrentMonthLast();
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-  computed: {
-    /* 主表头 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "版本号",
-        prop: "type",
-        width: 85,
-      });
-      tempsTabs.push({
-        label: "单据流水号",
-        prop: "taskId",
-        width: 120,
-      });
-      // tempsTabs.push({
-      //   label: "模块名称",
-      //   prop: "name",
-      //   width: 180,
-      // });
-      tempsTabs.push({
-        label: "创建人",
-        prop: "email",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "创建时间",
-        prop: "createdAt",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "说明",
-        prop: "remark",
-        width: 350,
-      });
-      tempsTabs.push({
-        label: "审批状态",
-        prop: "fileName",
-        width: 350,
-      });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
-      this.handleFilter();
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "taskId";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    handleSelectionChange(val) {
-      this.isEdit = false;
-      this.multipleSelection = [];
-      this.multipleSelection = val;
-    },
-    //已确认
-    handleConfirm(row) {
-      this.isEdit = false;
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      } else {
-        var getbillNum = "";
-        //判断已经生成出库单的不能再生成出库操作
-        this.multipleSelection.forEach((element) => {
-          let state = element.fileName;
-          if (state != "" && state != "已确认") {
-            this.isEdit = true;
-            getbillNum += state + ",";
-          }
-        });
-      }
-      if (this.isEdit == true) {
-        this.$message({
-          message:
-            "已经生成出库单的不能再确认！单号：" +
-            getbillNum.substr(0, getbillNum.length - 1),
-          type: "warning",
-        });
-        return;
-      } else {
-        var params = [];
-        let myalert = ""; //声明变量，其变量必须在此声明后使用
-        if (row) {
-          //单行
-          params.push(row.id);
-          myalert = row.name;
-        } else {
-          //多选
-          this.multipleSelection.forEach((element) => {
-            let id = element.id;
-            params.push(id);
-          });
-          myalert = "选中项";
-        }
-        this.$confirm("是否确认" + myalert + "?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.$axios
-              .posts(
-                "/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit",
-                params
-              )
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.$notify({
-                  title: "成功",
-                  message: "操作成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getList();
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消操作",
-            });
-          });
-      }
-    },
-    //出库单
-    handleCreateBills(row) {
-      this.isEdit = false;
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      } else {
-        var getbillNum = "";
-        //判断已经生成出库单的不能再生成出库操作
-        this.multipleSelection.forEach((element) => {
-          let state = element.fileName;
-          if (state != "" && state != "已确认") {
-            this.isEdit = true;
-            getbillNum += state + ",";
-          }
-        });
-      }
-      if (this.isEdit == true) {
-        this.$message({
-          message:
-            "已经生成出库单的不能再重新生成！单号：" +
-            getbillNum.substr(0, getbillNum.length - 1),
-          type: "warning",
-        });
-        return;
-      } else {
-        var params = [];
-        let myalert = ""; //声明变量，其变量必须在此声明后使用
-        if (row) {
-          //单行
-          params.push(row.id);
-          myalert = row.name;
-        } else {
-          //多选
-          this.multipleSelection.forEach((element) => {
-            let id = element.id;
-            params.push(id);
-          });
-          myalert = "选中项";
-        }
-        this.listBillQuery.guids = params;
-        this.listBillQuery.version = this.JobversionValue;
-        console.log("出库单条件：" + JSON.stringify(this.listBillQuery));
-        this.$confirm("是否确认出库" + myalert + "?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.formLoading = true;
-            this.$axios
-              .posts(
-                "/api/settleaccount/wmsjitoutput/WmsJitOutPut",
-                this.listBillQuery
-              )
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.$notify({
-                  title: "成功",
-                  message: "生成成功",
-                  type: "success",
-                  duration: 2000,
-                });
-
-                this.getList();
-                this.formLoading = false;
-              })
-              .catch(() => {
-                this.formLoading = false;
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消操作",
-            });
-          });
-      }
-    },
-    //批量删除
-    handleDelete(row) {
-      this.isEdit = false;
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      } else {
-        var getbillNum = "";
-        //判断已经生成出库单的不能执行删除操作
-        this.multipleSelection.forEach((element) => {
-          let state = element.fileName;
-          if (state != "" && state != "已确认") {
-            this.isEdit = true;
-            getbillNum += state + ",";
-          }
-        });
-      }
-      if (this.isEdit == true) {
-        this.$message({
-          message:
-            "已经生成出库单的不能删除！单号：" +
-            getbillNum.substr(0, getbillNum.length - 1),
-          type: "warning",
-        });
-        return;
-      } else {
-        var params = [];
-        let myalert = ""; //声明变量，其变量必须在此声明后使用
-        if (row) {
-          //单行
-          params.push(row.id);
-          myalert = row.name;
-        } else {
-          //多选
-          this.multipleSelection.forEach((element) => {
-            let id = element.id;
-            params.push(id);
-          });
-          myalert = "选中项";
-        }
-        this.$confirm("是否删除" + myalert + "?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.$axios
-              .posts("/api/settleaccount/Job/delete", params)
-              .then((response) => {
-                const index = this.list.indexOf(row);
-                this.$notify({
-                  title: "成功",
-                  message: "删除成功",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getList();
-              });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消操作",
-            });
-          });
-      }
-    },
-    //版本下拉列表选择项
-    JobVersionValue(params) {
-      //版本下拉选择
-      this.JobversionValue = params.value;
-      this.getList();
-    },
-    getJobVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
-        .then((response) => {
-          this.JobVersionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element;
-            options.label = element;
-            this.JobVersionList.push(options);
-          });
-          if (JSON.stringify(this.JobVersionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.JobversionValue = this.JobVersionList[0].value;
-            this.JobversionValueVerson = this.JobVersionList[0].label;
-            this.getList();
-          }
-        })
-        .catch(() => {
-          //this.listLoading = false;
-        });
-    },
-    submiteBillNo() {
-      var getkeenCodeNo = this.pasterValue.substring(
-        0,
-        this.pasterValue.length - 1
-      );
-      this.dataKenCode = getkeenCodeNo;
-      this.formCount.kennCode = this.dataKenCode;
-      this.showModal = false;
-    },
-    pasteMe(e) {
-      let source = e.clipboardData.getData("Text");
-      // 首先对源头进行解析
-      let rows = source.split("\r\n"); // 拆成很多行
-      this.pasterValue = "";
-      for (let i = 0; i < rows.length; i++) {
-        if (rows[i] != "") {
-          // 如果某一行不是空，再按列拆分
-          let columns = rows[i].split("\t"); // 已经按列划分
-          let dataone = {}; // 声明一行数组
-          for (let j = 0; j < columns.length; j++) {
-            // 读取tableData里的第j对应的key值
-            let keys = Object.keys(this.tableData[j]); // key的名
-            dataone[keys[j]] = columns[j];
-            this.pasterValue += columns[j] + ",";
-          }
-          this.tableData.push(dataone);
-          console.log(this.tableData);
-        }
-      }
-    },
-    //如果是要获得粘贴excel的内容，需要把粘贴的内容转换成二维数组
-    // pasteExcelToKennCode(e) {
-    //   let source = e.clipboardData.getData("Text");
-    //   // 首先对源头进行解析
-    //   let rows = source.split("\r\n"); // 拆成很多行
-    //   this.dataKenCode = "";
-    //   for (let i = 0; i < rows.length; i++) {
-    //     if (rows[i] != "") {
-    //       // 如果某一行不是空，再按列拆分
-    //       let columns = rows[i].split("\t"); // 已经按列划分
-
-    //       for (let j = 0; j < columns.length; j++) {
-    //         this.dataKenCode += columns[j] + ",";
-    //       }
-    //     }
-    //   }
-    // },
-    valueChange(data) {
-      this.getmaterialGroupValue = "";
-      this.getmaterialGroupValue += data + ",";
-      this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
-        0,
-        this.getmaterialGroupValue.length - 1
-      );
-    },
-    getdateValue(val) {
-      this.startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateVal(val) {
-      this.endTime = val;
-      this.getbalanceIndexData();
-    },
-
-    getCurrentMonthFirst() {
-      var date = new Date();
-      date.setDate(1);
-      var month = parseInt(date.getMonth() + 1);
-      var day = date.getDate();
-      if (month < 10) month = "0" + month;
-      if (day < 10) day = "0" + day;
-      this.startTime = date.getFullYear() + "-" + month + "-" + day;
-    },
-    getCurrentMonthLast() {
-      var date = new Date();
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      month = month < 10 ? "0" + month : month;
-      var day = new Date(year, month, 0);
-      this.endTime = year + "-" + month + "-" + day.getDate();
-    },
-    handleCheckedCitiesChange(value) {
-      alert(value);
-    },
-
-    getAllVersionList() {
-      this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
-        .then((response) => {
-          this.versionList = [];
-          response.forEach((element) => {
-            let options = {};
-            options.value = element.version;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //获取物料组车型
-    // getMaterialGroup() {
-    //   this.$axios
-    //     .posts("/api/settleaccount/CodeSetting/list", {
-    //       project: "物料组",
-    //       maxResultCount: 1000,
-    //       skipCount: 0,
-    //     })
-    //     .then((response) => {
-    //       this.materialGroupList = [];
-    //       response.items.forEach((element) => {
-    //         let options = {};
-    //         options.value = element.description;
-    //         options.label = element.value;
-    //         this.materialGroupList.push(options);
-    //       });
-    //     })
-    //     .catch(() => {
-    //       this.listLoading = false;
-    //     });
-    // },
-    //获取物料组车型
-    getMaterialGroup() {
-      this.$axios
-        .posts("/api/settleaccount/CodeSetting/list", {
-          project: "物料组",
-          maxResultCount: 1000,
-          skipCount: 0,
-          sorting: "value ascending",
-        })
-        .then((response) => {
-          this.materialGroupList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.description;
-            options.label = element.value;
-            this.materialGroupList.push(options);
-          });
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /* 重置 */
-    resetForm(formName) {
-      this.formCount = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-    },
-    save() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue; //版本
-          if (this.formCount.materialCode != "") {
-            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
-          }
-          if (this.formCount.sapCode != "") {
-            this.listExportQuery.sapCode = this.formCount.sapCode; //厂内物料号
-          }
-          if (this.formCount.kennCode != "") {
-            this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
-          }
-          this.listExportQuery.begin = this.startTime
-            ? this.startTime
-            : undefined;
-          this.listExportQuery.end = this.endTime ? this.endTime : undefined;
-          if (this.formCount.chassisNumber != "") {
-            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
-          }
-          // if (this.formCount.materialGroupValue != "") {
-          //   this.listExportQuery.materialGroup =
-          //     '"'+this.formCount.materialGroupValue+'"'; //物料组车型
-          // }
-          if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
-          }
-
-          console.log(
-            "大众发票与结算核对明细表-导出条件：" +
-              JSON.stringify(this.listExportQuery)
-          );
-          this.$axios
-            .posts(
-              "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
-              this.listExportQuery
-            )
-            .then((res) => {
-              let taskid = res;
-              if (Number.isInteger(taskid)) {
-                this.$notify({
-                  title: "成功",
-                  message: "任务生成成功！任务号:" + taskid,
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.getList();
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            });
-        }
-      });
-    },
-    handleCreate() {
-      this.$nextTick(() => {
-        this.$refs["formCount"].resetFields();
-      });
-      this.formTitle = "报表统计";
-      this.isEdit = false;
-      this.form = {};
-      this.datetime5 = [];
-      this.startTime = "";
-      this.endTime = "";
-      this.dialogFormVisible = true;
-    },
-    kennBtn() {
-      this.paster = "";
-      this.showModal = true;
-      this.tableData = [
-        {
-          name: "KEEN号",
-        },
-      ];
-    },
-    filterHandler(value, row, column) {
-      const property = column["property"];
-      return row[property] === value;
-    },
-    /* 任务详细信息 */
-    handleView(row) {
-      this.listQuery.taskId = row.taskId;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.form = response[0];
-          switch (response[0].stateName) {
-            case "Succeeded":
-            case "Failed":
-              this.activeIndex = 3;
-              break;
-            case "Processing":
-              this.activeIndex = 2;
-              break;
-            case "Enqueued":
-              this.activeIndex = 1;
-              break;
-          }
-          this.openView = true;
-        });
-    },
-    /*  刷新  */
-    refresh() {
-      this.list = [];
-      this.listQuery.taskId = "";
-      this.listQuery.name = "";
-      this.getList();
-    },
-    // 监听筛选项的变化
-    filterChange(filterObj) {
-      console.log(filterObj.actionName);
-      if (filterObj.actionName.length > 0) {
-        console.log("点击筛选");
-      } else {
-        console.log("点击重置");
-      }
-    },
-    /* 导出类型的文件 */
-    downloadErrData(param) {
-      this.listLoading = true;
-      let fileNameOfProject = param;
-      this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          if (fileNameOfProject.indexOf("_") != -1) {
-            let downName =
-              fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-              fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-            downloadFile(response, downName);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            downloadFile(response, fileNameOfProject);
-            this.$notify({
-              title: "成功",
-              message: "数据-导出中...",
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.listLoading = false;
-        })
-        .catch((error) => {
-          this.listLoading = false;
-        });
-    },
-    /* 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /* 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "stateName") {
-        return {
-          Succeeded: "执行完成(成功)",
-          Processing: "执行中...",
-          Failed: "执行完成(失败)",
-          Enqueued: "等待执行",
-        }[row[column.property]];
-      }
-      if (column.property == "createdAt") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    handleDownload(row) {
-      if (row.stateName == "Succeeded") {
-        this.downloadErrData(row.downFileName);
-      } else if (row.stateName == "Failed") {
-        this.downloadErrData(row.error);
-      }
-    },
-    getList() {
-      this.listLoading = true;
-      //导入界面中超链接过来的参数
-      this.listQuery.name = "准时化结算核对明细";
-      this.listQuery.type = this.JobversionValue;
-      this.$axios
-        .posts("/api/settleaccount/Job/list", this.listQuery)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    // fetchData(id) {
-    //   //循环动态，取客户名称
-    //   this.$axios
-    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-    //     .then((response) => {
-    //       this.form = response;
-    //     });
-    // },
-    resetQuery() {},
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      var item = this.list[rowIndex];
-      if (column.property === "fileName") {
-        if (item.fileName === "已确认") {
-          return { color: "#13CE66", cursor: "pointer", fontWeight: 700 };
-        } else {
-          return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 };
-        }
-      }
-      return { textAlign: "left" };
-      //}
-    },
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "stateName") {
-        return { textAlign: "center" };
-      }
-      return { textAlign: "center" };
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../../styles/crmtable.scss";
-@import "../../../styles/steps.scss";
-
-/deep/ .el-checkbox input:focus {
-  outline: none !important;
-  border-color: gray;
-  border: 0px;
-  box-shadow: none !important;
-}
-</style>
\ No newline at end of file
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/hq_y/index.vue b/code/WebApp/vue/src/views/ux/vw/dataInput/hq_y/index.vue
deleted file mode 100644
index cfcc0f30..00000000
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/hq_y/index.vue
+++ /dev/null
@@ -1,639 +0,0 @@
-<!--一汽轿车平台导入功能-->
-<template>
-  <div class="cr-body-content">
-    <flexbox class="content-header">
-      <XhJSSelect
-        :options="versionList"
-        style="width: 200px"
-        class="search-container"
-        @value-change="selectValue"
-      ></XhJSSelect>
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload2"
-        @click="handleImportExcel()"
-        >导入文件（Excel）
-      </el-button>
-      <!-- <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-download"
-        @click="handleDownload()"
-        >导出Excel
-      </el-button> -->
-      <el-dropdown
-        size="small"
-        class="filter-item"
-        style="margin-left: 15px; font-weight: bold"
-        @command="handleCommand"
-      >
-        <span class="el-dropdown-link">
-          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="excel" icon="el-icon-plus"
-            >导出Excel</el-dropdown-item
-          >
-          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
-            >导出Csv</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
-      <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照看板编号搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button>
-      <!--表格头组件，filter查询-->
-      <c-r-m-table-head
-        ref="crmTableHead"
-        :crm-type="crmType"
-        @handle="handleHandle"
-        @filter="handleFilters"
-      >
-      </c-r-m-table-head>
-    </flexbox>
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading.fullscreen.lock="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <el-table-column
-        label="版本"
-        prop="version"
-        sortable="custom"
-        align="center"
-        width="100px"
-        fixed
-      >
-        <template slot-scope="scope">
-          <el-tooltip :content="scope.row.version" placement="top">
-            <span class="link-type">{{ scope.row.version }}</span>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 导入Excel组件 -->
-      <importExcel
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-base";
-import CRMTableHead from "../../../components/CRMTableHead";
-import moment from "moment";
-import Lockr from "lockr";
-import { downloadFile } from "@/utils/crmindex.js";
-import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
-
-export default {
-  name: "HQYPlatform",
-  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "hqYPlatform",
-      versionValue: "",
-      versionList: [], //版本列表
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        settleAccountId: "",
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: true,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listVersionQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        site: "TH",
-        userId: "00000000-0000-0000-0000-000000000000",
-      },
-      listExportQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        //OrgID:"",
-        SkipCount: 0,
-        MaxResultCount: 15,
-        version: "",
-        fileType: 0,
-        userId: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 220,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 220;
-    };
-  },
-  created() {
-    this.getVersionInfo();
-    if (this.versionList == []) {
-      this.getList();
-    }
-  },
-  computed: {
-    /** 列表字段 */
-     getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "看板号",
-        prop: "btCarKanBan",
-        width: 170,
-      });
-      tempsTabs.push({ label: "看板编号", prop: "kanbanNumber", width: 250 });
-      tempsTabs.push({
-        label: "物料凭证号",
-        prop: "materialVoucherNo",
-        width: 200,
-      });
-
-      tempsTabs.push({
-        label: "物料号",
-        prop: "materialCode",
-        width: 200,
-      });
-      tempsTabs.push({
-        label: "验收单号",
-        prop: "acceptanceNo",
-        width: 130,
-      });
-      tempsTabs.push({
-        label: "验收单日期",
-        prop: "acceptanceDate",
-        width: 170,
-      });
-      tempsTabs.push({ label: "数量", prop: "price", width: 100 });
-      tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
-      tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
-      tempsTabs.push({
-        label: "存储地点",
-        prop: "storageLocation",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "存储地点描述",
-        prop: "storageLocationDesc",
-        width: 250,
-      });
-      tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
-      return tempsTabs;
-    },
-    // getDefaultField() {
-    //   var tempsTabs = [];
-    //   tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
-    //   tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 });
-    //   tempsTabs.push({
-    //     label: "采购订单号",
-    //     prop: "purchaseOrderNo",
-    //     width: 220,
-    //   });
-    //   tempsTabs.push({
-    //     label: "采购订单行项目",
-    //     prop: "purchaseOrderNoItem",
-    //     width: 170,
-    //   });
-    //   tempsTabs.push({
-    //     label: "采购订单文本",
-    //     prop: "purchaseOrderNoText",
-    //     width: 170,
-    //   });
-    //   tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 });
-    //   tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 });
-    //   tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 });
-    //   tempsTabs.push({
-    //     label: "采购价格不含税",
-    //     prop: "purchasePriceNoTax",
-    //     width: 200,
-    //   });
-    //   tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 });
-    //   tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 });
-    //   tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 });
-    //   tempsTabs.push({
-    //     label: "日期",
-    //     prop: "spareDate",
-    //     width: 150,
-    //     formType: "datetime",
-    //   });
-
-    //   tempsTabs.push({
-    //     label: "交货单号",
-    //     prop: "deliveryOrderNo",
-    //     width: 150,
-    //   });
-    //   tempsTabs.push({
-    //     label: "交货行号",
-    //     prop: "deliveryLineNum",
-    //     width: 150,
-    //   });
-    //   tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 });
-    //   tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 });
-    //   tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 });
-    //   tempsTabs.push({
-    //     label: "德国发票号",
-    //     prop: "germanInvoiceNo",
-    //     width: 150,
-    //   });
-    //   tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
-    //   tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 });
-    //   return tempsTabs;
-    // },
-  },
-  methods: {
-    handleCommand(command) {
-      if (this.versionValue === "") {
-        this.$message.error("请先选择版本！");
-        return;
-      }
-      switch (command) {
-        case "excel":
-          this.listQuery.fileType = 1; //0是csv,1是excel
-          break;
-        case "csv":
-          this.listQuery.fileType = 0; //0是csv,1是excel
-          break;
-        default:
-          //这里是没有找到对应的值处理
-          break;
-      }
-      this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("一汽轿车平台导出：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/settleaccount/BT_Carlatform/Export", this.listQuery)
-        .then((res) => {
-          let fileNameOfProject = res;
-          this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
-            .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
-                let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-                downloadFile(response, downName);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              } else {
-                downloadFile(response, fileNameOfProject);
-                this.$notify({
-                  title: "成功",
-                  message: "数据-导出成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.listLoading = false;
-            });
-        });
-    },
-
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-    selectOptionsChange(item) {
-      this.getList();
-    },
-    getVersionInfo() {
-      //取版本列表信息
-      //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 1000;
-      this.$axios
-        .posts("/api/settleaccount/BT_Carlatform/listversion", this.listQuery)
-        .then((response) => {
-          this.versionList = [];
-          response.items.forEach((element) => {
-            let options = {};
-            options.value = element.id;
-            options.label = element.version;
-            this.versionList.push(options);
-          });
-          if (JSON.stringify(this.versionList) != "[]") {
-            //因版本下拉有默认值，所以详表要自动绑定子表数据
-            this.versionValue = this.versionList[0].label;
-            this.getList();
-          }
-          this.listLoading = false;
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    handleImportExcel() {
-      //导入
-      this.showExcelImport = true;
-      this.$refs.importexcel.handleImportExcelClick();
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      // if (column.property === "state") {
-      //   return { 0: "其他", 2: "已结" }[row[column.property]];
-      // }
-      if (
-        column.property == "settleInputDate" ||
-        column.property == "settleDate"
-      ) {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      this.getVersionInfo();
-      this.listLoading = false;
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-    },
-
-    getList() {
-      this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
-      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/settleaccount/BT_Carlatform/list", this.listQuery)
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/settleaccount/BT_Carlatform/" + id)
-        .then((response) => {
-          this.form = response;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "kanbanNumber";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    /** 多项筛选操作 */
-    /** 筛选操作 */
-    handleFilters(data) {
-      if (data === null) {
-        this.listQuery.Filters = [];
-        this.getList(); //查询所有
-      } else {
-        this.filterObj = data;
-        console.log("筛选" + JSON.stringify(data));
-        var offsetHei = document.documentElement.clientHeight;
-        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
-        this.tableHeight = offsetHei - removeHeight;
-        this.currentPage = 1;
-        let Filter = [];
-        data.forEach((item) => {
-          let filter = {};
-          if (item.formType === "datetime" || item.formType === "datetime") {
-            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
-            filter["Column"] = item.fieldName;
-            filter["Logic"] = 0;
-            filter["Value"] = item.value[0];
-            filter["Action"] = item.action;
-            Filter.push(filter);
-
-            if (item.value[1] != null) {
-              filter["Value"] = item.value[1];
-              filter["Action"] = 5;
-              Filter.push(filter);
-            }
-          } else {
-            filter["Column"] = item.fieldName;
-            filter["Value"] = item.value;
-            filter["Logic"] = 0;
-            filter["Action"] = item.action;
-            Filter.push(filter);
-          }
-        });
-        console.log("筛选条件" + JSON.stringify(Filter));
-        this.listQuery.Filters = Filter;
-        this.getList();
-      }
-    },
-    resetQuery() {},
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      // if (column.property === "qty") {
-      //   return { textAlign: "right" };
-      // } else {
-      //   return { textAlign: "left" };
-      // }
-      return { textAlign: "left" };
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../../../styles/crmtable.scss";
-</style>
-<style lang="scss">
-.el-table .cell.el-tooltip {
-  white-space: pre-wrap;
-}
-</style>
-
-
diff --git a/code/WebApp/vue/src/views/ux/reportdata/deliverGoodsReport/index.vue b/code/WebApp/vue/src/views/ux/vw/dataInput/prebatch/index.vue
similarity index 93%
rename from code/WebApp/vue/src/views/ux/reportdata/deliverGoodsReport/index.vue
rename to code/WebApp/vue/src/views/ux/vw/dataInput/prebatch/index.vue
index bc1a6169..9d1cafdd 100644
--- a/code/WebApp/vue/src/views/ux/reportdata/deliverGoodsReport/index.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataInput/prebatch/index.vue
@@ -18,7 +18,7 @@
         size="mini"
         v-permission="['SettleAccount.Prebatchs.Delete']"
         @click="handleDelete()"
-        >批量删除
+        >作废(状态：其他)
       </el-button>
       <el-button
         class="filter-item"
@@ -34,13 +34,13 @@
         type="info"
         icon="el-icon-download"
         @click="handleDownload()"
-        >导出
+        >导出Excel
       </el-button>
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照KEEN号全字匹配搜索..."
+        placeholder="按照KEEN号搜索..."
         style="width: 220px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -182,7 +182,7 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 import permission from "@/directive/permission/index.js";
 import importExcel from "@/components/ImportExcel-vw";
 import { downloadFile } from "@/utils/crmindex.js";
-import CRMTableHead from "../../components/CRMTableHead";
+import CRMTableHead from "../../../components/CRMTableHead";
 
 //组件计量单位
 const bomUnit = [
@@ -307,7 +307,7 @@ export default {
     /** 格式化字段 */
     fieldFormatter(row, column) {
       if (column.property === "state") {
-        return { 3: "预批量", 0: "未结" }[row[column.property]];
+        return { 3: "预批量", 0: "其他" }[row[column.property]];
       }
       return row[column.property] || "--";
     },
@@ -325,20 +325,25 @@ export default {
       this.getList();
     },
     async handleDownload() {
-      await this.getDownBoms();
-      var fileNameOfProject = "CodeSettingExcelExporter.xlsx";
+      this.listLoading = true;
       this.$axios
-        .BolbGets(
-          "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-        )
-        .then((response) => {
-          downloadFile(response, "通用代码设置信息.xlsx");
-          this.$notify({
-            title: "成功",
-            message: "数据-导出成功！",
-            type: "success",
-            duration: 2000,
-          });
+        .posts("/api/settleaccount/Prebatch/Export", this.listQuery)
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              downloadFile(response, fileNameOfProject);
+              this.$notify({
+                title: "成功",
+                message: "数据-导出成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.listLoading = false;
+            });
         });
     },
     getDownBoms() {
@@ -349,9 +354,14 @@ export default {
           this.listLoading = false;
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .posts("/api/settleaccount/Prebatch/list", this.listQuery)
         .then((response) => {
@@ -425,7 +435,7 @@ export default {
         let filter = {
           logic: 0,
           column: column,
-          action: 0,
+          action: 6,
           value: this.searchContent,
         };
         this.listQuery.Filters.push(filter);
@@ -621,7 +631,7 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
+@import "../../../styles/crmtable.scss";
 </style>
 <style lang="scss">
 .el-table .cell.el-tooltip {
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/r3/index.vue b/code/WebApp/vue/src/views/ux/vw/dataInput/r3/index.vue
index 2cc26d79..ebaca227 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/r3/index.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataInput/r3/index.vue
@@ -1,10 +1,34 @@
-<!--R3已结数据-->
+<!--R3明细数据-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <!-- <el-select
+        v-model="versionValue"
+        size="small"
+        placeholder="选择版本过滤..."
+        style="width: 200px"
+        class="search-container"
+        clearable
+        @change="selectOptionsChange"
+      >
+        <el-option
+          v-for="item in versionList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select> -->
       <XhJSSelect
         :options="versionList"
-        style="width: 150px; margin-left: -10px"
+        style="width: 200px"
         class="search-container"
         @value-change="selectValue"
       ></XhJSSelect>
@@ -14,13 +38,12 @@
         type="warning"
         icon="el-icon-upload2"
         @click="handleImportExcel()"
-        >导入文件（Excel）
+        >导入文本（TXT）
       </el-button>
-
       <el-button
         class="filter-item"
         size="mini"
-        type="primary"
+        type="info"
         icon="el-icon-download"
         @click="handleDownload()"
         >导出Csv
@@ -30,7 +53,7 @@
         clearable
         size="small"
         placeholder="按照零件号搜索..."
-        style="width: 180px"
+        style="width: 200px"
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
@@ -49,7 +72,7 @@
         @filter="handleFilters"
       >
       </c-r-m-table-head>
-      <div class="right-container" style="margin-left: 180px">
+      <div class="right-container" style="margin-left: 240px">
         <el-dropdown
           v-if="MoreTypes.length > 0"
           trigger="click"
@@ -121,7 +144,6 @@
         </template>
       </el-table-column>
     </el-table>
-
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
       <pagination
@@ -145,23 +167,16 @@
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-vw";
+import importExcel from "@/components/ImportTxt";
 import CRMTableHead from "../../../components/CRMTableHead";
 import moment from "moment";
 import Lockr from "lockr";
 import { downloadFile } from "@/utils/crmindex.js";
 import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
-import XhJSSelectVerson from "@/components/CreateCom/Xh-JS-Select-Label.vue";
 
 export default {
-  name: "SettleAccount",
-  components: {
-    Pagination,
-    CRMTableHead,
-    importExcel,
-    XhJSSelect,
-    XhJSSelectVerson,
-  },
+  name: "R3",
+  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
   filters: {
     IsCustomerSignFilter(status) {
@@ -185,7 +200,6 @@ export default {
     return {
       crmType: "settleAccount",
       versionValue: "",
-      versionValueVerson: "",
       versionList: [], //版本列表
       rules: {
         //前端定义的规则，后端也有验证
@@ -198,7 +212,6 @@ export default {
         settleAccountId: "",
       },
       form: {
-        version: "",
         dicDetailID: "",
         customerId: "",
         projectId: "",
@@ -264,37 +277,53 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 260;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
     this.getVersionInfo();
-    //if (this.versionList == []) {
     this.getList();
-    //}
   },
+  //   watch: {
+  //     customerInfos: {
+  //       handler(newVal) {
+  //         if (newVal == "" || newVal == "undefined") {
+  //           //TODO
+  //         } else {
+  //           newVal.forEach((element) => {
+  //             this.customerInfo.settleAccountId = element.SettleAccountId;
+  //           });
+  //           if (this.customerInfo.settleAccountId != "") {
+  //             this.getList();
+  //           }
+  //         }
+  //       },
+  //     },
+  //   },
   computed: {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
+      //   tempsTabs.push({ label: "年度", prop: "year", width: 120 });
+      //   tempsTabs.push({ label: "期间", prop: "period", width: 150 });
       tempsTabs.push({ label: "KENN号", prop: "kennCode", width: 150 });
       tempsTabs.push({ label: "底盘号", prop: "chassisNumber", width: 120 });
-      tempsTabs.push({ label: "车型", prop: "model", width: 80 });
+      tempsTabs.push({ label: "车型", prop: "model", width: 100 });
       tempsTabs.push({
         label: "CP5时间",
         prop: "cP5A",
-        width: 160,
+        width: 150,
         formType: "datetime",
       });
 
       tempsTabs.push({
         label: "CP7时间",
         prop: "cP7",
-        width: 160,
+        width: 150,
         formType: "datetime",
       });
       tempsTabs.push({ label: "零件号", prop: "materialCode", width: 200 });
-      tempsTabs.push({ label: "数量", prop: "qty", width: 80 });
+      tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
       tempsTabs.push({ label: "未结算原因", prop: "remark", width: 280 });
       tempsTabs.push({ label: "结算标识", prop: "settlementID", width: 120 });
       tempsTabs.push({
@@ -302,13 +331,13 @@ export default {
         prop: "settlementSupplier",
         width: 150,
       });
-      //tempsTabs.push({ label: "状态", prop: "state", width: 120 });
+      tempsTabs.push({ label: "状态", prop: "state", width: 120 });
       return tempsTabs;
     },
     MoreTypes() {
       var moreTypes = [];
-      moreTypes.push({ type: "updateFis", name: "刷新FIS结算状态" });
-      moreTypes.push({ type: "enter", name: "刷新数据开票状态" });
+      moreTypes.push({ type: "updateFis", name: "更新FIS结算数据" });
+      //moreTypes.push({ type: "enter", name: "新按钮" });
       return moreTypes;
     },
   },
@@ -318,10 +347,6 @@ export default {
       this.versionValue = params.value;
       this.getList();
     },
-    selectValueVerson(params) {
-      //版本下拉选择
-      this.versionValueVerson = params.value;
-    },
     handleTypeDrop(command, params = {}) {
       if (command == "updateFis") {
         this.listLoading = true;
@@ -367,7 +392,6 @@ export default {
           if (JSON.stringify(this.versionList) != "[]") {
             //因版本下拉有默认值，所以详表要自动绑定子表数据
             this.versionValue = this.versionList[0].value;
-            this.versionValueVerson = this.versionList[0].label;
             this.getList();
           }
         })
@@ -406,25 +430,24 @@ export default {
       //关闭导入窗体时调用
       this.showExcelImport = false;
     },
-
+    //导出功能
     async handleDownload() {
       this.listLoading = true;
-      if (this.versionValueVerson === "") {
+      if (this.versionValue === "") {
         this.$message.error("必需选择版本！");
         this.listLoading = false;
         return;
       }
-      //根据ParentId条件导出
       if (this.versionValue != "") {
         this.listQuery.ParentId = this.versionValue;
       } else {
         this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
       }
-      console.log("R3已结导出：" + JSON.stringify(this.listQuery));
+      this.listQuery.fileType = 0; //0是csv,1是excel
+      this.listQuery.userId = Lockr.get("loginUserInfo").userId;
+      console.log("R3导出：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/SettleAccount/Export", {
-          parentId:this.listQuery.ParentId,
-        })
+        .posts("/api/settleaccount/SettleAccount/Export", this.listQuery)
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -459,9 +482,14 @@ export default {
             });
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
         this.listQuery.ParentId = this.versionValue;
       } else {
@@ -557,7 +585,7 @@ export default {
         return;
       }
       this.listQuery.Sorting = prop + " " + order;
-      console.log(this.listQuery.Sorting);
+       console.log(this.listQuery.Sorting)
       this.handleFilter();
     },
     handleSelectionChange(val) {
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/secondaryAdjustment/index.vue b/code/WebApp/vue/src/views/ux/vw/dataInput/secondaryAdjustment/index.vue
index 3f3b4436..012921ba 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/secondaryAdjustment/index.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataInput/secondaryAdjustment/index.vue
@@ -10,7 +10,7 @@
             @click="handleDelete()"
           >批量删除
           </el-button> -->
-      <el-select
+      <!-- <el-select
         v-model="versionValue"
         size="small"
         placeholder="选择版本过滤..."
@@ -25,7 +25,13 @@
           :label="item.label"
           :value="item.value"
         ></el-option>
-      </el-select>
+      </el-select> -->
+      <XhJSSelect
+        :options="versionList"
+        style="width: 200px"
+        class="search-container"
+        @value-change="selectValue"
+      ></XhJSSelect>
       <el-button
         class="filter-item"
         size="mini"
@@ -144,10 +150,11 @@ import CRMTableHead from "../../../components/CRMTableHead";
 import importExcel from "@/components/ImportExcel-vw";
 import moment from "moment";
 import Lockr from "lockr";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
 
 export default {
   name: "SecondaryAdjustment",
-  components: { Pagination, CRMTableHead, importExcel },
+  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
   filters: {
     IsCustomerSignFilter(status) {
@@ -255,7 +262,7 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-       tempsTabs.push({ label: "版本", prop: "version", width: 100 });
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
       // tempsTabs.push({ label: "年度", prop: "year", width: 85 });
       // tempsTabs.push({ label: "期间", prop: "period", width: 80 });
       tempsTabs.push({
@@ -283,13 +290,18 @@ export default {
     },
   },
   methods: {
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
     selectOptionsChange(item) {
       this.getList();
     },
     getVersionInfo() {
       //取版本列表信息
       //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 3000;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
       this.$axios
         .posts(
           "/api/settleaccount/SecondaryAdjustment/listVersion",
@@ -303,6 +315,11 @@ export default {
             options.label = element.version;
             this.versionList.push(options);
           });
+          if (JSON.stringify(this.versionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.versionValue = this.versionList[0].value;
+            this.getList();
+          }
         })
         .catch(() => {
           //this.listLoading = false;
@@ -452,9 +469,14 @@ export default {
           this.listLoading = false;
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
         this.listQuery.ParentId = this.versionValue;
       } else {
diff --git a/code/WebApp/vue/src/views/ux/vw/dataInput/secondaryDiscount/index.vue b/code/WebApp/vue/src/views/ux/vw/dataInput/secondaryDiscount/index.vue
index bf08c326..4831515b 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataInput/secondaryDiscount/index.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataInput/secondaryDiscount/index.vue
@@ -10,7 +10,7 @@
             @click="handleDelete()"
           >批量删除
           </el-button> -->
-      <el-select
+      <!-- <el-select
         v-model="versionValue"
         size="small"
         placeholder="选择版本过滤..."
@@ -25,7 +25,13 @@
           :label="item.label"
           :value="item.value"
         ></el-option>
-      </el-select>
+      </el-select> -->
+      <XhJSSelect
+        :options="versionList"
+        style="width: 200px"
+        class="search-container"
+        @value-change="selectValue"
+      ></XhJSSelect>
       <el-button
         class="filter-item"
         size="mini"
@@ -144,10 +150,11 @@ import CRMTableHead from "../../../components/CRMTableHead";
 import importExcel from "@/components/ImportExcel-vw";
 import moment from "moment";
 import Lockr from "lockr";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
 
 export default {
   name: "SecondaryDiscount",
-  components: { Pagination, CRMTableHead, importExcel },
+  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
   filters: {
     IsCustomerSignFilter(status) {
@@ -255,7 +262,7 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-       tempsTabs.push({ label: "版本", prop: "version", width: 100 });
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
       tempsTabs.push({ label: "供应商代码", prop: "supplierCode", width: 120 });
       tempsTabs.push({ label: "零件数量（回款）", prop: "qty", width: 150 });
       tempsTabs.push({ label: "金额（不含税）", prop: "amt", width: 150 });
@@ -271,13 +278,18 @@ export default {
     },
   },
   methods: {
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
     selectOptionsChange(item) {
       this.getList();
     },
     getVersionInfo() {
       //取版本列表信息
       //this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 3000;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
       this.$axios
         .posts(
           "/api/settleaccount/SecondaryDiscount/listVersion",
@@ -291,6 +303,11 @@ export default {
             options.label = element.version;
             this.versionList.push(options);
           });
+          if (JSON.stringify(this.versionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.versionValue = this.versionList[0].value;
+            this.getList();
+          }
         })
         .catch(() => {
           //this.listLoading = false;
@@ -440,9 +457,14 @@ export default {
           this.listLoading = false;
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.versionValue != "") {
         this.listQuery.ParentId = this.versionValue;
       } else {
diff --git a/code/WebApp/vue/src/views/ux/vw/dataOut/estimatedStockDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/vw/dataOut/estimatedStockDiffReport/detail.vue
new file mode 100644
index 00000000..ba5c17d2
--- /dev/null
+++ b/code/WebApp/vue/src/views/ux/vw/dataOut/estimatedStockDiffReport/detail.vue
@@ -0,0 +1,454 @@
+<!--暂估对比输出表-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="info"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出全部
+      </el-button>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照ERP物料号搜索..."
+        style="width: 230px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+
+export default {
+  name: "EstimatedStockDiffReport",
+  components: { Pagination, CRMTableHead },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "estimatedStockDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ParentId: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "单据流水号",
+        prop: "documentNumber",
+        width: 250,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 90 });
+      tempsTabs.push({ label: "ERP物料号", prop: "itemCode", width: 200 });
+      tempsTabs.push({ label: "ERP物料号描述", prop: "itemDesc", width: 200 });
+      tempsTabs.push({
+        label: "ERP物料号估价类",
+        prop: "estimationType",
+        width: 150,
+      });
+       tempsTabs.push({
+        label: "ERP物料号估价类描述",
+        prop: "estimationTypeDesc",
+        width: 185,
+      });
+      tempsTabs.push({
+        label: "暂估数量",
+        prop: "estimationQty",
+        width: 100,
+      });
+      tempsTabs.push({
+        label: "现有库存数量",
+        prop: "stockQty",
+        width: 130,
+      });
+      tempsTabs.push({ label: "总成件拆分数量", prop: "fgQty", width: 135 });
+      tempsTabs.push({
+        label: "发出未结算拆分数量",
+        prop: "unSettledQty",
+        width: 180,
+      });
+      tempsTabs.push({ label: "数量差异", prop: "diffQty", width: 100 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    //导出全部功能
+    async handleDownload() {
+      this.listLoading = true;
+      this.$axios
+        .gets(
+          "/api/settleaccount/estimated-unsettled-report/export/" +
+            this.customerInfo.parentId
+        )
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    getList(data) {
+      this.listLoading = true;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      this.listQuery.ParentId = this.customerInfo.parentId;
+      console.log("R3结算数据对比输出表：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/estimated-unsettled-report/details/byfilter",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          //alert(JSON.stringify(response.Items))
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/estimated-unsettled-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "itemCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "estimationQty" ||
+        column.property === "stockQty" ||
+        column.property === "stockQty" ||
+        column.property === "unSettledQty" ||
+        column.property === "diffQty" ||
+        column.property === "fgQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "estimationQty" ||
+        column.property === "stockQty" ||
+        column.property === "stockQty" ||
+        column.property === "unSettledQty" ||
+        column.property === "diffQty" ||
+        column.property === "fgQty"
+      ) {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../../styles/crmtable.scss";
+</style>
+
diff --git a/code/WebApp/vue/src/views/ux/billManage/kanbanOutOrder/index.vue b/code/WebApp/vue/src/views/ux/vw/dataOut/estimatedStockDiffReport/index.vue
similarity index 53%
rename from code/WebApp/vue/src/views/ux/billManage/kanbanOutOrder/index.vue
rename to code/WebApp/vue/src/views/ux/vw/dataOut/estimatedStockDiffReport/index.vue
index cd7f23ba..8261f6fe 100644
--- a/code/WebApp/vue/src/views/ux/billManage/kanbanOutOrder/index.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataOut/estimatedStockDiffReport/index.vue
@@ -1,7 +1,23 @@
-<!--轿车看板-发出未结算-->
+<!--暂估对比输出表-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
+      <!-- <el-button
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleDelete()"
+          >批量删除
+          </el-button> -->
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleCreate"
+        >统计
+      </el-button>
       <el-input
         v-model="searchContent"
         clearable
@@ -39,16 +55,19 @@
       @row-click="handleRowClick"
     >
       <el-table-column
-        label="单据号"
-        prop="billNum"
+        label="单据流水号"
+        prop="documentNumber"
         sortable="custom"
         align="center"
-        width="250px"
+        width="260px"
       >
         <template slot-scope="scope">
-          <el-tooltip :content="scope.row.billNum" placement="bottom-end">
+          <el-tooltip
+            :content="scope.row.documentNumber"
+            placement="bottom-end"
+          >
             <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.billNum
+              scope.row.documentNumber
             }}</span>
           </el-tooltip>
         </template>
@@ -70,6 +89,53 @@
         </template>
       </el-table-column>
     </el-table>
+    <!--表单渲染-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      width="700px"
+    >
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="small"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="版本" required />
+          </el-col>
+          <el-col :md="20" :xs="24">
+            <el-form-item prop="version">
+              <el-select
+                v-model="form.version"
+                clearable
+                style="width: 188px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="dialogFormVisible = false"
+          >取消</el-button
+        >
+        <el-button v-loading="formLoading" type="primary" @click="save"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
       <pagination
@@ -81,17 +147,17 @@
       />
       <!-- 抽屉控件 -->
       <el-drawer
-        title="信息详细页"
+        title="暂估对比信息详细页"
         size="75%"
         direction="rtl"
         :visible.sync="drawer"
         :before-close="handleDrawerClose"
       >
         <div>
-          <Detail
+          <SendUnsettledDiffReport
             v-bind:customerInfos="customerInfos"
             style="margin-top: -35px"
-          ></Detail>
+          ></SendUnsettledDiffReport>
         </div>
       </el-drawer>
     </div>
@@ -101,21 +167,31 @@
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import Detail from "./detail";
+import SendUnsettledDiffReport from "./detail";
 import moment from "moment";
-import { formatTimeToTimestamp } from "@/utils/index";
 
 export default {
   name: "sendUnsettledDiffReport",
-  components: { Pagination, Detail },
+  components: { Pagination, SendUnsettledDiffReport },
   directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
   data() {
     return {
       crmType: "sendUnsettledDiffReport",
       rules: {
-        // version: [{ required: true, message: "必须输入！", trigger: "change" }],
-        // beginTime: [{ required: true, message: "选择日期！", trigger: "change" }],
-        // endTime: [{ required: true, message: "选择日期！", trigger: "change" }],
+        //前端定义的规则，后端也有验证
+        version: [
+          { required: true, message: "必须选择版本！", trigger: "change" },
+        ],
       },
       customerInfos: [],
       searchContent: "", // 输入内容
@@ -124,13 +200,9 @@ export default {
         version: "",
         customerCode: "",
         customerName: "",
-        beginTime: "",
-        endTime: "",
       },
       versionValue: "",
       versionList: [],
-      startTimeVale: "",
-      endTimeVale: "",
       list: null,
       totalCount: 0,
       listLoading: true,
@@ -154,6 +226,7 @@ export default {
         //OrgID:"",
         SkipCount: 0,
         MaxResultCount: 15,
+        CustomCode: "",
       },
       page: 1,
       dialogFormVisible: false,
@@ -161,7 +234,7 @@ export default {
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 200,
+      tableHeight: document.documentElement.clientHeight - 260,
       isEdit: false,
     };
   },
@@ -169,24 +242,28 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 200;
+      self.tableHeight = offsetHei - 190;
     };
   },
   created() {
     this.getList();
-    //this.getVersionInfo();
+    this.getVersionInfo();
   },
   computed: {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
       tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 120,
+        label: "年度",
+        prop: "year",
+        width: 85,
       });
-      //tempsTabs.push({ label: "单据号", prop: "billNum", width: 150 });
-      tempsTabs.push({ label: "创建人", prop: "creator", width: 160 });
+      tempsTabs.push({
+        label: "期间",
+        prop: "period",
+        width: 85,
+      });
+      tempsTabs.push({ label: "版本", prop: "version", width: 100 });
       tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
       tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
       return tempsTabs;
@@ -212,10 +289,49 @@ export default {
           this.listLoading = false;
         });
     },
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["form"].resetFields();
+      // });
+      this.formTitle = "报表统计";
+      this.isEdit = false;
+      this.form = {};
+      this.dialogFormVisible = true;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+          //insert添加
+          this.form.customerCode = "U22000";
+          this.form.customerName = "一汽-大众汽车有限公司";
+          console.log(JSON.stringify(this.form));
+          this.$axios
+            .posts(
+              "/api/settleaccount/estimated-unsettled-report/report",
+              this.form
+            )
+            .then((response) => {
+              this.formLoading = false;
+              this.$notify({
+                title: "成功",
+                message: "统计成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.dialogFormVisible = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
     //抽屉
     handleDrawerOpen(param) {
       this.drawer = true;
-      var parentId = param.billNum; //单据号
+      var parentId = param.id; //主键id
       this.customerInfos = [
         {
           ParentId: parentId,
@@ -227,13 +343,20 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property == "creationTime") {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
         var date = row[column.property];
         if (date == undefined) {
           return "";
         }
         return moment(date).format("YYYY-MM-DD HH:mm:ss");
       }
+      // if(column.property=="documentType"){
+      //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
+      // }
       if (column.property == "documentStatus") {
         return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
           row[column.property]
@@ -248,13 +371,18 @@ export default {
     },
     getList(data) {
       this.listLoading = true;
-      if (data != undefined) {
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
         this.listQuery.SkipCount = (this.page - 1) * data.limit;
       } else {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
+      this.listQuery.CustomCode = "U22000";
       this.$axios
-        .posts("/api/settleaccount/wmsjitoutput/WmsJitList", this.listQuery)
+        .posts(
+          "/api/settleaccount/estimated-unsettled-report/list",
+          this.listQuery
+        )
         .then((response) => {
           this.list = response.items;
           //alert(JSON.stringify(response.Items))
@@ -268,6 +396,14 @@ export default {
           this.listLoading = false;
         });
     },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/estimated-unsettled-report/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
     /** 筛选操作 */
     handleFilter() {
       this.page = 1;
@@ -278,7 +414,7 @@ export default {
         let filter = {
           logic: 0,
           column: column,
-          action: 0,
+          action: 6,
           value: this.searchContent,
         };
         this.listQuery.Filters.push(filter);
@@ -286,6 +422,48 @@ export default {
       this.getList();
     },
     resetQuery() {},
+    // handleDelete(row) {
+    //   //批量删除
+    //   var params = [];
+    //   let myalert = ""; //声明变量，其变量必须在此声明后使用
+    //   if (row) {
+    //     //单行
+    //     params.push(row.id);
+    //     myalert = row.name;
+    //   } else {
+    //     //多选
+    //     this.multipleSelection.forEach((element) => {
+    //       let id = element.id;
+    //       params.push(id);
+    //     });
+    //     myalert = "选中项";
+    //   }
+    //   this.$confirm("是否删除" + myalert + "?", "提示", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning",
+    //   })
+    //     .then(() => {
+    //       this.$axios
+    //         .posts("/api/settleaccount/estimated-unsettled-report/delete", params)
+    //         .then((response) => {
+    //           const index = this.list.indexOf(row);
+    //           this.$notify({
+    //             title: "成功",
+    //             message: "删除成功",
+    //             type: "success",
+    //             duration: 2000,
+    //           });
+    //           this.getList();
+    //         });
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: "info",
+    //         message: "已取消删除",
+    //       });
+    //     });
+    // },
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
@@ -312,6 +490,6 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
+@import "../../../styles/crmtable.scss";
 </style>
 
diff --git a/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralAdjustmentReport/detail.vue b/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralAdjustmentReport/detail.vue
index 70d862ca..302e3458 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralAdjustmentReport/detail.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralAdjustmentReport/detail.vue
@@ -334,12 +334,20 @@ export default {
                 });
               }
               this.listLoading = false;
+            })
+            .catch(() => {//报错时 停止转圈
+              this.listLoading = false
             });
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.listQuery.ParentId = this.customerInfo.parentId;
       console.log(JSON.stringify("实际二配调整后输出表：" + this.listQuery));
       this.$axios
diff --git a/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralAdjustmentReport/index.vue b/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralAdjustmentReport/index.vue
index 3225d601..d25741b0 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralAdjustmentReport/index.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralAdjustmentReport/index.vue
@@ -54,7 +54,7 @@
         width="250px"
       >
         <template slot-scope="scope">
-          <el-tooltip :content="scope.row.documentNumber" placement="top">
+          <el-tooltip :content="scope.row.documentNumber" placement="bottom-end">
             <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
               scope.row.documentNumber
             }}</span>
@@ -203,10 +203,11 @@ export default {
         width: 110,
         formType: "datetime",
       });
-      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 120 });
-      tempsTabs.push({ label: "客户名称", prop: "customName", width: 130 });
-      tempsTabs.push({ label: "状态", prop: "documentStatus", width: 55 });
-      tempsTabs.push({ label: "备注", prop: "remark", width: 250 });
+            tempsTabs.push({ label: "版本", prop: "version", width: 85 });
+       tempsTabs.push({ label: "客户编码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
       return tempsTabs;
     },
   },
@@ -226,7 +227,7 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property == "beginTime" || column.property == "endTime") {
+      if (column.property == "beginTime" || column.property == "endTime"  || column.property == "creationTime") {
         var date = row[column.property];
         if (date == undefined) {
           return "";
@@ -248,9 +249,14 @@ export default {
       this.showExcelImport = false;
       this.getList();
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .posts("/api/settleaccount/sec-act-adjust-report/list", this.listQuery)
         .then((response) => {
diff --git a/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralDiffReport/detail.vue
index d81c4d2e..29fbbcf5 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralDiffReport/detail.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralDiffReport/detail.vue
@@ -22,7 +22,7 @@
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照客户总成物料号全字匹配搜索..."
+        placeholder="按照客户总成物料号搜索..."
         style="width: 250px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -301,9 +301,14 @@ export default {
             });
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.listQuery.ParentId = this.customerInfo.parentId;
       console.log("二配对比输出表：" + JSON.stringify(this.listQuery));
       this.$axios
@@ -342,7 +347,7 @@ export default {
         let filter = {
           logic: 0,
           column: column,
-          action: 0,
+          action: 6,
           value: this.searchContent,
         };
         this.listQuery.Filters.push(filter);
diff --git a/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralDiffReport/index.vue b/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralDiffReport/index.vue
index 52c0d975..743c4276 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralDiffReport/index.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataOut/secondaryActuralDiffReport/index.vue
@@ -10,17 +10,18 @@
             @click="handleDelete()"
           >批量删除
           </el-button> -->
-      <!-- <el-button
+      <el-button
         class="filter-item"
         size="mini"
         type="primary"
         icon="el-icon-plus"
         @click="handleCreate"
         >统计
-      </el-button> -->
+      </el-button>
       <el-select
         v-model="versionValue"
         size="small"
+        filterable
         placeholder="选择版本导出Excel..."
         style="width: 200px"
         class="search-container"
@@ -72,13 +73,27 @@
             icon="el-icon-circle-close"
             >二配对比输出表</el-dropdown-item
           >
+          <el-dropdown-item
+            command="check-assemblyList"
+            icon="el-icon-circle-close"
+            >二配比对基础信息校验</el-dropdown-item
+          >
         </el-dropdown-menu>
       </el-dropdown>
+      <el-button
+        type="warning"
+        plain
+        icon="el-icon-download"
+        size="mini"
+        style="margin-left: 15px"
+        @click="handleDownload()"
+        >(选择版本)导出二配打印表
+      </el-button>
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照版本号全字匹配搜索..."
+        placeholder="按照版本号搜索..."
         style="width: 250px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -94,7 +109,7 @@
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading="listLoading"
+      v-loading.fullscreen.lock="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
@@ -118,7 +133,10 @@
         width="260px"
       >
         <template slot-scope="scope">
-          <el-tooltip :content="scope.row.documentNumber" placement="top">
+          <el-tooltip
+            :content="scope.row.documentNumber"
+            placement="bottom-end"
+          >
             <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
               scope.row.documentNumber
             }}</span>
@@ -159,23 +177,20 @@
       >
         <el-row>
           <el-col :md="4" :xs="24">
-            <el-form-item label="版本" required />
+            <el-form-item label="年份" required />
           </el-col>
           <el-col :md="20" :xs="24">
-            <el-form-item prop="version">
-              <el-select
-                v-model="form.version"
-                clearable
-                style="width: 180px"
-                placeholder="请选择"
+            <el-form-item prop="year">
+              <el-date-picker
+                v-model="form.year"
+                style="width: 188px"
+                type="year"
+                format="yyyy 年"
+                value-format="yyyy"
+                placeholder="选择年"
+                :disabled="isEdit"
               >
-                <el-option
-                  v-for="item in versionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
@@ -228,16 +243,6 @@ export default {
   name: "SecondaryActuralDiffReport",
   components: { Pagination, StockFisDiffReport },
   directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
   data() {
     return {
       crmType: "secondaryActuralDiffReport",
@@ -252,9 +257,8 @@ export default {
       searchContent: "", // 输入内容
       drawer: false,
       form: {
-        version: "",
+        year: "",
         customerCode: "",
-        customerName: "",
       },
       versionValue: "",
       versionList: [],
@@ -282,6 +286,19 @@ export default {
         SkipCount: 0,
         MaxResultCount: 15,
       },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
       exportQuery: {
         version: "",
         customerCode: "",
@@ -323,14 +340,53 @@ export default {
         width: 75,
       });
       tempsTabs.push({ label: "版本", prop: "version", width: 85 });
-      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 110 });
-      tempsTabs.push({ label: "客户名称", prop: "customName", width: 150 });
-      tempsTabs.push({ label: "状态", prop: "documentStatus", width: 55 });
-      tempsTabs.push({ label: "备注", prop: "remark", width: 250 });
+      tempsTabs.push({ label: "客户编码", prop: "customCode", width: 120 });
+      tempsTabs.push({ label: "客户名称", prop: "customName", width: 160 });
+      tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+      tempsTabs.push({ label: "状态", prop: "documentStatus", width: 80 });
+      tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
       return tempsTabs;
     },
   },
   methods: {
+    handleDownload() {
+      if (this.versionValue === "") {
+        this.$message.error("请先选择版本！");
+        return;
+      }
+      this.listLoading = true;
+      this.exportQuery.version = this.versionValue;
+      this.exportQuery.customerCode = "U22000";
+      this.exportQuery.customerName = "一汽-大众汽车有限公司";
+      console.log("二配打印表条件：" + JSON.stringify(this.exportQuery));
+      this.$axios
+        .posts(
+          "/api/settleaccount/sec-act-diff-report/report/actual-adjust-sum/list",
+          this.exportQuery
+        )
+        .then((res) => {
+          let zipName = res;
+          this.$axios
+            .BolbGets("/api/settleaccount/getblobzipfile/download/" + zipName)
+            .then((response) => {
+              downloadFile(response, zipName);
+              this.$notify({
+                title: "成功",
+                message: "数据-导出成功！",
+                type: "success",
+                duration: 2000,
+              });
+
+              this.listLoading = false;
+            })
+            .catch((error) => {
+              this.listLoading = false;
+            });
+        })
+        .catch((error) => {
+          this.listLoading = false;
+        });
+    },
     handleCommand(command) {
       if (this.versionValue === "") {
         this.$message.error("请先选择版本！");
@@ -369,6 +425,10 @@ export default {
           this.exportApi =
             "/api/settleaccount/sec-act-diff-report/report/actual-stand-diff";
           break;
+        case "check-assemblyList":
+          this.exportApi =
+            "/api/settleaccount/sec-act-diff-report/report/check-assemblyList";
+          break;
         default:
           //这里是没有找到对应的值处理
           break;
@@ -378,46 +438,77 @@ export default {
       this.exportQuery.customerCode = "U22000";
       this.exportQuery.customerName = "一汽-大众汽车有限公司";
       console.log("二配对比条件：" + JSON.stringify(this.exportQuery));
-      this.$axios.posts(this.exportApi, this.exportQuery).then((res) => {
-        let fileNameOfProject = res;
-        this.$axios
-          .BolbGets(
-            "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-          )
-          .then((response) => {
-            if (fileNameOfProject.indexOf("_") != -1) {
-              let downName =
-                fileNameOfProject.slice(0, fileNameOfProject.lastIndexOf("_")) +
-                fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
-              downloadFile(response, downName);
-              this.$notify({
-                title: "成功",
-                message: "数据-导出成功！",
-                type: "success",
-                duration: 2000,
-              });
-            } else {
-              downloadFile(response, fileNameOfProject);
-              this.$notify({
-                title: "成功",
-                message: "数据-导出成功！",
-                type: "success",
-                duration: 2000,
+      this.$axios
+        .posts(this.exportApi, this.exportQuery)
+        .then((res) => {
+          if (res === "Success" && command === "check-assemblyList") {
+            //二配比对基础信息校验
+            this.$notify({
+              title: "成功",
+              message: "二配比对基础信息校验-成功！",
+              type: "success",
+              duration: 2000,
+            });
+            this.listLoading = false;
+          } else {
+            let fileNameOfProject = res;
+            if (command === "check-assemblyList") {
+              this.$message({
+                type: "warning",
+                message: "二配比对基础信息校验-失败！将导出！",
               });
             }
-            this.listLoading = false;
-          });
-      });
+            this.$axios
+              .BolbGets(
+                "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+              )
+              .then((response) => {
+                if (fileNameOfProject.indexOf("_") != -1) {
+                  let downName =
+                    fileNameOfProject.slice(
+                      0,
+                      fileNameOfProject.lastIndexOf("_")
+                    ) +
+                    fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                  downloadFile(response, downName);
+                  this.$notify({
+                    title: "成功",
+                    message: "数据-导出成功！",
+                    type: "success",
+                    duration: 2000,
+                  });
+                } else {
+                  downloadFile(response, fileNameOfProject);
+                  this.$notify({
+                    title: "成功",
+                    message: "数据-导出成功！",
+                    type: "success",
+                    duration: 2000,
+                  });
+                }
+                this.listLoading = false;
+              })
+              .catch((error) => {
+                this.listLoading = false;
+              });
+          }
+        })
+        .catch((error) => {
+          this.listLoading = false;
+        });
     },
     getVersionInfo() {
       //取版本列表信息
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 3000;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
         .then((response) => {
           this.versionList = [];
-          response.forEach((element) => {
+          response.items.forEach((element) => {
             let options = {};
             options.value = element.version;
             options.label = element.version;
@@ -438,25 +529,55 @@ export default {
       this.dialogFormVisible = true;
     },
     save() {
+      //实现导出excel表功能
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.formLoading = true;
           //insert添加
           this.form.customerCode = "U22000";
-          this.form.customerName = "一汽-大众汽车有限公司";
           console.log(JSON.stringify(this.form));
           this.$axios
-            .posts("/api/settleaccount/sec-act-diff-report/report", this.form)
-            .then((response) => {
-              this.formLoading = false;
-              this.$notify({
-                title: "成功",
-                message: "统计成功！",
-                type: "success",
-                duration: 2000,
-              });
-              this.dialogFormVisible = false;
-              this.getList();
+            .posts(
+              "/api/settleaccount/sec-act-diff-report/report/cumulative-actual-stand-diff",
+              this.form
+            )
+            .then((res) => {
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
             })
             .catch(() => {
               this.formLoading = false;
@@ -479,7 +600,11 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property == "beginTime" || column.property == "endTime") {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
         var date = row[column.property];
         if (date == undefined) {
           return "";
@@ -490,7 +615,7 @@ export default {
       //    return { 4: "NPA", 5: "PICK", 5: "PICK", 6: "ISS", 7: "TR", 8: "CYC", 201: "AdvanceShippingNotice", 202: "ArrivalNotice", 203: "Receipt" }[row[column.property]];
       // }
       if (column.property == "documentStatus") {
-        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+        return { 0: "新建", 1: "进行中", 5: "完成", 9: "作废" }[
           row[column.property]
         ];
       }
@@ -501,9 +626,14 @@ export default {
       this.showExcelImport = false;
       this.getList();
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+     // this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .posts("/api/settleaccount/sec-act-diff-report/list", this.listQuery)
         .then((response) => {
@@ -537,7 +667,7 @@ export default {
         let filter = {
           logic: 0,
           column: column,
-          action: 0,
+          action: 6,
           value: this.searchContent,
         };
         this.listQuery.Filters.push(filter);
diff --git a/code/WebApp/vue/src/views/ux/vw/dataOut/sendUnsettledDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/vw/dataOut/sendUnsettledDiffReport/detail.vue
index 25be11ab..7a9a8b74 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataOut/sendUnsettledDiffReport/detail.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataOut/sendUnsettledDiffReport/detail.vue
@@ -289,9 +289,13 @@ export default {
     //       this.listLoading = false;
     //     });
     // },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.listQuery.ParentId = this.customerInfo.parentId;
       console.log("fis未结算：" + JSON.stringify(this.listQuery));
       this.$axios
diff --git a/code/WebApp/vue/src/views/ux/vw/dataOut/sendUnsettledDiffReport/index.vue b/code/WebApp/vue/src/views/ux/vw/dataOut/sendUnsettledDiffReport/index.vue
index 60cb0db2..9b3a5e2a 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataOut/sendUnsettledDiffReport/index.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataOut/sendUnsettledDiffReport/index.vue
@@ -62,10 +62,14 @@
         width="260px"
       >
         <template slot-scope="scope">
+          <el-tooltip
+            :content="scope.row.documentNumber"
+            placement="bottom-end"
+          >
             <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
               scope.row.documentNumber
             }}</span>
-
+          </el-tooltip>
         </template>
       </el-table-column>
       <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
@@ -492,9 +496,14 @@ export default {
       this.showExcelImport = false;
       this.getList();
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.$axios
         .posts("/api/settleaccount/send-unsettled-report/list", this.listQuery)
         .then((response) => {
diff --git a/code/WebApp/vue/src/views/ux/vw/dataOut/stockFisDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/vw/dataOut/stockFisDiffReport/detail.vue
index 9f5c0e3f..08565c6c 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataOut/stockFisDiffReport/detail.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataOut/stockFisDiffReport/detail.vue
@@ -22,7 +22,7 @@
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照FIS物料号全字匹配搜索..."
+        placeholder="按照FIS物料号搜索..."
         style="width: 230px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -276,9 +276,13 @@ export default {
             });
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.listQuery.ParentId = this.customerInfo.parentId;
       console.log("fis结算：" + JSON.stringify(this.listQuery));
       this.$axios
@@ -317,7 +321,7 @@ export default {
         let filter = {
           logic: 0,
           column: column,
-          action: 0,
+          action: 6,
           value: this.searchContent,
         };
         this.listQuery.Filters.push(filter);
diff --git a/code/WebApp/vue/src/views/ux/vw/dataOut/stockFisDiffReport/index.vue b/code/WebApp/vue/src/views/ux/vw/dataOut/stockFisDiffReport/index.vue
index 360810b5..95dbb80d 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataOut/stockFisDiffReport/index.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataOut/stockFisDiffReport/index.vue
@@ -54,7 +54,10 @@
         width="260px"
       >
         <template slot-scope="scope">
-          <el-tooltip :content="scope.row.documentNumber" placement="top">
+          <el-tooltip
+            :content="scope.row.documentNumber"
+            placement="bottom-end"
+          >
             <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
               scope.row.documentNumber
             }}</span>
@@ -101,6 +104,7 @@
             <el-form-item prop="version">
               <el-select
                 v-model="form.version"
+                filterable
                 clearable
                 style="width: 188px"
                 placeholder="请选择"
@@ -158,6 +162,7 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 import permission from "@/directive/permission/index.js";
 import StockFisDiffReport from "./detail";
 import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
 
 export default {
   name: "sendUnsettledDiffReport",
@@ -216,6 +221,19 @@ export default {
         SkipCount: 0,
         MaxResultCount: 15,
       },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
       page: 1,
       dialogFormVisible: false,
       multipleSelection: [],
@@ -263,12 +281,15 @@ export default {
     getVersionInfo() {
       //取版本列表信息
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 3000;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
         .then((response) => {
           this.versionList = [];
-          response.forEach((element) => {
+          response.items.forEach((element) => {
             let options = {};
             options.value = element.version;
             options.label = element.version;
@@ -292,18 +313,53 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.formLoading = true;
-
           console.log(JSON.stringify(this.form));
           this.$axios
             .posts("/api/settleaccount/stock-fis-report/report", this.form)
-            .then((response) => {
-              this.formLoading = false;
-              this.$notify({
-                title: "成功",
-                message: "统计成功！",
-                type: "success",
-                duration: 2000,
-              });
+            .then((res) => {
+              //alert(JSON.stringify(res))
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              // this.$notify({
+              //   title: "成功",
+              //   message: "统计成功！",
+              //   type: "success",
+              //   duration: 2000,
+              // });
               this.dialogFormVisible = false;
               this.getList();
             })
@@ -328,7 +384,11 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property == "beginTime" || column.property == "endTime") {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
         var date = row[column.property];
         if (date == undefined) {
           return "";
@@ -350,9 +410,13 @@ export default {
       this.showExcelImport = false;
       this.getList();
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
 
       let customfilter = {
         logic: 0,
diff --git a/code/WebApp/vue/src/views/ux/vw/dataOut/stockSettledDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/vw/dataOut/stockSettledDiffReport/detail.vue
index ea48d5eb..34376c8c 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataOut/stockSettledDiffReport/detail.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataOut/stockSettledDiffReport/detail.vue
@@ -14,7 +14,7 @@
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照客户物料号全字匹配搜索..."
+        placeholder="按照客户物料号搜索..."
         style="width: 230px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -277,9 +277,13 @@ export default {
             });
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.listQuery.ParentId = this.customerInfo.parentId;
       console.log("R3结算数据对比输出表：" + JSON.stringify(this.listQuery));
       this.$axios
@@ -318,7 +322,7 @@ export default {
         let filter = {
           logic: 0,
           column: column,
-          action: 0,
+          action: 6,
           value: this.searchContent,
         };
         this.listQuery.Filters.push(filter);
diff --git a/code/WebApp/vue/src/views/ux/vw/dataOut/stockSettledDiffReport/index.vue b/code/WebApp/vue/src/views/ux/vw/dataOut/stockSettledDiffReport/index.vue
index 1eccd3b2..2521c9bb 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataOut/stockSettledDiffReport/index.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataOut/stockSettledDiffReport/index.vue
@@ -26,6 +26,8 @@
         @click="handleFilter"
         >搜索
       </el-button>
+
+     
     </flexbox>
     <!--表格渲染-->
     <el-table
@@ -54,7 +56,10 @@
         width="260px"
       >
         <template slot-scope="scope">
-          <el-tooltip :content="scope.row.documentNumber" placement="top">
+          <el-tooltip
+            :content="scope.row.documentNumber"
+            placement="bottom-end"
+          >
             <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
               scope.row.documentNumber
             }}</span>
@@ -101,6 +106,7 @@
             <el-form-item prop="version">
               <el-select
                 v-model="form.version"
+                filterable
                 clearable
                 style="width: 188px"
                 placeholder="请选择"
@@ -125,6 +131,7 @@
         >
       </div>
     </el-dialog>
+  
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
       <pagination
@@ -158,6 +165,7 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 import permission from "@/directive/permission/index.js";
 import SendUnsettledDiffReport from "./detail";
 import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
 
 export default {
   name: "sendUnsettledDiffReport",
@@ -182,14 +190,16 @@ export default {
           { required: true, message: "必须选择版本！", trigger: "change" },
         ],
       },
+      
       customerInfos: [],
       searchContent: "", // 输入内容
       drawer: false,
       form: {
         version: "",
-            customerCode: "U22000",
+        customerCode: "U22000",
         customerName: "一汽-大众汽车有限公司",
       },
+
       versionValue: "",
       versionList: [],
       list: null,
@@ -216,8 +226,22 @@ export default {
         SkipCount: 0,
         MaxResultCount: 15,
       },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
       page: 1,
       dialogFormVisible: false,
+      dialogFormExport: false,
       multipleSelection: [],
       formTitle: "",
       drawer: false,
@@ -260,15 +284,19 @@ export default {
     },
   },
   methods: {
+
     getVersionInfo() {
       //取版本列表信息
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 3000;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
         .then((response) => {
           this.versionList = [];
-          response.forEach((element) => {
+          response.items.forEach((element) => {
             let options = {};
             options.value = element.version;
             options.label = element.version;
@@ -295,18 +323,51 @@ export default {
 
           console.log(JSON.stringify(this.form));
           this.$axios
-            .posts(
-              "/api/settleaccount/stock-settled-report/report",
-              this.form
-            )
-            .then((response) => {
-              this.formLoading = false;
-              this.$notify({
-                title: "成功",
-                message: "统计成功！",
-                type: "success",
-                duration: 2000,
-              });
+            .posts("/api/settleaccount/stock-settled-report/report", this.form)
+            .then((res) => {
+              //alert(JSON.stringify(res))
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              // this.$notify({
+              //   title: "成功",
+              //   message: "统计成功！",
+              //   type: "success",
+              //   duration: 2000,
+              // });
               this.dialogFormVisible = false;
               this.getList();
             })
@@ -316,6 +377,7 @@ export default {
         }
       });
     },
+  
     //抽屉
     handleDrawerOpen(param) {
       this.drawer = true;
@@ -331,7 +393,11 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property == "beginTime" || column.property == "endTime") {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
         var date = row[column.property];
         if (date == undefined) {
           return "";
@@ -353,9 +419,13 @@ export default {
       this.showExcelImport = false;
       this.getList();
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
 
       let customfilter = {
         logic: 0,
diff --git a/code/WebApp/vue/src/views/ux/vw/dataOut/stockUnsettledDiffReport/detail.vue b/code/WebApp/vue/src/views/ux/vw/dataOut/stockUnsettledDiffReport/detail.vue
index f449b362..9fc9bbcf 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataOut/stockUnsettledDiffReport/detail.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataOut/stockUnsettledDiffReport/detail.vue
@@ -272,9 +272,13 @@ export default {
             });
         });
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.listQuery.ParentId = this.customerInfo.parentId;
       console.log("fis结算：" + JSON.stringify(this.listQuery));
       this.$axios
diff --git a/code/WebApp/vue/src/views/ux/vw/dataOut/stockUnsettledDiffReport/index.vue b/code/WebApp/vue/src/views/ux/vw/dataOut/stockUnsettledDiffReport/index.vue
index a535ae06..24142e64 100644
--- a/code/WebApp/vue/src/views/ux/vw/dataOut/stockUnsettledDiffReport/index.vue
+++ b/code/WebApp/vue/src/views/ux/vw/dataOut/stockUnsettledDiffReport/index.vue
@@ -26,11 +26,20 @@
         @click="handleFilter"
         >搜索
       </el-button>
+      <el-button
+        type="warning"
+        plain
+        icon="el-icon-download"
+        size="mini"
+        style="margin-left: 15px"
+        @click="handleDownload()"
+        >库存差异增减分析表
+      </el-button>
     </flexbox>
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading="listLoading"
+      v-loading.fullscreen.lock="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
@@ -54,7 +63,10 @@
         width="260px"
       >
         <template slot-scope="scope">
-          <el-tooltip :content="scope.row.documentNumber" placement="top">
+          <el-tooltip
+            :content="scope.row.documentNumber"
+            placement="bottom-end"
+          >
             <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
               scope.row.documentNumber
             }}</span>
@@ -101,6 +113,7 @@
             <el-form-item prop="version">
               <el-select
                 v-model="form.version"
+                filterable
                 clearable
                 style="width: 188px"
                 placeholder="请选择"
@@ -125,6 +138,56 @@
         >
       </div>
     </el-dialog>
+    <!--新宇做的报表-->
+    <el-dialog
+      :title="formTitle"
+      :visible.sync="dialogFormExport"
+      width="600px"
+      append-to-body
+    >
+      <el-form ref="formReport" :model="formReport" :rules="rulesReport" label-width="110px">
+        <el-form-item label="请选择年份" prop="year" required>
+          <el-date-picker
+            v-model="formReport.year"
+            style="width: 188px"
+            type="year"
+            format="yyyy 年"
+            value-format="yyyy"
+            placeholder="选择年"
+          />
+        </el-form-item>
+        <el-form-item label="请选客户" prop="customCode" required>
+          <el-select
+            v-model="formReport.customCode"
+            placeholder="请选择客户"
+            :style="{ width: '100%' }"
+            clearable
+          >
+            <el-option label="大众" value="U22000" />
+            <el-option label="奔腾" value="T51Z40" />
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="选择文件类型" prop="fileType">
+          <el-select
+            v-model="formReport.fileType"
+            placeholder="请选择文件类型"
+            :style="{ width: '100%' }"
+            clearable
+          >
+            <el-option label="CSV格式" value="0" />
+            <el-option label="Excel格式" value="1" />
+          </el-select>
+        </el-form-item> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" v-loading="formLoading" @click="submitForm"
+          >确 定</el-button
+        >
+        <el-button type="text" @click="dialogFormExport = false"
+          >取消</el-button
+        >
+      </div>
+    </el-dialog>
     <div class="table-footer">
       <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
       <pagination
@@ -158,6 +221,7 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 import permission from "@/directive/permission/index.js";
 import StockFisDiffReport from "./detail";
 import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
 
 export default {
   name: "sendUnsettledDiffReport",
@@ -182,14 +246,28 @@ export default {
           { required: true, message: "必须选择版本！", trigger: "change" },
         ],
       },
+      rulesReport: {
+        //前端定义的规则，后端也有验证
+        year: [{ required: true, message: "必填！", trigger: "change" }],
+        customCode: [{ required: true, message: "必填！", trigger: "change" }],
+      },
       customerInfos: [],
       searchContent: "", // 输入内容
       drawer: false,
       form: {
         version: "",
-      customerCode: "U22000",
+        customerCode: "U22000",
         customerName: "一汽-大众汽车有限公司",
       },
+      formReport: {
+        year: "",
+        customCode: "",
+        fileType: 0,
+        branchId: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+        documentNumber: "string",
+        documentType: 4,
+        documentStatus: 0,
+      },
       versionValue: "",
       versionList: [],
       list: null,
@@ -216,8 +294,22 @@ export default {
         SkipCount: 0,
         MaxResultCount: 15,
       },
+      listQueryVersion: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 1000,
+      },
       page: 1,
       dialogFormVisible: false,
+      dialogFormExport: false,
       multipleSelection: [],
       formTitle: "",
       drawer: false,
@@ -260,15 +352,24 @@ export default {
     },
   },
   methods: {
+    handleDownload() {
+      this.$nextTick(() => {
+        this.$refs["formReport"].resetFields();
+      });
+      this.formTitle = "导出库存差异增减分析表";
+      this.dialogFormExport = true;
+    },
     getVersionInfo() {
-      //取版本列表信息
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 3000;
+      this.listQueryVersion.SkipCount = (this.page - 1) * 1000;
       this.$axios
-        .posts("/api/settleaccount/CentralizedControl/openlist")
+        .posts(
+          "/api/settleaccount/CentralizedControl/list",
+          this.listQueryVersion
+        )
         .then((response) => {
           this.versionList = [];
-          response.forEach((element) => {
+          response.items.forEach((element) => {
             let options = {};
             options.value = element.version;
             options.label = element.version;
@@ -298,14 +399,50 @@ export default {
               "/api/settleaccount/stock-unsettled-report/report",
               this.form
             )
-            .then((response) => {
-              this.formLoading = false;
-              this.$notify({
-                title: "成功",
-                message: "统计成功！",
-                type: "success",
-                duration: 2000,
-              });
+            .then((res) => {
+              let fileNameOfProject = res;
+              this.$axios
+                .BolbGets(
+                  "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+                )
+                .then((response) => {
+                  if (fileNameOfProject.indexOf("_") != -1) {
+                    let downName =
+                      fileNameOfProject.slice(
+                        0,
+                        fileNameOfProject.lastIndexOf("_")
+                      ) +
+                      fileNameOfProject.slice(
+                        fileNameOfProject.lastIndexOf(".")
+                      );
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileNameOfProject);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              // this.formLoading = false;
+              // this.$notify({
+              //   title: "成功",
+              //   message: "统计成功！",
+              //   type: "success",
+              //   duration: 2000,
+              // });
               this.dialogFormVisible = false;
               this.getList();
             })
@@ -315,6 +452,57 @@ export default {
         }
       });
     },
+    submitForm() {
+      //导出报表-新宇做的报表
+      this.$refs.formReport.validate((valid) => {
+        if (valid) {
+          this.formLoading = true;
+
+          console.log(JSON.stringify(this.formReport));
+          this.$axios
+            .posts(
+              "/api/settleaccount/stock-unsettled-report/unsettlediff",
+              this.formReport
+            )
+            .then((res) => {
+              let fileName = res;
+              this.$axios
+                .BolbGets("/api/settleaccount/getblobfile/download/" + fileName)
+                .then((response) => {
+                  if (fileName.indexOf("_") != -1) {
+                    let downName =
+                      fileName.slice(0, fileName.lastIndexOf("_")) +
+                      fileName.slice(fileName.lastIndexOf("."));
+                    downloadFile(response, downName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  } else {
+                    downloadFile(response, fileName);
+                    this.$notify({
+                      title: "成功",
+                      message: "数据-导出成功！",
+                      type: "success",
+                      duration: 2000,
+                    });
+                  }
+                  this.formLoading = false;
+                })
+                .catch((error) => {
+                  this.formLoading = false;
+                });
+              this.dialogFormExport = false;
+              this.getList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
     //抽屉
     handleDrawerOpen(param) {
       this.drawer = true;
@@ -330,7 +518,11 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
-      if (column.property == "beginTime" || column.property == "endTime") {
+      if (
+        column.property == "beginTime" ||
+        column.property == "endTime" ||
+        column.property == "creationTime"
+      ) {
         var date = row[column.property];
         if (date == undefined) {
           return "";
@@ -349,9 +541,13 @@ export default {
       this.showExcelImport = false;
       this.getList();
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+       if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       this.listQuery.Filters = [];
 
       let customfilter = {
diff --git a/code/WebApp/vue/static/aa.vue b/code/WebApp/vue/static/aa.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/code/WebApp/vue/static/config.js b/code/WebApp/vue/static/config.js
index 89f7f188..cd1455df 100644
--- a/code/WebApp/vue/static/config.js
+++ b/code/WebApp/vue/static/config.js
@@ -2,14 +2,11 @@ let configJSON
 if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
-			//ip: 'http://192.168.0.63',
-      //ip: 'http://149.223.116.5',
-			//ip: 'http://192.168.0.140',
-			ip: 'http://127.0.0.1', //?? two
-      auth_port: '8066',
-      public_port: '8092',
-      //backend_port: '8092',
-			backend_port: '44344', //?? three
+
+      ip: 'http://dev.ccwin-in.com',
+      auth_port: '10582',
+      public_port: '10582',
+      backend_port: '10582'
     },
     basic: {},
     upload: {
@@ -28,27 +25,20 @@ if (process.env.NODE_ENV === 'development') {
       ip: 'http://localhost',
       basicPort: ''
     },
-    client: {
-      client_id: 'basic-web',
-      client_secret: '1q2w3e*',
-      grant_type: 'password'
+    client: {
+      client_id: 'basic-web',
+      client_secret: '1q2w3e*',
+      grant_type: 'password'
     }
   }
 } else {
   // 发布环境
   configJSON = {
     base: {
-      
-      //ip: 'http://192.168.0.67',
-      ip: 'http://192.168.0.140',
-      //ip: 'http://192.168.0.63',
-      //ip: 'http://149.223.116.5',
-      //ip: 'http://114.116.225.148',
-      //ip: 'http://10.123.148.162',
-      auth_port: '8066',
-      public_port: '8092',
-      backend_port: '8092'
-			
+      ip: 'http://dev.ccwin-in.com',
+      auth_port: '10582',
+      public_port: '10582',
+      backend_port: '10582'
     },
     basic: {},
     upload: {
@@ -67,43 +57,13 @@ if (process.env.NODE_ENV === 'development') {
       ip: 'http://localhost',
       basicPort: ''
     },
-    client: {
-      client_id: 'basic-web',
-      client_secret: '1q2w3e*',
-      grant_type: 'password'
+    client: {
+      client_id: 'basic-web',
+      client_secret: '1q2w3e*',
+      grant_type: 'password'
     }
   }
 }
-// 开发环境
-// export default {
-//   base: {
-//     ip: 'http://localhost',
-//     auth_port: '44323',
-//     public_port: '44350',
-//     backend_port: '44350'
-//   },
-//   basic: {},
-//   upload: {
-//     ip: 'http://localhost'
-//   },
-//   authServer: {
-//     ip: 'http://localhost'
-//   },
-//   crm: {
-//     ip: 'http://localhost'
-//   },
-//   oms: {
-//     ip: 'http://localhost'
-//   },
-//   wx: {
-//     ip: 'http://localhost',
-//     basicPort: ''
-//   },
-//   client: {
-//     client_id: 'abpvnext_master_App',
-//     client_secret: '1q2w3e*',
-//     grant_type: 'password'
-//   }
-// }
+
 
 export default configJSON
diff --git a/code/WebApp/vue/static/config.rar b/code/WebApp/vue/static/config.rar
new file mode 100644
index 00000000..98993eeb
Binary files /dev/null and b/code/WebApp/vue/static/config.rar differ
diff --git a/code/WebApp/vue/static/tableFieldForSearch.json b/code/WebApp/vue/static/tableFieldForSearch.json
index 956275ca..bc486f11 100644
--- a/code/WebApp/vue/static/tableFieldForSearch.json
+++ b/code/WebApp/vue/static/tableFieldForSearch.json
@@ -37,6 +37,16 @@
         "fieldName": "erpMaterialCode",
         "setting": []
       },
+      {
+        "fieldId": 1,
+        "formType": "text",
+        "name": "物料属性",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "materialProperty",
+        "setting": []
+      },
       {
         "fieldId": 2,
         "formType": "text",
@@ -46,6 +56,26 @@
         "fieldType": 1,
         "fieldName": "settleMaterialCode",
         "setting": []
+      },
+      {
+        "fieldId": 2,
+        "formType": "text",
+        "name": "发货看板物料号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "shipMaterailCode",
+        "setting": []
+      },
+      {
+        "fieldId": 2,
+        "formType": "text",
+        "name": "估价类",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "appraisalCategory",
+        "setting": []
       }
     ]
   },
@@ -87,6 +117,16 @@
   "material": {
     "id": "3",
     "data": [
+      {
+        "fieldId": 1,
+        "formType": "text",
+        "name": "工厂",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "factory",
+        "setting": []
+      },
       {
         "fieldId": 2,
         "formType": "text",
@@ -112,6 +152,16 @@
   "bomdatabase": {
     "id": "4",
     "data": [
+      {
+        "fieldId": 2,
+        "formType": "text",
+        "name": "工厂",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "factory",
+        "setting": []
+      },
       {
         "fieldId": 2,
         "formType": "text",
@@ -322,34 +372,29 @@
       },
       {
         "fieldId": 2,
-        "formType": "select",
-        "isNull": 0,
-        "name": "底盘开票状态",
-        "options": "",
-        "type": 3,
+        "formType": "text",
+        "name": "底盘号",
+        "type": 1,
         "value": "",
-        "fieldType": 0,
-        "fieldName": "state",
-        "setting": [
-          "未结,0",
-          "部分结算,1",
-          "已结,2"
-        ]
+        "fieldType": 1,
+        "fieldName": "chassisNumber",
+        "setting": []
       },
       {
-        "fieldId": 3,
+        "fieldId": 2,
         "formType": "select",
         "isNull": 0,
-        "name": "底盘结算状态",
+        "name": "状态",
         "options": "",
         "type": 3,
         "value": "",
         "fieldType": 0,
-        "fieldName": "settleState",
+        "fieldName": "state",
         "setting": [
-          "底盘未结,0",
-          "底盘部分结算,1",
-          "底盘已结,2"
+          "未结,0",
+          "部分结算,1",
+          "已结,2",
+          "预批量,3"
         ]
       }
     ]
@@ -406,61 +451,21 @@
         "fieldType": 1,
         "fieldName": "materialCode",
         "setting": []
-      }
-    ]
-  },
-  "unSettleAccount": {
-    "id": "11",
-    "data": [
-      {
-        "fieldId": 0,
-        "formType": "text",
-        "name": "版本",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "version",
-        "setting": []
       },
       {
         "fieldId": 2,
-        "formType": "text",
-        "name": "KENN号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "kennCode",
-        "setting": []
-      },
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "车型",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "model",
-        "setting": []
-      },
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "底盘号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "chassisNumber",
-        "setting": []
-      },
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "零件号",
-        "type": 1,
+        "formType": "select",
+        "isNull": 0,
+        "name": "状态",
+        "options": "",
+        "type": 3,
         "value": "",
-        "fieldType": 1,
-        "fieldName": "materialCode",
-        "setting": []
+        "fieldType": 0,
+        "fieldName": "state",
+        "setting": [
+          "未结,0",
+          "已结,2"
+        ]
       }
     ]
   },
@@ -489,28 +494,8 @@
         "fieldName": "state",
         "setting": [
           "预批量,3",
-          "其他,0"
+          "未结,0"
         ]
-      },
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "车型",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "carCode",
-        "setting": []
-      },
-      {
-        "fieldId": 4,
-        "formType": "text",
-        "name": "标识",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "yearKennCode",
-        "setting": []
       }
     ]
   },
@@ -1826,1125 +1811,4 @@
       }
     ]
   }
-  ,
-  "priceList": {
-    "id": "31",
-    "data": [
-      {
-        "fieldId": 0,
-        "formType": "text",
-        "name": "价格",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "price",
-        "setting": []
-      },
-      {
-        "fieldId": 1,
-        "formType": "text",
-        "name": "物料编号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialCode",
-        "setting": []
-      },
-      {
-        "fieldId": 1,
-        "formType": "text",
-        "name": "期间",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "version",
-        "setting": []
-      }
-    ]
-  },
-  "invoice": {
-    "id": "31",
-    "data": [
-      {
-        "fieldId": 0,
-        "formType": "text",
-        "name": "工厂",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "factory",
-        "setting": []
-      },
-      {
-        "fieldId": 1,
-        "formType": "text",
-        "name": "物料号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialCode",
-        "setting": []
-      },
-      {
-        "fieldId": 1,
-        "formType": "text",
-        "name": "零件名称",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialDesc",
-        "setting": []
-      }
-    ]
-  },
-  "settlementPart": {
-    "id": "32",
-    "data": [
-      {
-        "fieldId": 0,
-        "formType": "text",
-        "name": "结算物料号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "settlementPartCode",
-        "setting": []
-      },
-      {
-        "fieldId": 1,
-        "formType": "text",
-        "name": "工厂",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "factory",
-        "setting": []
-      },
-      {
-        "fieldId": 1,
-        "formType": "text",
-        "name": "车型",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "model",
-        "setting": []
-      }
-    ]
-  },
-  "itemInvoicePrice": {
-    "id": "32",
-    "data": [
-      {
-        "fieldId": 0,
-        "formType": "text",
-        "name": "零件名称",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialDesc",
-        "setting": []
-      },
-      {
-        "fieldId": 1,
-        "formType": "text",
-        "name": "销售订单",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "sales",
-        "setting": []
-      }
-    ]
-  },
-  "SettlementCrossReference": {
-    "id": "34",
-    "data": [
-      {
-        "fieldId": 1,
-        "formType": "text",
-        "name": "期间",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "period",
-        "setting": []
-      },
-      {
-        "fieldId": 2,
-        "formType": "text",
-        "name": "工厂",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "factory",
-        "setting": []
-      },
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "车型",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "model",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "零件类型",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "partType",
-        "setting": []
-      },
-      {
-        "fieldId": 6,
-        "formType": "text",
-        "name": "总成结算号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "settlementMaterialCode",
-        "setting": []
-      },
-      {
-        "fieldId": 7,
-        "formType": "text",
-        "name": "BOM清单零件号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "bomMaterialCode",
-        "setting": []
-      },
-      {
-        "fieldId": 8,
-        "formType": "text",
-        "name": "零件名称",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialDesc",
-        "setting": []
-      },
-      {
-        "fieldId": 9,
-        "formType": "text",
-        "name": "供应商代码",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "supplierCode",
-        "setting": []
-      },
-      {
-        "fieldId": 10,
-        "formType": "text",
-        "name": "采购员",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "buyer",
-        "setting": []
-      },
-      {
-        "fieldId": 11,
-        "formType": "text",
-        "name": "适用功能",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "customerCode",
-        "setting": []
-      }
-    ]
-  },
-  "EP": {
-    "id": "35",
-    "data": [
-      {
-        "fieldId": 1,
-        "formType": "text",
-        "name": "索引",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "index",
-        "setting": []
-      },
-      {
-        "fieldId": 2,
-        "formType": "text",
-        "name": "工厂",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "factory",
-        "setting": []
-      },
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "车型",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "model",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "零件类型",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "partType",
-        "setting": []
-      },
-      {
-        "fieldId": 6,
-        "formType": "text",
-        "name": "总成结算号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "settleMentPartCode",
-        "setting": []
-      },
-      {
-        "fieldId": 7,
-        "formType": "text",
-        "name": "BOM清单零件号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialPartCode",
-        "setting": []
-      },
-      {
-        "fieldId": 8,
-        "formType": "text",
-        "name": "零件名称",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialDesc",
-        "setting": []
-      },
-      {
-        "fieldId": 9,
-        "formType": "text",
-        "name": "供应商代码",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "supplierCode",
-        "setting": []
-      },
-      {
-        "fieldId": 10,
-        "formType": "text",
-        "name": "采购员",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "buyer",
-        "setting": []
-      },
-      {
-        "fieldId": 11,
-        "formType": "text",
-        "name": "BOM用量",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "usedNumber",
-        "setting": []
-      },
-      {
-        "fieldId": 12,
-        "formType": "text",
-        "name": "供货比例[%]",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "supplyProportion",
-        "setting": []
-      },
-      {
-        "fieldId": 13,
-        "formType": "text",
-        "name": "价格",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "price",
-        "setting": []
-      },
-      {
-        "fieldId": 14,
-        "formType": "text",
-        "name": "结算价格",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "settlementPrice",
-        "setting": []
-      },
-      {
-        "fieldId": 15,
-        "formType": "text",
-        "name": "单价差",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "diffPrice",
-        "setting": []
-      },
-      {
-        "fieldId": 16,
-        "formType": "text",
-        "name": "结算件下线数量",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "settlementNumber",
-        "setting": []
-      },
-      {
-        "fieldId": 17,
-        "formType": "text",
-        "name": "理论结算数量",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "theoreticalSettlementNumber",
-        "setting": []
-      },
-      {
-        "fieldId": 18,
-        "formType": "text",
-        "name": "实际结算数量",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "realSettlementNumber",
-        "setting": []
-      },
-      {
-        "fieldId": 19,
-        "formType": "text",
-        "name": "实际结算金额",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "realSettlementPrice",
-        "setting": []
-      },
-      {
-        "fieldId": 20,
-        "formType": "text",
-        "name": "是否量差",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "isDiffNumber",
-        "setting": []
-      },
-      {
-        "fieldId": 21,
-        "formType": "text",
-        "name": "差异金额",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "diffAmount",
-        "setting": []
-      },
-      {
-        "fieldId": 22,
-        "formType": "text",
-        "name": "差异原因",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "remark",
-        "setting": []
-      }
-    ]
-  },
-  "settlementPartAndSpareParts": {
-    "id": "36",
-    "data": [
-      {
-        "fieldId": 1,
-        "formType": "text",
-        "name": "期间",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "period",
-        "setting": []
-      },
-      {
-        "fieldId": 2,
-        "formType": "text",
-        "name": "适用功能",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "applicableFunction",
-        "setting": []
-      },
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "结算件编码",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "settlementPartCode",
-        "setting": []
-      },
-      {
-        "fieldId": 4,
-        "formType": "text",
-        "name": "结算件描述",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "settlementPartDesc",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "(Erp散件)零件号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "erpSparePartCode",
-        "setting": []
-      },
-      {
-        "fieldId": 6,
-        "formType": "text",
-        "name": "(Erp散件)零件名称",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "erpSparePartName",
-        "setting": []
-      },
-      {
-        "fieldId": 7,
-        "formType": "text",
-        "name": "零件类型",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "partType",
-        "setting": []
-      },
-      {
-        "fieldId": 8,
-        "formType": "text",
-        "name": "QAD代码",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "qADCode",
-        "setting": []
-      },
-      {
-        "fieldId": 9,
-        "formType": "text",
-        "name": "供应商代码",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "supplierCode",
-        "setting": []
-      },
-      {
-        "fieldId": 10,
-        "formType": "text",
-        "name": "供应商名称",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "supplierName",
-        "setting": []
-      },
-      {
-        "fieldId": 11,
-        "formType": "text",
-        "name": "产品类",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "productLine",
-        "setting": []
-      },
-      {
-        "fieldId": 12,
-        "formType": "text",
-        "name": "每车数量",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "perCarNum",
-        "setting": []
-      },
-      {
-        "fieldId": 13,
-        "formType": "text",
-        "name": "单价",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "price",
-        "setting": []
-      },
-      {
-        "fieldId": 14,
-        "formType": "text",
-        "name": "供货比例",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "supplyProportion",
-        "setting": []
-      },
-      {
-        "fieldId": 15,
-        "formType": "text",
-        "name": "辆份价格",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "quantityPrice",
-        "setting": []
-      }
-    ]
-  },
-  "vWKanBan": {
-    "id": "36",
-    "data": [
-      {
-        "fieldId": 1,
-        "formType": "text",
-        "name": "看板条码号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "kanban",
-        "setting": []
-      },
-      {
-        "fieldId": 2,
-        "formType": "text",
-        "name": "工厂",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "factory",
-        "setting": []
-      },
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "零件号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialCode",
-        "setting": []
-      },
-      {
-        "fieldId": 4,
-        "formType": "text",
-        "name": "零件类型",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "partType",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "供应商编码",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "supplierCode",
-        "setting": []
-      },
-      {
-        "fieldId": 6,
-        "formType": "text",
-        "name": "入库结算标识",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "flag",
-        "setting": []
-      },
-      
-      {
-        "fieldId": 15,
-        "formType": "text",
-        "name": "结算状态",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "state",
-        "setting": []
-      }
-    ]
-  },
-  "WMSKanBan": {
-    "id": "36",
-    "data": [
-      {
-        "fieldId": 1,
-        "formType": "text",
-        "name": "看板条码号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "kanban",
-        "setting": []
-      },
-      {
-        "fieldId": 2,
-        "formType": "text",
-        "name": "工厂",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "factory",
-        "setting": []
-      },
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "零件号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialCode",
-        "setting": []
-      },
-      {
-        "fieldId": 4,
-        "formType": "text",
-        "name": "零件类型",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "partType",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "供应商编码",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "supplierCode",
-        "setting": []
-      },
-      {
-        "fieldId": 6,
-        "formType": "text",
-        "name": "入库结算标识",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "flag",
-        "setting": []
-      },
-      
-      {
-        "fieldId": 15,
-        "formType": "text",
-        "name": "结算状态",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "state",
-        "setting": []
-      }
-    ]
-  },
-  "scrapClaims": {
-    "id": "36",
-    "data": [
-      {
-        "fieldId": 2,
-        "formType": "select",
-        "isNull": 0,
-        "name": "类型(报废和索赔)",
-        "options": "",
-        "type": 3,
-        "value": "",
-        "fieldType": 0,
-        "fieldName": "type",
-        "setting": [
-          "CP7报废,CP7报废",
-          "索赔,索赔"
-        ]
-      },
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "零件号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialCode",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "零件名称",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialDesc",
-        "setting": []
-      }
-    ]
-  },
-  "sparePart": {
-    "id": "36",
-    "data": [
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "采购类型",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "purchaseType",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "采购订单号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "purchaseOrderNo",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "物料代码",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialCode",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "交货单号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "deliveryOrderNo",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "批次号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "batchNo",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "工厂",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "factory",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "工厂名称",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "factoryName",
-        "setting": []
-      }
-    ]
-  },
-  "wmsSparePart": {
-    "id": "36",
-    "data": [
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "采购类型",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "purchaseType",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "采购订单号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "purchaseOrderNo",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "物料代码",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialCode",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "交货单号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "deliveryOrderNo",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "批次号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "batchNo",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "工厂",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "factory",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "工厂名称",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "factoryName",
-        "setting": []
-      }
-    ]
-  },
-  "hqHPlatform": {
-    "id": "36",
-    "data": [
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "采购订单号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "purchaseOrderNo",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "物料代码",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialCode",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "科目号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "accountNum",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "交货单号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "deliveryOrderNo",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "工厂",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "factory",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "工厂名称",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "factoryName",
-        "setting": []
-      }
-    ]
-  },
-  "hqMPlatform": {
-    "id": "36",
-    "data": [
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "采购订单号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "purchaseOrderNo",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "物料代码",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialCode",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "科目号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "accountNum",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "交货单号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "deliveryOrderNo",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "工厂",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "factory",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "工厂名称",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "factoryName",
-        "setting": []
-      }
-    ]
-  },
-  "vwOutOrder": {
-    "id": "36",
-    "data": [
-      {
-        "fieldId": 3,
-        "formType": "text",
-        "name": "零件号",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialCode",
-        "setting": []
-      },
-      {
-        "fieldId": 5,
-        "formType": "text",
-        "name": "物料组",
-        "type": 1,
-        "value": "",
-        "fieldType": 1,
-        "fieldName": "materialGroup",
-        "setting": []
-      },
-      {
-        "fieldId": 2,
-        "formType": "select",
-        "isNull": 0,
-        "name": "状态",
-        "options": "",
-        "type": 3,
-        "value": "",
-        "fieldType": 0,
-        "fieldName": "state",
-        "setting": [
-          "未处理,0",
-          "申请出库,1",
-          "确认出库,2",
-          "不能出库,3",
-          "取消出库,4"
-        ]
-      }
-    ]
-  }
 }
\ No newline at end of file
diff --git a/code/WebApp/vue/static/tableFieldForSearch520-v1.rar b/code/WebApp/vue/static/tableFieldForSearch520-v1.rar
new file mode 100644
index 00000000..06ad8a15
Binary files /dev/null and b/code/WebApp/vue/static/tableFieldForSearch520-v1.rar differ
diff --git a/code/WebApp/vue/static/tableFieldForSearch520.rar b/code/WebApp/vue/static/tableFieldForSearch520.rar
new file mode 100644
index 00000000..cbab40e9
Binary files /dev/null and b/code/WebApp/vue/static/tableFieldForSearch520.rar differ
diff --git a/code/WebApp/vue/vue.config.js b/code/WebApp/vue/vue.config.js
index a17d3c9f..f8c28e81 100644
--- a/code/WebApp/vue/vue.config.js
+++ b/code/WebApp/vue/vue.config.js
@@ -78,7 +78,7 @@ module.exports = {
         }
       }
     },
-    before: require('./mock/mock-server.js')
+    //before: require('./mock/mock-server.js')
   },
   configureWebpack: {
     // provide the app's title in webpack's name field, so that