diff --git a/config/index.js b/config/index.js
index 6d59569..c36a3a0 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,78 +1,78 @@
-"use strict";
-// Template version: 1.3.1
-// see http://vuejs-templates.github.io/webpack for documentation.
-
-const path = require("path");
-
-module.exports = {
-  dev: {
-    // Paths
-    assetsSubDirectory: "static",
-    assetsPublicPath: "/",
-    proxyTable: {
-      "/gyhl": {
-        // target: "/gyhl", //8889
-        target: "http://36.137.58.70:52/gyhl",
-        // // target:"http://192.168.1.194:21925", //lj-local
-        changeOrigin: true,
-        pathRewrite: {
-          "^/gyhl": ""
-        }
-      }
-    },
-
-    // Various Dev Server settings
-    host: "localhost", // can be overwritten by process.env.HOST
-    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: true,
-    errorOverlay: true,
-    notifyOnErrors: true,
-    poll: false,
-    // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
-
-    /**
-     * Source Maps
-     */
-
-    // https://webpack.js.org/configuration/devtool/#development
-    devtool: "cheap-module-eval-source-map",
-
-    // If you have problems debugging vue-files in devtools,
-    // set this to false - it *may* help
-    // https://vue-loader.vuejs.org/en/options.html#cachebusting
-    cacheBusting: true,
-
-    cssSourceMap: true
-  },
-
-  build: {
-    // Template for index.html
-    index: path.resolve(__dirname, "../gyhl/index.html"),
-
-    // Paths
-    assetsRoot: path.resolve(__dirname, "../gyhl"),
-    assetsSubDirectory: "static",
-    assetsPublicPath: "/",
-
-    /**
-     * Source Maps
-     */
-
-    productionSourceMap: false,
-    // https://webpack.js.org/configuration/devtool/#production
-    devtool: "#source-map",
-
-    // Gzip off by default as many popular static hosts such as
-    // Surge or Netlify already gzip all static assets for you.
-    // Before setting to `true`, make sure to:
-    // npm install --save-dev compression-webpack-plugin
-    productionGzip: false,
-    productionGzipExtensions: ["js", "css"],
-
-    // Run the build command with an extra argument to
-    // View the bundle analyzer report after build finishes:
-    // `npm run build --report`
-    // Set to `true` or `false` to always turn it on or off
-    bundleAnalyzerReport: process.env.npm_config_report
-  }
-};
+"use strict";
+// Template version: 1.3.1
+// see http://vuejs-templates.github.io/webpack for documentation.
+
+const path = require("path");
+
+module.exports = {
+  dev: {
+    // Paths
+    assetsSubDirectory: "static",
+    assetsPublicPath: "/",
+    proxyTable: {
+      "/gyhl": {
+        // target: "/gyhl", //8889
+        target: "http://36.139.25.238:52/gyhl",
+        // // target:"http://192.168.1.194:21925", //lj-local
+        changeOrigin: true,
+        pathRewrite: {
+          "^/gyhl": ""
+        }
+      }
+    },
+
+    // Various Dev Server settings
+    host: "localhost", // can be overwritten by process.env.HOST
+    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    autoOpenBrowser: true,
+    errorOverlay: true,
+    notifyOnErrors: true,
+    poll: false,
+    // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
+
+    /**
+     * Source Maps
+     */
+
+    // https://webpack.js.org/configuration/devtool/#development
+    devtool: "cheap-module-eval-source-map",
+
+    // If you have problems debugging vue-files in devtools,
+    // set this to false - it *may* help
+    // https://vue-loader.vuejs.org/en/options.html#cachebusting
+    cacheBusting: true,
+
+    cssSourceMap: true
+  },
+
+  build: {
+    // Template for index.html
+    index: path.resolve(__dirname, "../gyhl/index.html"),
+
+    // Paths
+    assetsRoot: path.resolve(__dirname, "../gyhl"),
+    assetsSubDirectory: "static",
+    assetsPublicPath: "/",
+
+    /**
+     * Source Maps
+     */
+
+    productionSourceMap: false,
+    // https://webpack.js.org/configuration/devtool/#production
+    devtool: "#source-map",
+
+    // Gzip off by default as many popular static hosts such as
+    // Surge or Netlify already gzip all static assets for you.
+    // Before setting to `true`, make sure to:
+    // npm install --save-dev compression-webpack-plugin
+    productionGzip: false,
+    productionGzipExtensions: ["js", "css"],
+
+    // Run the build command with an extra argument to
+    // View the bundle analyzer report after build finishes:
+    // `npm run build --report`
+    // Set to `true` or `false` to always turn it on or off
+    bundleAnalyzerReport: process.env.npm_config_report
+  }
+};
diff --git a/src/api/salesAPI.js b/src/api/salesAPI.js
index 81ffda6..b78418a 100644
--- a/src/api/salesAPI.js
+++ b/src/api/salesAPI.js
@@ -1,155 +1,186 @@
-/**
- *销售订单
- */
-import base from './base'; // 导入接口域名列表
-import axios from '@/request'; // 导入http中创建的axios实例
-
-const salesAPI = {
-  // 获取销售订单列表
-  listSalesContract(param) {
-    return axios.get(`${base.url}/apis/salesContractApi/salesContractList`, { params: param })
-  },
-  productionTraceabilityListSalesContract(param) {
-    return axios.get(`${base.url}/apis/productionTraceability/salesContractList`, { params: param })
-  },
-  // 获取销售订单导出列表
-  listForExport(param) {
-    return axios.get(`${base.url}/apis/salesContractApi/salesContractListForExport`, { params: param })
-  },
-  // 查询合同类型
-  listContractType(param) {
-    return axios.post(`${base.url}/apis/dict/getDictsByType`, param)
-  },
-  // 查询审核状态
-  listAauditSign(param) {
-    return axios.post(`${base.url}/apis/dict/getDictsByType`, param)
-  },
-  // 删除合同
-  removeContract(param) {
-    return axios.post(`${base.url}/apis/salesContractApi/batchRemove`, param)
-  },
-  // 暂存合同
-  saveContract(param) {
-    return axios.post(`${base.url}/apis/salesContractApi/addOrUpdate`, param)
-  },
-  /** 地磅生成销售 */
-  saveContractFormTruck(param){
-    return axios.post(`${base.url}/apis/salesContractApi/submitScalesContract`,param)
-  },
-  // 提交审批
-  submitContract(param) {
-    return axios.post(`${base.url}/apis/salesContractApi/submitContract`, param)
-  },
-  // 获取合同详细信息
-  getContractDetail(param) {
-    return axios.get(`${base.url}/apis/salesContractApi/detail`, { params: param })
-  },
-  // 审核合同
-  auditContract(param) {
-    return axios.post(`${base.url}/apis/salesContract/audit`, param)
-  },
-  // 反审核合同
-  reverseAuditContract(param) {
-    return axios.post(`${base.url}/apis/salesContract/reverseAudit`, param)
-  },
-  // 关闭合同
-  closeContract(param) {
-    return axios.post(`${base.url}/apis/salesContract/close`, param)
-  },
-  // 反关闭合同
-  reverseClose(param) {
-    return axios.post(`${base.url}/apis/salesContract/reverseClose`, param)
-  },
-  // 变更合同
-  changeContract(param) {
-    return axios.post(`${base.url}/apis/salesContractApi/edit`, param)
-  },
-   // 获取变更销售订单列表
-   getAlterationList(param) {
-    return axios.get(`${base.url}/apis/salesContractApi/alterationList`, { params: param })
-  },
-  // 获取变更销售订单详情
-  getAlterationDetail(param) {
-    return axios.get(`${base.url}/apis/salesContractApi/alterationDetail`, { params: param })
-  },
-  // 导出销售退货
-  exportExcel(param) {
-    return axios.get(`${base.url}/apis/exportExcel/salesContract`, { params: param ,responseType: "blob"})
-  },
-  // 销售订单导入单据
-  getSalesContractList(param) {
-    return axios.get(`${base.url}/apis/salesContractApi/dialog`, { params: param })
-  },
-  // 行关闭
-  closeLine(param) {
-    return axios.post(`${base.url}/apis/salesContractApi/closeLine`, param)
-  },
-
-
-
-
-  // 自定义文件名称文件下载
-  downloadByCusName(param) {
-    return axios.get(`${base.url}/apis/document/downloadByCusName`, { params: param })
-  },
-  // 单文件下载
-  down(param) {
-    return axios.get(`${base.url}/apis/file/down`, { params: param })
-  },
-  // 下载薪资档案模板
-  downLoadSalaryArchives(param) {
-    return axios.get(`${base.url}/apis/exportExcel/downLoadSalaryArchives`, { params: param ,responseType: "blob"})
-  },
-  // 下载社保模板
-  downLoadSocialSecurity(param) {
-    return axios.get(`${base.url}/apis/exportExcel/downLoadSocialSecurity`, { params: param ,responseType: "blob"})
-  },
-  // 下载个税模板
-  downLoadTax(param) {
-    return axios.get(`${base.url}/apis/exportExcel/downLoadTax`, { params: param ,responseType: "blob"})
-  },
-  // 导出薪资记录
-  downLoadRecord(param) {
-    return axios.get(`${base.url}/apis/exportExcel/downLoadRecord`, { params: param ,responseType: "blob"})
-  },
-
-  // 查询合同类型
-  associatedBill(param) {
-    return axios({
-      url:`${base.url}/apis/associatedBill/salesOrder`,
-      method: 'post',
-      data: param,
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
-      }
-    })
-  },
-
-  // 获取字典列表信息
-  list(param) {
-    return axios.post(`${base.url}/apis/dictionary/list`, param)
-},
-
-}
-export default salesAPI;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+/**
+ *销售订单
+ */
+import base from './base'; // 导入接口域名列表
+import axios from '@/request'; // 导入http中创建的axios实例
+
+const salesAPI = {
+  // 导入
+  importAllFile(param,type) {
+    let url = "";
+    switch (type) {
+      case "sales":
+        url = "/apis/standard/importExcel/sales";
+        break;
+      case 'wlps':
+        url ="/apis/mdh/shfw/importExcel";
+        break;
+      case 'patrolPlan':
+        url ="/apis/patrolPlan/importExcel";
+        break;
+      case 'project':
+        url ="/apis/project/importExcel";
+        break;
+        case 'upkeepPlan':
+          url ="/apis/upkeepPlan/importExcel";
+          break;
+          case 'xqgl':
+            url ="/apis/mdh/xqgl/importExcel";
+            break;
+        default:''
+    }
+    return axios.post(`${base.url}${url}`, param, {
+      headers: {
+        'Content-Type': 'multipart/form-data'
+      }
+    });
+  },
+
+  // 获取销售订单列表
+  listSalesContract(param) {
+    return axios.get(`${base.url}/apis/salesContractApi/salesContractList`, { params: param })
+  },
+  productionTraceabilityListSalesContract(param) {
+    return axios.get(`${base.url}/apis/productionTraceability/salesContractList`, { params: param })
+  },
+  // 获取销售订单导出列表
+  listForExport(param) {
+    return axios.get(`${base.url}/apis/salesContractApi/salesContractListForExport`, { params: param })
+  },
+  // 查询合同类型
+  listContractType(param) {
+    return axios.post(`${base.url}/apis/dict/getDictsByType`, param)
+  },
+  // 查询审核状态
+  listAauditSign(param) {
+    return axios.post(`${base.url}/apis/dict/getDictsByType`, param)
+  },
+  // 删除合同
+  removeContract(param) {
+    return axios.post(`${base.url}/apis/salesContractApi/batchRemove`, param)
+  },
+  // 暂存合同
+  saveContract(param) {
+    return axios.post(`${base.url}/apis/salesContractApi/addOrUpdate`, param)
+  },
+  /** 地磅生成销售 */
+  saveContractFormTruck(param){
+    return axios.post(`${base.url}/apis/salesContractApi/submitScalesContract`,param)
+  },
+  // 提交审批
+  submitContract(param) {
+    return axios.post(`${base.url}/apis/salesContractApi/submitContract`, param)
+  },
+  // 获取合同详细信息
+  getContractDetail(param) {
+    return axios.get(`${base.url}/apis/salesContractApi/detail`, { params: param })
+  },
+  // 审核合同
+  auditContract(param) {
+    return axios.post(`${base.url}/apis/salesContract/audit`, param)
+  },
+  // 反审核合同
+  reverseAuditContract(param) {
+    return axios.post(`${base.url}/apis/salesContract/reverseAudit`, param)
+  },
+  // 关闭合同
+  closeContract(param) {
+    return axios.post(`${base.url}/apis/salesContract/close`, param)
+  },
+  // 反关闭合同
+  reverseClose(param) {
+    return axios.post(`${base.url}/apis/salesContract/reverseClose`, param)
+  },
+  // 变更合同
+  changeContract(param) {
+    return axios.post(`${base.url}/apis/salesContractApi/edit`, param)
+  },
+   // 获取变更销售订单列表
+   getAlterationList(param) {
+    return axios.get(`${base.url}/apis/salesContractApi/alterationList`, { params: param })
+  },
+  // 获取变更销售订单详情
+  getAlterationDetail(param) {
+    return axios.get(`${base.url}/apis/salesContractApi/alterationDetail`, { params: param })
+  },
+  // 导出销售退货
+  exportExcel(param) {
+    return axios.get(`${base.url}/apis/exportExcel/salesContract`, { params: param ,responseType: "blob"})
+  },
+  // 销售订单导入单据
+  getSalesContractList(param) {
+    return axios.get(`${base.url}/apis/salesContractApi/dialog`, { params: param })
+  },
+  // 行关闭
+  closeLine(param) {
+    return axios.post(`${base.url}/apis/salesContractApi/closeLine`, param)
+  },
+
+
+
+
+  // 自定义文件名称文件下载
+  downloadByCusName(param) {
+    return axios.get(`${base.url}/apis/document/downloadByCusName`, { params: param })
+  },
+  // 单文件下载
+  down(param) {
+    return axios.get(`${base.url}/apis/file/down`, { params: param })
+  },
+  // 下载薪资档案模板
+  downLoadSalaryArchives(param) {
+    return axios.get(`${base.url}/apis/exportExcel/downLoadSalaryArchives`, { params: param ,responseType: "blob"})
+  },
+  // 下载社保模板
+  downLoadSocialSecurity(param) {
+    return axios.get(`${base.url}/apis/exportExcel/downLoadSocialSecurity`, { params: param ,responseType: "blob"})
+  },
+  // 下载个税模板
+  downLoadTax(param) {
+    return axios.get(`${base.url}/apis/exportExcel/downLoadTax`, { params: param ,responseType: "blob"})
+  },
+  // 导出薪资记录
+  downLoadRecord(param) {
+    return axios.get(`${base.url}/apis/exportExcel/downLoadRecord`, { params: param ,responseType: "blob"})
+  },
+
+  // 查询合同类型
+  associatedBill(param) {
+    return axios({
+      url:`${base.url}/apis/associatedBill/salesOrder`,
+      method: 'post',
+      data: param,
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+      }
+    })
+  },
+
+  // 获取字典列表信息
+  list(param) {
+    return axios.post(`${base.url}/apis/dictionary/list`, param)
+},
+
+}
+export default salesAPI;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/Dialog/dialogImportFile.vue b/src/components/Dialog/dialogImportFile.vue
new file mode 100644
index 0000000..61db190
--- /dev/null
+++ b/src/components/Dialog/dialogImportFile.vue
@@ -0,0 +1,169 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="dialogVisible"
+    :close-on-click-modal="false"
+    width="500px"
+    @close="handleClose"
+  >
+    <el-form ref="uploadForm" :model="form" label-width="80px">
+      <el-form-item label="选择文件">
+        <el-upload
+          ref="upload"
+          class="upload-demo"
+          action="#"
+          drag
+          :http-request="customUpload"
+          :headers="uploadHeaders"
+          :data="uploadData"
+          :before-upload="beforeUpload"
+          :on-success="handleSuccess"
+          :on-error="handleError"
+          :on-change="handleChange"
+          :auto-upload="false"
+          :file-list="fileList"
+          accept=".xlsx,.xls"
+        >
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          <div class="el-upload__tip" slot="tip">
+            只能上传Excel文件，且不超过10MB
+          </div>
+        </el-upload>
+      </el-form-item>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">取 消</el-button>
+      <el-button type="primary" @click="submitUpload" :loading="uploading">
+        {{ uploading ? '上传中...' : '确 定' }}
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'DialogImportFile',
+  props: {
+    title: {
+      type: String,
+      default: '导入Excel文件'
+    },
+    uploadData: {
+      type: Object,
+      default: () => ({})
+    },
+    uploadHeaders: {
+      type: Object,
+      default: () => ({})
+    },
+    source: {
+      type: String,
+      default: ''
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      dialogVisible: this.visible,
+      fileList: [],
+      uploading: false,
+      form: {}
+    };
+  },
+  watch: {
+    visible(newVal) {
+      this.dialogVisible = newVal;
+    }
+  },
+  methods: {
+    handleClose() {
+      this.$emit('update:visible', false);
+      this.$emit('close');
+      this.$refs.upload.clearFiles();
+      this.fileList = [];
+    },
+
+    handleChange(file, fileList) {
+      this.fileList = fileList.slice(-1);
+    },
+
+    beforeUpload(file) {
+      const isExcel =
+        file.type === 'application/vnd.ms-excel' ||
+        file.type ===
+          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+      const isLt10M = file.size / 1024 / 1024 < 10;
+
+      if (!isExcel) {
+        this.$message.error('只能上传Excel文件！');
+        return false;
+      }
+
+      if (!isLt10M) {
+        this.$message.error('上传文件大小不能超过10MB！');
+        return false;
+      }
+
+      return true;
+    },
+
+    // 自定义上传方法
+    async customUpload(options) {
+      const { file, onSuccess, onError } = options;
+      try {
+        const formData = new FormData();
+        formData.append('file', file);
+        this.$api.salesAPI.importAllFile(formData,this.source).then(response => {
+            console.log('上传成功', response);
+          }).catch(error => {
+            console.error('上传失败', error);
+          });
+
+        } catch (error) {
+          onError(error);
+        }
+    },
+
+    submitUpload() {
+      if (this.fileList.length === 0) {
+        this.$message.warning('请先选择文件');
+        return;
+      }
+
+      this.uploading = true;
+      this.$refs.upload.submit();
+    },
+
+    handleSuccess(response, file, fileList) {
+      this.uploading = false;
+      this.$message.success('文件上传成功');
+      const _self = this;
+      setTimeout(() => {
+        _self.$emit('success', response, file, fileList);
+        _self.handleClose();
+      }, 1000);
+    },
+
+    handleError(error, file, fileList) {
+      this.uploading = false;
+      this.$message.error('文件上传失败');
+      this.$emit('error', error, file, fileList);
+    }
+  }
+};
+</script>
+
+<style scoped>
+.upload-demo {
+  width: 100%;
+}
+.dialog-footer{
+  padding-right: 20px;
+  box-sizing: border-box;
+}
+</style>
diff --git a/src/components/Layout/index.vue b/src/components/Layout/index.vue
index 504f69d..78a95c2 100644
--- a/src/components/Layout/index.vue
+++ b/src/components/Layout/index.vue
@@ -1,297 +1,297 @@
-<template>
-  <div class="home rflex">
-    <nav-bar :navCollapse.sync="thisCollapse"></nav-bar>
-    <div class="menu_right wflex" ref="menu_right">
-      <div class="menu_right_box">
-        <div class="menu_right_header">
-          <!--<header-bar></header-bar>
-          <tag-nav></tag-nav>-->
-          <header-box
-            :isCollapse.sync="thisCollapse"
-            :notRedNum.sync="thisNotRedNum"
-          ></header-box>
-        </div>
-        <el-scrollbar
-          style="height: 100%;"
-          wrap-class="default-scrollbar__wrap"
-        >
-          <div class="menu_content" ref="menu_content">
-            <!--            <transition mode="out-in">-->
-            <!--              <keep-alive-->
-            <!--                exclude=""-->
-            <!--              >-->
-            <!--                <router-view :key="key" :notreadnum.sync='notreadnum'></router-view>-->
-            <!--              </keep-alive>-->
-            <!--            </transition>-->
-            <!-- <div class="goGo" v-if="isZx">
-              <img
-                src="../../assets/在线客服.png"
-                alt=""
-                @mouseenter="changeMenu"
-              />
-            </div> -->
-            <!-- <div class="goGo2" v-if="isShow" @mouseleave="changeMenuBack">
-              <div @mouseleave="changeTop" style="position:relative">
-                <img
-                  src="../../assets/QQ客服.png"
-                  alt=""
-                  @mouseenter="changeImg(1)"
-                />
-
-                <img
-                  src="../../assets/微信客服.png"
-                  alt=""
-                  @mouseenter="changeImg(2)"
-                />
-                <img
-                  src="../../assets/在线课堂.png"
-                  alt=""
-                  @mouseenter="changeImg(3)"
-                />
-                <img
-                  src="../../assets/QQ客服号.png"
-                  alt=""
-                  :class="imgShow == 1 ? 'active-one' : ''"
-                  v-if="imgShow == 1"
-                />
-                <img
-                  src="../../assets/erweima.png"
-                  alt=""
-                  :class="imgShow == 2 ? 'active-two' : ''"
-                  class="img-show"
-                  v-if="imgShow == 2"
-                />
-                <img
-                  src="../../assets/video.png"
-                  alt=""
-                  :class="imgShow == 3 ? 'active-two' : ''"
-                  class="img-show"
-                  v-if="imgShow == 3"
-                />
-              </div>
-              <img
-                src="../../assets/返回首页.png"
-                alt=""
-                @click="$router.push('/')"
-              />
-            </div> -->
-
-            <keep-alive>
-              <router-view
-                :notreadnum.sync="notreadnum"
-                :key="key"
-              ></router-view>
-            </keep-alive>
-          </div>
-        </el-scrollbar>
-        <!-- <FooteBar></FooteBar> -->
-        <!-- <backTop :ele="$refs.menu_content"></backTop> -->
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import HeaderBar from "./headerBar";
-import HeaderBox from "./headBox.vue";
-import NavBar from "./navBar";
-import TagNav from "./tagNav";
-import FooteBar from "./footerBar.vue";
-import backTop from "../BackTop";
-import { mapActions } from "vuex";
-
-export default {
-  data() {
-    return {
-      thisCollapse: false,
-      thisNotRedNum: 0,
-      notreadnum: "",
-      isShow: false,
-      isZx: true,
-      imgShow: 0
-    };
-  },
-  computed: {
-    //重要。相同路由页面跳转时，query不同，可以刷新页面
-    key() {
-      if (this.$route.query.t) {
-        this.$store.state.tagNav.openedPageList.forEach(item => {
-          if (item.path == this.$route.path) {
-            item.lastTime = this.$route.query.t;
-          }
-        });
-        return this.$route.fullPath;
-      } else {
-        // let re=""
-        // this.$store.state.tagNav.openedPageList.forEach(item=>{
-        //   if(item.path==this.$route.path){
-        //     re=item.lastTime
-        //   }
-        // })
-        // return re
-      }
-    },
-    tagNavList() {
-      // console.log("缓存页面");
-      // console.log(this.$store.state.tagNav.cachedPageName);
-      return this.$store.state.tagNav.cachedPageName;
-    }
-  },
-  mounted() {
-    this.getLogoUrl();
-    this.getNotReadCount();
-  },
-  components: {
-    HeaderBar,
-    NavBar,
-    TagNav,
-    FooteBar,
-    backTop,
-    HeaderBox
-  },
-  methods: {
-    ...mapActions({
-      getLogoUrl: "common/getLogoUrl"
-    }),
-    // 切换侧边在线客服菜单
-    changeMenu() {
-      this.isShow = true;
-      this.isZx = false;
-    },
-    changeMenuBack() {
-      this.isZx = true;
-      this.isShow = false;
-    },
-    changeImg(num) {
-      this.imgShow = num;
-    },
-    changeTop() {
-      this.imgShow = 0;
-    },
-    getNotReadCount() {
-      this.$api.notificationAPI
-        .countNotRead()
-        .then(res => {
-          this.thisNotRedNum = res.notReadCount;
-
-          // if(res.notReadCount ===0){
-          //
-          //   this.hasNotRead = false;
-          // }else{
-          //   this.hasNotRead = true;
-          // }
-        })
-        .catch(r => {
-          this.pictLoading = false;
-          console.log(r);
-        });
-    }
-  },
-  beforeRouteEnter(to, from, next) {
-    if (to.query.t) {
-      next(vm => {
-        vm.$store.state.tagNav.openedPageList.forEach(item => {
-          if (item.path == to.path) {
-            item.lastTime = to.fullPath;
-          }
-        });
-      });
-    } else {
-      next(vm => {});
-    }
-  },
-  watch: {
-    thisCollapse(newv, oldv) {
-      // console.log(newv)
-    },
-    notreadnum(newv) {
-      this.thisNotRedNum = newv;
-    }
-  }
-};
-</script>
-
-<style scoped lang="less">
-.home,
-.menu_right {
-  height: 100%;
-}
-
-.menu_right {
-  position: relative;
-  overflow: hidden;
-}
-.menu_right_box {
-  // padding-bottom: 41px;
-  padding-bottom: 25px;
-  height: 100%;
-  overflow: auto;
-  box-sizing: border-box;
-}
-.menu_right_header {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  width: 100%;
-  z-index: 999;
-}
-.menu_content {
-  position: relative;
-  height: 100%;
-  padding-top: 90px;
-  box-sizing: border-box;
-  /*overflow: hidden;*/
-}
-
-.page-component__scroll {
-  height: 100%;
-  overflow-x: hidden;
-}
-.el-scrollbar__wrap {
-  overflow-x: hidden;
-}
-.el-scrollbar {
-  overflow: hidden;
-  position: relative;
-}
-.goGo {
-  width: 42px;
-  position: fixed;
-  bottom: 45%;
-  right: 0;
-  z-index: 3000;
-  transform: scale(0.7);
-}
-.goGo2 {
-  width: 62px;
-  position: fixed;
-  bottom: 40%;
-  right: 10px;
-  z-index: 3000;
-}
-.active {
-  position: absolute;
-  top: 0;
-  right: 0;
-  // display: block;
-}
-.active-one {
-  position: absolute;
-  top: 0;
-  right: 65px;
-}
-.active-two {
-  position: absolute;
-  top: 30px;
-  right: 65px;
-}
-.img-show {
-  width: 200px;
-  height: 200px;
-}
-</style>
-<style>
-.home .el-scrollbar__view {
-  height: 100%;
-}
-</style>
+<template>
+  <div class="home rflex">
+    <nav-bar :navCollapse.sync="thisCollapse"></nav-bar>
+    <div class="menu_right wflex" ref="menu_right">
+      <div class="menu_right_box">
+        <div class="menu_right_header">
+          <!--<header-bar></header-bar>
+          <tag-nav></tag-nav>-->
+          <header-box
+            :isCollapse.sync="thisCollapse"
+            :notRedNum.sync="thisNotRedNum"
+          ></header-box>
+        </div>
+        <el-scrollbar
+          style="height: 100%;"
+          wrap-class="default-scrollbar__wrap"
+        >
+          <div class="menu_content" ref="menu_content">
+            <!--            <transition mode="out-in">-->
+            <!--              <keep-alive-->
+            <!--                exclude=""-->
+            <!--              >-->
+            <!--                <router-view :key="key" :notreadnum.sync='notreadnum'></router-view>-->
+            <!--              </keep-alive>-->
+            <!--            </transition>-->
+            <!-- <div class="goGo" v-if="isZx">
+              <img
+                src="../../assets/在线客服.png"
+                alt=""
+                @mouseenter="changeMenu"
+              />
+            </div> -->
+            <!-- <div class="goGo2" v-if="isShow" @mouseleave="changeMenuBack">
+              <div @mouseleave="changeTop" style="position:relative">
+                <img
+                  src="../../assets/QQ客服.png"
+                  alt=""
+                  @mouseenter="changeImg(1)"
+                />
+
+                <img
+                  src="../../assets/微信客服.png"
+                  alt=""
+                  @mouseenter="changeImg(2)"
+                />
+                <img
+                  src="../../assets/在线课堂.png"
+                  alt=""
+                  @mouseenter="changeImg(3)"
+                />
+                <img
+                  src="../../assets/QQ客服号.png"
+                  alt=""
+                  :class="imgShow == 1 ? 'active-one' : ''"
+                  v-if="imgShow == 1"
+                />
+                <img
+                  src="../../assets/erweima.png"
+                  alt=""
+                  :class="imgShow == 2 ? 'active-two' : ''"
+                  class="img-show"
+                  v-if="imgShow == 2"
+                />
+                <img
+                  src="../../assets/video.png"
+                  alt=""
+                  :class="imgShow == 3 ? 'active-two' : ''"
+                  class="img-show"
+                  v-if="imgShow == 3"
+                />
+              </div>
+              <img
+                src="../../assets/返回首页.png"
+                alt=""
+                @click="$router.push('/')"
+              />
+            </div> -->
+
+            <keep-alive>
+              <router-view
+                :notreadnum.sync="notreadnum"
+                :key="key"
+              ></router-view>
+            </keep-alive>
+          </div>
+        </el-scrollbar>
+        <!-- <FooteBar></FooteBar> -->
+        <!-- <backTop :ele="$refs.menu_content"></backTop> -->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import HeaderBar from "./headerBar";
+import HeaderBox from "./headBox.vue";
+import NavBar from "./navBar";
+import TagNav from "./tagNav";
+import FooteBar from "./footerBar.vue";
+import backTop from "../BackTop";
+import { mapActions } from "vuex";
+
+export default {
+  data() {
+    return {
+      thisCollapse: false,
+      thisNotRedNum: 0,
+      notreadnum: "",
+      isShow: false,
+      isZx: true,
+      imgShow: 0
+    };
+  },
+  computed: {
+    //重要。相同路由页面跳转时，query不同，可以刷新页面
+    key() {
+      if (this.$route.query.t) {
+        this.$store.state.tagNav.openedPageList.forEach(item => {
+          if (item.path == this.$route.path) {
+            item.lastTime = this.$route.query.t;
+          }
+        });
+        return this.$route.fullPath;
+      } else {
+        // let re=""
+        // this.$store.state.tagNav.openedPageList.forEach(item=>{
+        //   if(item.path==this.$route.path){
+        //     re=item.lastTime
+        //   }
+        // })
+        // return re
+      }
+    },
+    tagNavList() {
+      // console.log("缓存页面");
+      // console.log(this.$store.state.tagNav.cachedPageName);
+      return this.$store.state.tagNav.cachedPageName;
+    }
+  },
+  mounted() {
+    this.getLogoUrl();
+    this.getNotReadCount();
+  },
+  components: {
+    HeaderBar,
+    NavBar,
+    TagNav,
+    FooteBar,
+    backTop,
+    HeaderBox
+  },
+  methods: {
+    ...mapActions({
+      getLogoUrl: "common/getLogoUrl"
+    }),
+    // 切换侧边在线客服菜单
+    changeMenu() {
+      this.isShow = true;
+      this.isZx = false;
+    },
+    changeMenuBack() {
+      this.isZx = true;
+      this.isShow = false;
+    },
+    changeImg(num) {
+      this.imgShow = num;
+    },
+    changeTop() {
+      this.imgShow = 0;
+    },
+    getNotReadCount() {
+      this.$api.notificationAPI
+        .countNotRead()
+        .then(res => {
+          this.thisNotRedNum = res.notReadCount;
+
+          // if(res.notReadCount ===0){
+          //
+          //   this.hasNotRead = false;
+          // }else{
+          //   this.hasNotRead = true;
+          // }
+        })
+        .catch(r => {
+          this.pictLoading = false;
+          console.log(r);
+        });
+    }
+  },
+  beforeRouteEnter(to, from, next) {
+    if (to.query.t) {
+      next(vm => {
+        vm.$store.state.tagNav.openedPageList.forEach(item => {
+          if (item.path == to.path) {
+            item.lastTime = to.fullPath;
+          }
+        });
+      });
+    } else {
+      next(vm => {});
+    }
+  },
+  watch: {
+    thisCollapse(newv, oldv) {
+      // console.log(newv)
+    },
+    notreadnum(newv) {
+      this.thisNotRedNum = newv;
+    }
+  }
+};
+</script>
+
+<style scoped lang="less">
+.home,
+.menu_right {
+  height: 100%;
+}
+
+.menu_right {
+  position: relative;
+  overflow: hidden;
+}
+.menu_right_box {
+  // padding-bottom: 41px;
+  padding-bottom: 25px;
+  height: 100%;
+  overflow: auto;
+  box-sizing: border-box;
+}
+.menu_right_header {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  z-index: 999;
+}
+.menu_content {
+  position: relative;
+  height: 100%;
+  padding-top: 90px;
+  box-sizing: border-box;
+  /*overflow: hidden;*/
+}
+
+.page-component__scroll {
+  height: 100%;
+  overflow-x: hidden;
+}
+.el-scrollbar__wrap {
+  overflow-x: hidden;
+}
+.el-scrollbar {
+  overflow: hidden;
+  position: relative;
+}
+.goGo {
+  width: 42px;
+  position: fixed;
+  bottom: 45%;
+  right: 0;
+  z-index: 3000;
+  transform: scale(0.7);
+}
+.goGo2 {
+  width: 62px;
+  position: fixed;
+  bottom: 40%;
+  right: 10px;
+  z-index: 3000;
+}
+.active {
+  position: absolute;
+  top: 0;
+  right: 0;
+  // display: block;
+}
+.active-one {
+  position: absolute;
+  top: 0;
+  right: 65px;
+}
+.active-two {
+  position: absolute;
+  top: 30px;
+  right: 65px;
+}
+.img-show {
+  width: 200px;
+  height: 200px;
+}
+</style>
+<style>
+.home .el-scrollbar__view {
+  height: 100%;
+}
+</style>
diff --git a/src/pages/equipment/account.vue b/src/pages/equipment/account.vue
index e371b9d..50e56d0 100644
--- a/src/pages/equipment/account.vue
+++ b/src/pages/equipment/account.vue
@@ -1,663 +1,663 @@
-<template>
-  <!-- 设备台账 -->
-  <div class="sys-box">
-    <div class="sys-operate" style="position:relative">
-      <el-button type="primary" style='position:absolute;top:0' v-has="'equipment:add'" @click="add()">新增</el-button>
-      <el-button type="primary" style='position:absolute;top:0;left:76px' v-has="'equipment:remove'" @click="remove()"
-                 :disabled="btnOtherDisabled">删除
-      </el-button>
-      <el-button type="primary" style='position:absolute;top:0;left:142px' v-has="'equipment:generateQR'" @click="generateQR()"
-                 :disabled="btnOtherDisabled">生成二维码
-      </el-button>
-      <el-button type="primary" style='position:absolute;top:0;left:243px' v-has="'equipment:printQR'" @click="printQR()"
-                 :disabled="btnDelDisabled">批量打印二维码
-      </el-button>
-      <el-upload
-        style='margin-left:358px;display:inline-block'
-        ref="upload"
-        :action="uploadUrl"
-        :on-success="uploadSuccess"
-        :show-file-list='false'
-        :before-remove="function(){
-                       return false
-                     }"
-        :auto-upload="auto_upload"
-        :on-change="onChange"
-        v-loading.lock="fullscreenLoading"
-        class="inline-block"
-        accept=".xls,.xlsx,"
-      >
-        <el-button v-has="'equipment:upload'" size="small" type="primary">导入</el-button>
-        <!-- <div
-          slot="tip"
-          class="el-upload__tip"
-        ></div> -->
-      </el-upload>
-      <el-button v-has="'equipment:download'" type="primary" @click="upLoadExcel">下载模板</el-button>
-      <!-- <el-button type="primary" @click="importDevice()">导入</el-button>
-      <el-button type="primary" @click="exportDevice()">导出</el-button>-->
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class='form_item_input_out'>
-          <el-form-item label="设备名称" style='width:25%' class="form_item-inline">
-            <el-input placeholder="编号、名称模糊查询" v-model="search_data.nameAndType"></el-input>
-          </el-form-item>
-          <el-form-item label="使用部门" style='width:25%' class="form_item-inline">
-            <el-cascader clearable
-                         v-model="selectDeptId"
-                         :options="depOptions"
-                         :props="{ expandTrigger: 'hover',label:'text',value:'id',checkStrictly: true}"
-                         @change="handleChange"></el-cascader>
-          </el-form-item>
-          <el-form-item label="使用状况" style='width:25%' class="form_item-inline">
-            <el-select placeholder="请选择使用状况" v-model="search_data.using_status" clearable>
-              <el-option v-for="item in usingList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="设备类型" style='width:25%' class="form_item-inline">
-            <el-select placeholder="请选择设备类型" v-model="search_data.type" clearable>
-              <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class='form_item_btn_out'>
-          <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
-            <!-- <el-button type="primary">高级查询</el-button> -->
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table border
-                @row-click="clickRow"
-                v-loading="pictLoading"
-                ref="tb"
-                :data="tableData"
-                :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
-                @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column show-overflow-tooltip align="center" label="设备编号">
-          <template slot-scope="scope">
-            <el-link type="primary" @click="openDetails(scope.row)">{{ scope.row.serialno }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="name" show-overflow-tooltip align="center" label="设备名称"></el-table-column>
-        <el-table-column prop="model" align="center" label="规格型号" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="type_mes" align="center" label="设备类型" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="status_name" align="center" label="使用状况" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="site" show-overflow-tooltip align="center" label="安装地点"></el-table-column>
-        <el-table-column prop="dept_name" show-overflow-tooltip align="center" label="使用部门"></el-table-column>
-        <el-table-column prop="user_name" align="center" label="负责人"></el-table-column>
-        <el-table-column prop="buy_time" show-overflow-tooltip align="center" label="购置时间"
-                         width="114"></el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="search_data.pageno"
-        :page-sizes="pageSizes"
-        :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
-    </div>
-    <el-dialog title="生成二维码" :visible.sync="dialogVisible" center width="500px">
-      <div class="qrcode-box">
-        <p>{{ codeData.name }}</p>
-        <p>{{ codeData.serialno }}</p>
-        <div class="qrcode-img">
-          <div id="qrcode" ref="qrcode"></div>
-          <!-- <img :src="codeData.imageUrl" alt /> -->
-          <!-- <img src="../../assets/qr.png" alt /> -->
-        </div>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="printQR()">打 印</el-button>
-        <el-button type="primary" @click="saveQRPic()">存为图片</el-button>
-      </span>
-    </el-dialog>
-
-    <div style="margin:0 auto;display:none;" id="qrcode2" v-html="printHtml"></div>
-  </div>
-</template>
-
-<script>
-import base from '@/api/base.js'; // 导入接口域名列表
-import {mapState, mapActions, mapGetters, mapMutations} from "vuex";
-import QRCode from "qrcodejs2";
-
-export default {
-  name: "equipment_index",
-  data() {
-    return {
-      depOptions: [],
-      selectDeptId: [],
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10,
-        name: ""
-      },
-      adv_search_data: {},
-      tableData: [],
-      dialogVisible: false,
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      deptList: [],
-      usingList: [],
-      typeList: [],
-      rowIds: [],
-      codeData: {},
-      printHtml: "",
-      pictLoading: false,
-      uploadAttachment: [],
-      fileDocList: [],
-      uploadUrl: base.uploadUrl,
-      ftpPrefix: base.ftpPrefix,
-      fullscreenLoading: false,
-      auto_upload: false,
-    };
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search()
-      }
-    }
-  },
-  mounted() {
-    this.initDta();
-    this.search();
-    console.log(this.$route.query.using_status)
-    if (this.$route.query.using_status) {
-      this.$set(this.search_data, 'using_status', parseInt(this.$route.query.using_status))
-    }
-  },
-  methods: {
-    //根据当前id,获取一条树枝上的所有id数据
-    treeFindPath(tree, func, path = []) {
-      if (!tree) return []
-      for (const data of tree) {
-        path.push(data.id)
-        if (func(data)) return path
-        if (data.children) {
-          const findChildren = this.treeFindPath(data.children, func, path)
-          if (findChildren.length) return findChildren
-        }
-        path.pop()
-      }
-      return []
-    },
-    //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
-    setDeptList(tree) {
-      for (const data of tree) {
-        if (!data.hasChildren) {
-          data.children = undefined;
-        } else {
-          this.setDeptList(data.children)
-        }
-      }
-
-    },
-    //显示默认部门
-    setDefaultDept() {
-      if (this.depOptions.length > 0 && this.search_data.deptId) {
-        let id = JSON.stringify(this.search_data.deptId)
-        let select_id = this.treeFindPath(this.depOptions, data => data.id === id)
-        this.selectDeptId = JSON.parse(JSON.stringify(select_id))
-      }
-    },
-// 选择部门
-    handleChange: function (value) {
-      this.search_data.deptId = value[value.length - 1];
-      this.selectDeptId = value;
-    },
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-    /**
-     * 初始化数据
-     */
-    initDta() {
-      var self = this;
-      Promise.all([
-        this.$api.dictAPI.getDictsByType("device_type"),
-        this.$api.commonAPI.getDeptsTree(),
-        this.$api.dictAPI.getDictsByType("device_status")
-      ])
-        .then(([r1, r2, r3]) => {
-          //设备类别
-          if (r1.code === 0) {
-            this.typeList = r1.datas;
-          }
-          //使用部门
-          if (r2.code === 0) {
-            this.depOptions = r2.data.children;
-            this.setDefaultDept();
-            this.setDeptList(this.depOptions);
-            // this.deptList = r2.datas;
-          }
-          //使用状况
-          if (r3.code === 0) {
-            this.usingList = r3.datas;
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    /**
-     * 显示明细
-     */
-    openDetails(r) {
-      this.$router.push({
-        path: "/equipment/info",
-        query: {id: r.id, t: Date.now()}
-      });
-    },
-    /**
-     * 新增
-     */
-    add() {
-      this.$router.push({path: "/equipment/info", query: {t: Date.now()}});
-    },
-    /**
-     * 删除设备
-     */
-    remove() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认删除选中的设备台账吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.deviceAPI
-          .allDelete({deviceId: ids})
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.search();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 生成二维码
-     */
-    generateQR() {
-      let _this = this;
-      let item = this.rowIds[0];
-      let id = item.id;
-      this.$api.deviceAPI.getDeviceQRCode(id).then(res => {
-        if (res.code === 0) {
-          console.log(res.data);
-          this.codeData = {id: res.data.id, serialNo: res.data.serialNo};
-          this.dialogVisible = true;
-          this.$nextTick(() => {
-            document.getElementById("qrcode").innerHTML = "";
-            console.log(this.codeData);
-            let qrcode = new QRCode("qrcode", {
-              width: 200, // 设置宽度，单位像素
-              height: 200, // 设置高度，单位像素
-              text: JSON.stringify(_this.codeData) // 设置二维码内容或跳转地址
-            });
-          }, 100);
-        }
-      });
-    },
-    /**
-     * 保存二维码图片
-     */
-    saveQRPic() {
-      // //找到canvas标签
-      let myCanvas = document
-        .getElementById("qrcode")
-        .getElementsByTagName("canvas");
-      let img = document.getElementById("qrcode").getElementsByTagName("img");
-      let a = document.createElement("a");
-      let imgURL = myCanvas[0].toDataURL("image/jpg");
-      let ua = navigator.userAgent;
-      if (ua.indexOf("Trident") != -1 && ua.indexOf("Windows") != -1) {
-        var bstr = atob(imgURL.split(",")[1]);
-        var n = bstr.length;
-        var u8arr = new Uint8Array(n);
-        while (n--) {
-          u8arr[n] = bstr.charCodeAt(n);
-        }
-        var blob = new Blob([u8arr]);
-        window.navigator.msSaveOrOpenBlob(
-          blob,
-          this.codeData.name + "." + "png"
-        );
-      } else if (ua.indexOf("Firefox") > -1) {
-        let blob = this.base64ToBlob(imgURL);
-        let evt = document.createEvent("HTMLEvents");
-        evt.initEvent("click", true, true);
-        a.download = " ";
-        a.href = URL.createObjectURL(blob);
-        a.dispatchEvent(
-          new MouseEvent("click", {
-            bubbles: true,
-            cancelable: true,
-            view: window
-          })
-        );
-      } else {
-        img.src = myCanvas[0].toDataURL("image/jpg");
-        a.href = img.src;
-        a.download = this.codeData.name;
-        a.click();
-      }
-      this.dialogVisible = false;
-    },
-    /**
-     * base64转换函数
-     */
-    base64ToBlob(code) {
-      let parts = code.split(";base64,");
-      let contentType = parts[0].split(":")[1];
-      let raw = window.atob(parts[1]);
-      let rawLength = raw.length;
-      let uInt8Array = new Uint8Array(rawLength);
-      for (let i = 0; i < rawLength; ++i) {
-        uInt8Array[i] = raw.charCodeAt(i);
-      }
-      return new Blob([uInt8Array], {type: contentType});
-    },
-    /**
-     * 批量打印二维码
-     */
-    printQR() {
-      let self = this;
-      let head_str = "<html><head><title>设备二维码打印</title></head><body>"; //先生成头部
-      let foot_str = "</body></html>"; //生成尾部
-      let printBeforeStr =
-        "<em style='padding: 10px;text-align: center'><table style='border-collapse:collapse;width: auto;><tr style='padding:10px;'>";
-      let printContent = "";
-      let pLength = self.rowIds.length;
-      for (let i = 0; i < pLength; i++) {
-        if (i != 0 && i % 2 == 0 && i != pLength) {
-          printContent += "</tr><tr style='padding:10px;'>";
-        }
-        printContent +=
-          "<td width='50%' height='250' style='padding-left: 180px;padding-top: 30px'><div id='XQ" +
-          i +
-          "'></div><div style='text-align: center'><strong>" +
-          self.rowIds[i].name +
-          "</strong></div></td>";
-      }
-      let printAfter = "</tr></table></em>";
-      self.printHtml = printBeforeStr + printContent + printAfter;
-      document.getElementById("qrcode2").innerHTML = self.printHtml;
-
-      let new_str = document.getElementById("qrcode2").innerHTML; //获取指定打印区域
-      //构建新网页(关键步骤,必须先构建新网页,在生成二维码,否则不能显示二维码)
-      document.body.innerHTML = head_str + new_str + foot_str;
-      for (let j = 0; j < self.rowIds.length; j++) {
-        document.getElementById("XQ" + j).innerHTML = ""; //置空
-        // let contentStr = self.rowIds[j].serialno; //二维码内容
-        let contentStr = self.rowIds[j]; //二维码内容
-        let qrcode = new QRCode(document.getElementById("XQ" + j), {
-          text: JSON.stringify(contentStr),
-          width: 250,
-          height: 250,
-          colorDark: "#000000",
-          colorLight: "#ffffff"
-        });
-      }
-      window.print(); //打印刚才新建的网页
-      window.location.reload();
-      this.dialogVisible = false;
-      return false;
-    },
-    /**
-     * 导入
-     */
-    // importDevice() {
-    //   this.$alert("导入功能未实现", "提示");
-    // },
-    /**
-     * 导出
-     */
-    // exportDevice() {
-    //   this.$alert("导出功能未实现", "提示");
-    // },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-
-    getList() {
-      this.pictLoading = true;
-      this.$api.deviceAPI
-        .advancedQuery(this.search_data)
-        .then(res => {
-          if (res.code === 0) {
-            this.tableData = res.data ? res.data.datas : [];
-            this.tableData.forEach(item => {
-              item.buy_time = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.buy_time)
-            })
-            this.total = res.data ? res.data.totalRows : 0;
-          }
-          this.pictLoading = false;
-        })
-        .catch(res => {
-          this.pictLoading = false;
-        });
-    },
-
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    },
-    alertQR() {
-      this.$alert("请您选择要打印二维码设备", "提示", {
-        confirmButtonText: "确定",
-        callback: action => {
-          this.$message({
-            type: "info",
-            message: `action: ${action}`
-          });
-        }
-      });
-    },
-    //压缩并上传图片
-    httpRequest(upload, name, file) {//file是需要压缩图片时，原图片
-      let _this = this;
-      var tempFormData = new FormData();
-      tempFormData.append("file", upload, name);//上传blob对象
-      this.$api.deviceAPI.importExcel(tempFormData).then(res => {
-        _this.fullscreenLoading = false;
-        if (res.code == 0) {//上传成功
-          _this.$message({
-            message: '上传成功',
-            type: 'success',
-            duration: 2000
-          });
-          this.getList()
-          // upload.filePath=res.filePath;
-          // if (file) {
-          //   file.filePath = res.filePath;
-          // } else {
-          //   upload.filePath = res.filePath;
-          // }
-          // _this.uploadAttachment.push({
-          //   filePath: res.filePath,
-          //   fileName: res.fileName
-          // });
-
-        } else {//上传失败
-          _this.fullscreenLoading = false;
-          _this.$message.error(res.msg);
-          _this.$refs.upload.uploadFiles.splice(_this.$refs.upload.uploadFiles.length - 1, 1)
-        }
-
-      });
-    },
-    //查看文件
-    // onPreview(file) {
-    //   if (file.url) {
-    //     window.open(file.url)
-    //   } else if (file.raw) {
-    //     window.open(this.ftpPrefix + file.raw.filePath)
-    //   }
-    // },
-    /**
-     * 上传成功
-     */
-    uploadSuccess(res, file) {
-      if (res.msg === "操作成功") {
-        this.uploadAttachment.push({
-          filePath: res.filePath,
-          fileName: res.fileName
-        });
-      }
-    },
-    onChange(file, fileList) {
-      if (file.size > 100 * 1000000) {
-        this.$message.error('上传文件不能超过100M!');
-        this.$refs.upload.fileList = this.$refs.upload.fileList
-        this.$refs.upload.uploadFiles.splice(this.$refs.upload.uploadFiles.length - 1, 1)
-
-        return false
-      }
-      file = file.raw;
-      if (!/image\/\w+/.test(file.type)) {//非图片
-        this.fullscreenLoading = true;
-        this.httpRequest(file, file.name);
-      } else {
-        this.fullscreenLoading = true;
-        let _this = this;
-        imageConversion.compressAccurately(file, 400).then(res => {
-          if (res.size) {//压缩成功
-            _this.httpRequest(res, file.name, file);
-          } else {
-            _this.$message.error('压缩图片失败');
-            _this.fullscreenLoading = false;
-            _this.$refs.upload.uploadFiles.splice(_this.$refs.upload.uploadFiles.length - 1, 1)
-          }
-        })
-      }
-
-
-    },
-    // 下载模板
-    upLoadExcel() {
-      let excel = {
-        filePath: '/gyhl-file/template/device-account-template.xlsx',
-        fileName: 'device-account-template.xlsx'
-      }
-      this.$api.netWorkingAPI.downExcel(excel).then(res => {
-
-      })
-    },
-    /**
-     * 删除图片
-     */
-    // handleRemove(file, fileList) {
-    //   if (file.raw) {
-    //     let index
-    //     for (let i = 0; i < this.uploadAttachment.length; i++) {
-    //       if (this.uploadAttachment[i].filePath == file.raw.filePath) {
-    //         index = i;
-    //       }
-    //     }
-
-    //     this.uploadAttachment.splice(index, 1);
-
-    //   } else {
-    //     let index;
-    //     for (let i = 0; i < this.uploadAttachment.length; i++) {
-    //       if (this.uploadAttachment[i].filePath == file.url.split(this.ftpPrefix)[1]) {
-    //         index = i;
-    //       }
-    //     }
-    //     this.uploadAttachment.splice(index, 1);
-    //   }
-    // },
-  }
-};
-</script>
-
-<style scoped lang='less'>
-.qrcode-box {
-  text-align: center;
-}
-
-.qrcode-box > p {
-  font-size: 15px;
-}
-
-.qrcode-img {
-  padding: 10px 0px 0px;
-}
-
-#qrcode {
-  padding: 10px 0px 0px;
-  display: inline-block;
-
-  img {
-    // width: 132px;
-    // height: 132px;
-    background-color: #fff; //设置白色背景色
-    padding: 6px; // 利用padding的特性，挤出白边
-  }
-}
-</style>
-
+<template>
+  <!-- 设备台账 -->
+  <div class="sys-box">
+    <div class="sys-operate" style="position:relative">
+      <el-button type="primary" style='position:absolute;top:0' v-has="'equipment:add'" @click="add()">新增</el-button>
+      <el-button type="primary" style='position:absolute;top:0;left:76px' v-has="'equipment:remove'" @click="remove()"
+                 :disabled="btnOtherDisabled">删除
+      </el-button>
+      <el-button type="primary" style='position:absolute;top:0;left:142px' v-has="'equipment:generateQR'" @click="generateQR()"
+                 :disabled="btnOtherDisabled">生成二维码
+      </el-button>
+      <el-button type="primary" style='position:absolute;top:0;left:243px' v-has="'equipment:printQR'" @click="printQR()"
+                 :disabled="btnDelDisabled">批量打印二维码
+      </el-button>
+      <el-upload
+        style='margin-left:358px;display:inline-block'
+        ref="upload"
+        :action="uploadUrl"
+        :on-success="uploadSuccess"
+        :show-file-list='false'
+        :before-remove="function(){
+                       return false
+                     }"
+        :auto-upload="auto_upload"
+        :on-change="onChange"
+        v-loading.lock="fullscreenLoading"
+        class="inline-block"
+        accept=".xls,.xlsx,"
+      >
+        <el-button v-has="'equipment:upload'" size="small" type="primary">导入</el-button>
+        <!-- <div
+          slot="tip"
+          class="el-upload__tip"
+        ></div> -->
+      </el-upload>
+      <el-button v-has="'equipment:download'" type="primary" @click="upLoadExcel">下载模板</el-button>
+      <!-- <el-button type="primary" @click="importDevice()">导入</el-button>
+      <el-button type="primary" @click="exportDevice()">导出</el-button>-->
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class='form_item_input_out'>
+          <el-form-item label="设备名称" style='width:25%' class="form_item-inline">
+            <el-input placeholder="编号、名称模糊查询" v-model="search_data.nameAndType"></el-input>
+          </el-form-item>
+          <el-form-item label="使用部门" style='width:25%' class="form_item-inline">
+            <el-cascader clearable
+                         v-model="selectDeptId"
+                         :options="depOptions"
+                         :props="{ expandTrigger: 'hover',label:'text',value:'id',checkStrictly: true}"
+                         @change="handleChange"></el-cascader>
+          </el-form-item>
+          <el-form-item label="使用状况" style='width:25%' class="form_item-inline">
+            <el-select placeholder="请选择使用状况" v-model="search_data.using_status" clearable>
+              <el-option v-for="item in usingList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="设备类型" style='width:25%' class="form_item-inline">
+            <el-select placeholder="请选择设备类型" v-model="search_data.type" clearable>
+              <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class='form_item_btn_out'>
+          <el-form-item>
+            <el-button type="primary" @click="search()">查询</el-button>
+            <!-- <el-button type="primary">高级查询</el-button> -->
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table border
+                @row-click="clickRow"
+                v-loading="pictLoading"
+                ref="tb"
+                :data="tableData"
+                :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
+                @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column show-overflow-tooltip align="center" label="设备编号">
+          <template slot-scope="scope">
+            <el-link type="primary" @click="openDetails(scope.row)">{{ scope.row.serialno }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" show-overflow-tooltip align="center" label="设备名称"></el-table-column>
+        <el-table-column prop="model" align="center" label="规格型号" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="type_mes" align="center" label="设备类型" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="status_name" align="center" label="使用状况" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="site" show-overflow-tooltip align="center" label="安装地点"></el-table-column>
+        <el-table-column prop="dept_name" show-overflow-tooltip align="center" label="使用部门"></el-table-column>
+        <el-table-column prop="user_name" align="center" label="负责人"></el-table-column>
+        <!-- <el-table-column prop="buy_time" show-overflow-tooltip align="center" label="购置时间"
+                         width="114"></el-table-column> -->
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="search_data.pageno"
+        :page-sizes="pageSizes"
+        :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+    <el-dialog title="生成二维码" :visible.sync="dialogVisible" center width="500px">
+      <div class="qrcode-box">
+        <p>{{ codeData.name }}</p>
+        <p>{{ codeData.serialno }}</p>
+        <div class="qrcode-img">
+          <div id="qrcode" ref="qrcode"></div>
+          <!-- <img :src="codeData.imageUrl" alt /> -->
+          <!-- <img src="../../assets/qr.png" alt /> -->
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="printQR()">打 印</el-button>
+        <el-button type="primary" @click="saveQRPic()">存为图片</el-button>
+      </span>
+    </el-dialog>
+
+    <div style="margin:0 auto;display:none;" id="qrcode2" v-html="printHtml"></div>
+  </div>
+</template>
+
+<script>
+import base from '@/api/base.js'; // 导入接口域名列表
+import {mapState, mapActions, mapGetters, mapMutations} from "vuex";
+import QRCode from "qrcodejs2";
+
+export default {
+  name: "equipment_index",
+  data() {
+    return {
+      depOptions: [],
+      selectDeptId: [],
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10,
+        name: ""
+      },
+      adv_search_data: {},
+      tableData: [],
+      dialogVisible: false,
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      deptList: [],
+      usingList: [],
+      typeList: [],
+      rowIds: [],
+      codeData: {},
+      printHtml: "",
+      pictLoading: false,
+      uploadAttachment: [],
+      fileDocList: [],
+      uploadUrl: base.uploadUrl,
+      ftpPrefix: base.ftpPrefix,
+      fullscreenLoading: false,
+      auto_upload: false,
+    };
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search()
+      }
+    }
+  },
+  mounted() {
+    this.initDta();
+    this.search();
+    console.log(this.$route.query.using_status)
+    if (this.$route.query.using_status) {
+      this.$set(this.search_data, 'using_status', parseInt(this.$route.query.using_status))
+    }
+  },
+  methods: {
+    //根据当前id,获取一条树枝上的所有id数据
+    treeFindPath(tree, func, path = []) {
+      if (!tree) return []
+      for (const data of tree) {
+        path.push(data.id)
+        if (func(data)) return path
+        if (data.children) {
+          const findChildren = this.treeFindPath(data.children, func, path)
+          if (findChildren.length) return findChildren
+        }
+        path.pop()
+      }
+      return []
+    },
+    //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
+    setDeptList(tree) {
+      for (const data of tree) {
+        if (!data.hasChildren) {
+          data.children = undefined;
+        } else {
+          this.setDeptList(data.children)
+        }
+      }
+
+    },
+    //显示默认部门
+    setDefaultDept() {
+      if (this.depOptions.length > 0 && this.search_data.deptId) {
+        let id = JSON.stringify(this.search_data.deptId)
+        let select_id = this.treeFindPath(this.depOptions, data => data.id === id)
+        this.selectDeptId = JSON.parse(JSON.stringify(select_id))
+      }
+    },
+// 选择部门
+    handleChange: function (value) {
+      this.search_data.deptId = value[value.length - 1];
+      this.selectDeptId = value;
+    },
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+    /**
+     * 初始化数据
+     */
+    initDta() {
+      var self = this;
+      Promise.all([
+        this.$api.dictAPI.getDictsByType("device_type"),
+        this.$api.commonAPI.getDeptsTree(),
+        this.$api.dictAPI.getDictsByType("device_status")
+      ])
+        .then(([r1, r2, r3]) => {
+          //设备类别
+          if (r1.code === 0) {
+            this.typeList = r1.datas;
+          }
+          //使用部门
+          if (r2.code === 0) {
+            this.depOptions = r2.data.children;
+            this.setDefaultDept();
+            this.setDeptList(this.depOptions);
+            // this.deptList = r2.datas;
+          }
+          //使用状况
+          if (r3.code === 0) {
+            this.usingList = r3.datas;
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    /**
+     * 显示明细
+     */
+    openDetails(r) {
+      this.$router.push({
+        path: "/equipment/info",
+        query: {id: r.id, t: Date.now()}
+      });
+    },
+    /**
+     * 新增
+     */
+    add() {
+      this.$router.push({path: "/equipment/info", query: {t: Date.now()}});
+    },
+    /**
+     * 删除设备
+     */
+    remove() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认删除选中的设备台账吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.deviceAPI
+          .allDelete({deviceId: ids})
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.search();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 生成二维码
+     */
+    generateQR() {
+      let _this = this;
+      let item = this.rowIds[0];
+      let id = item.id;
+      this.$api.deviceAPI.getDeviceQRCode(id).then(res => {
+        if (res.code === 0) {
+          console.log(res.data);
+          this.codeData = {id: res.data.id, serialNo: res.data.serialNo};
+          this.dialogVisible = true;
+          this.$nextTick(() => {
+            document.getElementById("qrcode").innerHTML = "";
+            console.log(this.codeData);
+            let qrcode = new QRCode("qrcode", {
+              width: 200, // 设置宽度，单位像素
+              height: 200, // 设置高度，单位像素
+              text: JSON.stringify(_this.codeData) // 设置二维码内容或跳转地址
+            });
+          }, 100);
+        }
+      });
+    },
+    /**
+     * 保存二维码图片
+     */
+    saveQRPic() {
+      // //找到canvas标签
+      let myCanvas = document
+        .getElementById("qrcode")
+        .getElementsByTagName("canvas");
+      let img = document.getElementById("qrcode").getElementsByTagName("img");
+      let a = document.createElement("a");
+      let imgURL = myCanvas[0].toDataURL("image/jpg");
+      let ua = navigator.userAgent;
+      if (ua.indexOf("Trident") != -1 && ua.indexOf("Windows") != -1) {
+        var bstr = atob(imgURL.split(",")[1]);
+        var n = bstr.length;
+        var u8arr = new Uint8Array(n);
+        while (n--) {
+          u8arr[n] = bstr.charCodeAt(n);
+        }
+        var blob = new Blob([u8arr]);
+        window.navigator.msSaveOrOpenBlob(
+          blob,
+          this.codeData.name + "." + "png"
+        );
+      } else if (ua.indexOf("Firefox") > -1) {
+        let blob = this.base64ToBlob(imgURL);
+        let evt = document.createEvent("HTMLEvents");
+        evt.initEvent("click", true, true);
+        a.download = " ";
+        a.href = URL.createObjectURL(blob);
+        a.dispatchEvent(
+          new MouseEvent("click", {
+            bubbles: true,
+            cancelable: true,
+            view: window
+          })
+        );
+      } else {
+        img.src = myCanvas[0].toDataURL("image/jpg");
+        a.href = img.src;
+        a.download = this.codeData.name;
+        a.click();
+      }
+      this.dialogVisible = false;
+    },
+    /**
+     * base64转换函数
+     */
+    base64ToBlob(code) {
+      let parts = code.split(";base64,");
+      let contentType = parts[0].split(":")[1];
+      let raw = window.atob(parts[1]);
+      let rawLength = raw.length;
+      let uInt8Array = new Uint8Array(rawLength);
+      for (let i = 0; i < rawLength; ++i) {
+        uInt8Array[i] = raw.charCodeAt(i);
+      }
+      return new Blob([uInt8Array], {type: contentType});
+    },
+    /**
+     * 批量打印二维码
+     */
+    printQR() {
+      let self = this;
+      let head_str = "<html><head><title>设备二维码打印</title></head><body>"; //先生成头部
+      let foot_str = "</body></html>"; //生成尾部
+      let printBeforeStr =
+        "<em style='padding: 10px;text-align: center'><table style='border-collapse:collapse;width: auto;><tr style='padding:10px;'>";
+      let printContent = "";
+      let pLength = self.rowIds.length;
+      for (let i = 0; i < pLength; i++) {
+        if (i != 0 && i % 2 == 0 && i != pLength) {
+          printContent += "</tr><tr style='padding:10px;'>";
+        }
+        printContent +=
+          "<td width='50%' height='250' style='padding-left: 180px;padding-top: 30px'><div id='XQ" +
+          i +
+          "'></div><div style='text-align: center'><strong>" +
+          self.rowIds[i].name +
+          "</strong></div></td>";
+      }
+      let printAfter = "</tr></table></em>";
+      self.printHtml = printBeforeStr + printContent + printAfter;
+      document.getElementById("qrcode2").innerHTML = self.printHtml;
+
+      let new_str = document.getElementById("qrcode2").innerHTML; //获取指定打印区域
+      //构建新网页(关键步骤,必须先构建新网页,在生成二维码,否则不能显示二维码)
+      document.body.innerHTML = head_str + new_str + foot_str;
+      for (let j = 0; j < self.rowIds.length; j++) {
+        document.getElementById("XQ" + j).innerHTML = ""; //置空
+        // let contentStr = self.rowIds[j].serialno; //二维码内容
+        let contentStr = self.rowIds[j]; //二维码内容
+        let qrcode = new QRCode(document.getElementById("XQ" + j), {
+          text: JSON.stringify(contentStr),
+          width: 250,
+          height: 250,
+          colorDark: "#000000",
+          colorLight: "#ffffff"
+        });
+      }
+      window.print(); //打印刚才新建的网页
+      window.location.reload();
+      this.dialogVisible = false;
+      return false;
+    },
+    /**
+     * 导入
+     */
+    // importDevice() {
+    //   this.$alert("导入功能未实现", "提示");
+    // },
+    /**
+     * 导出
+     */
+    // exportDevice() {
+    //   this.$alert("导出功能未实现", "提示");
+    // },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+
+    getList() {
+      this.pictLoading = true;
+      this.$api.deviceAPI
+        .advancedQuery(this.search_data)
+        .then(res => {
+          if (res.code === 0) {
+            this.tableData = res.data ? res.data.datas : [];
+            this.tableData.forEach(item => {
+              item.buy_time = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.buy_time)
+            })
+            this.total = res.data ? res.data.totalRows : 0;
+          }
+          this.pictLoading = false;
+        })
+        .catch(res => {
+          this.pictLoading = false;
+        });
+    },
+
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    },
+    alertQR() {
+      this.$alert("请您选择要打印二维码设备", "提示", {
+        confirmButtonText: "确定",
+        callback: action => {
+          this.$message({
+            type: "info",
+            message: `action: ${action}`
+          });
+        }
+      });
+    },
+    //压缩并上传图片
+    httpRequest(upload, name, file) {//file是需要压缩图片时，原图片
+      let _this = this;
+      var tempFormData = new FormData();
+      tempFormData.append("file", upload, name);//上传blob对象
+      this.$api.deviceAPI.importExcel(tempFormData).then(res => {
+        _this.fullscreenLoading = false;
+        if (res.code == 0) {//上传成功
+          _this.$message({
+            message: '上传成功',
+            type: 'success',
+            duration: 2000
+          });
+          this.getList()
+          // upload.filePath=res.filePath;
+          // if (file) {
+          //   file.filePath = res.filePath;
+          // } else {
+          //   upload.filePath = res.filePath;
+          // }
+          // _this.uploadAttachment.push({
+          //   filePath: res.filePath,
+          //   fileName: res.fileName
+          // });
+
+        } else {//上传失败
+          _this.fullscreenLoading = false;
+          _this.$message.error(res.msg);
+          _this.$refs.upload.uploadFiles.splice(_this.$refs.upload.uploadFiles.length - 1, 1)
+        }
+
+      });
+    },
+    //查看文件
+    // onPreview(file) {
+    //   if (file.url) {
+    //     window.open(file.url)
+    //   } else if (file.raw) {
+    //     window.open(this.ftpPrefix + file.raw.filePath)
+    //   }
+    // },
+    /**
+     * 上传成功
+     */
+    uploadSuccess(res, file) {
+      if (res.msg === "操作成功") {
+        this.uploadAttachment.push({
+          filePath: res.filePath,
+          fileName: res.fileName
+        });
+      }
+    },
+    onChange(file, fileList) {
+      if (file.size > 100 * 1000000) {
+        this.$message.error('上传文件不能超过100M!');
+        this.$refs.upload.fileList = this.$refs.upload.fileList
+        this.$refs.upload.uploadFiles.splice(this.$refs.upload.uploadFiles.length - 1, 1)
+
+        return false
+      }
+      file = file.raw;
+      if (!/image\/\w+/.test(file.type)) {//非图片
+        this.fullscreenLoading = true;
+        this.httpRequest(file, file.name);
+      } else {
+        this.fullscreenLoading = true;
+        let _this = this;
+        imageConversion.compressAccurately(file, 400).then(res => {
+          if (res.size) {//压缩成功
+            _this.httpRequest(res, file.name, file);
+          } else {
+            _this.$message.error('压缩图片失败');
+            _this.fullscreenLoading = false;
+            _this.$refs.upload.uploadFiles.splice(_this.$refs.upload.uploadFiles.length - 1, 1)
+          }
+        })
+      }
+
+
+    },
+    // 下载模板
+    upLoadExcel() {
+      let excel = {
+        filePath: '/gyhl-file/template/device-account-template.xlsx',
+        fileName: 'device-account-template.xlsx'
+      }
+      this.$api.netWorkingAPI.downExcel(excel).then(res => {
+
+      })
+    },
+    /**
+     * 删除图片
+     */
+    // handleRemove(file, fileList) {
+    //   if (file.raw) {
+    //     let index
+    //     for (let i = 0; i < this.uploadAttachment.length; i++) {
+    //       if (this.uploadAttachment[i].filePath == file.raw.filePath) {
+    //         index = i;
+    //       }
+    //     }
+
+    //     this.uploadAttachment.splice(index, 1);
+
+    //   } else {
+    //     let index;
+    //     for (let i = 0; i < this.uploadAttachment.length; i++) {
+    //       if (this.uploadAttachment[i].filePath == file.url.split(this.ftpPrefix)[1]) {
+    //         index = i;
+    //       }
+    //     }
+    //     this.uploadAttachment.splice(index, 1);
+    //   }
+    // },
+  }
+};
+</script>
+
+<style scoped lang='less'>
+.qrcode-box {
+  text-align: center;
+}
+
+.qrcode-box > p {
+  font-size: 15px;
+}
+
+.qrcode-img {
+  padding: 10px 0px 0px;
+}
+
+#qrcode {
+  padding: 10px 0px 0px;
+  display: inline-block;
+
+  img {
+    // width: 132px;
+    // height: 132px;
+    background-color: #fff; //设置白色背景色
+    padding: 6px; // 利用padding的特性，挤出白边
+  }
+}
+</style>
+
diff --git a/src/pages/independent/center/components/disc.vue b/src/pages/independent/center/components/disc.vue
index 25d99d2..3919b1a 100644
--- a/src/pages/independent/center/components/disc.vue
+++ b/src/pages/independent/center/components/disc.vue
@@ -1,371 +1,378 @@
-<template>
-  <!-- 圆盘 -->
-  <div class="disc-wrap">
-    <!-- <div class="disc">
-      <div class="inner"></div>
-      <div class="outer"></div>
-      <div class="conent">
-        <div class="item1">
-          <div class="icon1"></div>
-          <div class="title1">
-            <span class="point"></span>
-            <span class="text">物料信息</span>
-            <span class="point"></span>
-          </div>
-        </div>
-        <div class="item2">
-          <div class="icon2"></div>
-          <div class="title2">
-            <span class="point"></span>
-            <span class="text">设备信息</span>
-            <span class="point"></span>
-          </div>
-        </div>
-        <div class="item3">
-          <div class="icon3"></div>
-          <div class="title3">
-            <span class="point"></span>
-            <span class="text">生产信息</span>
-            <span class="point"></span>
-          </div>
-        </div>
-        <div class="item4">
-          <div class="icon4"></div>
-          <div class="title4">
-            <span class="point"></span>
-            <span class="text">任务信息</span>
-            <span class="point"></span>
-          </div>
-        </div>
-      </div>
-    </div> -->
-  </div>
-</template>
-<script>
-import "../../../../utils/flexble";
-export default {
-  data() {
-    return {};
-  }
-};
-</script>
-<style scoped lang="less">
-.disc-wrap {
-  width: 100%;
-  height: 60%;
-  position: relative;
-  box-sizing: border-box;
-  background: url("../../../../assets/sc_bg.png");
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-
-
-  .disc {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    margin: auto;
-    transform: translateY(39px) scale(1);
-
-    .text {
-      font-size: 18px;
-    }
-
-    .inner {
-      position: absolute;
-      width: 58rem;
-      height: 43rem;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      margin: auto;
-      background: url("../../../../assets/longscreen2/house.png");
-      background-size: 108% 108%;
-      background-position: center center;
-      animation: rotate-in 70s linear infinite;
-      // transform: rotateX(65deg);
-      // @keyframes rotate-in {
-      //   0% {
-      //     transform: rotateX(65deg) rotateZ(0deg);
-      //   }
-      //   100% {
-      //     transform: rotateX(65deg) rotateZ(360deg);
-      //   }
-      // }
-    }
-
-    .outer {
-      position: absolute;
-      width: 48rem;
-      height: 48rem;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      margin: auto;
-      background: url("../../../../assets/longscreen2/out.png");
-      background-size: 100% 100%;
-      background-position: center center;
-      animation: rotate-out 70s linear infinite;
-      transform: rotateX(65deg);
-
-      @keyframes rotate-out {
-        0% {
-          transform: rotateX(65deg) rotateZ(100deg);
-        }
-
-        100% {
-          transform: rotateX(65deg) rotateZ(-360deg);
-        }
-      }
-    }
-
-    .conent {
-      position: absolute;
-      left: 50%;
-      top: 19.2rem;
-      width: 17.7rem;
-      height: 19rem;
-      transform: translateX(-50%);
-      // background: url("../../../../assets/longscreen2/mall_content.png");
-      background-position: center center;
-      background-size: 100% 100%;
-      z-index: 3;
-
-      @keyframes moveDown {
-
-        0%,
-        100% {
-          transform: translateY(0);
-        }
-
-        50% {
-          transform: translateY(-2rem);
-        }
-      }
-
-      @keyframes moveUp {
-
-        0%,
-        100% {
-          transform: translateY(-2rem);
-        }
-
-        50% {
-          transform: translateY(0);
-        }
-      }
-
-      .item1 {
-        width: 18rem;
-        height: 18rem;
-        top: 70%;
-        left: -120%;
-        position: absolute;
-        background-image: url("../../../../assets/longscreen2/1.png");
-        background-size: 100% 100%;
-
-        .icon1 {
-          width: 10rem;
-          height: 10rem;
-          position: absolute;
-          background-position: center center;
-          background-repeat: no-repeat;
-          background-size: 60% 60%;
-          left: 4rem;
-          top: -1.9rem;
-          background-image: url("../../../../assets/longscreen2/mall_内部贸易公司.svg");
-          z-index: 2;
-          animation: moveUp 4s ease-in-out infinite;
-        }
-
-        .title1 {
-          width: 158px;
-          height: 44px;
-          color: #e1e9e9;
-          position: absolute;
-          top: 30px;
-          left: -98px;
-          background-image: url("../../../../assets/longscreen2/mall_title.png");
-          background-size: 100% 99%;
-          z-index: 0;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-
-          .text {
-            padding: 0 10px;
-          }
-
-          .point {
-            display: block;
-            width: 4px;
-            height: 4px;
-            background: #c2fefa;
-            margin-top: 2px;
-          }
-        }
-      }
-
-      // 左上
-      .item2 {
-        width: 18rem;
-        height: 18rem;
-        background-image: url("../../../../assets/longscreen2/2.png");
-        background-size: 100% 100%;
-        top: -80%;
-        left: -120%;
-        position: absolute;
-
-        .icon2 {
-          width: 10rem;
-          height: 10rem;
-          position: absolute;
-          background-position: center center;
-          background-repeat: no-repeat;
-          background-size: 60% 60%;
-          left: 4.1rem;
-          top: -1.9rem;
-          background-image: url("../../../../assets/longscreen2/mall_外部卖家.svg");
-          z-index: 2;
-          animation: moveDown 4s ease-in-out infinite;
-        }
-
-        .title2 {
-          width: 158px;
-          height: 44px;
-          color: #e1e9e9;
-          position: absolute;
-          top: 30px;
-          left: -98px;
-          background-image: url("../../../../assets/longscreen2/mall_title.png");
-          background-size: 100% 99%;
-          z-index: 0;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-
-          .text {
-            padding: 0 10px;
-          }
-
-          .point {
-            display: block;
-            width: 4px;
-            height: 4px;
-            background: #c2fefa;
-            margin-top: 2px;
-          }
-        }
-      }
-
-      //右下
-      .item3 {
-        width: 18rem;
-        height: 18rem;
-        background-image: url("../../../../assets/longscreen2/3.png");
-        background-size: 100% 100%;
-        top: 60%;
-        left: 120%;
-        position: absolute;
-
-        .title3 {
-          width: 158px;
-          height: 44px;
-          color: #e1e9e9;
-          position: absolute;
-          top: 30px;
-          right: -92px;
-          background-image: url("../../../../assets/longscreen2/mall_title.png");
-          background-size: 100% 99%;
-          z-index: 0;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-
-          .text {
-            padding: 0 10px;
-          }
-
-          .point {
-            display: block;
-            width: 4px;
-            height: 4px;
-            background: #c2fefa;
-            margin-top: 2px;
-          }
-        }
-
-        .icon3 {
-          width: 100px;
-          height: 100px;
-          position: absolute;
-          background-position: center center;
-          background-repeat: no-repeat;
-          background-size: 60% 60%;
-          left: 40px;
-          top: -24px;
-          background-image: url("../../../../assets/longscreen2/mall_内部项目.svg");
-          z-index: 2;
-          animation: moveDown 4s ease-in-out infinite;
-        }
-      }
-
-      // 右上
-      .item4 {
-        width: 18rem;
-        height: 18rem;
-        background-image: url("../../../../assets/longscreen2/1.png");
-        background-size: 100% 100%;
-        top: -90%;
-        left: 120%;
-        position: absolute;
-
-        .icon4 {
-          width: 10rem;
-          height: 10rem;
-          position: absolute;
-          background-position: center center;
-          background-repeat: no-repeat;
-          background-size: 60% 60%;
-          right: 4.1rem;
-          top: -1.9rem;
-          background-image: url("../../../../assets/longscreen2/mall_外部材料供应商.svg");
-          z-index: 2;
-          animation: moveUp 4s ease-in-out infinite;
-        }
-
-        .title4 {
-          width: 158px;
-          height: 44px;
-          color: #e1e9e9;
-          position: absolute;
-          top: 30px;
-          right: -106px;
-          background-image: url("../../../../assets/longscreen2/mall_title.png");
-          background-size: 100% 99%;
-          z-index: 0;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-
-          .text {
-            padding: 0 10px;
-          }
-
-          .point {
-            display: block;
-            width: 4px;
-            height: 4px;
-            background: #c2fefa;
-            margin-top: 2px;
-          }
-        }
-      }
-    }
-  }
-}
-</style>
+<template>
+  <!-- 圆盘 -->
+  <div class="disc-wrap" >
+    <img :src="companyInfo.zp"  style="width:100%;height:100%;" alt="">
+    <!-- <div class="disc">
+      <div class="inner"></div>
+      <div class="outer"></div>
+      <div class="conent">
+        <div class="item1">
+          <div class="icon1"></div>
+          <div class="title1">
+            <span class="point"></span>
+            <span class="text">物料信息</span>
+            <span class="point"></span>
+          </div>
+        </div>
+        <div class="item2">
+          <div class="icon2"></div>
+          <div class="title2">
+            <span class="point"></span>
+            <span class="text">设备信息</span>
+            <span class="point"></span>
+          </div>
+        </div>
+        <div class="item3">
+          <div class="icon3"></div>
+          <div class="title3">
+            <span class="point"></span>
+            <span class="text">生产信息</span>
+            <span class="point"></span>
+          </div>
+        </div>
+        <div class="item4">
+          <div class="icon4"></div>
+          <div class="title4">
+            <span class="point"></span>
+            <span class="text">任务信息</span>
+            <span class="point"></span>
+          </div>
+        </div>
+      </div>
+    </div> -->
+  </div>
+</template>
+<script>
+import "../../../../utils/flexble";
+import { mapState } from "vuex";
+
+export default {
+  data() {
+    return {};
+  },
+  computed: {
+    ...mapState({
+      companyInfo: state => state.common.companyInfo
+    }),
+  },
+};
+</script>
+<style scoped lang="less">
+.disc-wrap {
+  width: 100%;
+  height: 60%;
+  position: relative;
+  box-sizing: border-box;
+  // background: url("../../../../assets/sc_bg.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+
+  .disc {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    margin: auto;
+    transform: translateY(39px) scale(1);
+
+    .text {
+      font-size: 18px;
+    }
+
+    .inner {
+      position: absolute;
+      width: 58rem;
+      height: 43rem;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      margin: auto;
+      background: url("../../../../assets/longscreen2/house.png");
+      background-size: 108% 108%;
+      background-position: center center;
+      animation: rotate-in 70s linear infinite;
+      // transform: rotateX(65deg);
+      // @keyframes rotate-in {
+      //   0% {
+      //     transform: rotateX(65deg) rotateZ(0deg);
+      //   }
+      //   100% {
+      //     transform: rotateX(65deg) rotateZ(360deg);
+      //   }
+      // }
+    }
+
+    .outer {
+      position: absolute;
+      width: 48rem;
+      height: 48rem;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      margin: auto;
+      background: url("../../../../assets/longscreen2/out.png");
+      background-size: 100% 100%;
+      background-position: center center;
+      animation: rotate-out 70s linear infinite;
+      transform: rotateX(65deg);
+
+      @keyframes rotate-out {
+        0% {
+          transform: rotateX(65deg) rotateZ(100deg);
+        }
+
+        100% {
+          transform: rotateX(65deg) rotateZ(-360deg);
+        }
+      }
+    }
+
+    .conent {
+      position: absolute;
+      left: 50%;
+      top: 19.2rem;
+      width: 17.7rem;
+      height: 19rem;
+      transform: translateX(-50%);
+      // background: url("../../../../assets/longscreen2/mall_content.png");
+      background-position: center center;
+      background-size: 100% 100%;
+      z-index: 3;
+
+      @keyframes moveDown {
+
+        0%,
+        100% {
+          transform: translateY(0);
+        }
+
+        50% {
+          transform: translateY(-2rem);
+        }
+      }
+
+      @keyframes moveUp {
+
+        0%,
+        100% {
+          transform: translateY(-2rem);
+        }
+
+        50% {
+          transform: translateY(0);
+        }
+      }
+
+      .item1 {
+        width: 18rem;
+        height: 18rem;
+        top: 70%;
+        left: -120%;
+        position: absolute;
+        background-image: url("../../../../assets/longscreen2/1.png");
+        background-size: 100% 100%;
+
+        .icon1 {
+          width: 10rem;
+          height: 10rem;
+          position: absolute;
+          background-position: center center;
+          background-repeat: no-repeat;
+          background-size: 60% 60%;
+          left: 4rem;
+          top: -1.9rem;
+          background-image: url("../../../../assets/longscreen2/mall_内部贸易公司.svg");
+          z-index: 2;
+          animation: moveUp 4s ease-in-out infinite;
+        }
+
+        .title1 {
+          width: 158px;
+          height: 44px;
+          color: #e1e9e9;
+          position: absolute;
+          top: 30px;
+          left: -98px;
+          background-image: url("../../../../assets/longscreen2/mall_title.png");
+          background-size: 100% 99%;
+          z-index: 0;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+
+          .text {
+            padding: 0 10px;
+          }
+
+          .point {
+            display: block;
+            width: 4px;
+            height: 4px;
+            background: #c2fefa;
+            margin-top: 2px;
+          }
+        }
+      }
+
+      // 左上
+      .item2 {
+        width: 18rem;
+        height: 18rem;
+        background-image: url("../../../../assets/longscreen2/2.png");
+        background-size: 100% 100%;
+        top: -80%;
+        left: -120%;
+        position: absolute;
+
+        .icon2 {
+          width: 10rem;
+          height: 10rem;
+          position: absolute;
+          background-position: center center;
+          background-repeat: no-repeat;
+          background-size: 60% 60%;
+          left: 4.1rem;
+          top: -1.9rem;
+          background-image: url("../../../../assets/longscreen2/mall_外部卖家.svg");
+          z-index: 2;
+          animation: moveDown 4s ease-in-out infinite;
+        }
+
+        .title2 {
+          width: 158px;
+          height: 44px;
+          color: #e1e9e9;
+          position: absolute;
+          top: 30px;
+          left: -98px;
+          background-image: url("../../../../assets/longscreen2/mall_title.png");
+          background-size: 100% 99%;
+          z-index: 0;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+
+          .text {
+            padding: 0 10px;
+          }
+
+          .point {
+            display: block;
+            width: 4px;
+            height: 4px;
+            background: #c2fefa;
+            margin-top: 2px;
+          }
+        }
+      }
+
+      //右下
+      .item3 {
+        width: 18rem;
+        height: 18rem;
+        background-image: url("../../../../assets/longscreen2/3.png");
+        background-size: 100% 100%;
+        top: 60%;
+        left: 120%;
+        position: absolute;
+
+        .title3 {
+          width: 158px;
+          height: 44px;
+          color: #e1e9e9;
+          position: absolute;
+          top: 30px;
+          right: -92px;
+          background-image: url("../../../../assets/longscreen2/mall_title.png");
+          background-size: 100% 99%;
+          z-index: 0;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+
+          .text {
+            padding: 0 10px;
+          }
+
+          .point {
+            display: block;
+            width: 4px;
+            height: 4px;
+            background: #c2fefa;
+            margin-top: 2px;
+          }
+        }
+
+        .icon3 {
+          width: 100px;
+          height: 100px;
+          position: absolute;
+          background-position: center center;
+          background-repeat: no-repeat;
+          background-size: 60% 60%;
+          left: 40px;
+          top: -24px;
+          background-image: url("../../../../assets/longscreen2/mall_内部项目.svg");
+          z-index: 2;
+          animation: moveDown 4s ease-in-out infinite;
+        }
+      }
+
+      // 右上
+      .item4 {
+        width: 18rem;
+        height: 18rem;
+        background-image: url("../../../../assets/longscreen2/1.png");
+        background-size: 100% 100%;
+        top: -90%;
+        left: 120%;
+        position: absolute;
+
+        .icon4 {
+          width: 10rem;
+          height: 10rem;
+          position: absolute;
+          background-position: center center;
+          background-repeat: no-repeat;
+          background-size: 60% 60%;
+          right: 4.1rem;
+          top: -1.9rem;
+          background-image: url("../../../../assets/longscreen2/mall_外部材料供应商.svg");
+          z-index: 2;
+          animation: moveUp 4s ease-in-out infinite;
+        }
+
+        .title4 {
+          width: 158px;
+          height: 44px;
+          color: #e1e9e9;
+          position: absolute;
+          top: 30px;
+          right: -106px;
+          background-image: url("../../../../assets/longscreen2/mall_title.png");
+          background-size: 100% 99%;
+          z-index: 0;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+
+          .text {
+            padding: 0 10px;
+          }
+
+          .point {
+            display: block;
+            width: 4px;
+            height: 4px;
+            background: #c2fefa;
+            margin-top: 2px;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/pages/independent/center/index.vue b/src/pages/independent/center/index.vue
index e2d7b7b..1304ed7 100644
--- a/src/pages/independent/center/index.vue
+++ b/src/pages/independent/center/index.vue
@@ -1,34 +1,34 @@
-<template>
-  <div id="center">
-    <!-- 圆盘 -->
-    <Disc></Disc>
-    <!-- 直采商城 -->
-    <!-- <ZhicaiMall></ZhicaiMall> -->
-    <!-- 大宗贸易商城 -->
-    <TradeMall style="z-index:9999"></TradeMall>
-  </div>
-</template>
-
-<script>
-import Disc from "./components/disc";
-// import ZhicaiMall from "./components/zhicaiMall";
-import TradeMall from "./components/tradeMall";
-export default {
-  name: "LongScreen",
-  components: { Disc, TradeMall },
-  data() {
-    return {};
-  }
-};
-</script>
-
-<style scoped lang="less">
-#center {
-  color: #fff;
-  width: 50%;
-  height: 100%;
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-}
-</style>
+<template>
+  <div id="center">
+    <!-- 圆盘 -->
+    <Disc></Disc>
+    <!-- 直采商城 -->
+    <!-- <ZhicaiMall></ZhicaiMall> -->
+    <!-- 大宗贸易商城 -->
+    <TradeMall style="z-index:9999"></TradeMall>
+  </div>
+</template>
+
+<script>
+import Disc from "./components/disc";
+// import ZhicaiMall from "./components/zhicaiMall";
+import TradeMall from "./components/tradeMall";
+export default {
+  name: "LongScreen",
+  components: { Disc, TradeMall },
+  data() {
+    return {};
+  }
+};
+</script>
+
+<style scoped lang="less">
+#center {
+  color: #fff;
+  width: 50%;
+  height: 100%;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+</style>
diff --git a/src/pages/independent/screen.vue b/src/pages/independent/screen.vue
index 3c25ee6..5e1939a 100644
--- a/src/pages/independent/screen.vue
+++ b/src/pages/independent/screen.vue
@@ -5,7 +5,7 @@
       <div class="header-wrap">
         <div class="myheader">
           <p class="header-title">
-            江西心诚药业互联网平台数字化展示中心
+            {{ companyInfo.screenName }}
           </p>
           <div class="time">{{ time }}</div>
           <!-- <div class="weather">{{ "🌤晴    22℃" }}</div> -->
@@ -51,6 +51,7 @@ import model3d from "./screen-3d";
 import model3dsb from "./screen-3d-sb";
 import model3dhcl from "./screen-3d-hcl";
 import model3dfq from "./screen-3d-fq";
+import { mapState } from "vuex";
 
 export default {
   name: "LongScreen",
@@ -70,6 +71,11 @@ export default {
       show: "cj"
     };
   },
+  computed: {
+    ...mapState({
+      companyInfo: state => state.common.companyInfo
+    }),
+  },
   mounted() {
     this.timeSelse = setInterval(() => {
       this.getTime();
diff --git a/src/pages/inspection/plan/index.vue b/src/pages/inspection/plan/index.vue
index 6b74021..9665723 100644
--- a/src/pages/inspection/plan/index.vue
+++ b/src/pages/inspection/plan/index.vue
@@ -1,525 +1,544 @@
-<template>
-  <!-- 巡检计划 -->
-  <div class="sys-box knowledge-box">
-    <div class="sys-operate">
-      <el-button type="primary" v-has="'inspection:plan:add'" @click="add()"
-        >新增</el-button
-      >
-      <el-button
-        type="primary"
-        v-has="'inspection:plan:remove'"
-        @click="remove()"
-        :disabled="btnDelDisabled"
-        >删除</el-button
-      >
-      <el-button
-        type="primary"
-        v-has="'inspection:plan:startUsing'"
-        @click="startUsing()"
-        :disabled="btnDelDisabled"
-        >启用</el-button
-      >
-      <el-button
-        type="primary"
-        v-has="'inspection:plan:forbidden'"
-        @click="forbidden()"
-        :disabled="btnDelDisabled"
-        >禁用</el-button
-      >
-      <!-- <el-button type="primary" @click="importPlan()">导入</el-button>
-      <el-button type="primary" @click="exportPlan()">导出</el-button>-->
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class="form_item_input_out">
-          <el-form-item
-            label="计划名称"
-            style="width:22%"
-            class="form_item-inline"
-          >
-            <el-input
-              placeholder="计划名称"
-              v-model="search_data.planName"
-            ></el-input>
-          </el-form-item>
-          <el-form-item
-            label="设备名称"
-            style="width:22%"
-            class="form_item-inline"
-          >
-            <el-input
-              placeholder="设备名称"
-              v-model="search_data.sbmc"
-            ></el-input>
-          </el-form-item>
-          <el-form-item
-            label="计划状态"
-            style="width:22%"
-            class="form_item-inline"
-          >
-            <el-select
-              clearable
-              v-model="search_data.status"
-              placeholder="计划状态"
-            >
-              <el-option
-                v-for="item in statusList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            label="巡检人"
-            style="width:22%"
-            class="form_item-inline"
-          >
-            <!-- <el-select clearable v-model="search_data.engineerId" filterable placeholder="请选择">
-            <el-option
-              v-for="item in getUserList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select> -->
-            <btn-input
-              :valueText.sync="search_data.engineerName"
-              :valueId.sync="search_data.engineerId"
-              :chooseVisible.sync="chooseUserVisible"
-            ></btn-input>
-          </el-form-item>
-          <el-form-item
-            label="计划时间"
-            style="width:34%"
-            class="form_item-inline"
-          >
-            <el-date-picker
-              v-model="planTime"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class="form_item_btn_out">
-          <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table
-        border
-        @sort-change="sortChange"
-        v-loading="pictLoading"
-        :data="tableData"
-        @row-click="clickRow"
-        ref="tb"
-        @selection-change="handleSelectionChange"
-        :header-cell-style="{
-          fontWeight: 'normal',
-          textAlign: 'center',
-          backgroundColor: '#eceff4',
-          color: '#222'
-        }"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center"
-        ></el-table-column>
-        <el-table-column prop="workOrderNo" align="center" label="计划单号">
-          <template slot-scope="scope">
-            <el-link type="primary" @click="viewDetail(scope.row)">{{
-              scope.row.workOrderNo
-            }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="planName"
-          label="计划名称"
-          align="center"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          sortable="custom"
-          width="110"
-          prop="statusId"
-          align="center"
-          label="计划状态"
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.statusName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="deptName"
-          align="center"
-          label="巡检部门"
-        ></el-table-column>
-        <el-table-column
-          prop="userName"
-          align="center"
-          label="巡检人"
-        ></el-table-column>
-        <el-table-column
-          sortable="custom"
-          prop="startTime"
-          align="center"
-          label="计划开始时间"
-          width="200"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          sortable="custom"
-          prop="endTime"
-          align="center"
-          label="计划结束时间"
-          width="200"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          prop="content"
-          align="center"
-          label="备注"
-          show-overflow-tooltip
-        ></el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="search_data.pageno"
-        :page-sizes="pageSizes"
-        :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
-    </div>
-
-    <!-- 选择负责人-->
-    <dialogChooseSingleUser
-      :visible.sync="chooseUserVisible"
-      @change="getUser"
-    ></dialogChooseSingleUser>
-  </div>
-</template>
-
-<script>
-import { formatDateTime } from "@/utils/tools.js";
-import btnInput from "@/components/btnInput.vue";
-import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-export default {
-  name: "inspection_plan",
-  components: {
-    btnInput,
-    dialogChooseSingleUser
-  },
-  data() {
-    return {
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10
-      },
-
-      planTime: "",
-
-      statusList: [], //计划状态
-      getUserList: [], //用户
-
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      chooseUserVisible: false,
-      rowIds: [],
-      tableData: [],
-      dialogVisible: false,
-      pictLoading: false
-    };
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search();
-      }
-    };
-  },
-  mounted() {
-    this.getList();
-    this.initData();
-  },
-  methods: {
-    /**
-     * 获取选择的负责人
-     */
-    getUser(val) {
-      if (val) {
-        this.$set(this.search_data, "engineerName", val.name);
-        this.$set(this.search_data, "engineerId", val.id);
-      } else {
-        this.$set(this.search_data, "engineerName", "");
-        this.$set(this.search_data, "engineerId", "");
-      }
-    },
-    sortChange({ column, prop, order }) {
-      let j = { column, prop, order };
-      let order_ = j.order == "ascending" ? "asc" : "desc";
-      this.$set(this.search_data, "sort", j.prop);
-      this.$set(this.search_data, "order", order_);
-      this.getList();
-    },
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-    /**
-     * 启用
-     */
-    startUsing() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认启用选中的巡检计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.patroPlanAPI
-          .startUsing({ ids: ids })
-          .then(res => {
-            console.log(res);
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "启用失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "启用失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 禁用
-     */
-    forbidden() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认禁用选中的巡检计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.patroPlanAPI
-          .forbidden({ ids: ids })
-          .then(res => {
-            console.log(res);
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "禁用失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "禁用失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    initData() {
-      Promise.all([
-        this.$api.commonAPI.getUsers(),
-        this.$api.dictAPI.getDictsByType("plan_status")
-      ])
-        .then(([r1, r2]) => {
-          if (r1.code === 0) {
-            this.getUserList = r1.datas;
-          }
-          if (r2.code === 0) {
-            this.statusList = r2.datas;
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    /**
-     * 获取列表
-     */
-    getList() {
-      if (this.planTime) {
-        this.search_data.startTime = formatDateTime(this.planTime[0]);
-        this.search_data.endTime = formatDateTime(this.planTime[1]);
-      } else {
-        this.search_data.startTime = "";
-        this.search_data.endTime = "";
-      }
-      this.pictLoading = true;
-      this.$api.patroPlanAPI
-        .planList(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.data) {
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    /**
-     * 新增
-     */
-    add() {
-      this.$router.push({
-        path: "/inspection/plan_add",
-        query: {
-          t: Date.now()
-        }
-      });
-    },
-    /**
-     * 查看明细
-     */
-    viewDetail(r) {
-      if (r.statusId === 146) {
-        this.$router.push({
-          path: "/inspection/plan_add",
-          query: { id: r.id, t: Date.now() }
-        });
-      } else {
-        this.$router.push({
-          path: "/inspection/plan_add",
-          query: { id: r.id, t: Date.now() }
-        });
-      }
-    },
-    /**
-     * 导入
-     */
-    importPlan() {},
-    /**
-     * 导出
-     */
-    exportPlan() {},
-    /**
-     *查看明细
-     */
-    openDetails(r) {
-      this.$router.push({
-        path: "/inspection/detail",
-        query: { id: r.id, t: Date.now() }
-      });
-    },
-
-    /**
-     * 删除POST /apis/patrolPlan/batcnRemovePlan
-     */
-    remove() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      // const ids = this.rowIds.map(item => item.id).toString();
-      let params = { ids: ids };
-      this.$confirm("确认删除选中的巡检计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.patroPlanAPI
-          .batcnRemovePlan(params)
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    }
-  }
-};
-</script>
-
-<style scoped></style>
+<template>
+  <!-- 巡检计划 -->
+  <div class="sys-box knowledge-box">
+    <div class="sys-operate">
+      <el-button type="primary" v-has="'inspection:plan:add'" @click="add()"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        v-has="'inspection:plan:remove'"
+        @click="remove()"
+        :disabled="btnDelDisabled"
+        >删除</el-button
+      >
+      <el-button
+        type="primary"
+        v-has="'inspection:plan:startUsing'"
+        @click="startUsing()"
+        :disabled="btnDelDisabled"
+        >启用</el-button
+      >
+      <el-button
+        type="primary"
+        v-has="'inspection:plan:forbidden'"
+        @click="forbidden()"
+        :disabled="btnDelDisabled"
+        >禁用</el-button
+      >
+      <el-button type="primary" v-has="'inspection:plan:import'" @click="importFile()">导入</el-button>
+      <!-- <el-button type="primary" @click="importPlan()">导入</el-button>
+      <el-button type="primary" @click="exportPlan()">导出</el-button>-->
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class="form_item_input_out">
+          <el-form-item
+            label="计划名称"
+            style="width:22%"
+            class="form_item-inline"
+          >
+            <el-input
+              placeholder="计划名称"
+              v-model="search_data.planName"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="设备名称"
+            style="width:22%"
+            class="form_item-inline"
+          >
+            <el-input
+              placeholder="设备名称"
+              v-model="search_data.sbmc"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="计划状态"
+            style="width:22%"
+            class="form_item-inline"
+          >
+            <el-select
+              clearable
+              v-model="search_data.status"
+              placeholder="计划状态"
+            >
+              <el-option
+                v-for="item in statusList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="巡检人"
+            style="width:22%"
+            class="form_item-inline"
+          >
+            <!-- <el-select clearable v-model="search_data.engineerId" filterable placeholder="请选择">
+            <el-option
+              v-for="item in getUserList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select> -->
+            <btn-input
+              :valueText.sync="search_data.engineerName"
+              :valueId.sync="search_data.engineerId"
+              :chooseVisible.sync="chooseUserVisible"
+            ></btn-input>
+          </el-form-item>
+          <el-form-item
+            label="计划时间"
+            style="width:34%"
+            class="form_item-inline"
+          >
+            <el-date-picker
+              v-model="planTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class="form_item_btn_out">
+          <el-form-item>
+            <el-button type="primary" @click="search()">查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table
+        border
+        @sort-change="sortChange"
+        v-loading="pictLoading"
+        :data="tableData"
+        @row-click="clickRow"
+        ref="tb"
+        @selection-change="handleSelectionChange"
+        :header-cell-style="{
+          fontWeight: 'normal',
+          textAlign: 'center',
+          backgroundColor: '#eceff4',
+          color: '#222'
+        }"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"
+        ></el-table-column>
+        <el-table-column prop="workOrderNo" align="center" label="计划单号">
+          <template slot-scope="scope">
+            <el-link type="primary" @click="viewDetail(scope.row)">{{
+              scope.row.workOrderNo
+            }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="planName"
+          label="计划名称"
+          align="center"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          sortable="custom"
+          width="110"
+          prop="statusId"
+          align="center"
+          label="计划状态"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.statusName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          align="center"
+          label="巡检部门"
+        ></el-table-column>
+        <el-table-column
+          prop="userName"
+          align="center"
+          label="巡检人"
+        ></el-table-column>
+        <el-table-column
+          sortable="custom"
+          prop="startTime"
+          align="center"
+          label="计划开始时间"
+          width="200"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          sortable="custom"
+          prop="endTime"
+          align="center"
+          label="计划结束时间"
+          width="200"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="content"
+          align="center"
+          label="备注"
+          show-overflow-tooltip
+        ></el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="search_data.pageno"
+        :page-sizes="pageSizes"
+        :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+
+    <!-- 选择负责人-->
+    <dialogChooseSingleUser
+      :visible.sync="chooseUserVisible"
+      @change="getUser"
+    ></dialogChooseSingleUser>
+
+    <dialog-import-file
+      v-if="showUserImportDialog"
+      :visible.sync="showUserImportDialog"
+      title="点检计划批量导入"
+      source="patrolPlan"
+      :upload-data="{ type: 'user' }"
+      @success="handleUserImportSuccess"
+      @close="showUserImportDialog = false"
+    />
+  </div>
+</template>
+
+<script>
+import { formatDateTime } from "@/utils/tools.js";
+import DialogImportFile from '@/components/Dialog/dialogImportFile.vue';
+import btnInput from "@/components/btnInput.vue";
+import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+export default {
+  name: "inspection_plan",
+  components: {
+    btnInput,
+    DialogImportFile,
+    dialogChooseSingleUser
+  },
+  data() {
+    return {
+      showUserImportDialog:false,
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10
+      },
+
+      planTime: "",
+
+      statusList: [], //计划状态
+      getUserList: [], //用户
+
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      chooseUserVisible: false,
+      rowIds: [],
+      tableData: [],
+      dialogVisible: false,
+      pictLoading: false
+    };
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search();
+      }
+    };
+  },
+  mounted() {
+    this.getList();
+    this.initData();
+  },
+  methods: {
+    handleUserImportSuccess(response, file, fileList) {
+      this.getList()
+    },
+    importFile(){
+      this.showUserImportDialog = true
+    },    /**
+     * 获取选择的负责人
+     */
+    getUser(val) {
+      if (val) {
+        this.$set(this.search_data, "engineerName", val.name);
+        this.$set(this.search_data, "engineerId", val.id);
+      } else {
+        this.$set(this.search_data, "engineerName", "");
+        this.$set(this.search_data, "engineerId", "");
+      }
+    },
+    sortChange({ column, prop, order }) {
+      let j = { column, prop, order };
+      let order_ = j.order == "ascending" ? "asc" : "desc";
+      this.$set(this.search_data, "sort", j.prop);
+      this.$set(this.search_data, "order", order_);
+      this.getList();
+    },
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+    /**
+     * 启用
+     */
+    startUsing() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认启用选中的巡检计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.patroPlanAPI
+          .startUsing({ ids: ids })
+          .then(res => {
+            console.log(res);
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "启用失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "启用失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 禁用
+     */
+    forbidden() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认禁用选中的巡检计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.patroPlanAPI
+          .forbidden({ ids: ids })
+          .then(res => {
+            console.log(res);
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "禁用失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "禁用失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    initData() {
+      Promise.all([
+        this.$api.commonAPI.getUsers(),
+        this.$api.dictAPI.getDictsByType("plan_status")
+      ])
+        .then(([r1, r2]) => {
+          if (r1.code === 0) {
+            this.getUserList = r1.datas;
+          }
+          if (r2.code === 0) {
+            this.statusList = r2.datas;
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    /**
+     * 获取列表
+     */
+    getList() {
+      if (this.planTime) {
+        this.search_data.startTime = formatDateTime(this.planTime[0]);
+        this.search_data.endTime = formatDateTime(this.planTime[1]);
+      } else {
+        this.search_data.startTime = "";
+        this.search_data.endTime = "";
+      }
+      this.pictLoading = true;
+      this.$api.patroPlanAPI
+        .planList(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.data) {
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    /**
+     * 新增
+     */
+    add() {
+      this.$router.push({
+        path: "/inspection/plan_add",
+        query: {
+          t: Date.now()
+        }
+      });
+    },
+    /**
+     * 查看明细
+     */
+    viewDetail(r) {
+      if (r.statusId === 146) {
+        this.$router.push({
+          path: "/inspection/plan_add",
+          query: { id: r.id, t: Date.now() }
+        });
+      } else {
+        this.$router.push({
+          path: "/inspection/plan_add",
+          query: { id: r.id, t: Date.now() }
+        });
+      }
+    },
+    /**
+     * 导入
+     */
+    importPlan() {},
+    /**
+     * 导出
+     */
+    exportPlan() {},
+    /**
+     *查看明细
+     */
+    openDetails(r) {
+      this.$router.push({
+        path: "/inspection/detail",
+        query: { id: r.id, t: Date.now() }
+      });
+    },
+
+    /**
+     * 删除POST /apis/patrolPlan/batcnRemovePlan
+     */
+    remove() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      // const ids = this.rowIds.map(item => item.id).toString();
+      let params = { ids: ids };
+      this.$confirm("确认删除选中的巡检计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.patroPlanAPI
+          .batcnRemovePlan(params)
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    }
+  }
+};
+</script>
+
+<style scoped></style>
diff --git a/src/pages/khgxgl/wlps/index.vue b/src/pages/khgxgl/wlps/index.vue
index c8a9142..0741598 100644
--- a/src/pages/khgxgl/wlps/index.vue
+++ b/src/pages/khgxgl/wlps/index.vue
@@ -1,531 +1,552 @@
-<template>
-  <!-- 保养计划列表页 -->
-  <div class="sys-box knowledge-box">
-    <div class="sys-operate">
-      <el-button type="primary" v-has="'upkeep:plan:add'" @click="add()">新增</el-button>
-      <el-button type="primary" v-has="'upkeep:plan:remove'" @click="remove()" :disabled="btnDelDisabled">删除</el-button>
-      <!-- <el-button
-        type="primary"
-        v-has="'upkeep:plan:remove'"
-        @click="reback()"
-        :disabled="btnDelDisabled"
-        >撤回</el-button
-      > -->
-      <!-- <el-button
-        type="primary"
-        v-has="'upkeep:plan:startUsing'"
-        @click="startUsing()"
-        :disabled="btnDelDisabled"
-        >启用</el-button
-      >
-      <el-button
-        type="primary"
-        v-has="'upkeep:plan:forbidden'"
-        @click="forbidden()"
-        :disabled="btnDelDisabled"
-        >禁用</el-button
-      > -->
-      <!-- <el-button type="primary" @click="execution()" :disabled="btnOtherDisabled">保养执行</el-button> -->
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class="form_item_input_out">
-          <el-form-item label="配送单号" style="width:22%" class="form_item-inline">
-            <el-input v-model="search_data.psdh" placeholder="配送单号"></el-input>
-          </el-form-item>
-          <el-form-item label="订单编号" style="width:22%" class="form_item-inline">
-            <el-input v-model="search_data.ddbh" placeholder="订单编号"></el-input>
-          </el-form-item>
-          <!-- <el-form-item label="区域" style="width:22%" class="form_item-inline">
-            <el-select
-              v-model="search_data.qyid"
-              filterable
-              clearable
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in qyList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            label="记录类型"
-            style="width:22%"
-            class="form_item-inline"
-          >
-            <el-select
-              v-model="search_data.jllxid"
-              filterable
-              clearable
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in jllxList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item> -->
-          <!-- <btn-input
-              :valueText.sync="search_data.engineerName"
-              :valueId.sync="search_data.engineerId"
-              :chooseVisible.sync="chooseUserVisible"
-            ></btn-input>
-          </el-form-item> -->
-          <el-form-item label="状态" style="width:22%" class="form_item-inline">
-            <el-select v-model="search_data.zt" clearable placeholder="请选择">
-              <el-option v-for="item in ztList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="服务单号" style="width:22%" class="form_item-inline">
-            <el-input v-model="search_data.fwdh" placeholder="服务单号"></el-input>
-          </el-form-item>
-          <el-form-item label="销售单号" style="width:22%" class="form_item-inline">
-            <el-input v-model="search_data.xsdh" placeholder="销售单号"></el-input>
-          </el-form-item>
-          <el-form-item label="操作日期" style="width:34%" class="form_item-inline">
-            <el-date-picker v-model="planTime" type="daterange" range-separator="-" start-placeholder="开始日期"
-              end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class="form_item_btn_out">
-          <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table border @sort-change="sortChange" v-loading="pictLoading" @row-click="clickRow" ref="tb"
-        :data="tableData" @selection-change="handleSelectionChange" :header-cell-style="{
-          fontWeight: 'normal',
-          textAlign: 'center',
-          backgroundColor: '#eceff4',
-          color: '#222'
-        }">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column prop="zskdh" align="center" width="200" label="配送单号" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <el-link type="primary" @click="viewDetail(scope.row)">{{
-              scope.row.psdh
-            }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="psrq" label="配送日期" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="zt" align="center" label="状态" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{
-              scope.row.zt == 1
-                ? "未开始"
-                : scope.row.zt == 2
-                  ? "对应中"
-                  : scope.row.zt == 3
-                    ? "已完成"
-                    : "--"
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="fwdh" align="center" label="服务单号" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="xsdh" align="center" label="销售单号" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="khmc" align="center" label="客户名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="lxr" align="center" label="联系人" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="lxdh" align="center" label="联系电话" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="dz" label="地址" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="wlfs" align="center" label="物流方式"></el-table-column>
-        <el-table-column prop="wldh" align="center" label="物流单号" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="ddbh" align="center" label="订单编号" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="ddsl" align="center" label="订单数量" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="cjry" align="center" label="创建人员" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="bz" align="center" label="备注" show-overflow-tooltip></el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-    <!-- 选择负责人-->
-    <!-- <dialogChooseSingleUser
-      :visible.sync="chooseUserVisible"
-      @change="getUser"
-    ></dialogChooseSingleUser> -->
-    <!-- <chooseSbjh :visible.sync="chooseSbjhVisible" /> -->
-  </div>
-</template>
-
-<script>
-import { formatDateTime } from "@/utils/tools.js";
-// import btnInput from "@/components/btnInput.vue";
-// import chooseSbjh from "./components/chooseSbjh.vue";
-// import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-let api = {
-  page: "/apis/mdh/wlps/pageList",
-  del: "/apis/mdh/wlps/del",
-  edit: "/apis/mdh/wlps/edit"
-};
-export default {
-  name: "wlps",
-  components: {
-    // btnInput
-    // dialogChooseSingleUser
-    // chooseSbjh
-  },
-  data() {
-    return {
-      ztList: [
-        {
-          name: "未开始",
-          id: 1
-        },
-        {
-          name: "对应中",
-          id: 2
-        },
-        {
-          name: "已完成",
-          id: 3
-        }
-      ],
-      qyList: [],
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10
-      },
-
-      planTime: "",
-
-      statusList: [], //计划状态
-      getUserList: [], //用户
-
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      chooseUserVisible: false,
-      chooseSbjhVisible: false,
-      rowIds: [],
-      tableData: [],
-      dialogVisible: false,
-      pictLoading: false,
-      qyList: [],
-      jllxList: [],
-      dywzList: []
-    };
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search();
-      }
-    };
-  },
-  mounted() {
-    //let user = JSON.parse(sessionStorage.getItem("userInfo"));
-    //console.log(user);
-    //this.search_data.engineerId = user.userId;
-    this.getList();
-    // this.initData();
-  },
-  methods: {
-    async reback() {
-      if (this.rowIds.length > 0) {
-        let r = this.rowIds[0];
-        let pass = r.zt == 3 ? true : false;
-        if (pass) {
-          const params = {
-            id: r.id,
-            zt: 2,
-            zczt: 0
-          };
-          const res = await this.$api.yxkAPI.yxkPost(api.edit, params);
-          if (res.code == 0) {
-            this.$message({
-              message: "撤回成功",
-              type: "success"
-            });
-            this.getList();
-          }
-        } else {
-          this.$message({
-            message: "非已提交状态不能撤回",
-            type: "warning"
-          });
-          return false;
-        }
-      } else {
-        this.$message({
-          message: "请选择一条数据",
-          type: "warning"
-        });
-        return false;
-      }
-    },
-    /**
-     * 获取选择的负责人
-     */
-    getUser(val) {
-      if (val) {
-        this.$set(this.search_data, "engineerName", val.name);
-        this.$set(this.search_data, "engineerId", val.id);
-      } else {
-        this.$set(this.search_data, "engineerName", "");
-        this.$set(this.search_data, "engineerId", "");
-      }
-    },
-    sortChange({ column, prop, order }) {
-      let j = { column, prop, order };
-      let order_ = j.order == "ascending" ? "asc" : "desc";
-      this.$set(this.search_data, "sort", j.prop);
-      this.$set(this.search_data, "order", order_);
-      this.getList();
-    },
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-    initData() {
-      Promise.all([
-        this.$api.dictAPI.getDictsByType("qy"),
-        this.$api.dictAPI.getDictsByType("jllx"),
-        this.$api.dictAPI.getDictsByType("dywz")
-      ])
-        .then(([r1, r2, r3]) => {
-          if (r1.code === 0) {
-            this.qyList = r1.datas;
-          }
-          if (r2.code == 0) {
-            this.jllxList = r2.datas;
-          }
-          if (r3.code == 0) {
-            this.dywzList = r3.datas;
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    /**
-     * 获取列表
-     */
-    getList() {
-      this.pictLoading = true;
-      if (this.planTime) {
-        this.search_data.startTime = formatDateTime(this.planTime[0]);
-        this.search_data.endTime = formatDateTime(this.planTime[1]);
-      } else {
-        this.search_data.startTime = null;
-        this.search_data.endTime = null;
-      }
-      this.$api.yxkAPI
-        .yxkPost(api.page, this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.data) {
-            this.total = res.data.total;
-            let result = res.data.records;
-            this.tableData = result;
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    /**
-     * 新增
-     */
-    add() {
-      this.$router.push({
-        path: "/khgxgl/wlps-add",
-        query: {
-          t: Date.now()
-        }
-      });
-    },
-    /**查看明细 */
-    viewDetail(r) {
-      if (r.zt == 2) {
-        this.$router.push({
-          path: "/khgxgl/wlps-add",
-          query: { id: r.id, t: Date.now() }
-        });
-      } else {
-        this.$router.push({
-          path: "/khgxgl/wlps-add",
-          query: { id: r.id, t: Date.now() }
-        });
-      }
-    },
-
-    /**
-     * 保养执行
-     */
-    execution() {
-      // let id = this.rowIds[0].reventId;
-      // this.$router.push({
-      //   path: "/upkeep/record",
-      //   query: { id: id }
-      // });
-    },
-    /**
-     * 删除
-     */
-    remove() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认删除选中的数据吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.yxkAPI
-          .yxkPost(api.del, ids)
-          .then(res => {
-            console.log(res);
-            if (res.code == 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 启用
-     */
-    startUsing() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认启用选中的保养计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.upkeepPlanAPI
-          .startUsing({ ids: ids })
-          .then(res => {
-            console.log(res);
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "启用失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "启用失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 禁用
-     */
-    forbidden() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认禁用选中的保养计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.upkeepPlanAPI
-          .forbidden({ ids: ids })
-          .then(res => {
-            console.log(res);
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "禁用失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "禁用失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    }
-  }
-};
-</script>
-
-<style scoped></style>
+<template>
+  <!-- 保养计划列表页 -->
+  <div class="sys-box knowledge-box">
+    <div class="sys-operate">
+      <el-button type="primary" v-has="'upkeep:plan:add'" @click="add()">新增</el-button>
+      <el-button type="primary" v-has="'upkeep:plan:remove'" @click="remove()" :disabled="btnDelDisabled">删除</el-button>
+      <el-button type="primary" v-has="'upkeep:plan:import'" @click="importFile()">导入</el-button>
+
+      <!-- <el-button
+        type="primary"
+        v-has="'upkeep:plan:remove'"
+        @click="reback()"
+        :disabled="btnDelDisabled"
+        >撤回</el-button
+      > -->
+      <!-- <el-button
+        type="primary"
+        v-has="'upkeep:plan:startUsing'"
+        @click="startUsing()"
+        :disabled="btnDelDisabled"
+        >启用</el-button
+      >
+      <el-button
+        type="primary"
+        v-has="'upkeep:plan:forbidden'"
+        @click="forbidden()"
+        :disabled="btnDelDisabled"
+        >禁用</el-button
+      > -->
+      <!-- <el-button type="primary" @click="execution()" :disabled="btnOtherDisabled">保养执行</el-button> -->
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class="form_item_input_out">
+          <el-form-item label="配送单号" style="width:22%" class="form_item-inline">
+            <el-input v-model="search_data.psdh" placeholder="配送单号"></el-input>
+          </el-form-item>
+          <el-form-item label="订单编号" style="width:22%" class="form_item-inline">
+            <el-input v-model="search_data.ddbh" placeholder="订单编号"></el-input>
+          </el-form-item>
+          <!-- <el-form-item label="区域" style="width:22%" class="form_item-inline">
+            <el-select
+              v-model="search_data.qyid"
+              filterable
+              clearable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in qyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="记录类型"
+            style="width:22%"
+            class="form_item-inline"
+          >
+            <el-select
+              v-model="search_data.jllxid"
+              filterable
+              clearable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in jllxList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item> -->
+          <!-- <btn-input
+              :valueText.sync="search_data.engineerName"
+              :valueId.sync="search_data.engineerId"
+              :chooseVisible.sync="chooseUserVisible"
+            ></btn-input>
+          </el-form-item> -->
+          <el-form-item label="状态" style="width:22%" class="form_item-inline">
+            <el-select v-model="search_data.zt" clearable placeholder="请选择">
+              <el-option v-for="item in ztList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="服务单号" style="width:22%" class="form_item-inline">
+            <el-input v-model="search_data.fwdh" placeholder="服务单号"></el-input>
+          </el-form-item>
+          <el-form-item label="销售单号" style="width:22%" class="form_item-inline">
+            <el-input v-model="search_data.xsdh" placeholder="销售单号"></el-input>
+          </el-form-item>
+          <el-form-item label="操作日期" style="width:34%" class="form_item-inline">
+            <el-date-picker v-model="planTime" type="daterange" range-separator="-" start-placeholder="开始日期"
+              end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class="form_item_btn_out">
+          <el-form-item>
+            <el-button type="primary" @click="search()">查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table border @sort-change="sortChange" v-loading="pictLoading" @row-click="clickRow" ref="tb"
+        :data="tableData" @selection-change="handleSelectionChange" :header-cell-style="{
+          fontWeight: 'normal',
+          textAlign: 'center',
+          backgroundColor: '#eceff4',
+          color: '#222'
+        }">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="zskdh" align="center" width="200" label="配送单号" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-link type="primary" @click="viewDetail(scope.row)">{{
+              scope.row.psdh
+            }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="psrq" label="配送日期" align="center" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="zt" align="center" label="状态" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{
+              scope.row.zt == 1
+                ? "未开始"
+                : scope.row.zt == 2
+                  ? "对应中"
+                  : scope.row.zt == 3
+                    ? "已完成"
+                    : "--"
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="fwdh" align="center" label="服务单号" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="xsdh" align="center" label="销售单号" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="khmc" align="center" label="客户名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="lxr" align="center" label="联系人" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="lxdh" align="center" label="联系电话" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="dz" label="地址" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="wlfs" align="center" label="物流方式"></el-table-column>
+        <el-table-column prop="wldh" align="center" label="物流单号" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="ddbh" align="center" label="订单编号" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="ddsl" align="center" label="订单数量" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="cjry" align="center" label="创建人员" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="bz" align="center" label="备注" show-overflow-tooltip></el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+    <!-- 选择负责人-->
+    <!-- <dialogChooseSingleUser
+      :visible.sync="chooseUserVisible"
+      @change="getUser"
+    ></dialogChooseSingleUser> -->
+    <!-- <chooseSbjh :visible.sync="chooseSbjhVisible" /> -->
+    <dialog-import-file
+      v-if="showUserImportDialog"
+      :visible.sync="showUserImportDialog"
+      title="售后管理批量导入"
+      source="wlps"
+      :upload-data="{ type: 'user' }"
+      @success="handleUserImportSuccess"
+      @close="showUserImportDialog = false"
+    />
+  </div>
+</template>
+
+<script>
+
+import { formatDateTime } from "@/utils/tools.js";
+import DialogImportFile from '@/components/Dialog/dialogImportFile.vue';
+// import btnInput from "@/components/btnInput.vue";
+// import chooseSbjh from "./components/chooseSbjh.vue";
+// import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+let api = {
+  page: "/apis/mdh/wlps/pageList",
+  del: "/apis/mdh/wlps/del",
+  edit: "/apis/mdh/wlps/edit"
+};
+export default {
+  name: "wlps",
+  components: {
+    DialogImportFile
+    // btnInput
+    // dialogChooseSingleUser
+    // chooseSbjh
+  },
+  data() {
+    return {
+      showUserImportDialog:false,
+      ztList: [
+        {
+          name: "未开始",
+          id: 1
+        },
+        {
+          name: "对应中",
+          id: 2
+        },
+        {
+          name: "已完成",
+          id: 3
+        }
+      ],
+      qyList: [],
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10
+      },
+
+      planTime: "",
+
+      statusList: [], //计划状态
+      getUserList: [], //用户
+
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      chooseUserVisible: false,
+      chooseSbjhVisible: false,
+      rowIds: [],
+      tableData: [],
+      dialogVisible: false,
+      pictLoading: false,
+      qyList: [],
+      jllxList: [],
+      dywzList: []
+    };
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search();
+      }
+    };
+  },
+  mounted() {
+    //let user = JSON.parse(sessionStorage.getItem("userInfo"));
+    //console.log(user);
+    //this.search_data.engineerId = user.userId;
+    this.getList();
+    // this.initData();
+  },
+  methods: {
+    handleUserImportSuccess(response, file, fileList) {
+      this.getList()
+    },
+    importFile(){
+      this.showUserImportDialog = true
+    },
+    async reback() {
+      if (this.rowIds.length > 0) {
+        let r = this.rowIds[0];
+        let pass = r.zt == 3 ? true : false;
+        if (pass) {
+          const params = {
+            id: r.id,
+            zt: 2,
+            zczt: 0
+          };
+          const res = await this.$api.yxkAPI.yxkPost(api.edit, params);
+          if (res.code == 0) {
+            this.$message({
+              message: "撤回成功",
+              type: "success"
+            });
+            this.getList();
+          }
+        } else {
+          this.$message({
+            message: "非已提交状态不能撤回",
+            type: "warning"
+          });
+          return false;
+        }
+      } else {
+        this.$message({
+          message: "请选择一条数据",
+          type: "warning"
+        });
+        return false;
+      }
+    },
+    /**
+     * 获取选择的负责人
+     */
+    getUser(val) {
+      if (val) {
+        this.$set(this.search_data, "engineerName", val.name);
+        this.$set(this.search_data, "engineerId", val.id);
+      } else {
+        this.$set(this.search_data, "engineerName", "");
+        this.$set(this.search_data, "engineerId", "");
+      }
+    },
+    sortChange({ column, prop, order }) {
+      let j = { column, prop, order };
+      let order_ = j.order == "ascending" ? "asc" : "desc";
+      this.$set(this.search_data, "sort", j.prop);
+      this.$set(this.search_data, "order", order_);
+      this.getList();
+    },
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+    initData() {
+      Promise.all([
+        this.$api.dictAPI.getDictsByType("qy"),
+        this.$api.dictAPI.getDictsByType("jllx"),
+        this.$api.dictAPI.getDictsByType("dywz")
+      ])
+        .then(([r1, r2, r3]) => {
+          if (r1.code === 0) {
+            this.qyList = r1.datas;
+          }
+          if (r2.code == 0) {
+            this.jllxList = r2.datas;
+          }
+          if (r3.code == 0) {
+            this.dywzList = r3.datas;
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    /**
+     * 获取列表
+     */
+    getList() {
+      this.pictLoading = true;
+      if (this.planTime) {
+        this.search_data.startTime = formatDateTime(this.planTime[0]);
+        this.search_data.endTime = formatDateTime(this.planTime[1]);
+      } else {
+        this.search_data.startTime = null;
+        this.search_data.endTime = null;
+      }
+      this.$api.yxkAPI
+        .yxkPost(api.page, this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.data) {
+            this.total = res.data.total;
+            let result = res.data.records;
+            this.tableData = result;
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    /**
+     * 新增
+     */
+    add() {
+      this.$router.push({
+        path: "/khgxgl/wlps-add",
+        query: {
+          t: Date.now()
+        }
+      });
+    },
+    /**查看明细 */
+    viewDetail(r) {
+      if (r.zt == 2) {
+        this.$router.push({
+          path: "/khgxgl/wlps-add",
+          query: { id: r.id, t: Date.now() }
+        });
+      } else {
+        this.$router.push({
+          path: "/khgxgl/wlps-add",
+          query: { id: r.id, t: Date.now() }
+        });
+      }
+    },
+
+    /**
+     * 保养执行
+     */
+    execution() {
+      // let id = this.rowIds[0].reventId;
+      // this.$router.push({
+      //   path: "/upkeep/record",
+      //   query: { id: id }
+      // });
+    },
+    /**
+     * 删除
+     */
+    remove() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认删除选中的数据吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.yxkAPI
+          .yxkPost(api.del, ids)
+          .then(res => {
+            console.log(res);
+            if (res.code == 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 启用
+     */
+    startUsing() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认启用选中的保养计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.upkeepPlanAPI
+          .startUsing({ ids: ids })
+          .then(res => {
+            console.log(res);
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "启用失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "启用失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 禁用
+     */
+    forbidden() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认禁用选中的保养计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.upkeepPlanAPI
+          .forbidden({ ids: ids })
+          .then(res => {
+            console.log(res);
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "禁用失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "禁用失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    }
+  }
+};
+</script>
+
+<style scoped></style>
diff --git a/src/pages/khgxgl/xqgl/index.vue b/src/pages/khgxgl/xqgl/index.vue
index 03f6ae5..27feb22 100644
--- a/src/pages/khgxgl/xqgl/index.vue
+++ b/src/pages/khgxgl/xqgl/index.vue
@@ -1,529 +1,549 @@
-<template>
-  <!-- 保养计划列表页 -->
-  <div class="sys-box knowledge-box">
-    <div class="sys-operate">
-      <el-button type="primary" v-has="'upkeep:plan:add'" @click="add()">新增</el-button>
-      <el-button type="primary" v-has="'upkeep:plan:remove'" @click="remove()" :disabled="btnDelDisabled">删除</el-button>
-      <!-- <el-button
-        type="primary"
-        v-has="'upkeep:plan:remove'"
-        @click="reback()"
-        :disabled="btnDelDisabled"
-        >撤回</el-button
-      > -->
-      <!-- <el-button
-        type="primary"
-        v-has="'upkeep:plan:startUsing'"
-        @click="startUsing()"
-        :disabled="btnDelDisabled"
-        >启用</el-button
-      >
-      <el-button
-        type="primary"
-        v-has="'upkeep:plan:forbidden'"
-        @click="forbidden()"
-        :disabled="btnDelDisabled"
-        >禁用</el-button
-      > -->
-      <!-- <el-button type="primary" @click="execution()" :disabled="btnOtherDisabled">保养执行</el-button> -->
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class="form_item_input_out">
-          <el-form-item label="需求单号" style="width:22%" class="form_item-inline">
-            <el-input v-model="search_data.xqdh" placeholder="需求单号"></el-input>
-          </el-form-item>
-          <!-- <el-form-item
-            label="规格型号"
-            style="width:22%"
-            class="form_item-inline"
-          >
-            <el-input
-              v-model="search_data.xh"
-              placeholder="规格型号"
-            ></el-input>
-          </el-form-item> -->
-          <!-- <el-form-item label="区域" style="width:22%" class="form_item-inline">
-            <el-select
-              v-model="search_data.qyid"
-              filterable
-              clearable
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in qyList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            label="记录类型"
-            style="width:22%"
-            class="form_item-inline"
-          >
-            <el-select
-              v-model="search_data.jllxid"
-              filterable
-              clearable
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in jllxList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item> -->
-          <!-- <btn-input
-              :valueText.sync="search_data.engineerName"
-              :valueId.sync="search_data.engineerId"
-              :chooseVisible.sync="chooseUserVisible"
-            ></btn-input>
-          </el-form-item> -->
-          <el-form-item label="状态" style="width:22%" class="form_item-inline">
-            <el-select v-model="search_data.ztid" clearable placeholder="请选择">
-              <el-option v-for="item in ztList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="操作时间" style="width:34%" class="form_item-inline">
-            <el-date-picker v-model="planTime" type="daterange" range-separator="-" start-placeholder="开始日期"
-              end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class="form_item_btn_out">
-          <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table border @sort-change="sortChange" v-loading="pictLoading" @row-click="clickRow" ref="tb"
-        :data="tableData" @selection-change="handleSelectionChange" :header-cell-style="{
-          fontWeight: 'normal',
-          textAlign: 'center',
-          backgroundColor: '#eceff4',
-          color: '#222'
-        }">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column prop="xqdh" align="center" width="200" label="需求单号" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <el-link type="primary" @click="viewDetail(scope.row)">{{
-              scope.row.xqdh
-            }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="xqrq" label="需求日期" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="sjdh" label="设计单号" align="center" width="220" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="zt" align="center" label="状态" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{
-              scope.row.zt == 1
-                ? "未开始"
-                : scope.row.zt == 2
-                  ? "对应中"
-                  : scope.row.zt == 3
-                    ? "已完成"
-                    : "--"
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="khmc" align="center" label="客户名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="wlyq" align="center" label="物料要求" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="slyq" label="数量要求" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="ggyq" align="center" label="规格要求"></el-table-column>
-        <el-table-column prop="jsyq" align="center" label="技术要求" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="xqfhrq" align="center" label="需求发货日期" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="fhdz" align="center" label="发货地址" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="jlry" align="center" label="记录人员" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="bz" align="center" label="备注" show-overflow-tooltip></el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-    <!-- 选择负责人-->
-    <!-- <dialogChooseSingleUser
-      :visible.sync="chooseUserVisible"
-      @change="getUser"
-    ></dialogChooseSingleUser> -->
-    <!-- <chooseSbjh :visible.sync="chooseSbjhVisible" /> -->
-  </div>
-</template>
-
-<script>
-import { formatDateTime } from "@/utils/tools.js";
-// import btnInput from "@/components/btnInput.vue";
-// import chooseSbjh from "./components/chooseSbjh.vue";
-// import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-let api = {
-  page: "/apis/mdh/xqgl/pageList",
-  del: "/apis/mdh/xqgl/del",
-  edit: "/apis/mdh/xqgl/edit"
-};
-export default {
-  name: "xqgl",
-  components: {
-    // btnInput
-    // dialogChooseSingleUser
-    // chooseSbjh
-  },
-  data() {
-    return {
-      ztList: [
-        {
-          name: "未开始",
-          id: 1
-        },
-        {
-          name: "对应中",
-          id: 2
-        },
-        {
-          name: "已完成",
-          id: 3
-        }
-      ],
-      qyList: [],
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10
-      },
-
-      planTime: "",
-
-      statusList: [], //计划状态
-      getUserList: [], //用户
-
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      chooseUserVisible: false,
-      chooseSbjhVisible: false,
-      rowIds: [],
-      tableData: [],
-      dialogVisible: false,
-      pictLoading: false,
-      qyList: [],
-      jllxList: [],
-      dywzList: []
-    };
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search();
-      }
-    };
-  },
-  mounted() {
-    //let user = JSON.parse(sessionStorage.getItem("userInfo"));
-    //console.log(user);
-    //this.search_data.engineerId = user.userId;
-    this.getList();
-    // this.initData();
-  },
-  methods: {
-    async reback() {
-      if (this.rowIds.length > 0) {
-        let r = this.rowIds[0];
-        let pass = r.zt == 3 ? true : false;
-        if (pass) {
-          const params = {
-            id: r.id,
-            zt: 2,
-            zczt: 0
-          };
-          const res = await this.$api.yxkAPI.yxkPost(api.edit, params);
-          if (res.code == 0) {
-            this.$message({
-              message: "撤回成功",
-              type: "success"
-            });
-            this.getList();
-          }
-        } else {
-          this.$message({
-            message: "非已提交状态不能撤回",
-            type: "warning"
-          });
-          return false;
-        }
-      } else {
-        this.$message({
-          message: "请选择一条数据",
-          type: "warning"
-        });
-        return false;
-      }
-    },
-    /**
-     * 获取选择的负责人
-     */
-    getUser(val) {
-      if (val) {
-        this.$set(this.search_data, "engineerName", val.name);
-        this.$set(this.search_data, "engineerId", val.id);
-      } else {
-        this.$set(this.search_data, "engineerName", "");
-        this.$set(this.search_data, "engineerId", "");
-      }
-    },
-    sortChange({ column, prop, order }) {
-      let j = { column, prop, order };
-      let order_ = j.order == "ascending" ? "asc" : "desc";
-      this.$set(this.search_data, "sort", j.prop);
-      this.$set(this.search_data, "order", order_);
-      this.getList();
-    },
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-    initData() {
-      Promise.all([
-        this.$api.dictAPI.getDictsByType("qy"),
-        this.$api.dictAPI.getDictsByType("jllx"),
-        this.$api.dictAPI.getDictsByType("dywz")
-      ])
-        .then(([r1, r2, r3]) => {
-          if (r1.code === 0) {
-            this.qyList = r1.datas;
-          }
-          if (r2.code == 0) {
-            this.jllxList = r2.datas;
-          }
-          if (r3.code == 0) {
-            this.dywzList = r3.datas;
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    /**
-     * 获取列表
-     */
-    getList() {
-      this.pictLoading = true;
-      if (this.planTime) {
-        this.search_data.startTime = formatDateTime(this.planTime[0]);
-        this.search_data.endTime = formatDateTime(this.planTime[1]);
-      } else {
-        this.search_data.startTime = null;
-        this.search_data.endTime = null;
-      }
-      this.$api.yxkAPI
-        .yxkPost(api.page, this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.data) {
-            this.total = res.data.total;
-            let result = res.data.records;
-            this.tableData = result;
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    /**
-     * 新增
-     */
-    add() {
-      this.$router.push({
-        path: "/khgxgl/xqgl-add",
-        query: {
-          t: Date.now()
-        }
-      });
-    },
-    /**查看明细 */
-    viewDetail(r) {
-      if (r.zt == 2) {
-        this.$router.push({
-          path: "/khgxgl/xqgl-add",
-          query: { id: r.id, t: Date.now() }
-        });
-      } else {
-        this.$router.push({
-          path: "/khgxgl/xqgl-detail",
-          query: { id: r.id, t: Date.now() }
-        });
-      }
-    },
-
-    /**
-     * 保养执行
-     */
-    execution() {
-      // let id = this.rowIds[0].reventId;
-      // this.$router.push({
-      //   path: "/upkeep/record",
-      //   query: { id: id }
-      // });
-    },
-    /**
-     * 删除
-     */
-    remove() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认删除选中的数据吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.yxkAPI
-          .yxkPost(api.del, ids)
-          .then(res => {
-            console.log(res);
-            if (res.code == 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 启用
-     */
-    startUsing() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认启用选中的保养计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.upkeepPlanAPI
-          .startUsing({ ids: ids })
-          .then(res => {
-            console.log(res);
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "启用失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "启用失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 禁用
-     */
-    forbidden() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认禁用选中的保养计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.upkeepPlanAPI
-          .forbidden({ ids: ids })
-          .then(res => {
-            console.log(res);
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "禁用失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "禁用失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    }
-  }
-};
-</script>
-
-<style scoped></style>
+<template>
+  <!-- 保养计划列表页 -->
+  <div class="sys-box knowledge-box">
+    <div class="sys-operate">
+      <el-button type="primary" v-has="'upkeep:plan:add'" @click="add()">新增</el-button>
+      <el-button type="primary" v-has="'upkeep:plan:remove'" @click="remove()" :disabled="btnDelDisabled">删除</el-button>
+      <el-button type="primary" v-has="'upkeep:plan:import:xqgl'" @click="importFile()" >导入</el-button>
+      <!-- <el-button
+        type="primary"
+        v-has="'upkeep:plan:remove'"
+        @click="reback()"
+        :disabled="btnDelDisabled"
+        >撤回</el-button
+      > -->
+      <!-- <el-button
+        type="primary"
+        v-has="'upkeep:plan:startUsing'"
+        @click="startUsing()"
+        :disabled="btnDelDisabled"
+        >启用</el-button
+      >
+      <el-button
+        type="primary"
+        v-has="'upkeep:plan:forbidden'"
+        @click="forbidden()"
+        :disabled="btnDelDisabled"
+        >禁用</el-button
+      > -->
+      <!-- <el-button type="primary" @click="execution()" :disabled="btnOtherDisabled">保养执行</el-button> -->
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class="form_item_input_out">
+          <el-form-item label="需求单号" style="width:22%" class="form_item-inline">
+            <el-input v-model="search_data.xqdh" placeholder="需求单号"></el-input>
+          </el-form-item>
+          <!-- <el-form-item
+            label="规格型号"
+            style="width:22%"
+            class="form_item-inline"
+          >
+            <el-input
+              v-model="search_data.xh"
+              placeholder="规格型号"
+            ></el-input>
+          </el-form-item> -->
+          <!-- <el-form-item label="区域" style="width:22%" class="form_item-inline">
+            <el-select
+              v-model="search_data.qyid"
+              filterable
+              clearable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in qyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="记录类型"
+            style="width:22%"
+            class="form_item-inline"
+          >
+            <el-select
+              v-model="search_data.jllxid"
+              filterable
+              clearable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in jllxList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item> -->
+          <!-- <btn-input
+              :valueText.sync="search_data.engineerName"
+              :valueId.sync="search_data.engineerId"
+              :chooseVisible.sync="chooseUserVisible"
+            ></btn-input>
+          </el-form-item> -->
+          <el-form-item label="状态" style="width:22%" class="form_item-inline">
+            <el-select v-model="search_data.ztid" clearable placeholder="请选择">
+              <el-option v-for="item in ztList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="操作时间" style="width:34%" class="form_item-inline">
+            <el-date-picker v-model="planTime" type="daterange" range-separator="-" start-placeholder="开始日期"
+              end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class="form_item_btn_out">
+          <el-form-item>
+            <el-button type="primary" @click="search()">查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table border @sort-change="sortChange" v-loading="pictLoading" @row-click="clickRow" ref="tb"
+        :data="tableData" @selection-change="handleSelectionChange" :header-cell-style="{
+          fontWeight: 'normal',
+          textAlign: 'center',
+          backgroundColor: '#eceff4',
+          color: '#222'
+        }">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="xqdh" align="center" width="200" label="需求单号" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-link type="primary" @click="viewDetail(scope.row)">{{
+              scope.row.xqdh
+            }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="xqrq" label="需求日期" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="sjdh" label="设计单号" align="center" width="220" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="zt" align="center" label="状态" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{
+              scope.row.zt == 1
+                ? "未开始"
+                : scope.row.zt == 2
+                  ? "对应中"
+                  : scope.row.zt == 3
+                    ? "已完成"
+                    : "--"
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="khmc" align="center" label="客户名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="wlyq" align="center" label="物料要求" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="slyq" label="数量要求" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="ggyq" align="center" label="规格要求"></el-table-column>
+        <el-table-column prop="jsyq" align="center" label="技术要求" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="xqfhrq" align="center" label="需求发货日期" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="fhdz" align="center" label="发货地址" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="jlry" align="center" label="记录人员" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="bz" align="center" label="备注" show-overflow-tooltip></el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+    <!-- 选择负责人-->
+    <!-- <dialogChooseSingleUser
+      :visible.sync="chooseUserVisible"
+      @change="getUser"
+    ></dialogChooseSingleUser> -->
+    <!-- <chooseSbjh :visible.sync="chooseSbjhVisible" /> -->
+    <dialog-import-file
+      v-if="showUserImportDialog"
+      :visible.sync="showUserImportDialog"
+      title="需求管理批量导入"
+      source="xqgl"
+      :upload-data="{ type: 'user' }"
+      @success="handleUserImportSuccess"
+      @close="showUserImportDialog = false"
+    />
+  </div>
+</template>
+
+<script>
+import { formatDateTime } from "@/utils/tools.js";
+import DialogImportFile from '@/components/Dialog/dialogImportFile.vue';
+
+// import btnInput from "@/components/btnInput.vue";
+// import chooseSbjh from "./components/chooseSbjh.vue";
+// import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+let api = {
+  page: "/apis/mdh/xqgl/pageList",
+  del: "/apis/mdh/xqgl/del",
+  edit: "/apis/mdh/xqgl/edit"
+};
+export default {
+  name: "xqgl",
+  components: {
+    DialogImportFile
+    // btnInput
+    // dialogChooseSingleUser
+    // chooseSbjh
+  },
+  data() {
+    return {
+      showUserImportDialog:false,
+      ztList: [
+        {
+          name: "未开始",
+          id: 1
+        },
+        {
+          name: "对应中",
+          id: 2
+        },
+        {
+          name: "已完成",
+          id: 3
+        }
+      ],
+      qyList: [],
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10
+      },
+
+      planTime: "",
+
+      statusList: [], //计划状态
+      getUserList: [], //用户
+
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      chooseUserVisible: false,
+      chooseSbjhVisible: false,
+      rowIds: [],
+      tableData: [],
+      dialogVisible: false,
+      pictLoading: false,
+      qyList: [],
+      jllxList: [],
+      dywzList: []
+    };
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search();
+      }
+    };
+  },
+  mounted() {
+    //let user = JSON.parse(sessionStorage.getItem("userInfo"));
+    //console.log(user);
+    //this.search_data.engineerId = user.userId;
+    this.getList();
+    // this.initData();
+  },
+  methods: {
+    handleUserImportSuccess(response, file, fileList) {
+      this.getList()
+    },
+    importFile(){
+      this.showUserImportDialog = true
+    },
+    async reback() {
+      if (this.rowIds.length > 0) {
+        let r = this.rowIds[0];
+        let pass = r.zt == 3 ? true : false;
+        if (pass) {
+          const params = {
+            id: r.id,
+            zt: 2,
+            zczt: 0
+          };
+          const res = await this.$api.yxkAPI.yxkPost(api.edit, params);
+          if (res.code == 0) {
+            this.$message({
+              message: "撤回成功",
+              type: "success"
+            });
+            this.getList();
+          }
+        } else {
+          this.$message({
+            message: "非已提交状态不能撤回",
+            type: "warning"
+          });
+          return false;
+        }
+      } else {
+        this.$message({
+          message: "请选择一条数据",
+          type: "warning"
+        });
+        return false;
+      }
+    },
+    /**
+     * 获取选择的负责人
+     */
+    getUser(val) {
+      if (val) {
+        this.$set(this.search_data, "engineerName", val.name);
+        this.$set(this.search_data, "engineerId", val.id);
+      } else {
+        this.$set(this.search_data, "engineerName", "");
+        this.$set(this.search_data, "engineerId", "");
+      }
+    },
+    sortChange({ column, prop, order }) {
+      let j = { column, prop, order };
+      let order_ = j.order == "ascending" ? "asc" : "desc";
+      this.$set(this.search_data, "sort", j.prop);
+      this.$set(this.search_data, "order", order_);
+      this.getList();
+    },
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+    initData() {
+      Promise.all([
+        this.$api.dictAPI.getDictsByType("qy"),
+        this.$api.dictAPI.getDictsByType("jllx"),
+        this.$api.dictAPI.getDictsByType("dywz")
+      ])
+        .then(([r1, r2, r3]) => {
+          if (r1.code === 0) {
+            this.qyList = r1.datas;
+          }
+          if (r2.code == 0) {
+            this.jllxList = r2.datas;
+          }
+          if (r3.code == 0) {
+            this.dywzList = r3.datas;
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    /**
+     * 获取列表
+     */
+    getList() {
+      this.pictLoading = true;
+      if (this.planTime) {
+        this.search_data.startTime = formatDateTime(this.planTime[0]);
+        this.search_data.endTime = formatDateTime(this.planTime[1]);
+      } else {
+        this.search_data.startTime = null;
+        this.search_data.endTime = null;
+      }
+      this.$api.yxkAPI
+        .yxkPost(api.page, this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.data) {
+            this.total = res.data.total;
+            let result = res.data.records;
+            this.tableData = result;
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    /**
+     * 新增
+     */
+    add() {
+      this.$router.push({
+        path: "/khgxgl/xqgl-add",
+        query: {
+          t: Date.now()
+        }
+      });
+    },
+    /**查看明细 */
+    viewDetail(r) {
+      if (r.zt == 2) {
+        this.$router.push({
+          path: "/khgxgl/xqgl-add",
+          query: { id: r.id, t: Date.now() }
+        });
+      } else {
+        this.$router.push({
+          path: "/khgxgl/xqgl-detail",
+          query: { id: r.id, t: Date.now() }
+        });
+      }
+    },
+
+    /**
+     * 保养执行
+     */
+    execution() {
+      // let id = this.rowIds[0].reventId;
+      // this.$router.push({
+      //   path: "/upkeep/record",
+      //   query: { id: id }
+      // });
+    },
+    /**
+     * 删除
+     */
+    remove() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认删除选中的数据吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.yxkAPI
+          .yxkPost(api.del, ids)
+          .then(res => {
+            console.log(res);
+            if (res.code == 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 启用
+     */
+    startUsing() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认启用选中的保养计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.upkeepPlanAPI
+          .startUsing({ ids: ids })
+          .then(res => {
+            console.log(res);
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "启用失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "启用失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 禁用
+     */
+    forbidden() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认禁用选中的保养计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.upkeepPlanAPI
+          .forbidden({ ids: ids })
+          .then(res => {
+            console.log(res);
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "禁用失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "禁用失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    }
+  }
+};
+</script>
+
+<style scoped></style>
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 23c9946..b7babd1 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -1,9 +1,8 @@
 <template>
   <div class="sys-login" style="overflow: hidden;">
     <div class="login-logo" style="display:flex;">
-      <img style="width:50px;height:50px;" src="../../assets/logo_xc.jpg" alt />
-      <h2 style="margin-left:10px;color:#fff">江西心诚药业有限公司</h2>
-      <!-- <img src="../../assets/logo1.png" alt /> -->
+      <img style="width:50px;height:50px;" :src="companyInfo.logoUrl" alt />
+      <h2 style="margin-left:10px;color:#fff">{{ companyInfo.name }}</h2>
     </div>
     <!-- <div class="login-slogan">
       赋能万物&nbsp;连接未来
@@ -48,15 +47,20 @@ export default {
         name: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
         password: [{ required: true, message: "密码不能为空", trigger: "blur" }]
       },
-      sysMsg: ""
+      sysMsg: "",
     };
   },
-  computed: {},
+  computed: {
+    ...mapState({
+      companyInfo: state => state.common.companyInfo
+    }),
+  },
   methods: {
     ...mapActions({
       login: "auth/loginByUser",
-      getNavList: "auth/getNavList"
+      getNavList: "auth/getNavList",
     }),
+
     submitForm() {
       var self = this;
       this.$refs.loginForm.validate(valid => {
diff --git a/src/pages/maintain/plan/index.vue b/src/pages/maintain/plan/index.vue
index 20a4cd1..2823345 100644
--- a/src/pages/maintain/plan/index.vue
+++ b/src/pages/maintain/plan/index.vue
@@ -1,528 +1,553 @@
-<template>
-  <!-- 保养计划列表页 -->
-  <div class="sys-box knowledge-box">
-    <div class="sys-operate">
-      <el-button type="primary" v-has="'upkeep:plan:add'" @click="add()"
-        >新增</el-button
-      >
-      <el-button
-        type="primary"
-        v-has="'upkeep:plan:remove'"
-        @click="remove()"
-        :disabled="btnDelDisabled"
-        >删除</el-button
-      >
-      <el-button
-        type="primary"
-        v-has="'upkeep:plan:startUsing'"
-        @click="startUsing()"
-        :disabled="btnDelDisabled"
-        >启用</el-button
-      >
-      <el-button
-        type="primary"
-        v-has="'upkeep:plan:forbidden'"
-        @click="forbidden()"
-        :disabled="btnDelDisabled"
-        >禁用</el-button
-      >
-      <!-- <el-button type="primary" @click="execution()" :disabled="btnOtherDisabled">保养执行</el-button> -->
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class="form_item_input_out">
-          <el-form-item
-            label="计划名称"
-            style="width:22%"
-            class="form_item-inline"
-          >
-            <el-input
-              v-model="search_data.name"
-              placeholder="计划名称"
-            ></el-input>
-          </el-form-item>
-          <el-form-item
-            label="负责人"
-            style="width:22%"
-            class="form_item-inline"
-          >
-            <el-select
-              v-model="search_data.engineerId"
-              filterable
-              clearable
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in getUserList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.userId"
-              ></el-option>
-            </el-select>
-            <!-- <btn-input
-              :valueText.sync="search_data.engineerName"
-              :valueId.sync="search_data.engineerId"
-              :chooseVisible.sync="chooseUserVisible"
-            ></btn-input> -->
-          </el-form-item>
-          <el-form-item
-            label="计划时间"
-            style="width:34%"
-            class="form_item-inline"
-          >
-            <el-date-picker
-              v-model="planTime"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item
-            label="计划状态"
-            style="width:22%"
-            class="form_item-inline"
-          >
-            <el-select
-              v-model="search_data.status"
-              clearable
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in statusList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class="form_item_btn_out">
-          <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table
-        border
-        @sort-change="sortChange"
-        v-loading="pictLoading"
-        @row-click="clickRow"
-        ref="tb"
-        :data="tableData"
-        @selection-change="handleSelectionChange"
-        :header-cell-style="{
-          fontWeight: 'normal',
-          textAlign: 'center',
-          backgroundColor: '#eceff4',
-          color: '#222'
-        }"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="work_orderNo"
-          align="center"
-          width="160"
-          label="计划单号"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <el-link type="primary" @click="viewDetail(scope.row)">{{
-              scope.row.work_orderNo
-            }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="name"
-          label="保养计划名称"
-          align="center"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          sortable="custom"
-          prop="startTime"
-          align="center"
-          label="计划开始时间"
-          width="124"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          sortable="custom"
-          prop="endTime"
-          align="center"
-          label="计划结束时间"
-          width="124"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          prop="deviceName"
-          align="center"
-          label="设备名称"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          prop="model"
-          align="center"
-          label="规格型号"
-          show-overflow-tooltip
-        ></el-table-column>
-        <!-- <el-table-column prop="" align="center" label="保养项目" show-overflow-tooltip></el-table-column>
-        <el-table-column prop align="center" label="保养方法" show-overflow-tooltip></el-table-column>-->
-        <!-- <el-table-column prop="realityEndTime" align="center" width="114" label="实际结束时间" show-overflow-tooltip></el-table-column> -->
-        <el-table-column
-          prop="man_hour"
-          align="center"
-          label="保养工时（小时）"
-        ></el-table-column>
-        <el-table-column
-          prop="userName"
-          align="center"
-          label="保养负责人"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          sortable="custom"
-          width="110"
-          prop="status"
-          align="center"
-          label="计划状态"
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.statusName }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="search_data.pageno"
-        :page-sizes="pageSizes"
-        :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
-    </div>
-    <!-- 选择负责人-->
-    <dialogChooseSingleUser
-      :visible.sync="chooseUserVisible"
-      @change="getUser"
-    ></dialogChooseSingleUser>
-  </div>
-</template>
-
-<script>
-import { formatDateTime } from "@/utils/tools.js";
-import btnInput from "@/components/btnInput.vue";
-import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-export default {
-  name: "upkeep_plan",
-  components: {
-    btnInput,
-    dialogChooseSingleUser
-  },
-  data() {
-    return {
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10
-      },
-
-      planTime: "",
-
-      statusList: [], //计划状态
-      getUserList: [], //用户
-
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      chooseUserVisible: false,
-      rowIds: [],
-      tableData: [],
-      dialogVisible: false,
-      pictLoading: false
-    };
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search();
-      }
-    };
-  },
-  mounted() {
-    //let user = JSON.parse(sessionStorage.getItem("userInfo"));
-    //console.log(user);
-    //this.search_data.engineerId = user.userId;
-    this.getList();
-    this.initData();
-  },
-  methods: {
-    /**
-     * 获取选择的负责人
-     */
-    getUser(val) {
-      if (val) {
-        this.$set(this.search_data, "engineerName", val.name);
-        this.$set(this.search_data, "engineerId", val.id);
-      } else {
-        this.$set(this.search_data, "engineerName", "");
-        this.$set(this.search_data, "engineerId", "");
-      }
-    },
-    sortChange({ column, prop, order }) {
-      let j = { column, prop, order };
-      let order_ = j.order == "ascending" ? "asc" : "desc";
-      this.$set(this.search_data, "sort", j.prop);
-      this.$set(this.search_data, "order", order_);
-      this.getList();
-    },
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-    initData() {
-      Promise.all([
-        // this.$api.commonAPI.getUsers(),
-        this.$api.yxkAPI.yxkGet("/apis/patrolRecord/engineerList"),
-        this.$api.dictAPI.getDictsByType("plan_status")
-      ])
-        .then(([r1, r2]) => {
-          if (r1.code === 0) {
-            this.getUserList = r1.data;
-          }
-          if (r2.code === 0) {
-            this.statusList = r2.datas;
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    /**
-     * 获取列表
-     */
-    getList() {
-      if (this.planTime) {
-        this.search_data.start_time = formatDateTime(this.planTime[0]);
-        this.search_data.end_time = formatDateTime(this.planTime[1]);
-      } else {
-        this.search_data.start_time = "";
-        this.search_data.end_time = "";
-      }
-      this.pictLoading = true;
-      this.$api.upkeepPlanAPI
-        .planListForUser(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.data) {
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    /**
-     * 新增
-     */
-    add() {
-      this.$router.push({
-        path: "/upkeep/plan_add",
-        query: {
-          t: Date.now()
-        }
-      });
-    },
-    /**查看明细 */
-    viewDetail(r) {
-      if (r.status === 146) {
-        this.$router.push({
-          path: "/upkeep/plan_add",
-          query: { id: r.id, t: Date.now() }
-        });
-      } else {
-        this.$router.push({
-          path: "/upkeep/plan_detail",
-          query: { id: r.id, t: Date.now() }
-        });
-      }
-    },
-
-    /**
-     * 保养执行
-     */
-    execution() {
-      // let id = this.rowIds[0].reventId;
-      // this.$router.push({
-      //   path: "/upkeep/record",
-      //   query: { id: id }
-      // });
-    },
-    /**
-     * 删除
-     */
-    remove() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认删除选中的保养计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.upkeepPlanAPI
-          .deletLargeUpPlan(ids)
-          .then(res => {
-            console.log(res);
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 启用
-     */
-    startUsing() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认启用选中的保养计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.upkeepPlanAPI
-          .startUsing({ ids: ids })
-          .then(res => {
-            console.log(res);
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "启用失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "启用失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 禁用
-     */
-    forbidden() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认禁用选中的保养计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.upkeepPlanAPI
-          .forbidden({ ids: ids })
-          .then(res => {
-            console.log(res);
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "禁用失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "禁用失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    }
-  }
-};
-</script>
-
-<style scoped></style>
+<template>
+  <!-- 保养计划列表页 -->
+  <div class="sys-box knowledge-box">
+    <div class="sys-operate">
+      <el-button type="primary" v-has="'upkeep:plan:add'" @click="add()"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        v-has="'upkeep:plan:remove'"
+        @click="remove()"
+        :disabled="btnDelDisabled"
+        >删除</el-button
+      >
+      <el-button
+        type="primary"
+        v-has="'upkeep:plan:startUsing'"
+        @click="startUsing()"
+        :disabled="btnDelDisabled"
+        >启用</el-button
+      >
+      <el-button
+        type="primary"
+        v-has="'upkeep:plan:forbidden'"
+        @click="forbidden()"
+        :disabled="btnDelDisabled"
+        >禁用</el-button
+      >
+      <el-button
+        type="primary"
+        v-has="'upkeep:plan:import:maintain'"
+        @click="importFile()"
+        >导入</el-button
+      >
+      <!-- <el-button type="primary" @click="execution()" :disabled="btnOtherDisabled">保养执行</el-button> -->
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class="form_item_input_out">
+          <el-form-item
+            label="计划名称"
+            style="width:22%"
+            class="form_item-inline"
+          >
+            <el-input
+              v-model="search_data.name"
+              placeholder="计划名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="负责人"
+            style="width:22%"
+            class="form_item-inline"
+          >
+            <el-select
+              v-model="search_data.engineerId"
+              filterable
+              clearable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in getUserList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.userId"
+              ></el-option>
+            </el-select>
+            <!-- <btn-input
+              :valueText.sync="search_data.engineerName"
+              :valueId.sync="search_data.engineerId"
+              :chooseVisible.sync="chooseUserVisible"
+            ></btn-input> -->
+          </el-form-item>
+          <el-form-item
+            label="计划时间"
+            style="width:34%"
+            class="form_item-inline"
+          >
+            <el-date-picker
+              v-model="planTime"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item
+            label="计划状态"
+            style="width:22%"
+            class="form_item-inline"
+          >
+            <el-select
+              v-model="search_data.status"
+              clearable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in statusList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="form_item_btn_out">
+          <el-form-item>
+            <el-button type="primary" @click="search()">查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table
+        border
+        @sort-change="sortChange"
+        v-loading="pictLoading"
+        @row-click="clickRow"
+        ref="tb"
+        :data="tableData"
+        @selection-change="handleSelectionChange"
+        :header-cell-style="{
+          fontWeight: 'normal',
+          textAlign: 'center',
+          backgroundColor: '#eceff4',
+          color: '#222'
+        }"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="work_orderNo"
+          align="center"
+          width="160"
+          label="计划单号"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-link type="primary" @click="viewDetail(scope.row)">{{
+              scope.row.work_orderNo
+            }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="保养计划名称"
+          align="center"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          sortable="custom"
+          prop="startTime"
+          align="center"
+          label="计划开始时间"
+          width="124"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          sortable="custom"
+          prop="endTime"
+          align="center"
+          label="计划结束时间"
+          width="124"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="deviceName"
+          align="center"
+          label="设备名称"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="model"
+          align="center"
+          label="规格型号"
+          show-overflow-tooltip
+        ></el-table-column>
+        <!-- <el-table-column prop="" align="center" label="保养项目" show-overflow-tooltip></el-table-column>
+        <el-table-column prop align="center" label="保养方法" show-overflow-tooltip></el-table-column>-->
+        <!-- <el-table-column prop="realityEndTime" align="center" width="114" label="实际结束时间" show-overflow-tooltip></el-table-column> -->
+        <el-table-column
+          prop="man_hour"
+          align="center"
+          label="保养工时（小时）"
+        ></el-table-column>
+        <el-table-column
+          prop="userName"
+          align="center"
+          label="保养负责人"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          sortable="custom"
+          width="110"
+          prop="status"
+          align="center"
+          label="计划状态"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.statusName }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="search_data.pageno"
+        :page-sizes="pageSizes"
+        :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+    <!-- 选择负责人-->
+    <dialogChooseSingleUser
+      :visible.sync="chooseUserVisible"
+      @change="getUser"
+    ></dialogChooseSingleUser>
+    <dialog-import-file
+      v-if="showUserImportDialog"
+      :visible.sync="showUserImportDialog"
+      title="保养计划批量导入"
+      source="upkeep"
+      :upload-data="{ type: 'user' }"
+      @success="handleUserImportSuccess"
+      @close="showUserImportDialog = false"
+    />
+  </div>
+</template>
+
+<script>
+import { formatDateTime } from "@/utils/tools.js";
+import btnInput from "@/components/btnInput.vue";
+import DialogImportFile from '@/components/Dialog/dialogImportFile.vue';
+
+import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+export default {
+  name: "upkeep_plan",
+  components: {
+    btnInput,
+    DialogImportFile,
+    dialogChooseSingleUser
+  },
+  data() {
+    return {
+      showUserImportDialog:false,
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10
+      },
+
+      planTime: "",
+
+      statusList: [], //计划状态
+      getUserList: [], //用户
+
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      chooseUserVisible: false,
+      rowIds: [],
+      tableData: [],
+      dialogVisible: false,
+      pictLoading: false
+    };
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search();
+      }
+    };
+  },
+  mounted() {
+    //let user = JSON.parse(sessionStorage.getItem("userInfo"));
+    //console.log(user);
+    //this.search_data.engineerId = user.userId;
+    this.getList();
+    this.initData();
+  },
+  methods: {
+    handleUserImportSuccess(response, file, fileList) {
+      this.getList()
+    },
+    importFile(){
+      this.showUserImportDialog = true
+    },
+    /**
+     * 获取选择的负责人
+     */
+    getUser(val) {
+      if (val) {
+        this.$set(this.search_data, "engineerName", val.name);
+        this.$set(this.search_data, "engineerId", val.id);
+      } else {
+        this.$set(this.search_data, "engineerName", "");
+        this.$set(this.search_data, "engineerId", "");
+      }
+    },
+    sortChange({ column, prop, order }) {
+      let j = { column, prop, order };
+      let order_ = j.order == "ascending" ? "asc" : "desc";
+      this.$set(this.search_data, "sort", j.prop);
+      this.$set(this.search_data, "order", order_);
+      this.getList();
+    },
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+    initData() {
+      Promise.all([
+        // this.$api.commonAPI.getUsers(),
+        this.$api.yxkAPI.yxkGet("/apis/patrolRecord/engineerList"),
+        this.$api.dictAPI.getDictsByType("plan_status")
+      ])
+        .then(([r1, r2]) => {
+          if (r1.code === 0) {
+            this.getUserList = r1.data;
+          }
+          if (r2.code === 0) {
+            this.statusList = r2.datas;
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    /**
+     * 获取列表
+     */
+    getList() {
+      if (this.planTime) {
+        this.search_data.start_time = formatDateTime(this.planTime[0]);
+        this.search_data.end_time = formatDateTime(this.planTime[1]);
+      } else {
+        this.search_data.start_time = "";
+        this.search_data.end_time = "";
+      }
+      this.pictLoading = true;
+      this.$api.upkeepPlanAPI
+        .planListForUser(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.data) {
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    /**
+     * 新增
+     */
+    add() {
+      this.$router.push({
+        path: "/upkeep/plan_add",
+        query: {
+          t: Date.now()
+        }
+      });
+    },
+    /**查看明细 */
+    viewDetail(r) {
+      if (r.status === 146) {
+        this.$router.push({
+          path: "/upkeep/plan_add",
+          query: { id: r.id, t: Date.now() }
+        });
+      } else {
+        this.$router.push({
+          path: "/upkeep/plan_detail",
+          query: { id: r.id, t: Date.now() }
+        });
+      }
+    },
+
+    /**
+     * 保养执行
+     */
+    execution() {
+      // let id = this.rowIds[0].reventId;
+      // this.$router.push({
+      //   path: "/upkeep/record",
+      //   query: { id: id }
+      // });
+    },
+    /**
+     * 删除
+     */
+    remove() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认删除选中的保养计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.upkeepPlanAPI
+          .deletLargeUpPlan(ids)
+          .then(res => {
+            console.log(res);
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 启用
+     */
+    startUsing() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认启用选中的保养计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.upkeepPlanAPI
+          .startUsing({ ids: ids })
+          .then(res => {
+            console.log(res);
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "启用失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "启用失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 禁用
+     */
+    forbidden() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认禁用选中的保养计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.upkeepPlanAPI
+          .forbidden({ ids: ids })
+          .then(res => {
+            console.log(res);
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "禁用失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "禁用失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    }
+  }
+};
+</script>
+
+<style scoped></style>
diff --git a/src/pages/management/company.vue b/src/pages/management/company.vue
index 0e8ed9f..ba1e259 100644
--- a/src/pages/management/company.vue
+++ b/src/pages/management/company.vue
@@ -1,547 +1,551 @@
-<template>
-  <div class="sys-box company-box">
-    <div class="sys-operate">
-      <el-button
-        type="primary"
-        v-has="'management:company:save'"
-        @click="save('form')"
-        :disabled="isDisabled"
-        >保存</el-button
-      >
-    </div>
-    <div class="sys-form">
-      <el-form
-        v-loading="loading"
-        label-width="110px"
-        :model="formData"
-        ref="form"
-        :rules="ruleForm"
-      >
-        <div class="flex">
-          <el-form-item label="公司名称" prop="name" class="form-inline">
-            <el-input
-              v-model="formData.name"
-              placeholder="请输入公司名称"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="所在地区" class="form-inline">
-            <div class="flex2">
-              <el-select
-                v-model="formData.province"
-                filterable
-                placeholder="请选择省"
-                @change="changeProvince"
-              >
-                <el-option
-                  v-for="item in provinceList"
-                  :key="item.cityId"
-                  :label="item.shortName"
-                  :value="item.cityId"
-                ></el-option>
-              </el-select>
-              <el-select
-                v-model="formData.city"
-                filterable
-                placeholder="请选择市"
-                @change="changeCity"
-              >
-                <el-option
-                  v-for="item in cityList"
-                  :key="item.cityId"
-                  :label="item.shortName"
-                  :value="item.cityId"
-                ></el-option>
-              </el-select>
-              <el-select
-                v-model="formData.district"
-                filterable
-                placeholder="请选择区/县"
-                @change="changeOrigin"
-              >
-                <el-option
-                  v-for="item in originList"
-                  :key="item.cityId"
-                  :label="item.shortName"
-                  :value="item.cityId"
-                ></el-option>
-              </el-select>
-            </div>
-          </el-form-item>
-          <el-form-item label="详细地址" prop="address" class="form-inline">
-            <el-input
-              v-model="formData.address"
-              placeholder="请输入详细地址"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="邮编" class="form-inline">
-            <el-input
-              v-model="formData.zipCode"
-              placeholder="请输入邮编"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话" class="form-inline">
-            <el-input
-              v-model="formData.telephone"
-              placeholder="请输入联系电话"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="传真" class="form-inline">
-            <el-input
-              v-model="formData.fax"
-              placeholder="请输入传真"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="联系人" prop="linkman" class="form-inline">
-            <el-input
-              v-model="formData.linkman"
-              placeholder="请输入联系人"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="职务" class="form-inline">
-            <el-input
-              v-model="formData.job"
-              placeholder="请输入职务"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="手机" class="form-inline">
-            <el-input
-              v-model="formData.mobile"
-              placeholder="请输入手机"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="QQ" class="form-inline">
-            <el-input v-model="formData.qq" placeholder="请输入QQ"></el-input>
-          </el-form-item>
-          <el-form-item label="Email" class="form-inline">
-            <el-input
-              v-model="formData.email"
-              placeholder="请输入Email"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="公司网址" class="form-inline">
-            <el-input
-              v-model="formData.url"
-              placeholder="请输入公司网址"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="公司总人数" class="form-inline">
-            <el-input
-              v-model="formData.gszrs"
-              placeholder="公司总人数"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="监控总数" class="form-inline">
-            <el-input v-model="formData.jkzs" placeholder="监控总数"></el-input>
-          </el-form-item>
-        </div>
-        <div class="flex">
-          <el-form-item
-            :label="formData.logoUrl ? '更换logo(建议尺寸:40x40)' : 'logo'"
-            class="form-inline"
-          >
-            <el-upload
-              class="avatar-uploader"
-              :action="uploadUrl"
-              accept="image/png,image/jpg,image/jpeg"
-              :show-file-list="false"
-              :on-success="uploadSuccess"
-            >
-              <!-- :before-upload="before" -->
-              <img
-                v-if="formData.logoUrl"
-                :src="ftpPrefix + formData.logoUrl"
-                class="avatar"
-              />
-              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-            </el-upload>
-          </el-form-item>
-        </div>
-        <el-form-item label="公司照片">
-          <yxkUpload v-model="formData.zp" :img="formData.zp" />
-        </el-form-item>
-        <el-form-item label="公司介绍">
-          <el-input
-            type="textarea"
-            v-model="formData.companyIntroduction"
-            placeholder="请输入公司介绍"
-            :autosize="{ minRows: 4 }"
-          ></el-input>
-        </el-form-item>
-        <div class="flex">
-          <el-form-item label="服务开始日期" class="form-inline">
-            <el-input
-              v-model="formData.serviceStartTime"
-              placeholder="服务开始日期"
-              readonly
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="服务结束日期" class="form-inline">
-            <el-input
-              v-model="formData.serviceEndTime"
-              placeholder="服务结束日期"
-              readonly
-            ></el-input>
-          </el-form-item>
-        </div>
-        <el-form-item label="服务注册码">
-          <el-input
-            v-model="formData.serviceCode"
-            type="textarea"
-            placeholder="服务注册码"
-            readonly
-          ></el-input>
-        </el-form-item>
-        <div class="flex">
-          <el-form-item label="产品编号" class="form-inline">
-            <el-input
-              v-model="formData.code"
-              placeholder="请输入产品编号"
-              :disabled="formData.code"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="产品版本号" class="form-inline">
-            <el-input
-              v-model="formData.version"
-              placeholder="请输入产品版本号"
-              :disabled="formData.version"
-            ></el-input>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-  </div>
-</template>
-
-<script>
-import yxkUpload from "@/components/yxkUpload/index.vue";
-import { mapState, mapActions, mapGetters, mapMutations } from "vuex";
-import base from "@/api/base";
-import { imageConversion } from "@/utils/conversion.js";
-
-export default {
-  components: {
-    yxkUpload
-  },
-  data() {
-    return {
-      formData: {
-        province: null,
-        city: null,
-        district: null,
-        companyIntroduction: ""
-      },
-      fullscreenLoading: false,
-      auto_upload: false,
-      uploadUrl: base.uploadUrl,
-      ftpPrefix: base.ftpPrefix,
-      uploadAttachment: [],
-      provinceList: [], // 省列表
-      cityList: [], // 市列表
-      originList: [], // 区列表
-      valueProvince: "", // 所选的省
-      valueCity: "", // 所选的市
-      valueOrigin: "", // 所选的区
-      cityOptions: [], // 市下拉框数据
-      originOptions: [], // 区下拉框数据
-      ruleForm: {
-        name: [{ required: true, message: "请输入公司名称", trigger: "blur" }],
-        linkman: [{ required: true, message: "请输入联系人", trigger: "blur" }],
-        address: [
-          { required: true, message: "请输入详细地址", trigger: "blur" }
-        ]
-      },
-      deptList: [],
-      roleList: [],
-      initFileList: [],
-      isDisabled: false,
-      loading: false
-    };
-  },
-  mounted() {
-    this.initialize();
-    this.getDetail();
-  },
-  methods: {
-    ...mapMutations({
-      removeTagNav: "tagNav/removeTagNav"
-    }),
-    /**
-     * 初始化数据
-     */
-    initialize() {
-      this.$api.commonAPI.areaList({ cityId: 100000 }).then(res => {
-        if (res.code === 0) {
-          this.provinceList = res.data;
-        }
-      });
-    },
-    getDetail() {
-      this.loading = true;
-      this.$api.companyAPI.detail().then(res => {
-        this.loading = false;
-        if (res.code == 0) {
-          console.log(res);
-          this.formData = Object.assign({}, this.formData, res.result);
-
-          this.formData.province = res.result.provinceId;
-          this.$set(
-            this.formData,
-            "zipCode",
-            res.result.zipCode ? res.result.zipCode : ""
-          );
-          this.changeProvince(res.result.provinceId);
-          this.formData.city = res.result.cityId;
-          this.changeCity(res.result.cityId);
-          this.formData.district = res.result.districtId;
-          this.formData.companyIntroduction = res.result.companyIntroduction;
-          this.formData.logoUrl = res.result.logoUrl;
-          let file = {
-            fileName: "logo",
-            filePath: this.formData.logoUrl
-          };
-          this.uploadAttachment.push(file);
-        }
-      });
-    },
-    /**
-     * 取消方法
-     */
-    back() {
-      this.removeTagNav({
-        path: this.$route.path,
-        title: this.$route.meta.name
-      });
-      this.$router.push({ path: "/management/user" });
-    },
-    /**
-     * 保存
-     */
-    save(form) {
-      this.$refs[form].validate(valid => {
-        if (valid) {
-          if (this.isDisabled) {
-            return;
-          }
-          this.isDisabled = true;
-          this.$api.companyAPI.update(this.formData).then(res => {
-            this.isDisabled = false;
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-            } else {
-              this.$message({
-                message: res.msg,
-                type: "error"
-              });
-            }
-          });
-        } else {
-          return false;
-        }
-      });
-    },
-    // 选择省
-    changeProvince(val) {
-      this.$forceUpdate();
-      this.formData.city = null;
-      this.formData.district = null;
-      this.$api.commonAPI.areaList({ cityId: val }).then(res => {
-        if (res.code === 0) {
-          this.cityList = res.data;
-        }
-      });
-    },
-    // 选择市
-    changeCity(val) {
-      this.$forceUpdate();
-      this.formData.district = null;
-      this.$api.commonAPI.areaList({ cityId: val }).then(res => {
-        if (res.code === 0) {
-          this.originList = res.data;
-        }
-      });
-    },
-    // 选择区
-    changeOrigin(val) {
-      this.$forceUpdate();
-    },
-    /**
-     * 上传成功
-     */
-    uploadSuccess(res, file) {
-      console.log(3);
-      if (res.msg === "操作成功") {
-        this.formData.logoUrl = res.filePath;
-        let file = {
-          fileName: "logo",
-          filePath: this.formData.logoUrl
-        };
-        this.uploadAttachment.push(file);
-      }
-    },
-    /**
-     * 删除图片
-     */
-    handleRemove(file, fileList) {
-      if (file.raw) {
-        this.formData.taglocationappearanceImage.splice(
-          this.formData.taglocationappearanceImage.indexOf(file.raw.filePath),
-          1
-        );
-      } else {
-        let index = this.formData.taglocationappearanceImage.indexOf(
-          file.url.substr(1)
-        );
-        this.formData.taglocationappearanceImage.splice(index, 1);
-      }
-    },
-    before(file) {
-      const isSize = new Promise(function(resolve, reject) {
-        let width = 220;
-        let height = 45;
-        let _URL = window.URL || window.webkitURL;
-        let img = new Image();
-        img.onload = function() {
-          let valid = img.width == width && img.height == height;
-          valid ? resolve() : reject();
-        };
-        img.src = _URL.createObjectURL(file);
-      }).then(
-        () => {
-          return file;
-        },
-        () => {
-          this.$message({
-            message: "logo尺寸只能是220*45px!请重新选择!",
-            type: "warning"
-          });
-          return Promise.reject();
-          return false; //必须加上return false; 才能阻止
-        }
-      );
-      return isSize;
-    },
-    //压缩并上传图片
-    httpRequest(upload, name) {
-      let _this = this;
-      var xmlhttp = new XMLHttpRequest();
-      xmlhttp.onreadystatechange = function() {
-        if (xmlhttp.readyState == 4) {
-          if (xmlhttp.status == 200) {
-            _this.fullscreenLoading = false;
-            var data = eval("(" + xmlhttp.responseText + ")");
-            if (data.code == 0) {
-              //上传成功
-              upload.filePath = data.filePath;
-              _this.formData.logoUrl = data.filePath;
-            } else {
-              //上传失败
-              _this.$message.error("上传失败");
-              _this.$refs.upload.uploadFiles.splice(
-                _this.$refs.upload.uploadFiles.length - 1,
-                1
-              );
-            }
-          } else {
-            _this.fullscreenLoading = false;
-            _this.$message.error("上传失败");
-            _this.$refs.upload.uploadFiles.splice(
-              _this.$refs.upload.uploadFiles.length - 1,
-              1
-            );
-          }
-        }
-      };
-      var tempFormData = new FormData();
-      tempFormData.append("file", upload, name); //上传blob对象
-
-      xmlhttp.open("POST", this.uploadUrl, true); //imageUploadUrl图片上传地址
-      xmlhttp.send(tempFormData);
-    },
-    onChange(file, fileList) {
-      file = file.raw;
-      if (!/image\/\w+/.test(file.type)) {
-        //非图片
-        this.$message({
-          message: "只能上传图片",
-          type: "warning"
-        });
-        this.$refs.upload.uploadFiles.splice(
-          this.$refs.upload.uploadFiles.length - 1,
-          1
-        );
-        return false;
-      } else {
-        this.fullscreenLoading = true;
-        let _this = this;
-        imageConversion.compressAccurately(file, 400).then(res => {
-          if (res.size) {
-            //压缩成功
-            _this.httpRequest(res, file.name);
-          } else {
-            _this.$message.error("压缩图片失败");
-            _this.fullscreenLoading = false;
-            _this.$refs.upload.uploadFiles.splice(
-              _this.$refs.upload.uploadFiles.length - 1,
-              1
-            );
-          }
-        });
-      }
-    }
-  }
-};
-</script>
-
-<style scoped>
-.flex {
-  display: flex;
-  justify-content: space-between;
-  flex-wrap: wrap;
-}
-.flex2 {
-  display: flex;
-  justify-content: space-between;
-}
-.form-inline {
-  width: 50%;
-}
-
-.sys-form .form-inline .el-input {
-  width: 100%;
-}
-.avatar-uploader .el-upload {
-  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: 184px;
-  height: 60px;
-  line-height: 60px;
-  text-align: center;
-}
-.avatar {
-  background-color: #f0f0f0;
-  width: 184px;
-  height: 60px;
-  display: block;
-}
-</style>
-<style>
-.company-box .el-select {
-  width: 33%;
-}
-.company-box .sys-form .form-inline .el-select .el-input {
-  width: 100%;
-}
-</style>
+<template>
+  <div class="sys-box company-box">
+    <div class="sys-operate">
+      <el-button
+        type="primary"
+        v-has="'management:company:save'"
+        @click="save('form')"
+        :disabled="isDisabled"
+        >保存</el-button
+      >
+    </div>
+    <div class="sys-form">
+      <el-form
+        v-loading="loading"
+        label-width="110px"
+        :model="formData"
+        ref="form"
+        :rules="ruleForm"
+      >
+        <div class="flex">
+          <el-form-item label="公司名称" prop="name" class="form-inline">
+            <el-input
+              v-model="formData.name"
+              placeholder="请输入公司名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="所在地区" class="form-inline">
+            <div class="flex2">
+              <el-select
+                v-model="formData.province"
+                filterable
+                placeholder="请选择省"
+                @change="changeProvince"
+              >
+                <el-option
+                  v-for="item in provinceList"
+                  :key="item.cityId"
+                  :label="item.shortName"
+                  :value="item.cityId"
+                ></el-option>
+              </el-select>
+              <el-select
+                v-model="formData.city"
+                filterable
+                placeholder="请选择市"
+                @change="changeCity"
+              >
+                <el-option
+                  v-for="item in cityList"
+                  :key="item.cityId"
+                  :label="item.shortName"
+                  :value="item.cityId"
+                ></el-option>
+              </el-select>
+              <el-select
+                v-model="formData.district"
+                filterable
+                placeholder="请选择区/县"
+                @change="changeOrigin"
+              >
+                <el-option
+                  v-for="item in originList"
+                  :key="item.cityId"
+                  :label="item.shortName"
+                  :value="item.cityId"
+                ></el-option>
+              </el-select>
+            </div>
+          </el-form-item>
+          <el-form-item label="详细地址" prop="address" class="form-inline">
+            <el-input
+              v-model="formData.address"
+              placeholder="请输入详细地址"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="邮编" class="form-inline">
+            <el-input
+              v-model="formData.zipCode"
+              placeholder="请输入邮编"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="联系电话" class="form-inline">
+            <el-input
+              v-model="formData.telephone"
+              placeholder="请输入联系电话"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="传真" class="form-inline">
+            <el-input
+              v-model="formData.fax"
+              placeholder="请输入传真"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="联系人" prop="linkman" class="form-inline">
+            <el-input
+              v-model="formData.linkman"
+              placeholder="请输入联系人"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="职务" class="form-inline">
+            <el-input
+              v-model="formData.job"
+              placeholder="请输入职务"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="手机" class="form-inline">
+            <el-input
+              v-model="formData.mobile"
+              placeholder="请输入手机"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="QQ" class="form-inline">
+            <el-input v-model="formData.qq" placeholder="请输入QQ"></el-input>
+          </el-form-item>
+          <el-form-item label="Email" class="form-inline">
+            <el-input
+              v-model="formData.email"
+              placeholder="请输入Email"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="公司网址" class="form-inline">
+            <el-input
+              v-model="formData.url"
+              placeholder="请输入公司网址"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="公司总人数" class="form-inline">
+            <el-input
+              v-model="formData.gszrs"
+              placeholder="公司总人数"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="监控总数" class="form-inline">
+            <el-input v-model="formData.jkzs" placeholder="监控总数"></el-input>
+          </el-form-item>
+          <el-form-item label="数字化大屏名称" class="form-inline">
+            <el-input v-model="formData.screenName" placeholder="数字化大屏名称"></el-input>
+          </el-form-item>
+        </div>
+        <div class="flex">
+          <el-form-item
+            :label="formData.logoUrl ? '更换logo(建议尺寸:40x40)' : 'logo'"
+            class="form-inline"
+          >
+            <el-upload
+              class="avatar-uploader"
+              :action="uploadUrl"
+              accept="image/png,image/jpg,image/jpeg"
+              :show-file-list="false"
+              :on-success="uploadSuccess"
+            >
+              <!-- :before-upload="before" -->
+              <img
+                v-if="formData.logoUrl"
+                :src="ftpPrefix + formData.logoUrl"
+                class="avatar"
+              />
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </el-form-item>
+        </div>
+        <el-form-item label="公司照片">
+          <yxkUpload v-model="formData.zp" :img="formData.zp" />
+        </el-form-item>
+        <el-form-item label="公司介绍">
+          <el-input
+            type="textarea"
+            v-model="formData.companyIntroduction"
+            placeholder="请输入公司介绍"
+            :autosize="{ minRows: 4 }"
+          ></el-input>
+        </el-form-item>
+        <div class="flex">
+          <el-form-item label="服务开始日期" class="form-inline">
+            <el-input
+              v-model="formData.serviceStartTime"
+              placeholder="服务开始日期"
+              readonly
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="服务结束日期" class="form-inline">
+            <el-input
+              v-model="formData.serviceEndTime"
+              placeholder="服务结束日期"
+              readonly
+            ></el-input>
+          </el-form-item>
+        </div>
+        <el-form-item label="服务注册码">
+          <el-input
+            v-model="formData.serviceCode"
+            type="textarea"
+            placeholder="服务注册码"
+            readonly
+          ></el-input>
+        </el-form-item>
+        <div class="flex">
+          <el-form-item label="产品编号" class="form-inline">
+            <el-input
+              v-model="formData.code"
+              placeholder="请输入产品编号"
+              :disabled="formData.code"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="产品版本号" class="form-inline">
+            <el-input
+              v-model="formData.version"
+              placeholder="请输入产品版本号"
+              :disabled="formData.version"
+            ></el-input>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import yxkUpload from "@/components/yxkUpload/index.vue";
+import { mapState, mapActions, mapGetters, mapMutations } from "vuex";
+import base from "@/api/base";
+import { imageConversion } from "@/utils/conversion.js";
+
+export default {
+  components: {
+    yxkUpload
+  },
+  data() {
+    return {
+      formData: {
+        province: null,
+        city: null,
+        district: null,
+        companyIntroduction: ""
+      },
+      fullscreenLoading: false,
+      auto_upload: false,
+      uploadUrl: base.uploadUrl,
+      ftpPrefix: base.ftpPrefix,
+      screenName:"",
+      uploadAttachment: [],
+      provinceList: [], // 省列表
+      cityList: [], // 市列表
+      originList: [], // 区列表
+      valueProvince: "", // 所选的省
+      valueCity: "", // 所选的市
+      valueOrigin: "", // 所选的区
+      cityOptions: [], // 市下拉框数据
+      originOptions: [], // 区下拉框数据
+      ruleForm: {
+        name: [{ required: true, message: "请输入公司名称", trigger: "blur" }],
+        linkman: [{ required: true, message: "请输入联系人", trigger: "blur" }],
+        address: [
+          { required: true, message: "请输入详细地址", trigger: "blur" }
+        ]
+      },
+      deptList: [],
+      roleList: [],
+      initFileList: [],
+      isDisabled: false,
+      loading: false
+    };
+  },
+  mounted() {
+    this.initialize();
+    this.getDetail();
+  },
+  methods: {
+    ...mapMutations({
+      removeTagNav: "tagNav/removeTagNav"
+    }),
+    /**
+     * 初始化数据
+     */
+    initialize() {
+      this.$api.commonAPI.areaList({ cityId: 100000 }).then(res => {
+        if (res.code === 0) {
+          this.provinceList = res.data;
+        }
+      });
+    },
+    getDetail() {
+      this.loading = true;
+      this.$api.companyAPI.detail().then(res => {
+        this.loading = false;
+        if (res.code == 0) {
+          console.log(res);
+          this.formData = Object.assign({}, this.formData, res.result);
+
+          this.formData.province = res.result.provinceId;
+          this.$set(
+            this.formData,
+            "zipCode",
+            res.result.zipCode ? res.result.zipCode : ""
+          );
+          this.changeProvince(res.result.provinceId);
+          this.formData.city = res.result.cityId;
+          this.changeCity(res.result.cityId);
+          this.formData.district = res.result.districtId;
+          this.formData.companyIntroduction = res.result.companyIntroduction;
+          this.formData.logoUrl = res.result.logoUrl;
+          let file = {
+            fileName: "logo",
+            filePath: this.formData.logoUrl
+          };
+          this.uploadAttachment.push(file);
+        }
+      });
+    },
+    /**
+     * 取消方法
+     */
+    back() {
+      this.removeTagNav({
+        path: this.$route.path,
+        title: this.$route.meta.name
+      });
+      this.$router.push({ path: "/management/user" });
+    },
+    /**
+     * 保存
+     */
+    save(form) {
+      this.$refs[form].validate(valid => {
+        if (valid) {
+          if (this.isDisabled) {
+            return;
+          }
+          this.isDisabled = true;
+          this.$api.companyAPI.update(this.formData).then(res => {
+            this.isDisabled = false;
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "error"
+              });
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+    // 选择省
+    changeProvince(val) {
+      this.$forceUpdate();
+      this.formData.city = null;
+      this.formData.district = null;
+      this.$api.commonAPI.areaList({ cityId: val }).then(res => {
+        if (res.code === 0) {
+          this.cityList = res.data;
+        }
+      });
+    },
+    // 选择市
+    changeCity(val) {
+      this.$forceUpdate();
+      this.formData.district = null;
+      this.$api.commonAPI.areaList({ cityId: val }).then(res => {
+        if (res.code === 0) {
+          this.originList = res.data;
+        }
+      });
+    },
+    // 选择区
+    changeOrigin(val) {
+      this.$forceUpdate();
+    },
+    /**
+     * 上传成功
+     */
+    uploadSuccess(res, file) {
+      console.log(3);
+      if (res.msg === "操作成功") {
+        this.formData.logoUrl = res.filePath;
+        let file = {
+          fileName: "logo",
+          filePath: this.formData.logoUrl
+        };
+        this.uploadAttachment.push(file);
+      }
+    },
+    /**
+     * 删除图片
+     */
+    handleRemove(file, fileList) {
+      if (file.raw) {
+        this.formData.taglocationappearanceImage.splice(
+          this.formData.taglocationappearanceImage.indexOf(file.raw.filePath),
+          1
+        );
+      } else {
+        let index = this.formData.taglocationappearanceImage.indexOf(
+          file.url.substr(1)
+        );
+        this.formData.taglocationappearanceImage.splice(index, 1);
+      }
+    },
+    before(file) {
+      const isSize = new Promise(function(resolve, reject) {
+        let width = 220;
+        let height = 45;
+        let _URL = window.URL || window.webkitURL;
+        let img = new Image();
+        img.onload = function() {
+          let valid = img.width == width && img.height == height;
+          valid ? resolve() : reject();
+        };
+        img.src = _URL.createObjectURL(file);
+      }).then(
+        () => {
+          return file;
+        },
+        () => {
+          this.$message({
+            message: "logo尺寸只能是220*45px!请重新选择!",
+            type: "warning"
+          });
+          return Promise.reject();
+          return false; //必须加上return false; 才能阻止
+        }
+      );
+      return isSize;
+    },
+    //压缩并上传图片
+    httpRequest(upload, name) {
+      let _this = this;
+      var xmlhttp = new XMLHttpRequest();
+      xmlhttp.onreadystatechange = function() {
+        if (xmlhttp.readyState == 4) {
+          if (xmlhttp.status == 200) {
+            _this.fullscreenLoading = false;
+            var data = eval("(" + xmlhttp.responseText + ")");
+            if (data.code == 0) {
+              //上传成功
+              upload.filePath = data.filePath;
+              _this.formData.logoUrl = data.filePath;
+            } else {
+              //上传失败
+              _this.$message.error("上传失败");
+              _this.$refs.upload.uploadFiles.splice(
+                _this.$refs.upload.uploadFiles.length - 1,
+                1
+              );
+            }
+          } else {
+            _this.fullscreenLoading = false;
+            _this.$message.error("上传失败");
+            _this.$refs.upload.uploadFiles.splice(
+              _this.$refs.upload.uploadFiles.length - 1,
+              1
+            );
+          }
+        }
+      };
+      var tempFormData = new FormData();
+      tempFormData.append("file", upload, name); //上传blob对象
+
+      xmlhttp.open("POST", this.uploadUrl, true); //imageUploadUrl图片上传地址
+      xmlhttp.send(tempFormData);
+    },
+    onChange(file, fileList) {
+      file = file.raw;
+      if (!/image\/\w+/.test(file.type)) {
+        //非图片
+        this.$message({
+          message: "只能上传图片",
+          type: "warning"
+        });
+        this.$refs.upload.uploadFiles.splice(
+          this.$refs.upload.uploadFiles.length - 1,
+          1
+        );
+        return false;
+      } else {
+        this.fullscreenLoading = true;
+        let _this = this;
+        imageConversion.compressAccurately(file, 400).then(res => {
+          if (res.size) {
+            //压缩成功
+            _this.httpRequest(res, file.name);
+          } else {
+            _this.$message.error("压缩图片失败");
+            _this.fullscreenLoading = false;
+            _this.$refs.upload.uploadFiles.splice(
+              _this.$refs.upload.uploadFiles.length - 1,
+              1
+            );
+          }
+        });
+      }
+    }
+  }
+};
+</script>
+
+<style scoped>
+.flex {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+.flex2 {
+  display: flex;
+  justify-content: space-between;
+}
+.form-inline {
+  width: 50%;
+}
+
+.sys-form .form-inline .el-input {
+  width: 100%;
+}
+.avatar-uploader .el-upload {
+  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: 184px;
+  height: 60px;
+  line-height: 60px;
+  text-align: center;
+}
+.avatar {
+  background-color: #f0f0f0;
+  width: 184px;
+  height: 60px;
+  display: block;
+}
+</style>
+<style>
+.company-box .el-select {
+  width: 33%;
+}
+.company-box .sys-form .form-inline .el-select .el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/pages/management/customer/index.vue b/src/pages/management/customer/index.vue
index bef5d19..3667e06 100644
--- a/src/pages/management/customer/index.vue
+++ b/src/pages/management/customer/index.vue
@@ -1,999 +1,999 @@
-<template>
-  <div class="sys-task sys-box">
-    <div class="sys-operate" style="position:relative">
-      <el-button type="primary" style="position:absolute;top:0" @click="add()"
-        v-has="'management:customer:add'">新增</el-button>
-      <el-button type="primary" style="position:absolute;top:0;left:76px" :disabled="btnDelDisabled" @click="remove()"
-        v-has="'management:customer:delete'">删除</el-button>
-      <el-button type="primary" style="position:absolute;top:0;left:140px" @click="audit(1)" :disabled="btnDelDisabled"
-        v-has="'management:customer:audit'">批量审核</el-button>
-      <el-button type="primary" style="position:absolute;top:0;left:228px" @click="disAudit(1)"
-        :disabled="btnOtherDisabled" v-has="'management:customer:reverseAudit'">反审核</el-button>
-      <el-upload ref="upload" :action="uploadUrl" :on-success="uploadSuccess" :file-list="fileDocList" :before-remove="function () {
-        return false;
-      }
-        " :auto-upload="auto_upload" :on-change="onChange" v-loading.lock="fullscreenLoading" class="inline-block"
-        accept=".xls,.xlsx,">
-        <el-button size="small" v-has="'management:customer:upload'" type="primary"
-          style="position:absolute;top:0;left:315px">导入</el-button>
-        <!-- <div
-        slot="tip"
-        class="el-upload__tip"
-      ></div> -->
-      </el-upload>
-      <el-button type="primary" v-has="'management:customer:download'" @click="download()"
-        style="position:absolute;top:0;left:378px">下载模板</el-button>
-      <el-button type="primary" v-has="'management:customer:deletedList'" size="small"
-        style="position:absolute;top:0;left:455px" @click="deletedList">已删除</el-button>
-      <el-button type="primary" style="position:absolute;top:0;left:530px;color:#fff;background:rgb(24, 134, 254)"
-        @click="synchronous">同步CRM</el-button>
-    </div>
-    <div class="sys-search">
-      <el-form inline>
-        <el-form-item label="客户名称">
-          <el-input placeholder="请输入客户名称" v-model="search_data.name" clearable></el-input>
-        </el-form-item>
-        <el-form-item label="社会统一信用代码">
-          <el-input placeholder="社会统一信用代码（精确查询）" v-model="search_data.taxNumber" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="search()">查询</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table border v-loading="pictLoading" @row-click="clickRow" ref="tb" :data="tableData" :header-cell-style="{
-        fontWeight: 'normal',
-        textAlign: 'center',
-        backgroundColor: '#eceff4',
-        color: '#222'
-      }" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column prop="code" label="客户编号" show-overflow-tooltip align="center">
-          <template slot-scope="scope">
-            <el-link type="primary" @click.stop="openDetails(scope.row)">{{
-              scope.row.code
-            }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="client_name" align="center" label="客户名称" show-overflow-tooltip></el-table-column>
-        <!--<el-table-column prop="type_name" align="center" label="客户类型"></el-table-column>-->
-        <el-table-column prop="linkman_name" align="center" label="联系人"></el-table-column>
-        <el-table-column prop="linkman_phone" align="center" label="联系电话"></el-table-column>
-        <el-table-column prop="address" align="center" label="地址" show-overflow-tooltip></el-table-column>
-        <!--<el-table-column prop="client_desc" align="center" label="备注" show-overflow-tooltip></el-table-column>-->
-        <el-table-column prop="taxNumber" align="center" label="社会统一信用代码" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="bankName" align="center" label="开户行" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="account" align="center" label="账号" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="belongSalesmanName" align="center" label="所属业务员" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="belongDeptName" align="center" label="所属部门" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="statusName" align="center" label="审核状态" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="useStatusName" align="center" label="状态" show-overflow-tooltip></el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-
-    <el-dialog :title="dialogTitle" center :visible.sync="dialogVisible" width="900px">
-      <el-form v-loading="dialogLoading" label-width="82px" :rules="rules" :model="formData" class="company-form"
-        ref="form">
-        <div class="dialog-flex">
-          <el-form-item label="客户编码" class="form-inline" prop="code">
-            <el-input placeholder="请输入客户编码" v-model="formData.code"></el-input>
-          </el-form-item>
-          <el-form-item prop="name" label="客户名称" class="form-inline form-inline2">
-            <el-input placeholder="请输入客户名称" v-model="formData.name"></el-input>
-          </el-form-item>
-        </div>
-
-        <div class="dialog-flex">
-          <el-form-item label="联系人" class="form-inline" prop="linkerMan">
-            <el-input placeholder="请输入联系人" v-model="formData.linkerMan"></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话" class="form-inline" prop="phone">
-            <el-input placeholder="请输入联系电话" v-model="formData.phone"></el-input>
-          </el-form-item>
-          <el-form-item label="客户类型" class="form-inline" prop="type">
-            <el-select clearable placeholder="请选择" v-model="formData.type">
-              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class="dialog-flex">
-          <el-form-item label="社会统一信用代码" class="form-inline5" label-width="125" prop="taxNumber">
-            <el-input placeholder="请输入社会统一信用代码" v-model="formData.taxNumber"></el-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-flex">
-          <el-form-item label="地址" prop="address">
-            <el-input placeholder="请输入地址" v-model="formData.address"></el-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-flex">
-          <el-form-item label="开户行" class="form-inline1" prop="bank">
-            <el-input placeholder="请输入开户银行" v-model="formData.bank"></el-input>
-          </el-form-item>
-          <el-form-item label="账号" class="form-inline1" prop="account">
-            <el-input placeholder="账号" v-model="formData.account"></el-input>
-          </el-form-item>
-        </div>
-
-        <div class="dialog-flex">
-          <el-form-item label="所属业务员" class="form-inline1" prop="belongSalesmanName">
-            <btn-input :valueText.sync="formData.belongSalesmanName" :valueId.sync="formData.belongSalesman"
-              :chooseVisible.sync="chooseUserVisible"></btn-input>
-          </el-form-item>
-          <el-form-item label="所属部门" prop="belongDeptName" class="form-inline1">
-            <el-input v-model="formData.belongDeptName" readonly=""></el-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-flex">
-          <el-form-item label="收货地址" prop="harvestAddress">
-            <el-input placeholder="请输入地址" v-model="formData.harvestAddress"></el-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-flex">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item prop="useCredit" label="是否启用信用管理" label-width="100">
-                <el-radio v-model="formData.useCredit" :label="1">是</el-radio>
-                <el-radio v-model="formData.useCredit" :label="0">否</el-radio>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="payType" label="付款类型" class="radio-right">
-                <el-select clearable placeholder="请选择付款类型" v-model="formData.payType" value=""
-                  style="width: 340px !important;">
-                  <el-option v-for="item in payTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-        <div class="dialog-flex">
-          <el-form-item prop="creditLimit" label="信用额度" class="form-inline1" v-show="formData.useCredit === 1">
-            <el-input v-model="formData.creditLimit" oninput="value=value.replace(/[^0-9.]/g,'')" placeholder="请输入信用额度">
-              <span slot="suffix">/ 元</span>
-            </el-input>
-          </el-form-item>
-          <el-form-item prop="creditPeriod" label="信用期限" class="form-inline1" v-show="formData.useCredit === 1">
-            <el-input v-model="formData.creditPeriod" oninput="value=value.replace(/[^0-9.]/g,'')"
-              placeholder="请输入信用期限">
-              <span slot="suffix">/ 天</span>
-            </el-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-flex">
-          <el-form-item prop="expireInform" label="信用期限到期提醒提前期" class="form-inline7" v-show="formData.useCredit === 1"
-            label-width="100">
-            <el-input v-model="formData.expireInform" oninput="value=value.replace(/[^0-9.]/g,'')"
-              placeholder="请输入信用期限到期提醒提前期">
-              <span slot="suffix">/ 天</span>
-            </el-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-flex">
-          <el-form-item label="备注" prop="desc">
-            <el-input type="textarea" :autosize="{ minRows: 2 }" v-model="formData.desc"></el-input>
-          </el-form-item>
-        </div>
-
-        <div class="dialog-flex">
-          <el-form-item prop="createByName" label="制单人" class="form-inline">
-            <el-input v-model="formData.createByName" disabled></el-input>
-          </el-form-item>
-          <el-form-item prop="auditName" label="审核人" class="form-inline">
-            <el-input placeholder="审核人" v-model="formData.auditName" disabled></el-input>
-          </el-form-item>
-          <el-form-item label="状态" class="form-inline" prop="useStatus">
-            <el-radio v-model="formData.useStatus" :label="1">启用</el-radio>
-            <el-radio v-model="formData.useStatus" :label="0">禁用</el-radio>
-          </el-form-item>
-        </div>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogVisible = false">{{
-          config.cancelText
-        }}</el-button>
-        <el-button type="primary" @click="save('form')" v-if="
-          this.formData.status == 178 || this.formData.status == undefined
-        " v-has="'management:customer:add'" :disabled="isDisabled">保存</el-button>
-
-        <el-button type="primary" size="small" @click="audit" v-if="this.formData.status == 178"
-          v-has="'management:customer:audit'">审核</el-button>
-        <el-button type="primary" size="small" @click="disAudit" v-if="this.formData.status == 179"
-          v-has="'management:customer:reverseAudit'">反审核</el-button>
-      </span>
-    </el-dialog>
-    <!--选择用户-->
-    <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
-  </div>
-</template>
-
-<script>
-import base from "@/api/base.js"; // 导入接口域名列表
-import btnInput from "@/components/btnInput.vue";
-import config from "@/utils/config.js";
-import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-import Cookies from "js-cookie";
-export default {
-  components: {
-    btnInput,
-    DialogChooseSingleUser
-  },
-  data() {
-    const useCreditRule = (rule, value, callback) => {
-      if (this.formData.useCredit === 1) {
-        if (!value) {
-          callback(new Error("信用额度相关选项必填！"));
-        } else {
-          callback();
-        }
-      } else {
-        callback();
-      }
-    };
-    return {
-      formData: {
-        useCredit: 1, //是否启用信用管理 默认是
-        creditLimit: "", //信用额度
-        creditPeriod: "", //信用期限
-        expireInform: "", //信用期限到期提前几天通知
-        payType: "", //付款类型
-        name: "",
-        code: "",
-        phone: "",
-        belongSalesman: "",
-        belongSalesmanName: ""
-      },
-      rules: {
-        name: [{ required: true, message: "请输入客户名称", trigger: "blur" }],
-        creditLimit: [
-          {
-            required: true,
-            message: "请输入信用额度",
-            trigger: "blur",
-            validator: useCreditRule
-          }
-        ],
-        creditPeriod: [
-          {
-            required: true,
-            message: "请输入信用期限",
-            trigger: "blur",
-            validator: useCreditRule
-          }
-        ],
-        payType: [
-          {
-            required: true,
-            message: "请选择付款类型",
-            trigger: "blur",
-            validator: useCreditRule
-          }
-        ],
-        expireInform: [
-          {
-            required: true,
-            message: "请输入信用期限到期提醒提前期",
-            trigger: "blur",
-            validator: useCreditRule
-          }
-        ]
-        //   linkerMan: [
-        //   { required: true, message: "请输入联系人", trigger: "blur" }
-        // ],
-        // phone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
-        // type: [
-        //   { required: true, message: "请选择客户类型", trigger: "change" }
-        // ],
-        // address: [{ required: true, message: "请输入地址", trigger: "blur" }],
-
-        // useStatus: [{ required: true, message: "请选择状态", trigger: "blur" }]
-      },
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10
-      },
-      options: [],
-      payTypeList: [], //付款类型列表
-      bankOptions: [],
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      rowIds: [],
-      tableData: [],
-      dialogVisible: false,
-      isDisabled: false,
-      dialogTitle: "新增",
-      loading: false,
-      isUpdate: false,
-      // options: [],
-      getUserList: [],
-      selectDeptId: [],
-      depOptions: [],
-      pictLoading: false,
-      dialogLoading: false,
-      chooseUserVisible: false,
-      chooseID: "", //编辑的id
-      config: config,
-      uploadAttachment: [],
-      fileDocList: [],
-      uploadUrl: base.uploadUrl,
-      ftpPrefix: base.ftpPrefix,
-      fullscreenLoading: false,
-      auto_upload: false
-    };
-  },
-  mounted() {
-    let user = Cookies.get("userName");
-    this.formData.createByName = user;
-    // this.initData();
-    this.getList();
-  },
-  // watch: {
-  //   formData: {
-  //     handler(newVal, oldVal) {
-  //       console.log(newVal,1111);
-  //       if(!newVal.belongSalesman) {
-  //         this.formData.belongDeptName = ''
-  //         this.formData.belongDeptId = ''
-  //       }
-  //     },
-  //     deep: true
-  //   },
-  // },
-  methods: {
-    synchronous() {
-      this.$api.yxkAPI.yxkGet("/apis/clients/sync").then(res => {
-        if (res.code == 200) {
-          this.$confirm("数据同步成功,请确认", {
-            type: "warning"
-          }).then(() => {
-            this.getList();
-          });
-        }
-      });
-    },
-    // 下载模板
-    download() {
-      let obj = {
-        filePath: "/gyhl-file/template/client-template.xlsx",
-        fileName: "客户模板.xlsx"
-      };
-      this.$api.commonAPI.downLoad(obj).then(res => {
-        if (res.status == 200) {
-          window.open(res.request.responseURL);
-          this.$message({
-            message: "下载成功",
-            type: "success"
-          });
-        } else {
-          this.$message({
-            message: "下载失败",
-            type: "error"
-          });
-        }
-      });
-    },
-
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-    // 已删除
-    deletedList() {
-      this.$router.push({
-        path: "/management/customer_deletedList",
-        query: { t: Date.now() }
-      });
-    },
-    // initData() {
-    //   Promise.all(
-    //     [
-    //       this.$api.dictAPI.getDictsByType("client_type"),
-    //       this.$api.commonAPI.getDeptsTree(),
-    //       this.$api.dictAPI.getDictsByType("bank"),
-    //       this.$api.dictAPI.getDictsByType("type_of_payment"),
-    //     ].map(p => p.catch(e => e))
-    //   ).then(
-    //     ([r1,r2,r3,r4]) => {
-    //       if (r1.code === 0) {
-    //         this.options = r1.datas;
-    //       }
-    //       if (r2.code === 0) {
-    //         this.depOptions=r2.data.children;
-    //         this.setDeptList(this.depOptions);
-    //         this.setDefaultDept()
-    //       }
-    //       if (r3.code === 0) {
-    //         this.bankOptions = r3.datas;
-    //         // this.$set(this.formData,'bank',r3.datas.length>=1?r3.datas[r3.datas.length-1]:'')
-    //
-    //       }
-    //       if (r4.code === 0) {
-    //         if (r4.datas) {
-    //           this.payTypeList = r4.datas.filter(item => item.name === '不赊账' || item.name === '赊账');
-    //         }
-    //
-    //       }
-    //     }
-    //   )
-    //     .catch(error => {
-    //       console.log(error);
-    //     });
-    // },
-    /**
-     *获取列表
-     */
-    getList() {
-      this.pictLoading = true;
-      this.$api.cliensAPI
-        .listServiceGroup(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.data) {
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    /**
-     * 新增往来单位
-     */
-    add() {
-      // this.isUpdate = false;
-      // this.dialogVisible = true;
-      // this.chooseID = "";
-      // this.formData = {};
-      // this.formData.createByName = Cookies.get("userName");
-      // this.formData.useStatus = 1;
-      // this.formData.useCredit = 1;
-      // // this.getClientCode();
-      // this.dialogTitle = "新增客户信息";
-      //   this.$refs["form"].resetFields();
-      //   this.formData.useCredit = 1;
-
-      this.$router.push({
-        path: "/management/customer_add",
-        query: {
-          report_url: this.$route.path,
-          t: Date.now()
-        }
-      });
-    },
-
-    /**
-     *查看明细
-     */
-    openDetails(r) {
-      // this.dialogVisible = true;
-      // this.chooseID = r.id;
-      // if (this.$refs["form"] !== undefined) {
-      //   this.$refs["form"].resetFields();
-      // }
-      // this.getDetail();
-      // this.dialogTitle = "编辑客户信息";
-      this.$router.push({
-        path: "/management/customer_add",
-        query: {
-          report_url: this.$route.path,
-          id: r.id,
-          t: Date.now()
-        }
-      });
-    },
-    /**
-     * 获取明细
-     */
-    // getDetail() {
-    //   this.dialogLoading = true;
-    //     this.formData={};//先清空
-    //   this.$api.cliensAPI
-    //     .detalsOneClien(this.chooseID)
-    //     .then(res => {
-    //       this.dialogLoading = false;
-    //       if (res.data) {
-    //           this.formData=Object.assign({}, this.formData, res.data)
-    //           this.$set(this.formData,'name',res.data.client_name)
-    //           this.$set(this.formData,'linkerMan',res.data.linkman_name)
-    //           this.$set(this.formData,'phone',res.data.linkman_phone)
-    //           this.$set(this.formData,'type',res.data.type_id)
-    //           this.$set(this.formData,'desc',res.data.client_desc?res.data.client_desc:"");
-    //           //信用相关赋值
-    //         this.$set(this.formData,'useCredit',res.data.useCredit?res.data.useCredit:0);
-    //         this.$set(this.formData,'creditLimit',res.data.creditLimit?res.data.creditLimit:"");
-    //         this.$set(this.formData,'creditPeriod',res.data.creditPeriod?res.data.creditPeriod:"");
-    //         this.$set(this.formData,'expireInform',res.data.expireInform?res.data.expireInform:"");
-    //         this.$set(this.formData,'payType',res.data.payType?res.data.payType:"");
-    //
-    //         this.isUpdate = true;
-    //       } else {
-    //         this.dialogVisible = false;
-    //         this.$alert("获取客户明细失败", "提示", { type: "warning" });
-    //       }
-    //     })
-    //     .catch(r => {
-    //       console.log(r);
-    //     });
-    // },
-    /**
-     * 保存往来单位
-     */
-    // save(form) {
-    //
-    //   this.$refs[form].validate(valid => {
-    //     if (valid) {
-    //       // this.formData.auditId = this.formData.auditId?this.formData.auditId:'';
-    //       this.formData.auditName = this.formData.auditName?this.formData.auditName:'';
-    //       this.formData.operatorName = this.formData.operatorName?this.formData.operatorName:'';
-    //       if (this.chooseID) {
-    //         this.formData.Id= this.chooseID;
-    //         if(this.isDisabled) {
-    //           return
-    //         }
-    //         this.isDisabled = true
-    //         this.$api.cliensAPI
-    //           .saveChangeDetals(this.formData)
-    //           .then(res => {
-    //             this.isDisabled = false
-    //             if (res.code === 0) {
-    //               this.$message({
-    //                 message: res.msg,
-    //                 type: "success"
-    //               });
-    //               this.dialogVisible = false;
-    //               this.getList();
-    //             } else {
-    //               this.$message({
-    //                 message: res.msg,
-    //                 type: "error"
-    //               });
-    //             }
-    //           })
-    //           .catch(r => {
-    //             this.$message({
-    //               message: res.msg,
-    //               type: "success"
-    //             });
-    //           });
-    //       } else {
-    //         if(this.isDisabled) {
-    //           return
-    //         }
-    //         this.isDisabled = true
-    //         this.$api.cliensAPI
-    //           .addServiceGroup(this.formData)
-    //           .then(res => {
-    //             this.isDisabled = false
-    //             if (res.code === 0) {
-    //               this.$message({
-    //                 message: res.msg,
-    //                 type: "success",
-    //                 duration:10000
-    //               });
-    //               this.dialogVisible = false;
-    //               this.getList();
-    //             } else {
-    //               if(res.code === 501) {
-    //                 this.$confirm(res.msg, "提示", {
-    //                   type: "warning"
-    //                 }).then(() => {
-    //                   this.dialogLoading = true;
-    //                   this.formData={};//先清空
-    //                   this.$api.cliensAPI
-    //                     .detalsOneClien(res.data.id)
-    //                     .then(res => {
-    //                       this.dialogLoading = false;
-    //                       if (res.data) {
-    //                           this.formData=Object.assign({}, this.formData, res.data)
-    //                           this.$set(this.formData,'name',res.data.client_name)
-    //                           this.$set(this.formData,'linkerMan',res.data.linkman_name)
-    //                           this.$set(this.formData,'phone',res.data.linkman_phone)
-    //                           this.$set(this.formData,'type',res.data.type_id)
-    //                           this.$set(this.formData,'desc',res.data.client_desc?res.data.client_desc:"")
-    //                         this.isUpdate = true;
-    //                         this.chooseID = this.formData.id
-    //                       } else {
-    //                         this.dialogVisible = false;
-    //                         this.$alert("获取客户明细失败", "提示", { type: "warning" });
-    //                       }
-    //                     })
-    //                     .catch(r => {
-    //                       console.log(r);
-    //                     });
-    //                 })
-    //               } else {
-    //                 this.$message({
-    //                   message: res.msg,
-    //                   type: "error"
-    //                 });
-    //               }
-    //             }
-    //           })
-    //           .catch(r => {
-    //             this.$message({
-    //               message: res.msg,
-    //               type: "success"
-    //             });
-    //           });
-    //       }
-    //     } else {
-    //       return false;
-    //     }
-    //   });
-    // },
-
-    /**
-     * 审核
-     */
-    audit(n) {
-      let ids = [];
-      let id;
-      if (n == 1) {
-        //点击列表上面的审核按钮
-        this.rowIds.forEach(item => {
-          ids.push(item.id);
-        });
-      } else {
-        //点击弹出框里面的审核按钮
-        ids.push(this.formData.id);
-      }
-      this.$api.cliensAPI.batchAudit({ ids: ids }).then(res => {
-        if (res.code === 0) {
-          this.$message({
-            message: res.msg,
-            type: "success"
-          });
-          this.dialogVisible = false;
-          this.getList();
-        } else {
-          this.$message({
-            message: res.msg,
-            type: "error"
-          });
-        }
-      });
-    },
-
-    /**
-     * 反审核
-     */
-    disAudit(n) {
-      let id;
-      if (n == 1) {
-        //点击列表上面的审核按钮
-        id = this.rowIds[0].id;
-      } else {
-        //点击弹出框里面的审核按钮
-        id = this.formData.id;
-      }
-      this.$api.cliensAPI.reverseAudit({ id: id }).then(res => {
-        if (res.code === 0) {
-          this.$message({
-            message: res.msg,
-            type: "success"
-          });
-          this.dialogVisible = false;
-          this.getList();
-        } else {
-          this.$message({
-            message: res.msg,
-            type: "error"
-          });
-        }
-      });
-    },
-
-    //
-    // //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
-    // setDeptList(tree){
-    //   for (const data of tree) {
-    //     if(!data.hasChildren){
-    //       data.children=undefined;
-    //     }else{
-    //       this.setDeptList(data.children)
-    //     }
-    //   }
-    // },
-    // //显示默认部门
-    // setDefaultDept(){
-    //   if(this.depOptions.length>0&&this.formData.deptId){
-    //     let id=JSON.stringify( this.formData.deptId)
-    //     let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
-    //     this.selectDeptId=JSON.parse(JSON.stringify(select_id))
-    //   }
-    // },
-    // //根据当前id,获取一条树枝上的所有id数据
-    // treeFindPath (tree, func, path = []) {
-    //   if (!tree) return []
-    //   for (const data of tree) {
-    //     path.push(data.id)
-    //     if (func(data)) return path
-    //     if (data.children) {
-    //       const findChildren = this.treeFindPath(data.children, func, path)
-    //       if (findChildren.length) return findChildren
-    //     }
-    //     path.pop()
-    //   }
-    //   return []
-    // },
-
-    /**
-     * 获取用户
-     */
-    // getUser(data) {
-    //   console.log(data);
-    //   var self = this;
-    //   if (data) {
-    //     this.$set(this.formData,'belongSalesmanName',data.name)
-    //     this.$set(this.formData,'belongSalesman',data.id)
-    //     // this.formData.belongSalesmanName = data.name;
-    //     // this.formData.belongSalesman = data.id;
-    //     this.formData.belongDept = data.deptId
-    //     this.formData.belongDeptName = data.deptName
-    //     // this.getUserList.forEach(item => {
-    //     //   if (data.id === item.id) {
-    //     //     self.formData.selectDeptId = item.deptId;
-    //     //     self.formData.deptId= item.deptId;
-    //     //     return;
-    //     //   }
-    //     // });
-    //     // if (self.formData.deptId == 0) {
-    //     //   self.formData.selectDeptId = "";
-    //     // }
-    //     this.setDefaultDept()
-    //   }
-    // },
-
-    // 选择部门
-    handleChange: function(value) {
-      this.$set(
-        this.formData,
-        "belongDept",
-        value.length >= 1 ? value[value.length - 1] : ""
-      );
-      this.selectDeptId = value;
-    },
-
-    /**
-     * 删除往来单位
-     */
-    remove() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      //let id = this.rowIds[0].id;
-      this.$confirm("确认删除选中的客户档案吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.cliensAPI
-          .deleteClient(ids)
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    },
-    //压缩并上传图片
-    httpRequest(upload, name, file) {
-      //file是需要压缩图片时，原图片
-      let _this = this;
-      var tempFormData = new FormData();
-      tempFormData.append("file", upload, name); //上传blob对象
-      this.$api.clientAPI.importExcel(tempFormData).then(res => {
-        _this.fullscreenLoading = false;
-        if (res.code == 0) {
-          //上传成功
-          _this.$message({
-            message: "上传成功",
-            type: "success",
-            duration: 2000
-          });
-          // upload.filePath=res.filePath;
-          if (file) {
-            file.filePath = res.filePath;
-          } else {
-            upload.filePath = res.filePath;
-          }
-          _this.uploadAttachment.push({
-            filePath: res.filePath,
-            fileName: res.fileName
-          });
-        } else {
-          //上传失败
-          _this.fullscreenLoading = false;
-          _this.$message.error(res.msg);
-          _this.$refs.upload.uploadFiles.splice(
-            _this.$refs.upload.uploadFiles.length - 1,
-            1
-          );
-        }
-      });
-    },
-
-    /**
-     * 上传成功
-     */
-    uploadSuccess(res, file) {
-      if (res.msg === "操作成功") {
-        this.uploadAttachment.push({
-          filePath: res.filePath,
-          fileName: res.fileName
-        });
-      }
-    },
-    onChange(file, fileList) {
-      if (file.size > 100 * 1000000) {
-        this.$message.error("上传文件不能超过100M!");
-        this.$refs.upload.fileList = this.$refs.upload.fileList;
-        this.$refs.upload.uploadFiles.splice(
-          this.$refs.upload.uploadFiles.length - 1,
-          1
-        );
-
-        return false;
-      }
-      file = file.raw;
-      if (!/image\/\w+/.test(file.type)) {
-        //非图片
-        this.fullscreenLoading = true;
-        this.httpRequest(file, file.name);
-      } else {
-        this.fullscreenLoading = true;
-        let _this = this;
-        imageConversion.compressAccurately(file, 400).then(res => {
-          if (res.size) {
-            //压缩成功
-            _this.httpRequest(res, file.name, file);
-          } else {
-            _this.$message.error("压缩图片失败");
-            _this.fullscreenLoading = false;
-            _this.$refs.upload.uploadFiles.splice(
-              _this.$refs.upload.uploadFiles.length - 1,
-              1
-            );
-          }
-        });
-      }
-    }
-  }
-};
-</script>
-
-<style scoped>
-.company-form {
-  overflow: auto !important;
-}
-
-.company-form .el-textarea,
-.company-form .el-input {
-  width: 760px !important;
-}
-
-.company-form .form-inline,
-.company-form .form-inline1 {
-  float: left !important;
-  /* display: inline-block; */
-}
-
-.radio-right {
-  display: inline-block;
-}
-
-.company-form .form-inline .el-input,
-.company-form .el-select,
-.company-form .el-cascader {
-  width: 200px !important;
-  display: block !important;
-}
-
-.company-form .form-inline1 .el-input,
-.company-form .form-inline1 .el-select,
-.company-form .form-inline1 .el-cascader {
-  width: 340px !important;
-}
-
-.company-form .form-inline2 .el-input {
-  width: 480px !important;
-}
-
-.company-form textarea {
-  height: 80px !important;
-}
-
-.mb {
-  margin-bottom: 20px !important;
-}
-
-.dialog-flex {
-  position: relative;
-  width: 100% !important;
-  overflow: auto;
-}
-
-.form-inline5 .el-input {
-  width: 715px !important;
-}
-
-.form-inline6 .el-input {
-  width: 115px !important;
-}
-
-.form-inline7 .el-input {
-  width: 668px !important;
-}
-
-element.style {
-  width: 82px !important;
-  margin-left: 82px !important;
-}
-</style>
+<template>
+  <div class="sys-task sys-box">
+    <div class="sys-operate" style="position:relative">
+      <el-button type="primary" style="position:absolute;top:0" @click="add()"
+        v-has="'management:customer:add'">新增</el-button>
+      <el-button type="primary" style="position:absolute;top:0;left:76px" :disabled="btnDelDisabled" @click="remove()"
+        v-has="'management:customer:delete'">删除</el-button>
+      <el-button type="primary" style="position:absolute;top:0;left:140px" @click="audit(1)" :disabled="btnDelDisabled"
+        v-has="'management:customer:audit'">批量审核</el-button>
+      <el-button type="primary" style="position:absolute;top:0;left:228px" @click="disAudit(1)"
+        :disabled="btnOtherDisabled" v-has="'management:customer:reverseAudit'">反审核</el-button>
+      <el-upload ref="upload" :action="uploadUrl" :on-success="uploadSuccess" :file-list="fileDocList" :before-remove="function () {
+        return false;
+      }
+        " :auto-upload="auto_upload" :on-change="onChange" v-loading.lock="fullscreenLoading" class="inline-block"
+        accept=".xls,.xlsx,">
+        <el-button size="small" v-has="'management:customer:upload'" type="primary"
+          style="position:absolute;top:0;left:315px">导入</el-button>
+        <!-- <div
+        slot="tip"
+        class="el-upload__tip"
+      ></div> -->
+      </el-upload>
+      <el-button type="primary" v-has="'management:customer:download'" @click="download()"
+        style="position:absolute;top:0;left:378px">下载模板</el-button>
+      <el-button type="primary" v-has="'management:customer:deletedList'" size="small"
+        style="position:absolute;top:0;left:455px" @click="deletedList">已删除</el-button>
+      <el-button type="primary" style="position:absolute;top:0;left:530px;color:#fff;background:rgb(24, 134, 254)"
+        @click="synchronous">同步CRM</el-button>
+    </div>
+    <div class="sys-search">
+      <el-form inline>
+        <el-form-item label="客户名称">
+          <el-input placeholder="请输入客户名称" v-model="search_data.name" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="社会统一信用代码">
+          <el-input placeholder="社会统一信用代码（精确查询）" v-model="search_data.taxNumber" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="search()">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table border v-loading="pictLoading" @row-click="clickRow" ref="tb" :data="tableData" :header-cell-style="{
+        fontWeight: 'normal',
+        textAlign: 'center',
+        backgroundColor: '#eceff4',
+        color: '#222'
+      }" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="code" label="客户编号" show-overflow-tooltip align="center">
+          <template slot-scope="scope">
+            <el-link type="primary" @click.stop="openDetails(scope.row)">{{
+              scope.row.code
+            }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="client_name" align="center" label="客户名称" show-overflow-tooltip></el-table-column>
+        <!--<el-table-column prop="type_name" align="center" label="客户类型"></el-table-column>-->
+        <el-table-column prop="linkman_name" align="center" label="联系人"></el-table-column>
+        <el-table-column prop="linkman_phone" align="center" label="联系电话"></el-table-column>
+        <el-table-column prop="address" align="center" label="地址" show-overflow-tooltip></el-table-column>
+        <!--<el-table-column prop="client_desc" align="center" label="备注" show-overflow-tooltip></el-table-column>-->
+        <!-- <el-table-column prop="taxNumber" align="center" label="社会统一信用代码" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="bankName" align="center" label="开户行" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="account" align="center" label="账号" show-overflow-tooltip></el-table-column> -->
+        <el-table-column prop="belongSalesmanName" align="center" label="所属业务员" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="belongDeptName" align="center" label="所属部门" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="statusName" align="center" label="审核状态" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="useStatusName" align="center" label="状态" show-overflow-tooltip></el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+
+    <el-dialog :title="dialogTitle" center :visible.sync="dialogVisible" width="900px">
+      <el-form v-loading="dialogLoading" label-width="82px" :rules="rules" :model="formData" class="company-form"
+        ref="form">
+        <div class="dialog-flex">
+          <el-form-item label="客户编码" class="form-inline" prop="code">
+            <el-input placeholder="请输入客户编码" v-model="formData.code"></el-input>
+          </el-form-item>
+          <el-form-item prop="name" label="客户名称" class="form-inline form-inline2">
+            <el-input placeholder="请输入客户名称" v-model="formData.name"></el-input>
+          </el-form-item>
+        </div>
+
+        <div class="dialog-flex">
+          <el-form-item label="联系人" class="form-inline" prop="linkerMan">
+            <el-input placeholder="请输入联系人" v-model="formData.linkerMan"></el-input>
+          </el-form-item>
+          <el-form-item label="联系电话" class="form-inline" prop="phone">
+            <el-input placeholder="请输入联系电话" v-model="formData.phone"></el-input>
+          </el-form-item>
+          <el-form-item label="客户类型" class="form-inline" prop="type">
+            <el-select clearable placeholder="请选择" v-model="formData.type">
+              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="dialog-flex">
+          <el-form-item label="社会统一信用代码" class="form-inline5" label-width="125" prop="taxNumber">
+            <el-input placeholder="请输入社会统一信用代码" v-model="formData.taxNumber"></el-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-flex">
+          <el-form-item label="地址" prop="address">
+            <el-input placeholder="请输入地址" v-model="formData.address"></el-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-flex">
+          <el-form-item label="开户行" class="form-inline1" prop="bank">
+            <el-input placeholder="请输入开户银行" v-model="formData.bank"></el-input>
+          </el-form-item>
+          <el-form-item label="账号" class="form-inline1" prop="account">
+            <el-input placeholder="账号" v-model="formData.account"></el-input>
+          </el-form-item>
+        </div>
+
+        <div class="dialog-flex">
+          <el-form-item label="所属业务员" class="form-inline1" prop="belongSalesmanName">
+            <btn-input :valueText.sync="formData.belongSalesmanName" :valueId.sync="formData.belongSalesman"
+              :chooseVisible.sync="chooseUserVisible"></btn-input>
+          </el-form-item>
+          <el-form-item label="所属部门" prop="belongDeptName" class="form-inline1">
+            <el-input v-model="formData.belongDeptName" readonly=""></el-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-flex">
+          <el-form-item label="收货地址" prop="harvestAddress">
+            <el-input placeholder="请输入地址" v-model="formData.harvestAddress"></el-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-flex">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item prop="useCredit" label="是否启用信用管理" label-width="100">
+                <el-radio v-model="formData.useCredit" :label="1">是</el-radio>
+                <el-radio v-model="formData.useCredit" :label="0">否</el-radio>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="payType" label="付款类型" class="radio-right">
+                <el-select clearable placeholder="请选择付款类型" v-model="formData.payType" value=""
+                  style="width: 340px !important;">
+                  <el-option v-for="item in payTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="dialog-flex">
+          <el-form-item prop="creditLimit" label="信用额度" class="form-inline1" v-show="formData.useCredit === 1">
+            <el-input v-model="formData.creditLimit" oninput="value=value.replace(/[^0-9.]/g,'')" placeholder="请输入信用额度">
+              <span slot="suffix">/ 元</span>
+            </el-input>
+          </el-form-item>
+          <el-form-item prop="creditPeriod" label="信用期限" class="form-inline1" v-show="formData.useCredit === 1">
+            <el-input v-model="formData.creditPeriod" oninput="value=value.replace(/[^0-9.]/g,'')"
+              placeholder="请输入信用期限">
+              <span slot="suffix">/ 天</span>
+            </el-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-flex">
+          <el-form-item prop="expireInform" label="信用期限到期提醒提前期" class="form-inline7" v-show="formData.useCredit === 1"
+            label-width="100">
+            <el-input v-model="formData.expireInform" oninput="value=value.replace(/[^0-9.]/g,'')"
+              placeholder="请输入信用期限到期提醒提前期">
+              <span slot="suffix">/ 天</span>
+            </el-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-flex">
+          <el-form-item label="备注" prop="desc">
+            <el-input type="textarea" :autosize="{ minRows: 2 }" v-model="formData.desc"></el-input>
+          </el-form-item>
+        </div>
+
+        <div class="dialog-flex">
+          <el-form-item prop="createByName" label="制单人" class="form-inline">
+            <el-input v-model="formData.createByName" disabled></el-input>
+          </el-form-item>
+          <el-form-item prop="auditName" label="审核人" class="form-inline">
+            <el-input placeholder="审核人" v-model="formData.auditName" disabled></el-input>
+          </el-form-item>
+          <el-form-item label="状态" class="form-inline" prop="useStatus">
+            <el-radio v-model="formData.useStatus" :label="1">启用</el-radio>
+            <el-radio v-model="formData.useStatus" :label="0">禁用</el-radio>
+          </el-form-item>
+        </div>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false">{{
+          config.cancelText
+        }}</el-button>
+        <el-button type="primary" @click="save('form')" v-if="
+          this.formData.status == 178 || this.formData.status == undefined
+        " v-has="'management:customer:add'" :disabled="isDisabled">保存</el-button>
+
+        <el-button type="primary" size="small" @click="audit" v-if="this.formData.status == 178"
+          v-has="'management:customer:audit'">审核</el-button>
+        <el-button type="primary" size="small" @click="disAudit" v-if="this.formData.status == 179"
+          v-has="'management:customer:reverseAudit'">反审核</el-button>
+      </span>
+    </el-dialog>
+    <!--选择用户-->
+    <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
+  </div>
+</template>
+
+<script>
+import base from "@/api/base.js"; // 导入接口域名列表
+import btnInput from "@/components/btnInput.vue";
+import config from "@/utils/config.js";
+import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+import Cookies from "js-cookie";
+export default {
+  components: {
+    btnInput,
+    DialogChooseSingleUser
+  },
+  data() {
+    const useCreditRule = (rule, value, callback) => {
+      if (this.formData.useCredit === 1) {
+        if (!value) {
+          callback(new Error("信用额度相关选项必填！"));
+        } else {
+          callback();
+        }
+      } else {
+        callback();
+      }
+    };
+    return {
+      formData: {
+        useCredit: 1, //是否启用信用管理 默认是
+        creditLimit: "", //信用额度
+        creditPeriod: "", //信用期限
+        expireInform: "", //信用期限到期提前几天通知
+        payType: "", //付款类型
+        name: "",
+        code: "",
+        phone: "",
+        belongSalesman: "",
+        belongSalesmanName: ""
+      },
+      rules: {
+        name: [{ required: true, message: "请输入客户名称", trigger: "blur" }],
+        creditLimit: [
+          {
+            required: true,
+            message: "请输入信用额度",
+            trigger: "blur",
+            validator: useCreditRule
+          }
+        ],
+        creditPeriod: [
+          {
+            required: true,
+            message: "请输入信用期限",
+            trigger: "blur",
+            validator: useCreditRule
+          }
+        ],
+        payType: [
+          {
+            required: true,
+            message: "请选择付款类型",
+            trigger: "blur",
+            validator: useCreditRule
+          }
+        ],
+        expireInform: [
+          {
+            required: true,
+            message: "请输入信用期限到期提醒提前期",
+            trigger: "blur",
+            validator: useCreditRule
+          }
+        ]
+        //   linkerMan: [
+        //   { required: true, message: "请输入联系人", trigger: "blur" }
+        // ],
+        // phone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+        // type: [
+        //   { required: true, message: "请选择客户类型", trigger: "change" }
+        // ],
+        // address: [{ required: true, message: "请输入地址", trigger: "blur" }],
+
+        // useStatus: [{ required: true, message: "请选择状态", trigger: "blur" }]
+      },
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10
+      },
+      options: [],
+      payTypeList: [], //付款类型列表
+      bankOptions: [],
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      rowIds: [],
+      tableData: [],
+      dialogVisible: false,
+      isDisabled: false,
+      dialogTitle: "新增",
+      loading: false,
+      isUpdate: false,
+      // options: [],
+      getUserList: [],
+      selectDeptId: [],
+      depOptions: [],
+      pictLoading: false,
+      dialogLoading: false,
+      chooseUserVisible: false,
+      chooseID: "", //编辑的id
+      config: config,
+      uploadAttachment: [],
+      fileDocList: [],
+      uploadUrl: base.uploadUrl,
+      ftpPrefix: base.ftpPrefix,
+      fullscreenLoading: false,
+      auto_upload: false
+    };
+  },
+  mounted() {
+    let user = Cookies.get("userName");
+    this.formData.createByName = user;
+    // this.initData();
+    this.getList();
+  },
+  // watch: {
+  //   formData: {
+  //     handler(newVal, oldVal) {
+  //       console.log(newVal,1111);
+  //       if(!newVal.belongSalesman) {
+  //         this.formData.belongDeptName = ''
+  //         this.formData.belongDeptId = ''
+  //       }
+  //     },
+  //     deep: true
+  //   },
+  // },
+  methods: {
+    synchronous() {
+      this.$api.yxkAPI.yxkGet("/apis/clients/sync").then(res => {
+        if (res.code == 200) {
+          this.$confirm("数据同步成功,请确认", {
+            type: "warning"
+          }).then(() => {
+            this.getList();
+          });
+        }
+      });
+    },
+    // 下载模板
+    download() {
+      let obj = {
+        filePath: "/gyhl-file/template/client-template.xlsx",
+        fileName: "客户模板.xlsx"
+      };
+      this.$api.commonAPI.downLoad(obj).then(res => {
+        if (res.status == 200) {
+          window.open(res.request.responseURL);
+          this.$message({
+            message: "下载成功",
+            type: "success"
+          });
+        } else {
+          this.$message({
+            message: "下载失败",
+            type: "error"
+          });
+        }
+      });
+    },
+
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+    // 已删除
+    deletedList() {
+      this.$router.push({
+        path: "/management/customer_deletedList",
+        query: { t: Date.now() }
+      });
+    },
+    // initData() {
+    //   Promise.all(
+    //     [
+    //       this.$api.dictAPI.getDictsByType("client_type"),
+    //       this.$api.commonAPI.getDeptsTree(),
+    //       this.$api.dictAPI.getDictsByType("bank"),
+    //       this.$api.dictAPI.getDictsByType("type_of_payment"),
+    //     ].map(p => p.catch(e => e))
+    //   ).then(
+    //     ([r1,r2,r3,r4]) => {
+    //       if (r1.code === 0) {
+    //         this.options = r1.datas;
+    //       }
+    //       if (r2.code === 0) {
+    //         this.depOptions=r2.data.children;
+    //         this.setDeptList(this.depOptions);
+    //         this.setDefaultDept()
+    //       }
+    //       if (r3.code === 0) {
+    //         this.bankOptions = r3.datas;
+    //         // this.$set(this.formData,'bank',r3.datas.length>=1?r3.datas[r3.datas.length-1]:'')
+    //
+    //       }
+    //       if (r4.code === 0) {
+    //         if (r4.datas) {
+    //           this.payTypeList = r4.datas.filter(item => item.name === '不赊账' || item.name === '赊账');
+    //         }
+    //
+    //       }
+    //     }
+    //   )
+    //     .catch(error => {
+    //       console.log(error);
+    //     });
+    // },
+    /**
+     *获取列表
+     */
+    getList() {
+      this.pictLoading = true;
+      this.$api.cliensAPI
+        .listServiceGroup(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.data) {
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    /**
+     * 新增往来单位
+     */
+    add() {
+      // this.isUpdate = false;
+      // this.dialogVisible = true;
+      // this.chooseID = "";
+      // this.formData = {};
+      // this.formData.createByName = Cookies.get("userName");
+      // this.formData.useStatus = 1;
+      // this.formData.useCredit = 1;
+      // // this.getClientCode();
+      // this.dialogTitle = "新增客户信息";
+      //   this.$refs["form"].resetFields();
+      //   this.formData.useCredit = 1;
+
+      this.$router.push({
+        path: "/management/customer_add",
+        query: {
+          report_url: this.$route.path,
+          t: Date.now()
+        }
+      });
+    },
+
+    /**
+     *查看明细
+     */
+    openDetails(r) {
+      // this.dialogVisible = true;
+      // this.chooseID = r.id;
+      // if (this.$refs["form"] !== undefined) {
+      //   this.$refs["form"].resetFields();
+      // }
+      // this.getDetail();
+      // this.dialogTitle = "编辑客户信息";
+      this.$router.push({
+        path: "/management/customer_add",
+        query: {
+          report_url: this.$route.path,
+          id: r.id,
+          t: Date.now()
+        }
+      });
+    },
+    /**
+     * 获取明细
+     */
+    // getDetail() {
+    //   this.dialogLoading = true;
+    //     this.formData={};//先清空
+    //   this.$api.cliensAPI
+    //     .detalsOneClien(this.chooseID)
+    //     .then(res => {
+    //       this.dialogLoading = false;
+    //       if (res.data) {
+    //           this.formData=Object.assign({}, this.formData, res.data)
+    //           this.$set(this.formData,'name',res.data.client_name)
+    //           this.$set(this.formData,'linkerMan',res.data.linkman_name)
+    //           this.$set(this.formData,'phone',res.data.linkman_phone)
+    //           this.$set(this.formData,'type',res.data.type_id)
+    //           this.$set(this.formData,'desc',res.data.client_desc?res.data.client_desc:"");
+    //           //信用相关赋值
+    //         this.$set(this.formData,'useCredit',res.data.useCredit?res.data.useCredit:0);
+    //         this.$set(this.formData,'creditLimit',res.data.creditLimit?res.data.creditLimit:"");
+    //         this.$set(this.formData,'creditPeriod',res.data.creditPeriod?res.data.creditPeriod:"");
+    //         this.$set(this.formData,'expireInform',res.data.expireInform?res.data.expireInform:"");
+    //         this.$set(this.formData,'payType',res.data.payType?res.data.payType:"");
+    //
+    //         this.isUpdate = true;
+    //       } else {
+    //         this.dialogVisible = false;
+    //         this.$alert("获取客户明细失败", "提示", { type: "warning" });
+    //       }
+    //     })
+    //     .catch(r => {
+    //       console.log(r);
+    //     });
+    // },
+    /**
+     * 保存往来单位
+     */
+    // save(form) {
+    //
+    //   this.$refs[form].validate(valid => {
+    //     if (valid) {
+    //       // this.formData.auditId = this.formData.auditId?this.formData.auditId:'';
+    //       this.formData.auditName = this.formData.auditName?this.formData.auditName:'';
+    //       this.formData.operatorName = this.formData.operatorName?this.formData.operatorName:'';
+    //       if (this.chooseID) {
+    //         this.formData.Id= this.chooseID;
+    //         if(this.isDisabled) {
+    //           return
+    //         }
+    //         this.isDisabled = true
+    //         this.$api.cliensAPI
+    //           .saveChangeDetals(this.formData)
+    //           .then(res => {
+    //             this.isDisabled = false
+    //             if (res.code === 0) {
+    //               this.$message({
+    //                 message: res.msg,
+    //                 type: "success"
+    //               });
+    //               this.dialogVisible = false;
+    //               this.getList();
+    //             } else {
+    //               this.$message({
+    //                 message: res.msg,
+    //                 type: "error"
+    //               });
+    //             }
+    //           })
+    //           .catch(r => {
+    //             this.$message({
+    //               message: res.msg,
+    //               type: "success"
+    //             });
+    //           });
+    //       } else {
+    //         if(this.isDisabled) {
+    //           return
+    //         }
+    //         this.isDisabled = true
+    //         this.$api.cliensAPI
+    //           .addServiceGroup(this.formData)
+    //           .then(res => {
+    //             this.isDisabled = false
+    //             if (res.code === 0) {
+    //               this.$message({
+    //                 message: res.msg,
+    //                 type: "success",
+    //                 duration:10000
+    //               });
+    //               this.dialogVisible = false;
+    //               this.getList();
+    //             } else {
+    //               if(res.code === 501) {
+    //                 this.$confirm(res.msg, "提示", {
+    //                   type: "warning"
+    //                 }).then(() => {
+    //                   this.dialogLoading = true;
+    //                   this.formData={};//先清空
+    //                   this.$api.cliensAPI
+    //                     .detalsOneClien(res.data.id)
+    //                     .then(res => {
+    //                       this.dialogLoading = false;
+    //                       if (res.data) {
+    //                           this.formData=Object.assign({}, this.formData, res.data)
+    //                           this.$set(this.formData,'name',res.data.client_name)
+    //                           this.$set(this.formData,'linkerMan',res.data.linkman_name)
+    //                           this.$set(this.formData,'phone',res.data.linkman_phone)
+    //                           this.$set(this.formData,'type',res.data.type_id)
+    //                           this.$set(this.formData,'desc',res.data.client_desc?res.data.client_desc:"")
+    //                         this.isUpdate = true;
+    //                         this.chooseID = this.formData.id
+    //                       } else {
+    //                         this.dialogVisible = false;
+    //                         this.$alert("获取客户明细失败", "提示", { type: "warning" });
+    //                       }
+    //                     })
+    //                     .catch(r => {
+    //                       console.log(r);
+    //                     });
+    //                 })
+    //               } else {
+    //                 this.$message({
+    //                   message: res.msg,
+    //                   type: "error"
+    //                 });
+    //               }
+    //             }
+    //           })
+    //           .catch(r => {
+    //             this.$message({
+    //               message: res.msg,
+    //               type: "success"
+    //             });
+    //           });
+    //       }
+    //     } else {
+    //       return false;
+    //     }
+    //   });
+    // },
+
+    /**
+     * 审核
+     */
+    audit(n) {
+      let ids = [];
+      let id;
+      if (n == 1) {
+        //点击列表上面的审核按钮
+        this.rowIds.forEach(item => {
+          ids.push(item.id);
+        });
+      } else {
+        //点击弹出框里面的审核按钮
+        ids.push(this.formData.id);
+      }
+      this.$api.cliensAPI.batchAudit({ ids: ids }).then(res => {
+        if (res.code === 0) {
+          this.$message({
+            message: res.msg,
+            type: "success"
+          });
+          this.dialogVisible = false;
+          this.getList();
+        } else {
+          this.$message({
+            message: res.msg,
+            type: "error"
+          });
+        }
+      });
+    },
+
+    /**
+     * 反审核
+     */
+    disAudit(n) {
+      let id;
+      if (n == 1) {
+        //点击列表上面的审核按钮
+        id = this.rowIds[0].id;
+      } else {
+        //点击弹出框里面的审核按钮
+        id = this.formData.id;
+      }
+      this.$api.cliensAPI.reverseAudit({ id: id }).then(res => {
+        if (res.code === 0) {
+          this.$message({
+            message: res.msg,
+            type: "success"
+          });
+          this.dialogVisible = false;
+          this.getList();
+        } else {
+          this.$message({
+            message: res.msg,
+            type: "error"
+          });
+        }
+      });
+    },
+
+    //
+    // //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
+    // setDeptList(tree){
+    //   for (const data of tree) {
+    //     if(!data.hasChildren){
+    //       data.children=undefined;
+    //     }else{
+    //       this.setDeptList(data.children)
+    //     }
+    //   }
+    // },
+    // //显示默认部门
+    // setDefaultDept(){
+    //   if(this.depOptions.length>0&&this.formData.deptId){
+    //     let id=JSON.stringify( this.formData.deptId)
+    //     let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
+    //     this.selectDeptId=JSON.parse(JSON.stringify(select_id))
+    //   }
+    // },
+    // //根据当前id,获取一条树枝上的所有id数据
+    // treeFindPath (tree, func, path = []) {
+    //   if (!tree) return []
+    //   for (const data of tree) {
+    //     path.push(data.id)
+    //     if (func(data)) return path
+    //     if (data.children) {
+    //       const findChildren = this.treeFindPath(data.children, func, path)
+    //       if (findChildren.length) return findChildren
+    //     }
+    //     path.pop()
+    //   }
+    //   return []
+    // },
+
+    /**
+     * 获取用户
+     */
+    // getUser(data) {
+    //   console.log(data);
+    //   var self = this;
+    //   if (data) {
+    //     this.$set(this.formData,'belongSalesmanName',data.name)
+    //     this.$set(this.formData,'belongSalesman',data.id)
+    //     // this.formData.belongSalesmanName = data.name;
+    //     // this.formData.belongSalesman = data.id;
+    //     this.formData.belongDept = data.deptId
+    //     this.formData.belongDeptName = data.deptName
+    //     // this.getUserList.forEach(item => {
+    //     //   if (data.id === item.id) {
+    //     //     self.formData.selectDeptId = item.deptId;
+    //     //     self.formData.deptId= item.deptId;
+    //     //     return;
+    //     //   }
+    //     // });
+    //     // if (self.formData.deptId == 0) {
+    //     //   self.formData.selectDeptId = "";
+    //     // }
+    //     this.setDefaultDept()
+    //   }
+    // },
+
+    // 选择部门
+    handleChange: function(value) {
+      this.$set(
+        this.formData,
+        "belongDept",
+        value.length >= 1 ? value[value.length - 1] : ""
+      );
+      this.selectDeptId = value;
+    },
+
+    /**
+     * 删除往来单位
+     */
+    remove() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      //let id = this.rowIds[0].id;
+      this.$confirm("确认删除选中的客户档案吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.cliensAPI
+          .deleteClient(ids)
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    },
+    //压缩并上传图片
+    httpRequest(upload, name, file) {
+      //file是需要压缩图片时，原图片
+      let _this = this;
+      var tempFormData = new FormData();
+      tempFormData.append("file", upload, name); //上传blob对象
+      this.$api.clientAPI.importExcel(tempFormData).then(res => {
+        _this.fullscreenLoading = false;
+        if (res.code == 0) {
+          //上传成功
+          _this.$message({
+            message: "上传成功",
+            type: "success",
+            duration: 2000
+          });
+          // upload.filePath=res.filePath;
+          if (file) {
+            file.filePath = res.filePath;
+          } else {
+            upload.filePath = res.filePath;
+          }
+          _this.uploadAttachment.push({
+            filePath: res.filePath,
+            fileName: res.fileName
+          });
+        } else {
+          //上传失败
+          _this.fullscreenLoading = false;
+          _this.$message.error(res.msg);
+          _this.$refs.upload.uploadFiles.splice(
+            _this.$refs.upload.uploadFiles.length - 1,
+            1
+          );
+        }
+      });
+    },
+
+    /**
+     * 上传成功
+     */
+    uploadSuccess(res, file) {
+      if (res.msg === "操作成功") {
+        this.uploadAttachment.push({
+          filePath: res.filePath,
+          fileName: res.fileName
+        });
+      }
+    },
+    onChange(file, fileList) {
+      if (file.size > 100 * 1000000) {
+        this.$message.error("上传文件不能超过100M!");
+        this.$refs.upload.fileList = this.$refs.upload.fileList;
+        this.$refs.upload.uploadFiles.splice(
+          this.$refs.upload.uploadFiles.length - 1,
+          1
+        );
+
+        return false;
+      }
+      file = file.raw;
+      if (!/image\/\w+/.test(file.type)) {
+        //非图片
+        this.fullscreenLoading = true;
+        this.httpRequest(file, file.name);
+      } else {
+        this.fullscreenLoading = true;
+        let _this = this;
+        imageConversion.compressAccurately(file, 400).then(res => {
+          if (res.size) {
+            //压缩成功
+            _this.httpRequest(res, file.name, file);
+          } else {
+            _this.$message.error("压缩图片失败");
+            _this.fullscreenLoading = false;
+            _this.$refs.upload.uploadFiles.splice(
+              _this.$refs.upload.uploadFiles.length - 1,
+              1
+            );
+          }
+        });
+      }
+    }
+  }
+};
+</script>
+
+<style scoped>
+.company-form {
+  overflow: auto !important;
+}
+
+.company-form .el-textarea,
+.company-form .el-input {
+  width: 760px !important;
+}
+
+.company-form .form-inline,
+.company-form .form-inline1 {
+  float: left !important;
+  /* display: inline-block; */
+}
+
+.radio-right {
+  display: inline-block;
+}
+
+.company-form .form-inline .el-input,
+.company-form .el-select,
+.company-form .el-cascader {
+  width: 200px !important;
+  display: block !important;
+}
+
+.company-form .form-inline1 .el-input,
+.company-form .form-inline1 .el-select,
+.company-form .form-inline1 .el-cascader {
+  width: 340px !important;
+}
+
+.company-form .form-inline2 .el-input {
+  width: 480px !important;
+}
+
+.company-form textarea {
+  height: 80px !important;
+}
+
+.mb {
+  margin-bottom: 20px !important;
+}
+
+.dialog-flex {
+  position: relative;
+  width: 100% !important;
+  overflow: auto;
+}
+
+.form-inline5 .el-input {
+  width: 715px !important;
+}
+
+.form-inline6 .el-input {
+  width: 115px !important;
+}
+
+.form-inline7 .el-input {
+  width: 668px !important;
+}
+
+element.style {
+  width: 82px !important;
+  margin-left: 82px !important;
+}
+</style>
diff --git a/src/pages/management/project/index.vue b/src/pages/management/project/index.vue
index d1fd7d1..2823d8d 100644
--- a/src/pages/management/project/index.vue
+++ b/src/pages/management/project/index.vue
@@ -1,543 +1,564 @@
-<template>
-  <div class="sys-task sys-box">
-    <div class="sys-operate">
-      <el-button type="primary" v-has="'management:project:add'" @click="add()">新增</el-button>
-      <!-- <el-button type="primary" :disabled="btnDelDisabled" @click="remove()" >删除</el-button> -->
-      <el-button type="primary" v-has="'management:project:show'" @click="show()"
-        :disabled="btnOtherDisabled">编辑</el-button>
-      <!-- <el-button type="primary" v-has="'management:project:audit'" @click="audit(1)"
-        :disabled="btnOtherDisabled">审核</el-button>
-      <el-button type="primary" v-has="'management:project:disAudit'" @click="disAudit(1)"
-        :disabled="btnOtherDisabled">反审核</el-button> -->
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class="form_item_input_out">
-          <el-form-item label="项目单号" style="width:22%" class="form_item-inline">
-            <el-input placeholder="请输入项目单号" v-model="search_data.code" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="项目名称" style="width:22%" class="form_item-inline">
-            <el-input placeholder="请输入项目名称" v-model="search_data.name" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="项目日期" style="width:34%" class="form_item-inline">
-            <el-date-picker v-model="planTime" type="daterange" range-separator="-" start-placeholder="开始日期"
-              end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table border v-loading="pictLoading" @row-click="clickRow" ref="tb" :data="tableData" :header-cell-style="{
-        fontWeight: 'normal',
-        textAlign: 'center',
-        backgroundColor: '#eceff4',
-        color: '#222'
-      }" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column prop="code" label="项目单号" show-overflow-tooltip align="center">
-          <template slot-scope="scope">
-            <el-link type="primary" @click.stop="openDetails(scope.row)">{{
-              scope.row.code
-            }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="xmrq" align="center" label="项目日期" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="name" align="center" label="项目名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="xmyq" align="center" label="项目要求" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="xmsm" align="center" label="项目说明" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="jlry" align="center" label="记录人员" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="remarks" align="center" label="备注" show-overflow-tooltip></el-table-column>
-        <!-- <el-table-column prop="auditSignName" align="center" label="审核状态" show-overflow-tooltip></el-table-column> -->
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-
-    <el-dialog :title="dialogTitle" center :visible.sync="dialogVisible" width="900px">
-      <el-form v-loading="dialogLoading" label-width="110px" :model="formData" :rules="rulesForm" class="company-form"
-        ref="form">
-        <el-form-item prop="code" label="项目单号">
-          <el-input v-model="formData.code" disabled></el-input>
-        </el-form-item>
-        <el-form-item prop="xmrq" label="项目日期">
-          <!-- <el-input v-model="formData.code"></el-input> -->
-          <el-date-picker v-model="formData.xmrq" type="datetime" placeholder="选择日期时间"
-            value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-        </el-form-item>
-        <el-form-item label="记录人员" prop="jlry">
-          <btn-input :valueText.sync="formData.jlry" :valueId.sync="formData.jlryid"
-            :chooseVisible.sync="chooseUserVisible"></btn-input>
-        </el-form-item>
-        <el-form-item prop="name" label="项目名称">
-          <el-input v-model="formData.name"></el-input>
-        </el-form-item>
-        <el-form-item label="项目状态" prop="dywzid">
-          <el-select clearable style="width: 100%;" v-model="formData.xmztid" @change="
-            el => {
-              formData.xmzt = xmztList.filter(
-                item => item.id == el
-              )[0].name;
-            }
-          " placeholder="请选择">
-            <el-option v-for="item in xmztList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="xmyq" label="项目要求">
-          <el-input type="textarea" :autosize="{ minRows: 2 }" v-model="formData.xmyq"></el-input>
-        </el-form-item>
-        <el-form-item prop="xmsm" label="项目说明">
-          <el-input type="textarea" :autosize="{ minRows: 2 }" v-model="formData.xmsm"></el-input>
-        </el-form-item>
-        <el-form-item prop="remarks" label="备注">
-          <el-input type="textarea" :autosize="{ minRows: 2 }" v-model="formData.remarks"></el-input>
-        </el-form-item>
-
-        <!-- <div class="dialog-flex">
-                <el-form-item prop="auditorName" label="审核人" >
-                  <el-input placeholder="审核人" v-model="formData.auditorName" disabled></el-input>
-                </el-form-item>
-          </div> -->
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogVisible = false">{{
-          config.cancelText
-        }}</el-button>
-        <el-button type="primary" @click="save('form')" :disabled="isDisabled">保存</el-button>
-
-        <!-- <el-button type="primary" size="small" @click="audit" v-if="this.formData.auditSign == 178">审核</el-button> -->
-        <!-- <el-button type="primary" size="small" @click="disAudit" v-if="this.formData.auditSign == 179">反审核</el-button> -->
-      </span>
-    </el-dialog>
-    <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
-  </div>
-</template>
-
-<script>
-import config from "@/utils/config.js";
-import Cookies from "js-cookie";
-import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-import { formatDateTime } from "@/utils/tools.js";
-import btnInput from "@/components/btnInput.vue";
-
-export default {
-  components: {
-    btnInput,
-    DialogChooseSingleUser
-  },
-  data() {
-    return {
-      chooseUserVisible:false,
-      dywzList:[],
-      planTime: [],
-      xmztList:[],
-      rulesForm: {
-        jlry: [
-          { required: true, message: "请选择记录人员", trigger: "change" }
-        ],
-        name: [
-          { required: true, message: "请输入项目名称", trigger: "change" }
-        ],
-        // code: [{ required: true, message: "请输入项目代码", trigger: "change" }]
-      },
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10
-      },
-      options: [],
-      expenseOptions: [],
-      chooseDevicesVisible: false,
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      rowIds: [],
-      tableData: [],
-      userInfo: {},
-      deviceoptions: [],
-      dialogVisible: false,
-      dialogTitle: "新增",
-      formData: {},
-      btn: false,
-      loading: false,
-      isDisabled: false,
-      // options: [],
-      getUserList: [],
-      selectDeptId: [],
-      depOptions: [],
-      pictLoading: false,
-      dialogLoading: false,
-      chooseUserVisible: false,
-      chooseID: "", //编辑的id
-      config: config
-    };
-  },
-  mounted() {
-    this.getList();
-    this.initialize();
-  },
-  watch: {},
-  methods: {
-       initialize() {
-      Promise.all([
-        this.$api.dictAPI.getDictsByType("xmzt"),
-      ])
-        .then(([r1]) => {
-          if (r1.code === 0) {
-            this.xmztList = r1.datas;
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-      getUser(data) {
-      var self = this;
-      if (data) {
-        self.$set(self.formData, "jlryid", data.id);
-        self.$set(self.formData, "jlry", data.name);
-      }
-    },
-    settime(n) {
-      if (n.toString().length == 1) {
-        return "0" + n.toString();
-      } else {
-        return n;
-      }
-    },
-
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-
-    /**
-     *获取列表
-     */
-    getList() {
-      this.pictLoading = true;
-      // if (this.planTime) {
-      //   this.search_data.ksrq = formatDateTime(this.planTime[0]);
-      //   this.search_data.jsrq = formatDateTime(this.planTime[1]);
-      // } else {
-      //   this.search_data.ksrq = null;
-      //   this.search_data.jsrq = null;
-      // }
-      this.$api.projectAPI
-        .pageList(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.data) {
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    /**
-     * 新增费用
-     */
-
-    add() {
-      this.chooseID = "";
-      this.formData = {};
-      this.dialogVisible = true;
-      this.dialogTitle = "新增项目信息";
-      if (this.$refs["form"] !== undefined) {
-        this.$refs["form"].resetFields();
-      }
-    },
-
-    /**
-     *查看明细
-     */
-    openDetails(r) {
-      console.log(r);
-      this.dialogVisible = true;
-      this.chooseID = r.id;
-      if (this.$refs["form"] !== undefined) {
-        this.$refs["form"].resetFields();
-      }
-      this.getDetail();
-      this.isDisabled = true
-      this.dialogTitle = "查看项目信息";
-    },
-    // 查看
-    show() {
-      this.isDisabled = false;
-      this.dialogVisible = true;
-      this.chooseID = this.rowIds[0].id;
-      if (this.$refs["form"] !== undefined) {
-        this.$refs["form"].resetFields();
-      }
-      this.getDetail();
-      this.dialogTitle = "编辑项目信息";
-    },
-    /**
-     * 获取明细
-     */
-    getDetail() {
-      this.dialogLoading = true;
-      this.formData = {}; //先清空
-      this.$api.projectAPI
-        .detail(this.chooseID)
-        .then(res => {
-          this.dialogLoading = false;
-          if (res.data) {
-            this.formData = Object.assign({}, this.formData, res.data);
-          } else {
-            this.dialogVisible = false;
-            this.$alert("获取项目信息明细失败", "提示", { type: "warning" });
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    /**
-     * 保存
-     */
-    save(form) {
-      this.$refs[form].validate(valid => {
-        if (valid) {
-          if (this.chooseID) {
-            this.formData.Id = this.chooseID;
-            if (this.isDisabled) {
-              return;
-            }
-            this.isDisabled = true;
-            this.$api.projectAPI
-              .save(this.formData)
-              .then(res => {
-                this.isDisabled = false;
-                if (res.code === 0) {
-                  this.$message({
-                    message: res.msg,
-                    type: "success"
-                  });
-                  this.dialogVisible = false;
-                  this.getList();
-                } else {
-                  this.$message({
-                    message: res.msg,
-                    type: "error"
-                  });
-                }
-              })
-              .catch(r => {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-              });
-          } else {
-            if (this.isDisabled) {
-              return;
-            }
-            this.isDisabled = true;
-            this.$api.projectAPI
-              .save(this.formData)
-              .then(res => {
-                this.isDisabled = false;
-                if (res.code === 0) {
-                  this.$message({
-                    message: res.msg,
-                    type: "success"
-                  });
-                  this.dialogVisible = false;
-                  this.getList();
-                } else {
-                  this.$message({
-                    message: res.msg,
-                    type: "error"
-                  });
-                }
-              })
-              .catch(r => {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-              });
-          }
-        } else {
-          return false;
-        }
-      });
-    },
-
-    /**
-     * 审核
-     */
-    audit(n) {
-      let id;
-      if (n == 1) {
-        //点击列表上面的审核按钮
-        id = this.rowIds[0].id;
-      } else {
-        //点击弹出框里面的审核按钮
-        id = this.formData.id;
-      }
-      this.$api.projectAPI.audit(id).then(res => {
-        if (res.code === 0) {
-          this.$message({
-            message: res.msg,
-            type: "success"
-          });
-          this.dialogVisible = false;
-          this.getList();
-        } else {
-          this.$message({
-            message: res.msg,
-            type: "error"
-          });
-        }
-      });
-    },
-
-    /**
-     * 反审核
-     */
-    disAudit(n) {
-      let id;
-      if (n == 1) {
-        //点击列表上面的审核按钮
-        id = this.rowIds[0].id;
-      } else {
-        //点击弹出框里面的审核按钮
-        id = this.formData.id;
-      }
-      this.$api.projectAPI.reverseAudit(id).then(res => {
-        if (res.code === 0) {
-          this.$message({
-            message: res.msg,
-            type: "success"
-          });
-          this.dialogVisible = false;
-          this.getList();
-        } else {
-          this.$message({
-            message: res.msg,
-            type: "error"
-          });
-        }
-      });
-    },
-
-    /**
-     * 删除费用
-     */
-    //   remove() {
-    //     let ids = [];
-    //     this.rowIds.forEach(item => {
-    //       ids.push(item.id);
-    //     });
-    //     //let id = this.rowIds[0].id;
-    //     this.$confirm("确认删除项目信息吗?", "提示", {
-    //       type: "warning"    //     }).then(() => {
-    //       this.$api.projectAPI
-    //         .delete({ids:ids})
-    //         .then(res => {
-    //           if (res.code === 0) {
-    //             this.$message({
-    //               message: res.msg,
-    //               type: "success"
-    //             });
-    //             this.getList();
-    //           } else {
-    //             this.$message({
-    //               message: res.msg ? res.msg : "删除失败，请重试",
-    //               type: "error"
-    //             });
-    //           }
-    //         })
-    //         .catch(error => {
-    //           this.$message({
-    //             message: "删除失败，请重试",
-    //             type: "error"
-    //           });
-    //         });
-    //     });
-    //   },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    }
-  }
-};
-</script>
-
-<style scoped>
-.company-form {
-  overflow: auto;
-}
-
-.company-form .el-textarea,
-.company-form .el-input {
-  width: 100%;
-}
-
-.company-form .form-inline,
-.company-form .form-inline1 {
-  float: left;
-  /*display: inline-block;*/
-}
-
-.company-form .form-inline .el-input,
-.company-form .el-select,
-.company-form .el-cascader {
-  width: 200px;
-  display: block;
-}
-
-.company-form textarea {
-  height: 80px;
-}
-</style>
+<template>
+  <div class="sys-task sys-box">
+    <div class="sys-operate">
+      <el-button type="primary" v-has="'management:project:add'" @click="add()">新增</el-button>
+      <!-- <el-button type="primary" :disabled="btnDelDisabled" @click="remove()" >删除</el-button> -->
+      <el-button type="primary" v-has="'management:project:show'" @click="show()"
+        :disabled="btnOtherDisabled">编辑</el-button>
+        <el-button type="primary" v-has="'management:project:import'" @click="importFile()">导入</el-button>
+      <!-- <el-button type="primary" v-has="'management:project:audit'" @click="audit(1)"
+        :disabled="btnOtherDisabled">审核</el-button>
+      <el-button type="primary" v-has="'management:project:disAudit'" @click="disAudit(1)"
+        :disabled="btnOtherDisabled">反审核</el-button> -->
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class="form_item_input_out">
+          <el-form-item label="项目单号" style="width:22%" class="form_item-inline">
+            <el-input placeholder="请输入项目单号" v-model="search_data.code" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="项目名称" style="width:22%" class="form_item-inline">
+            <el-input placeholder="请输入项目名称" v-model="search_data.name" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="项目日期" style="width:34%" class="form_item-inline">
+            <el-date-picker v-model="planTime" type="daterange" range-separator="-" start-placeholder="开始日期"
+              end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="search()">查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table border v-loading="pictLoading" @row-click="clickRow" ref="tb" :data="tableData" :header-cell-style="{
+        fontWeight: 'normal',
+        textAlign: 'center',
+        backgroundColor: '#eceff4',
+        color: '#222'
+      }" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="code" label="项目单号" show-overflow-tooltip align="center">
+          <template slot-scope="scope">
+            <el-link type="primary" @click.stop="openDetails(scope.row)">{{
+              scope.row.code
+            }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="xmrq" align="center" label="项目日期" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="name" align="center" label="项目名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="xmyq" align="center" label="项目要求" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="xmsm" align="center" label="项目说明" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="jlry" align="center" label="记录人员" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="remarks" align="center" label="备注" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="auditSignName" align="center" label="审核状态" show-overflow-tooltip></el-table-column> -->
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+
+    <el-dialog :title="dialogTitle" center :visible.sync="dialogVisible" width="900px">
+      <el-form v-loading="dialogLoading" label-width="110px" :model="formData" :rules="rulesForm" class="company-form"
+        ref="form">
+        <el-form-item prop="code" label="项目单号">
+          <el-input v-model="formData.code" disabled></el-input>
+        </el-form-item>
+        <el-form-item prop="xmrq" label="项目日期">
+          <!-- <el-input v-model="formData.code"></el-input> -->
+          <el-date-picker v-model="formData.xmrq" type="datetime" placeholder="选择日期时间"
+            value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="记录人员" prop="jlry">
+          <btn-input :valueText.sync="formData.jlry" :valueId.sync="formData.jlryid"
+            :chooseVisible.sync="chooseUserVisible"></btn-input>
+        </el-form-item>
+        <el-form-item prop="name" label="项目名称">
+          <el-input v-model="formData.name"></el-input>
+        </el-form-item>
+        <el-form-item label="项目状态" prop="dywzid">
+          <el-select clearable style="width: 100%;" v-model="formData.xmztid" @change="
+            el => {
+              formData.xmzt = xmztList.filter(
+                item => item.id == el
+              )[0].name;
+            }
+          " placeholder="请选择">
+            <el-option v-for="item in xmztList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="xmyq" label="项目要求">
+          <el-input type="textarea" :autosize="{ minRows: 2 }" v-model="formData.xmyq"></el-input>
+        </el-form-item>
+        <el-form-item prop="xmsm" label="项目说明">
+          <el-input type="textarea" :autosize="{ minRows: 2 }" v-model="formData.xmsm"></el-input>
+        </el-form-item>
+        <el-form-item prop="remarks" label="备注">
+          <el-input type="textarea" :autosize="{ minRows: 2 }" v-model="formData.remarks"></el-input>
+        </el-form-item>
+
+        <!-- <div class="dialog-flex">
+                <el-form-item prop="auditorName" label="审核人" >
+                  <el-input placeholder="审核人" v-model="formData.auditorName" disabled></el-input>
+                </el-form-item>
+          </div> -->
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false">{{
+          config.cancelText
+        }}</el-button>
+        <el-button type="primary" @click="save('form')" :disabled="isDisabled">保存</el-button>
+
+        <!-- <el-button type="primary" size="small" @click="audit" v-if="this.formData.auditSign == 178">审核</el-button> -->
+        <!-- <el-button type="primary" size="small" @click="disAudit" v-if="this.formData.auditSign == 179">反审核</el-button> -->
+      </span>
+    </el-dialog>
+    <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
+
+    <dialog-import-file
+      v-if="showUserImportDialog"
+      :visible.sync="showUserImportDialog"
+      title="项目管理批量导入"
+      source="project"
+      :upload-data="{ type: 'user' }"
+      @success="handleUserImportSuccess"
+      @close="showUserImportDialog = false"
+    />
+  </div>
+</template>
+
+<script>
+import config from "@/utils/config.js";
+import DialogImportFile from '@/components/Dialog/dialogImportFile.vue';
+
+import Cookies from "js-cookie";
+import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+import { formatDateTime } from "@/utils/tools.js";
+import btnInput from "@/components/btnInput.vue";
+
+export default {
+  components: {
+    btnInput,
+    DialogChooseSingleUser,
+    DialogImportFile
+  },
+  data() {
+    return {
+      chooseUserVisible:false,
+      showUserImportDialog:false,
+      dywzList:[],
+      planTime: [],
+      xmztList:[],
+      rulesForm: {
+        jlry: [
+          { required: true, message: "请选择记录人员", trigger: "change" }
+        ],
+        name: [
+          { required: true, message: "请输入项目名称", trigger: "change" }
+        ],
+        // code: [{ required: true, message: "请输入项目代码", trigger: "change" }]
+      },
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10
+      },
+      options: [],
+      expenseOptions: [],
+      chooseDevicesVisible: false,
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      rowIds: [],
+      tableData: [],
+      userInfo: {},
+      deviceoptions: [],
+      dialogVisible: false,
+      dialogTitle: "新增",
+      formData: {},
+      btn: false,
+      loading: false,
+      isDisabled: false,
+      // options: [],
+      getUserList: [],
+      selectDeptId: [],
+      depOptions: [],
+      pictLoading: false,
+      dialogLoading: false,
+      chooseUserVisible: false,
+      chooseID: "", //编辑的id
+      config: config
+    };
+  },
+  mounted() {
+    this.getList();
+    this.initialize();
+  },
+  watch: {},
+  methods: {
+       initialize() {
+      Promise.all([
+        this.$api.dictAPI.getDictsByType("xmzt"),
+      ])
+        .then(([r1]) => {
+          if (r1.code === 0) {
+            this.xmztList = r1.datas;
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    handleUserImportSuccess(response, file, fileList) {
+      this.getList()
+    },
+    importFile(){
+      this.showUserImportDialog = true
+    },
+      getUser(data) {
+      var self = this;
+      if (data) {
+        self.$set(self.formData, "jlryid", data.id);
+        self.$set(self.formData, "jlry", data.name);
+      }
+    },
+    settime(n) {
+      if (n.toString().length == 1) {
+        return "0" + n.toString();
+      } else {
+        return n;
+      }
+    },
+
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+
+    /**
+     *获取列表
+     */
+    getList() {
+      this.pictLoading = true;
+      // if (this.planTime) {
+      //   this.search_data.ksrq = formatDateTime(this.planTime[0]);
+      //   this.search_data.jsrq = formatDateTime(this.planTime[1]);
+      // } else {
+      //   this.search_data.ksrq = null;
+      //   this.search_data.jsrq = null;
+      // }
+      this.$api.projectAPI
+        .pageList(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.data) {
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    /**
+     * 新增费用
+     */
+
+    add() {
+      this.chooseID = "";
+      this.formData = {};
+      this.dialogVisible = true;
+      this.dialogTitle = "新增项目信息";
+      if (this.$refs["form"] !== undefined) {
+        this.$refs["form"].resetFields();
+      }
+    },
+
+    /**
+     *查看明细
+     */
+    openDetails(r) {
+      console.log(r);
+      this.dialogVisible = true;
+      this.chooseID = r.id;
+      if (this.$refs["form"] !== undefined) {
+        this.$refs["form"].resetFields();
+      }
+      this.getDetail();
+      this.isDisabled = true
+      this.dialogTitle = "查看项目信息";
+    },
+    // 查看
+    show() {
+      this.isDisabled = false;
+      this.dialogVisible = true;
+      this.chooseID = this.rowIds[0].id;
+      if (this.$refs["form"] !== undefined) {
+        this.$refs["form"].resetFields();
+      }
+      this.getDetail();
+      this.dialogTitle = "编辑项目信息";
+    },
+    /**
+     * 获取明细
+     */
+    getDetail() {
+      this.dialogLoading = true;
+      this.formData = {}; //先清空
+      this.$api.projectAPI
+        .detail(this.chooseID)
+        .then(res => {
+          this.dialogLoading = false;
+          if (res.data) {
+            this.formData = Object.assign({}, this.formData, res.data);
+          } else {
+            this.dialogVisible = false;
+            this.$alert("获取项目信息明细失败", "提示", { type: "warning" });
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    /**
+     * 保存
+     */
+    save(form) {
+      this.$refs[form].validate(valid => {
+        if (valid) {
+          if (this.chooseID) {
+            this.formData.Id = this.chooseID;
+            if (this.isDisabled) {
+              return;
+            }
+            this.isDisabled = true;
+            this.$api.projectAPI
+              .save(this.formData)
+              .then(res => {
+                this.isDisabled = false;
+                if (res.code === 0) {
+                  this.$message({
+                    message: res.msg,
+                    type: "success"
+                  });
+                  this.dialogVisible = false;
+                  this.getList();
+                } else {
+                  this.$message({
+                    message: res.msg,
+                    type: "error"
+                  });
+                }
+              })
+              .catch(r => {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+              });
+          } else {
+            if (this.isDisabled) {
+              return;
+            }
+            this.isDisabled = true;
+            this.$api.projectAPI
+              .save(this.formData)
+              .then(res => {
+                this.isDisabled = false;
+                if (res.code === 0) {
+                  this.$message({
+                    message: res.msg,
+                    type: "success"
+                  });
+                  this.dialogVisible = false;
+                  this.getList();
+                } else {
+                  this.$message({
+                    message: res.msg,
+                    type: "error"
+                  });
+                }
+              })
+              .catch(r => {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+              });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+
+    /**
+     * 审核
+     */
+    audit(n) {
+      let id;
+      if (n == 1) {
+        //点击列表上面的审核按钮
+        id = this.rowIds[0].id;
+      } else {
+        //点击弹出框里面的审核按钮
+        id = this.formData.id;
+      }
+      this.$api.projectAPI.audit(id).then(res => {
+        if (res.code === 0) {
+          this.$message({
+            message: res.msg,
+            type: "success"
+          });
+          this.dialogVisible = false;
+          this.getList();
+        } else {
+          this.$message({
+            message: res.msg,
+            type: "error"
+          });
+        }
+      });
+    },
+
+    /**
+     * 反审核
+     */
+    disAudit(n) {
+      let id;
+      if (n == 1) {
+        //点击列表上面的审核按钮
+        id = this.rowIds[0].id;
+      } else {
+        //点击弹出框里面的审核按钮
+        id = this.formData.id;
+      }
+      this.$api.projectAPI.reverseAudit(id).then(res => {
+        if (res.code === 0) {
+          this.$message({
+            message: res.msg,
+            type: "success"
+          });
+          this.dialogVisible = false;
+          this.getList();
+        } else {
+          this.$message({
+            message: res.msg,
+            type: "error"
+          });
+        }
+      });
+    },
+
+    /**
+     * 删除费用
+     */
+    //   remove() {
+    //     let ids = [];
+    //     this.rowIds.forEach(item => {
+    //       ids.push(item.id);
+    //     });
+    //     //let id = this.rowIds[0].id;
+    //     this.$confirm("确认删除项目信息吗?", "提示", {
+    //       type: "warning"    //     }).then(() => {
+    //       this.$api.projectAPI
+    //         .delete({ids:ids})
+    //         .then(res => {
+    //           if (res.code === 0) {
+    //             this.$message({
+    //               message: res.msg,
+    //               type: "success"
+    //             });
+    //             this.getList();
+    //           } else {
+    //             this.$message({
+    //               message: res.msg ? res.msg : "删除失败，请重试",
+    //               type: "error"
+    //             });
+    //           }
+    //         })
+    //         .catch(error => {
+    //           this.$message({
+    //             message: "删除失败，请重试",
+    //             type: "error"
+    //           });
+    //         });
+    //     });
+    //   },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    }
+  }
+};
+</script>
+
+<style scoped>
+.company-form {
+  overflow: auto;
+}
+
+.company-form .el-textarea,
+.company-form .el-input {
+  width: 100%;
+}
+
+.company-form .form-inline,
+.company-form .form-inline1 {
+  float: left;
+  /*display: inline-block;*/
+}
+
+.company-form .form-inline .el-input,
+.company-form .el-select,
+.company-form .el-cascader {
+  width: 200px;
+  display: block;
+}
+
+.company-form textarea {
+  height: 80px;
+}
+</style>
diff --git a/src/pages/mes/basic/process/index.vue b/src/pages/mes/basic/process/index.vue
index 42bce2e..db9c1ea 100644
--- a/src/pages/mes/basic/process/index.vue
+++ b/src/pages/mes/basic/process/index.vue
@@ -1,377 +1,377 @@
-<template>
-  <div class="sys-box plan-box">
-    <div class="sys-operate">
-      <el-button type="primary" @click="gotoAdd" v-has="'basic:process:add'">新增</el-button>
-      <el-button type="primary" @click="remove" :disabled="btnDelDisabled" v-has="'basic:process:delete'">删除</el-button>
-      <el-button type="primary" @click="audit" :disabled="btnDelDisabled" v-has="'basic:process:audit'">批量审核</el-button>
-      <el-button type="primary" @click="disAudit" :disabled="btnOtherDisabled" v-has="'basic:process:reverseAudit'">反审核</el-button>
-      <el-button type="primary" @click="download()" >下载模板</el-button>
-      <el-upload
-        style="display: inline-block;margin-left: 5px"
-        ref="upload"
-        :action="uploadUrl"
-        :file-list="fileDocList"
-        :before-remove="function(){
-                       return false
-                     }"
-        :auto-upload="auto_upload"
-        :on-change="onChange"
-        v-loading.lock="fullscreenLoading"
-        class="inline-block"
-        accept=".xls,.xlsx,"
-      >
-        <el-button size="small" v-has="'basic:process:upload'" type="primary" >导入</el-button>
-      </el-upload>
-    </div>
-    <div class="sys-search">
-      <el-form inline>
-        <el-form-item label="工序名称">
-          <el-input placeholder="请输入工序名称" v-model="search_data.name" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="search">查询</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table
-      border
-      v-loading="pictLoading"
-      ref="tb"
-      :data="tableData"
-      :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
-      @selection-change="handleSelectionChange"
-      >
-      <el-table-column type="selection" width="55" align="center"></el-table-column>
-      <el-table-column prop="code" align="center" label="工序代码" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <el-link type="primary" @click="gotoEdit(scope.row)">{{scope.row.code}}</el-link>
-        </template>
-      </el-table-column>
-      <el-table-column prop="name" align="center" label="工序名称" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="standard" align="center" label="基准良率" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="type" align="center" label="工序类型" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <div v-if="scope.row.type==238">普通订单</div>
-          <div v-else-if="scope.row.type==239">正常生产</div>
-          <div v-else="scope.row.type==240">返工返修</div>
-        </template>
-      </el-table-column>
-      <el-table-column prop="whetherExamine" align="center" label="是否检验" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ scope.row.whetherExamine === 1 ? '是' : '否' }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="whetherCollect" align="center" label="是否自动采集" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ scope.row.whetherCollect === 1 ? '是' : '否' }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="manHour" align="center" label="单件工时（分钟）" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="labourPrice" align="center" label="单件工价（元/件）" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="auditSignName" align="center" label="审核状态" show-overflow-tooltip></el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="search_data.pageno"
-        :page-sizes="pageSizes"
-        :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
-    </div>
-  </div>
-</template>
-
-<script>
-  import config from "@/utils/config.js";
-  import base from '@/api/base.js'; // 导入接口域名列表
-  export default {
-    data() {
-      return {
-        search_data: {
-          pageno: 1,
-          pagesize: 10
-        },
-        total: 0, //总条数
-        pageSizes: [10, 20, 50], //每页展示多少条
-        pictLoading: false,
-        btnDelDisabled: true,
-        btnOtherDisabled: true,
-        tableData: [],
-        processIds: [],
-        uploadUrl: base.uploadUrl,
-        fileDocList: [],
-        auto_upload: false,
-        fullscreenLoading: false,
-      }
-    },
-    created() {
-      var _this = this;
-      document.onkeydown = e => {
-        if (e.key === "Enter") {
-          _this.search()
-        }
-      }
-    },
-    mounted() {
-      this.getList();
-    },
-    methods: {
-      onChange(file, fileList) {
-        if (file.size > 100 * 1000000) {
-          this.$message.error('上传文件不能超过100M!');
-          this.$refs.upload.uploadFiles.splice(this.$refs.upload.uploadFiles.length - 1, 1);
-
-          return false
-        }
-        file = file.raw;
-        if (!/image\/\w+/.test(file.type)) {//非图片
-          this.fullscreenLoading = true;
-          this.httpRequest(file, file.name);
-        } else {
-          this.fullscreenLoading = true;
-          let _this = this;
-          imageConversion.compressAccurately(file, 400).then(res => {
-            if (res.size) {//压缩成功
-              _this.httpRequest(res, file.name, file);
-            } else {
-              _this.$message.error('压缩图片失败');
-              _this.fullscreenLoading = false;
-              _this.$refs.upload.uploadFiles.splice(_this.$refs.upload.uploadFiles.length - 1, 1)
-            }
-          })
-        }
-      },
-      //压缩并上传图片
-      httpRequest(upload, name, file) {//file是需要压缩图片时，原图片
-        let _this = this;
-        var tempFormData = new FormData();
-        tempFormData.append("file", upload, name);//上传blob对象
-        this.$api.processAPI.importExcel(tempFormData).then(res => {
-          _this.fullscreenLoading = false;
-          if (res.code === 0) {//上传成功
-            _this.$message({
-              message: '上传成功',
-              type: 'success',
-              duration: 2000
-            });
-          } else {//上传失败
-            _this.fullscreenLoading = false;
-            _this.$message.error(res.msg);
-            _this.$refs.upload.uploadFiles.splice(_this.$refs.upload.uploadFiles.length - 1, 1)
-          }
-
-        });
-      },
-
-      // 下载模板
-      download() {
-        let obj = {filePath:"/gyhl-file/template/work-procedure-template.xlsx",fileName:"工序模板.xlsx"}
-        this.$api.commonAPI
-          .downLoad(obj)
-          .then(res => {
-            if(res.status == 200) {
-              window.open(res.request.responseURL)
-              this.$message({
-                message: '下载成功',
-                type: "success"
-              });
-            } else {
-              this.$message({
-                message: '下载失败',
-                type: "error"
-              });
-            }
-          })
-      },
-      // 审核
-      audit() {
-        let ids = [];
-          this.processIds.forEach(item => {
-            ids.push(item.id)
-          })
-        this.$confirm("确认审核选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.processAPI
-          .batchAudit(ids)
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                  message: res.msg,
-                  type: "success"
-                })
-                this. getList();
-            } else {
-              this.$message({
-                  message: res.msg,
-                  type: "error"
-                })
-            }
-          })
-        })
-
-      },
-      // 反审核
-      disAudit() {
-        let id = this.processIds[0].id
-        this.$confirm("确认反审核选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.processAPI
-          .backToAudit(id)
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                  message: res.msg,
-                  type: "success"
-                })
-                this. getList();
-            } else {
-              this.$message({
-                  message: res.msg,
-                  type: "error"
-                })
-            }
-          })
-        })
-
-      },
-
-      // 获取工序配置列表
-      getList() {
-        this.pictLoading = true;
-        this.$api.processAPI
-        .listProcess(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          console.log(res.data)
-          if (res.data) {
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-      },
-
-      // 跳转到编辑页面
-      gotoEdit(row) {
-        this.$router.push({ path: "/basic/process_edit", query: { id: row.id, t:Date.now() } })
-      },
-
-      // 删除
-      remove() {
-      let ids = [];
-      console.log(this.processIds)
-      this.processIds.forEach(item => {
-        ids.push(item.id)
-        console.log(ids)
-      })
-      this.$confirm("确认删除选中的工序配置吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.processAPI
-        .removeProcess(ids)
-        .then(res => {
-          if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-        })
-        .catch(error => {
-          this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-        })
-      })
-    },
-
-
-
-      // 查询
-      search() {
-        this.search_data.pageno = 1;
-        this.getList();
-      },
-
-      //  跳往新增列表
-      gotoAdd() {
-        this.$router.push({path:'/basic/process_add',query: { t: Date.now() }})
-      },
-
-      clickRow() {
-
-      },
-      // 每页显示多少条
-      handleSizeChange(val) {
-        this.search_data.pagesize = val;
-        this.getList();
-      },
-      // 上下分页
-      handleCurrentChange(val) {
-        this.search_data.pageno = val;
-        this.getList();
-      },
-        /**
-       * 处理选中
-       */
-      handleSelectionChange(val) {
-        console.log(val)
-        this.processIds = val;
-        this.setBtn(val);
-      },
-      /**
-     * 控件操作按钮状态
-     */
-        setBtn(val) {
-        let isFlag = true;
-        let isDelFlag = true;
-        if (val.length > 0) {
-          isDelFlag = false;
-          if (val.length == 1) {
-            isFlag = false;
-          }
-        } else {
-          isFlag = true;
-          isDelFlag = true;
-        }
-        this.btnDelDisabled = isDelFlag;
-        this.btnOtherDisabled = isFlag;
-      },
-    }
-  }
-
-</script>
-
-<style scoped>
-.process-form .form-inline {
-  display: inline-block;
-}
-.company-form .form-inline .el-input {
-  width: 200px;
-}
-.company-form .form-inline .el-selectt {
-  width: 200px;
-}
-.company-form textarea {
-  height: 80px;
-}
-.dialogButton{
-  margin-bottom: 20px;
-}
-</style>
+<template>
+  <div class="sys-box plan-box">
+    <div class="sys-operate">
+      <el-button type="primary" @click="gotoAdd" v-has="'basic:process:add'">新增</el-button>
+      <el-button type="primary" @click="remove" :disabled="btnDelDisabled" v-has="'basic:process:delete'">删除</el-button>
+      <el-button type="primary" @click="audit" :disabled="btnDelDisabled" v-has="'basic:process:audit'">批量审核</el-button>
+      <el-button type="primary" @click="disAudit" :disabled="btnOtherDisabled" v-has="'basic:process:reverseAudit'">反审核</el-button>
+      <el-button type="primary" @click="download()" >下载模板</el-button>
+      <el-upload
+        style="display: inline-block;margin-left: 5px"
+        ref="upload"
+        :action="uploadUrl"
+        :file-list="fileDocList"
+        :before-remove="function(){
+                       return false
+                     }"
+        :auto-upload="auto_upload"
+        :on-change="onChange"
+        v-loading.lock="fullscreenLoading"
+        class="inline-block"
+        accept=".xls,.xlsx,"
+      >
+        <el-button size="small" v-has="'basic:process:upload'" type="primary" >导入</el-button>
+      </el-upload>
+    </div>
+    <div class="sys-search">
+      <el-form inline>
+        <el-form-item label="工序名称">
+          <el-input placeholder="请输入工序名称" v-model="search_data.name" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="search">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table
+      border
+      v-loading="pictLoading"
+      ref="tb"
+      :data="tableData"
+      :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
+      @selection-change="handleSelectionChange"
+      >
+      <el-table-column type="selection" width="55" align="center"></el-table-column>
+      <el-table-column prop="code" align="center" label="工序代码" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <el-link type="primary" @click="gotoEdit(scope.row)">{{scope.row.code}}</el-link>
+        </template>
+      </el-table-column>
+      <el-table-column prop="name" align="center" label="工序名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="standard" align="center" label="基准良率" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="type" align="center" label="工序类型" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <div v-if="scope.row.type==238">普通订单</div>
+          <div v-else-if="scope.row.type==239">正常生产</div>
+          <div v-else="scope.row.type==240">返工返修</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="whetherExamine" align="center" label="是否检验" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ scope.row.whetherExamine === 1 ? '是' : '否' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="whetherCollect" align="center" label="是否自动采集" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ scope.row.whetherCollect === 1 ? '是' : '否' }}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column prop="manHour" align="center" label="单件工时（分钟）" show-overflow-tooltip></el-table-column> -->
+      <!-- <el-table-column prop="labourPrice" align="center" label="单件工价（元/件）" show-overflow-tooltip></el-table-column> -->
+      <el-table-column prop="auditSignName" align="center" label="审核状态" show-overflow-tooltip></el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="search_data.pageno"
+        :page-sizes="pageSizes"
+        :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+  import config from "@/utils/config.js";
+  import base from '@/api/base.js'; // 导入接口域名列表
+  export default {
+    data() {
+      return {
+        search_data: {
+          pageno: 1,
+          pagesize: 10
+        },
+        total: 0, //总条数
+        pageSizes: [10, 20, 50], //每页展示多少条
+        pictLoading: false,
+        btnDelDisabled: true,
+        btnOtherDisabled: true,
+        tableData: [],
+        processIds: [],
+        uploadUrl: base.uploadUrl,
+        fileDocList: [],
+        auto_upload: false,
+        fullscreenLoading: false,
+      }
+    },
+    created() {
+      var _this = this;
+      document.onkeydown = e => {
+        if (e.key === "Enter") {
+          _this.search()
+        }
+      }
+    },
+    mounted() {
+      this.getList();
+    },
+    methods: {
+      onChange(file, fileList) {
+        if (file.size > 100 * 1000000) {
+          this.$message.error('上传文件不能超过100M!');
+          this.$refs.upload.uploadFiles.splice(this.$refs.upload.uploadFiles.length - 1, 1);
+
+          return false
+        }
+        file = file.raw;
+        if (!/image\/\w+/.test(file.type)) {//非图片
+          this.fullscreenLoading = true;
+          this.httpRequest(file, file.name);
+        } else {
+          this.fullscreenLoading = true;
+          let _this = this;
+          imageConversion.compressAccurately(file, 400).then(res => {
+            if (res.size) {//压缩成功
+              _this.httpRequest(res, file.name, file);
+            } else {
+              _this.$message.error('压缩图片失败');
+              _this.fullscreenLoading = false;
+              _this.$refs.upload.uploadFiles.splice(_this.$refs.upload.uploadFiles.length - 1, 1)
+            }
+          })
+        }
+      },
+      //压缩并上传图片
+      httpRequest(upload, name, file) {//file是需要压缩图片时，原图片
+        let _this = this;
+        var tempFormData = new FormData();
+        tempFormData.append("file", upload, name);//上传blob对象
+        this.$api.processAPI.importExcel(tempFormData).then(res => {
+          _this.fullscreenLoading = false;
+          if (res.code === 0) {//上传成功
+            _this.$message({
+              message: '上传成功',
+              type: 'success',
+              duration: 2000
+            });
+          } else {//上传失败
+            _this.fullscreenLoading = false;
+            _this.$message.error(res.msg);
+            _this.$refs.upload.uploadFiles.splice(_this.$refs.upload.uploadFiles.length - 1, 1)
+          }
+
+        });
+      },
+
+      // 下载模板
+      download() {
+        let obj = {filePath:"/gyhl-file/template/work-procedure-template.xlsx",fileName:"工序模板.xlsx"}
+        this.$api.commonAPI
+          .downLoad(obj)
+          .then(res => {
+            if(res.status == 200) {
+              window.open(res.request.responseURL)
+              this.$message({
+                message: '下载成功',
+                type: "success"
+              });
+            } else {
+              this.$message({
+                message: '下载失败',
+                type: "error"
+              });
+            }
+          })
+      },
+      // 审核
+      audit() {
+        let ids = [];
+          this.processIds.forEach(item => {
+            ids.push(item.id)
+          })
+        this.$confirm("确认审核选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.processAPI
+          .batchAudit(ids)
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                  message: res.msg,
+                  type: "success"
+                })
+                this. getList();
+            } else {
+              this.$message({
+                  message: res.msg,
+                  type: "error"
+                })
+            }
+          })
+        })
+
+      },
+      // 反审核
+      disAudit() {
+        let id = this.processIds[0].id
+        this.$confirm("确认反审核选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.processAPI
+          .backToAudit(id)
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                  message: res.msg,
+                  type: "success"
+                })
+                this. getList();
+            } else {
+              this.$message({
+                  message: res.msg,
+                  type: "error"
+                })
+            }
+          })
+        })
+
+      },
+
+      // 获取工序配置列表
+      getList() {
+        this.pictLoading = true;
+        this.$api.processAPI
+        .listProcess(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          console.log(res.data)
+          if (res.data) {
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+      },
+
+      // 跳转到编辑页面
+      gotoEdit(row) {
+        this.$router.push({ path: "/basic/process_edit", query: { id: row.id, t:Date.now() } })
+      },
+
+      // 删除
+      remove() {
+      let ids = [];
+      console.log(this.processIds)
+      this.processIds.forEach(item => {
+        ids.push(item.id)
+        console.log(ids)
+      })
+      this.$confirm("确认删除选中的工序配置吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.processAPI
+        .removeProcess(ids)
+        .then(res => {
+          if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+        })
+        .catch(error => {
+          this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+        })
+      })
+    },
+
+
+
+      // 查询
+      search() {
+        this.search_data.pageno = 1;
+        this.getList();
+      },
+
+      //  跳往新增列表
+      gotoAdd() {
+        this.$router.push({path:'/basic/process_add',query: { t: Date.now() }})
+      },
+
+      clickRow() {
+
+      },
+      // 每页显示多少条
+      handleSizeChange(val) {
+        this.search_data.pagesize = val;
+        this.getList();
+      },
+      // 上下分页
+      handleCurrentChange(val) {
+        this.search_data.pageno = val;
+        this.getList();
+      },
+        /**
+       * 处理选中
+       */
+      handleSelectionChange(val) {
+        console.log(val)
+        this.processIds = val;
+        this.setBtn(val);
+      },
+      /**
+     * 控件操作按钮状态
+     */
+        setBtn(val) {
+        let isFlag = true;
+        let isDelFlag = true;
+        if (val.length > 0) {
+          isDelFlag = false;
+          if (val.length == 1) {
+            isFlag = false;
+          }
+        } else {
+          isFlag = true;
+          isDelFlag = true;
+        }
+        this.btnDelDisabled = isDelFlag;
+        this.btnOtherDisabled = isFlag;
+      },
+    }
+  }
+
+</script>
+
+<style scoped>
+.process-form .form-inline {
+  display: inline-block;
+}
+.company-form .form-inline .el-input {
+  width: 200px;
+}
+.company-form .form-inline .el-selectt {
+  width: 200px;
+}
+.company-form textarea {
+  height: 80px;
+}
+.dialogButton{
+  margin-bottom: 20px;
+}
+</style>
diff --git a/src/pages/mes/inspection/plan/index.vue b/src/pages/mes/inspection/plan/index.vue
index 067d0f5..e275312 100644
--- a/src/pages/mes/inspection/plan/index.vue
+++ b/src/pages/mes/inspection/plan/index.vue
@@ -1,434 +1,434 @@
-<template>
-  <!-- 巡检计划 -->
-  <div class="sys-box knowledge-box">
-    <div class="sys-operate">
-      <el-button type="primary" v-has="'mesInspection:plan:add'" @click="add()">新增</el-button>
-      <el-button type="primary" v-has="'mesInspection:plan:remove'" @click="remove()" :disabled="btnDelDisabled">删除</el-button>
-      <el-button type="primary" v-has="'mesInspection:plan:record'" @click="createRecord()" :disabled="btnOtherDisabled">下达</el-button>
-      <el-button type="primary" v-has="'mesInspection:plan:startUsing'" @click="startUsing()" :disabled="btnDelDisabled">启用</el-button>
-      <el-button type="primary" v-has="'mesInspection:plan:forbidden'" @click="forbidden()" :disabled="btnDelDisabled">禁用</el-button>
-
-      <!-- <el-button type="primary" @click="importPlan()">导入</el-button>
-      <el-button type="primary" @click="exportPlan()">导出</el-button>-->
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class='form_item_input_out'>
-        <el-form-item label="计划名称" style='width:22%' class="form_item-inline">
-          <el-input placeholder="计划名称" v-model="search_data.planName"></el-input>
-        </el-form-item>
-        <el-form-item label="任务状态" style='width:22%' class="form_item-inline">
-          <el-select clearable v-model="search_data.status" placeholder="任务状态">
-            <el-option
-              v-for="item in statusList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="巡检人" style='width:22%' class="form_item-inline">
-          <!-- <el-select clearable v-model="search_data.engineerId" filterable placeholder="请选择">
-            <el-option
-              v-for="item in getUserList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select> -->
-          <btn-input :valueText.sync='search_data.engineerName' :valueId.sync='search_data.engineerId' :chooseVisible.sync='chooseUserVisible'></btn-input>
-        </el-form-item>
-        <el-form-item label="计划时间" style='width:34%' class="form_item-inline">
-          <el-date-picker
-            v-model="planTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        </div>
-      <div class='form_item_btn_out'   >
-        <el-form-item>
-          <el-button type="primary" @click="search()">查询</el-button>
-        </el-form-item>
-      </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table border   @sort-change="sortChange"
-        v-loading="pictLoading"
-        :data="tableData"
-        @row-click="clickRow"
-        ref="tb"
-        @selection-change="handleSelectionChange"
-        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
-      >
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column prop="workOrderNo" align="center" label="计划单号">
-          <template slot-scope="scope">
-            <el-link type="primary" @click="viewDetail(scope.row)">{{scope.row.workOrderNo}}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="planName" label="计划名称" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column sortable="custom" width="110" prop="statusId" align="center" label="任务状态">
-          <template slot-scope="scope">
-            <span>{{scope.row.statusName}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="deptName" align="center" label="巡检部门"></el-table-column>
-        <el-table-column prop="userName" align="center" label="巡检人"></el-table-column>
-        <el-table-column sortable="custom" prop="startTime" align="center" label="计划开始时间" width="124" show-overflow-tooltip></el-table-column>
-        <el-table-column sortable="custom" prop="endTime" align="center" label="计划完成时间"  width="124" show-overflow-tooltip></el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="search_data.pageno"
-        :page-sizes="pageSizes"
-        :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
-    </div>
-
-    <!-- 选择负责人-->
-    <dialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser" ></dialogChooseSingleUser>
-  </div>
-</template>
-
-<script>
-import { formatDateTime } from "@/utils/tools.js";
-import btnInput from "@/components/btnInput.vue";
-import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-export default {
-  name: "mesInspection_plan",
-  components: {
-    btnInput,dialogChooseSingleUser,
-  },
-  data() {
-    return {
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10
-      },
-
-      planTime: "",
-
-      statusList: [], //计划状态
-      getUserList: [], //用户
-
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      chooseUserVisible: false,
-      rowIds: [],
-      tableData: [],
-      dialogVisible: false,
-      pictLoading: false
-    };
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search()
-      }
-    }
-  },
-  mounted() {
-    this.getList();
-    this.initData();
-  },
-  methods: {
-    // 下达
-    createRecord(row){
-      let id = this.rowIds[0].id
-      this.$api.mesPatroPlanAPI.createRecordList(id).then(res=>{
-        if (res.code === 0) {
-          this.$message({
-            message: res.msg,
-            type: "success"
-          });
-        }else {
-          this.$message({
-            message: res.msg,
-            type: "error"
-          });
-        }
-      }).catch(err=>{
-
-      })
-    },
-    /**
-     * 获取选择的负责人
-     */
-    getUser(val){
-      if (val) {
-        this.$set(this.search_data,'engineerName',val.name)
-        this.$set(this.search_data,'engineerId',val.id)
-      }else{
-        this.$set(this.search_data,'engineerName',"")
-        this.$set(this.search_data,'engineerId',"")
-      }
-    },
-    sortChange({ column, prop, order }){
-      let j={ column, prop, order };
-      let order_=j.order=="ascending"?'asc':'desc'
-      this.$set(this.search_data,'sort',j.prop)
-      this.$set(this.search_data,'order',order_)
-      this.getList();
-    },
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-    /**
-     * 启用
-     */
-    startUsing() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认启用选中的巡检计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.mesPatroPlanAPI
-          .startUsing({ids: ids})
-          .then(res => {
-            console.log(res);
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ?res.msg: "启用失败，请重试"  ,
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "启用失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 禁用
-     */
-    forbidden() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认禁用选中的巡检计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.mesPatroPlanAPI
-          .forbidden({ids: ids})
-          .then(res => {
-            console.log(res);
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ?res.msg: "禁用失败，请重试"  ,
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "禁用失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    initData() {
-      Promise.all([
-        this.$api.commonAPI.getUsers(),
-        this.$api.dictAPI.getDictsByType("plan_status")
-      ])
-        .then(([r1, r2]) => {
-          if (r1.code === 0) {
-            this.getUserList = r1.datas;
-          }
-          if (r2.code === 0) {
-            this.statusList = r2.datas;
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    /**
-     * 获取列表
-     */
-    getList() {
-      if (this.planTime) {
-        this.search_data.startTime = formatDateTime(this.planTime[0]);
-        this.search_data.endTime = formatDateTime(this.planTime[1]);
-      } else {
-        this.search_data.startTime = "";
-        this.search_data.endTime = "";
-      }
-      this.pictLoading = true;
-      this.$api.mesPatroPlanAPI
-        .planList(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.data) {
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    /**
-     * 新增
-     */
-    add() {
-      this.$router.push({
-        path: "/mesInspection/plan_add",
-        query: {
-          t: Date.now()
-        }
-      });
-    },
-    /**
-     * 查看明细
-     */
-    viewDetail(r) {
-      if (r.statusId === 146) {
-        this.$router.push({
-          path: "/mesInspection/plan_add",
-          query: { id: r.id, t: Date.now() }
-        });
-      } else {
-        this.$router.push({
-          path: "/mesInspection/plan_detail",
-          query: { id: r.id, t: Date.now() }
-        });
-      }
-    },
-    /**
-     * 导入
-     */
-    importPlan() {},
-    /**
-     * 导出
-     */
-    exportPlan() {},
-    /**
-     *查看明细
-     */
-    openDetails(r) {
-      this.$router.push({
-        path: "/mesInspection/detail",
-        query: { id: r.id, t: Date.now() }
-      });
-    },
-
-    /**
-     * 删除POST /apis/patrolPlan/batcnRemovePlan
-     */
-    remove() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      // const ids = this.rowIds.map(item => item.id).toString();
-      let params = { ids: ids };
-      this.$confirm("确认删除选中的巡检计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.mesPatroPlanAPI
-          .batcnRemovePlan(params)
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    }
-  }
-};
-</script>
-
-<style scoped>
-</style>
+<template>
+  <!-- 巡检计划 -->
+  <div class="sys-box knowledge-box">
+    <div class="sys-operate">
+      <el-button type="primary" v-has="'mesInspection:plan:add'" @click="add()">新增</el-button>
+      <el-button type="primary" v-has="'mesInspection:plan:remove'" @click="remove()" :disabled="btnDelDisabled">删除</el-button>
+      <el-button type="primary" v-has="'mesInspection:plan:record'" @click="createRecord()" :disabled="btnOtherDisabled">下达</el-button>
+      <el-button type="primary" v-has="'mesInspection:plan:startUsing'" @click="startUsing()" :disabled="btnDelDisabled">启用</el-button>
+      <el-button type="primary" v-has="'mesInspection:plan:forbidden'" @click="forbidden()" :disabled="btnDelDisabled">禁用</el-button>
+
+      <!-- <el-button type="primary" @click="importPlan()">导入</el-button>
+      <el-button type="primary" @click="exportPlan()">导出</el-button>-->
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class='form_item_input_out'>
+        <el-form-item label="计划名称" style='width:22%' class="form_item-inline">
+          <el-input placeholder="计划名称" v-model="search_data.planName"></el-input>
+        </el-form-item>
+        <el-form-item label="任务状态" style='width:22%' class="form_item-inline">
+          <el-select clearable v-model="search_data.status" placeholder="任务状态">
+            <el-option
+              v-for="item in statusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="巡检人" style='width:22%' class="form_item-inline">
+          <!-- <el-select clearable v-model="search_data.engineerId" filterable placeholder="请选择">
+            <el-option
+              v-for="item in getUserList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select> -->
+          <btn-input :valueText.sync='search_data.engineerName' :valueId.sync='search_data.engineerId' :chooseVisible.sync='chooseUserVisible'></btn-input>
+        </el-form-item>
+        <el-form-item label="计划时间" style='width:34%' class="form_item-inline">
+          <el-date-picker
+            v-model="planTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        </div>
+      <div class='form_item_btn_out'   >
+        <el-form-item>
+          <el-button type="primary" @click="search()">查询</el-button>
+        </el-form-item>
+      </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table border   @sort-change="sortChange"
+        v-loading="pictLoading"
+        :data="tableData"
+        @row-click="clickRow"
+        ref="tb"
+        @selection-change="handleSelectionChange"
+        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
+      >
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="workOrderNo" align="center" label="计划单号">
+          <template slot-scope="scope">
+            <el-link type="primary" @click="viewDetail(scope.row)">{{scope.row.workOrderNo}}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="planName" label="计划名称" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column sortable="custom" width="110" prop="statusId" align="center" label="任务状态">
+          <template slot-scope="scope">
+            <span>{{scope.row.statusName}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="deptName" align="center" label="巡检部门"></el-table-column>
+        <el-table-column prop="userName" align="center" label="巡检人"></el-table-column>
+        <el-table-column sortable="custom" prop="startTime" align="center" label="计划开始时间" width="124" show-overflow-tooltip></el-table-column>
+        <el-table-column sortable="custom" prop="endTime" align="center" label="计划完成时间"  width="124" show-overflow-tooltip></el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="search_data.pageno"
+        :page-sizes="pageSizes"
+        :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+
+    <!-- 选择负责人-->
+    <dialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser" ></dialogChooseSingleUser>
+  </div>
+</template>
+
+<script>
+import { formatDateTime } from "@/utils/tools.js";
+import btnInput from "@/components/btnInput.vue";
+import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+export default {
+  name: "mesInspection_plan",
+  components: {
+    btnInput,dialogChooseSingleUser,
+  },
+  data() {
+    return {
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10
+      },
+
+      planTime: "",
+
+      statusList: [], //计划状态
+      getUserList: [], //用户
+
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      chooseUserVisible: false,
+      rowIds: [],
+      tableData: [],
+      dialogVisible: false,
+      pictLoading: false
+    };
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search()
+      }
+    }
+  },
+  mounted() {
+    this.getList();
+    this.initData();
+  },
+  methods: {
+    // 下达
+    createRecord(row){
+      let id = this.rowIds[0].id
+      this.$api.mesPatroPlanAPI.createRecordList(id).then(res=>{
+        if (res.code === 0) {
+          this.$message({
+            message: res.msg,
+            type: "success"
+          });
+        }else {
+          this.$message({
+            message: res.msg,
+            type: "error"
+          });
+        }
+      }).catch(err=>{
+
+      })
+    },
+    /**
+     * 获取选择的负责人
+     */
+    getUser(val){
+      if (val) {
+        this.$set(this.search_data,'engineerName',val.name)
+        this.$set(this.search_data,'engineerId',val.id)
+      }else{
+        this.$set(this.search_data,'engineerName',"")
+        this.$set(this.search_data,'engineerId',"")
+      }
+    },
+    sortChange({ column, prop, order }){
+      let j={ column, prop, order };
+      let order_=j.order=="ascending"?'asc':'desc'
+      this.$set(this.search_data,'sort',j.prop)
+      this.$set(this.search_data,'order',order_)
+      this.getList();
+    },
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+    /**
+     * 启用
+     */
+    startUsing() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认启用选中的巡检计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.mesPatroPlanAPI
+          .startUsing({ids: ids})
+          .then(res => {
+            console.log(res);
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ?res.msg: "启用失败，请重试"  ,
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "启用失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 禁用
+     */
+    forbidden() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认禁用选中的巡检计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.mesPatroPlanAPI
+          .forbidden({ids: ids})
+          .then(res => {
+            console.log(res);
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ?res.msg: "禁用失败，请重试"  ,
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "禁用失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    initData() {
+      Promise.all([
+        this.$api.commonAPI.getUsers(),
+        this.$api.dictAPI.getDictsByType("plan_status")
+      ])
+        .then(([r1, r2]) => {
+          if (r1.code === 0) {
+            this.getUserList = r1.datas;
+          }
+          if (r2.code === 0) {
+            this.statusList = r2.datas;
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    /**
+     * 获取列表
+     */
+    getList() {
+      if (this.planTime) {
+        this.search_data.startTime = formatDateTime(this.planTime[0]);
+        this.search_data.endTime = formatDateTime(this.planTime[1]);
+      } else {
+        this.search_data.startTime = "";
+        this.search_data.endTime = "";
+      }
+      this.pictLoading = true;
+      this.$api.mesPatroPlanAPI
+        .planList(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.data) {
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    /**
+     * 新增
+     */
+    add() {
+      this.$router.push({
+        path: "/mesInspection/plan_add",
+        query: {
+          t: Date.now()
+        }
+      });
+    },
+    /**
+     * 查看明细
+     */
+    viewDetail(r) {
+      if (r.statusId === 146) {
+        this.$router.push({
+          path: "/mesInspection/plan_add",
+          query: { id: r.id, t: Date.now() }
+        });
+      } else {
+        this.$router.push({
+          path: "/mesInspection/plan_detail",
+          query: { id: r.id, t: Date.now() }
+        });
+      }
+    },
+    /**
+     * 导入
+     */
+    importPlan() {},
+    /**
+     * 导出
+     */
+    exportPlan() {},
+    /**
+     *查看明细
+     */
+    openDetails(r) {
+      this.$router.push({
+        path: "/mesInspection/detail",
+        query: { id: r.id, t: Date.now() }
+      });
+    },
+
+    /**
+     * 删除POST /apis/patrolPlan/batcnRemovePlan
+     */
+    remove() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      // const ids = this.rowIds.map(item => item.id).toString();
+      let params = { ids: ids };
+      this.$confirm("确认删除选中的巡检计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.mesPatroPlanAPI
+          .batcnRemovePlan(params)
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    }
+  }
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/pages/mes/inspection/plan/index_1.vue b/src/pages/mes/inspection/plan/index_1.vue
index 067d0f5..e275312 100644
--- a/src/pages/mes/inspection/plan/index_1.vue
+++ b/src/pages/mes/inspection/plan/index_1.vue
@@ -1,434 +1,434 @@
-<template>
-  <!-- 巡检计划 -->
-  <div class="sys-box knowledge-box">
-    <div class="sys-operate">
-      <el-button type="primary" v-has="'mesInspection:plan:add'" @click="add()">新增</el-button>
-      <el-button type="primary" v-has="'mesInspection:plan:remove'" @click="remove()" :disabled="btnDelDisabled">删除</el-button>
-      <el-button type="primary" v-has="'mesInspection:plan:record'" @click="createRecord()" :disabled="btnOtherDisabled">下达</el-button>
-      <el-button type="primary" v-has="'mesInspection:plan:startUsing'" @click="startUsing()" :disabled="btnDelDisabled">启用</el-button>
-      <el-button type="primary" v-has="'mesInspection:plan:forbidden'" @click="forbidden()" :disabled="btnDelDisabled">禁用</el-button>
-
-      <!-- <el-button type="primary" @click="importPlan()">导入</el-button>
-      <el-button type="primary" @click="exportPlan()">导出</el-button>-->
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class='form_item_input_out'>
-        <el-form-item label="计划名称" style='width:22%' class="form_item-inline">
-          <el-input placeholder="计划名称" v-model="search_data.planName"></el-input>
-        </el-form-item>
-        <el-form-item label="任务状态" style='width:22%' class="form_item-inline">
-          <el-select clearable v-model="search_data.status" placeholder="任务状态">
-            <el-option
-              v-for="item in statusList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="巡检人" style='width:22%' class="form_item-inline">
-          <!-- <el-select clearable v-model="search_data.engineerId" filterable placeholder="请选择">
-            <el-option
-              v-for="item in getUserList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select> -->
-          <btn-input :valueText.sync='search_data.engineerName' :valueId.sync='search_data.engineerId' :chooseVisible.sync='chooseUserVisible'></btn-input>
-        </el-form-item>
-        <el-form-item label="计划时间" style='width:34%' class="form_item-inline">
-          <el-date-picker
-            v-model="planTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        </div>
-      <div class='form_item_btn_out'   >
-        <el-form-item>
-          <el-button type="primary" @click="search()">查询</el-button>
-        </el-form-item>
-      </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table border   @sort-change="sortChange"
-        v-loading="pictLoading"
-        :data="tableData"
-        @row-click="clickRow"
-        ref="tb"
-        @selection-change="handleSelectionChange"
-        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
-      >
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column prop="workOrderNo" align="center" label="计划单号">
-          <template slot-scope="scope">
-            <el-link type="primary" @click="viewDetail(scope.row)">{{scope.row.workOrderNo}}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="planName" label="计划名称" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column sortable="custom" width="110" prop="statusId" align="center" label="任务状态">
-          <template slot-scope="scope">
-            <span>{{scope.row.statusName}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="deptName" align="center" label="巡检部门"></el-table-column>
-        <el-table-column prop="userName" align="center" label="巡检人"></el-table-column>
-        <el-table-column sortable="custom" prop="startTime" align="center" label="计划开始时间" width="124" show-overflow-tooltip></el-table-column>
-        <el-table-column sortable="custom" prop="endTime" align="center" label="计划完成时间"  width="124" show-overflow-tooltip></el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="search_data.pageno"
-        :page-sizes="pageSizes"
-        :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
-    </div>
-
-    <!-- 选择负责人-->
-    <dialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser" ></dialogChooseSingleUser>
-  </div>
-</template>
-
-<script>
-import { formatDateTime } from "@/utils/tools.js";
-import btnInput from "@/components/btnInput.vue";
-import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-export default {
-  name: "mesInspection_plan",
-  components: {
-    btnInput,dialogChooseSingleUser,
-  },
-  data() {
-    return {
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10
-      },
-
-      planTime: "",
-
-      statusList: [], //计划状态
-      getUserList: [], //用户
-
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      chooseUserVisible: false,
-      rowIds: [],
-      tableData: [],
-      dialogVisible: false,
-      pictLoading: false
-    };
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search()
-      }
-    }
-  },
-  mounted() {
-    this.getList();
-    this.initData();
-  },
-  methods: {
-    // 下达
-    createRecord(row){
-      let id = this.rowIds[0].id
-      this.$api.mesPatroPlanAPI.createRecordList(id).then(res=>{
-        if (res.code === 0) {
-          this.$message({
-            message: res.msg,
-            type: "success"
-          });
-        }else {
-          this.$message({
-            message: res.msg,
-            type: "error"
-          });
-        }
-      }).catch(err=>{
-
-      })
-    },
-    /**
-     * 获取选择的负责人
-     */
-    getUser(val){
-      if (val) {
-        this.$set(this.search_data,'engineerName',val.name)
-        this.$set(this.search_data,'engineerId',val.id)
-      }else{
-        this.$set(this.search_data,'engineerName',"")
-        this.$set(this.search_data,'engineerId',"")
-      }
-    },
-    sortChange({ column, prop, order }){
-      let j={ column, prop, order };
-      let order_=j.order=="ascending"?'asc':'desc'
-      this.$set(this.search_data,'sort',j.prop)
-      this.$set(this.search_data,'order',order_)
-      this.getList();
-    },
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-    /**
-     * 启用
-     */
-    startUsing() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认启用选中的巡检计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.mesPatroPlanAPI
-          .startUsing({ids: ids})
-          .then(res => {
-            console.log(res);
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ?res.msg: "启用失败，请重试"  ,
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "启用失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 禁用
-     */
-    forbidden() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      this.$confirm("确认禁用选中的巡检计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.mesPatroPlanAPI
-          .forbidden({ids: ids})
-          .then(res => {
-            console.log(res);
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ?res.msg: "禁用失败，请重试"  ,
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "禁用失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    initData() {
-      Promise.all([
-        this.$api.commonAPI.getUsers(),
-        this.$api.dictAPI.getDictsByType("plan_status")
-      ])
-        .then(([r1, r2]) => {
-          if (r1.code === 0) {
-            this.getUserList = r1.datas;
-          }
-          if (r2.code === 0) {
-            this.statusList = r2.datas;
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    /**
-     * 获取列表
-     */
-    getList() {
-      if (this.planTime) {
-        this.search_data.startTime = formatDateTime(this.planTime[0]);
-        this.search_data.endTime = formatDateTime(this.planTime[1]);
-      } else {
-        this.search_data.startTime = "";
-        this.search_data.endTime = "";
-      }
-      this.pictLoading = true;
-      this.$api.mesPatroPlanAPI
-        .planList(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.data) {
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    /**
-     * 新增
-     */
-    add() {
-      this.$router.push({
-        path: "/mesInspection/plan_add",
-        query: {
-          t: Date.now()
-        }
-      });
-    },
-    /**
-     * 查看明细
-     */
-    viewDetail(r) {
-      if (r.statusId === 146) {
-        this.$router.push({
-          path: "/mesInspection/plan_add",
-          query: { id: r.id, t: Date.now() }
-        });
-      } else {
-        this.$router.push({
-          path: "/mesInspection/plan_detail",
-          query: { id: r.id, t: Date.now() }
-        });
-      }
-    },
-    /**
-     * 导入
-     */
-    importPlan() {},
-    /**
-     * 导出
-     */
-    exportPlan() {},
-    /**
-     *查看明细
-     */
-    openDetails(r) {
-      this.$router.push({
-        path: "/mesInspection/detail",
-        query: { id: r.id, t: Date.now() }
-      });
-    },
-
-    /**
-     * 删除POST /apis/patrolPlan/batcnRemovePlan
-     */
-    remove() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      // const ids = this.rowIds.map(item => item.id).toString();
-      let params = { ids: ids };
-      this.$confirm("确认删除选中的巡检计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.mesPatroPlanAPI
-          .batcnRemovePlan(params)
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    }
-  }
-};
-</script>
-
-<style scoped>
-</style>
+<template>
+  <!-- 巡检计划 -->
+  <div class="sys-box knowledge-box">
+    <div class="sys-operate">
+      <el-button type="primary" v-has="'mesInspection:plan:add'" @click="add()">新增</el-button>
+      <el-button type="primary" v-has="'mesInspection:plan:remove'" @click="remove()" :disabled="btnDelDisabled">删除</el-button>
+      <el-button type="primary" v-has="'mesInspection:plan:record'" @click="createRecord()" :disabled="btnOtherDisabled">下达</el-button>
+      <el-button type="primary" v-has="'mesInspection:plan:startUsing'" @click="startUsing()" :disabled="btnDelDisabled">启用</el-button>
+      <el-button type="primary" v-has="'mesInspection:plan:forbidden'" @click="forbidden()" :disabled="btnDelDisabled">禁用</el-button>
+
+      <!-- <el-button type="primary" @click="importPlan()">导入</el-button>
+      <el-button type="primary" @click="exportPlan()">导出</el-button>-->
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class='form_item_input_out'>
+        <el-form-item label="计划名称" style='width:22%' class="form_item-inline">
+          <el-input placeholder="计划名称" v-model="search_data.planName"></el-input>
+        </el-form-item>
+        <el-form-item label="任务状态" style='width:22%' class="form_item-inline">
+          <el-select clearable v-model="search_data.status" placeholder="任务状态">
+            <el-option
+              v-for="item in statusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="巡检人" style='width:22%' class="form_item-inline">
+          <!-- <el-select clearable v-model="search_data.engineerId" filterable placeholder="请选择">
+            <el-option
+              v-for="item in getUserList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select> -->
+          <btn-input :valueText.sync='search_data.engineerName' :valueId.sync='search_data.engineerId' :chooseVisible.sync='chooseUserVisible'></btn-input>
+        </el-form-item>
+        <el-form-item label="计划时间" style='width:34%' class="form_item-inline">
+          <el-date-picker
+            v-model="planTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        </div>
+      <div class='form_item_btn_out'   >
+        <el-form-item>
+          <el-button type="primary" @click="search()">查询</el-button>
+        </el-form-item>
+      </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table border   @sort-change="sortChange"
+        v-loading="pictLoading"
+        :data="tableData"
+        @row-click="clickRow"
+        ref="tb"
+        @selection-change="handleSelectionChange"
+        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
+      >
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="workOrderNo" align="center" label="计划单号">
+          <template slot-scope="scope">
+            <el-link type="primary" @click="viewDetail(scope.row)">{{scope.row.workOrderNo}}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="planName" label="计划名称" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column sortable="custom" width="110" prop="statusId" align="center" label="任务状态">
+          <template slot-scope="scope">
+            <span>{{scope.row.statusName}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="deptName" align="center" label="巡检部门"></el-table-column>
+        <el-table-column prop="userName" align="center" label="巡检人"></el-table-column>
+        <el-table-column sortable="custom" prop="startTime" align="center" label="计划开始时间" width="124" show-overflow-tooltip></el-table-column>
+        <el-table-column sortable="custom" prop="endTime" align="center" label="计划完成时间"  width="124" show-overflow-tooltip></el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="search_data.pageno"
+        :page-sizes="pageSizes"
+        :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+
+    <!-- 选择负责人-->
+    <dialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser" ></dialogChooseSingleUser>
+  </div>
+</template>
+
+<script>
+import { formatDateTime } from "@/utils/tools.js";
+import btnInput from "@/components/btnInput.vue";
+import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+export default {
+  name: "mesInspection_plan",
+  components: {
+    btnInput,dialogChooseSingleUser,
+  },
+  data() {
+    return {
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10
+      },
+
+      planTime: "",
+
+      statusList: [], //计划状态
+      getUserList: [], //用户
+
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      chooseUserVisible: false,
+      rowIds: [],
+      tableData: [],
+      dialogVisible: false,
+      pictLoading: false
+    };
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search()
+      }
+    }
+  },
+  mounted() {
+    this.getList();
+    this.initData();
+  },
+  methods: {
+    // 下达
+    createRecord(row){
+      let id = this.rowIds[0].id
+      this.$api.mesPatroPlanAPI.createRecordList(id).then(res=>{
+        if (res.code === 0) {
+          this.$message({
+            message: res.msg,
+            type: "success"
+          });
+        }else {
+          this.$message({
+            message: res.msg,
+            type: "error"
+          });
+        }
+      }).catch(err=>{
+
+      })
+    },
+    /**
+     * 获取选择的负责人
+     */
+    getUser(val){
+      if (val) {
+        this.$set(this.search_data,'engineerName',val.name)
+        this.$set(this.search_data,'engineerId',val.id)
+      }else{
+        this.$set(this.search_data,'engineerName',"")
+        this.$set(this.search_data,'engineerId',"")
+      }
+    },
+    sortChange({ column, prop, order }){
+      let j={ column, prop, order };
+      let order_=j.order=="ascending"?'asc':'desc'
+      this.$set(this.search_data,'sort',j.prop)
+      this.$set(this.search_data,'order',order_)
+      this.getList();
+    },
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+    /**
+     * 启用
+     */
+    startUsing() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认启用选中的巡检计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.mesPatroPlanAPI
+          .startUsing({ids: ids})
+          .then(res => {
+            console.log(res);
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ?res.msg: "启用失败，请重试"  ,
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "启用失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 禁用
+     */
+    forbidden() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      this.$confirm("确认禁用选中的巡检计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.mesPatroPlanAPI
+          .forbidden({ids: ids})
+          .then(res => {
+            console.log(res);
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ?res.msg: "禁用失败，请重试"  ,
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "禁用失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    initData() {
+      Promise.all([
+        this.$api.commonAPI.getUsers(),
+        this.$api.dictAPI.getDictsByType("plan_status")
+      ])
+        .then(([r1, r2]) => {
+          if (r1.code === 0) {
+            this.getUserList = r1.datas;
+          }
+          if (r2.code === 0) {
+            this.statusList = r2.datas;
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    /**
+     * 获取列表
+     */
+    getList() {
+      if (this.planTime) {
+        this.search_data.startTime = formatDateTime(this.planTime[0]);
+        this.search_data.endTime = formatDateTime(this.planTime[1]);
+      } else {
+        this.search_data.startTime = "";
+        this.search_data.endTime = "";
+      }
+      this.pictLoading = true;
+      this.$api.mesPatroPlanAPI
+        .planList(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.data) {
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    /**
+     * 新增
+     */
+    add() {
+      this.$router.push({
+        path: "/mesInspection/plan_add",
+        query: {
+          t: Date.now()
+        }
+      });
+    },
+    /**
+     * 查看明细
+     */
+    viewDetail(r) {
+      if (r.statusId === 146) {
+        this.$router.push({
+          path: "/mesInspection/plan_add",
+          query: { id: r.id, t: Date.now() }
+        });
+      } else {
+        this.$router.push({
+          path: "/mesInspection/plan_detail",
+          query: { id: r.id, t: Date.now() }
+        });
+      }
+    },
+    /**
+     * 导入
+     */
+    importPlan() {},
+    /**
+     * 导出
+     */
+    exportPlan() {},
+    /**
+     *查看明细
+     */
+    openDetails(r) {
+      this.$router.push({
+        path: "/mesInspection/detail",
+        query: { id: r.id, t: Date.now() }
+      });
+    },
+
+    /**
+     * 删除POST /apis/patrolPlan/batcnRemovePlan
+     */
+    remove() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      // const ids = this.rowIds.map(item => item.id).toString();
+      let params = { ids: ids };
+      this.$confirm("确认删除选中的巡检计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.mesPatroPlanAPI
+          .batcnRemovePlan(params)
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    }
+  }
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/pages/mes/jobShop/workReport/index.vue b/src/pages/mes/jobShop/workReport/index.vue
index f31686e..5d80767 100644
--- a/src/pages/mes/jobShop/workReport/index.vue
+++ b/src/pages/mes/jobShop/workReport/index.vue
@@ -1,1072 +1,1106 @@
-<template>
-  <div class="sys-task sys-box">
-    <div class="sys-operate sys-tabs">
-      <el-button type="primary" @click="remove()" :disabled="btnDelDisabled" v-has="'jobShop:reportWork:delete'">删除</el-button>
-      <el-button type="primary" @click="rework()" :disabled="btnOtherDisabled" v-has="'jobShop:reportWork:rework'">返工返修</el-button>
-      <el-button type="primary" @click="edit()" :disabled="btnOtherDisabled" v-has="'jobShop:reportWork:edit'">编辑</el-button>
-      <el-button type="primary" @click="showColumnSetDialog">{{config.configureBtnName}}</el-button>
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out ">
-        <div class='form_item_input_out'>
-          <el-form-item label="日期" style='width:31%' class="form_item-inline">
-          <el-date-picker
-            v-model="search_data.time"
-            type="daterange"
-            format="yyyy-MM-dd"
-            range-separator="—"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="操作工" style='width:23%' class="form_item-inline">
-          <!-- <el-input placeholder="请选择" clearable v-model="search_data.operatorName">
-            <el-button slot="append" @click="chooseUserVisible = true" icon="el-icon-search"></el-button>
-          </el-input> -->
-          <btn-input :valueText.sync='search_data.operatorName' :valueId.sync='search_data.operatorName' :chooseVisible.sync='chooseUserVisible'></btn-input>
-        </el-form-item>
-        <el-form-item label="工序名" style='width:23%' class="form_item-inline">
-          <!-- <el-input placeholder="请选择" clearable v-model="search_data.processName">
-            <el-button slot="append" @click="chooseProcessVisible = true" icon="el-icon-search"></el-button>
-          </el-input> -->
-          <btn-input :valueText.sync='search_data.processName' :valueId.sync='search_data.processName' :chooseVisible.sync='chooseProcessVisible'></btn-input>
-        </el-form-item>
-        <el-form-item label="产品名" style='width:23%' class="form_item-inline">
-          <!-- <el-input placeholder="请选择" clearable v-model="search_data.materielName">
-            <el-button slot="append" @click="chooseMaterielVisible = true" icon="el-icon-search"></el-button>
-          </el-input> -->
-          <btn-input :valueText.sync='search_data.materielName' :valueId.sync='search_data.materielName' :chooseVisible.sync='chooseMaterielVisible'></btn-input>
-        </el-form-item>
-        </div>
-      <div class='form_item_btn_out'   >
-        <el-form-item>
-          <el-button type="primary" @click="search()">查询</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="moreSearch()">高级查询</el-button>
-        </el-form-item>
-      </div>
-      </el-form>
-    </div>
-
-    <div class="sys-table">
-      <el-table border
-        fit  @sort-change="sortChange"
-        v-if="formTableData.length>0"
-        v-loading="pictLoading"
-        @row-click="clickRow"
-        ref="tb"
-        show-summary
-        :summary-method="getSummaries"
-        :data="tableData"
-        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
-        @selection-change="handleSelectionChange"
-      >
-      <el-table-column type="selection" width="55" align="center"></el-table-column>
-      <el-table-column v-for="(items,index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
-                         align="center" show-overflow-tooltip :sortable="(items.prop_=='createTime')?'custom':false">
-             <template slot-scope="scope">
-               <div>
-                   <div v-if="items.prop_=='proPlanWorkOrderNo'">
-                    <el-link type="primary" @click.stop="viewDetail(scope.row)">{{scope.row.proPlanWorkOrderNo}}</el-link>
-                  </div>
-                  <div v-else-if="items.prop_=='planWorkOrderNo'">
-                    <el-link type="primary" @click.stop="viewDetail1(scope.row)">{{scope.row.planWorkOrderNo}}</el-link>
-                  </div>
-                 <div v-else>
-                   <div style="overflow:hidden">{{scope.row[items.prop_]}}</div>
-                 </div>
-               </div>
-               </template>
-       </el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="search_data.pageno"
-        :page-sizes="pageSizes"
-        :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
-    </div>
-
-    <el-dialog center title="" width="800px" :visible.sync="RollBackVisible">
-      <el-form
-        v-loading="dialogLoading"
-        label-width="160px"
-        :model="formData"
-        :rules="rulesForm"
-        class="company-form"
-        ref="form"
-      >
-        <!--工序计划单号-->
-        <el-form-item prop="planNo" label="工序计划" class="form-inline">
-          <el-input placeholder="" v-model="formData.planNo" readonly></el-input>
-        </el-form-item>
-        <el-form-item prop="reportCode" label="报工单号" class="form-inline">
-          <el-input placeholder="" v-model="formData.reportCode" readonly></el-input>
-        </el-form-item>
-        <el-form-item prop="createTime" label="报工日期" class="form-inline">
-          <el-date-picker readonly
-                          v-model="formData.createTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder=""
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item prop="deptName" label="生产部门" class="form-inline">
-          <el-input placeholder="" v-model="formData.deptName" readonly></el-input>
-        </el-form-item>
-        <el-form-item prop="deviceName" label="加工设备" class="form-inline">
-          <el-input placeholder="" v-model="formData.deviceName" readonly></el-input>
-        </el-form-item>
-        <el-form-item prop="operatorName" label="操作工" class="form-inline">
-          <el-input placeholder="" v-model="formData.operatorName" readonly></el-input>
-        </el-form-item>
-        <el-form-item prop="createName" label="报工人员" class="form-inline">
-          <el-input placeholder="" v-model="formData.createName" readonly></el-input>
-        </el-form-item>
-        <el-form-item prop="processName" label="汇报工序" class="form-inline">
-          <el-input placeholder="" v-model="formData.processName" readonly></el-input>
-        </el-form-item>
-        <el-form-item prop="serialNo" label="产品代码" class="form-inline">
-          <el-input placeholder="" v-model="formData.serialNo" readonly></el-input>
-        </el-form-item>
-        <el-form-item prop="materielName" label="产品名称" class="form-inline">
-          <el-input placeholder="" v-model="formData.materielName" readonly></el-input>
-        </el-form-item>
-        <el-form-item prop="specification" label="规格型号" class="form-inline">
-          <el-input placeholder="" v-model="formData.specification" readonly></el-input>
-        </el-form-item>
-            <el-form-item prop="unitName" label="主计量单位" class="form-inline">
-                <el-input placeholder="" v-model="formData.unitName" readonly></el-input>
-           </el-form-item>
-          <el-form-item prop="unitName" label="辅助单位" class="form-inline">
-              <!-- :disabled="formData.status==148" -->
-            <el-select clearable style="width:90% !important" v-model="formData.supportUomName" filterable placeholder="请选择辅助单位">
-              <el-option v-for="item in uomList" :key="item.id" :label="item.name" :value="item.id"  :disabled="formData.status==148"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="unitName" label="换算系数" class="form-inline">
-              <el-input-number :min="0"
-                               size="small"
-                               v-model="formData.convCoefficient"
-                               controls-position="right"
-                               style="width: 100%"
-                               class="inputClass"
-                              @change="changeConvCoefficient">
-              </el-input-number>
-          </el-form-item>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item prop="completion_count" label="完工数量(主单位)" class="form-inline">
-              <el-input placeholder="" v-model="formData.completion_count" readonly></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="completionCountSupport" label="完工数量(辅单位)" class="form-inline">
-                  <el-input-number v-model="formData.completionCountSupport"
-                                   ref="ipOne"
-                                   style="width: 100%"
-                                   label=""
-                                   controls-position="right"
-                                   :min="0"
-                                   size="small"
-                                   @change="changeCompletionCountSupport" >
-                  </el-input-number>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item prop="conformity_count" label="合格数量(主单位)" class="form-inline">
-              <el-input placeholder="" v-model="formData.conformity_count" readonly></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="conformityCountSupport" label="合格数量(辅单位)" class="form-inline">
-              <el-input-number v-model="formData.conformityCountSupport"
-                               style="width: 100%"
-                               id="ipTwo"
-                               label=""
-                               :disabled="formData.isExamine==1"
-                               controls-position="right"
-                               :min="0"
-                               @change="changeConformityCountSupport" >
-                               size="small">
-              </el-input-number>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item prop="rework_count" label="返工数量(主单位)" class="form-inline">
-              <el-input placeholder="" v-model="formData.rework_count" readonly></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item  label-position="top" prop="reworkCountSupport" label="返工数量(辅单位)" size="mini"   class="form-inline">
-              <el-input-number v-model="formData.reworkCountSupport"
-                               style="..."
-                               id="ipThree"
-                               :disabled="formData.isExamine==1"
-                               controls-position="right"
-                               label=""
-                               :min="0"
-                               @change="changeReworkCountSupport" >
-                               size="mini">
-              </el-input-number>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item prop="scrap_count" label="报废数量(主单位)" class="form-inline">
-              <el-input placeholder="" v-model="formData.scrap_count" readonly></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label-position="top" prop="scrapCountSupport" label="报废数量(辅单位)" size="mini"  class="form-inline">
-              <el-input-number v-model="formData.scrapCountSupport"
-                               style="width: 100%"
-                               label=""
-                               id="ipFour"
-                               :disabled="formData.isExamine==1"
-                               controls-position="right"
-                               :min="0"
-                               @change="changeScrapCountSupport" >
-                               size="mini">
-              </el-input-number>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="saveAndChange('form')">保存</el-button>
-            <el-button type="primary" @click="RollBackVisible = false">{{config.cancelText}}</el-button>
-          </span>
-    </el-dialog>
-
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px" :before-close="handleClose">
-      <el-table border
-                :data="showTableColumns"
-                :key="Math.random()"
-                max-height="350"
-                style="width: 100%">
-        <el-table-column
-          prop="title"
-          label="列表名称"
-          width="180" fixed>
-        </el-table-column>报工时间
-        <el-table-column
-          prop="select"
-          label="是否显示"
-          width="180">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作"
-        >
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-
-
-<el-dialog title="高级查询" center :visible.sync="advanceQueryDialogVisible" width="670px">
-      <el-form :inline="true"
-               label-width="80px"
-               class="dialog-form"
-               ref="form" style="width: 620px"
-      >
-        <div class="dialog-line">
-        <el-form-item label="报工单号" class="dialog-form-inline">
-          <el-input placeholder="报工单号" v-model="formData.code" clearable></el-input>
-        </el-form-item>
-        <el-form-item label="供应商" class="dialog-form-inline">
-          <!-- <el-input placeholder="供应商名" clearable v-model="formData.supplierName">
-            <el-button slot="append" @click="chooseSupplierVisible = true" icon="el-icon-search"></el-button>
-          </el-input> -->
-          <btn-input :valueText.sync='formData.supplierName' :valueId.sync='formData.supplierName' :chooseVisible.sync='chooseSupplierVisible'></btn-input>
-        </el-form-item>
-        </div>
-        <div class="dialog-line">
-        <el-form-item label="设备" class="dialog-form-inline">
-          <!-- <el-input placeholder="设备" clearable v-model="formData.deviceName">
-            <el-button slot="append" @click="chooseDevicesVisible = true" icon="el-icon-search"></el-button>
-          </el-input> -->
-          <btn-input :valueText.sync='formData.deviceName' :valueId.sync='formData.deviceName' :chooseVisible.sync='chooseDevicesVisible'></btn-input>
-        </el-form-item>
-         <el-form-item label="" class="dialog-form-inline" >
-        </el-form-item>
-        </div>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">确定</el-button>
-        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
-        <el-button type="primary" @click="clear">清空</el-button>
-      </span>
-    </el-dialog>
-    <!--选择职员-->
-    <dialogChooseSingleUsers :visible.sync="chooseUserVisible" @change="getUser" ></dialogChooseSingleUsers>
-    <!--选择设备-->
-    <dialogChooseSingleDevice :visible.sync="chooseDevicesVisible" @change="getDevice" ></dialogChooseSingleDevice>
-    <!--选择工序-->
-    <dialogChooseSingleProcess :visible.sync="chooseProcessVisible" @change="getProcess" ></dialogChooseSingleProcess>
-    <!--选择供应商-->
-    <dialogChooseSingleSuppliers :visible.sync="chooseSupplierVisible" @change="getSupplier" ></dialogChooseSingleSuppliers>
-    <!--选择物料-->
-    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getPart" ></dialogChooseSingleParts>
-
-  </div>
-</template>
-
-<script>
-    import { formatDateTime } from "@/utils/tools.js";
-    import config from "@/utils/config.js";
-    import btnInput from "@/components/btnInput.vue";
-    import dialogChooseSingleUsers from "../../../../components/System/dialogChooseSingleUsers";
-    import dialogChooseSingleDevice from "../../../../components/System/dialogChooseSingleDevice";
-    import dialogChooseSingleProcess from "../../../../components/System/dialogChooseSingleProcess";
-    import dialogChooseSingleParts from "../../../../components/System/dialogChooseSingleParts";
-    import dialogChooseSingleSuppliers from "../../../../components/System/dialogChooseSingleSuppliers";
-    export default {
-        components: {
-          btnInput,dialogChooseSingleUsers,dialogChooseSingleDevice,dialogChooseSingleProcess,dialogChooseSingleParts,dialogChooseSingleSuppliers
-        },
-        name: "work_report_list",
-        data() {
-            return {
-              advanceQueryDialogVisible:false,
-              config: config,
-              formData:{},
-              rulesForm: {
-
-              },
-              RollBackVisible: false,
-              dialogLoading: false,
-                total: 0, //总条数
-                pageSizes: [10, 20, 50], //每页展示多少条
-                search_data: {
-                  pageno: 1,
-                  pagesize: 10
-                },
-                headInfo:{},
-                bodyInfo:{},
-                btnDelDisabled: true,
-                btnOtherDisabled: true,
-                rowIds: [],
-                allCompletionCount: 0,
-                allConformityCount: 0,
-                allReworkCount: 0,
-                allScrapCount: 0,
-
-                allCompletionCountSupport: 0,
-                allConformityCountSupport: 0,
-                allReworkCountSupport: 0,
-                allScrapCountSupport: 0,
-
-                tableData: [],
-                convCoefficientOfChange:0,
-                uomList:[],
-                chooseUserVisible: false, // 选择用户
-                chooseDevicesVisible:false,//选择设备
-                chooseProcessVisible:false,// 选择工序
-                chooseSupplierVisible:false,
-                chooseMaterielVisible:false,
-
-                columnSetDialogVisible: false,
-                columnSetDialogTitle: "设置显示字段列表",
-                tableId: 'jobShop_work_report_table',
-                pictLoading: false,
-
-                //默认列表数据
-                showTableColumnsDefault: [
-                    {title: "报工时间", prop_: "createTime", select: true},
-                    {title: "操作工", prop_: "operatorName", select: true},
-                    {title: "报工单号", prop_: "code", select: true},
-                    {title: "产品代码", prop_: "serialNo", select: true},
-                    {title: "产品名称", prop_: "materialName", select: true},
-                    {title: "规格型号", prop_: "specification", select: true},
-                    {title: "主计量单位", prop_: "unitName", select: true},
-                    {title: "辅助单位", prop_: "supportUomName", select: true},
-                    {title: "自动采集", prop_: "autoCollect", select: true},
-                    {title: "汇报工序", prop_: "processName", select: true},
-                    {title: "完工数量(主计量单位)", prop_: "completionCount", select: true},
-                    {title: "合格数量(主计量单位)", prop_: "conformityCount", select: true},
-                    {title: "返工数量(主计量单位)", prop_: "reworkCount", select: true},
-                    {title: "报废数量(主计量单位)", prop_: "scrapCount", select: true},
-                    {title: "完工数量(辅助单位)", prop_: "completionCountSupport", select: true},
-                    {title: "合格数量(辅助单位)", prop_: "conformityCountSupport", select: true},
-                    {title: "返工数量(辅助单位)", prop_: "reworkCountSupport", select: true},
-                    {title: "报废数量(辅助单位)", prop_: "scrapCountSupport", select: true},
-                    {title: "供应商", prop_: "supplierName", select: true},
-                    {title: "生产部门", prop_: "deptName", select: true},
-                    {title: "加工设备", prop_: "deviceName", select: true},
-                    {title: "生产计划单号", prop_: "proPlanWorkOrderNo", select: true},
-                    {title: "工序计划单号", prop_: "planWorkOrderNo", select: true},
-                ],
-                ///弹出页面列表数据
-                showTableColumns: [
-                    {title: "报工时间", prop_: "createTime", select: true},
-                    {title: "操作工", prop_: "operatorName", select: true},
-                    {title: "报工单号", prop_: "code", select: true},
-                    {title: "产品代码", prop_: "serialNo", select: true},
-                    {title: "产品名称", prop_: "materialName", select: true},
-                    {title: "规格型号", prop_: "specification", select: true},
-                    {title: "主计量单位", prop_: "unitName", select: true},
-                    {title: "辅助单位", prop_: "supportUomName", select: true},
-                    {title: "自动采集", prop_: "autoCollect", select: true},
-                    {title: "汇报工序", prop_: "processName", select: true},
-                    {title: "完工数量(主计量单位)", prop_: "completionCount", select: true},
-                    {title: "合格数量(主计量单位)", prop_: "conformityCount", select: true},
-                    {title: "返工数量(主计量单位)", prop_: "reworkCount", select: true},
-                    {title: "报废数量(主计量单位)", prop_: "scrapCount", select: true},
-                    {title: "完工数量(辅助单位)", prop_: "completionCountSupport", select: true},
-                    {title: "合格数量(辅助单位)", prop_: "conformityCountSupport", select: true},
-                    {title: "返工数量(辅助单位)", prop_: "reworkCountSupport", select: true},
-                    {title: "报废数量(辅助单位)", prop_: "scrapCountSupport", select: true},
-                    {title: "供应商", prop_: "supplierName", select: true},
-                    {title: "生产部门", prop_: "deptName", select: true},
-                    {title: "加工设备", prop_: "deviceName", select: true},
-                    {title: "生产计划单号", prop_: "proPlanWorkOrderNo", select: true},
-                    {title: "工序计划单号", prop_: "planWorkOrderNo", select: true},
-                ],
-                showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
-                //显示的列表字段
-                formTableData: [],
-            };
-        },
-        created() {
-            this.initData();
-            this.getList();
-          var _this = this;
-          document.onkeydown = e => {
-            if (e.key === "Enter") {
-              _this.search()
-            }
-          }
-        },
-        mounted() {
-          this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-          this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-          this.getShowColumns();
-        },
-        methods: {
-          //设置显示字段
-            showColumnSetDialog() {
-                this.columnSetDialogVisible = true;
-                this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-            },
-            //前移
-            toUp(scope) {
-                if (scope.$index == 0) {
-                return false;
-                }
-                let n;
-                for (let i = 0; i < this.showTableColumns.length; i++) {
-                if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-                    n = i;
-                }
-                }
-                let temp = this.showTableColumns[n];
-                this.showTableColumns[n] = this.showTableColumns[n - 1];
-                this.showTableColumns[n - 1] = temp;
-                this.$forceUpdate();
-            },
-            //后移
-            toDown(scope) {
-                if (scope.$index == this.showTableColumns.length - 1) {
-                return false;
-                }
-                let n;
-                for (let i = 0; i < this.showTableColumns.length; i++) {
-                if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-                    n = i;
-                }
-                }
-                let temp = this.showTableColumns[n];
-                this.showTableColumns[n] = this.showTableColumns[n + 1];
-                this.showTableColumns[n + 1] = temp;
-                this.$forceUpdate();
-            },
-            //恢复默认
-            toDefault() {
-                this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-                this.$forceUpdate();
-            },
-            //完成列表字段设置
-            saveAndCloseColumnSetDialog() {
-                let tableNo = this.tableId;
-                let tableColumns = JSON.stringify(this.showTableColumns);
-                this.columnSetDialogVisible = false;
-                this.$api.tableColumnAPI
-                .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
-                .then(res => {
-                    let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-                    this.formTableData = [];
-                    for (let i = 0; i < arr.length; i++) {
-                        if (arr[i].select) {
-                            this.formTableData.push(arr[i]);
-                        }
-                    }
-                })
-                .catch(r => {
-                    console.log(r);
-                });
-            },
-            //关闭字段设置弹出
-            handleClose() {
-                this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
-                this.columnSetDialogVisible = false;
-
-            },
-            /**
-             * 获取显示字段
-             */
-            getShowColumns() {
-                let tableNo = this.tableId;
-                this.formTableData = [];
-
-                this.$api.tableColumnAPI
-                    .getShowColumns({tableNo: tableNo})
-                    .then(res => {
-                        if (res.code == 0) {
-                            if (res.results) {
-                                this.showTableColumns = JSON.parse(res.results);
-                                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-                                for (let i = 0; i < arr.length; i++) {
-                                    if (arr[i].select) {
-                                        this.formTableData.push(arr[i]);
-                                    }
-                                }
-                                this.$forceUpdate();
-                            } else {
-                                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-                                for (let i = 0; i < arr.length; i++) {
-                                    if (arr[i].select) {
-                                        this.formTableData.push(arr[i]);
-                                    }
-                                }
-                                this.$forceUpdate();
-                            }
-                        } else {
-                            this.$message({
-                                message: res.msg ? res.msg : "获取列表信息失败",
-                                type: "error"
-                            });
-                        }
-
-                    })
-                    .catch(r => {
-                        this.$message({
-                            message: r,
-                            type: "error"
-                        });
-                        console.log(r);
-                    });
-            },
-
-            /**
-             * 获取物料单位
-             */
-            getSupportUomName() {
-                this.$api.dictAPI.getDictsByType("uom_type")
-                    .then(res => {
-                        this.uomList = res.datas
-                    })
-            },
-
-          // 编辑
-          edit() {
-              this.getSupportUomName();
-            this.RollBackVisible=true
-            this.getDetail()
-          },
-          // 保存编辑
-          saveAndChange() {
-                debugger;
-            let id = this.rowIds[0].id;
-            let flag = false
-              if(this.formData.isExamine==0){
-                  if(this.formData.completion_count !=this.formData.conformity_count+this.formData.rework_count+this.formData.scrap_count) {
-                      flag = true
-                  }
-              }
-            if(flag) {
-              this.$message({
-                message:"完工数量必须等于合格数量+返工数量+报废数量之和",
-                type: "warning"
-              });
-              return
-            }
-              this.$api.workReportAPI
-                  .updateReport({
-                      id: id,
-                      dispatchItemId:this.formData.dispatchId,
-                      completionCount:this.formData.completion_count,
-                      conformityCount:this.formData.conformity_count,
-                      reworkCount:this.formData.rework_count,
-                      scrapCount:this.formData.scrap_count,
-                      completionCountSupport:this.formData.completionCountSupport,
-                      conformityCountSupport:this.formData.conformityCountSupport,
-                      reworkCountSupport:this.formData.reworkCountSupport,
-                      scrapCountSupport:this.formData.scrapCountSupport,
-                      supportUom:this.formData.supportUom,
-                      convCoefficient:this.formData.convCoefficient,
-                  })
-                  .then(res => {
-                      if (res.code === 0) {
-                          this.$message({
-                              message: res.msg,
-                              type: "success"
-                          });
-                          this.RollBackVisible = false
-                          this.getList();
-                      } else {
-                          this.$message({
-                              message: res.msg,
-                              type: "error"
-                          });
-                      }
-                  })
-          },
-            getDetail() {
-                let id = this.rowIds[0].id;
-                this.dispatchId = id
-                this.$api.workReportAPI
-                    .reportDetail({id: id})
-                    .then(res => {
-                        if (res.code == 0) {
-                            this.$set(this.formData, 'dispatchId', res.data.dispatchId)
-                            this.$set(this.formData, 'reportCode', res.data.reportCode)
-                            this.$set(this.formData, 'planNo', res.data.planNo)
-                            this.$set(this.formData, 'serialNo', res.data.serialNo)
-                            this.$set(this.formData, 'materielName', res.data.materielName)
-                            this.$set(this.formData, 'specification', res.data.specification)
-                            this.$set(this.formData, 'unitName', res.data.unitName)
-                            this.$set(this.formData, 'operatorName', res.data.operatorName)
-                            this.$set(this.formData, 'createTime', res.data.createTime)
-                            this.$set(this.formData, 'deviceName', res.data.deviceName)
-                            this.$set(this.formData, 'deptName', res.data.deptName)
-                            this.$set(this.formData, 'processName', res.data.processName)
-                            this.$set(this.formData, 'createName', res.data.createName)
-                            this.$set(this.formData, 'completion_count', res.data.completion_count)
-                            this.$set(this.formData, 'scrap_count', res.data.scrap_count)
-                            this.$set(this.formData, 'conformity_count', res.data.conformity_count)
-                            this.$set(this.formData, 'rework_count', res.data.rework_count)
-                            this.$set(this.formData, 'completionCountSupport', res.data.completionCountSupport)
-                            this.$set(this.formData, 'scrapCountSupport', res.data.scrapCountSupport)
-                            this.$set(this.formData, 'conformityCountSupport', res.data.conformityCountSupport)
-                            this.$set(this.formData, 'reworkCountSupport', res.data.reworkCountSupport)
-                            this.$set(this.formData, 'supportUomName', res.data.supportUomName)
-                            this.$set(this.formData, 'convCoefficient', res.data.convCoefficient)
-                            this.$set(this.formData, 'isExamine', res.data.isExamine)
-                            this.$set(this.formData, 'status', res.data.status)
-                           this.convCoefficientOfChange=res.data.convCoefficient
-                        }
-                    })
-            },
-          /**
-           * 查看源单明细
-           */
-          viewDetail(r) {
-              let proPlanWorkOrderId = r.proPlanWorkOrderId
-              this.$router.push({ path: '/planManagement/production_add', query: {id:proPlanWorkOrderId,t: Date.now() } })
-          },
-          /**
-           * 查看源单明细
-           */
-          viewDetail1(r) {
-              let planWorkOrderId = r.planWorkOrderId
-              this.$router.push({ path: '/planManagement/working_procedure_add', query: {id:planWorkOrderId,t: Date.now() } })
-          },
-      /**
-       * 高级查询
-       */
-      moreSearch() {
-        this.advanceQueryDialogVisible = true;
-      },
-
-      save() {
-        for (var n in this.formData) {
-          this.search_data[n] = this.formData[n];
-        }
-        this.search_data.pageno = 1;
-        this.$nextTick(function () {
-          this.advanceQueryDialogVisible = false;
-          this.getList();
-        })
-      },
-      //清空
-      clear() {
-        for (var n in this.formData) {
-          this.formData[n] = '';
-        }
-        this.$forceUpdate()
-
-      },
-          sortChange({ column, prop, order }){
-            let j={ column, prop, order };
-            let order_=j.order=="ascending"?'asc':'desc'
-            this.$set(this.search_data,'sort',j.prop)
-            this.$set(this.search_data,'order',order_)
-            this.getList();
-          },
-            //根据当前id,获取一条树枝上的所有id数据
-            treeFindPath (tree, func, path = []) {
-                if (!tree) return []
-                for (const data of tree) {
-                    path.push(data.id)
-                    if (func(data)) return path
-                    if (data.children) {
-                        const findChildren = this.treeFindPath(data.children, func, path)
-                        if (findChildren.length) return findChildren
-                    }
-                    path.pop()
-                }
-                return []
-            },
-          initData(){
-
-          },
-          clickRow(row) {
-            this.$refs.tb.toggleRowSelection(row);
-          },
-
-          /**
-           * 获取用户
-           */
-          getUser(val) {
-            if (val) {
-              this.$set(this.search_data,'operatorName',val.NAME)
-            }else{
-              this.$set(this.search_data,'operatorName',"")
-            }
-          },
-          /**
-           * 选择设备
-           */
-          getDevice(val) {
-            if (val) {
-              this.$set(this.formData,'deviceName',val.name)
-            }else{
-              this.$set(this.formData,'deviceName',"")
-            }
-          },
-          /**
-           * 选择工序
-           */
-          getProcess(val) {
-            if (val) {
-              this.$set(this.search_data,'processName',val.name)
-            }else{
-              this.$set(this.search_data,'processName',"")
-            }
-          },
-          /**
-           * 获取选择的产品
-           */
-          getPart(val) {
-            if (val) {
-              this.$set(this.search_data,'materielName',val.name)
-            }else{
-              this.$set(this.search_data,'materielName',"")
-            }
-          },
-          /**
-           * 获取选择的供应商
-           */
-          getSupplier(val) {
-            if (val) {
-              this.$set(this.formData,'supplierName',val.name)
-            }else{
-              this.$set(this.formData,'supplierName',"")
-            }
-          },
-            /**
-             * 获取列表
-             */
-            getList() {
-                this.pictLoading = true;
-                if (this.search_data.time) {
-                    this.search_data.startTime = formatDateTime(this.search_data.time[0]);
-                    this.search_data.endTime = formatDateTime(this.search_data.time[1]);
-                } else {
-                    this.search_data.startTime = "";
-                    this.search_data.endTime = "";
-                }
-                this.$api.workReportAPI
-                    .workingReportList(this.search_data)
-                    .then(res => {
-                        this.pictLoading = false;
-                        if (res.data) {
-                            this.total = res.data.totalRows;
-                            this.tableData = res.data.datas ? res.data.datas : [];
-                            this.allCompletionCount = res.data.allCompletionCount
-                            this.allConformityCount = res.data.allConformityCount
-                            this.allReworkCount = res.data.allReworkCount
-                            this.allScrapCount = res.data.allScrapCount
-
-                            this.allCompletionCountSupport = res.data.allCompletionCountSupport
-                            this.allConformityCountSupport = res.data.allConformityCountSupport
-                            this.allReworkCountSupport = res.data.allReworkCountSupport
-                            this.allScrapCountSupport = res.data.allScrapCountSupport
-                        } else {
-                            this.total = 0;
-                            this.tableData = [];
-                        }
-                    })
-                    .catch(r => {
-                        this.pictLoading = false;
-                        console.log(r);
-                    });
-            },
-            /**
-             * 查询
-             */
-            search() {
-                this.search_data.pageno = 1;
-                this.getList();
-            },
-            // 上下分页
-            handleCurrentChange(val) {
-                this.search_data.pageno = val;
-                this.getList();
-            },
-            // 每页显示多少条
-            handleSizeChange(val) {
-                this.search_data.pagesize = val;
-                this.getList();
-            },
-            /**
-             * 删除
-             */
-            remove() {
-                let ids = [];
-                this.rowIds.forEach(item => {
-                    ids.push(item.id);
-                });
-                this.$confirm("确认删除选中的报工单吗?", "提示", {
-                    type: "warning"
-                }).then(() => {
-                    this.$api.workReportAPI
-                        .deleteOfReport({ids:ids})
-                        .then(res => {
-                            if (res.code === 0) {
-                                this.$message({
-                                    message: res.msg,
-                                    type: "success"
-                                });
-                                this.getList();
-                            } else {
-                                this.$message({
-                                    message: res.msg ? res.msg : "删除失败，请重试",
-                                    type: "error"
-                                });
-                            }
-                        })
-                        .catch(error => {
-                            this.$message({
-                                message: "删除失败，请重试",
-                                type: "error"
-                            });
-                        });
-                });
-            },
-
-          /**
-           * 返工返修
-           */
-          rework() {
-            if(this.rowIds[0].status==146) {// 暂存状态
-              this.$message({
-                message: "暂存状态不可以返工返修",
-                type: "error"
-              });
-              return
-            }
-            this.$confirm("确认返工返修选中的报工单吗?", "提示", {
-              type: "warning"
-            }).then(() => {
-              this.$api.workReportAPI
-                .reworkRepair({id:this.rowIds[0].id,sign:0})
-                .then(res => {
-                  if (res.code === 0) {
-                    if(res.headInfo){
-                      this.headInfo=res.headInfo
-                      this.bodyInfo=res.bodyInfo
-                      this.headInfo.materielId=this.headInfo.materielId;
-                      this.$router.push({
-                          name: "working_procedure_add_planManagement",
-                          query: { headInfo: this.headInfo,bodyInfo: this.bodyInfo, t: Date.now(),from:'rework',which_rework:"work_report",sourceInfo:res.sourceInfo,reworkCount:this.rowIds[0].reworkCount }
-                      });
-                      return
-                    }else{
-                      this.$message({
-                        message: "没有源工序计划不能返工返修",
-                        type: "warning"
-                      });
-                    }
-                  } else {
-                    this.$message({
-                      message: res.msg ? res.msg : "返修失败，请重试",
-                      type: "error"
-                    });
-                  }
-                })
-                .catch(error => {
-                  this.$message({
-                    message: "返修失败，请重试",
-                    type: "error"
-                  });
-                });
-            });
-          },
-
-            /**
-             * 处理选中
-             */
-            handleSelectionChange(val) {
-                this.rowIds = val;
-                this.setBtn(val);
-            },
-            /**
-             * 控件操作按钮状态
-             */
-            setBtn(val) {
-                let isFlag = true;
-                let isDelFlag = true;
-                if (val.length > 0) {
-                    isDelFlag = false;
-                    if (val.length == 1) {
-                        isFlag = false;
-                    }
-                } else {
-                    isFlag = true;
-                    isDelFlag = true;
-                }
-                this.btnDelDisabled = isDelFlag;
-                this.btnOtherDisabled = isFlag;
-            },
-            // 合计
-            getSummaries(param){
-              const sums = [];
-              sums[1] = "总计";
-              sums[11] = "" + this.allCompletionCount;
-              sums[12] = "" + this.allConformityCount;
-              sums[13] = "" + this.allReworkCount;
-              sums[14] = "" + this.allScrapCount;
-
-                sums[15] = "" + this.allCompletionCountSupport;
-                sums[16] = "" + this.allConformityCountSupport;
-                sums[17] = "" + this.allReworkCountSupport;
-                sums[18] = "" + this.allScrapCountSupport;
-
-
-              return sums;
-            },
-
-            //绑定数量的计算
-            changeCompletionCountSupport(value) {
-                if (!isNaN(this.convCoefficientOfChange) && !isNaN(value)) {
-                    console.log("===="+this.convCoefficientOfChange)
-                    console.log("===="+this.value)
-                   // formData.completion_count
-                   //  row.completion_count = parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(2));
-                    this.$set(this.formData, 'completion_count',parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(3)))
-                    console.log("===="+parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(2)))
-                } else {
-                    row.unitUomCount = 0;
-                }
-            },
-            changeConformityCountSupport(value){
-                if (!isNaN(this.convCoefficientOfChange) && !isNaN(value)) {
-                    console.log("===="+"")
-                    console.log("===="+this.value)
-                    this.$set(this.formData, 'conformity_count',parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(3)))
-                    console.log("===="+parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(2)))
-                } else {
-                    row.unitUomCount = 0;
-                }
-            },
-            changeReworkCountSupport(value){
-                if (!isNaN(this.convCoefficientOfChange) && !isNaN(value)) {
-                    console.log("===="+"")
-                    console.log("===="+this.value)
-                    this.$set(this.formData, 'rework_count',parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(3)))
-                    console.log("===="+parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(2)))
-                } else {
-                    row.unitUomCount = 0;
-                }
-            },
-            changeScrapCountSupport(value){
-                if (!isNaN(this.convCoefficientOfChange) && !isNaN(value)) {
-                    console.log("===报废数量="+"")
-                    console.log("===="+this.value)
-                    this.$set(this.formData, 'scrap_count',parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(3)))
-                    console.log("===="+parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(2)))
-                } else {
-                    row.unitUomCount = 0;
-                }
-            },
-            //换算系数
-            changeConvCoefficient(value) {
-                if (!isNaN(value)) {
-                    this.convCoefficientOfChange = value;
-                } else {
-                    this.convCoefficientOfChange = 0;
-                };
-                this.changeCompletionCountSupport(this.$refs.ipOne.value);
-                if(this.formData.isExamine==0){
-                    this.changeConformityCountSupport(this.formData.conformityCountSupport );
-                    this.changeReworkCountSupport(this.formData.reworkCountSupport );
-                    this.changeScrapCountSupport(this.formData.scrapCountSupport );
-                }
-            },
-        }
-    };
-</script>
-
-<style scoped>
-  .el-table__row:hover,
-  .el-table__row:hover > td {
-    background-color: #dfedfc !important;
-  }
-  .company-form .form-inline {
-    display: inline-block;
-  }
-
-
-  .company-form .form-inline .el-input {
-    width: 200px !important;
-  }
-  .company-form .form-inline .el-input-number {
-    width: 120px !important;
-  }
-
-  .company-form textarea {
-    height: 80px !important;
-  }
-</style>
-
+<template>
+  <div class="sys-task sys-box">
+    <div class="sys-operate sys-tabs">
+      <el-button type="primary" @click="remove()" :disabled="btnDelDisabled" v-has="'jobShop:reportWork:delete'">删除</el-button>
+      <el-button type="primary" @click="rework()" :disabled="btnOtherDisabled" v-has="'jobShop:reportWork:rework'">返工返修</el-button>
+      <el-button type="primary" @click="edit()" :disabled="btnOtherDisabled" v-has="'jobShop:reportWork:edit'">编辑</el-button>
+      <el-button type="primary" @click="showColumnSetDialog">{{config.configureBtnName}}</el-button>
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out ">
+        <div class='form_item_input_out'>
+          <el-form-item label="日期" style='width:31%' class="form_item-inline">
+          <el-date-picker
+            v-model="search_data.time"
+            type="daterange"
+            format="yyyy-MM-dd"
+            range-separator="—"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="操作工" style='width:23%' class="form_item-inline">
+          <!-- <el-input placeholder="请选择" clearable v-model="search_data.operatorName">
+            <el-button slot="append" @click="chooseUserVisible = true" icon="el-icon-search"></el-button>
+          </el-input> -->
+          <btn-input :valueText.sync='search_data.operatorName' :valueId.sync='search_data.operatorName' :chooseVisible.sync='chooseUserVisible'></btn-input>
+        </el-form-item>
+        <el-form-item label="工序名" style='width:23%' class="form_item-inline">
+          <!-- <el-input placeholder="请选择" clearable v-model="search_data.processName">
+            <el-button slot="append" @click="chooseProcessVisible = true" icon="el-icon-search"></el-button>
+          </el-input> -->
+          <btn-input :valueText.sync='search_data.processName' :valueId.sync='search_data.processName' :chooseVisible.sync='chooseProcessVisible'></btn-input>
+        </el-form-item>
+        <el-form-item label="产品名" style='width:23%' class="form_item-inline">
+          <!-- <el-input placeholder="请选择" clearable v-model="search_data.materielName">
+            <el-button slot="append" @click="chooseMaterielVisible = true" icon="el-icon-search"></el-button>
+          </el-input> -->
+          <btn-input :valueText.sync='search_data.materielName' :valueId.sync='search_data.materielName' :chooseVisible.sync='chooseMaterielVisible'></btn-input>
+        </el-form-item>
+        <el-form-item label="生产计划单号" style='width:22%' class="form_item-inline">
+          <el-input v-model="search_data.scjhdh" placeholder="源单单号" clearable ></el-input>
+        </el-form-item>
+        <el-form-item label="工序计划单号" style='width:22%' class="form_item-inline">
+          <el-input v-model="search_data.gxjhdh" placeholder="源单单号" clearable ></el-input>
+        </el-form-item>
+        </div>
+      <div class='form_item_btn_out'   >
+        <el-form-item>
+          <el-button type="primary" @click="search()">查询</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="moreSearch()">高级查询</el-button>
+        </el-form-item>
+      </div>
+      </el-form>
+    </div>
+
+    <div class="sys-table">
+      <el-table border
+        fit  @sort-change="sortChange"
+        v-if="formTableData.length>0"
+        v-loading="pictLoading"
+        @row-click="clickRow"
+        ref="tb"
+        show-summary
+        :summary-method="getSummaries"
+        :data="tableData"
+        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
+        @selection-change="handleSelectionChange"
+      >
+      <el-table-column type="selection" width="55" align="center"></el-table-column>
+      <el-table-column v-for="(items,index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
+                         align="center" show-overflow-tooltip :sortable="(items.prop_=='createTime')?'custom':false">
+             <template slot-scope="scope">
+               <div>
+                   <div v-if="items.prop_=='proPlanWorkOrderNo'">
+                    <el-link type="primary" @click.stop="viewDetail(scope.row)">{{scope.row.proPlanWorkOrderNo}}</el-link>
+                  </div>
+                  <div v-else-if="items.prop_=='planWorkOrderNo'">
+                    <el-link type="primary" @click.stop="viewDetail1(scope.row)">{{scope.row.planWorkOrderNo}}</el-link>
+                  </div>
+                 <div v-else>
+                   <div style="overflow:hidden">{{scope.row[items.prop_]}}</div>
+                 </div>
+               </div>
+               </template>
+       </el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="search_data.pageno"
+        :page-sizes="pageSizes"
+        :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+
+    <el-dialog center title="" width="800px" :visible.sync="RollBackVisible">
+      <el-form
+        v-loading="dialogLoading"
+        label-width="160px"
+        :model="formData"
+        :rules="rulesForm"
+        class="company-form"
+        ref="form"
+      >
+        <!--工序计划单号-->
+        <el-form-item prop="planNo" label="工序计划" class="form-inline">
+          <el-input placeholder="" v-model="formData.planNo" readonly></el-input>
+        </el-form-item>
+        <el-form-item prop="reportCode" label="报工单号" class="form-inline">
+          <el-input placeholder="" v-model="formData.reportCode" readonly></el-input>
+        </el-form-item>
+        <el-form-item prop="createTime" label="报工日期" class="form-inline">
+          <el-date-picker readonly
+                          v-model="formData.createTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder=""
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item prop="deptName" label="生产部门" class="form-inline">
+          <el-input placeholder="" v-model="formData.deptName" readonly></el-input>
+        </el-form-item>
+        <el-form-item prop="deviceName" label="加工设备" class="form-inline">
+          <el-input placeholder="" v-model="formData.deviceName" readonly></el-input>
+        </el-form-item>
+        <el-form-item prop="operatorName" label="操作工" class="form-inline">
+          <el-input placeholder="" v-model="formData.operatorName" readonly></el-input>
+        </el-form-item>
+        <el-form-item prop="createName" label="报工人员" class="form-inline">
+          <el-input placeholder="" v-model="formData.createName" readonly></el-input>
+        </el-form-item>
+        <el-form-item prop="processName" label="汇报工序" class="form-inline">
+          <el-input placeholder="" v-model="formData.processName" readonly></el-input>
+        </el-form-item>
+        <el-form-item prop="serialNo" label="产品代码" class="form-inline">
+          <el-input placeholder="" v-model="formData.serialNo" readonly></el-input>
+        </el-form-item>
+        <el-form-item prop="materielName" label="产品名称" class="form-inline">
+          <el-input placeholder="" v-model="formData.materielName" readonly></el-input>
+        </el-form-item>
+        <el-form-item prop="specification" label="规格型号" class="form-inline">
+          <el-input placeholder="" v-model="formData.specification" readonly></el-input>
+        </el-form-item>
+            <el-form-item prop="unitName" label="主计量单位" class="form-inline">
+                <el-input placeholder="" v-model="formData.unitName" readonly></el-input>
+           </el-form-item>
+          <el-form-item prop="unitName" label="辅助单位" class="form-inline">
+              <!-- :disabled="formData.status==148" -->
+            <el-select clearable style="width:90% !important" v-model="formData.supportUomName" filterable placeholder="请选择辅助单位">
+              <el-option v-for="item in uomList" :key="item.id" :label="item.name" :value="item.id"  :disabled="formData.status==148"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="unitName" label="换算系数" class="form-inline">
+              <el-input-number :min="0"
+                               size="small"
+                               v-model="formData.convCoefficient"
+                               controls-position="right"
+                               style="width: 100%"
+                               class="inputClass"
+                              @change="changeConvCoefficient">
+              </el-input-number>
+          </el-form-item>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item prop="completion_count" label="完工数量(主单位)" class="form-inline">
+              <el-input placeholder="" v-model="formData.completion_count" readonly></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="completionCountSupport" label="完工数量(辅单位)" class="form-inline">
+                  <el-input-number v-model="formData.completionCountSupport"
+                                   ref="ipOne"
+                                   style="width: 100%"
+                                   label=""
+                                   controls-position="right"
+                                   :min="0"
+                                   size="small"
+                                   @change="changeCompletionCountSupport" >
+                  </el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item prop="conformity_count" label="合格数量(主单位)" class="form-inline">
+              <el-input placeholder="" v-model="formData.conformity_count" readonly></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="conformityCountSupport" label="合格数量(辅单位)" class="form-inline">
+              <el-input-number v-model="formData.conformityCountSupport"
+                               style="width: 100%"
+                               id="ipTwo"
+                               label=""
+                               :disabled="formData.isExamine==1"
+                               controls-position="right"
+                               :min="0"
+                               @change="changeConformityCountSupport" >
+                               size="small">
+              </el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item prop="rework_count" label="返工数量(主单位)" class="form-inline">
+              <el-input placeholder="" v-model="formData.rework_count" readonly></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item  label-position="top" prop="reworkCountSupport" label="返工数量(辅单位)" size="mini"   class="form-inline">
+              <el-input-number v-model="formData.reworkCountSupport"
+                               style="..."
+                               id="ipThree"
+                               :disabled="formData.isExamine==1"
+                               controls-position="right"
+                               label=""
+                               :min="0"
+                               @change="changeReworkCountSupport" >
+                               size="mini">
+              </el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item prop="scrap_count" label="报废数量(主单位)" class="form-inline">
+              <el-input placeholder="" v-model="formData.scrap_count" readonly></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label-position="top" prop="scrapCountSupport" label="报废数量(辅单位)" size="mini"  class="form-inline">
+              <el-input-number v-model="formData.scrapCountSupport"
+                               style="width: 100%"
+                               label=""
+                               id="ipFour"
+                               :disabled="formData.isExamine==1"
+                               controls-position="right"
+                               :min="0"
+                               @change="changeScrapCountSupport" >
+                               size="mini">
+              </el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="saveAndChange('form')">保存</el-button>
+            <el-button type="primary" @click="RollBackVisible = false">{{config.cancelText}}</el-button>
+          </span>
+    </el-dialog>
+
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px" :before-close="handleClose">
+      <el-table border
+                :data="showTableColumns"
+                :key="Math.random()"
+                max-height="350"
+                style="width: 100%">
+        <el-table-column
+          prop="title"
+          label="列表名称"
+          width="180" fixed>
+        </el-table-column>报工时间
+        <el-table-column
+          prop="select"
+          label="是否显示"
+          width="180">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+
+
+<el-dialog title="高级查询" center :visible.sync="advanceQueryDialogVisible" width="670px">
+      <el-form :inline="true"
+               label-width="80px"
+               class="dialog-form"
+               ref="form" style="width: 620px"
+      >
+        <div class="dialog-line">
+        <el-form-item label="报工单号" class="dialog-form-inline">
+          <el-input placeholder="报工单号" v-model="formData.code" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="供应商" class="dialog-form-inline">
+          <!-- <el-input placeholder="供应商名" clearable v-model="formData.supplierName">
+            <el-button slot="append" @click="chooseSupplierVisible = true" icon="el-icon-search"></el-button>
+          </el-input> -->
+          <btn-input :valueText.sync='formData.supplierName' :valueId.sync='formData.supplierName' :chooseVisible.sync='chooseSupplierVisible'></btn-input>
+        </el-form-item>
+        </div>
+        <div class="dialog-line">
+        <el-form-item label="设备" class="dialog-form-inline">
+          <!-- <el-input placeholder="设备" clearable v-model="formData.deviceName">
+            <el-button slot="append" @click="chooseDevicesVisible = true" icon="el-icon-search"></el-button>
+          </el-input> -->
+          <btn-input :valueText.sync='formData.deviceName' :valueId.sync='formData.deviceName' :chooseVisible.sync='chooseDevicesVisible'></btn-input>
+        </el-form-item>
+         <el-form-item label="" class="dialog-form-inline" >
+        </el-form-item>
+        </div>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">确定</el-button>
+        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="clear">清空</el-button>
+      </span>
+    </el-dialog>
+    <!--选择职员-->
+    <dialogChooseSingleUsers :visible.sync="chooseUserVisible" @change="getUser" ></dialogChooseSingleUsers>
+    <!--选择设备-->
+    <dialogChooseSingleDevice :visible.sync="chooseDevicesVisible" @change="getDevice" ></dialogChooseSingleDevice>
+    <!--选择工序-->
+    <dialogChooseSingleProcess :visible.sync="chooseProcessVisible" @change="getProcess" ></dialogChooseSingleProcess>
+    <!--选择供应商-->
+    <dialogChooseSingleSuppliers :visible.sync="chooseSupplierVisible" @change="getSupplier" ></dialogChooseSingleSuppliers>
+    <!--选择物料-->
+    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getPart" ></dialogChooseSingleParts>
+
+  </div>
+</template>
+
+<script>
+    import { formatDateTime } from "@/utils/tools.js";
+    import config from "@/utils/config.js";
+    import btnInput from "@/components/btnInput.vue";
+    import dialogChooseSingleUsers from "../../../../components/System/dialogChooseSingleUsers";
+    import dialogChooseSingleDevice from "../../../../components/System/dialogChooseSingleDevice";
+    import dialogChooseSingleProcess from "../../../../components/System/dialogChooseSingleProcess";
+    import dialogChooseSingleParts from "../../../../components/System/dialogChooseSingleParts";
+    import dialogChooseSingleSuppliers from "../../../../components/System/dialogChooseSingleSuppliers";
+    export default {
+        components: {
+          btnInput,dialogChooseSingleUsers,dialogChooseSingleDevice,dialogChooseSingleProcess,dialogChooseSingleParts,dialogChooseSingleSuppliers
+        },
+        name: "work_report_list",
+        data() {
+            return {
+              advanceQueryDialogVisible:false,
+              config: config,
+              formData:{},
+              rulesForm: {
+
+              },
+              RollBackVisible: false,
+              dialogLoading: false,
+                total: 0, //总条数
+                pageSizes: [10, 20, 50], //每页展示多少条
+                search_data: {
+                  pageno: 1,
+                  pagesize: 10
+                },
+                headInfo:{},
+                bodyInfo:{},
+                btnDelDisabled: true,
+                btnOtherDisabled: true,
+                rowIds: [],
+                allCompletionCount: 0,
+                allConformityCount: 0,
+                allReworkCount: 0,
+                allScrapCount: 0,
+
+                allCompletionCountSupport: 0,
+                allConformityCountSupport: 0,
+                allReworkCountSupport: 0,
+                allScrapCountSupport: 0,
+
+                tableData: [],
+                convCoefficientOfChange:0,
+                uomList:[],
+                chooseUserVisible: false, // 选择用户
+                chooseDevicesVisible:false,//选择设备
+                chooseProcessVisible:false,// 选择工序
+                chooseSupplierVisible:false,
+                chooseMaterielVisible:false,
+
+                columnSetDialogVisible: false,
+                columnSetDialogTitle: "设置显示字段列表",
+                tableId: 'jobShop_work_report_table',
+                pictLoading: false,
+
+                //默认列表数据
+                showTableColumnsDefault: [
+                    {title: "报工时间", prop_: "createTime", select: true},
+                    {title: "操作工", prop_: "operatorName", select: true},
+                    {title: "报工单号", prop_: "code", select: true},
+                    {title: "产品代码", prop_: "serialNo", select: true},
+                    {title: "产品名称", prop_: "materialName", select: true},
+                    {title: "规格型号", prop_: "specification", select: true},
+                    {title: "主计量单位", prop_: "unitName", select: true},
+                    {title: "辅助单位", prop_: "supportUomName", select: false},
+                    {title: "自动采集", prop_: "autoCollect", select: false},
+                    {title: "汇报工序", prop_: "processName", select: true},
+                    {title: "完工数量(主计量单位)", prop_: "completionCount", select: true},
+                    {title: "合格数量(主计量单位)", prop_: "conformityCount", select: false},
+                    {title: "返工数量(主计量单位)", prop_: "reworkCount", select: false},
+                    {title: "报废数量(主计量单位)", prop_: "scrapCount", select: false},
+                    {title: "完工数量(辅助单位)", prop_: "completionCountSupport", select: false},
+                    {title: "合格数量(辅助单位)", prop_: "conformityCountSupport", select: false},
+                    {title: "返工数量(辅助单位)", prop_: "reworkCountSupport", select: false},
+                    {title: "报废数量(辅助单位)", prop_: "scrapCountSupport", select: false},
+                    {title: "供应商", prop_: "supplierName", select: false},
+                    {title: "生产部门", prop_: "deptName", select: true},
+                    {title: "加工设备", prop_: "deviceName", select: true},
+                    {title: "生产计划单号", prop_: "proPlanWorkOrderNo", select: true},
+                    {title: "工序计划单号", prop_: "planWorkOrderNo", select: true},
+                ],
+                ///弹出页面列表数据
+                showTableColumns: [
+                    {title: "报工时间", prop_: "createTime", select: true},
+                    {title: "操作工", prop_: "operatorName", select: true},
+                    {title: "报工单号", prop_: "code", select: true},
+                    {title: "产品代码", prop_: "serialNo", select: true},
+                    {title: "产品名称", prop_: "materialName", select: true},
+                    {title: "规格型号", prop_: "specification", select: true},
+                    {title: "主计量单位", prop_: "unitName", select: true},
+                    {title: "辅助单位", prop_: "supportUomName", select: false},
+                    {title: "自动采集", prop_: "autoCollect", select: false},
+                    {title: "汇报工序", prop_: "processName", select: true},
+                    {title: "完工数量(主计量单位)", prop_: "completionCount", select: true},
+                    {title: "合格数量(主计量单位)", prop_: "conformityCount", select: false},
+                    {title: "返工数量(主计量单位)", prop_: "reworkCount", select: false},
+                    {title: "报废数量(主计量单位)", prop_: "scrapCount", select: false},
+                    {title: "完工数量(辅助单位)", prop_: "completionCountSupport", select: false},
+                    {title: "合格数量(辅助单位)", prop_: "conformityCountSupport", select: false},
+                    {title: "返工数量(辅助单位)", prop_: "reworkCountSupport", select: false},
+                    {title: "报废数量(辅助单位)", prop_: "scrapCountSupport", select: false},
+                    {title: "供应商", prop_: "supplierName", select: false},
+                    {title: "生产部门", prop_: "deptName", select: true},
+                    {title: "加工设备", prop_: "deviceName", select: true},
+                    {title: "生产计划单号", prop_: "proPlanWorkOrderNo", select: true},
+                    {title: "工序计划单号", prop_: "planWorkOrderNo", select: true},
+                ],
+                showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
+                //显示的列表字段
+                formTableData: [],
+            };
+        },
+        created() {
+            this.initData();
+            this.getList();
+          var _this = this;
+          document.onkeydown = e => {
+            if (e.key === "Enter") {
+              _this.search()
+            }
+          }
+        },
+        mounted() {
+          this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+          this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+          this.getShowColumns();
+        },
+        methods: {
+          //设置显示字段
+            showColumnSetDialog() {
+                this.columnSetDialogVisible = true;
+                this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+            },
+            //前移
+            toUp(scope) {
+                if (scope.$index == 0) {
+                return false;
+                }
+                let n;
+                for (let i = 0; i < this.showTableColumns.length; i++) {
+                if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+                    n = i;
+                }
+                }
+                let temp = this.showTableColumns[n];
+                this.showTableColumns[n] = this.showTableColumns[n - 1];
+                this.showTableColumns[n - 1] = temp;
+                this.$forceUpdate();
+            },
+            //后移
+            toDown(scope) {
+                if (scope.$index == this.showTableColumns.length - 1) {
+                return false;
+                }
+                let n;
+                for (let i = 0; i < this.showTableColumns.length; i++) {
+                if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+                    n = i;
+                }
+                }
+                let temp = this.showTableColumns[n];
+                this.showTableColumns[n] = this.showTableColumns[n + 1];
+                this.showTableColumns[n + 1] = temp;
+                this.$forceUpdate();
+            },
+            //恢复默认
+            toDefault() {
+                this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+                this.$forceUpdate();
+            },
+            //完成列表字段设置
+            saveAndCloseColumnSetDialog() {
+                let tableNo = this.tableId;
+                let tableColumns = JSON.stringify(this.showTableColumns);
+                this.columnSetDialogVisible = false;
+                this.$api.tableColumnAPI
+                .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
+                .then(res => {
+                    let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+                    this.formTableData = [];
+                    for (let i = 0; i < arr.length; i++) {
+                        if (arr[i].select) {
+                            this.formTableData.push(arr[i]);
+                        }
+                    }
+                })
+                .catch(r => {
+                    console.log(r);
+                });
+            },
+            //关闭字段设置弹出
+            handleClose() {
+                this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
+                this.columnSetDialogVisible = false;
+
+            },
+            /**
+             * 获取显示字段
+             */
+            getShowColumns() {
+                let tableNo = this.tableId;
+                this.formTableData = [];
+
+                this.$api.tableColumnAPI
+                    .getShowColumns({tableNo: tableNo})
+                    .then(res => {
+                        if (res.code == 0) {
+                            if (res.results) {
+                                this.showTableColumns = JSON.parse(res.results);
+                                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+                                for (let i = 0; i < arr.length; i++) {
+                                    if (arr[i].select) {
+                                        this.formTableData.push(arr[i]);
+                                    }
+                                }
+                                this.$forceUpdate();
+                            } else {
+                                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+                                for (let i = 0; i < arr.length; i++) {
+                                    if (arr[i].select) {
+                                        this.formTableData.push(arr[i]);
+                                    }
+                                }
+                                this.$forceUpdate();
+                            }
+                        } else {
+                            this.$message({
+                                message: res.msg ? res.msg : "获取列表信息失败",
+                                type: "error"
+                            });
+                        }
+
+                    })
+                    .catch(r => {
+                        this.$message({
+                            message: r,
+                            type: "error"
+                        });
+                        console.log(r);
+                    });
+            },
+
+            /**
+             * 获取物料单位
+             */
+            getSupportUomName() {
+                this.$api.dictAPI.getDictsByType("uom_type")
+                    .then(res => {
+                        this.uomList = res.datas
+                    })
+            },
+
+          // 编辑
+          edit() {
+              this.getSupportUomName();
+            this.RollBackVisible=true
+            this.getDetail()
+          },
+          // 保存编辑
+          saveAndChange() {
+                debugger;
+            let id = this.rowIds[0].id;
+            let flag = false
+              if(this.formData.isExamine==0){
+                  if(this.formData.completion_count !=this.formData.conformity_count+this.formData.rework_count+this.formData.scrap_count) {
+                      flag = true
+                  }
+              }
+            if(flag) {
+              this.$message({
+                message:"完工数量必须等于合格数量+返工数量+报废数量之和",
+                type: "warning"
+              });
+              return
+            }
+              this.$api.workReportAPI
+                  .updateReport({
+                      id: id,
+                      dispatchItemId:this.formData.dispatchId,
+                      completionCount:this.formData.completion_count,
+                      conformityCount:this.formData.conformity_count,
+                      reworkCount:this.formData.rework_count,
+                      scrapCount:this.formData.scrap_count,
+                      completionCountSupport:this.formData.completionCountSupport,
+                      conformityCountSupport:this.formData.conformityCountSupport,
+                      reworkCountSupport:this.formData.reworkCountSupport,
+                      scrapCountSupport:this.formData.scrapCountSupport,
+                      supportUom:this.formData.supportUom,
+                      convCoefficient:this.formData.convCoefficient,
+                  })
+                  .then(res => {
+                      if (res.code === 0) {
+                          this.$message({
+                              message: res.msg,
+                              type: "success"
+                          });
+                          this.RollBackVisible = false
+                          this.getList();
+                      } else {
+                          this.$message({
+                              message: res.msg,
+                              type: "error"
+                          });
+                      }
+                  })
+          },
+            getDetail() {
+                let id = this.rowIds[0].id;
+                this.dispatchId = id
+                this.$api.workReportAPI
+                    .reportDetail({id: id})
+                    .then(res => {
+                        if (res.code == 0) {
+                            this.$set(this.formData, 'dispatchId', res.data.dispatchId)
+                            this.$set(this.formData, 'reportCode', res.data.reportCode)
+                            this.$set(this.formData, 'planNo', res.data.planNo)
+                            this.$set(this.formData, 'serialNo', res.data.serialNo)
+                            this.$set(this.formData, 'materielName', res.data.materielName)
+                            this.$set(this.formData, 'specification', res.data.specification)
+                            this.$set(this.formData, 'unitName', res.data.unitName)
+                            this.$set(this.formData, 'operatorName', res.data.operatorName)
+                            this.$set(this.formData, 'createTime', res.data.createTime)
+                            this.$set(this.formData, 'deviceName', res.data.deviceName)
+                            this.$set(this.formData, 'deptName', res.data.deptName)
+                            this.$set(this.formData, 'processName', res.data.processName)
+                            this.$set(this.formData, 'createName', res.data.createName)
+                            this.$set(this.formData, 'completion_count', res.data.completion_count)
+                            this.$set(this.formData, 'scrap_count', res.data.scrap_count)
+                            this.$set(this.formData, 'conformity_count', res.data.conformity_count)
+                            this.$set(this.formData, 'rework_count', res.data.rework_count)
+                            this.$set(this.formData, 'completionCountSupport', res.data.completionCountSupport)
+                            this.$set(this.formData, 'scrapCountSupport', res.data.scrapCountSupport)
+                            this.$set(this.formData, 'conformityCountSupport', res.data.conformityCountSupport)
+                            this.$set(this.formData, 'reworkCountSupport', res.data.reworkCountSupport)
+                            this.$set(this.formData, 'supportUomName', res.data.supportUomName)
+                            this.$set(this.formData, 'convCoefficient', res.data.convCoefficient)
+                            this.$set(this.formData, 'isExamine', res.data.isExamine)
+                            this.$set(this.formData, 'status', res.data.status)
+                           this.convCoefficientOfChange=res.data.convCoefficient
+                        }
+                    })
+            },
+          /**
+           * 查看源单明细
+           */
+          viewDetail(r) {
+              let proPlanWorkOrderId = r.proPlanWorkOrderId
+              this.$router.push({ path: '/planManagement/production_add', query: {id:proPlanWorkOrderId,t: Date.now() } })
+          },
+          /**
+           * 查看源单明细
+           */
+          viewDetail1(r) {
+              let planWorkOrderId = r.planWorkOrderId
+              this.$router.push({ path: '/planManagement/working_procedure_add', query: {id:planWorkOrderId,t: Date.now() } })
+          },
+      /**
+       * 高级查询
+       */
+      moreSearch() {
+        this.advanceQueryDialogVisible = true;
+      },
+
+      save() {
+        for (var n in this.formData) {
+          this.search_data[n] = this.formData[n];
+        }
+        this.search_data.pageno = 1;
+        this.$nextTick(function () {
+          this.advanceQueryDialogVisible = false;
+          this.getList();
+        })
+      },
+      //清空
+      clear() {
+        for (var n in this.formData) {
+          this.formData[n] = '';
+        }
+        this.$forceUpdate()
+
+      },
+          sortChange({ column, prop, order }){
+            let j={ column, prop, order };
+            let order_=j.order=="ascending"?'asc':'desc'
+            this.$set(this.search_data,'sort',j.prop)
+            this.$set(this.search_data,'order',order_)
+            this.getList();
+          },
+            //根据当前id,获取一条树枝上的所有id数据
+            treeFindPath (tree, func, path = []) {
+                if (!tree) return []
+                for (const data of tree) {
+                    path.push(data.id)
+                    if (func(data)) return path
+                    if (data.children) {
+                        const findChildren = this.treeFindPath(data.children, func, path)
+                        if (findChildren.length) return findChildren
+                    }
+                    path.pop()
+                }
+                return []
+            },
+          initData(){
+
+          },
+          clickRow(row) {
+            this.$refs.tb.toggleRowSelection(row);
+          },
+
+          /**
+           * 获取用户
+           */
+          getUser(val) {
+            if (val) {
+              this.$set(this.search_data,'operatorName',val.NAME)
+            }else{
+              this.$set(this.search_data,'operatorName',"")
+            }
+          },
+          /**
+           * 选择设备
+           */
+          getDevice(val) {
+            if (val) {
+              this.$set(this.formData,'deviceName',val.name)
+            }else{
+              this.$set(this.formData,'deviceName',"")
+            }
+          },
+          /**
+           * 选择工序
+           */
+          getProcess(val) {
+            if (val) {
+              this.$set(this.search_data,'processName',val.name)
+            }else{
+              this.$set(this.search_data,'processName',"")
+            }
+          },
+          /**
+           * 获取选择的产品
+           */
+          getPart(val) {
+            if (val) {
+              this.$set(this.search_data,'materielName',val.name)
+            }else{
+              this.$set(this.search_data,'materielName',"")
+            }
+          },
+          /**
+           * 获取选择的供应商
+           */
+          getSupplier(val) {
+            if (val) {
+              this.$set(this.formData,'supplierName',val.name)
+            }else{
+              this.$set(this.formData,'supplierName',"")
+            }
+          },
+            /**
+             * 获取列表
+             */
+            getList() {
+                this.pictLoading = true;
+                if (this.search_data.time) {
+                    this.search_data.startTime = formatDateTime(this.search_data.time[0]);
+                    this.search_data.endTime = formatDateTime(this.search_data.time[1]);
+                } else {
+                    this.search_data.startTime = "";
+                    this.search_data.endTime = "";
+                }
+                this.$api.workReportAPI
+                    .workingReportList(this.search_data)
+                    .then(res => {
+                        this.pictLoading = false;
+                        if (res.data) {
+                            this.total = res.data.totalRows;
+                            this.tableData = res.data.datas ? res.data.datas : [];
+                            this.allCompletionCount = res.data.allCompletionCount
+                            this.allConformityCount = res.data.allConformityCount
+                            this.allReworkCount = res.data.allReworkCount
+                            this.allScrapCount = res.data.allScrapCount
+
+                            this.allCompletionCountSupport = res.data.allCompletionCountSupport
+                            this.allConformityCountSupport = res.data.allConformityCountSupport
+                            this.allReworkCountSupport = res.data.allReworkCountSupport
+                            this.allScrapCountSupport = res.data.allScrapCountSupport
+                        } else {
+                            this.total = 0;
+                            this.tableData = [];
+                        }
+                    })
+                    .catch(r => {
+                        this.pictLoading = false;
+                        console.log(r);
+                    });
+            },
+            /**
+             * 查询
+             */
+            search() {
+                this.search_data.pageno = 1;
+                this.getList();
+            },
+            // 上下分页
+            handleCurrentChange(val) {
+                this.search_data.pageno = val;
+                this.getList();
+            },
+            // 每页显示多少条
+            handleSizeChange(val) {
+                this.search_data.pagesize = val;
+                this.getList();
+            },
+            /**
+             * 删除
+             */
+            remove() {
+                let ids = [];
+                this.rowIds.forEach(item => {
+                    ids.push(item.id);
+                });
+                this.$confirm("确认删除选中的报工单吗?", "提示", {
+                    type: "warning"
+                }).then(() => {
+                    this.$api.workReportAPI
+                        .deleteOfReport({ids:ids})
+                        .then(res => {
+                            if (res.code === 0) {
+                                this.$message({
+                                    message: res.msg,
+                                    type: "success"
+                                });
+                                this.getList();
+                            } else {
+                                this.$message({
+                                    message: res.msg ? res.msg : "删除失败，请重试",
+                                    type: "error"
+                                });
+                            }
+                        })
+                        .catch(error => {
+                            this.$message({
+                                message: "删除失败，请重试",
+                                type: "error"
+                            });
+                        });
+                });
+            },
+
+          /**
+           * 返工返修
+           */
+          rework() {
+            if(this.rowIds[0].status==146) {// 暂存状态
+              this.$message({
+                message: "暂存状态不可以返工返修",
+                type: "error"
+              });
+              return
+            }
+            this.$confirm("确认返工返修选中的报工单吗?", "提示", {
+              type: "warning"
+            }).then(() => {
+              this.$api.workReportAPI
+                .reworkRepair({id:this.rowIds[0].id,sign:0})
+                .then(res => {
+                  if (res.code === 0) {
+                    if(res.headInfo){
+                      this.headInfo=res.headInfo
+                      this.bodyInfo=res.bodyInfo
+                      this.headInfo.materielId=this.headInfo.materielId;
+                      this.$router.push({
+                          name: "working_procedure_add_planManagement",
+                          query: { headInfo: this.headInfo,bodyInfo: this.bodyInfo, t: Date.now(),from:'rework',which_rework:"work_report",sourceInfo:res.sourceInfo,reworkCount:this.rowIds[0].reworkCount }
+                      });
+                      return
+                    }else{
+                      this.$message({
+                        message: "没有源工序计划不能返工返修",
+                        type: "warning"
+                      });
+                    }
+                  } else {
+                    this.$message({
+                      message: res.msg ? res.msg : "返修失败，请重试",
+                      type: "error"
+                    });
+                  }
+                })
+                .catch(error => {
+                  this.$message({
+                    message: "返修失败，请重试",
+                    type: "error"
+                  });
+                });
+            });
+          },
+
+            /**
+             * 处理选中
+             */
+            handleSelectionChange(val) {
+                this.rowIds = val;
+                this.setBtn(val);
+            },
+            /**
+             * 控件操作按钮状态
+             */
+            setBtn(val) {
+                let isFlag = true;
+                let isDelFlag = true;
+                if (val.length > 0) {
+                    isDelFlag = false;
+                    if (val.length == 1) {
+                        isFlag = false;
+                    }
+                } else {
+                    isFlag = true;
+                    isDelFlag = true;
+                }
+                this.btnDelDisabled = isDelFlag;
+                this.btnOtherDisabled = isFlag;
+            },
+            // 合计
+            getSummaries(param){
+              const { columns, data } = param;
+              const sums = [];
+              columns.forEach((column, index) => {
+                if (index === 0) {
+                  sums[index] = '总价';
+                  return;
+                }
+                console.log(column.property)
+                const values = data.map(item => Number(item[column.property]));
+                if (!values.every(value => isNaN(value))) {
+                  switch (column.property) {
+                    case 'completionCount':
+                      sums[index] = this.allCompletionCount;
+                      break;
+                    case 'conformityCount':
+                      sums[index] = this.allConformityCount;
+                      break;
+                    case 'reworkCount':
+                      sums[index] = this.allReworkCount;
+                      break;
+                    case 'scrapCount':
+                      sums[index] = this.allScrapCount;
+                      break;
+                    case 'completionCountSupport':
+                      sums[index] = this.allCompletionCountSupport;
+                      break;
+                    case 'conformityCountSupport':
+                      sums[index] = this.allConformityCountSupport;
+                      break;
+                    case 'reworkCountSupport':
+                      sums[index] = this.allReworkCountSupport;
+                      break;
+                    case 'scrapCountSupport':
+                      sums[index] = this.allScrapCountSupport;
+                      break;
+                    default:
+                  }
+                } else {
+                  sums[index] = '';
+                }
+              });
+              return sums;
+            },
+
+            //绑定数量的计算
+            changeCompletionCountSupport(value) {
+                if (!isNaN(this.convCoefficientOfChange) && !isNaN(value)) {
+                    console.log("===="+this.convCoefficientOfChange)
+                    console.log("===="+this.value)
+                   // formData.completion_count
+                   //  row.completion_count = parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(2));
+                    this.$set(this.formData, 'completion_count',parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(3)))
+                    console.log("===="+parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(2)))
+                } else {
+                    row.unitUomCount = 0;
+                }
+            },
+            changeConformityCountSupport(value){
+                if (!isNaN(this.convCoefficientOfChange) && !isNaN(value)) {
+                    console.log("===="+"")
+                    console.log("===="+this.value)
+                    this.$set(this.formData, 'conformity_count',parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(3)))
+                    console.log("===="+parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(2)))
+                } else {
+                    row.unitUomCount = 0;
+                }
+            },
+            changeReworkCountSupport(value){
+                if (!isNaN(this.convCoefficientOfChange) && !isNaN(value)) {
+                    console.log("===="+"")
+                    console.log("===="+this.value)
+                    this.$set(this.formData, 'rework_count',parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(3)))
+                    console.log("===="+parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(2)))
+                } else {
+                    row.unitUomCount = 0;
+                }
+            },
+            changeScrapCountSupport(value){
+                if (!isNaN(this.convCoefficientOfChange) && !isNaN(value)) {
+                    console.log("===报废数量="+"")
+                    console.log("===="+this.value)
+                    this.$set(this.formData, 'scrap_count',parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(3)))
+                    console.log("===="+parseFloat((parseFloat(this.convCoefficientOfChange) * parseFloat(value)).toFixed(2)))
+                } else {
+                    row.unitUomCount = 0;
+                }
+            },
+            //换算系数
+            changeConvCoefficient(value) {
+                if (!isNaN(value)) {
+                    this.convCoefficientOfChange = value;
+                } else {
+                    this.convCoefficientOfChange = 0;
+                };
+                this.changeCompletionCountSupport(this.$refs.ipOne.value);
+                if(this.formData.isExamine==0){
+                    this.changeConformityCountSupport(this.formData.conformityCountSupport );
+                    this.changeReworkCountSupport(this.formData.reworkCountSupport );
+                    this.changeScrapCountSupport(this.formData.scrapCountSupport );
+                }
+            },
+        }
+    };
+</script>
+
+<style scoped>
+  .el-table__row:hover,
+  .el-table__row:hover > td {
+    background-color: #dfedfc !important;
+  }
+  .company-form .form-inline {
+    display: inline-block;
+  }
+
+
+  .company-form .form-inline .el-input {
+    width: 200px !important;
+  }
+  .company-form .form-inline .el-input-number {
+    width: 120px !important;
+  }
+
+  .company-form textarea {
+    height: 80px !important;
+  }
+</style>
+
diff --git a/src/pages/mes/planManagement/production/index.vue b/src/pages/mes/planManagement/production/index.vue
index 4b97961..a74a3e8 100644
--- a/src/pages/mes/planManagement/production/index.vue
+++ b/src/pages/mes/planManagement/production/index.vue
@@ -1,1075 +1,1075 @@
-<template>
-  <div class="sys-task sys-box">
-    <div class="sys-operate sys-tabs">
-      <el-button type="primary" @click="add()" v-has="'plan:productionPlan:add'" style="margin-bottom:5px">新增
-      </el-button>
-      <el-button type="primary" @click="remove()" :disabled="btnDelDisabled" v-has="'plan:productionPlan:delete'">删除
-      </el-button>
-      <el-button type="primary" @click="give(0)" :disabled="btnDelDisabled" v-has="'plan:productionPlan:give'">下达
-      </el-button>
-      <el-button type="primary" @click="give(1)" :disabled="btnOtherDisabled" v-has="'plan:productionPlan:reverseGive'">
-        反下达
-      </el-button>
-      <el-button type="primary" @click="putup(0)" :disabled="btnOtherDisabled" v-has="'plan:productionPlan:putUp'">挂起
-      </el-button>
-      <el-button type="primary" @click="putup(1)" :disabled="btnOtherDisabled"
-        v-has="'plan:productionPlan:reversePutUp'">反挂起
-      </el-button>
-      <el-button type="primary" @click="close(0)" :disabled="btnOtherDisabled" v-has="'plan:productionPlan:close'">结案
-      </el-button>
-      <el-button type="primary" @click="close(1)" :disabled="btnOtherDisabled"
-        v-has="'plan:productionPlan:reverseClose'">反结案
-      </el-button>
-      <el-button type="primary" @click="alteration()" :disabled="btnOtherDisabled"
-        v-has="'plan:productionPlan:alteration'">变更
-      </el-button>
-      <el-button type="primary" @click="follow()" :disabled="btnOtherDisabled" v-has="'plan:productionPlan:follow'">跟踪
-      </el-button>
-      <el-button type="primary" @click="alterationRecord()" :disabled="btnOtherDisabled"
-        v-has="'plan:productionPlan:alterationRecord'">变更记录
-      </el-button>
-      <ExcelImport roleLink="production:plan:import" tmpLink="/static/muban/productionPlan.xlsx" @finish="getList()">
-      </ExcelImport>
-      <el-button type="primary" @click="showColumnSetDialog">{{ config.configureBtnName }}</el-button>
-      <el-button type="primary" @click="print()">打印</el-button>
-      <!-- <el-button type="primary" @click="send()" :disabled="btnOtherDisabled">转派</el-button>
-      <el-button type="primary" @click="check()" :disabled="btnOtherDisabled">验收</el-button>-->
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out ">
-        <div class='form_item_input_out'>
-          <el-form-item label="日期" style='width:34%' class="form_item-inline">
-            <el-date-picker v-model="search_data.time" type="daterange" format="yyyy-MM-dd" range-separator="—"
-              start-placeholder="开始日期" end-placeholder="截止日期"></el-date-picker>
-          </el-form-item>
-          <el-form-item label="产品名称" style='width:24%' class="form_item-inline">
-            <!-- <el-input placeholder="请选择" clearable v-model="search_data.proName">
-              <el-button slot="append" @click="chooseMaterielVisible = true" icon="el-icon-search"></el-button>
-            </el-input> -->
-            <btn-input :valueText.sync='search_data.proName' :valueId.sync='search_data.proName'
-              :chooseVisible.sync='chooseMaterielVisible'></btn-input>
-          </el-form-item>
-          <el-form-item label="生产计划单号" style="width:20%" class="form_item-inline">
-            <el-input v-model="search_data.planNo" placeholder="生产计划单号"></el-input>
-          </el-form-item>
-          <el-form-item label="源单号" style="width:20%" class="form_item-inline">
-            <el-input v-model="search_data.sourceNo" placeholder="源单号"></el-input>
-          </el-form-item>
-          <el-form-item label="生产部门" style='width:22%' class="form_item-inline">
-            <el-cascader clearable v-model="selectDeptId" :options="depOptions"
-              :props="{ expandTrigger: 'hover', label: 'text', value: 'id', checkStrictly: true }"
-              @change="handleChange"></el-cascader>
-          </el-form-item>
-          <el-form-item label="状态" style='width:20%' class="form_item-inline">
-            <el-select v-model="search_data.status" placeholder="请选择" clearable>
-              <el-option v-for="item in planList" :key="item.value" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class='form_item_btn_out'>
-          <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="moreSearch()">高级查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-
-    <div class="sys-table">
-      <el-table border fit @sort-change="sortChange" v-if="formTableData.length > 0" v-loading="pictLoading"
-        @row-click="clickRow" ref="tb" :data="tableData" :summary-method="getSummaries" show-summary
-        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }"
-        @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column v-for="(items, index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
-          align="center" show-overflow-tooltip
-          :sortable="(items.prop_ == 'deliveryDate' || items.prop_ == 'planStartTime' || items.prop_ == 'planEndTime') ? 'custom' : false">
-          <template slot-scope="scope">
-            <div>
-              <div v-if="items.prop_ == 'planNo'">
-                <el-link type="primary" @click.stop="viewDetail(scope.row)">{{ scope.row.planNo }}</el-link>
-              </div>
-              <div v-else-if="items.prop_ == 'sourceNo'">
-                <el-link type="primary" @click.stop="viewDetailOne(scope.row)">{{ scope.row.sourceNo }}</el-link>
-              </div>
-              <div v-else>
-                <div style="overflow:hidden">{{ scope.row[items.prop_] }}</div>
-              </div>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <div class="sys-pagination">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
-      :before-close="handleClose">
-      <el-table border :data="showTableColumns" :key="Math.random()" max-height="350" style="width: 100%">
-        <el-table-column prop="title" label="列表名称" width="180" fixed>
-        </el-table-column>
-        <el-table-column prop="select" label="是否显示" width="180">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-
-    <el-dialog center title="工序计划" width="800px" :visible.sync="producePlanVisible">
-      <el-table :data="producePlan"
-        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }">
-        <el-table-column prop="workOrderNo" label="工序计划单编号" align="center"></el-table-column>
-        <el-table-column prop="materialSerialNo" label="产品代码" align="center"></el-table-column>
-        <el-table-column prop="materialName" label="产品名称" align="center"></el-table-column>
-        <el-table-column prop="planStartTime" label="计划开工日期" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="planEndTime" label="计划完工日期" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="completionCount" label="完工数量" align="center"></el-table-column>
-      </el-table>
-      <el-form style="display: flex;justify-content: center;margin-top: 10px">
-        <el-button style="margin: auto" type="primary" @click="producePlanVisible = false">关闭</el-button>
-      </el-form>
-    </el-dialog>
-    <el-dialog title="高级查询" center :visible.sync="advanceQueryDialogVisible" width="670px">
-      <el-form :inline="true" label-width="80px" class="dialog-form" ref="form" style="width: 620px">
-        <div class="dialog-line">
-          <el-form-item label="客户">
-            <!-- <el-input placeholder="请输入客户" clearable v-model="formData.clientName">
-              <el-button slot="append" @click="chooseClientVisible = true" icon="el-icon-search"></el-button>
-            </el-input> -->
-            <btn-input :valueText.sync='formData.clientName' :valueId.sync='formData.clientName'
-              :chooseVisible.sync='chooseClientVisible'></btn-input>
-          </el-form-item>
-        </div>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">确定</el-button>
-        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
-        <el-button type="primary" @click="clear">清空</el-button>
-      </span>
-    </el-dialog>
-    <!--选择产品-->
-    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getPart"></dialogChooseSingleParts>
-    <!--    选择客户-->
-    <dialogChooseSingleClient :visible.sync="chooseClientVisible" @change="getClient"></dialogChooseSingleClient>
-
-    <!--打印页-->
-    <div style="margin:0 auto;display:none;" id="print_content">
-      <printPlans :printDetail="printDetail" :printList="printList" :printForm="printForm" :printTotal="printTotal"
-        :printDirection=true></printPlans>
-    </div>
-
-
-  </div>
-</template>
-
-<script>
-import {formatDateTime} from "@/utils/tools.js";
-import config from "@/utils/config.js";
-import btnInput from "@/components/btnInput.vue";
-import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
-import dialogChooseSingleClient from "@/components/System/dialogChooseSingleClient";
-import ExcelImport from '@/components/Button/Excel';
-import printPlans from "./printPlans";
-import Cookies from "js-cookie";
-import {parseTime} from "@/utils/tools";
-
-export default {
-  components: {
-    btnInput, dialogChooseSingleParts, dialogChooseSingleClient, ExcelImport, printPlans
-  },
-  name: "production_planManagement",
-  data() {
-    return {
-      formData: {},
-      advanceQueryDialogVisible: false,
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10,
-        // clientId:'',
-        clientName: "",
-        proName: '',
-        deptId: '',
-        status: '',
-        startTime: "",
-        endTime: "",
-      },
-      pictLoading: false,
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      rowIds: [],
-      tableData: [],
-      chooseUserVisible: false,
-
-      planList: [],
-      depOptions: [],
-      selectDeptId: '',
-      chooseMaterielVisible: false,//选择物料
-      chooseClientVisible: false,//选择客户
-      producePlan: {},
-      planCounts: 0,
-      planCountSupports: 0,
-      config: config,
-      producePlanVisible: false,
-
-
-      columnSetDialogVisible: false,
-      columnSetDialogTitle: "设置显示字段列表",
-      tableId: 'planManagement_productuion_table',
-      //默认列表数据
-      showTableColumnsDefault: [
-        {title: "生产计划单号", prop_: "planNo", select: true},
-        {title: "单据状态", prop_: "planStatusName", select: true},
-        {title: "下达人", prop_: "auditorName", select: true},
-        {title: "交货期", prop_: "deliveryDate", select: true},
-        {title: "产品代码", prop_: "materialSerialNo", select: true},
-        {title: "产品名称", prop_: "materialName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "主计量单位", prop_: "unitUomName", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "主单位数量", prop_: "planCount", select: true},
-        {title: "计划生产数量", prop_: "planCountSupport", select: true},
-        {title: "批号", prop_: "batchNo", select: true},
-        {title: "计划开工日期", prop_: "planStartTime", select: true},
-        {title: "计划完工日期", prop_: "planEndTime", select: true},
-        {title: "BOM单号", prop_: "bomSerialno", select: true},
-        {title: "BOM版本", prop_: "bomVersion", select: true},
-        {title: "工艺编号", prop_: "tecRouteCode", select: true},
-        {title: "工艺版本", prop_: "tecRouteVersion", select: true},
-        {title: "制单日期", prop_: "createTime", select: true},
-        {title: "下达时间", prop_: "giveTime", select: true},
-        {title: "结案时间", prop_: "actualFinishTime", select: true},
-        {title: "源单类型", prop_: "sourceTypeName", select: true},
-        {title: "源单号", prop_: "sourceNo", select: true},
-        {title: "客户名称", prop_: "clientName", select: true},
-      ],
-      ///弹出页面列表数据
-      showTableColumns: [
-        {title: "生产计划单号", prop_: "planNo", select: true},
-        {title: "单据状态", prop_: "planStatusName", select: true},
-        {title: "下达人", prop_: "auditorName", select: true},
-        {title: "交货期", prop_: "deliveryDate", select: true},
-        {title: "产品代码", prop_: "materialSerialNo", select: true},
-        {title: "产品名称", prop_: "materialName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "主计量单位", prop_: "unitUomName", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "主单位数量", prop_: "planCount", select: true},
-        {title: "计划生产数量", prop_: "planCountSupport", select: true},
-        {title: "批号", prop_: "batchNo", select: true},
-        {title: "计划开工日期", prop_: "planStartTime", select: true},
-        {title: "计划完工日期", prop_: "planEndTime", select: true},
-        {title: "BOM单号", prop_: "bomSerialno", select: true},
-        {title: "BOM版本", prop_: "bomVersion", select: true},
-        {title: "工艺编号", prop_: "tecRouteCode", select: true},
-        {title: "工艺版本", prop_: "tecRouteVersion", select: true},
-        {title: "制单日期", prop_: "createTime", select: true},
-        {title: "下达时间", prop_: "giveTime", select: true},
-        {title: "结案时间", prop_: "actualFinishTime", select: true},
-        {title: "源单类型", prop_: "sourceTypeName", select: true},
-        {title: "源单号", prop_: "sourceNo", select: true},
-        {title: "客户名称", prop_: "clientName", select: true},
-      ],
-      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
-      //显示的列表字段
-      formTableData: [],
-      printTotal: {count: "", amount: ""},//需要计算总计的列的prop_。如果不需要计算总计就不传给组件
-      printList: [],
-      printDetail: {
-        createByName: "",
-        createTimePrint: ''
-      },
-      printForm: [
-        {title: "产品代码", prop_: "materialSerialNo"},
-        {title: "产品名称", prop_: "materialName"},
-        {title: "规格", prop_: "specification"},
-        {title: "主计量单位", prop_: "unitUomName"},
-        {title: "计划生产数量", prop_: "planCount"},
-        {title: "生产部门", prop_: "proDeptName"},
-        {title: "批号", prop_: "batchNo"},
-        {title: "生产计划单号", prop_: "planNo"},
-        // {title: "辅助单位", prop_: "supportUomName"},
-        // {title: "生产数量（辅助单位）", prop_: "planCountSupport"},
-        {title: "计划开工日期", prop_: "planStartTime"},
-        {title: "计划完工日期", prop_: "planEndTime"},
-      ],
-      userInfo: {},
-    };
-  },
-  created() {
-    this.initData();
-    this.getList();
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search()
-      }
-    }
-  },
-  mounted() {
-    this.userInfo = JSON.parse(Cookies.get("userInfo"));
-    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.getShowColumns();
-  },
-  methods: {
-
-    print() {
-      document.getElementById('print_content').style.display = "block";
-      this.printList = JSON.parse(JSON.stringify(this.printList));//打印内容
-      // this.printList2=JSON.parse(JSON.stringify(this.printList2))//打印内页
-      this.$nextTick(function () {
-        let head_str = "<html><head><title>打印</title></head><body>"; //先生成头部
-        let foot_str = "</body></html>"; //生成尾部
-        let new_str = document.getElementById("print_content").innerHTML; //获取指定打印区域
-        document.body.innerHTML = head_str + new_str + foot_str;
-        window.print(); //打印刚才新建的网页
-        window.location.reload();
-        return false;
-      })
-
-    },
-    //设置显示字段
-    showColumnSetDialog() {
-      this.columnSetDialogVisible = true;
-      this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    },
-    //前移
-    toUp(scope) {
-      if (scope.$index == 0) {
-        return false;
-      }
-      let n;
-      for (let i = 0; i < this.showTableColumns.length; i++) {
-        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-          n = i;
-        }
-      }
-      let temp = this.showTableColumns[n];
-      this.showTableColumns[n] = this.showTableColumns[n - 1];
-      this.showTableColumns[n - 1] = temp;
-      this.$forceUpdate();
-    },
-    //后移
-    toDown(scope) {
-      if (scope.$index == this.showTableColumns.length - 1) {
-        return false;
-      }
-      let n;
-      for (let i = 0; i < this.showTableColumns.length; i++) {
-        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-          n = i;
-        }
-      }
-      let temp = this.showTableColumns[n];
-      this.showTableColumns[n] = this.showTableColumns[n + 1];
-      this.showTableColumns[n + 1] = temp;
-      this.$forceUpdate();
-    },
-    //恢复默认
-    toDefault() {
-      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-      this.$forceUpdate();
-    },
-    //完成列表字段设置
-    saveAndCloseColumnSetDialog() {
-      let tableNo = this.tableId;
-      let tableColumns = JSON.stringify(this.showTableColumns);
-      this.columnSetDialogVisible = false;
-      this.$api.tableColumnAPI
-        .saveShowColumns({tableNo: tableNo, tableColumns: tableColumns})
-        .then(res => {
-          let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-          this.formTableData = [];
-          for (let i = 0; i < arr.length; i++) {
-            if (arr[i].select) {
-              this.formTableData.push(arr[i]);
-            }
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    //关闭字段设置弹出
-    handleClose() {
-      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
-      this.columnSetDialogVisible = false;
-
-    },
-    /**
-     * 获取显示字段
-     */
-    getShowColumns() {
-      let tableNo = this.tableId;
-      this.formTableData = [];
-
-      this.$api.tableColumnAPI
-        .getShowColumns({tableNo: tableNo})
-        .then(res => {
-          if (res.code == 0) {
-            if (res.results) {
-              this.showTableColumns = JSON.parse(res.results);
-              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-              for (let i = 0; i < arr.length; i++) {
-                if (arr[i].select) {
-                  this.formTableData.push(arr[i]);
-                }
-              }
-              this.$forceUpdate();
-            } else {
-              let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-              for (let i = 0; i < arr.length; i++) {
-                if (arr[i].select) {
-                  this.formTableData.push(arr[i]);
-                }
-              }
-              this.$forceUpdate();
-            }
-          } else {
-            this.$message({
-              message: res.msg ? res.msg : "获取列表信息失败",
-              type: "error"
-            });
-          }
-
-        })
-        .catch(r => {
-          this.$message({
-            message: r,
-            type: "error"
-          });
-          console.log(r);
-        });
-    },
-
-
-    /**
-     * 查看源单明细
-     */
-    viewDetail1(r) {
-      let queryId = r.queryId
-      this.$router.push({path: '/sales/salesContract_add', query: {id: queryId, t: Date.now()}})
-    },
-    // 查看
-    /**
-     * 计算合计
-     */
-    getSummaries(param) {
-      const {columns, data} = param;
-      const sums = [];
-      columns.forEach((column, index) => {
-        sums[0] = "合计";
-        if (column.property == 'planCount') {
-          sums[index] = this.planCounts;
-          return;
-        }
-        if (column.property == 'planCountSupport') {
-          sums[index] = this.planCountSupports;
-          return;
-        }
-
-      })
-      return sums;
-
-    },
-    /**
-     * 高级查询
-     */
-    moreSearch() {
-      this.advanceQueryDialogVisible = true;
-    },
-
-    save() {
-      for (var n in this.formData) {
-        this.search_data[n] = this.formData[n];
-      }
-      this.search_data.pageno = 1;
-      this.$nextTick(function () {
-        this.advanceQueryDialogVisible = false;
-        this.getList();
-      })
-    },
-    //清空
-    clear() {
-      for (var n in this.formData) {
-        this.formData[n] = '';
-      }
-      this.$forceUpdate()
-    },
-    sortChange({column, prop, order}) {
-      let j = {column, prop, order};
-      let order_ = j.order == "ascending" ? 'asc' : 'desc'
-      this.$set(this.search_data, 'sort', j.prop)
-      this.$set(this.search_data, 'order', order_)
-      this.getList();
-    },
-    //根据当前id,获取一条树枝上的所有id数据
-    treeFindPath(tree, func, path = []) {
-      if (!tree) return []
-      for (const data of tree) {
-        path.push(data.id)
-        if (func(data)) return path
-        if (data.children) {
-          const findChildren = this.treeFindPath(data.children, func, path)
-          if (findChildren.length) return findChildren
-        }
-        path.pop()
-      }
-      return []
-    },
-    //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
-    setDeptList(tree) {
-      for (const data of tree) {
-        if (!data.hasChildren) {
-          data.children = undefined;
-        } else {
-          this.setDeptList(data.children)
-        }
-      }
-
-    },
-    //显示默认部门
-    setDefaultDept() {
-      if (this.depOptions.length > 0 && this.search_data.deptId) {
-        let id = JSON.stringify(this.search_data.deptId)
-        let select_id = this.treeFindPath(this.depOptions, data => data.id === id)
-        this.selectDeptId = JSON.parse(JSON.stringify(select_id))
-      }
-    },
-
-// 选择部门
-    handleChange: function (value) {
-      this.search_data.deptId = value.length > 0 ? value[value.length - 1] : '';
-      this.selectDeptId = value;
-    },
-    initData() {
-      Promise.all([
-        this.$api.dictAPI.getDictsByType("plan_type"),
-        this.$api.commonAPI.getDeptsTree(),
-      ])
-        .then(([r1, r2, r3]) => {
-          //计划状态
-          if (r1.code === 0) {
-            this.planList = r1.datas;
-          }
-          //使用部门
-          if (r2.code === 0) {
-            this.depOptions = r2.data.children;
-            this.setDefaultDept();
-            this.setDeptList(this.depOptions);
-            // this.deptList = r2.datas;
-          }
-          //使用状况
-          // if (r3.code === 0) {
-          //     this.usingList = r3.datas;
-          // }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-    /**
-     * 获取选择的备件
-     */
-    getPart(val) {
-      if (val) {
-        this.$set(this.search_data, 'proName', val.name)
-      } else {
-        this.$set(this.search_data, 'proName', "")
-      }
-    },
-    /**
-     * 获取选择的客户
-     */
-    getClient(val) {
-      if (val) {
-        this.$set(this.formData, 'clientName', val.client_name)
-        // this.$set(this.search_data,'clientId',val.id)
-      } else {
-        this.$set(this.formData, 'clientName', "")
-        // this.$set(this.search_data,'clientId',"")
-      }
-
-    },
-    /**
-     * 获取列表
-     */
-    getList() {
-      this.pictLoading = true;
-      if (this.search_data.time) {
-        this.search_data.startTime = formatDateTime(this.search_data.time[0]);
-        this.search_data.endTime = formatDateTime(this.search_data.time[1]);
-      } else {
-        this.search_data.startTime = "";
-        this.search_data.endTime = "";
-      }
-      this.$api.planManagementAPI
-        .productionList(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.data) {
-            this.total = res.data.totalRows;
-            this.planCounts = res.count.planCounts;
-            this.planCountSupports = res.count.planCountSupports;
-            this.tableData = res.data.datas ? res.data.datas : [];
-            this.tableData.forEach(item => {
-
-              item.createTime = item.createTime.substr(0, 10)
-              item.deliveryDate = item.deliveryDate.substr(0, 10)
-              item.planStartTime = item.planStartTime.substr(0, 10)
-              item.planEndTime = item.planEndTime.substr(0, 10)
-            })
-            this.printList = this.tableData
-            this.printDetail.createByName = Cookies.get("userName");
-            this.printDetail.createTimePrint = parseTime(new Date(), "{y}-{m}-{d}")
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          this.pictLoading = false;
-          console.log(r);
-        });
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    /**
-     * 新增任务
-     */
-    add() {
-      this.$router.push({
-        path: "/planManagement/production_add",
-        query: {
-          t: Date.now()
-        }
-      });
-    },
-    /**
-     * 查看生产计划明细
-     */
-    viewDetail(r) {
-      this.$router.push({
-        path: "/planManagement/production_add",
-        query: {id: r.id, t: Date.now()}
-      });
-    },
-    // 查看源单明细
-    viewDetailOne(row) {
-      this.$router.push({path: "/sales/salesContract_detail", query: {id: row.id, t: Date.now()}})
-    },
-    //
-    /**
-     * 删除
-     */
-    remove() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      // const ids = this.rowIds.map(item => item.id).toString();
-      let params = {ids: ids};
-      this.$confirm("确认删除选中的生产计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.planManagementAPI
-          .productionPlanBatchRemove({ids: ids})
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 下达
-     */
-    give(n) {
-      console.log(this.userInfo)
-      let item = this.rowIds[0];
-      let id = item.id;
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      if (n == 0) {
-        this.$confirm("确认下达选中的生产计划吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.planManagementAPI
-            .batchIssuedPlan({ids: ids})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "操作失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "操作失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      } else if (n == 1) {
-        if (item.auditorName != this.userInfo.name) {
-          this.$message({
-            message: "该项目无权限反下达",
-            type: "error"
-          });
-          return;
-        }
-        this.$confirm("确认反下达选中的生产计划吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.planManagementAPI
-            .productionPlanreverseIssuedPlan({id: id})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "操作失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "操作失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      }
-    },
-    /**
-     * 挂起
-     */
-    putup(n) {
-      let item = this.rowIds[0];
-      let id = item.id;
-      if (n == 0) {
-        this.$confirm("确认挂起选中的生产计划吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.planManagementAPI
-            .productionPlanPutUpPlan({id: id})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "操作失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "操作失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      } else if (n == 1) {
-        this.$confirm("确认反挂起选中的生产计划吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.planManagementAPI
-            .productionPlanReversePutUpPlan({id: id})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "操作失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "操作失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      }
-    },
-
-    /**
-     * 结案
-     */
-    close(n) {
-      let item = this.rowIds[0];
-      let id = item.id;
-      let _this = this;
-      if (n == 0) {
-        this.$confirm("确认结案选中的生产计划吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.planManagementAPI
-            .productionPlanCloseCase({id: id})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else if (res.code === 1) {
-                this.$confirm(res.msg, '提示', {
-                  confirmButtonText: '查看工序计划详情',
-                  cancelButtonText: '取消',
-                  type: 'warning'
-                }).then(() => {
-                  _this.producePlanVisible = true
-                  _this.producePlan = res.data.data
-                  for (let n in _this.producePlan) {
-                    if (_this.producePlan[n] == null) {
-                      _this.producePlan[n] = 0
-                    }
-                  }
-                }).catch(() => {
-                  // this.$message({
-                  //     type: 'info',
-                  //     message: '已取消删除'
-                  // });
-                });
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "操作失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "操作失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      } else if (n == 1) {
-        this.$confirm("确认反结案选中的生产计划吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.planManagementAPI
-            .productionPlanReverseCloseCase({id: id})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "操作失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "操作失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      }
-    },
-    /**
-     * 变更
-     */
-    alteration() {
-      let item = this.rowIds[0];
-      let id = item.id;
-      if (item.planStatus == 231) {//计划状态
-        this.$router.push({
-          path: "/planManagement/production_add",
-          query: {id: id, t: Date.now()}
-        });
-      } else if (item.planStatus == 234) {
-        this.$message({
-          message: "结案状态不可以变更",
-          type: "error"
-        });
-      } else if (item.planStatus == 233) {
-        this.$message({
-          message: "挂起状态不可以变更",
-          type: "error"
-        });
-      } else if (item.planStatus == 232) {//下达状态
-        this.$api.planManagementAPI
-          .productionPlanisAlterationPlan({id: id})
-          .then(res => {
-            if (res.code === 0) {
-              this.$router.push({
-                path: "/planManagement/production_add",
-                query: {id: id, from: 'alteration', t: Date.now()}
-              });
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "操作失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "操作失败，请重试",
-              type: "error"
-            });
-          });
-      }
-    },
-    /**
-     * 跟踪
-     */
-    follow() {
-      let item = this.rowIds[0];
-      let id = item.id;
-      this.$router.push({
-        path: "/planManagement/production_follow",
-        query: {id: id, planNo: item.planNo, t: Date.now()}
-      });
-    },
-    /**
-     * 变更记录
-     */
-    alterationRecord() {
-      let item = this.rowIds[0];
-      let id = item.id;
-      this.$router.push({
-        path: "/planManagement/production_alteration",
-        query: {id: id, t: Date.now()}
-      });
-    },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    }
-  }
-};
-</script>
-
-<style>
-.el-table__row:hover,
-.el-table__row:hover>td {
-  background-color: #dfedfc !important;
-}
-
-.el-button+.el-button {
-  margin-left: 1px;
-}
-
-.aa {
-  margin: 0 0 0 4px !important;
-}
-
-.el-button--small,
-.el-button--small.is-round {
-  padding: 9px 14px;
-}
-</style>
+<template>
+  <div class="sys-task sys-box">
+    <div class="sys-operate sys-tabs">
+      <el-button type="primary" @click="add()" v-has="'plan:productionPlan:add'" style="margin-bottom:5px">新增
+      </el-button>
+      <el-button type="primary" @click="remove()" :disabled="btnDelDisabled" v-has="'plan:productionPlan:delete'">删除
+      </el-button>
+      <el-button type="primary" @click="give(0)" :disabled="btnDelDisabled" v-has="'plan:productionPlan:give'">下达
+      </el-button>
+      <el-button type="primary" @click="give(1)" :disabled="btnOtherDisabled" v-has="'plan:productionPlan:reverseGive'">
+        反下达
+      </el-button>
+      <el-button type="primary" @click="putup(0)" :disabled="btnOtherDisabled" v-has="'plan:productionPlan:putUp'">挂起
+      </el-button>
+      <el-button type="primary" @click="putup(1)" :disabled="btnOtherDisabled"
+        v-has="'plan:productionPlan:reversePutUp'">反挂起
+      </el-button>
+      <el-button type="primary" @click="close(0)" :disabled="btnOtherDisabled" v-has="'plan:productionPlan:close'">结案
+      </el-button>
+      <el-button type="primary" @click="close(1)" :disabled="btnOtherDisabled"
+        v-has="'plan:productionPlan:reverseClose'">反结案
+      </el-button>
+      <el-button type="primary" @click="alteration()" :disabled="btnOtherDisabled"
+        v-has="'plan:productionPlan:alteration'">变更
+      </el-button>
+      <el-button type="primary" @click="follow()" :disabled="btnOtherDisabled" v-has="'plan:productionPlan:follow'">跟踪
+      </el-button>
+      <el-button type="primary" @click="alterationRecord()" :disabled="btnOtherDisabled"
+        v-has="'plan:productionPlan:alterationRecord'">变更记录
+      </el-button>
+      <ExcelImport roleLink="production:plan:import" tmpLink="/static/muban/productionPlan.xlsx" @finish="getList()">
+      </ExcelImport>
+      <el-button type="primary" @click="showColumnSetDialog">{{ config.configureBtnName }}</el-button>
+      <el-button type="primary" @click="print()">打印</el-button>
+      <!-- <el-button type="primary" @click="send()" :disabled="btnOtherDisabled">转派</el-button>
+      <el-button type="primary" @click="check()" :disabled="btnOtherDisabled">验收</el-button>-->
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out ">
+        <div class='form_item_input_out'>
+          <el-form-item label="日期" style='width:34%' class="form_item-inline">
+            <el-date-picker v-model="search_data.time" type="daterange" format="yyyy-MM-dd" range-separator="—"
+              start-placeholder="开始日期" end-placeholder="截止日期"></el-date-picker>
+          </el-form-item>
+          <el-form-item label="产品名称" style='width:24%' class="form_item-inline">
+            <!-- <el-input placeholder="请选择" clearable v-model="search_data.proName">
+              <el-button slot="append" @click="chooseMaterielVisible = true" icon="el-icon-search"></el-button>
+            </el-input> -->
+            <btn-input :valueText.sync='search_data.proName' :valueId.sync='search_data.proName'
+              :chooseVisible.sync='chooseMaterielVisible'></btn-input>
+          </el-form-item>
+          <el-form-item label="生产计划单号" style="width:20%" class="form_item-inline">
+            <el-input v-model="search_data.planNo" placeholder="生产计划单号"></el-input>
+          </el-form-item>
+          <el-form-item label="源单号" style="width:20%" class="form_item-inline">
+            <el-input v-model="search_data.sourceNo" placeholder="源单号"></el-input>
+          </el-form-item>
+          <el-form-item label="生产部门" style='width:22%' class="form_item-inline">
+            <el-cascader clearable v-model="selectDeptId" :options="depOptions"
+              :props="{ expandTrigger: 'hover', label: 'text', value: 'id', checkStrictly: true }"
+              @change="handleChange"></el-cascader>
+          </el-form-item>
+          <el-form-item label="状态" style='width:20%' class="form_item-inline">
+            <el-select v-model="search_data.status" placeholder="请选择" clearable>
+              <el-option v-for="item in planList" :key="item.value" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class='form_item_btn_out'>
+          <el-form-item>
+            <el-button type="primary" @click="search()">查询</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="moreSearch()">高级查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+
+    <div class="sys-table">
+      <el-table border fit @sort-change="sortChange" v-if="formTableData.length > 0" v-loading="pictLoading"
+        @row-click="clickRow" ref="tb" :data="tableData" :summary-method="getSummaries" show-summary
+        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column v-for="(items, index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
+          align="center" show-overflow-tooltip
+          :sortable="(items.prop_ == 'deliveryDate' || items.prop_ == 'planStartTime' || items.prop_ == 'planEndTime') ? 'custom' : false">
+          <template slot-scope="scope">
+            <div>
+              <div v-if="items.prop_ == 'planNo'">
+                <el-link type="primary" @click.stop="viewDetail(scope.row)">{{ scope.row.planNo }}</el-link>
+              </div>
+              <div v-else-if="items.prop_ == 'sourceNo'">
+                <el-link type="primary" @click.stop="viewDetailOne(scope.row)">{{ scope.row.sourceNo }}</el-link>
+              </div>
+              <div v-else>
+                <div style="overflow:hidden">{{ scope.row[items.prop_] }}</div>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div class="sys-pagination">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
+      :before-close="handleClose">
+      <el-table border :data="showTableColumns" :key="Math.random()" max-height="350" style="width: 100%">
+        <el-table-column prop="title" label="列表名称" width="180" fixed>
+        </el-table-column>
+        <el-table-column prop="select" label="是否显示" width="180">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+
+    <el-dialog center title="工序计划" width="800px" :visible.sync="producePlanVisible">
+      <el-table :data="producePlan"
+        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }">
+        <el-table-column prop="workOrderNo" label="工序计划单编号" align="center"></el-table-column>
+        <el-table-column prop="materialSerialNo" label="产品代码" align="center"></el-table-column>
+        <el-table-column prop="materialName" label="产品名称" align="center"></el-table-column>
+        <el-table-column prop="planStartTime" label="计划开工日期" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="planEndTime" label="计划完工日期" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="completionCount" label="完工数量" align="center"></el-table-column>
+      </el-table>
+      <el-form style="display: flex;justify-content: center;margin-top: 10px">
+        <el-button style="margin: auto" type="primary" @click="producePlanVisible = false">关闭</el-button>
+      </el-form>
+    </el-dialog>
+    <el-dialog title="高级查询" center :visible.sync="advanceQueryDialogVisible" width="670px">
+      <el-form :inline="true" label-width="80px" class="dialog-form" ref="form" style="width: 620px">
+        <div class="dialog-line">
+          <el-form-item label="客户">
+            <!-- <el-input placeholder="请输入客户" clearable v-model="formData.clientName">
+              <el-button slot="append" @click="chooseClientVisible = true" icon="el-icon-search"></el-button>
+            </el-input> -->
+            <btn-input :valueText.sync='formData.clientName' :valueId.sync='formData.clientName'
+              :chooseVisible.sync='chooseClientVisible'></btn-input>
+          </el-form-item>
+        </div>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">确定</el-button>
+        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="clear">清空</el-button>
+      </span>
+    </el-dialog>
+    <!--选择产品-->
+    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getPart"></dialogChooseSingleParts>
+    <!--    选择客户-->
+    <dialogChooseSingleClient :visible.sync="chooseClientVisible" @change="getClient"></dialogChooseSingleClient>
+
+    <!--打印页-->
+    <div style="margin:0 auto;display:none;" id="print_content">
+      <printPlans :printDetail="printDetail" :printList="printList" :printForm="printForm" :printTotal="printTotal"
+        :printDirection=true></printPlans>
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+import {formatDateTime} from "@/utils/tools.js";
+import config from "@/utils/config.js";
+import btnInput from "@/components/btnInput.vue";
+import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
+import dialogChooseSingleClient from "@/components/System/dialogChooseSingleClient";
+import ExcelImport from '@/components/Button/Excel';
+import printPlans from "./printPlans";
+import Cookies from "js-cookie";
+import {parseTime} from "@/utils/tools";
+
+export default {
+  components: {
+    btnInput, dialogChooseSingleParts, dialogChooseSingleClient, ExcelImport, printPlans
+  },
+  name: "production_planManagement",
+  data() {
+    return {
+      formData: {},
+      advanceQueryDialogVisible: false,
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10,
+        // clientId:'',
+        clientName: "",
+        proName: '',
+        deptId: '',
+        status: '',
+        startTime: "",
+        endTime: "",
+      },
+      pictLoading: false,
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      rowIds: [],
+      tableData: [],
+      chooseUserVisible: false,
+
+      planList: [],
+      depOptions: [],
+      selectDeptId: '',
+      chooseMaterielVisible: false,//选择物料
+      chooseClientVisible: false,//选择客户
+      producePlan: {},
+      planCounts: 0,
+      planCountSupports: 0,
+      config: config,
+      producePlanVisible: false,
+
+
+      columnSetDialogVisible: false,
+      columnSetDialogTitle: "设置显示字段列表",
+      tableId: 'planManagement_productuion_table',
+      //默认列表数据
+      showTableColumnsDefault: [
+        {title: "生产计划单号", prop_: "planNo", select: true},
+        {title: "单据状态", prop_: "planStatusName", select: true},
+        {title: "下达人", prop_: "auditorName", select: true},
+        {title: "交货期", prop_: "deliveryDate", select: false},
+        {title: "产品代码", prop_: "materialSerialNo", select: true},
+        {title: "产品名称", prop_: "materialName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "主计量单位", prop_: "unitUomName", select: true},
+        {title: "辅助单位", prop_: "supportUomName", select: false},
+        {title: "主单位数量", prop_: "planCount", select: false},
+        {title: "计划生产数量", prop_: "planCountSupport", select: true},
+        {title: "批号", prop_: "batchNo", select: false},
+        {title: "计划开工日期", prop_: "planStartTime", select: true},
+        {title: "计划完工日期", prop_: "planEndTime", select: true},
+        {title: "BOM单号", prop_: "bomSerialno", select: false},
+        {title: "BOM版本", prop_: "bomVersion", select: false},
+        {title: "工艺编号", prop_: "tecRouteCode", select: true},
+        {title: "工艺版本", prop_: "tecRouteVersion", select: false},
+        {title: "制单日期", prop_: "createTime", select: true},
+        {title: "下达时间", prop_: "giveTime", select: false},
+        {title: "结案时间", prop_: "actualFinishTime", select: false},
+        {title: "源单类型", prop_: "sourceTypeName", select: true},
+        {title: "源单号", prop_: "sourceNo", select: true},
+        {title: "客户名称", prop_: "clientName", select: false},
+      ],
+      ///弹出页面列表数据
+      showTableColumns: [
+        {title: "生产计划单号", prop_: "planNo", select: true},
+        {title: "单据状态", prop_: "planStatusName", select: true},
+        {title: "下达人", prop_: "auditorName", select: true},
+        {title: "交货期", prop_: "deliveryDate", select: false},
+        {title: "产品代码", prop_: "materialSerialNo", select: true},
+        {title: "产品名称", prop_: "materialName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "主计量单位", prop_: "unitUomName", select: true},
+        {title: "辅助单位", prop_: "supportUomName", select: false},
+        {title: "主单位数量", prop_: "planCount", select: false},
+        {title: "计划生产数量", prop_: "planCountSupport", select: true},
+        {title: "批号", prop_: "batchNo", select: false},
+        {title: "计划开工日期", prop_: "planStartTime", select: true},
+        {title: "计划完工日期", prop_: "planEndTime", select: true},
+        {title: "BOM单号", prop_: "bomSerialno", select: false},
+        {title: "BOM版本", prop_: "bomVersion", select: false},
+        {title: "工艺编号", prop_: "tecRouteCode", select: true},
+        {title: "工艺版本", prop_: "tecRouteVersion", select: false},
+        {title: "制单日期", prop_: "createTime", select: true},
+        {title: "下达时间", prop_: "giveTime", select: false},
+        {title: "结案时间", prop_: "actualFinishTime", select: false},
+        {title: "源单类型", prop_: "sourceTypeName", select: true},
+        {title: "源单号", prop_: "sourceNo", select: true},
+        {title: "客户名称", prop_: "clientName", select: false},
+      ],
+      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
+      //显示的列表字段
+      formTableData: [],
+      printTotal: {count: "", amount: ""},//需要计算总计的列的prop_。如果不需要计算总计就不传给组件
+      printList: [],
+      printDetail: {
+        createByName: "",
+        createTimePrint: ''
+      },
+      printForm: [
+        {title: "产品代码", prop_: "materialSerialNo"},
+        {title: "产品名称", prop_: "materialName"},
+        {title: "规格", prop_: "specification"},
+        {title: "主计量单位", prop_: "unitUomName"},
+        {title: "计划生产数量", prop_: "planCount"},
+        {title: "生产部门", prop_: "proDeptName"},
+        {title: "批号", prop_: "batchNo"},
+        {title: "生产计划单号", prop_: "planNo"},
+        // {title: "辅助单位", prop_: "supportUomName"},
+        // {title: "生产数量（辅助单位）", prop_: "planCountSupport"},
+        {title: "计划开工日期", prop_: "planStartTime"},
+        {title: "计划完工日期", prop_: "planEndTime"},
+      ],
+      userInfo: {},
+    };
+  },
+  created() {
+    this.initData();
+    this.getList();
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search()
+      }
+    }
+  },
+  mounted() {
+    this.userInfo = JSON.parse(Cookies.get("userInfo"));
+    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.getShowColumns();
+  },
+  methods: {
+
+    print() {
+      document.getElementById('print_content').style.display = "block";
+      this.printList = JSON.parse(JSON.stringify(this.printList));//打印内容
+      // this.printList2=JSON.parse(JSON.stringify(this.printList2))//打印内页
+      this.$nextTick(function () {
+        let head_str = "<html><head><title>打印</title></head><body>"; //先生成头部
+        let foot_str = "</body></html>"; //生成尾部
+        let new_str = document.getElementById("print_content").innerHTML; //获取指定打印区域
+        document.body.innerHTML = head_str + new_str + foot_str;
+        window.print(); //打印刚才新建的网页
+        window.location.reload();
+        return false;
+      })
+
+    },
+    //设置显示字段
+    showColumnSetDialog() {
+      this.columnSetDialogVisible = true;
+      this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    },
+    //前移
+    toUp(scope) {
+      if (scope.$index == 0) {
+        return false;
+      }
+      let n;
+      for (let i = 0; i < this.showTableColumns.length; i++) {
+        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+          n = i;
+        }
+      }
+      let temp = this.showTableColumns[n];
+      this.showTableColumns[n] = this.showTableColumns[n - 1];
+      this.showTableColumns[n - 1] = temp;
+      this.$forceUpdate();
+    },
+    //后移
+    toDown(scope) {
+      if (scope.$index == this.showTableColumns.length - 1) {
+        return false;
+      }
+      let n;
+      for (let i = 0; i < this.showTableColumns.length; i++) {
+        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+          n = i;
+        }
+      }
+      let temp = this.showTableColumns[n];
+      this.showTableColumns[n] = this.showTableColumns[n + 1];
+      this.showTableColumns[n + 1] = temp;
+      this.$forceUpdate();
+    },
+    //恢复默认
+    toDefault() {
+      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+      this.$forceUpdate();
+    },
+    //完成列表字段设置
+    saveAndCloseColumnSetDialog() {
+      let tableNo = this.tableId;
+      let tableColumns = JSON.stringify(this.showTableColumns);
+      this.columnSetDialogVisible = false;
+      this.$api.tableColumnAPI
+        .saveShowColumns({tableNo: tableNo, tableColumns: tableColumns})
+        .then(res => {
+          let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+          this.formTableData = [];
+          for (let i = 0; i < arr.length; i++) {
+            if (arr[i].select) {
+              this.formTableData.push(arr[i]);
+            }
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    //关闭字段设置弹出
+    handleClose() {
+      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
+      this.columnSetDialogVisible = false;
+
+    },
+    /**
+     * 获取显示字段
+     */
+    getShowColumns() {
+      let tableNo = this.tableId;
+      this.formTableData = [];
+
+      this.$api.tableColumnAPI
+        .getShowColumns({tableNo: tableNo})
+        .then(res => {
+          if (res.code == 0) {
+            if (res.results) {
+              this.showTableColumns = JSON.parse(res.results);
+              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+              for (let i = 0; i < arr.length; i++) {
+                if (arr[i].select) {
+                  this.formTableData.push(arr[i]);
+                }
+              }
+              this.$forceUpdate();
+            } else {
+              let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+              for (let i = 0; i < arr.length; i++) {
+                if (arr[i].select) {
+                  this.formTableData.push(arr[i]);
+                }
+              }
+              this.$forceUpdate();
+            }
+          } else {
+            this.$message({
+              message: res.msg ? res.msg : "获取列表信息失败",
+              type: "error"
+            });
+          }
+
+        })
+        .catch(r => {
+          this.$message({
+            message: r,
+            type: "error"
+          });
+          console.log(r);
+        });
+    },
+
+
+    /**
+     * 查看源单明细
+     */
+    viewDetail1(r) {
+      let queryId = r.queryId
+      this.$router.push({path: '/sales/salesContract_add', query: {id: queryId, t: Date.now()}})
+    },
+    // 查看
+    /**
+     * 计算合计
+     */
+    getSummaries(param) {
+      const {columns, data} = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        sums[0] = "合计";
+        if (column.property == 'planCount') {
+          sums[index] = this.planCounts;
+          return;
+        }
+        if (column.property == 'planCountSupport') {
+          sums[index] = this.planCountSupports;
+          return;
+        }
+
+      })
+      return sums;
+
+    },
+    /**
+     * 高级查询
+     */
+    moreSearch() {
+      this.advanceQueryDialogVisible = true;
+    },
+
+    save() {
+      for (var n in this.formData) {
+        this.search_data[n] = this.formData[n];
+      }
+      this.search_data.pageno = 1;
+      this.$nextTick(function () {
+        this.advanceQueryDialogVisible = false;
+        this.getList();
+      })
+    },
+    //清空
+    clear() {
+      for (var n in this.formData) {
+        this.formData[n] = '';
+      }
+      this.$forceUpdate()
+    },
+    sortChange({column, prop, order}) {
+      let j = {column, prop, order};
+      let order_ = j.order == "ascending" ? 'asc' : 'desc'
+      this.$set(this.search_data, 'sort', j.prop)
+      this.$set(this.search_data, 'order', order_)
+      this.getList();
+    },
+    //根据当前id,获取一条树枝上的所有id数据
+    treeFindPath(tree, func, path = []) {
+      if (!tree) return []
+      for (const data of tree) {
+        path.push(data.id)
+        if (func(data)) return path
+        if (data.children) {
+          const findChildren = this.treeFindPath(data.children, func, path)
+          if (findChildren.length) return findChildren
+        }
+        path.pop()
+      }
+      return []
+    },
+    //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
+    setDeptList(tree) {
+      for (const data of tree) {
+        if (!data.hasChildren) {
+          data.children = undefined;
+        } else {
+          this.setDeptList(data.children)
+        }
+      }
+
+    },
+    //显示默认部门
+    setDefaultDept() {
+      if (this.depOptions.length > 0 && this.search_data.deptId) {
+        let id = JSON.stringify(this.search_data.deptId)
+        let select_id = this.treeFindPath(this.depOptions, data => data.id === id)
+        this.selectDeptId = JSON.parse(JSON.stringify(select_id))
+      }
+    },
+
+// 选择部门
+    handleChange: function (value) {
+      this.search_data.deptId = value.length > 0 ? value[value.length - 1] : '';
+      this.selectDeptId = value;
+    },
+    initData() {
+      Promise.all([
+        this.$api.dictAPI.getDictsByType("plan_type"),
+        this.$api.commonAPI.getDeptsTree(),
+      ])
+        .then(([r1, r2, r3]) => {
+          //计划状态
+          if (r1.code === 0) {
+            this.planList = r1.datas;
+          }
+          //使用部门
+          if (r2.code === 0) {
+            this.depOptions = r2.data.children;
+            this.setDefaultDept();
+            this.setDeptList(this.depOptions);
+            // this.deptList = r2.datas;
+          }
+          //使用状况
+          // if (r3.code === 0) {
+          //     this.usingList = r3.datas;
+          // }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+    /**
+     * 获取选择的备件
+     */
+    getPart(val) {
+      if (val) {
+        this.$set(this.search_data, 'proName', val.name)
+      } else {
+        this.$set(this.search_data, 'proName', "")
+      }
+    },
+    /**
+     * 获取选择的客户
+     */
+    getClient(val) {
+      if (val) {
+        this.$set(this.formData, 'clientName', val.client_name)
+        // this.$set(this.search_data,'clientId',val.id)
+      } else {
+        this.$set(this.formData, 'clientName', "")
+        // this.$set(this.search_data,'clientId',"")
+      }
+
+    },
+    /**
+     * 获取列表
+     */
+    getList() {
+      this.pictLoading = true;
+      if (this.search_data.time) {
+        this.search_data.startTime = formatDateTime(this.search_data.time[0]);
+        this.search_data.endTime = formatDateTime(this.search_data.time[1]);
+      } else {
+        this.search_data.startTime = "";
+        this.search_data.endTime = "";
+      }
+      this.$api.planManagementAPI
+        .productionList(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.data) {
+            this.total = res.data.totalRows;
+            this.planCounts = res.count.planCounts;
+            this.planCountSupports = res.count.planCountSupports;
+            this.tableData = res.data.datas ? res.data.datas : [];
+            this.tableData.forEach(item => {
+
+              item.createTime = item.createTime.substr(0, 10)
+              item.deliveryDate = item.deliveryDate.substr(0, 10)
+              item.planStartTime = item.planStartTime.substr(0, 10)
+              item.planEndTime = item.planEndTime.substr(0, 10)
+            })
+            this.printList = this.tableData
+            this.printDetail.createByName = Cookies.get("userName");
+            this.printDetail.createTimePrint = parseTime(new Date(), "{y}-{m}-{d}")
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          this.pictLoading = false;
+          console.log(r);
+        });
+    },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    /**
+     * 新增任务
+     */
+    add() {
+      this.$router.push({
+        path: "/planManagement/production_add",
+        query: {
+          t: Date.now()
+        }
+      });
+    },
+    /**
+     * 查看生产计划明细
+     */
+    viewDetail(r) {
+      this.$router.push({
+        path: "/planManagement/production_add",
+        query: {id: r.id, t: Date.now()}
+      });
+    },
+    // 查看源单明细
+    viewDetailOne(row) {
+      this.$router.push({path: "/sales/salesContract_detail", query: {id: row.id, t: Date.now()}})
+    },
+    //
+    /**
+     * 删除
+     */
+    remove() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      // const ids = this.rowIds.map(item => item.id).toString();
+      let params = {ids: ids};
+      this.$confirm("确认删除选中的生产计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.planManagementAPI
+          .productionPlanBatchRemove({ids: ids})
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 下达
+     */
+    give(n) {
+      console.log(this.userInfo)
+      let item = this.rowIds[0];
+      let id = item.id;
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      if (n == 0) {
+        this.$confirm("确认下达选中的生产计划吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.planManagementAPI
+            .batchIssuedPlan({ids: ids})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "操作失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "操作失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      } else if (n == 1) {
+        if (item.auditorName != this.userInfo.name) {
+          this.$message({
+            message: "该项目无权限反下达",
+            type: "error"
+          });
+          return;
+        }
+        this.$confirm("确认反下达选中的生产计划吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.planManagementAPI
+            .productionPlanreverseIssuedPlan({id: id})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "操作失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "操作失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      }
+    },
+    /**
+     * 挂起
+     */
+    putup(n) {
+      let item = this.rowIds[0];
+      let id = item.id;
+      if (n == 0) {
+        this.$confirm("确认挂起选中的生产计划吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.planManagementAPI
+            .productionPlanPutUpPlan({id: id})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "操作失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "操作失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      } else if (n == 1) {
+        this.$confirm("确认反挂起选中的生产计划吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.planManagementAPI
+            .productionPlanReversePutUpPlan({id: id})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "操作失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "操作失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      }
+    },
+
+    /**
+     * 结案
+     */
+    close(n) {
+      let item = this.rowIds[0];
+      let id = item.id;
+      let _this = this;
+      if (n == 0) {
+        this.$confirm("确认结案选中的生产计划吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.planManagementAPI
+            .productionPlanCloseCase({id: id})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else if (res.code === 1) {
+                this.$confirm(res.msg, '提示', {
+                  confirmButtonText: '查看工序计划详情',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(() => {
+                  _this.producePlanVisible = true
+                  _this.producePlan = res.data.data
+                  for (let n in _this.producePlan) {
+                    if (_this.producePlan[n] == null) {
+                      _this.producePlan[n] = 0
+                    }
+                  }
+                }).catch(() => {
+                  // this.$message({
+                  //     type: 'info',
+                  //     message: '已取消删除'
+                  // });
+                });
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "操作失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "操作失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      } else if (n == 1) {
+        this.$confirm("确认反结案选中的生产计划吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.planManagementAPI
+            .productionPlanReverseCloseCase({id: id})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "操作失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "操作失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      }
+    },
+    /**
+     * 变更
+     */
+    alteration() {
+      let item = this.rowIds[0];
+      let id = item.id;
+      if (item.planStatus == 231) {//计划状态
+        this.$router.push({
+          path: "/planManagement/production_add",
+          query: {id: id, t: Date.now()}
+        });
+      } else if (item.planStatus == 234) {
+        this.$message({
+          message: "结案状态不可以变更",
+          type: "error"
+        });
+      } else if (item.planStatus == 233) {
+        this.$message({
+          message: "挂起状态不可以变更",
+          type: "error"
+        });
+      } else if (item.planStatus == 232) {//下达状态
+        this.$api.planManagementAPI
+          .productionPlanisAlterationPlan({id: id})
+          .then(res => {
+            if (res.code === 0) {
+              this.$router.push({
+                path: "/planManagement/production_add",
+                query: {id: id, from: 'alteration', t: Date.now()}
+              });
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "操作失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "操作失败，请重试",
+              type: "error"
+            });
+          });
+      }
+    },
+    /**
+     * 跟踪
+     */
+    follow() {
+      let item = this.rowIds[0];
+      let id = item.id;
+      this.$router.push({
+        path: "/planManagement/production_follow",
+        query: {id: id, planNo: item.planNo, t: Date.now()}
+      });
+    },
+    /**
+     * 变更记录
+     */
+    alterationRecord() {
+      let item = this.rowIds[0];
+      let id = item.id;
+      this.$router.push({
+        path: "/planManagement/production_alteration",
+        query: {id: id, t: Date.now()}
+      });
+    },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    }
+  }
+};
+</script>
+
+<style>
+.el-table__row:hover,
+.el-table__row:hover>td {
+  background-color: #dfedfc !important;
+}
+
+.el-button+.el-button {
+  margin-left: 1px;
+}
+
+.aa {
+  margin: 0 0 0 4px !important;
+}
+
+.el-button--small,
+.el-button--small.is-round {
+  padding: 9px 14px;
+}
+</style>
diff --git a/src/pages/mes/planManagement/working_procedure/index.vue b/src/pages/mes/planManagement/working_procedure/index.vue
index afa9f54..8384ddb 100644
--- a/src/pages/mes/planManagement/working_procedure/index.vue
+++ b/src/pages/mes/planManagement/working_procedure/index.vue
@@ -1,1057 +1,1057 @@
-<template>
-  <div class="sys-task sys-box">
-    <div class="sys-operate sys-tabs">
-      <el-button type="primary" @click="add()" v-has="'plan:workingProcedure:add'">新增</el-button>
-      <el-button type="primary" @click="remove()" :disabled="btnDelDisabled" v-has="'plan:workingProcedure:delete'">删除
-      </el-button>
-      <el-button type="primary" @click="give(0)" :disabled="btnDelDisabled" v-has="'plan:workingProcedure:give'">下达
-      </el-button>
-      <el-button type="primary" @click="give(1)" :disabled="btnOtherDisabled"
-        v-has="'plan:workingProcedure:reverseGive'">反下达
-      </el-button>
-      <el-button type="primary" @click="putup(0)" :disabled="btnOtherDisabled" v-has="'plan:workingProcedure:putUp'">
-        挂起
-      </el-button>
-      <el-button type="primary" @click="putup(1)" :disabled="btnOtherDisabled"
-        v-has="'plan:workingProcedure:reversePutUp'">反挂起
-      </el-button>
-      <el-button type="primary" @click="close(0)" :disabled="btnOtherDisabled" v-has="'plan:workingProcedure:close'">
-        结案
-      </el-button>
-      <el-button type="primary" @click="close(1)" :disabled="btnOtherDisabled"
-        v-has="'plan:workingProcedure:reverseClose'">反结案
-      </el-button>
-      <el-button type="primary" @click="split" :disabled="btnOtherDisabled" v-has="'plan:workingProcedure:split'">拆分
-      </el-button>
-      <el-button type="primary" @click="concat" :disabled="btnOtherDisabled" v-has="'plan:workingProcedure:concat'">还原
-      </el-button>
-      <el-button type="primary" @click="follow" :disabled="btnOtherDisabled" v-has="'plan:workingProcedure:follow'">跟踪
-      </el-button>
-      <el-button type="primary" @click="detail" :disabled="btnOtherDisabled" v-has="'plan:workingProcedure:detail'">查看
-      </el-button>
-      <el-button type="primary" @click="showColumnSetDialog">{{ config.configureBtnName }}</el-button>
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class='form_item_input_out'>
-          <el-form-item label="日期" style='width:34%' class="form_item-inline">
-            <el-date-picker v-model="search_data.time" type="daterange" format="yyyy-MM-dd" range-separator="—"
-              start-placeholder="开始日期" end-placeholder="截止日期"></el-date-picker>
-          </el-form-item>
-          <el-form-item label="产品名称" style='width:24%' class="form_item-inline">
-            <el-input placeholder="请选择产品" clearable v-model="search_data.proName">
-              <el-button slot="append" @click="chooseMaterielVisible = true" icon="el-icon-search"></el-button>
-            </el-input>
-          </el-form-item>
-          <el-form-item label="生产计划单号" style="width:20%" class="form_item-inline">
-            <el-input v-model="search_data.productionPlanNo" placeholder="生产计划单号"></el-input>
-          </el-form-item>
-          <el-form-item label="工序计划单编号" style="width:20%" class="form_item-inline">
-            <el-input v-model="search_data.planNo" placeholder="工序计划单编号"></el-input>
-          </el-form-item>
-          <el-form-item label="生产部门" style='width:24%' class="form_item-inline">
-            <el-cascader clearable v-model="selectDeptId" :options="depOptions"
-              :props="{ expandTrigger: 'hover', label: 'text', value: 'id', checkStrictly: true }"
-              @change="handleChange"></el-cascader>
-          </el-form-item>
-          <el-form-item label="状态" style='width:18%' class="form_item-inline">
-            <el-select v-model="search_data.status" placeholder="请选择状态" clearable>
-              <el-option v-for="item in planList" :key="item.value" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class='form_item_btn_out'>
-          <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-
-    <div class="sys-table">
-      <el-table border fit @sort-change="sortChange" v-loading="pictLoading" @row-click="clickRow" ref="tb"
-        :summary-method="getSummaries" show-summary v-if="formTableData.length > 0" :data="tableData"
-        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }"
-        @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column v-for="(items, index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
-          align="center" show-overflow-tooltip :sortable="(items.prop_ == 'deliveryDate') ? 'custom' : false">
-          <template slot-scope="scope">
-            <div>
-              <div v-if="items.prop_ == 'planNo'">
-                <el-link type="primary" @click.stop="viewDetail(scope.row)">{{ scope.row.planNo }}</el-link>
-              </div>
-              <div v-else-if="items.prop_ == 'productionPlanNo'">
-                <el-link type="primary" @click.stop="viewDetail1(scope.row)">{{ scope.row.productionPlanNo }}</el-link>
-              </div>
-              <div v-else>
-                <div style="overflow:hidden">{{ scope.row[items.prop_] }}</div>
-              </div>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <div class="sys-pagination">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
-      :before-close="handleClose">
-      <el-table border :data="showTableColumns" :key="Math.random()" max-height="350" style="width: 100%">
-        <el-table-column prop="title" label="列表名称" width="180" fixed>
-        </el-table-column>
-        <el-table-column prop="select" label="是否显示" width="180">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-
-    <el-drawer size="820px" :modal="false" :title="drawerTitle" :visible.sync="drawer">
-      <el-table v-loading="drawerLoading" :data="bodyList" fit
-        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }"
-        border>
-        <el-table-column prop="serialNumber" show-overflow-tooltip align="center" label="顺序号"></el-table-column>
-        <el-table-column prop="processCode" show-overflow-tooltip width="160" align="center"
-          label="工序代码"></el-table-column>
-        <el-table-column prop="processName" show-overflow-tooltip align="center" label="工序名称"></el-table-column>
-        <el-table-column prop="planCount" align="center" show-overflow-tooltip width="50"
-          label="计划数量"></el-table-column>
-        <el-table-column prop="planStartTime" show-overflow-tooltip align="center" width="105"
-          label="计划开工日期"></el-table-column>
-        <el-table-column prop="planEndTime" show-overflow-tooltip align="center" width="105"
-          label="计划完工日期"></el-table-column>
-        <el-table-column prop="completionCount" show-overflow-tooltip align="center" width="50"
-          label="完工数量"></el-table-column>
-        <el-table-column prop="conformityCount" show-overflow-tooltip align="center" width="50"
-          label="合格数量"></el-table-column>
-        <el-table-column prop="scrapCount" show-overflow-tooltip align="center" width="50"
-          label="报废数量"></el-table-column>
-        <el-table-column prop="reworkCount" show-overflow-tooltip align="center" width="50"
-          label="返修数量"></el-table-column>
-        <el-table-column prop="processStatusName" show-overflow-tooltip align="center" label="工序状态"></el-table-column>
-      </el-table>
-      <div class="sys-pagination">
-        <el-pagination @size-change="handleSizeChange_drawer" @current-change="handleCurrentChange_drawer"
-          :current-page="search_data_drawer.pageno" :page-sizes="pageSizes" :page-size="search_data_drawer.pagesize"
-          layout="total, sizes, prev, pager, next, jumper" :total="total_drawer"></el-pagination>
-      </div>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="drawer = false" class="footer_btn">{{ config.cancelText }}</el-button>
-      </div>
-    </el-drawer>
-
-
-    <el-dialog center title="" width="820px" :visible.sync="concatListVisible">
-      <div style="color: red;margin-bottom: 5px">当前选中的单据存在以下关联的拆分单据，还原后所有的被拆分的子单将被删除，请确认是否还原</div>
-      <el-table :data="concatList"
-        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }">
-        <el-table-column prop="planNo" label="工序计划单编号" align="center"></el-table-column>
-        <el-table-column prop="planStatusName" label="单据状态" align="center"></el-table-column>
-        <el-table-column prop="clientName" label="客户" align="center"></el-table-column>
-        <el-table-column prop="deliveryDate" label="交货期" align="center" show-overflow-tooltip
-          width="100"></el-table-column>
-        <el-table-column prop="materialSerialNo" label="产品代码" align="center" show-overflow-tooltip
-          width="100"></el-table-column>
-        <el-table-column prop="materialName" label="产品名称" align="center"></el-table-column>
-        <el-table-column prop="specification" label="规格型号" align="center"></el-table-column>
-        <el-table-column prop="unitUomName" label="主计量单位" align="center"></el-table-column>
-        <el-table-column prop="productionPlanNo" label="生产计划单号" align="center"></el-table-column>
-      </el-table>
-      <el-form style="display: flex;justify-content: center;margin-top: 10px">
-        <el-button type="primary" @click="sureConcat">确认</el-button>
-        <el-button type="primary" @click="concatListVisible = false">关闭</el-button>
-      </el-form>
-    </el-dialog>
-    <!--选择产品-->
-    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getPart"></dialogChooseSingleParts>
-  </div>
-</template>
-
-<script>
-// 计划231 下达232 挂起233 结案234
-import {formatDateTime} from "@/utils/tools.js";
-import config from "@/utils/config.js";
-import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
-import Cookies from "js-cookie";
-
-export default {
-  components: {
-    dialogChooseSingleParts
-  },
-  name: "production_planManagement",
-  data() {
-    return {
-      concatList: [],
-      concatListVisible: false,//还原的时候，显示拆分的单据
-      chooseMaterielVisible: false,//选择物料
-      planList: [],
-      drawerTitle: "工序明细",
-      total: 0, //总条数
-      total_drawer: 0,
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10,
-        proName: "",
-        deptId: '',
-        startTime: "",
-        endTime: "",
-        status: ""
-      },
-      planCountTotal: 0,
-      drawer: false,
-      drawerLoading: false,
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      rowIds: [],
-      tableData: [],
-      bodyList: [],
-      depOptions: [],
-      selectDeptId: '',
-      producePlan: {},
-      config: config,
-      search_data_drawer: {
-        pageno: 1,
-        pagesize: 10,
-        planId: ''
-      },
-      columnSetDialogVisible: false,
-      columnSetDialogTitle: "设置显示字段列表",
-      tableId: 'planManagement_working_procedure_table',
-      pictLoading: false,
-      //默认列表数据
-      showTableColumnsDefault: [
-        {title: "工序计划单编号", prop_: "planNo", select: true},
-        {title: "单据状态", prop_: "planStatusName", select: true},
-        {title: "下达人", prop_: "audituserName", select: true},
-        {title: "客户", prop_: "clientName", select: true},
-        {title: "交货期", prop_: "deliveryDate", select: true},
-        {title: "产品代码", prop_: "materialSerialNo", select: true},
-        {title: "产品名称", prop_: "materialName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "主计量单位", prop_: "unitUomName", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "主单位数量", prop_: "planCount", select: true},
-        {title: "计划生产数量", prop_: "planCountSupport", select: true},
-        {title: "生产计划单号", prop_: "productionPlanNo", select: true},
-      ],
-      ///弹出页面列表数据
-      showTableColumns: [
-        {title: "工序计划单编号", prop_: "planNo", select: true},
-        {title: "单据状态", prop_: "planStatusName", select: true},
-        {title: "下达人", prop_: "audituserName", select: true},
-        {title: "客户", prop_: "clientName", select: true},
-        {title: "交货期", prop_: "deliveryDate", select: true},
-        {title: "产品代码", prop_: "materialSerialNo", select: true},
-        {title: "产品名称", prop_: "materialName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "主计量单位", prop_: "unitUomName", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "主单位数量", prop_: "planCount", select: true},
-        {title: "计划生产数量", prop_: "planCountSupport", select: true},
-        {title: "生产计划单号", prop_: "productionPlanNo", select: true},
-      ],
-      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
-      //显示的列表字段
-      formTableData: [],
-      userInfo: {},
-    };
-  },
-  created() {
-    this.initData();
-    this.getList();
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search()
-      }
-    }
-  },
-  beforeRouteLeave(to, from, next) {
-    this.drawer = false;
-    next()
-  },
-  mounted() {
-    this.userInfo = JSON.parse(Cookies.get("userInfo"));
-    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.getShowColumns();
-  },
-  methods: {
-    //设置显示字段
-    showColumnSetDialog() {
-      this.columnSetDialogVisible = true;
-      this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    },
-    //前移
-    toUp(scope) {
-      if (scope.$index == 0) {
-        return false;
-      }
-      let n;
-      for (let i = 0; i < this.showTableColumns.length; i++) {
-        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-          n = i;
-        }
-      }
-      let temp = this.showTableColumns[n];
-      this.showTableColumns[n] = this.showTableColumns[n - 1];
-      this.showTableColumns[n - 1] = temp;
-      this.$forceUpdate();
-    },
-    //后移
-    toDown(scope) {
-      if (scope.$index == this.showTableColumns.length - 1) {
-        return false;
-      }
-      let n;
-      for (let i = 0; i < this.showTableColumns.length; i++) {
-        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-          n = i;
-        }
-      }
-      let temp = this.showTableColumns[n];
-      this.showTableColumns[n] = this.showTableColumns[n + 1];
-      this.showTableColumns[n + 1] = temp;
-      this.$forceUpdate();
-    },
-    //恢复默认
-    toDefault() {
-      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-      this.$forceUpdate();
-    },
-    //完成列表字段设置
-    saveAndCloseColumnSetDialog() {
-      let tableNo = this.tableId;
-      let tableColumns = JSON.stringify(this.showTableColumns);
-      this.columnSetDialogVisible = false;
-      this.$api.tableColumnAPI
-        .saveShowColumns({tableNo: tableNo, tableColumns: tableColumns})
-        .then(res => {
-          let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-          this.formTableData = [];
-          for (let i = 0; i < arr.length; i++) {
-            if (arr[i].select) {
-              this.formTableData.push(arr[i]);
-            }
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    //关闭字段设置弹出
-    handleClose() {
-      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
-      this.columnSetDialogVisible = false;
-
-    },
-    /**
-     * 获取显示字段
-     */
-    getShowColumns() {
-      let tableNo = this.tableId;
-      this.formTableData = [];
-
-      this.$api.tableColumnAPI
-        .getShowColumns({tableNo: tableNo})
-        .then(res => {
-          if (res.code == 0) {
-            if (res.results) {
-              this.showTableColumns = JSON.parse(res.results);
-              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-              for (let i = 0; i < arr.length; i++) {
-                if (arr[i].select) {
-                  this.formTableData.push(arr[i]);
-                }
-              }
-              this.$forceUpdate();
-            } else {
-              let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-              for (let i = 0; i < arr.length; i++) {
-                if (arr[i].select) {
-                  this.formTableData.push(arr[i]);
-                }
-              }
-              this.$forceUpdate();
-            }
-          } else {
-            this.$message({
-              message: res.msg ? res.msg : "获取列表信息失败",
-              type: "error"
-            });
-          }
-
-        })
-        .catch(r => {
-          this.$message({
-            message: r,
-            type: "error"
-          });
-          console.log(r);
-        });
-    },
-
-
-    /**
-     * 查看源单明细
-     */
-    viewDetail1(r) {
-      let queryId = r.queryId
-      this.$router.push({path: '/planManagement/production_add', query: {id: queryId, t: Date.now()}})
-    },
-    sortChange({column, prop, order}) {
-      let j = {column, prop, order};
-      let order_ = j.order == "ascending" ? 'asc' : 'desc'
-      this.$set(this.search_data, 'sort', j.prop)
-      this.$set(this.search_data, 'order', order_)
-      this.getList();
-    },
-    /**
-     * 计算合计
-     */
-    getSummaries(param) {
-      const {columns, data} = param;
-      const sums = [];
-      columns.forEach((column, index) => {
-        sums[0] = "合计";
-        if (column.property == 'planCount') {
-          sums[index] = this.planCountTotal
-          return;
-        }
-
-      })
-      return sums;
-
-    },
-    initData() {
-      Promise.all([
-        this.$api.dictAPI.getDictsByType("plan_type"),
-        this.$api.commonAPI.getDeptsTree(),
-      ])
-        .then(([r1, r2, r3]) => {
-          //计划状态
-          if (r1.code === 0) {
-            this.planList = r1.datas;
-          }
-          //使用部门
-          if (r2.code === 0) {
-            this.depOptions = r2.data.children;
-            this.setDefaultDept();
-            this.setDeptList(this.depOptions);
-            // this.deptList = r2.datas;
-          }
-          //使用状况
-          // if (r3.code === 0) {
-          //     this.usingList = r3.datas;
-          // }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    /**
-     * 获取选择的备件
-     */
-    getPart(val) {
-      if (val) {
-        this.$set(this.search_data, 'proName', val.name)
-      } else {
-        this.$set(this.search_data, 'proName', "")
-      }
-    },
-    //根据当前id,获取一条树枝上的所有id数据
-    treeFindPath(tree, func, path = []) {
-      if (!tree) return []
-      for (const data of tree) {
-        path.push(data.id)
-        if (func(data)) return path
-        if (data.children) {
-          const findChildren = this.treeFindPath(data.children, func, path)
-          if (findChildren.length) return findChildren
-        }
-        path.pop()
-      }
-      return []
-    },
-    //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
-    setDeptList(tree) {
-      for (const data of tree) {
-        if (!data.hasChildren) {
-          data.children = undefined;
-        } else {
-          this.setDeptList(data.children)
-        }
-      }
-
-    },
-    //显示默认部门
-    setDefaultDept() {
-      if (this.depOptions.length > 0 && this.search_data.deptId) {
-        let id = JSON.stringify(this.search_data.deptId)
-        let select_id = this.treeFindPath(this.depOptions, data => data.id === id)
-        this.selectDeptId = JSON.parse(JSON.stringify(select_id))
-      }
-    },
-
-// 选择部门
-    handleChange: function (value) {
-      // console.log(value)
-      this.search_data.deptId = value.length > 0 ? value[value.length - 1] : '';
-      this.selectDeptId = value;
-    },
-    //查看详情
-    detail() {
-      let item = this.rowIds[0];
-      this.clickRow(item);
-    },
-    //拆分
-    split() {
-      if (this.rowIds[0].planStatusId == 234) {//结案状态
-        this.$message({
-          message: "结案状态不可以拆分",
-          type: "error"
-        });
-        return
-      }
-      this.$router.push({
-        path: "/planManagement/working_procedure_add",
-        query: {id: this.rowIds[0].id, t: Date.now(), from: 'split'}
-      });
-    },
-    //合并还原
-    concat() {
-      // let ids = [];
-      // this.rowIds.forEach(item => {
-      //     ids.push(item.id);
-      // });
-      if (this.rowIds[0].planStatusId == 234) {//结案状态
-        this.$message({
-          message: "结案状态不可以还原",
-          type: "error"
-        });
-        return
-      }
-      this.$confirm("确认还原选中的工序计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.planManagementAPI
-          .workingProcedurePlanConcatPlanList({id: this.rowIds[0].id})
-          .then(res => {
-            console.log(res)
-            if (res.code === 0) {
-              if (res.data) {
-                this.concatList = res.data
-                this.concatListVisible = true;
-              } else {
-                this.$message({
-                  message: "没有拆分单据不能还原",
-                  type: "warning"
-                });
-              }
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "还原失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "还原失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    //确认还原合并
-    sureConcat() {
-      let ids = [];
-      this.concatList.forEach(p => {
-        ids.push(p.id)
-      })
-      this.$api.planManagementAPI
-        .workingProcedurePlanConcatPlan({ids: ids})
-        .then(res => {
-          console.log(res)
-          if (res.code === 0) {
-            this.concatListVisible = false;
-            this.$message({
-              message: res.msg,
-              type: "success"
-            });
-            this.getList();
-          } else {
-            this.$message({
-              message: res.msg ? res.msg : "还原失败，请重试",
-              type: "error"
-            });
-          }
-        })
-        .catch(error => {
-          this.$message({
-            message: "还原失败，请重试",
-            type: "error"
-          });
-        });
-    },
-    //查看详情
-    clickRow(row) {
-      this.$router.push({
-        path: "/planManagement/working_procedure_add",
-        query: {id: row.id, t: Date.now()}
-      });
-    },
-    /**
-     * 查看子项
-     */
-    viewDetail(row) {
-      this.drawer = true;
-      this.drawerTitle = "工序明细(工序计划单编号:" + row.planNo + ")"
-      this.search_data_drawer.planId = row.id;
-      this.search_data_drawer.pageno = 1;
-      this.getList_drawer();
-    },
-    /**
-     * 获取列表
-     */
-    getList() {
-      this.pictLoading = true;
-      if (this.search_data.time) {
-        this.search_data.startTime = formatDateTime(this.search_data.time[0]);
-        this.search_data.endTime = formatDateTime(this.search_data.time[1]);
-      } else {
-        this.search_data.startTime = "";
-        this.search_data.endTime = "";
-      }
-      this.$api.planManagementAPI
-        .workingProcedurePlanList(this.search_data)
-        .then(res => {
-          console.log(res)
-          this.pictLoading = false;
-          if (res.data) {
-            this.total = res.data.totalRows;
-            this.planCountTotal = res.total.planCountTotal;
-            this.tableData = res.data.datas ? res.data.datas : [];
-            this.tableData.forEach(item => {
-              item.deliveryDate = item.deliveryDate.substr(0, 10)
-            })
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          this.pictLoading = false;
-          console.log(r);
-        });
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.search_data.pageno = 1;
-      this.getList();
-    },
-    /**
-     * 新增
-     */
-    add() {
-      this.$router.push({
-        path: "/planManagement/working_procedure_add",
-        query: {
-          t: Date.now()
-        }
-      });
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    /**
-     * 抽屉弹框-每页显示多少条
-     */
-    handleSizeChange_drawer(val) {
-      this.search_data_drawer.pagesize = val;
-      this.getList_drawer();
-    },
-    /**
-     * 抽屉弹框-上下分页
-     */
-    handleCurrentChange_drawer(val) {
-      this.search_data_drawer.pageno = val;
-      this.getList_drawer();
-    },
-    /**
-     * 抽屉弹框获取列表
-     */
-    getList_drawer() {
-      this.drawerLoading = true;
-      this.$api.planManagementAPI
-        .workingProcedurePlanChildList(this.search_data_drawer)
-        .then(res => {
-          this.drawerLoading = false;
-          if (res.data) {
-            this.total_drawer = res.data.totalRows;
-            this.bodyList = res.data.datas ? res.data.datas : [];
-          } else {
-            this.total_drawer = 0;
-            this.bodyList = [];
-          }
-        })
-        .catch(r => {
-          this.drawerLoading = false;
-        });
-    },
-
-    /**
-     * 删除
-     */
-    remove() {
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      // const ids = this.rowIds.map(item => item.id).toString();
-      let params = {ids: ids};
-      this.$confirm("确认删除选中的工序计划吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.planManagementAPI
-          .workingProcedurePlanbatchRemove({ids: ids})
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 下达
-     */
-    give(n) {
-      let item = this.rowIds[0];
-      let id = item.id;
-      let ids = [];
-      this.rowIds.forEach(item => {
-        ids.push(item.id);
-      });
-      if (n == 0) {
-        this.$confirm("确认下达选中的工序计划吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.planManagementAPI
-            .workingProcedurePlanBatchIssuedPlan({ids: ids})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "操作失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "操作失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      } else if (n == 1) {
-        if (item.audituserName != this.userInfo.name) {
-          this.$message({
-            message: "该项目无权限反下达",
-            type: "error"
-          });
-          return;
-        }
-        this.$confirm("确认反下达选中的工序计划吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.planManagementAPI
-            .workingProcedurePlanreverseIssuedPlan({id: id})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "操作失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "操作失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      }
-    },
-    /**
-     * 挂起
-     */
-    putup(n) {
-      let item = this.rowIds[0];
-      let id = item.id;
-      if (n == 0) {
-        this.$confirm("确认挂起选中的工序计划吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.planManagementAPI
-            .workingProcedurePlanputUpPlan({id: id})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "操作失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "操作失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      } else if (n == 1) {
-        this.$confirm("确认反挂起选中的工序计划吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.planManagementAPI
-            .workingProcedurePlanreversePutUpPlan({id: id})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "操作失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "操作失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      }
-    },
-
-    /**
-     * 结案
-     */
-    close(n) {
-      let item = this.rowIds[0];
-      let id = item.id;
-      let _this = this;
-      if (n == 0) {
-        this.$confirm("确认结案选中的工序计划吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.planManagementAPI
-            .workingProcedurePlancloseCase({id: id})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else if (res.code === 1) {
-                this.$confirm(res.msg, '提示', {
-                  confirmButtonText: '查看工序计划详情',
-                  cancelButtonText: '取消',
-                  type: 'warning'
-                }).then(() => {
-                  _this.producePlanVisible = true
-                  _this.producePlan = res.data.data
-                  for (let n in _this.producePlan) {
-                    if (_this.producePlan[n] == null) {
-                      _this.producePlan[n] = 0
-                    }
-                  }
-                }).catch(() => {
-                  // this.$message({
-                  //     type: 'info',
-                  //     message: '已取消删除'
-                  // });
-                });
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "操作失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "操作失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      } else if (n == 1) {
-        this.$confirm("确认反结案选中的工序计划吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.planManagementAPI
-            .workingProcedurePlanreverseCloseCase({id: id})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "操作失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "操作失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      }
-    },
-    /**
-     * 跟踪
-     */
-    follow() {
-      let item = this.rowIds[0];
-      let id = item.id;
-      this.$router.push({
-        path: "/planManagement/working_procedure_follow",
-        query: {id: id, planNo: item.planNo, t: Date.now()}
-      });
-    },
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.rowIds = val;
-      this.setBtn(val);
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    }
-  }
-};
-</script>
-
-<style>
-.el-table__row:hover,
-.el-table__row:hover>td {
-  background-color: #dfedfc !important;
-}
-</style>
-<style scoped>
-/*.el-dialog__wrapper{*/
-/*  left: auto !important;*/
-/*  width: 860px !important;*/
-/*}*/
-.el-drawer {
-  padding-bottom: 60px;
-  box-sizing: border-box;
-  box-shadow: 0 8px 10px -5px rgba(0, 0, 0, .2), 0 16px 24px 2px rgba(0, 0, 0, .14), 0 6px 30px 5px rgba(0, 0, 0, .12) !important;
-}
-
-.dialog-footer {
-  position: absolute;
-  bottom: 20px;
-  width: 100%;
-}
-
-.footer_btn {
-  display: block;
-  margin: auto;
-}
-</style>
+<template>
+  <div class="sys-task sys-box">
+    <div class="sys-operate sys-tabs">
+      <el-button type="primary" @click="add()" v-has="'plan:workingProcedure:add'">新增</el-button>
+      <el-button type="primary" @click="remove()" :disabled="btnDelDisabled" v-has="'plan:workingProcedure:delete'">删除
+      </el-button>
+      <el-button type="primary" @click="give(0)" :disabled="btnDelDisabled" v-has="'plan:workingProcedure:give'">下达
+      </el-button>
+      <el-button type="primary" @click="give(1)" :disabled="btnOtherDisabled"
+        v-has="'plan:workingProcedure:reverseGive'">反下达
+      </el-button>
+      <el-button type="primary" @click="putup(0)" :disabled="btnOtherDisabled" v-has="'plan:workingProcedure:putUp'">
+        挂起
+      </el-button>
+      <el-button type="primary" @click="putup(1)" :disabled="btnOtherDisabled"
+        v-has="'plan:workingProcedure:reversePutUp'">反挂起
+      </el-button>
+      <el-button type="primary" @click="close(0)" :disabled="btnOtherDisabled" v-has="'plan:workingProcedure:close'">
+        结案
+      </el-button>
+      <el-button type="primary" @click="close(1)" :disabled="btnOtherDisabled"
+        v-has="'plan:workingProcedure:reverseClose'">反结案
+      </el-button>
+      <el-button type="primary" @click="split" :disabled="btnOtherDisabled" v-has="'plan:workingProcedure:split'">拆分
+      </el-button>
+      <el-button type="primary" @click="concat" :disabled="btnOtherDisabled" v-has="'plan:workingProcedure:concat'">还原
+      </el-button>
+      <el-button type="primary" @click="follow" :disabled="btnOtherDisabled" v-has="'plan:workingProcedure:follow'">跟踪
+      </el-button>
+      <el-button type="primary" @click="detail" :disabled="btnOtherDisabled" v-has="'plan:workingProcedure:detail'">查看
+      </el-button>
+      <el-button type="primary" @click="showColumnSetDialog">{{ config.configureBtnName }}</el-button>
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class='form_item_input_out'>
+          <el-form-item label="日期" style='width:34%' class="form_item-inline">
+            <el-date-picker v-model="search_data.time" type="daterange" format="yyyy-MM-dd" range-separator="—"
+              start-placeholder="开始日期" end-placeholder="截止日期"></el-date-picker>
+          </el-form-item>
+          <el-form-item label="产品名称" style='width:24%' class="form_item-inline">
+            <el-input placeholder="请选择产品" clearable v-model="search_data.proName">
+              <el-button slot="append" @click="chooseMaterielVisible = true" icon="el-icon-search"></el-button>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="生产计划单号" style="width:20%" class="form_item-inline">
+            <el-input v-model="search_data.productionPlanNo" placeholder="生产计划单号"></el-input>
+          </el-form-item>
+          <el-form-item label="工序计划单编号" style="width:20%" class="form_item-inline">
+            <el-input v-model="search_data.planNo" placeholder="工序计划单编号"></el-input>
+          </el-form-item>
+          <el-form-item label="生产部门" style='width:24%' class="form_item-inline">
+            <el-cascader clearable v-model="selectDeptId" :options="depOptions"
+              :props="{ expandTrigger: 'hover', label: 'text', value: 'id', checkStrictly: true }"
+              @change="handleChange"></el-cascader>
+          </el-form-item>
+          <el-form-item label="状态" style='width:18%' class="form_item-inline">
+            <el-select v-model="search_data.status" placeholder="请选择状态" clearable>
+              <el-option v-for="item in planList" :key="item.value" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class='form_item_btn_out'>
+          <el-form-item>
+            <el-button type="primary" @click="search()">查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+
+    <div class="sys-table">
+      <el-table border fit @sort-change="sortChange" v-loading="pictLoading" @row-click="clickRow" ref="tb"
+        :summary-method="getSummaries" show-summary v-if="formTableData.length > 0" :data="tableData"
+        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column v-for="(items, index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
+          align="center" show-overflow-tooltip :sortable="(items.prop_ == 'deliveryDate') ? 'custom' : false">
+          <template slot-scope="scope">
+            <div>
+              <div v-if="items.prop_ == 'planNo'">
+                <el-link type="primary" @click.stop="viewDetail(scope.row)">{{ scope.row.planNo }}</el-link>
+              </div>
+              <div v-else-if="items.prop_ == 'productionPlanNo'">
+                <el-link type="primary" @click.stop="viewDetail1(scope.row)">{{ scope.row.productionPlanNo }}</el-link>
+              </div>
+              <div v-else>
+                <div style="overflow:hidden">{{ scope.row[items.prop_] }}</div>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div class="sys-pagination">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
+      :before-close="handleClose">
+      <el-table border :data="showTableColumns" :key="Math.random()" max-height="350" style="width: 100%">
+        <el-table-column prop="title" label="列表名称" width="180" fixed>
+        </el-table-column>
+        <el-table-column prop="select" label="是否显示" width="180">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+
+    <el-drawer size="820px" :modal="false" :title="drawerTitle" :visible.sync="drawer">
+      <el-table v-loading="drawerLoading" :data="bodyList" fit
+        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }"
+        border>
+        <el-table-column prop="serialNumber" show-overflow-tooltip align="center" label="顺序号"></el-table-column>
+        <el-table-column prop="processCode" show-overflow-tooltip width="160" align="center"
+          label="工序代码"></el-table-column>
+        <el-table-column prop="processName" show-overflow-tooltip align="center" label="工序名称"></el-table-column>
+        <el-table-column prop="planCount" align="center" show-overflow-tooltip width="50"
+          label="计划数量"></el-table-column>
+        <el-table-column prop="planStartTime" show-overflow-tooltip align="center" width="105"
+          label="计划开工日期"></el-table-column>
+        <el-table-column prop="planEndTime" show-overflow-tooltip align="center" width="105"
+          label="计划完工日期"></el-table-column>
+        <el-table-column prop="completionCount" show-overflow-tooltip align="center" width="50"
+          label="完工数量"></el-table-column>
+        <el-table-column prop="conformityCount" show-overflow-tooltip align="center" width="50"
+          label="合格数量"></el-table-column>
+        <el-table-column prop="scrapCount" show-overflow-tooltip align="center" width="50"
+          label="报废数量"></el-table-column>
+        <el-table-column prop="reworkCount" show-overflow-tooltip align="center" width="50"
+          label="返修数量"></el-table-column>
+        <el-table-column prop="processStatusName" show-overflow-tooltip align="center" label="工序状态"></el-table-column>
+      </el-table>
+      <div class="sys-pagination">
+        <el-pagination @size-change="handleSizeChange_drawer" @current-change="handleCurrentChange_drawer"
+          :current-page="search_data_drawer.pageno" :page-sizes="pageSizes" :page-size="search_data_drawer.pagesize"
+          layout="total, sizes, prev, pager, next, jumper" :total="total_drawer"></el-pagination>
+      </div>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="drawer = false" class="footer_btn">{{ config.cancelText }}</el-button>
+      </div>
+    </el-drawer>
+
+
+    <el-dialog center title="" width="820px" :visible.sync="concatListVisible">
+      <div style="color: red;margin-bottom: 5px">当前选中的单据存在以下关联的拆分单据，还原后所有的被拆分的子单将被删除，请确认是否还原</div>
+      <el-table :data="concatList"
+        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }">
+        <el-table-column prop="planNo" label="工序计划单编号" align="center"></el-table-column>
+        <el-table-column prop="planStatusName" label="单据状态" align="center"></el-table-column>
+        <el-table-column prop="clientName" label="客户" align="center"></el-table-column>
+        <el-table-column prop="deliveryDate" label="交货期" align="center" show-overflow-tooltip
+          width="100"></el-table-column>
+        <el-table-column prop="materialSerialNo" label="产品代码" align="center" show-overflow-tooltip
+          width="100"></el-table-column>
+        <el-table-column prop="materialName" label="产品名称" align="center"></el-table-column>
+        <el-table-column prop="specification" label="规格型号" align="center"></el-table-column>
+        <el-table-column prop="unitUomName" label="主计量单位" align="center"></el-table-column>
+        <el-table-column prop="productionPlanNo" label="生产计划单号" align="center"></el-table-column>
+      </el-table>
+      <el-form style="display: flex;justify-content: center;margin-top: 10px">
+        <el-button type="primary" @click="sureConcat">确认</el-button>
+        <el-button type="primary" @click="concatListVisible = false">关闭</el-button>
+      </el-form>
+    </el-dialog>
+    <!--选择产品-->
+    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getPart"></dialogChooseSingleParts>
+  </div>
+</template>
+
+<script>
+// 计划231 下达232 挂起233 结案234
+import {formatDateTime} from "@/utils/tools.js";
+import config from "@/utils/config.js";
+import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
+import Cookies from "js-cookie";
+
+export default {
+  components: {
+    dialogChooseSingleParts
+  },
+  name: "production_planManagement",
+  data() {
+    return {
+      concatList: [],
+      concatListVisible: false,//还原的时候，显示拆分的单据
+      chooseMaterielVisible: false,//选择物料
+      planList: [],
+      drawerTitle: "工序明细",
+      total: 0, //总条数
+      total_drawer: 0,
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10,
+        proName: "",
+        deptId: '',
+        startTime: "",
+        endTime: "",
+        status: ""
+      },
+      planCountTotal: 0,
+      drawer: false,
+      drawerLoading: false,
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      rowIds: [],
+      tableData: [],
+      bodyList: [],
+      depOptions: [],
+      selectDeptId: '',
+      producePlan: {},
+      config: config,
+      search_data_drawer: {
+        pageno: 1,
+        pagesize: 10,
+        planId: ''
+      },
+      columnSetDialogVisible: false,
+      columnSetDialogTitle: "设置显示字段列表",
+      tableId: 'planManagement_working_procedure_table',
+      pictLoading: false,
+      //默认列表数据
+      showTableColumnsDefault: [
+        {title: "工序计划单编号", prop_: "planNo", select: true},
+        {title: "单据状态", prop_: "planStatusName", select: true},
+        {title: "下达人", prop_: "audituserName", select: true},
+        {title: "客户", prop_: "clientName", select: false},
+        {title: "交货期", prop_: "deliveryDate", select: false},
+        {title: "产品代码", prop_: "materialSerialNo", select: true},
+        {title: "产品名称", prop_: "materialName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "主计量单位", prop_: "unitUomName", select: true},
+        {title: "辅助单位", prop_: "supportUomName", select: false},
+        {title: "主单位数量", prop_: "planCount", select: false},
+        {title: "计划生产数量", prop_: "planCountSupport", select: true},
+        {title: "生产计划单号", prop_: "productionPlanNo", select: true},
+      ],
+      ///弹出页面列表数据
+      showTableColumns: [
+        {title: "工序计划单编号", prop_: "planNo", select: true},
+        {title: "单据状态", prop_: "planStatusName", select: true},
+        {title: "下达人", prop_: "audituserName", select: true},
+        {title: "客户", prop_: "clientName", select: false},
+        {title: "交货期", prop_: "deliveryDate", select: false},
+        {title: "产品代码", prop_: "materialSerialNo", select: true},
+        {title: "产品名称", prop_: "materialName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "主计量单位", prop_: "unitUomName", select: true},
+        {title: "辅助单位", prop_: "supportUomName", select: false},
+        {title: "主单位数量", prop_: "planCount", select: false},
+        {title: "计划生产数量", prop_: "planCountSupport", select: true},
+        {title: "生产计划单号", prop_: "productionPlanNo", select: true},
+      ],
+      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
+      //显示的列表字段
+      formTableData: [],
+      userInfo: {},
+    };
+  },
+  created() {
+    this.initData();
+    this.getList();
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search()
+      }
+    }
+  },
+  beforeRouteLeave(to, from, next) {
+    this.drawer = false;
+    next()
+  },
+  mounted() {
+    this.userInfo = JSON.parse(Cookies.get("userInfo"));
+    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.getShowColumns();
+  },
+  methods: {
+    //设置显示字段
+    showColumnSetDialog() {
+      this.columnSetDialogVisible = true;
+      this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    },
+    //前移
+    toUp(scope) {
+      if (scope.$index == 0) {
+        return false;
+      }
+      let n;
+      for (let i = 0; i < this.showTableColumns.length; i++) {
+        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+          n = i;
+        }
+      }
+      let temp = this.showTableColumns[n];
+      this.showTableColumns[n] = this.showTableColumns[n - 1];
+      this.showTableColumns[n - 1] = temp;
+      this.$forceUpdate();
+    },
+    //后移
+    toDown(scope) {
+      if (scope.$index == this.showTableColumns.length - 1) {
+        return false;
+      }
+      let n;
+      for (let i = 0; i < this.showTableColumns.length; i++) {
+        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+          n = i;
+        }
+      }
+      let temp = this.showTableColumns[n];
+      this.showTableColumns[n] = this.showTableColumns[n + 1];
+      this.showTableColumns[n + 1] = temp;
+      this.$forceUpdate();
+    },
+    //恢复默认
+    toDefault() {
+      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+      this.$forceUpdate();
+    },
+    //完成列表字段设置
+    saveAndCloseColumnSetDialog() {
+      let tableNo = this.tableId;
+      let tableColumns = JSON.stringify(this.showTableColumns);
+      this.columnSetDialogVisible = false;
+      this.$api.tableColumnAPI
+        .saveShowColumns({tableNo: tableNo, tableColumns: tableColumns})
+        .then(res => {
+          let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+          this.formTableData = [];
+          for (let i = 0; i < arr.length; i++) {
+            if (arr[i].select) {
+              this.formTableData.push(arr[i]);
+            }
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    //关闭字段设置弹出
+    handleClose() {
+      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
+      this.columnSetDialogVisible = false;
+
+    },
+    /**
+     * 获取显示字段
+     */
+    getShowColumns() {
+      let tableNo = this.tableId;
+      this.formTableData = [];
+
+      this.$api.tableColumnAPI
+        .getShowColumns({tableNo: tableNo})
+        .then(res => {
+          if (res.code == 0) {
+            if (res.results) {
+              this.showTableColumns = JSON.parse(res.results);
+              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+              for (let i = 0; i < arr.length; i++) {
+                if (arr[i].select) {
+                  this.formTableData.push(arr[i]);
+                }
+              }
+              this.$forceUpdate();
+            } else {
+              let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+              for (let i = 0; i < arr.length; i++) {
+                if (arr[i].select) {
+                  this.formTableData.push(arr[i]);
+                }
+              }
+              this.$forceUpdate();
+            }
+          } else {
+            this.$message({
+              message: res.msg ? res.msg : "获取列表信息失败",
+              type: "error"
+            });
+          }
+
+        })
+        .catch(r => {
+          this.$message({
+            message: r,
+            type: "error"
+          });
+          console.log(r);
+        });
+    },
+
+
+    /**
+     * 查看源单明细
+     */
+    viewDetail1(r) {
+      let queryId = r.queryId
+      this.$router.push({path: '/planManagement/production_add', query: {id: queryId, t: Date.now()}})
+    },
+    sortChange({column, prop, order}) {
+      let j = {column, prop, order};
+      let order_ = j.order == "ascending" ? 'asc' : 'desc'
+      this.$set(this.search_data, 'sort', j.prop)
+      this.$set(this.search_data, 'order', order_)
+      this.getList();
+    },
+    /**
+     * 计算合计
+     */
+    getSummaries(param) {
+      const {columns, data} = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        sums[0] = "合计";
+        if (column.property == 'planCount') {
+          sums[index] = this.planCountTotal
+          return;
+        }
+
+      })
+      return sums;
+
+    },
+    initData() {
+      Promise.all([
+        this.$api.dictAPI.getDictsByType("plan_type"),
+        this.$api.commonAPI.getDeptsTree(),
+      ])
+        .then(([r1, r2, r3]) => {
+          //计划状态
+          if (r1.code === 0) {
+            this.planList = r1.datas;
+          }
+          //使用部门
+          if (r2.code === 0) {
+            this.depOptions = r2.data.children;
+            this.setDefaultDept();
+            this.setDeptList(this.depOptions);
+            // this.deptList = r2.datas;
+          }
+          //使用状况
+          // if (r3.code === 0) {
+          //     this.usingList = r3.datas;
+          // }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    /**
+     * 获取选择的备件
+     */
+    getPart(val) {
+      if (val) {
+        this.$set(this.search_data, 'proName', val.name)
+      } else {
+        this.$set(this.search_data, 'proName', "")
+      }
+    },
+    //根据当前id,获取一条树枝上的所有id数据
+    treeFindPath(tree, func, path = []) {
+      if (!tree) return []
+      for (const data of tree) {
+        path.push(data.id)
+        if (func(data)) return path
+        if (data.children) {
+          const findChildren = this.treeFindPath(data.children, func, path)
+          if (findChildren.length) return findChildren
+        }
+        path.pop()
+      }
+      return []
+    },
+    //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
+    setDeptList(tree) {
+      for (const data of tree) {
+        if (!data.hasChildren) {
+          data.children = undefined;
+        } else {
+          this.setDeptList(data.children)
+        }
+      }
+
+    },
+    //显示默认部门
+    setDefaultDept() {
+      if (this.depOptions.length > 0 && this.search_data.deptId) {
+        let id = JSON.stringify(this.search_data.deptId)
+        let select_id = this.treeFindPath(this.depOptions, data => data.id === id)
+        this.selectDeptId = JSON.parse(JSON.stringify(select_id))
+      }
+    },
+
+// 选择部门
+    handleChange: function (value) {
+      // console.log(value)
+      this.search_data.deptId = value.length > 0 ? value[value.length - 1] : '';
+      this.selectDeptId = value;
+    },
+    //查看详情
+    detail() {
+      let item = this.rowIds[0];
+      this.clickRow(item);
+    },
+    //拆分
+    split() {
+      if (this.rowIds[0].planStatusId == 234) {//结案状态
+        this.$message({
+          message: "结案状态不可以拆分",
+          type: "error"
+        });
+        return
+      }
+      this.$router.push({
+        path: "/planManagement/working_procedure_add",
+        query: {id: this.rowIds[0].id, t: Date.now(), from: 'split'}
+      });
+    },
+    //合并还原
+    concat() {
+      // let ids = [];
+      // this.rowIds.forEach(item => {
+      //     ids.push(item.id);
+      // });
+      if (this.rowIds[0].planStatusId == 234) {//结案状态
+        this.$message({
+          message: "结案状态不可以还原",
+          type: "error"
+        });
+        return
+      }
+      this.$confirm("确认还原选中的工序计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.planManagementAPI
+          .workingProcedurePlanConcatPlanList({id: this.rowIds[0].id})
+          .then(res => {
+            console.log(res)
+            if (res.code === 0) {
+              if (res.data) {
+                this.concatList = res.data
+                this.concatListVisible = true;
+              } else {
+                this.$message({
+                  message: "没有拆分单据不能还原",
+                  type: "warning"
+                });
+              }
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "还原失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "还原失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    //确认还原合并
+    sureConcat() {
+      let ids = [];
+      this.concatList.forEach(p => {
+        ids.push(p.id)
+      })
+      this.$api.planManagementAPI
+        .workingProcedurePlanConcatPlan({ids: ids})
+        .then(res => {
+          console.log(res)
+          if (res.code === 0) {
+            this.concatListVisible = false;
+            this.$message({
+              message: res.msg,
+              type: "success"
+            });
+            this.getList();
+          } else {
+            this.$message({
+              message: res.msg ? res.msg : "还原失败，请重试",
+              type: "error"
+            });
+          }
+        })
+        .catch(error => {
+          this.$message({
+            message: "还原失败，请重试",
+            type: "error"
+          });
+        });
+    },
+    //查看详情
+    clickRow(row) {
+      this.$router.push({
+        path: "/planManagement/working_procedure_add",
+        query: {id: row.id, t: Date.now()}
+      });
+    },
+    /**
+     * 查看子项
+     */
+    viewDetail(row) {
+      this.drawer = true;
+      this.drawerTitle = "工序明细(工序计划单编号:" + row.planNo + ")"
+      this.search_data_drawer.planId = row.id;
+      this.search_data_drawer.pageno = 1;
+      this.getList_drawer();
+    },
+    /**
+     * 获取列表
+     */
+    getList() {
+      this.pictLoading = true;
+      if (this.search_data.time) {
+        this.search_data.startTime = formatDateTime(this.search_data.time[0]);
+        this.search_data.endTime = formatDateTime(this.search_data.time[1]);
+      } else {
+        this.search_data.startTime = "";
+        this.search_data.endTime = "";
+      }
+      this.$api.planManagementAPI
+        .workingProcedurePlanList(this.search_data)
+        .then(res => {
+          console.log(res)
+          this.pictLoading = false;
+          if (res.data) {
+            this.total = res.data.totalRows;
+            this.planCountTotal = res.total.planCountTotal;
+            this.tableData = res.data.datas ? res.data.datas : [];
+            this.tableData.forEach(item => {
+              item.deliveryDate = item.deliveryDate.substr(0, 10)
+            })
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          this.pictLoading = false;
+          console.log(r);
+        });
+    },
+    /**
+     * 查询
+     */
+    search() {
+      this.search_data.pageno = 1;
+      this.getList();
+    },
+    /**
+     * 新增
+     */
+    add() {
+      this.$router.push({
+        path: "/planManagement/working_procedure_add",
+        query: {
+          t: Date.now()
+        }
+      });
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    /**
+     * 抽屉弹框-每页显示多少条
+     */
+    handleSizeChange_drawer(val) {
+      this.search_data_drawer.pagesize = val;
+      this.getList_drawer();
+    },
+    /**
+     * 抽屉弹框-上下分页
+     */
+    handleCurrentChange_drawer(val) {
+      this.search_data_drawer.pageno = val;
+      this.getList_drawer();
+    },
+    /**
+     * 抽屉弹框获取列表
+     */
+    getList_drawer() {
+      this.drawerLoading = true;
+      this.$api.planManagementAPI
+        .workingProcedurePlanChildList(this.search_data_drawer)
+        .then(res => {
+          this.drawerLoading = false;
+          if (res.data) {
+            this.total_drawer = res.data.totalRows;
+            this.bodyList = res.data.datas ? res.data.datas : [];
+          } else {
+            this.total_drawer = 0;
+            this.bodyList = [];
+          }
+        })
+        .catch(r => {
+          this.drawerLoading = false;
+        });
+    },
+
+    /**
+     * 删除
+     */
+    remove() {
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      // const ids = this.rowIds.map(item => item.id).toString();
+      let params = {ids: ids};
+      this.$confirm("确认删除选中的工序计划吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.planManagementAPI
+          .workingProcedurePlanbatchRemove({ids: ids})
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 下达
+     */
+    give(n) {
+      let item = this.rowIds[0];
+      let id = item.id;
+      let ids = [];
+      this.rowIds.forEach(item => {
+        ids.push(item.id);
+      });
+      if (n == 0) {
+        this.$confirm("确认下达选中的工序计划吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.planManagementAPI
+            .workingProcedurePlanBatchIssuedPlan({ids: ids})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "操作失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "操作失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      } else if (n == 1) {
+        if (item.audituserName != this.userInfo.name) {
+          this.$message({
+            message: "该项目无权限反下达",
+            type: "error"
+          });
+          return;
+        }
+        this.$confirm("确认反下达选中的工序计划吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.planManagementAPI
+            .workingProcedurePlanreverseIssuedPlan({id: id})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "操作失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "操作失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      }
+    },
+    /**
+     * 挂起
+     */
+    putup(n) {
+      let item = this.rowIds[0];
+      let id = item.id;
+      if (n == 0) {
+        this.$confirm("确认挂起选中的工序计划吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.planManagementAPI
+            .workingProcedurePlanputUpPlan({id: id})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "操作失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "操作失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      } else if (n == 1) {
+        this.$confirm("确认反挂起选中的工序计划吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.planManagementAPI
+            .workingProcedurePlanreversePutUpPlan({id: id})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "操作失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "操作失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      }
+    },
+
+    /**
+     * 结案
+     */
+    close(n) {
+      let item = this.rowIds[0];
+      let id = item.id;
+      let _this = this;
+      if (n == 0) {
+        this.$confirm("确认结案选中的工序计划吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.planManagementAPI
+            .workingProcedurePlancloseCase({id: id})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else if (res.code === 1) {
+                this.$confirm(res.msg, '提示', {
+                  confirmButtonText: '查看工序计划详情',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(() => {
+                  _this.producePlanVisible = true
+                  _this.producePlan = res.data.data
+                  for (let n in _this.producePlan) {
+                    if (_this.producePlan[n] == null) {
+                      _this.producePlan[n] = 0
+                    }
+                  }
+                }).catch(() => {
+                  // this.$message({
+                  //     type: 'info',
+                  //     message: '已取消删除'
+                  // });
+                });
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "操作失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "操作失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      } else if (n == 1) {
+        this.$confirm("确认反结案选中的工序计划吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.planManagementAPI
+            .workingProcedurePlanreverseCloseCase({id: id})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "操作失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "操作失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      }
+    },
+    /**
+     * 跟踪
+     */
+    follow() {
+      let item = this.rowIds[0];
+      let id = item.id;
+      this.$router.push({
+        path: "/planManagement/working_procedure_follow",
+        query: {id: id, planNo: item.planNo, t: Date.now()}
+      });
+    },
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.rowIds = val;
+      this.setBtn(val);
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    }
+  }
+};
+</script>
+
+<style>
+.el-table__row:hover,
+.el-table__row:hover>td {
+  background-color: #dfedfc !important;
+}
+</style>
+<style scoped>
+/*.el-dialog__wrapper{*/
+/*  left: auto !important;*/
+/*  width: 860px !important;*/
+/*}*/
+.el-drawer {
+  padding-bottom: 60px;
+  box-sizing: border-box;
+  box-shadow: 0 8px 10px -5px rgba(0, 0, 0, .2), 0 16px 24px 2px rgba(0, 0, 0, .14), 0 6px 30px 5px rgba(0, 0, 0, .12) !important;
+}
+
+.dialog-footer {
+  position: absolute;
+  bottom: 20px;
+  width: 100%;
+}
+
+.footer_btn {
+  display: block;
+  margin: auto;
+}
+</style>
diff --git a/src/pages/mes/quality/deliveryInspection/index.vue b/src/pages/mes/quality/deliveryInspection/index.vue
index 5dd56af..72d3ca3 100644
--- a/src/pages/mes/quality/deliveryInspection/index.vue
+++ b/src/pages/mes/quality/deliveryInspection/index.vue
@@ -1,639 +1,644 @@
-<template>
-  <div class="sys-task sys-box">
-    <div class="sys-operate sys-tabs">
-      <el-button type="primary" @click="gotoAdd" v-has="'quality:deliveryInspection:add'">新增</el-button>
-      <el-button type="primary" @click="remove()" :disabled="btnDelDisabled"
-        v-has="'quality:deliveryInspection:delete'">删除</el-button>
-      <el-button type="primary" @click="audit()" :disabled="btnOtherDisabled"
-        v-has="'quality:deliveryInspection:audit'">审核</el-button>
-      <el-button type="primary" @click="reverseAudit()" :disabled="btnOtherDisabled"
-        v-has="'quality:deliveryInspection:reverseAudit'">反审核</el-button>
-      <el-button type="primary" @click="showColumnSetDialog">{{ config.configureBtnName }}</el-button>
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class='form_item_input_out'>
-          <el-form-item label="部门" style='width:20%' class="form_item-inline">
-            <el-cascader clearable v-model="selectDeptId" :options="depOptions"
-              :props="{ expandTrigger: 'hover', label: 'text', value: 'id', checkStrictly: true }"
-              @change="handleChange"></el-cascader>
-          </el-form-item>
-          <el-form-item label="物料代码" style='width:22%' class="form_item-inline">
-            <!-- <el-input placeholder="物料" clearable v-model="search_data.serialNo">
-            <el-button slot="append" @click="chooseMaterielVisible = true" icon="el-icon-search"></el-button>
-          </el-input> -->
-            <btn-input :valueText.sync='search_data.serialNo' :valueId.sync='search_data.serialNo'
-              :chooseVisible.sync='chooseMaterielVisible'></btn-input>
-          </el-form-item>
-          <el-form-item label="选择客户" style='width:22%' class="form_item-inline">
-            <!-- <el-input placeholder="客户" clearable v-model="search_data.clientName">
-            <el-button slot="append" @click="chooseClientVisible = true" icon="el-icon-search"></el-button>
-          </el-input> -->
-            <btn-input :valueText.sync='search_data.clientName' :valueId.sync='search_data.clientName'
-              :chooseVisible.sync='chooseClientVisible'></btn-input>
-          </el-form-item>
-          <el-form-item label="日期" style='width:36%' class="form_item-inline">
-            <el-date-picker v-model="search_data.time" type="daterange" format="yyyy-MM-dd" range-separator="—"
-              start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class='form_item_btn_out'>
-          <el-form-item>
-            <el-button @click="search" type="primary" size="small">查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-
-    <div class="sys-table">
-      <el-table border fit @sort-change="sortChange" v-if="formTableData.length > 0" ref="tb" show-summary
-        :summary-method="getSummaries" :data="tableData"
-        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }"
-        @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column v-for="(items, index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
-          align="center" show-overflow-tooltip :sortable="(items.prop_ == 'createTime') ? 'custom' : false">
-          <template slot-scope="scope">
-            <div>
-              <div v-if="items.prop_ == 'sourceNo'">
-                <el-link type="primary" @click.stop="viewDetail(scope.row)">{{ scope.row.sourceNo }}</el-link>
-              </div>
-              <div v-else-if="items.prop_ == 'inspectionNo'">
-                <el-link type="primary" @click.stop="clickRow(scope.row)">{{ scope.row.inspectionNo }}</el-link>
-              </div>
-              <div v-else>
-                <div style="overflow:hidden">{{ scope.row[items.prop_] }}</div>
-              </div>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <div class="sys-pagination">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
-      :before-close="handleClose">
-      <el-table border :data="showTableColumns" :key="Math.random()" max-height="350" style="width: 100%">
-        <el-table-column prop="title" label="列表名称" width="180" fixed>
-        </el-table-column>
-        <el-table-column prop="select" label="是否显示" width="180">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-
-    <!--    选择客户-->
-    <dialogChooseSingleClient :visible.sync="chooseClientVisible" @change="getClient"></dialogChooseSingleClient>
-    <!--选择物料-->
-    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getPart"></dialogChooseSingleParts>
-
-  </div>
-</template>
-
-<script>
-import btnInput from "@/components/btnInput.vue";
-    import { formatDateTime } from "@/utils/tools.js";
-    import config from "@/utils/config.js";
-    import dialogChooseSingleClient from "@/components/System/dialogChooseSingleClient";
-    import dialogChooseSingleParts from "../../../../components/System/dialogChooseSingleParts";
-    export default {
-        components: {
-          btnInput,dialogChooseSingleParts,dialogChooseSingleClient
-        },
-        name: "materialScrapList",
-        data() {
-            return {
-                total: 0, //总条数
-                pageSizes: [10, 20, 50], //每页展示多少条
-                search_data: {
-                  pageno: 1,
-                  pagesize: 10,
-                  serialNo:"",
-                  supplierName:""
-                },
-                selectDeptId:'',
-                btnDelDisabled: true,
-                btnOtherDisabled: true,
-                rowIds: [],
-                tableData: [],
-                sendCounts: 0,
-                unqualifiedCounts:0,
-                qualifiedCounts:0,
-                inspectionCounts:0,
-                sendCountSupport: 0,
-                inspectionCountSupport:0,
-                qualifiedCountSupport:0,
-                unqualifiedCountSupport:0,
-                config: config,
-
-              chooseClientVisible:false,//选择客户
-              chooseMaterielVisible:false,
-
-                depOptions:[],
-
-                columnSetDialogVisible: false,
-                columnSetDialogTitle: "设置显示字段列表",
-                tableId: 'quality_deliveryInspection_table',
-                pictLoading: false,
-                //默认列表数据
-                showTableColumnsDefault: [
-                    {title: "单据编号", prop_: "inspectionNo", select: true},
-                    {title: "日期", prop_: "createTime", select: true},
-                    {title: "物料代码", prop_: "materialSerialNo", select: true},
-                    {title: "物料名称", prop_: "materialName", select: true},
-                    {title: "规格型号", prop_: "specification", select: true},
-                    {title: "计量单位", prop_: "unitUomName", select: true},
-                    {title: "批号", prop_: "batchNo", select: true},
-                    {title: "部门", prop_: "deptName", select: true},
-                    {title: "客户", prop_: "clientName", select: true},
-                    {title: "报检数量(主单位)", prop_: "sendCount", select: true},
-                    {title: "检验数量(主单位)", prop_: "inspectionCount", select: true},
-                    {title: "合格数量(主单位)", prop_: "qualifiedCount", select: true},
-                    {title: "不合格数量(主单位)", prop_: "unqualifiedCount", select: true},
-                    {title: "辅助单位", prop_: "supportUomName", select: true},
-                    {title: "报检数量(辅单位)", prop_: "sendCountSupport", select: true},
-                    {title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: true},
-                    {title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: true},
-                    {title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: true},
-                    {title: "备注", prop_: "remarks", select: true},
-                    {title: "制单人", prop_: "createrName", select: true},
-                    {title: "审核人", prop_: "auditorName", select: true},
-                    {title: "源单类型", prop_: "sourceTypeName", select: true},
-                    {title: "源单单号", prop_: "sourceNo", select: true},
-                    {title: "单据状态", prop_: "statusName", select: true},
-                ],
-                ///弹出页面列表数据
-                showTableColumns: [
-                    {title: "单据编号", prop_: "inspectionNo", select: true},
-                    {title: "日期", prop_: "createTime", select: true},
-                    {title: "物料代码", prop_: "materialSerialNo", select: true},
-                    {title: "物料名称", prop_: "materialName", select: true},
-                    {title: "规格型号", prop_: "specification", select: true},
-                    {title: "计量单位", prop_: "unitUomName", select: true},
-                    {title: "批号", prop_: "batchNo", select: true},
-                    {title: "部门", prop_: "deptName", select: true},
-                    {title: "客户", prop_: "clientName", select: true},
-                    {title: "报检数量(主单位)", prop_: "sendCount", select: true},
-                    {title: "检验数量(主单位)", prop_: "inspectionCount", select: true},
-                    {title: "合格数量(主单位)", prop_: "qualifiedCount", select: true},
-                    {title: "不合格数量(主单位)", prop_: "unqualifiedCount", select: true},
-                    {title: "辅助单位", prop_: "supportUomName", select: true},
-                    {title: "报检数量(辅单位)", prop_: "sendCountSupport", select: true},
-                    {title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: true},
-                    {title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: true},
-                    {title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: true},
-                    {title: "备注", prop_: "remarks", select: true},
-                    {title: "制单人", prop_: "createrName", select: true},
-                    {title: "审核人", prop_: "auditorName", select: true},
-                    {title: "源单类型", prop_: "sourceTypeName", select: true},
-                    {title: "源单单号", prop_: "sourceNo", select: true},
-                    {title: "单据状态", prop_: "statusName", select: true},
-                ],
-                showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
-                //显示的列表字段
-                formTableData: [],
-            };
-        },
-        created() {
-            this.initData();
-            this.getList();
-          var _this = this;
-          document.onkeydown = e => {
-            if (e.key === "Enter") {
-              _this.search()
-            }
-          }
-        },
-        mounted() {
-          this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-            this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-            this.getShowColumns();
-        },
-        methods: {
-          //设置显示字段
-            showColumnSetDialog() {
-                this.columnSetDialogVisible = true;
-                this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-            },
-            //前移
-            toUp(scope) {
-                if (scope.$index == 0) {
-                return false;
-                }
-                let n;
-                for (let i = 0; i < this.showTableColumns.length; i++) {
-                if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-                    n = i;
-                }
-                }
-                let temp = this.showTableColumns[n];
-                this.showTableColumns[n] = this.showTableColumns[n - 1];
-                this.showTableColumns[n - 1] = temp;
-                this.$forceUpdate();
-            },
-            //后移
-            toDown(scope) {
-                if (scope.$index == this.showTableColumns.length - 1) {
-                return false;
-                }
-                let n;
-                for (let i = 0; i < this.showTableColumns.length; i++) {
-                if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-                    n = i;
-                }
-                }
-                let temp = this.showTableColumns[n];
-                this.showTableColumns[n] = this.showTableColumns[n + 1];
-                this.showTableColumns[n + 1] = temp;
-                this.$forceUpdate();
-            },
-            //恢复默认
-            toDefault() {
-                this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-                this.$forceUpdate();
-            },
-            //完成列表字段设置
-            saveAndCloseColumnSetDialog() {
-                let tableNo = this.tableId;
-                let tableColumns = JSON.stringify(this.showTableColumns);
-                this.columnSetDialogVisible = false;
-                this.$api.tableColumnAPI
-                .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
-                .then(res => {
-                    let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-                    this.formTableData = [];
-                    for (let i = 0; i < arr.length; i++) {
-                        if (arr[i].select) {
-                            this.formTableData.push(arr[i]);
-                        }
-                    }
-                })
-                .catch(r => {
-                    console.log(r);
-                });
-            },
-            //关闭字段设置弹出
-            handleClose() {
-                this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
-                this.columnSetDialogVisible = false;
-
-            },
-            /**
-             * 获取显示字段
-             */
-            getShowColumns() {
-                let tableNo = this.tableId;
-                this.formTableData = [];
-
-                this.$api.tableColumnAPI
-                .getShowColumns({tableNo:tableNo})
-                .then(res => {
-                    if(res.code==0){
-                    if(res.results){
-                        this.showTableColumns = JSON.parse(res.results);
-                        let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-                        for (let i = 0; i < arr.length; i++) {
-                        if (arr[i].select) {
-                            this.formTableData.push(arr[i]);
-                        }
-                        }
-                        this.$forceUpdate();
-                    }else{
-                        let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-                        for (let i = 0; i < arr.length; i++) {
-                        if (arr[i].select) {
-                            this.formTableData.push(arr[i]);
-                        }
-                        }
-                        this.$forceUpdate();
-                    }
-                    }else{
-                    this.$message({
-                        message: res.msg ? res.msg : "获取列表信息失败",
-                        type: "error"
-                    });
-                    }
-
-                })
-                .catch(r => {
-                    this.$message({
-                    message: r,
-                    type: "error"
-                    });
-                    console.log(r);
-                });
-            },
-
-
-          /**
-           * 查看源单明细
-           */
-          viewDetail(r) {
-              let queryId = r.queryId
-            this.$router.push({ path: '/sales/salesContract_add', query: {id:queryId,t: Date.now() } })
-          },
-            /**
-             * 计算合计
-             */
-            getSummaries(param) {
-                const sums = [];
-                sums[0] = "合计";
-                sums[7] = "" + this.sendCounts;
-                sums[8] = "" + this.inspectionCounts;
-                sums[9] = "" + this.qualifiedCounts;
-                sums[10] = "" + this.unqualifiedCounts;
-                sums[15] = "" + this.sendCountSupport;
-                sums[16] = "" + this.inspectionCountSupport;
-                sums[17] = "" + this.qualifiedCountSupport;
-                sums[18] = "" + this.unqualifiedCountSupport;
-                return sums;
-            },
-          sortChange({ column, prop, order }){
-            let j={ column, prop, order };
-            let order_=j.order=="ascending"?'asc':'desc'
-            this.$set(this.search_data,'sort',j.prop)
-            this.$set(this.search_data,'order',order_)
-            this.getList();
-          },
-            //根据当前id,获取一条树枝上的所有id数据
-            treeFindPath (tree, func, path = []) {
-                if (!tree) return []
-                for (const data of tree) {
-                    path.push(data.id)
-                    if (func(data)) return path
-                    if (data.children) {
-                        const findChildren = this.treeFindPath(data.children, func, path)
-                        if (findChildren.length) return findChildren
-                    }
-                    path.pop()
-                }
-                return []
-            },
-          initData(){
-            Promise.all([
-              this.$api.commonAPI.getDeptsTree(),
-            ])
-              .then(([r1]) => {
-                //使用部门
-                if (r1.code === 0) {
-                  this.depOptions=r1.data.children;
-                  this.setDefaultDept();
-                  this.setDeptList(this.depOptions);
-                }
-              })
-              .catch(error => {
-                console.log(error);
-              });
-          },
-          clickRow(row) {
-            this.$router.push({
-              path: "/quality/addDeliveryInspection",
-              query: { id: row.id, t: Date.now() }
-            });
-          },
-          //显示默认部门
-          setDefaultDept(){
-            if(this.depOptions.length>0&&this.search_data.deptId){
-              let id=JSON.stringify( this.search_data.deptId)
-              let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
-              this.selectDeptId=JSON.parse(JSON.stringify(select_id))
-            }
-          },
-          handleChange:function(value){
-            // console.log(value)
-            this.search_data.deptId=value.length>0?value[value.length-1]:'';
-            this.selectDeptId=value;
-          },
-          /**
-           * 获取选择的客户
-           */
-          getClient(val){
-            if (val) {
-              this.$set(this.search_data,'clientName',val.client_name)
-              // this.$set(this.search_data,'clientId',val.id)
-            }else{
-              this.$set(this.search_data,'clientName',"")
-              // this.$set(this.search_data,'clientId',"")
-            }
-
-          },
-          /**
-           * 获取选择的产品
-           */
-          getPart(val) {
-            if (val) {
-              this.$set(this.search_data,'serialNo',val.serialNo)
-            }else{
-              this.$set(this.search_data,'materielName',"")
-            }
-          },
-
-            /**
-             * 获取列表
-             */
-            getList() {
-                this.pictLoading = true;
-                this.search_data.inspectionType = 218;
-                if (this.search_data.time) {
-                    this.search_data.startTime = formatDateTime(this.search_data.time[0]);
-                    this.search_data.endTime = formatDateTime(this.search_data.time[1]);
-                } else {
-                    this.search_data.startTime = "";
-                    this.search_data.endTime = "";
-                }
-                this.$api.inspectionAPI
-                    .inspectionList(this.search_data)
-                    .then(res => {
-                        this.pictLoading = false;
-                        if (res.data) {
-                            this.sendCounts = res.count.sendCounts
-                            this.unqualifiedCounts = res.count.unqualifiedCounts
-                            this.qualifiedCounts = res.count.qualifiedCounts
-                            this.inspectionCounts = res.count.inspectionCounts
-                            this.sendCountSupport = res.count.sendCountSupport
-                            this.inspectionCountSupport = res.count.inspectionCountSupport
-                            this.qualifiedCountSupport = res.count.qualifiedCountSupport
-                            this.unqualifiedCountSupport = res.count.unqualifiedCountSupport
-
-                            this.total = res.data.totalRows;
-                            this.tableData = res.data.datas ? res.data.datas : [];
-                            this.tableData.forEach(item => {
-                                item.createTime = item.createTime.substr(0, 10)
-                            })
-                        } else {
-                            this.total = 0;
-                            this.tableData = [];
-                        }
-                    })
-                    .catch(r => {
-                        this.pictLoading = false;
-                    });
-            },
-            /**
-             * 查询
-             */
-            search() {
-                this.search_data.pageno = 1;
-                this.getList();
-            },
-            // 上下分页
-            handleCurrentChange(val) {
-                this.search_data.pageno = val;
-                this.getList();
-            },
-            // 每页显示多少条
-            handleSizeChange(val) {
-                this.search_data.pagesize = val;
-                this.getList();
-            },
-          // 跳转到添加页面
-          gotoAdd() {
-            this.$router.push({
-                path: "/quality/addDeliveryInspection",
-                query: {
-                  t: Date.now()
-                }
-            }
-            )
-
-          },
-
-            /**
-             * 删除
-             */
-            remove() {
-                let ids = [];
-                this.rowIds.forEach(item => {
-                    ids.push(item.id);
-                });
-                // const ids = this.rowIds.map(item => item.id).toString();
-                let params = { ids: ids };
-                this.$confirm("确认删除选中的发货检验单吗?", "提示", {
-                    type: "warning"
-                }).then(() => {
-                    this.$api.inspectionAPI
-                        .removeBatch({ids:ids})
-                        .then(res => {
-                            if (res.code === 0) {
-                                this.$message({
-                                    message: res.msg,
-                                    type: "success"
-                                });
-                                this.getList();
-                            } else {
-                                this.$message({
-                                    message: res.msg ? res.msg : "删除失败，请重试",
-                                    type: "error"
-                                });
-                            }
-                        })
-                        .catch(error => {
-                            this.$message({
-                                message: "删除失败，请重试",
-                                type: "error"
-                            });
-                        });
-                });
-            },
-
-          audit() {
-            let id = this.rowIds[0].id;
-            this.$api.inspectionAPI
-              .audit({id: id})
-              .then(res => {
-                if(res.code === 0) {
-                  this.$message({
-                    message: res.msg,
-                    type: "success"
-                  })
-                  this.getList();
-                } else {
-                  this.$message({
-                    message: res.msg,
-                    type: "error"
-                  })
-                }
-              })
-          },
-
-          /**
-           * 反审核
-           */
-          reverseAudit() {
-            let id = this.rowIds[0].id;
-            this.$api.inspectionAPI
-              .reverseAudit({id: id})
-              .then(res => {
-                if(res.code === 0) {
-                  this.$message({
-                    message: res.msg,
-                    type: "success"
-                  })
-                  this.getList();
-                } else {
-                  this.$message({
-                    message: res.msg,
-                    type: "error"
-                  })
-                }
-              })
-          },
-
-            /**
-             * 处理选中
-             */
-            handleSelectionChange(val) {
-                this.rowIds = val;
-                this.setBtn(val);
-            },
-            /**
-             * 控件操作按钮状态
-             */
-            setBtn(val) {
-                let isFlag = true;
-                let isDelFlag = true;
-                if (val.length > 0) {
-                    isDelFlag = false;
-                    if (val.length == 1) {
-                        isFlag = false;
-                    }
-                } else {
-                    isFlag = true;
-                    isDelFlag = true;
-                }
-                this.btnDelDisabled = isDelFlag;
-                this.btnOtherDisabled = isFlag;
-            }
-        }
-    };
-</script>
-
-<style>
-.el-table__row:hover,
-.el-table__row:hover>td {
-  background-color: #dfedfc !important;
-}
-</style>
+<template>
+  <div class="sys-task sys-box">
+    <div class="sys-operate sys-tabs">
+      <el-button type="primary" @click="gotoAdd" v-has="'quality:deliveryInspection:add'">新增11</el-button>
+      <el-button type="primary" @click="remove()" :disabled="btnDelDisabled"
+        v-has="'quality:deliveryInspection:delete'">删除</el-button>
+      <el-button type="primary" @click="audit()" :disabled="btnOtherDisabled"
+        v-has="'quality:deliveryInspection:audit'">审核</el-button>
+      <el-button type="primary" @click="reverseAudit()" :disabled="btnOtherDisabled"
+        v-has="'quality:deliveryInspection:reverseAudit'">反审核</el-button>
+      <el-button type="primary" @click="showColumnSetDialog">{{ config.configureBtnName }}</el-button>
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class='form_item_input_out'>
+          <el-form-item label="部门" style='width:20%' class="form_item-inline">
+            <el-cascader clearable v-model="selectDeptId" :options="depOptions"
+              :props="{ expandTrigger: 'hover', label: 'text', value: 'id', checkStrictly: true }"
+              @change="handleChange"></el-cascader>
+          </el-form-item>
+          <el-form-item label="物料代码" style='width:22%' class="form_item-inline">
+            <!-- <el-input placeholder="物料" clearable v-model="search_data.serialNo">
+            <el-button slot="append" @click="chooseMaterielVisible = true" icon="el-icon-search"></el-button>
+          </el-input> -->
+            <btn-input :valueText.sync='search_data.serialNo' :valueId.sync='search_data.serialNo'
+              :chooseVisible.sync='chooseMaterielVisible'></btn-input>
+          </el-form-item>
+          <el-form-item label="选择客户" style='width:22%' class="form_item-inline">
+            <!-- <el-input placeholder="客户" clearable v-model="search_data.clientName">
+            <el-button slot="append" @click="chooseClientVisible = true" icon="el-icon-search"></el-button>
+          </el-input> -->
+            <btn-input :valueText.sync='search_data.clientName' :valueId.sync='search_data.clientName'
+              :chooseVisible.sync='chooseClientVisible'></btn-input>
+          </el-form-item>
+          <el-form-item label="源单单号" style='width:22%' class="form_item-inline">
+            <el-input v-model="search_data.sourceNo" placeholder="源单单号" clearable ></el-input>
+          </el-form-item>
+          <el-form-item label="日期" style='width:36%' class="form_item-inline">
+            <el-date-picker v-model="search_data.time" type="daterange" format="yyyy-MM-dd" range-separator="—"
+              start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+
+        </div>
+        <div class='form_item_btn_out'>
+          <el-form-item>
+            <el-button @click="search" type="primary" size="small">查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+
+    <div class="sys-table">
+      <el-table border fit @sort-change="sortChange" v-if="formTableData.length > 0" ref="tb" show-summary
+        :summary-method="getSummaries" :data="tableData"
+        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column v-for="(items, index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
+          align="center" show-overflow-tooltip :sortable="(items.prop_ == 'createTime') ? 'custom' : false">
+          <template slot-scope="scope">
+            <div>
+              <div v-if="items.prop_ == 'sourceNo'">
+                <el-link type="primary" @click.stop="viewDetail(scope.row)">{{ scope.row.sourceNo }}</el-link>
+              </div>
+              <div v-else-if="items.prop_ == 'inspectionNo'">
+                <el-link type="primary" @click.stop="clickRow(scope.row)">{{ scope.row.inspectionNo }}</el-link>
+              </div>
+              <div v-else>
+                <div style="overflow:hidden">{{ scope.row[items.prop_] }}</div>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div class="sys-pagination">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
+      :before-close="handleClose">
+      <el-table border :data="showTableColumns" :key="Math.random()" max-height="350" style="width: 100%">
+        <el-table-column prop="title" label="列表名称" width="180" fixed>
+        </el-table-column>
+        <el-table-column prop="select" label="是否显示" width="180">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+
+    <!--    选择客户-->
+    <dialogChooseSingleClient :visible.sync="chooseClientVisible" @change="getClient"></dialogChooseSingleClient>
+    <!--选择物料-->
+    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getPart"></dialogChooseSingleParts>
+
+  </div>
+</template>
+
+<script>
+import btnInput from "@/components/btnInput.vue";
+    import { formatDateTime } from "@/utils/tools.js";
+    import config from "@/utils/config.js";
+    import dialogChooseSingleClient from "@/components/System/dialogChooseSingleClient";
+    import dialogChooseSingleParts from "../../../../components/System/dialogChooseSingleParts";
+    export default {
+        components: {
+          btnInput,dialogChooseSingleParts,dialogChooseSingleClient
+        },
+        name: "materialScrapList",
+        data() {
+            return {
+                total: 0, //总条数
+                pageSizes: [10, 20, 50], //每页展示多少条
+                search_data: {
+                  pageno: 1,
+                  pagesize: 10,
+                  serialNo:"",
+                  supplierName:""
+                },
+                selectDeptId:'',
+                btnDelDisabled: true,
+                btnOtherDisabled: true,
+                rowIds: [],
+                tableData: [],
+                sendCounts: 0,
+                unqualifiedCounts:0,
+                qualifiedCounts:0,
+                inspectionCounts:0,
+                sendCountSupport: 0,
+                inspectionCountSupport:0,
+                qualifiedCountSupport:0,
+                unqualifiedCountSupport:0,
+                config: config,
+
+              chooseClientVisible:false,//选择客户
+              chooseMaterielVisible:false,
+
+                depOptions:[],
+
+                columnSetDialogVisible: false,
+                columnSetDialogTitle: "设置显示字段列表",
+                tableId: 'quality_deliveryInspection_table',
+                pictLoading: false,
+                //默认列表数据
+                showTableColumnsDefault: [
+                    {title: "单据编号", prop_: "inspectionNo", select: true},
+                    {title: "日期", prop_: "createTime", select: true},
+                    {title: "物料代码", prop_: "materialSerialNo", select: true},
+                    {title: "物料名称", prop_: "materialName", select: true},
+                    {title: "规格型号", prop_: "specification", select: false},
+                    {title: "计量单位", prop_: "unitUomName", select: false},
+                    {title: "批号", prop_: "batchNo", select: false},
+                    {title: "部门", prop_: "deptName", select: true},
+                    {title: "客户", prop_: "clientName", select: true},
+                    {title: "报检数量(主单位)", prop_: "sendCount", select: true},
+                    {title: "检验数量(主单位)", prop_: "inspectionCount", select: true},
+                    {title: "合格数量(主单位)", prop_: "qualifiedCount", select: true},
+                    {title: "不合格数量(主单位)", prop_: "unqualifiedCount", select: true},
+                    {title: "辅助单位", prop_: "supportUomName", select: false},
+                    {title: "报检数量(辅单位)", prop_: "sendCountSupport", select: false},
+                    {title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: false},
+                    {title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: false},
+                    {title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: false},
+                    {title: "单据状态", prop_: "statusName", select: true},
+                    {title: "制单人", prop_: "createrName", select: false},
+                    {title: "审核人", prop_: "auditorName", select: false},
+                    {title: "源单类型", prop_: "sourceTypeName", select: true},
+                    {title: "源单单号", prop_: "sourceNo", select: true},
+                    {title: "备注", prop_: "remarks", select: true},
+                ],
+                ///弹出页面列表数据
+                showTableColumns: [
+                    {title: "单据编号", prop_: "inspectionNo", select: true},
+                    {title: "日期", prop_: "createTime", select: true},
+                    {title: "物料代码", prop_: "materialSerialNo", select: true},
+                    {title: "物料名称", prop_: "materialName", select: true},
+                    {title: "规格型号", prop_: "specification", select: false},
+                    {title: "计量单位", prop_: "unitUomName", select: false},
+                    {title: "批号", prop_: "batchNo", select: false},
+                    {title: "部门", prop_: "deptName", select: true},
+                    {title: "客户", prop_: "clientName", select: true},
+                    {title: "报检数量(主单位)", prop_: "sendCount", select: true},
+                    {title: "检验数量(主单位)", prop_: "inspectionCount", select: true},
+                    {title: "合格数量(主单位)", prop_: "qualifiedCount", select: true},
+                    {title: "不合格数量(主单位)", prop_: "unqualifiedCount", select: true},
+                    {title: "辅助单位", prop_: "supportUomName", select: false},
+                    {title: "报检数量(辅单位)", prop_: "sendCountSupport", select: false},
+                    {title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: false},
+                    {title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: false},
+                    {title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: false},
+                    {title: "单据状态", prop_: "statusName", select: true},
+                    {title: "制单人", prop_: "createrName", select: false},
+                    {title: "审核人", prop_: "auditorName", select: false},
+                    {title: "源单类型", prop_: "sourceTypeName", select: true},
+                    {title: "源单单号", prop_: "sourceNo", select: true},
+                    {title: "备注", prop_: "remarks", select: true},
+
+                ],
+                showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
+                //显示的列表字段
+                formTableData: [],
+            };
+        },
+        created() {
+            this.initData();
+            this.getList();
+          var _this = this;
+          document.onkeydown = e => {
+            if (e.key === "Enter") {
+              _this.search()
+            }
+          }
+        },
+        mounted() {
+          this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+            this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+            this.getShowColumns();
+        },
+        methods: {
+          //设置显示字段
+            showColumnSetDialog() {
+                this.columnSetDialogVisible = true;
+                this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+            },
+            //前移
+            toUp(scope) {
+                if (scope.$index == 0) {
+                return false;
+                }
+                let n;
+                for (let i = 0; i < this.showTableColumns.length; i++) {
+                if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+                    n = i;
+                }
+                }
+                let temp = this.showTableColumns[n];
+                this.showTableColumns[n] = this.showTableColumns[n - 1];
+                this.showTableColumns[n - 1] = temp;
+                this.$forceUpdate();
+            },
+            //后移
+            toDown(scope) {
+                if (scope.$index == this.showTableColumns.length - 1) {
+                return false;
+                }
+                let n;
+                for (let i = 0; i < this.showTableColumns.length; i++) {
+                if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+                    n = i;
+                }
+                }
+                let temp = this.showTableColumns[n];
+                this.showTableColumns[n] = this.showTableColumns[n + 1];
+                this.showTableColumns[n + 1] = temp;
+                this.$forceUpdate();
+            },
+            //恢复默认
+            toDefault() {
+                this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+                this.$forceUpdate();
+            },
+            //完成列表字段设置
+            saveAndCloseColumnSetDialog() {
+                let tableNo = this.tableId;
+                let tableColumns = JSON.stringify(this.showTableColumns);
+                this.columnSetDialogVisible = false;
+                this.$api.tableColumnAPI
+                .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
+                .then(res => {
+                    let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+                    this.formTableData = [];
+                    for (let i = 0; i < arr.length; i++) {
+                        if (arr[i].select) {
+                            this.formTableData.push(arr[i]);
+                        }
+                    }
+                })
+                .catch(r => {
+                    console.log(r);
+                });
+            },
+            //关闭字段设置弹出
+            handleClose() {
+                this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
+                this.columnSetDialogVisible = false;
+
+            },
+            /**
+             * 获取显示字段
+             */
+            getShowColumns() {
+                let tableNo = this.tableId;
+                this.formTableData = [];
+
+                this.$api.tableColumnAPI
+                .getShowColumns({tableNo:tableNo})
+                .then(res => {
+                    if(res.code==0){
+                    if(res.results){
+                        this.showTableColumns = JSON.parse(res.results);
+                        let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+                        for (let i = 0; i < arr.length; i++) {
+                        if (arr[i].select) {
+                            this.formTableData.push(arr[i]);
+                        }
+                        }
+                        this.$forceUpdate();
+                    }else{
+                        let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+                        for (let i = 0; i < arr.length; i++) {
+                        if (arr[i].select) {
+                            this.formTableData.push(arr[i]);
+                        }
+                        }
+                        this.$forceUpdate();
+                    }
+                    }else{
+                    this.$message({
+                        message: res.msg ? res.msg : "获取列表信息失败",
+                        type: "error"
+                    });
+                    }
+
+                })
+                .catch(r => {
+                    this.$message({
+                    message: r,
+                    type: "error"
+                    });
+                    console.log(r);
+                });
+            },
+
+
+          /**
+           * 查看源单明细
+           */
+          viewDetail(r) {
+              let queryId = r.queryId
+            this.$router.push({ path: '/sales/salesContract_add', query: {id:queryId,t: Date.now() } })
+          },
+            /**
+             * 计算合计
+             */
+            getSummaries(param) {
+                const sums = [];
+                sums[0] = "合计";
+                sums[7] = "" + this.sendCounts;
+                sums[8] = "" + this.inspectionCounts;
+                sums[9] = "" + this.qualifiedCounts;
+                sums[10] = "" + this.unqualifiedCounts;
+                sums[15] = "" + this.sendCountSupport;
+                sums[16] = "" + this.inspectionCountSupport;
+                sums[17] = "" + this.qualifiedCountSupport;
+                sums[18] = "" + this.unqualifiedCountSupport;
+                return sums;
+            },
+          sortChange({ column, prop, order }){
+            let j={ column, prop, order };
+            let order_=j.order=="ascending"?'asc':'desc'
+            this.$set(this.search_data,'sort',j.prop)
+            this.$set(this.search_data,'order',order_)
+            this.getList();
+          },
+            //根据当前id,获取一条树枝上的所有id数据
+            treeFindPath (tree, func, path = []) {
+                if (!tree) return []
+                for (const data of tree) {
+                    path.push(data.id)
+                    if (func(data)) return path
+                    if (data.children) {
+                        const findChildren = this.treeFindPath(data.children, func, path)
+                        if (findChildren.length) return findChildren
+                    }
+                    path.pop()
+                }
+                return []
+            },
+          initData(){
+            Promise.all([
+              this.$api.commonAPI.getDeptsTree(),
+            ])
+              .then(([r1]) => {
+                //使用部门
+                if (r1.code === 0) {
+                  this.depOptions=r1.data.children;
+                  this.setDefaultDept();
+                  this.setDeptList(this.depOptions);
+                }
+              })
+              .catch(error => {
+                console.log(error);
+              });
+          },
+          clickRow(row) {
+            this.$router.push({
+              path: "/quality/addDeliveryInspection",
+              query: { id: row.id, t: Date.now() }
+            });
+          },
+          //显示默认部门
+          setDefaultDept(){
+            if(this.depOptions.length>0&&this.search_data.deptId){
+              let id=JSON.stringify( this.search_data.deptId)
+              let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
+              this.selectDeptId=JSON.parse(JSON.stringify(select_id))
+            }
+          },
+          handleChange:function(value){
+            // console.log(value)
+            this.search_data.deptId=value.length>0?value[value.length-1]:'';
+            this.selectDeptId=value;
+          },
+          /**
+           * 获取选择的客户
+           */
+          getClient(val){
+            if (val) {
+              this.$set(this.search_data,'clientName',val.client_name)
+              // this.$set(this.search_data,'clientId',val.id)
+            }else{
+              this.$set(this.search_data,'clientName',"")
+              // this.$set(this.search_data,'clientId',"")
+            }
+
+          },
+          /**
+           * 获取选择的产品
+           */
+          getPart(val) {
+            if (val) {
+              this.$set(this.search_data,'serialNo',val.serialNo)
+            }else{
+              this.$set(this.search_data,'materielName',"")
+            }
+          },
+
+            /**
+             * 获取列表
+             */
+            getList() {
+                this.pictLoading = true;
+                this.search_data.inspectionType = 218;
+                if (this.search_data.time) {
+                    this.search_data.startTime = formatDateTime(this.search_data.time[0]);
+                    this.search_data.endTime = formatDateTime(this.search_data.time[1]);
+                } else {
+                    this.search_data.startTime = "";
+                    this.search_data.endTime = "";
+                }
+                this.$api.inspectionAPI
+                    .inspectionList(this.search_data)
+                    .then(res => {
+                        this.pictLoading = false;
+                        if (res.data) {
+                            this.sendCounts = res.count.sendCounts
+                            this.unqualifiedCounts = res.count.unqualifiedCounts
+                            this.qualifiedCounts = res.count.qualifiedCounts
+                            this.inspectionCounts = res.count.inspectionCounts
+                            this.sendCountSupport = res.count.sendCountSupport
+                            this.inspectionCountSupport = res.count.inspectionCountSupport
+                            this.qualifiedCountSupport = res.count.qualifiedCountSupport
+                            this.unqualifiedCountSupport = res.count.unqualifiedCountSupport
+
+                            this.total = res.data.totalRows;
+                            this.tableData = res.data.datas ? res.data.datas : [];
+                            this.tableData.forEach(item => {
+                                item.createTime = item.createTime.substr(0, 10)
+                            })
+                        } else {
+                            this.total = 0;
+                            this.tableData = [];
+                        }
+                    })
+                    .catch(r => {
+                        this.pictLoading = false;
+                    });
+            },
+            /**
+             * 查询
+             */
+            search() {
+                this.search_data.pageno = 1;
+                this.getList();
+            },
+            // 上下分页
+            handleCurrentChange(val) {
+                this.search_data.pageno = val;
+                this.getList();
+            },
+            // 每页显示多少条
+            handleSizeChange(val) {
+                this.search_data.pagesize = val;
+                this.getList();
+            },
+          // 跳转到添加页面
+          gotoAdd() {
+            this.$router.push({
+                path: "/quality/addDeliveryInspection",
+                query: {
+                  t: Date.now()
+                }
+            }
+            )
+
+          },
+
+            /**
+             * 删除
+             */
+            remove() {
+                let ids = [];
+                this.rowIds.forEach(item => {
+                    ids.push(item.id);
+                });
+                // const ids = this.rowIds.map(item => item.id).toString();
+                let params = { ids: ids };
+                this.$confirm("确认删除选中的发货检验单吗?", "提示", {
+                    type: "warning"
+                }).then(() => {
+                    this.$api.inspectionAPI
+                        .removeBatch({ids:ids})
+                        .then(res => {
+                            if (res.code === 0) {
+                                this.$message({
+                                    message: res.msg,
+                                    type: "success"
+                                });
+                                this.getList();
+                            } else {
+                                this.$message({
+                                    message: res.msg ? res.msg : "删除失败，请重试",
+                                    type: "error"
+                                });
+                            }
+                        })
+                        .catch(error => {
+                            this.$message({
+                                message: "删除失败，请重试",
+                                type: "error"
+                            });
+                        });
+                });
+            },
+
+          audit() {
+            let id = this.rowIds[0].id;
+            this.$api.inspectionAPI
+              .audit({id: id})
+              .then(res => {
+                if(res.code === 0) {
+                  this.$message({
+                    message: res.msg,
+                    type: "success"
+                  })
+                  this.getList();
+                } else {
+                  this.$message({
+                    message: res.msg,
+                    type: "error"
+                  })
+                }
+              })
+          },
+
+          /**
+           * 反审核
+           */
+          reverseAudit() {
+            let id = this.rowIds[0].id;
+            this.$api.inspectionAPI
+              .reverseAudit({id: id})
+              .then(res => {
+                if(res.code === 0) {
+                  this.$message({
+                    message: res.msg,
+                    type: "success"
+                  })
+                  this.getList();
+                } else {
+                  this.$message({
+                    message: res.msg,
+                    type: "error"
+                  })
+                }
+              })
+          },
+
+            /**
+             * 处理选中
+             */
+            handleSelectionChange(val) {
+                this.rowIds = val;
+                this.setBtn(val);
+            },
+            /**
+             * 控件操作按钮状态
+             */
+            setBtn(val) {
+                let isFlag = true;
+                let isDelFlag = true;
+                if (val.length > 0) {
+                    isDelFlag = false;
+                    if (val.length == 1) {
+                        isFlag = false;
+                    }
+                } else {
+                    isFlag = true;
+                    isDelFlag = true;
+                }
+                this.btnDelDisabled = isDelFlag;
+                this.btnOtherDisabled = isFlag;
+            }
+        }
+    };
+</script>
+
+<style>
+.el-table__row:hover,
+.el-table__row:hover>td {
+  background-color: #dfedfc !important;
+}
+</style>
diff --git a/src/pages/mes/quality/productInspection/index.vue b/src/pages/mes/quality/productInspection/index.vue
index e82a750..069f5c6 100644
--- a/src/pages/mes/quality/productInspection/index.vue
+++ b/src/pages/mes/quality/productInspection/index.vue
@@ -1,672 +1,706 @@
-<template>
-  <div class="sys-task sys-box">
-    <div class="sys-operate sys-tabs">
-      <el-button type="primary" @click="gotoAdd" v-has="'quality:productInspection:add'">新增</el-button>
-      <el-button type="primary" @click="remove()" :disabled="btnDelDisabled"
-        v-has="'quality:productInspection:delete'">删除</el-button>
-      <el-button type="primary" @click="audit()" :disabled="btnOtherDisabled"
-        v-has="'quality:productInspection:audit'">审核</el-button>
-      <el-button type="primary" @click="reverseAudit()" :disabled="btnOtherDisabled"
-        v-has="'quality:productInspection:reverseAudit'">反审核</el-button>
-      <el-button type="primary" @click="qrCode()" :disabled="btnOtherDisabled"
-        v-has="'quality:productInspection:qrcode'">生成二维码</el-button>
-      <el-button type="primary" @click="showColumnSetDialog">{{ config.configureBtnName }}</el-button>
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class='form_item_input_out'>
-          <el-form-item label="部门" style='width:33.3%' class="form_item-inline">
-            <el-cascader clearable v-model="selectDeptId" :options="depOptions"
-              :props="{ expandTrigger: 'hover', label: 'text', value: 'id', checkStrictly: true }"
-              @change="handleChange"></el-cascader>
-          </el-form-item>
-          <el-form-item label="产品代码" style='width:33.3%' class="form_item-inline">
-            <!-- <el-input placeholder="请选择物料" clearable v-model="search_data.serialNo">
-            <el-button slot="append" @click="chooseMaterielVisible = true" icon="el-icon-search"></el-button>
-          </el-input> -->
-            <btn-input :valueText.sync='search_data.serialNo' :valueId.sync='search_data.serialNo'
-              :chooseVisible.sync='chooseMaterielVisible'></btn-input>
-          </el-form-item>
-
-          <el-form-item label="日期" style='width:33.3%' class="form_item-inline">
-            <el-date-picker v-model="search_data.time" type="daterange" format="yyyy-MM-dd" range-separator="—"
-              start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class='form_item_btn_out'>
-          <el-form-item>
-            <el-button @click="search" type="primary" size="small">查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-
-    <div class="sys-table">
-      <el-table border fit @sort-change="sortChange" v-if="formTableData.length > 0" v-loading="pictLoading" ref="tb"
-        show-summary :summary-method="getSummaries" :data="tableData"
-        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }"
-        @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column v-for="(items, index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
-          align="center" show-overflow-tooltip :sortable="(items.prop_ == 'createTime') ? 'custom' : false">
-          <template slot-scope="scope">
-            <div>
-              <div v-if="items.prop_ == 'sourceNo'">
-                <el-link type="primary" @click.stop="viewDetail(scope.row)">{{ scope.row.sourceNo }}</el-link>
-              </div>
-              <div v-else-if="items.prop_ == 'inspectionNo'">
-                <el-link type="primary" @click.stop="clickRow(scope.row)">{{ scope.row.inspectionNo }}</el-link>
-              </div>
-              <div v-else>
-                <div style="overflow:hidden">{{ scope.row[items.prop_] }}</div>
-              </div>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <div class="sys-pagination">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
-      :before-close="handleClose">
-      <el-table border :data="showTableColumns" :key="Math.random()" max-height="350" style="width: 100%">
-        <el-table-column prop="title" label="列表名称" width="180" fixed>
-        </el-table-column>
-        <el-table-column prop="select" label="是否显示" width="180">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-
-    <!--选择物料-->
-    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getPart"></dialogChooseSingleParts>
-
-  </div>
-</template>
-
-<script>
-    import { formatDateTime } from "@/utils/tools.js";
-    import config from "@/utils/config.js";
-    import btnInput from "@/components/btnInput.vue";
-    import dialogChooseSingleParts from "../../../../components/System/dialogChooseSingleParts";
-    export default {
-        components: {
-          btnInput,dialogChooseSingleParts
-        },
-        name: "materialScrapList",
-        data() {
-            return {
-                total: 0, //总条数
-                pageSizes: [10, 20, 50], //每页展示多少条
-                search_data: {
-                  pageno: 1,
-                  pagesize: 10,
-                  serialNo:"",
-                  deptId:""
-                },
-                selectDeptId:'',
-                btnDelDisabled: true,
-                btnOtherDisabled: true,
-                rowIds: [],
-                tableData: [],
-                sendCounts: 0,
-                unqualifiedCounts:0,
-                qualifiedCounts:0,
-                inspectionCounts:0,
-                sendCountSupport: 0,
-                inspectionCountSupport:0,
-                qualifiedCountSupport:0,
-                unqualifiedCountSupport:0,
-                chooseMaterielVisible:false,
-                config: config,
-                depOptions:[],
-
-                columnSetDialogVisible: false,
-                columnSetDialogTitle: "设置显示字段列表",
-                tableId: 'quality_productInspection_table',
-                pictLoading: false,
-                //默认列表数据
-                showTableColumnsDefault: [
-                    {title: "单据编号", prop_: "inspectionNo", select: true},
-                    {title: "日期", prop_: "createTime", select: true},
-                    {title: "产品代码", prop_: "materialSerialNo", select: true},
-                    {title: "产品名称", prop_: "materialName", select: true},
-                    {title: "规格型号", prop_: "specification", select: true},
-                    {title: "计量单位", prop_: "unitUomName", select: true},
-                    {title: "批号", prop_: "batchNo", select: true},
-                    {title: "生产部门", prop_: "deptName", select: true},
-                    {title: "报检数量(主单位)", prop_: "sendCount", select: true},
-                    {title: "检验数量(主单位)", prop_: "inspectionCount", select: true},
-                    {title: "合格数量(主单位)", prop_: "qualifiedCount", select: true},
-                    {title: "不合格数量(主单位)", prop_: "unqualifiedCount", select: true},
-                    {title: "辅助单位", prop_: "supportUomName", select: true},
-                    {title: "报检数量(辅单位)", prop_: "sendCountSupport", select: true},
-                    {title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: true},
-                    {title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: true},
-                    {title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: true},
-                    {title: "备注", prop_: "remarks", select: true},
-                    {title: "制单人", prop_: "createrName", select: true},
-                    {title: "审核人", prop_: "auditorName", select: true},
-                    {title: "源单类型", prop_: "sourceTypeName", select: true},
-                    {title: "源单单号", prop_: "sourceNo", select: true},
-                    {title: "单据状态", prop_: "statusName", select: true},
-                ],
-                ///弹出页面列表数据
-                showTableColumns: [
-                    {title: "单据编号", prop_: "inspectionNo", select: true},
-                    {title: "日期", prop_: "createTime", select: true},
-                    {title: "产品代码", prop_: "materialSerialNo", select: true},
-                    {title: "产品名称", prop_: "materialName", select: true},
-                    {title: "规格型号", prop_: "specification", select: true},
-                    {title: "计量单位", prop_: "unitUomName", select: true},
-                    {title: "批号", prop_: "batchNo", select: true},
-                    {title: "生产部门", prop_: "deptName", select: true},
-                    {title: "报检数量(主单位)", prop_: "sendCount", select: true},
-                    {title: "检验数量(主单位)", prop_: "inspectionCount", select: true},
-                    {title: "合格数量(主单位)", prop_: "qualifiedCount", select: true},
-                    {title: "不合格数量(主单位)", prop_: "unqualifiedCount", select: true},
-                    {title: "辅助单位", prop_: "supportUomName", select: true},
-                    {title: "报检数量(辅单位)", prop_: "sendCountSupport", select: true},
-                    {title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: true},
-                    {title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: true},
-                    {title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: true},
-                    {title: "备注", prop_: "remarks", select: true},
-                    {title: "制单人", prop_: "createrName", select: true},
-                    {title: "审核人", prop_: "auditorName", select: true},
-                    {title: "源单类型", prop_: "sourceTypeName", select: true},
-                    {title: "源单单号", prop_: "sourceNo", select: true},
-                    {title: "单据状态", prop_: "statusName", select: true},
-                ],
-                showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
-                //显示的列表字段
-                formTableData: [],
-            };
-        },
-        created() {
-            this.initData();
-            this.getList();
-          var _this = this;
-          document.onkeydown = e => {
-            if (e.key === "Enter") {
-              _this.search()
-            }
-          }
-        },
-        mounted() {
-          this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-            this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-            this.getShowColumns();
-        },
-        methods: {
-          //设置显示字段
-            showColumnSetDialog() {
-                this.columnSetDialogVisible = true;
-                this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-            },
-            //前移
-            toUp(scope) {
-                if (scope.$index == 0) {
-                return false;
-                }
-                let n;
-                for (let i = 0; i < this.showTableColumns.length; i++) {
-                if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-                    n = i;
-                }
-                }
-                let temp = this.showTableColumns[n];
-                this.showTableColumns[n] = this.showTableColumns[n - 1];
-                this.showTableColumns[n - 1] = temp;
-                this.$forceUpdate();
-            },
-            //后移
-            toDown(scope) {
-                if (scope.$index == this.showTableColumns.length - 1) {
-                return false;
-                }
-                let n;
-                for (let i = 0; i < this.showTableColumns.length; i++) {
-                if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-                    n = i;
-                }
-                }
-                let temp = this.showTableColumns[n];
-                this.showTableColumns[n] = this.showTableColumns[n + 1];
-                this.showTableColumns[n + 1] = temp;
-                this.$forceUpdate();
-            },
-            //恢复默认
-            toDefault() {
-                this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-                this.$forceUpdate();
-            },
-            //完成列表字段设置
-            saveAndCloseColumnSetDialog() {
-                let tableNo = this.tableId;
-                let tableColumns = JSON.stringify(this.showTableColumns);
-                this.columnSetDialogVisible = false;
-                this.$api.tableColumnAPI
-                .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
-                .then(res => {
-                    let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-                    this.formTableData = [];
-                    for (let i = 0; i < arr.length; i++) {
-                        if (arr[i].select) {
-                            this.formTableData.push(arr[i]);
-                        }
-                    }
-                })
-                .catch(r => {
-                    console.log(r);
-                });
-            },
-            //关闭字段设置弹出
-            handleClose() {
-                this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
-                this.columnSetDialogVisible = false;
-
-            },
-            /**
-             * 获取显示字段
-             */
-            getShowColumns() {
-                let tableNo = this.tableId;
-                this.formTableData = [];
-
-                this.$api.tableColumnAPI
-                .getShowColumns({tableNo:tableNo})
-                .then(res => {
-                    if(res.code==0){
-                    if(res.results){
-                        this.showTableColumns = JSON.parse(res.results);
-                        let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-                        for (let i = 0; i < arr.length; i++) {
-                        if (arr[i].select) {
-                            this.formTableData.push(arr[i]);
-                        }
-                        }
-                        this.$forceUpdate();
-                    }else{
-                        let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-                        for (let i = 0; i < arr.length; i++) {
-                        if (arr[i].select) {
-                            this.formTableData.push(arr[i]);
-                        }
-                        }
-                        this.$forceUpdate();
-                    }
-                    }else{
-                    this.$message({
-                        message: res.msg ? res.msg : "获取列表信息失败",
-                        type: "error"
-                    });
-                    }
-
-                })
-                .catch(r => {
-                    this.$message({
-                    message: r,
-                    type: "error"
-                    });
-                    console.log(r);
-                });
-            },
-
-
-          /**
-           * 查看源单明细
-           */
-          viewDetail(r) {
-              let queryId = r.queryId
-            this.$router.push({ path: '/planManagement/production_add', query: {id:queryId,t: Date.now() } })
-          },
-            /**
-             * 计算合计
-             */
-            getSummaries(param) {
-                const sums = [];
-                sums[0] = "合计";
-                sums[7] = "" + this.sendCounts;
-                sums[8] = "" + this.inspectionCounts;
-                sums[9] = "" + this.qualifiedCounts;
-                sums[12] = "" + this.unqualifiedCounts;
-                sums[14] = "" + this.sendCountSupport;
-                sums[15] = "" + this.inspectionCountSupport;
-                sums[16] = "" + this.qualifiedCountSupport;
-                sums[17] = "" + this.unqualifiedCountSupport;
-                return sums;
-            },
-          sortChange({ column, prop, order }){
-            let j={ column, prop, order };
-            let order_=j.order=="ascending"?'asc':'desc'
-            this.$set(this.search_data,'sort',j.prop)
-            this.$set(this.search_data,'order',order_)
-            this.getList();
-          },
-            //根据当前id,获取一条树枝上的所有id数据
-            treeFindPath (tree, func, path = []) {
-                if (!tree) return []
-                for (const data of tree) {
-                    path.push(data.id)
-                    if (func(data)) return path
-                    if (data.children) {
-                        const findChildren = this.treeFindPath(data.children, func, path)
-                        if (findChildren.length) return findChildren
-                    }
-                    path.pop()
-                }
-                return []
-            },
-          initData(){
-            Promise.all([
-              this.$api.commonAPI.getDeptsTree(),
-            ])
-              .then(([r1]) => {
-                //使用部门
-                if (r1.code === 0) {
-                  this.depOptions=r1.data.children;
-                  this.setDefaultDept();
-                  this.setDeptList(this.depOptions);
-                }
-              })
-              .catch(error => {
-                console.log(error);
-              });
-          },
-            //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
-      setDeptList(tree){
-          for (const data of tree) {
-              if(!data.hasChildren){
-                  data.children=undefined;
-              }else{
-                  this.setDeptList(data.children)
-              }
-          }
-
-      },
-          clickRow(row) {
-            this.$router.push({
-              path: "/quality/addProductInspection",
-              query: { id: row.id, t: Date.now() }
-            });
-          },
-          //显示默认部门
-          setDefaultDept(){
-            if(this.depOptions.length>0&&this.search_data.deptId){
-              let id=JSON.stringify( this.search_data.deptId)
-              let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
-              this.selectDeptId=JSON.parse(JSON.stringify(select_id))
-            }
-          },
-          handleChange:function(value){
-            // console.log(value)
-            this.search_data.deptId=value.length>0?value[value.length-1]:'';
-            this.selectDeptId=value;
-          },
-          /**
-           * 获取选择的客户
-           */
-          getClient(val){
-            if (val) {
-              this.$set(this.search_data,'clientName',val.client_name)
-              // this.$set(this.search_data,'clientId',val.id)
-            }else{
-              this.$set(this.search_data,'clientName',"")
-              // this.$set(this.search_data,'clientId',"")
-            }
-
-          },
-          /**
-           * 获取选择的产品
-           */
-          getPart(val) {
-            if (val) {
-              this.$set(this.search_data,'serialNo',val.serialNo)
-            }else{
-              this.$set(this.search_data,'materielName',"")
-            }
-          },
-
-            /**
-             * 获取列表
-             */
-            getList() {
-                this.pictLoading = true;
-                this.search_data.inspectionType=217;
-                if (this.search_data.time) {
-                    this.search_data.startTime = formatDateTime(this.search_data.time[0]);
-                    this.search_data.endTime = formatDateTime(this.search_data.time[1]);
-                } else {
-                    this.search_data.startTime = "";
-                    this.search_data.endTime = "";
-                }
-                this.$api.inspectionAPI
-                    .inspectionList(this.search_data)
-                    .then(res => {
-                        this.pictLoading = false;
-                        if (res.data) {
-                          this.sendCounts = res.count.sendCounts
-                            this.unqualifiedCounts = res.count.unqualifiedCounts
-                            this.qualifiedCounts = res.count.qualifiedCounts
-                            this.inspectionCounts = res.count.inspectionCounts
-
-                            this.sendCountSupport = res.count.sendCountSupport
-                            this.inspectionCountSupport = res.count.inspectionCountSupport
-                            this.qualifiedCountSupport = res.count.qualifiedCountSupport
-                            this.unqualifiedCountSupport = res.count.unqualifiedCountSupport
-
-                            this.total = res.data.totalRows;
-                            this.tableData = res.data.datas ? res.data.datas : [];
-                            this.tableData.forEach(item => {
-                              item.createTime = item.createTime.substr(0,10)
-                            })
-                        } else {
-                            this.total = 0;
-                            this.tableData = [];
-                        }
-                    })
-                    .catch(r => {
-                        this.pictLoading = false;
-                    });
-            },
-            /**
-             * 查询
-             */
-            search() {
-                this.search_data.pageno = 1;
-                this.getList();
-            },
-            // 上下分页
-            handleCurrentChange(val) {
-                this.search_data.pageno = val;
-                this.getList();
-            },
-            // 每页显示多少条
-            handleSizeChange(val) {
-                this.search_data.pagesize = val;
-                this.getList();
-            },
-          // 跳转到添加页面
-          gotoAdd() {
-            this.$router.push({
-                path: "/quality/addProductInspection",
-                query: {
-                  t: Date.now()
-                }
-            }
-            )
-
-          },
-
-            /**
-             * 删除
-             */
-            remove() {
-                let ids = [];
-                this.rowIds.forEach(item => {
-                    ids.push(item.id);
-                });
-                // const ids = this.rowIds.map(item => item.id).toString();
-                let params = { ids: ids };
-                this.$confirm("确认删除选中的产品检验单吗?", "提示", {
-                    type: "warning"
-                }).then(() => {
-                    this.$api.inspectionAPI
-                        .removeBatch({ids:ids})
-                        .then(res => {
-                            if (res.code === 0) {
-                                this.$message({
-                                    message: res.msg,
-                                    type: "success"
-                                });
-                                this.getList();
-                            } else {
-                                this.$message({
-                                    message: res.msg ? res.msg : "删除失败，请重试",
-                                    type: "error"
-                                });
-                            }
-                        })
-                        .catch(error => {
-                            this.$message({
-                                message: "删除失败，请重试",
-                                type: "error"
-                            });
-                        });
-                });
-            },
-
-          audit() {
-            let id = this.rowIds[0].id;
-            this.$api.inspectionAPI
-              .audit({id: id})
-              .then(res => {
-                if(res.code === 0) {
-                  this.$message({
-                    message: res.msg,
-                    type: "success"
-                  })
-                  this.getList();
-                } else {
-                  this.$message({
-                    message: res.msg,
-                    type: "error"
-                  })
-                }
-              })
-          },
-
-          /**
-           * 反审核
-           */
-          reverseAudit() {
-            let id = this.rowIds[0].id;
-            this.$api.inspectionAPI
-              .reverseAudit({id: id})
-              .then(res => {
-                if(res.code === 0) {
-                  this.$message({
-                    message: res.msg,
-                    type: "success"
-                  })
-                  this.getList();
-                } else {
-                  this.$message({
-                    message: res.msg,
-                    type: "error"
-                  })
-                }
-              })
-          },
-            /**
-           * 生成二维码
-           */
-        qrCode(){
-            let row = this.rowIds[0];
-            if(row.qualifiedCount<=0){
-                this.$message({
-                            message:"合格数量小于0",
-                            type: "error"
-                        });
-                        return
-            }
-            let params={
-                    isPrintedQrcode:row.isPrintedQrcode?row.isPrintedQrcode:0,
-                    unitCount:row.unitCodeCount?row.unitCodeCount:'',
-                     inspectionId:row.id,
-                    inspectionNo:row.inspectionNo,
-                    materielNo:row.materialSerialNo,
-                      batchNo:row.batchNo,
-                    qualifiedCount:row.qualifiedCountSupport,//取合格数量(辅单位)
-                    supportUom:row.supportUom,
-                    supportUomName:row.supportUomName//辅助单位
-            }
-          this.$router.push({
-                        path: "/quality/productInspection_qrcode",
-                        name: 'productInspection_qrcode',
-                        query: {
-                          t: Date.now()
-                        },
-                         params: params
-                    }
-                    )
-        },
-
-            /**
-             * 处理选中
-             */
-            handleSelectionChange(val) {
-                this.rowIds = val;
-                this.setBtn(val);
-            },
-            /**
-             * 控件操作按钮状态
-             */
-            setBtn(val) {
-                let isFlag = true;
-                let isDelFlag = true;
-                if (val.length > 0) {
-                    isDelFlag = false;
-                    if (val.length == 1) {
-                        isFlag = false;
-                    }
-                } else {
-                    isFlag = true;
-                    isDelFlag = true;
-                }
-                this.btnDelDisabled = isDelFlag;
-                this.btnOtherDisabled = isFlag;
-            }
-        }
-    };
-</script>
-
-<style>
-.el-table__row:hover,
-.el-table__row:hover>td {
-  background-color: #dfedfc !important;
-}
-</style>
+<template>
+  <div class="sys-task sys-box">
+    <div class="sys-operate sys-tabs">
+      <el-button type="primary" @click="gotoAdd" v-has="'quality:productInspection:add'">新增</el-button>
+      <el-button type="primary" @click="remove()" :disabled="btnDelDisabled"
+        v-has="'quality:productInspection:delete'">删除</el-button>
+      <el-button type="primary" @click="audit()" :disabled="btnOtherDisabled"
+        v-has="'quality:productInspection:audit'">审核</el-button>
+      <el-button type="primary" @click="reverseAudit()" :disabled="btnOtherDisabled"
+        v-has="'quality:productInspection:reverseAudit'">反审核</el-button>
+      <el-button type="primary" @click="qrCode()" :disabled="btnOtherDisabled"
+        v-has="'quality:productInspection:qrcode'">生成二维码</el-button>
+      <el-button type="primary" @click="showColumnSetDialog">{{ config.configureBtnName }}</el-button>
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class='form_item_input_out'>
+          <el-form-item label="部门" style='width:33.3%' class="form_item-inline">
+            <el-cascader clearable v-model="selectDeptId" :options="depOptions"
+              :props="{ expandTrigger: 'hover', label: 'text', value: 'id', checkStrictly: true }"
+              @change="handleChange"></el-cascader>
+          </el-form-item>
+          <el-form-item label="产品代码" style='width:33.3%' class="form_item-inline">
+            <!-- <el-input placeholder="请选择物料" clearable v-model="search_data.serialNo">
+            <el-button slot="append" @click="chooseMaterielVisible = true" icon="el-icon-search"></el-button>
+          </el-input> -->
+            <btn-input :valueText.sync='search_data.serialNo' :valueId.sync='search_data.serialNo'
+              :chooseVisible.sync='chooseMaterielVisible'></btn-input>
+          </el-form-item>
+          <el-form-item label="源单单号" style='width:22%' class="form_item-inline">
+            <el-input v-model="search_data.sourceNo" placeholder="源单单号" clearable ></el-input>
+          </el-form-item>
+          <el-form-item label="日期" style='width:33.3%' class="form_item-inline">
+            <el-date-picker v-model="search_data.time" type="daterange" format="yyyy-MM-dd" range-separator="—"
+              start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class='form_item_btn_out'>
+          <el-form-item>
+            <el-button @click="search" type="primary" size="small">查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+
+    <div class="sys-table">
+      <el-table border fit @sort-change="sortChange" v-if="formTableData.length > 0" v-loading="pictLoading" ref="tb"
+        show-summary :summary-method="getSummaries" :data="tableData"
+        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column v-for="(items, index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
+          align="center" show-overflow-tooltip :sortable="(items.prop_ == 'createTime') ? 'custom' : false">
+          <template slot-scope="scope">
+            <div>
+              <div v-if="items.prop_ == 'sourceNo'">
+                <el-link type="primary" @click.stop="viewDetail(scope.row)">{{ scope.row.sourceNo }}</el-link>
+              </div>
+              <div v-else-if="items.prop_ == 'inspectionNo'">
+                <el-link type="primary" @click.stop="clickRow(scope.row)">{{ scope.row.inspectionNo }}</el-link>
+              </div>
+              <div v-else>
+                <div style="overflow:hidden">{{ scope.row[items.prop_] }}</div>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div class="sys-pagination">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
+      :before-close="handleClose">
+      <el-table border :data="showTableColumns" :key="Math.random()" max-height="350" style="width: 100%">
+        <el-table-column prop="title" label="列表名称" width="180" fixed>
+        </el-table-column>
+        <el-table-column prop="select" label="是否显示" width="180">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+
+    <!--选择物料-->
+    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getPart"></dialogChooseSingleParts>
+
+  </div>
+</template>
+
+<script>
+    import { formatDateTime } from "@/utils/tools.js";
+    import config from "@/utils/config.js";
+    import btnInput from "@/components/btnInput.vue";
+    import dialogChooseSingleParts from "../../../../components/System/dialogChooseSingleParts";
+    export default {
+        components: {
+          btnInput,dialogChooseSingleParts
+        },
+        name: "materialScrapList",
+        data() {
+            return {
+                total: 0, //总条数
+                pageSizes: [10, 20, 50], //每页展示多少条
+                search_data: {
+                  pageno: 1,
+                  pagesize: 10,
+                  serialNo:"",
+                  deptId:""
+                },
+                selectDeptId:'',
+                btnDelDisabled: true,
+                btnOtherDisabled: true,
+                rowIds: [],
+                tableData: [],
+                sendCounts: 0,
+                unqualifiedCounts:0,
+                qualifiedCounts:0,
+                inspectionCounts:0,
+                sendCountSupport: 0,
+                inspectionCountSupport:0,
+                qualifiedCountSupport:0,
+                unqualifiedCountSupport:0,
+                chooseMaterielVisible:false,
+                config: config,
+                depOptions:[],
+
+                columnSetDialogVisible: false,
+                columnSetDialogTitle: "设置显示字段列表",
+                tableId: 'quality_productInspection_table',
+                pictLoading: false,
+                //默认列表数据
+                showTableColumnsDefault: [
+                    {title: "单据编号", prop_: "inspectionNo", select: true},
+                    {title: "日期", prop_: "createTime", select: true},
+                    {title: "产品代码", prop_: "materialSerialNo", select: true},
+                    {title: "产品名称", prop_: "materialName", select: true},
+                    {title: "规格型号", prop_: "specification", select: false},
+                    {title: "计量单位", prop_: "unitUomName", select: true},
+                    {title: "批号", prop_: "batchNo", select: false},
+                    {title: "生产部门", prop_: "deptName", select: true},
+                    {title: "报检数量(主单位)", prop_: "sendCount", select: true},
+                    {title: "检验数量(主单位)", prop_: "inspectionCount", select: true},
+                    {title: "合格数量(主单位)", prop_: "qualifiedCount", select: true},
+                    {title: "不合格数量(主单位)", prop_: "unqualifiedCount", select: true},
+                    {title: "辅助单位", prop_: "supportUomName", select: false},
+                    {title: "报检数量(辅单位)", prop_: "sendCountSupport", select: false},
+                    {title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: false},
+                    {title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: false},
+                    {title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: false},
+                    {title: "备注", prop_: "remarks", select: false},
+                    {title: "制单人", prop_: "createrName", select: false},
+                    {title: "审核人", prop_: "auditorName", select: false},
+                    {title: "源单类型", prop_: "sourceTypeName", select: true},
+                    {title: "源单单号", prop_: "sourceNo", select: true},
+                    {title: "单据状态", prop_: "statusName", select: false},
+                ],
+                ///弹出页面列表数据
+                showTableColumns: [
+                    {title: "单据编号", prop_: "inspectionNo", select: true},
+                    {title: "日期", prop_: "createTime", select: true},
+                    {title: "产品代码", prop_: "materialSerialNo", select: true},
+                    {title: "产品名称", prop_: "materialName", select: true},
+                    {title: "规格型号", prop_: "specification", select: false},
+                    {title: "计量单位", prop_: "unitUomName", select: true},
+                    {title: "批号", prop_: "batchNo", select: false},
+                    {title: "生产部门", prop_: "deptName", select: true},
+                    {title: "报检数量(主单位)", prop_: "sendCount", select: true},
+                    {title: "检验数量(主单位)", prop_: "inspectionCount", select: true},
+                    {title: "合格数量(主单位)", prop_: "qualifiedCount", select: true},
+                    {title: "不合格数量(主单位)", prop_: "unqualifiedCount", select: true},
+                    {title: "辅助单位", prop_: "supportUomName", select: false},
+                    {title: "报检数量(辅单位)", prop_: "sendCountSupport", select: false},
+                    {title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: false},
+                    {title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: false},
+                    {title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: false},
+                    {title: "备注", prop_: "remarks", select: false},
+                    {title: "制单人", prop_: "createrName", select: false},
+                    {title: "审核人", prop_: "auditorName", select: false},
+                    {title: "源单类型", prop_: "sourceTypeName", select: true},
+                    {title: "源单单号", prop_: "sourceNo", select: true},
+                    {title: "单据状态", prop_: "statusName", select: false},
+                ],
+                showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
+                //显示的列表字段
+                formTableData: [],
+            };
+        },
+        created() {
+            this.initData();
+            this.getList();
+          var _this = this;
+          document.onkeydown = e => {
+            if (e.key === "Enter") {
+              _this.search()
+            }
+          }
+        },
+        mounted() {
+          this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+            this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+            this.getShowColumns();
+        },
+        methods: {
+          //设置显示字段
+            showColumnSetDialog() {
+                this.columnSetDialogVisible = true;
+                this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+            },
+            //前移
+            toUp(scope) {
+                if (scope.$index == 0) {
+                return false;
+                }
+                let n;
+                for (let i = 0; i < this.showTableColumns.length; i++) {
+                if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+                    n = i;
+                }
+                }
+                let temp = this.showTableColumns[n];
+                this.showTableColumns[n] = this.showTableColumns[n - 1];
+                this.showTableColumns[n - 1] = temp;
+                this.$forceUpdate();
+            },
+            //后移
+            toDown(scope) {
+                if (scope.$index == this.showTableColumns.length - 1) {
+                return false;
+                }
+                let n;
+                for (let i = 0; i < this.showTableColumns.length; i++) {
+                if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+                    n = i;
+                }
+                }
+                let temp = this.showTableColumns[n];
+                this.showTableColumns[n] = this.showTableColumns[n + 1];
+                this.showTableColumns[n + 1] = temp;
+                this.$forceUpdate();
+            },
+            //恢复默认
+            toDefault() {
+                this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+                this.$forceUpdate();
+            },
+            //完成列表字段设置
+            saveAndCloseColumnSetDialog() {
+                let tableNo = this.tableId;
+                let tableColumns = JSON.stringify(this.showTableColumns);
+                this.columnSetDialogVisible = false;
+                this.$api.tableColumnAPI
+                .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
+                .then(res => {
+                    let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+                    this.formTableData = [];
+                    for (let i = 0; i < arr.length; i++) {
+                        if (arr[i].select) {
+                            this.formTableData.push(arr[i]);
+                        }
+                    }
+                })
+                .catch(r => {
+                    console.log(r);
+                });
+            },
+            //关闭字段设置弹出
+            handleClose() {
+                this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
+                this.columnSetDialogVisible = false;
+
+            },
+            /**
+             * 获取显示字段
+             */
+            getShowColumns() {
+                let tableNo = this.tableId;
+                this.formTableData = [];
+
+                this.$api.tableColumnAPI
+                .getShowColumns({tableNo:tableNo})
+                .then(res => {
+                    if(res.code==0){
+                    if(res.results){
+                        this.showTableColumns = JSON.parse(res.results);
+                        let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+                        for (let i = 0; i < arr.length; i++) {
+                        if (arr[i].select) {
+                            this.formTableData.push(arr[i]);
+                        }
+                        }
+                        this.$forceUpdate();
+                    }else{
+                        let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+                        for (let i = 0; i < arr.length; i++) {
+                        if (arr[i].select) {
+                            this.formTableData.push(arr[i]);
+                        }
+                        }
+                        this.$forceUpdate();
+                    }
+                    }else{
+                    this.$message({
+                        message: res.msg ? res.msg : "获取列表信息失败",
+                        type: "error"
+                    });
+                    }
+
+                })
+                .catch(r => {
+                    this.$message({
+                    message: r,
+                    type: "error"
+                    });
+                    console.log(r);
+                });
+            },
+
+
+          /**
+           * 查看源单明细
+           */
+          viewDetail(r) {
+              let queryId = r.queryId
+            this.$router.push({ path: '/planManagement/production_add', query: {id:queryId,t: Date.now() } })
+          },
+            /**
+             * 计算合计
+             */
+            getSummaries(param) {
+              const { columns, data } = param;
+              const sums = [];
+              columns.forEach((column, index) => {
+                if (index === 0) {
+                  sums[index] = '总价';
+                  return;
+                }
+                console.log(column.property)
+                const values = data.map(item => Number(item[column.property]));
+                if (!values.every(value => isNaN(value))) {
+                  switch (column.property) {
+                    case 'sendCount':
+                      sums[index] = this.sendCounts;
+                      break;
+                    case 'inspectionCount':
+                      sums[index] = this.inspectionCounts;
+                      break;
+                    case 'qualifiedCount':
+                      sums[index] = this.qualifiedCounts;
+                      break;
+                    case 'unqualifiedCount':
+                      sums[index] = this.unqualifiedCounts;
+                      break;
+                    case 'sendCountSupport':
+                      sums[index] = this.sendCountSupport;
+                      break;
+                    case 'inspectionCountSupport':
+                      sums[index] = this.inspectionCountSupport;
+                      break;
+                    case 'qualifiedCountSupport':
+                      sums[index] = this.qualifiedCountSupport;
+                      break;
+                    case 'unqualifiedCountSupport':
+                      sums[index] = this.unqualifiedCountSupport;
+                      break;
+                    default:
+                  }
+                } else {
+                  sums[index] = '';
+                }
+              });
+              return sums;
+            },
+
+          sortChange({ column, prop, order }){
+            let j={ column, prop, order };
+            let order_=j.order=="ascending"?'asc':'desc'
+            this.$set(this.search_data,'sort',j.prop)
+            this.$set(this.search_data,'order',order_)
+            this.getList();
+          },
+            //根据当前id,获取一条树枝上的所有id数据
+            treeFindPath (tree, func, path = []) {
+                if (!tree) return []
+                for (const data of tree) {
+                    path.push(data.id)
+                    if (func(data)) return path
+                    if (data.children) {
+                        const findChildren = this.treeFindPath(data.children, func, path)
+                        if (findChildren.length) return findChildren
+                    }
+                    path.pop()
+                }
+                return []
+            },
+          initData(){
+            Promise.all([
+              this.$api.commonAPI.getDeptsTree(),
+            ])
+              .then(([r1]) => {
+                //使用部门
+                if (r1.code === 0) {
+                  this.depOptions=r1.data.children;
+                  this.setDefaultDept();
+                  this.setDeptList(this.depOptions);
+                }
+              })
+              .catch(error => {
+                console.log(error);
+              });
+          },
+            //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
+      setDeptList(tree){
+          for (const data of tree) {
+              if(!data.hasChildren){
+                  data.children=undefined;
+              }else{
+                  this.setDeptList(data.children)
+              }
+          }
+
+      },
+          clickRow(row) {
+            this.$router.push({
+              path: "/quality/addProductInspection",
+              query: { id: row.id, t: Date.now() }
+            });
+          },
+          //显示默认部门
+          setDefaultDept(){
+            if(this.depOptions.length>0&&this.search_data.deptId){
+              let id=JSON.stringify( this.search_data.deptId)
+              let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
+              this.selectDeptId=JSON.parse(JSON.stringify(select_id))
+            }
+          },
+          handleChange:function(value){
+            // console.log(value)
+            this.search_data.deptId=value.length>0?value[value.length-1]:'';
+            this.selectDeptId=value;
+          },
+          /**
+           * 获取选择的客户
+           */
+          getClient(val){
+            if (val) {
+              this.$set(this.search_data,'clientName',val.client_name)
+              // this.$set(this.search_data,'clientId',val.id)
+            }else{
+              this.$set(this.search_data,'clientName',"")
+              // this.$set(this.search_data,'clientId',"")
+            }
+
+          },
+          /**
+           * 获取选择的产品
+           */
+          getPart(val) {
+            if (val) {
+              this.$set(this.search_data,'serialNo',val.serialNo)
+            }else{
+              this.$set(this.search_data,'materielName',"")
+            }
+          },
+
+            /**
+             * 获取列表
+             */
+            getList() {
+                this.pictLoading = true;
+                this.search_data.inspectionType=217;
+                if (this.search_data.time) {
+                    this.search_data.startTime = formatDateTime(this.search_data.time[0]);
+                    this.search_data.endTime = formatDateTime(this.search_data.time[1]);
+                } else {
+                    this.search_data.startTime = "";
+                    this.search_data.endTime = "";
+                }
+                this.$api.inspectionAPI
+                    .inspectionList(this.search_data)
+                    .then(res => {
+                        this.pictLoading = false;
+                        if (res.data) {
+                          this.sendCounts = res.count.sendCounts
+                            this.unqualifiedCounts = res.count.unqualifiedCounts
+                            this.qualifiedCounts = res.count.qualifiedCounts
+                            this.inspectionCounts = res.count.inspectionCounts
+
+                            this.sendCountSupport = res.count.sendCountSupport
+                            this.inspectionCountSupport = res.count.inspectionCountSupport
+                            this.qualifiedCountSupport = res.count.qualifiedCountSupport
+                            this.unqualifiedCountSupport = res.count.unqualifiedCountSupport
+
+                            this.total = res.data.totalRows;
+                            this.tableData = res.data.datas ? res.data.datas : [];
+                            this.tableData.forEach(item => {
+                              item.createTime = item.createTime.substr(0,10)
+                            })
+                        } else {
+                            this.total = 0;
+                            this.tableData = [];
+                        }
+                    })
+                    .catch(r => {
+                        this.pictLoading = false;
+                    });
+            },
+            /**
+             * 查询
+             */
+            search() {
+                this.search_data.pageno = 1;
+                this.getList();
+            },
+            // 上下分页
+            handleCurrentChange(val) {
+                this.search_data.pageno = val;
+                this.getList();
+            },
+            // 每页显示多少条
+            handleSizeChange(val) {
+                this.search_data.pagesize = val;
+                this.getList();
+            },
+          // 跳转到添加页面
+          gotoAdd() {
+            this.$router.push({
+                path: "/quality/addProductInspection",
+                query: {
+                  t: Date.now()
+                }
+            }
+            )
+
+          },
+
+            /**
+             * 删除
+             */
+            remove() {
+                let ids = [];
+                this.rowIds.forEach(item => {
+                    ids.push(item.id);
+                });
+                // const ids = this.rowIds.map(item => item.id).toString();
+                let params = { ids: ids };
+                this.$confirm("确认删除选中的产品检验单吗?", "提示", {
+                    type: "warning"
+                }).then(() => {
+                    this.$api.inspectionAPI
+                        .removeBatch({ids:ids})
+                        .then(res => {
+                            if (res.code === 0) {
+                                this.$message({
+                                    message: res.msg,
+                                    type: "success"
+                                });
+                                this.getList();
+                            } else {
+                                this.$message({
+                                    message: res.msg ? res.msg : "删除失败，请重试",
+                                    type: "error"
+                                });
+                            }
+                        })
+                        .catch(error => {
+                            this.$message({
+                                message: "删除失败，请重试",
+                                type: "error"
+                            });
+                        });
+                });
+            },
+
+          audit() {
+            let id = this.rowIds[0].id;
+            this.$api.inspectionAPI
+              .audit({id: id})
+              .then(res => {
+                if(res.code === 0) {
+                  this.$message({
+                    message: res.msg,
+                    type: "success"
+                  })
+                  this.getList();
+                } else {
+                  this.$message({
+                    message: res.msg,
+                    type: "error"
+                  })
+                }
+              })
+          },
+
+          /**
+           * 反审核
+           */
+          reverseAudit() {
+            let id = this.rowIds[0].id;
+            this.$api.inspectionAPI
+              .reverseAudit({id: id})
+              .then(res => {
+                if(res.code === 0) {
+                  this.$message({
+                    message: res.msg,
+                    type: "success"
+                  })
+                  this.getList();
+                } else {
+                  this.$message({
+                    message: res.msg,
+                    type: "error"
+                  })
+                }
+              })
+          },
+            /**
+           * 生成二维码
+           */
+        qrCode(){
+            let row = this.rowIds[0];
+            if(row.qualifiedCount<=0){
+                this.$message({
+                            message:"合格数量小于0",
+                            type: "error"
+                        });
+                        return
+            }
+            let params={
+                    isPrintedQrcode:row.isPrintedQrcode?row.isPrintedQrcode:0,
+                    unitCount:row.unitCodeCount?row.unitCodeCount:'',
+                     inspectionId:row.id,
+                    inspectionNo:row.inspectionNo,
+                    materielNo:row.materialSerialNo,
+                      batchNo:row.batchNo,
+                    qualifiedCount:row.qualifiedCountSupport,//取合格数量(辅单位)
+                    supportUom:row.supportUom,
+                    supportUomName:row.supportUomName//辅助单位
+            }
+          this.$router.push({
+                        path: "/quality/productInspection_qrcode",
+                        name: 'productInspection_qrcode',
+                        query: {
+                          t: Date.now()
+                        },
+                         params: params
+                    }
+                    )
+        },
+
+            /**
+             * 处理选中
+             */
+            handleSelectionChange(val) {
+                this.rowIds = val;
+                this.setBtn(val);
+            },
+            /**
+             * 控件操作按钮状态
+             */
+            setBtn(val) {
+                let isFlag = true;
+                let isDelFlag = true;
+                if (val.length > 0) {
+                    isDelFlag = false;
+                    if (val.length == 1) {
+                        isFlag = false;
+                    }
+                } else {
+                    isFlag = true;
+                    isDelFlag = true;
+                }
+                this.btnDelDisabled = isDelFlag;
+                this.btnOtherDisabled = isFlag;
+            }
+        }
+    };
+</script>
+
+<style>
+.el-table__row:hover,
+.el-table__row:hover>td {
+  background-color: #dfedfc !important;
+}
+</style>
diff --git a/src/pages/scm/sales/delivery_note/index.vue b/src/pages/scm/sales/delivery_note/index.vue
index b678ff7..96fa780 100644
--- a/src/pages/scm/sales/delivery_note/index.vue
+++ b/src/pages/scm/sales/delivery_note/index.vue
@@ -1,1156 +1,1163 @@
-<template>
-  <div class="sys-box approve-box">
-    <div class="sys-tabs">
-      <el-tabs v-model="activeName">
-        <el-tab-pane label="我发起的" name="first">
-          <mineTabPage :disableBtn="false"
-                       :formTableData="formTableData"
-                       :searchParamElement="searchParamElement"
-                       :tableData="tableData"
-                       :listQuery="search_data"
-                       :total="total"
-                       :pictLoading="pictLoading"
-                       :buttons="buttons"
-                       :summary="summary"
-                       :showMoreSearch="true"
-                       @btnClick="btnClick"
-                       @getList="getList"
-                       @search="search"
-                       @moreSearch="moreSearch"
-                       @goLink="gotoDetail"
-                       @goToLink='goToLink'
-                       @handleCurrentChange="handleCurrentChange"
-                       @handleSizeChange="handleSizeChange"
-                       @getSummaries="getSummaries"
-                       @handleSelectionChange="handleSelectionChange"
-          ></mineTabPage>
-        </el-tab-pane>
-        <el-tab-pane label="我的审批" name="second">
-          <span slot="label">
-            <el-badge class="item" :value="approveTotal">我审批的</el-badge>
-          </span>
-          <auditTabPage :formTableData="showAuditColumnsDefault"
-                        :searchParamElement="searchApproveParamElement"
-                        :tableData="auditTableData"
-                        :listTitle="'销售订单审批'"
-                        :listQuery="approveListQuery"
-                        :total="approveTotal"
-                        :pictLoading="pictLoading"
-                        :buttons="buttons"
-                        @btnClick="btnClick"
-                        @getList="searchApproveList"
-                        @search="searchApproveList"
-                        @moreSearch="moreSearch"
-                        @gotoDetail="gotoApproveDetail"
-                        @handleCurrentChange="handleApproveCurrentChange"
-                        @handleSizeChange="handleApproveSizeChange"
-                        @handleSelectionChange="handleSelectionChange"
-          ></auditTabPage>
-        </el-tab-pane>
-        <el-tab-pane label="已审批的" name="fourth">
-          <approvedPage :disableBtn="false"
-                        :formTableData="formTableData"
-                        :searchParamElement="searchParamElement"
-                        :tableData="tableData"
-                        :listQuery="search_data4"
-                        :total="total"
-                        :pictLoading="pictLoading"
-                        :buttons="approvedButton"
-                        :summary="summary"
-                        :showMoreSearch="true"
-                        @btnClick="btnClick"
-                        @getList="getList"
-                        @search="search"
-                        @moreSearch="moreSearch"
-                        @goLink="gotoDetail"
-                        @goToLink='goToLink'
-                        @handleCurrentChange="handleCurrentChange"
-                        @handleSizeChange="handleSizeChange"
-                        @handleSelectionChange="handleSelectionChange">
-          </approvedPage>
-        </el-tab-pane>
-        <el-tab-pane label="我的团队" name="third">
-          <listTabPage :disableBtn="false"
-                       :formTableData="formTableData"
-                       :searchParamElement="searchParamElement"
-                       :tableData="tableData"
-                       :listQuery="search_data2"
-                       :total="total"
-                       :pictLoading="pictLoading"
-                       :buttons="otherButton"
-                       :summary="summary"
-                       :showMoreSearch="true"
-                       @btnClick="btnClick"
-                       @getList="getList"
-                       @search="search"
-                       @moreSearch="moreSearch"
-                       @goLink="gotoDetail"
-                       @goToLink='goToLink'
-                       @handleCurrentChange="handleCurrentChange"
-                       @handleSizeChange="handleSizeChange"
-                       @handleSelectionChange="handleSelectionChange">
-          </listTabPage>
-        </el-tab-pane>
-        <el-tab-pane label="所有列表" name="end" v-if="isExist('sales:deliveryNote:allList')">
-          <listTabPage :disableBtn="false"
-                       :formTableData="formTableData"
-                       :searchParamElement="searchParamElement"
-                       :tableData="tableData"
-                       :listQuery="search_data3"
-                       :total="total"
-                       :pictLoading="pictLoading"
-                       :buttons="allListButton"
-                       :summary="summary"
-                       :showMoreSearch="true"
-                       @btnClick="btnClick"
-                       @getList="getList"
-                       @search="search"
-                       @moreSearch="moreSearch"
-                       @goLink="gotoDetail"
-                       @goToLink='goToLink'
-                       @handleCurrentChange="handleCurrentChange"
-                       @handleSizeChange="handleSizeChange"
-                       @handleSelectionChange="handleSelectionChange">
-          </listTabPage>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
-               :before-close="handleClose">
-      <el-table border
-                :data="showTableColumns"
-                :key="Math.random()"
-                max-height="350"
-                style="width: 100%">
-        <el-table-column
-          prop="title"
-          label="列表名称"
-          width="180" fixed>
-        </el-table-column>
-        <el-table-column
-          prop="select"
-          label="是否显示"
-          width="180">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作"
-        >
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-
-    <!-- 高级查询对话框 -->
-    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
-      <el-form :inline="true"
-               v-loading="dialogLoading"
-               label-width="80px"
-               class="dialog-form"
-               ref="form" style="width: 620px"
-      >
-        <div class="dialog-line">
-          <el-form-item label="通知时间" class="dialog-form-inline-single">
-            <el-date-picker
-              v-model="formDataTime"
-              type="daterange"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              range-separator="—"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-            ></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="客户名称" class="dialog-form-inline">
-            <el-input placeholder="请输入客户名" v-model="formData.clientName" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="物料名称" class="dialog-form-inline">
-            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel'
-                       :chooseVisible.sync='chooseMaterielVisible'></btn-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="规格型号" class="dialog-form-inline">
-            <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="销售部门" class="dialog-form-inline">
-            <el-cascader
-              v-model="salesPersonDept"
-              clearable
-              :options="depOptions"
-              :props="{ expandTrigger: 'hover',label:'text',value:'id', checkStrictly: true}"
-              @change="handleChange"></el-cascader>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="审核状态" class="dialog-form-inline">
-            <el-select v-model="formData.auditSign" style="width:100%" clearable placeholder="请选择"
-                       @change="changeFacility" value="">
-              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="销售人员" prop="salesPersonName" class="dialog-form-inline">
-            <btn-input :valueText.sync='formData.salesPersonName' :valueId.sync='formData.salesPerson'
-                       :chooseVisible.sync='chooseUserVisible'></btn-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="制单人员" prop="createByName" class="dialog-form-inline">
-            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy'
-                       :chooseVisible.sync='chooseUserVisible1'></btn-input>
-          </el-form-item>
-          <el-form-item label="" prop="" class="dialog-form-inline">
-          </el-form-item>
-        </div>
-
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">确定</el-button>
-        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
-        <el-button type="primary" @click="clear">清空</el-button>
-      </span>
-    </el-dialog>
-
-    <!--选择用户-->
-    <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
-    <!--选择制单人-->
-    <DialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></DialogChooseSingleUser1>
-    <!--选择物料-->
-    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel"></dialogChooseSingleParts>
-  </div>
-</template>
-
-<script>
-import btnInput from "@/components/btnInput.vue";
-import config from "../../../../utils/config.js";
-import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
-import DialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
-import deliveryNoteApi from "../../../../api/deliveryNoteAPI";
-import mineTabPage from "@/components/TabPages/mineTabPage";
-import listTabPage from "@/components/TabPages/listTabPage";
-import auditTabPage from "@/components/TabPages/auditTabPage";
-import approvedPage from "@/components/TabPages/approvedPage";
-
-export default {
-  components: {
-    btnInput,
-    DialogChooseSingleUser,
-    DialogChooseSingleUser1,
-    dialogChooseSingleParts,
-    mineTabPage,
-    listTabPage,
-    auditTabPage,
-    approvedPage
-  },
-  data() {
-    return {
-      total: 0, //总条数
-      approveTotal: 0, //总条数
-      pageSize: [10, 20, 50], //每页展示多少条
-      activeName: "first",
-      search_data: {
-        tabType: 0,
-        page: 1,
-        pageSize: 10,
-      }, search_data1: {
-        tabType: 0,
-        page: 1,
-        pageSize: 10,
-      }, search_data2: {
-        tabType: 1,
-        page: 1,
-        pageSize: 10,
-      }, search_data3: {
-        tabType: 2,
-        page: 1,
-        pageSize: 10,
-      }, search_data4: {
-        tabType: 3,
-        page: 1,
-        pageSize: 10,
-      },
-      approveListQuery: {
-        type: 11,
-        pageno: 1,
-        pagesize: 5
-      },
-      formData: {
-        page: 1,
-        pageSize: 10,
-        deliveryCode: '', //通知单号
-        clientName: '',//客户名称
-        materielName: '',//物料名称
-        startTime: "",
-        endTime: "",
-        specification: '',
-        salesPersonDept: '',
-        auditSign: '',
-        salesPersonName: '',
-        salesPerson: '',
-        deptId: '',
-        createBy: "",//制单人id
-        createByName: ""
-      },
-      auditTableData: [],
-      buttons: [
-        {key: 0, btnName: "新增", vhas: "sales:deliveryNote:add", click: "goAdd", type: "primary", disabled: false},
-        {key: 1, btnName: "删除", vhas: "sales:deliveryNote:remove", click: "remove", type: "primary", disabled: true},
-        {key: 2, btnName: "导出", vhas: "sales:deliveryNote:exportExcel", click: "exportExcel", type: "primary", disabled: false,tabType:0},
-        {key: 3, btnName: "列表配置", click: "showColumnSetDialog", type: "primary", disabled: false}
-      ],
-      otherButton: [
-        {
-          key: 0,
-          btnName: "导出",
-          vhas: "sales:deliveryNote:exportExcel",
-          click: "exportExcel",
-          type: "primary",
-          disabled: false,
-          tabType:1
-        }
-      ],
-      allListButton: [
-        {
-          key: 0,
-          btnName: "导出",
-          vhas: "sales:deliveryNote:exportExcel",
-          click: "exportExcel",
-          type: "primary",
-          disabled: false,
-          tabType:2
-        },
-        // {key: 1, btnName: "删除", vhas: "sales:salesContract:remove", click: "remove", type: "primary", disabled: true}
-      ],
-      approvedButton: [
-        {
-          key: 0,
-          btnName: "导出",
-          vhas: "sales:deliveryNote:exportExcel",
-          click: "exportExcel",
-          type: "primary",
-          disabled: false,
-          tabType:3
-        },
-        // {key: 1, btnName: "删除", vhas: "sales:deliveryNote:remove", click: "remove", type: "primary", disabled: true}
-      ],
-      //默认审批页面列表
-      showAuditColumnsDefault: [
-        // {title: "审批标题", prop_: "title",content:"销售订单审批", select: true},
-        {title: "申请人", prop_: "approveApplicantName", select: true},
-        {title: "申请时间", prop_: "submitTime", select: true},
-        {title: "审批状态", prop_: "approveStatusName", select: true, sortable: true},
-      ],
-      //默认列表数据
-      showTableColumnsDefault: [
-        {title: "通知日期", prop_: "noteTime", select: true},
-        {title: "单据编号", prop_: "deliveryCode", select: true},
-        {title: "客户名称", prop_: "clientName", select: true},
-        {title: "物料代码", prop_: "materielSerialNo", select: true},
-        {title: "物料名称", prop_: "materielName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "主计量单位", prop_: "unitUomName", select: true},
-        {title: "主单位数量", prop_: "deliveryCount", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "发货数量", prop_: "deliveryCountSupport", select: true},
-        {title: "销售单价", prop_: "sellUnitPrice", select: true},
-        {title: "销售金额", prop_: "sellAmount", select: true},
-        {title: "部门", prop_: "deptName", select: true},
-        {title: "销售员", prop_: "salesPersonName", select: true},
-        {title: "审批状态", prop_: "approveStateName", select: true},
-        {title: "源单类型", prop_: "sourceTypeName", select: true},
-        {title: "源单单号", prop_: "sourceCode", select: true}
-      ],
-      ///弹出页面列表数据
-      showTableColumns: [
-        {title: "通知日期", prop_: "noteTime", select: true},
-        {title: "单据编号", prop_: "deliveryCode", select: true},
-        {title: "客户名称", prop_: "clientName", select: true},
-        {title: "物料代码", prop_: "materielSerialNo", select: true},
-        {title: "物料名称", prop_: "materielName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "主计量单位", prop_: "unitUomName", select: true},
-        {title: "主单位数量", prop_: "deliveryCount", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "发货数量", prop_: "deliveryCountSupport", select: true},
-        {title: "销售单价", prop_: "sellUnitPrice", select: true},
-        {title: "销售金额", prop_: "sellAmount", select: true},
-        {title: "部门", prop_: "deptName", select: true},
-        {title: "销售员", prop_: "salesPersonName", select: true},
-        {title: "审批状态", prop_: "approveStateName", select: true},
-        {title: "源单类型", prop_: "sourceTypeName", select: true},
-        {title: "源单单号", prop_: "sourceCode", select: true}
-      ],
-      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
-      //显示的列表字段
-      formTableData: [],
-      searchParamElement: [
-        {key: 0, label: "通知单号", searchType: "inputElement", placeholder: "通知单号", model: "deliveryCode", clearable: true},
-        {key: 1, label: "客户名称", searchType: "inputElement", placeholder: "客户", model: "clientName", clearable: true},
-        {key: 2, label: "物料名称", searchType: "inputElement", placeholder: "物料名称", model: "materielName", clearable: true},
-        {key: 3, label: "通知时间", searchType: "dateElement", placeholder: "请选择时间段", model: "timeArea", clearable: true}
-      ],
-      searchApproveParamElement: [
-        {label: "合同编号", searchType: "inputElement", placeholder: "合同编号", model: "dataCode", clearable: true},
-        {label: "客户", searchType: "inputElement", placeholder: "模糊搜索", model: "clientName", clearable: true},
-        // {label:"物料",searchType:"inputElement",placeholder:"模糊搜索",model: "materielName",clearable:true},
-        {label: "合同日期", searchType: "dateElement", placeholder: "请选择时间段", model: "timeArea", clearable: true}
-      ],
-      summary: {},
-      formDataTime: "",
-      tableData: [],
-      depOptions: [],
-      salesPersonDept: '',
-      options: [],
-      config: config,
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      advanceQueryDialogVisible: false,
-      chooseUserVisible: false,
-      chooseUserVisible1: false,
-      chooseMaterielVisible: false,//物料
-      dialogLoading: false,
-      dialogTitle: "",
-      pictLoading: false,
-      columnSetDialogTitle: "设置显示字段列表",
-      columnSetDialogVisible: false,
-      selectedItems: [],
-      tableId: 'delivery_note_table'
-    }
-  },
-  watch: {
-    formDataTime(val) {
-      if (val) {
-        this.formData.startTime = val[0];
-        this.formData.endTime = val[1];
-      } else {
-        this.formData.startTime = "";
-        this.formData.endTime = "";
-      }
-
-    },
-
-    activeName(val){
-      if(val==="first"){
-        this.search_data=this.search_data1
-        this.getList(0)
-      }else if(val==="second"){
-        // this.search_data.tabType=null
-      }else if(val==="third"){
-        this.search_data=this.search_data2
-        this.getList()
-      }else if(val==="fourth"){
-        this.search_data=this.search_data4
-        this.getList()
-      }else if(val==="end"){
-        this.search_data=this.search_data3
-        this.getList()
-      }
-    },
-  },
-  mounted(){
-    if (this.$route.query.active) {
-      this.activeName = "second";
-    }
-  },
-  created() {
-    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.myApproveList()
-    this.getList(0);
-    this.getShowColumns();
-    this.initData();
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search()
-      }
-    }
-  },
-  methods: {
-    btnClick(val,tabType) {
-      console.log("根据方法名称调用")
-      if (val === "goAdd") {
-        this.goAdd()
-      } else if (val == "showColumnSetDialog") {
-        this.showColumnSetDialog()
-      } else if (val == "remove") {
-        this.remove()
-      } else if (val == "disAudit") {
-        this.disAudit()
-      } else if (val === "exportExcel") {
-        this.exportExcel(tabType)
-      } else if (val === "close") {
-        this.close()
-      } else if (val === "reverseClose") {
-        this.reverseClose()
-      } else if (val === "change") {
-        this.change()
-      } else if (val === "gotoAlterationList") {
-        this.gotoAlterationList()
-      } else if (val === "showColumnSetDialog") {
-        this.showColumnSetDialog()
-      }
-    },
-
-    myApproveList() {
-      this.pictLoading = true;
-      console.log(this.approveListQuery)
-      this.$api.scmApproveAPI.myApproveList(this.approveListQuery).then(res => {
-        this.pictLoading = false
-        if (res.code == 0) {
-          if (res.data && res.data.list) {
-            this.auditTableData = res.data.list;
-            this.approveTotal = res.data.total;
-          } else {
-            this.auditTableData = [];
-            this.approveTotal = 0;
-          }
-          if (this.auditTableData.length) {
-            this.auditTableData.forEach(item => {
-              if (item.approveState == 0) {
-                item.approveStatusName = "暂存"
-              } else if (item.approveState == 1) {
-                item.approveStatusName = "待审批"
-              } else if (item.approveState == 2) {
-                item.approveStatusName = "已驳回"
-              } else if (item.approveState == 3) {
-                item.approveStatusName = "审批通过"
-              }
-              item.summary = [
-                {label: "通知单号", value: item.deliveryCode},
-                {label: "客户", value: item.clientName},
-                {label: "通知日期", value: item.submitTime},
-                {label: "通知总金额", value: item.sellAmount},
-              ]
-            })
-          }
-        }
-      }).catch(r => {
-      })
-    },
-
-    searchApproveList() {
-      this.approveListQuery.pagesize = 5
-      this.approveListQuery.pageno = 1
-      this.myApproveList()
-    },
-    // 返回首页
-    gotoIndex() {
-      this.chooseProVisible = false
-    },
-
-    // 导出
-    exportExcel(val) {
-      delete this.formData.pagesize;
-      delete this.formData.pageno;
-      this.formData.tabType=val
-      deliveryNoteApi
-        .exportExcel(this.formData)
-        .then(res => {
-        })
-    },
-    /**
-     * 反审核
-     */
-    disAudit() {
-      let id = this.selectedItems[0].mainId;
-      this.$confirm("确认反审核选中的项吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        deliveryNoteApi
-          .reverseAudit({id: id})
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg,
-                type: "error"
-              })
-            }
-          })
-      })
-
-    },
-
-    /**
-     * 审核
-     */
-    audit() {
-      let id = this.selectedItems[0].mainId;
-      this.$confirm("确认审核选中的项吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        deliveryNoteApi
-          .audit({id: id})
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.getList();
-            } else {
-              this.$message({
-                message: res.msg,
-                type: "error"
-              })
-            }
-          })
-      })
-
-    },
-
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-
-    // 跳转到查看页面
-    gotoDetail(row) {
-      this.$router.push({path: "/sales/deliveryNote_add", query: {id: row.mainId, t: Date.now()}})
-    },
-
-    //进入审核页面
-    gotoApproveDetail(row) {
-      this.$router.push({
-        path: "/sales/deliveryNote_add",
-        query: {
-          id: row.mainId,
-          instanceId:row.instanceId,
-          taskId:row.taskId,
-          tabType:this.search_data.tabType,
-          isApprove: true,
-          t: Date.now()
-        }
-      });
-    },
-
-    // 前往新增页面
-    goAdd() {
-      this.$router.push({path: "/sales/deliveryNote_add", query: {t: Date.now()}})
-    },
-
-    // 获取销售订单列表
-    getList() {
-      this.pictLoading = true;
-      deliveryNoteApi
-        .findList(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.list) {
-            //数量金额合计
-            this.summary = res.totalSum;
-            this.total = res.totalRows;
-            this.tableData = res.list;
-            this.tableData.forEach(item => {
-              //格式化日期
-              if (item.noteTime) {
-                item.noteTime = item.noteTime.substring(0, 10);
-                if(item.approveState==0){
-                  item.approveStatusName = "暂存"
-                } else if(item.approveState==1){
-                  item.approveStatusName = "待审批"
-                }else if(item.approveState==2){
-                  item.approveStatusName = "已驳回"
-                }else if(item.approveState==3){
-                  item.approveStatusName = "审批通过"
-                }
-              }
-            })
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        }).catch(r => {
-        console.log(r);
-      });
-    },
-
-    //设置显示字段
-    showColumnSetDialog() {
-      this.columnSetDialogVisible = true;
-      this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    },
-    //前移
-    toUp(scope) {
-      if (scope.$index === 0) {
-        return false;
-      }
-      let n;
-      for (let i = 0; i < this.showTableColumns.length; i++) {
-        if (this.showTableColumns[i].prop_ === scope.row.prop_) {
-          n = i;
-        }
-      }
-      let temp = this.showTableColumns[n];
-      this.showTableColumns[n] = this.showTableColumns[n - 1];
-      this.showTableColumns[n - 1] = temp;
-      this.$forceUpdate();
-    },
-    //后移
-    toDown(scope) {
-      if (scope.$index === this.showTableColumns.length - 1) {
-        return false;
-      }
-      let n;
-      for (let i = 0; i < this.showTableColumns.length; i++) {
-        if (this.showTableColumns[i].prop_ === scope.row.prop_) {
-          n = i;
-        }
-      }
-      let temp = this.showTableColumns[n];
-      this.showTableColumns[n] = this.showTableColumns[n + 1];
-      this.showTableColumns[n + 1] = temp;
-      this.$forceUpdate();
-    },
-    //恢复默认
-    toDefault() {
-      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-      this.$forceUpdate();
-    },
-    //完成列表字段设置
-    saveAndCloseColumnSetDialog() {
-      let tableNo = this.tableId;
-      let tableColumns = JSON.stringify(this.showTableColumns);
-      this.columnSetDialogVisible = false;
-      this.$api.tableColumnAPI
-        .saveShowColumns({tableNo: tableNo, tableColumns: tableColumns})
-        .then(res => {
-          let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-          this.formTableData = [];
-          for (let i = 0; i < arr.length; i++) {
-            if (arr[i].select) {
-              this.formTableData.push(arr[i]);
-            }
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    //关闭字段设置弹出
-    handleClose() {
-      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
-      this.columnSetDialogVisible = false;
-
-    },
-    /**
-     * 获取显示字段
-     */
-    getShowColumns() {
-      let tableNo = this.tableId;
-      this.formTableData = [];
-
-      this.$api.tableColumnAPI
-        .getShowColumns({tableNo: tableNo})
-        .then(res => {
-          if (res.code === 0) {
-            if (res.results) {
-              this.showTableColumns = JSON.parse(res.results);
-              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-              for (let i = 0; i < arr.length; i++) {
-                if (arr[i].select) {
-                  this.formTableData.push(arr[i]);
-                }
-              }
-              this.$forceUpdate();
-            } else {
-              let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-              for (let i = 0; i < arr.length; i++) {
-                if (arr[i].select) {
-                  this.formTableData.push(arr[i]);
-                }
-              }
-              this.$forceUpdate();
-            }
-          } else {
-            this.$message({
-              message: res.msg ? res.msg : "获取列表信息失败",
-              type: "error"
-            });
-          }
-          console.log(this.formTableData)
-
-        })
-        .catch(r => {
-          this.$message({
-            message: r,
-            type: "error"
-          });
-          console.log(r);
-        });
-    },
-
-    // 查询
-    search() {
-      this.formData.page = 1;
-      this.formData.pageSize = 10;
-      this.getList();
-    },
-
-    /**
-     * 高级查询
-     */
-    moreSearch() {
-      this.advanceQueryDialogVisible = true;
-      this.dialogTitle = "高级查询";
-    },
-    save() {
-      for (var n in this.formData) {
-        this.formData[n] = this.formData[n];
-      }
-      this.formData.inDatas = "";
-      this.time = this.formDataTime;
-      this.formData.page = 1;
-      this.$nextTick(function () {
-        this.advanceQueryDialogVisible = false;
-        this.getList();
-      })
-    },
-    //清空
-    clear() {
-      this.formData.startTime = "";
-      this.formData.endTime = "";
-      this.formData.specification = "";
-      this.formData.salesPersonDept = "";
-      this.formData.auditSign = "";
-      this.formData.materielName = "";//物料名称
-      this.formData.salesPersonName = "";
-      this.formData.salesPerson = "";
-      this.formData.deptId = "";
-      this.formData.createBy = "";
-      this.formData.createByName = "";
-      this.formDataTime = "";
-      this.salesPersonDept = "";
-    },
-    changeFacility() {
-      this.$forceUpdate();
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pageSize = val;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.page = val;
-      this.getList();
-    },
-
-    // 每页显示多少条
-    handleApproveSizeChange(val) {
-      this.approveListQuery.pagesize = val;
-      this.myApproveList();
-    },
-    // 上下分页
-    handleApproveCurrentChange(val) {
-      this.approveListQuery.pageno = val;
-      this.myApproveList();
-    },
-
-    // 所有列表展示
-    isExist(val){
-      let isExist = false
-      // 从浏览器缓存中获取权限数组
-      var buttonpermsStr = localStorage.getItem('btnContext');
-      if (buttonpermsStr === undefined || buttonpermsStr == null) {
-        return false
-      } else {
-        JSON.parse(buttonpermsStr).forEach(element => {
-          //匹配缓存中的数据中有没有匹配的值
-          if (element == val) {
-            // 若在按钮中定义的权限字段能在后端返回的权限数组中能找到，则该按钮可显示
-            isExist = true
-          }
-        });
-      }
-      return isExist
-    },
-
-    /**
-     * 初始化
-     */
-    initData() {
-      // 获取审核状态
-      this.$api.salesAPI
-        .listAauditSign({
-          type: "audit_status",
-        })
-        .then(res => {
-          this.options = res.datas
-        });
-      // 获取生产部门
-      Promise.all([this.$api.commonAPI.getDeptsTree(), this.$api.roleAPI.list()])
-        .then(([r1, r2]) => {
-          if (r1.code === 0) {
-            this.depOptions = r1.data.children;
-            // this.setDefaultDept();
-            this.setDeptList(this.depOptions);
-          }
-          if (r2.code === 0) {
-            this.roleList = r2.datas;
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    getMateriel(val) {
-      if (val) {
-        this.$set(this.formData, 'materiel', val.id);
-        this.$set(this.formData, 'materielName', val.name);
-      } else {
-        this.$set(this.formData, 'materiel', "");
-        this.$set(this.formData, 'materielName', "");
-      }
-    },
-
-    /**
-     * 获取用户
-     */
-    getUser(data) {
-      if (data) {
-        this.$set(this.formData, 'salesPersonName', data.name);
-        this.$set(this.formData, 'salesPerson', data.id);
-      }
-    },
-    /**
-     * 获取制单人
-     */
-    getUser1(data) {
-      console.log(data);
-      var self = this;
-      if (data) {
-        this.formData.createByName = data.name;
-        this.formData.createBy = data.id;
-      }
-    },
-    //根据当前id,获取一条树枝上的所有id数据
-    treeFindPath(tree, func, path = []) {
-      if (!tree) return [];
-      for (const data of tree) {
-        path.push(data.id);
-        if (func(data)) return path;
-        if (data.children) {
-          const findChildren = this.treeFindPath(data.children, func, path)
-          if (findChildren.length) return findChildren
-        }
-        path.pop()
-      }
-      return []
-    },
-    //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
-    setDeptList(tree) {
-      for (const data of tree) {
-        if (!data.hasChildren) {
-          data.children = undefined;
-        } else {
-          this.setDeptList(data.children)
-        }
-      }
-    },
-    // 选择部门
-    handleChange: function (value) {
-      this.formData.deptId = value.length >= 1 ? value[value.length - 1] : '';
-      this.salesPersonDept = value;
-    },
-
-
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      console.log(val);
-      this.selectedItems = val;
-      this.setBtn(val);
-    },
-
-    /**
-     * 删除
-     */
-    remove() {
-      let ids = [];
-      this.selectedItems.forEach(item => {
-        ids.push(item.mainId);
-        console.log(ids)
-      });
-      this.$confirm("确认删除选中的项吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        deliveryNoteApi.batchDelete({ids: ids}).then(res => {
-          if (res.code === 0) {
-            this.$message({
-              message: '删除成功！',
-              type: "success"
-            });
-            this.search();
-          } else {
-            this.$message({
-              message: res.msg ? res.msg : "删除失败，请重试",
-              type: "error"
-            });
-          }
-        }).catch(error => {
-          this.$message({
-            message: "删除失败，请重试",
-            type: "error"
-          });
-        });
-      });
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        // 将删除的按钮状态改成可选
-        this.buttons[1].disabled=false
-        // this.allListButton[1].disabled=false
-        // this.approvedButton[1].disabled=false
-        if (val.length === 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnOtherDisabled = isDelFlag;
-      this.btnDelDisabled = isFlag;
-    },
-    // 合计
-    getSummaries(param) {
-      const {columns, data} = param;
-      let sums = [];
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = '合计';
-          return;
-        }
-        if (column.property !== 'deliveryCount' && column.property !== 'deliveryCountSupport' && column.property !== 'sellAmount') {
-          sums[index] = '';
-          return;
-        }
-
-        const values = data.map(item => Number(item[column.property]));
-        if (!values.every(value => isNaN(value))) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0);
-        } else {
-          sums[index] = '';
-        }
-        if (column.property === 'deliveryCount') {
-          if (sums[index]) {
-            sums[index] = this.summary.totalDeliveryCount;
-          }
-          return;
-        }
-        if (column.property === 'deliveryCountSupport') {
-          if (sums[index]) {
-            sums[index] = this.summary.totalDeliveryCountSupport;
-          }
-          return;
-        }
-        if (column.property === 'sellAmount') {
-          if (sums[index]) {
-            sums[index] = this.summary.totalSellAmount;
-          }
-        }
-      });
-
-      return sums;
-    },
-    /**
-     * 查看源单明细
-     */
-    viewDetail(row) {
-      const queryId = row.queryId;
-      if (queryId) {
-        this.$router.push({path: '/sales/salesContract_add', query: {id: queryId, t: Date.now()}})
-      }
-    },
-    // 点击源单单号查看相应源单明细页面
-    goToLink(row){
-      this.$router.push({
-        path: "/sales/salesContract_add",
-        query: {id:row.queryId,t: Date.now()}
-      });
-    },
-  }
-}
-</script>
-
-<style scoped>
-.approve-box .sys-tabs .el-tabs__nav-wrap {
-  padding: 5px 20px 0px;
-}
-.approve-box .sys-tabs .el-tabs__item {
-  padding-top: 10px;
-  height: 50px;
-}
-.approve-box .el-timeline-item__content {
-  line-height: 1.5;
-}
-.approve-box .el-dialog__body {
-  padding-top: 0px;
-}
-</style>
-<style>
-.approve-box .sys-tabs .el-tabs__nav-wrap {
-  padding: 5px 20px 0px;
-}
-.approve-box .sys-tabs .el-tabs__item {
-  padding-top: 10px;
-  height: 50px;
-}
-.approve-box .el-timeline-item__content {
-  line-height: 1.5;
-}
-.approve-box .el-dialog__body {
-  padding-top: 0px;
-}
-.approve-form .el-form-item {
-  margin-bottom: 0px;
-}
-.approve-timeline .el-timeline-item__wrapper {
-  padding-top: 10px;
-  padding-left: 80px;
-}
-.approve-timeline .el-timeline-item__tail {
-  left: 30px;
-  border-left-width: 4px;
-}
-</style>
-
-
-
-
+<template>
+  <div class="sys-box approve-box">
+    <div class="sys-tabs">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="我发起的" name="first">
+          <mineTabPage :disableBtn="false"
+                       :formTableData="formTableData"
+                       :searchParamElement="launchSearch"
+                       :tableData="tableData"
+                       :listQuery="search_data"
+                       :total="total"
+                       :pictLoading="pictLoading"
+                       :buttons="buttons"
+                       :summary="summary"
+                       :showMoreSearch="true"
+                       @btnClick="btnClick"
+                       @getList="getList"
+                       @search="search"
+                       @moreSearch="moreSearch"
+                       @goLink="gotoDetail"
+                       @goToLink='goToLink'
+                       @handleCurrentChange="handleCurrentChange"
+                       @handleSizeChange="handleSizeChange"
+                       @getSummaries="getSummaries"
+                       @handleSelectionChange="handleSelectionChange"
+          ></mineTabPage>
+        </el-tab-pane>
+        <el-tab-pane label="我的审批" name="second">
+          <span slot="label">
+            <el-badge class="item" :value="approveTotal">我审批的</el-badge>
+          </span>
+          <auditTabPage :formTableData="showAuditColumnsDefault"
+                        :searchParamElement="searchApproveParamElement"
+                        :tableData="auditTableData"
+                        :listTitle="'销售订单审批'"
+                        :listQuery="approveListQuery"
+                        :total="approveTotal"
+                        :pictLoading="pictLoading"
+                        :buttons="buttons"
+                        @btnClick="btnClick"
+                        @getList="searchApproveList"
+                        @search="searchApproveList"
+                        @moreSearch="moreSearch"
+                        @gotoDetail="gotoApproveDetail"
+                        @handleCurrentChange="handleApproveCurrentChange"
+                        @handleSizeChange="handleApproveSizeChange"
+                        @handleSelectionChange="handleSelectionChange"
+          ></auditTabPage>
+        </el-tab-pane>
+        <el-tab-pane label="已审批的" name="fourth">
+          <approvedPage :disableBtn="false"
+                        :formTableData="formTableData"
+                        :searchParamElement="searchParamElement"
+                        :tableData="tableData"
+                        :listQuery="search_data4"
+                        :total="total"
+                        :pictLoading="pictLoading"
+                        :buttons="approvedButton"
+                        :summary="summary"
+                        :showMoreSearch="true"
+                        @btnClick="btnClick"
+                        @getList="getList"
+                        @search="search"
+                        @moreSearch="moreSearch"
+                        @goLink="gotoDetail"
+                        @goToLink='goToLink'
+                        @handleCurrentChange="handleCurrentChange"
+                        @handleSizeChange="handleSizeChange"
+                        @handleSelectionChange="handleSelectionChange">
+          </approvedPage>
+        </el-tab-pane>
+        <el-tab-pane label="我的团队" name="third">
+          <listTabPage :disableBtn="false"
+                       :formTableData="formTableData"
+                       :searchParamElement="searchParamElement"
+                       :tableData="tableData"
+                       :listQuery="search_data2"
+                       :total="total"
+                       :pictLoading="pictLoading"
+                       :buttons="otherButton"
+                       :summary="summary"
+                       :showMoreSearch="true"
+                       @btnClick="btnClick"
+                       @getList="getList"
+                       @search="search"
+                       @moreSearch="moreSearch"
+                       @goLink="gotoDetail"
+                       @goToLink='goToLink'
+                       @handleCurrentChange="handleCurrentChange"
+                       @handleSizeChange="handleSizeChange"
+                       @handleSelectionChange="handleSelectionChange">
+          </listTabPage>
+        </el-tab-pane>
+        <el-tab-pane label="所有列表" name="end" v-if="isExist('sales:deliveryNote:allList')">
+          <listTabPage :disableBtn="false"
+                       :formTableData="formTableData"
+                       :searchParamElement="searchParamElement"
+                       :tableData="tableData"
+                       :listQuery="search_data3"
+                       :total="total"
+                       :pictLoading="pictLoading"
+                       :buttons="allListButton"
+                       :summary="summary"
+                       :showMoreSearch="true"
+                       @btnClick="btnClick"
+                       @getList="getList"
+                       @search="search"
+                       @moreSearch="moreSearch"
+                       @goLink="gotoDetail"
+                       @goToLink='goToLink'
+                       @handleCurrentChange="handleCurrentChange"
+                       @handleSizeChange="handleSizeChange"
+                       @handleSelectionChange="handleSelectionChange">
+          </listTabPage>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
+               :before-close="handleClose">
+      <el-table border
+                :data="showTableColumns"
+                :key="Math.random()"
+                max-height="350"
+                style="width: 100%">
+        <el-table-column
+          prop="title"
+          label="列表名称"
+          width="180" fixed>
+        </el-table-column>
+        <el-table-column
+          prop="select"
+          label="是否显示"
+          width="180">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+
+    <!-- 高级查询对话框 -->
+    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
+      <el-form :inline="true"
+               v-loading="dialogLoading"
+               label-width="80px"
+               class="dialog-form"
+               ref="form" style="width: 620px"
+      >
+        <div class="dialog-line">
+          <el-form-item label="通知时间" class="dialog-form-inline-single">
+            <el-date-picker
+              v-model="formDataTime"
+              type="daterange"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              range-separator="—"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="客户名称" class="dialog-form-inline">
+            <el-input placeholder="请输入客户名" v-model="formData.clientName" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="物料名称" class="dialog-form-inline">
+            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel'
+                       :chooseVisible.sync='chooseMaterielVisible'></btn-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="规格型号" class="dialog-form-inline">
+            <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="销售部门" class="dialog-form-inline">
+            <el-cascader
+              v-model="salesPersonDept"
+              clearable
+              :options="depOptions"
+              :props="{ expandTrigger: 'hover',label:'text',value:'id', checkStrictly: true}"
+              @change="handleChange"></el-cascader>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="审核状态" class="dialog-form-inline">
+            <el-select v-model="formData.auditSign" style="width:100%" clearable placeholder="请选择"
+                       @change="changeFacility" value="">
+              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="销售人员" prop="salesPersonName" class="dialog-form-inline">
+            <btn-input :valueText.sync='formData.salesPersonName' :valueId.sync='formData.salesPerson'
+                       :chooseVisible.sync='chooseUserVisible'></btn-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="制单人员" prop="createByName" class="dialog-form-inline">
+            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy'
+                       :chooseVisible.sync='chooseUserVisible1'></btn-input>
+          </el-form-item>
+          <el-form-item label="" prop="" class="dialog-form-inline">
+          </el-form-item>
+        </div>
+
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">确定</el-button>
+        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="clear">清空</el-button>
+      </span>
+    </el-dialog>
+
+    <!--选择用户-->
+    <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
+    <!--选择制单人-->
+    <DialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></DialogChooseSingleUser1>
+    <!--选择物料-->
+    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel"></dialogChooseSingleParts>
+  </div>
+</template>
+
+<script>
+import btnInput from "@/components/btnInput.vue";
+import config from "../../../../utils/config.js";
+import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
+import DialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
+import deliveryNoteApi from "../../../../api/deliveryNoteAPI";
+import mineTabPage from "@/components/TabPages/mineTabPage";
+import listTabPage from "@/components/TabPages/listTabPage";
+import auditTabPage from "@/components/TabPages/auditTabPage";
+import approvedPage from "@/components/TabPages/approvedPage";
+
+export default {
+  components: {
+    btnInput,
+    DialogChooseSingleUser,
+    DialogChooseSingleUser1,
+    dialogChooseSingleParts,
+    mineTabPage,
+    listTabPage,
+    auditTabPage,
+    approvedPage
+  },
+  data() {
+    return {
+      total: 0, //总条数
+      approveTotal: 0, //总条数
+      pageSize: [10, 20, 50], //每页展示多少条
+      activeName: "first",
+      search_data: {
+        tabType: 0,
+        page: 1,
+        pageSize: 10,
+      }, search_data1: {
+        tabType: 0,
+        page: 1,
+        pageSize: 10,
+      }, search_data2: {
+        tabType: 1,
+        page: 1,
+        pageSize: 10,
+      }, search_data3: {
+        tabType: 2,
+        page: 1,
+        pageSize: 10,
+      }, search_data4: {
+        tabType: 3,
+        page: 1,
+        pageSize: 10,
+      },
+      approveListQuery: {
+        type: 11,
+        pageno: 1,
+        pagesize: 5
+      },
+      formData: {
+        page: 1,
+        pageSize: 10,
+        deliveryCode: '', //通知单号
+        clientName: '',//客户名称
+        materielName: '',//物料名称
+        startTime: "",
+        endTime: "",
+        specification: '',
+        salesPersonDept: '',
+        auditSign: '',
+        salesPersonName: '',
+        salesPerson: '',
+        deptId: '',
+        createBy: "",//制单人id
+        createByName: ""
+      },
+      auditTableData: [],
+      buttons: [
+        {key: 0, btnName: "新增", vhas: "sales:deliveryNote:add", click: "goAdd", type: "primary", disabled: false},
+        {key: 1, btnName: "删除", vhas: "sales:deliveryNote:remove", click: "remove", type: "primary", disabled: true},
+        {key: 2, btnName: "导出", vhas: "sales:deliveryNote:exportExcel", click: "exportExcel", type: "primary", disabled: false,tabType:0},
+        {key: 3, btnName: "列表配置", click: "showColumnSetDialog", type: "primary", disabled: false}
+      ],
+      otherButton: [
+        {
+          key: 0,
+          btnName: "导出",
+          vhas: "sales:deliveryNote:exportExcel",
+          click: "exportExcel",
+          type: "primary",
+          disabled: false,
+          tabType:1
+        }
+      ],
+      allListButton: [
+        {
+          key: 0,
+          btnName: "导出",
+          vhas: "sales:deliveryNote:exportExcel",
+          click: "exportExcel",
+          type: "primary",
+          disabled: false,
+          tabType:2
+        },
+        // {key: 1, btnName: "删除", vhas: "sales:salesContract:remove", click: "remove", type: "primary", disabled: true}
+      ],
+      approvedButton: [
+        {
+          key: 0,
+          btnName: "导出",
+          vhas: "sales:deliveryNote:exportExcel",
+          click: "exportExcel",
+          type: "primary",
+          disabled: false,
+          tabType:3
+        },
+        // {key: 1, btnName: "删除", vhas: "sales:deliveryNote:remove", click: "remove", type: "primary", disabled: true}
+      ],
+      //默认审批页面列表
+      showAuditColumnsDefault: [
+        // {title: "审批标题", prop_: "title",content:"销售订单审批", select: true},
+        {title: "申请人", prop_: "approveApplicantName", select: true},
+        {title: "申请时间", prop_: "submitTime", select: true},
+        {title: "审批状态", prop_: "approveStatusName", select: true, sortable: true},
+      ],
+      //默认列表数据
+      showTableColumnsDefault: [
+        {title: "通知日期", prop_: "noteTime", select: true},
+        {title: "单据编号", prop_: "deliveryCode", select: true},
+        {title: "客户名称", prop_: "clientName", select: true},
+        {title: "物料代码", prop_: "materielSerialNo", select: true},
+        {title: "物料名称", prop_: "materielName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "主计量单位", prop_: "unitUomName", select: true},
+        {title: "主单位数量", prop_: "deliveryCount", select: true},
+        {title: "辅助单位", prop_: "supportUomName", select: false},
+        {title: "发货数量", prop_: "deliveryCountSupport", select: false},
+        {title: "销售单价", prop_: "sellUnitPrice", select: false},
+        {title: "销售金额", prop_: "sellAmount", select: false},
+        {title: "部门", prop_: "deptName", select: false},
+        {title: "销售员", prop_: "salesPersonName", select: true},
+        {title: "审批状态", prop_: "approveStateName", select: true},
+        {title: "源单类型", prop_: "sourceTypeName", select: true},
+        {title: "源单单号", prop_: "sourceCode", select: true}
+      ],
+      ///弹出页面列表数据
+      showTableColumns: [
+        {title: "通知日期", prop_: "noteTime", select: true},
+        {title: "单据编号", prop_: "deliveryCode", select: true},
+        {title: "客户名称", prop_: "clientName", select: true},
+        {title: "物料代码", prop_: "materielSerialNo", select: true},
+        {title: "物料名称", prop_: "materielName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "主计量单位", prop_: "unitUomName", select: true},
+        {title: "主单位数量", prop_: "deliveryCount", select: true},
+        {title: "辅助单位", prop_: "supportUomName", select: false},
+        {title: "发货数量", prop_: "deliveryCountSupport", select: false},
+        {title: "销售单价", prop_: "sellUnitPrice", select: false},
+        {title: "销售金额", prop_: "sellAmount", select: false},
+        {title: "部门", prop_: "deptName", select: false},
+        {title: "销售员", prop_: "salesPersonName", select: true},
+        {title: "审批状态", prop_: "approveStateName", select: true},
+        {title: "源单类型", prop_: "sourceTypeName", select: true},
+        {title: "源单单号", prop_: "sourceCode", select: true}
+      ],
+      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
+      //显示的列表字段
+      formTableData: [],
+      searchParamElement: [
+        {key: 0, label: "通知单号", searchType: "inputElement", placeholder: "通知单号", model: "deliveryCode", clearable: true},
+        {key: 1, label: "客户名称", searchType: "inputElement", placeholder: "客户", model: "clientName", clearable: true},
+        {key: 2, label: "物料名称", searchType: "inputElement", placeholder: "物料名称", model: "materielName", clearable: true},
+        {key: 3, label: "通知时间", searchType: "dateElement", placeholder: "请选择时间段", model: "timeArea", clearable: true},
+      ],
+      launchSearch:[
+        {key: 0, label: "通知单号", searchType: "inputElement", placeholder: "通知单号", model: "deliveryCode", clearable: true},
+        {key: 1, label: "客户名称", searchType: "inputElement", placeholder: "客户", model: "clientName", clearable: true},
+        {key: 2, label: "物料名称", searchType: "inputElement", placeholder: "物料名称", model: "materielName", clearable: true},
+        {key: 3, label: "通知时间", searchType: "dateElement", placeholder: "请选择时间段", model: "timeArea", clearable: true},
+        {key: 4, label: "源单单号", searchType: "inputElement", placeholder: "源单单号", model: "sourceNo", clearable: true}
+      ],
+      searchApproveParamElement: [
+        {label: "合同编号", searchType: "inputElement", placeholder: "合同编号", model: "dataCode", clearable: true},
+        {label: "客户", searchType: "inputElement", placeholder: "模糊搜索", model: "clientName", clearable: true},
+        // {label:"物料",searchType:"inputElement",placeholder:"模糊搜索",model: "materielName",clearable:true},
+        {label: "合同日期", searchType: "dateElement", placeholder: "请选择时间段", model: "timeArea", clearable: true}
+      ],
+      summary: {},
+      formDataTime: "",
+      tableData: [],
+      depOptions: [],
+      salesPersonDept: '',
+      options: [],
+      config: config,
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      advanceQueryDialogVisible: false,
+      chooseUserVisible: false,
+      chooseUserVisible1: false,
+      chooseMaterielVisible: false,//物料
+      dialogLoading: false,
+      dialogTitle: "",
+      pictLoading: false,
+      columnSetDialogTitle: "设置显示字段列表",
+      columnSetDialogVisible: false,
+      selectedItems: [],
+      tableId: 'delivery_note_table'
+    }
+  },
+  watch: {
+    formDataTime(val) {
+      if (val) {
+        this.formData.startTime = val[0];
+        this.formData.endTime = val[1];
+      } else {
+        this.formData.startTime = "";
+        this.formData.endTime = "";
+      }
+
+    },
+
+    activeName(val){
+      if(val==="first"){
+        this.search_data=this.search_data1
+        this.getList(0)
+      }else if(val==="second"){
+        // this.search_data.tabType=null
+      }else if(val==="third"){
+        this.search_data=this.search_data2
+        this.getList()
+      }else if(val==="fourth"){
+        this.search_data=this.search_data4
+        this.getList()
+      }else if(val==="end"){
+        this.search_data=this.search_data3
+        this.getList()
+      }
+    },
+  },
+  mounted(){
+    if (this.$route.query.active) {
+      this.activeName = "second";
+    }
+  },
+  created() {
+    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.myApproveList()
+    this.getList(0);
+    this.getShowColumns();
+    this.initData();
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search()
+      }
+    }
+  },
+  methods: {
+    btnClick(val,tabType) {
+      console.log("根据方法名称调用")
+      if (val === "goAdd") {
+        this.goAdd()
+      } else if (val == "showColumnSetDialog") {
+        this.showColumnSetDialog()
+      } else if (val == "remove") {
+        this.remove()
+      } else if (val == "disAudit") {
+        this.disAudit()
+      } else if (val === "exportExcel") {
+        this.exportExcel(tabType)
+      } else if (val === "close") {
+        this.close()
+      } else if (val === "reverseClose") {
+        this.reverseClose()
+      } else if (val === "change") {
+        this.change()
+      } else if (val === "gotoAlterationList") {
+        this.gotoAlterationList()
+      } else if (val === "showColumnSetDialog") {
+        this.showColumnSetDialog()
+      }
+    },
+
+    myApproveList() {
+      this.pictLoading = true;
+      console.log(this.approveListQuery)
+      this.$api.scmApproveAPI.myApproveList(this.approveListQuery).then(res => {
+        this.pictLoading = false
+        if (res.code == 0) {
+          if (res.data && res.data.list) {
+            this.auditTableData = res.data.list;
+            this.approveTotal = res.data.total;
+          } else {
+            this.auditTableData = [];
+            this.approveTotal = 0;
+          }
+          if (this.auditTableData.length) {
+            this.auditTableData.forEach(item => {
+              if (item.approveState == 0) {
+                item.approveStatusName = "暂存"
+              } else if (item.approveState == 1) {
+                item.approveStatusName = "待审批"
+              } else if (item.approveState == 2) {
+                item.approveStatusName = "已驳回"
+              } else if (item.approveState == 3) {
+                item.approveStatusName = "审批通过"
+              }
+              item.summary = [
+                {label: "通知单号", value: item.deliveryCode},
+                {label: "客户", value: item.clientName},
+                {label: "通知日期", value: item.submitTime},
+                {label: "通知总金额", value: item.sellAmount},
+              ]
+            })
+          }
+        }
+      }).catch(r => {
+      })
+    },
+
+    searchApproveList() {
+      this.approveListQuery.pagesize = 5
+      this.approveListQuery.pageno = 1
+      this.myApproveList()
+    },
+    // 返回首页
+    gotoIndex() {
+      this.chooseProVisible = false
+    },
+
+    // 导出
+    exportExcel(val) {
+      delete this.formData.pagesize;
+      delete this.formData.pageno;
+      this.formData.tabType=val
+      deliveryNoteApi
+        .exportExcel(this.formData)
+        .then(res => {
+        })
+    },
+    /**
+     * 反审核
+     */
+    disAudit() {
+      let id = this.selectedItems[0].mainId;
+      this.$confirm("确认反审核选中的项吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        deliveryNoteApi
+          .reverseAudit({id: id})
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "error"
+              })
+            }
+          })
+      })
+
+    },
+
+    /**
+     * 审核
+     */
+    audit() {
+      let id = this.selectedItems[0].mainId;
+      this.$confirm("确认审核选中的项吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        deliveryNoteApi
+          .audit({id: id})
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.getList();
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "error"
+              })
+            }
+          })
+      })
+
+    },
+
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+
+    // 跳转到查看页面
+    gotoDetail(row) {
+      this.$router.push({path: "/sales/deliveryNote_add", query: {id: row.mainId, t: Date.now()}})
+    },
+
+    //进入审核页面
+    gotoApproveDetail(row) {
+      this.$router.push({
+        path: "/sales/deliveryNote_add",
+        query: {
+          id: row.mainId,
+          instanceId:row.instanceId,
+          taskId:row.taskId,
+          tabType:this.search_data.tabType,
+          isApprove: true,
+          t: Date.now()
+        }
+      });
+    },
+
+    // 前往新增页面
+    goAdd() {
+      this.$router.push({path: "/sales/deliveryNote_add", query: {t: Date.now()}})
+    },
+
+    // 获取销售订单列表
+    getList() {
+      this.pictLoading = true;
+      deliveryNoteApi
+        .findList(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.list) {
+            //数量金额合计
+            this.summary = res.totalSum;
+            this.total = res.totalRows;
+            this.tableData = res.list;
+            this.tableData.forEach(item => {
+              //格式化日期
+              if (item.noteTime) {
+                item.noteTime = item.noteTime.substring(0, 10);
+                if(item.approveState==0){
+                  item.approveStatusName = "暂存"
+                } else if(item.approveState==1){
+                  item.approveStatusName = "待审批"
+                }else if(item.approveState==2){
+                  item.approveStatusName = "已驳回"
+                }else if(item.approveState==3){
+                  item.approveStatusName = "审批通过"
+                }
+              }
+            })
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        }).catch(r => {
+        console.log(r);
+      });
+    },
+
+    //设置显示字段
+    showColumnSetDialog() {
+      this.columnSetDialogVisible = true;
+      this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    },
+    //前移
+    toUp(scope) {
+      if (scope.$index === 0) {
+        return false;
+      }
+      let n;
+      for (let i = 0; i < this.showTableColumns.length; i++) {
+        if (this.showTableColumns[i].prop_ === scope.row.prop_) {
+          n = i;
+        }
+      }
+      let temp = this.showTableColumns[n];
+      this.showTableColumns[n] = this.showTableColumns[n - 1];
+      this.showTableColumns[n - 1] = temp;
+      this.$forceUpdate();
+    },
+    //后移
+    toDown(scope) {
+      if (scope.$index === this.showTableColumns.length - 1) {
+        return false;
+      }
+      let n;
+      for (let i = 0; i < this.showTableColumns.length; i++) {
+        if (this.showTableColumns[i].prop_ === scope.row.prop_) {
+          n = i;
+        }
+      }
+      let temp = this.showTableColumns[n];
+      this.showTableColumns[n] = this.showTableColumns[n + 1];
+      this.showTableColumns[n + 1] = temp;
+      this.$forceUpdate();
+    },
+    //恢复默认
+    toDefault() {
+      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+      this.$forceUpdate();
+    },
+    //完成列表字段设置
+    saveAndCloseColumnSetDialog() {
+      let tableNo = this.tableId;
+      let tableColumns = JSON.stringify(this.showTableColumns);
+      this.columnSetDialogVisible = false;
+      this.$api.tableColumnAPI
+        .saveShowColumns({tableNo: tableNo, tableColumns: tableColumns})
+        .then(res => {
+          let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+          this.formTableData = [];
+          for (let i = 0; i < arr.length; i++) {
+            if (arr[i].select) {
+              this.formTableData.push(arr[i]);
+            }
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    //关闭字段设置弹出
+    handleClose() {
+      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
+      this.columnSetDialogVisible = false;
+
+    },
+    /**
+     * 获取显示字段
+     */
+    getShowColumns() {
+      let tableNo = this.tableId;
+      this.formTableData = [];
+
+      this.$api.tableColumnAPI
+        .getShowColumns({tableNo: tableNo})
+        .then(res => {
+          if (res.code === 0) {
+            if (res.results) {
+              this.showTableColumns = JSON.parse(res.results);
+              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+              for (let i = 0; i < arr.length; i++) {
+                if (arr[i].select) {
+                  this.formTableData.push(arr[i]);
+                }
+              }
+              this.$forceUpdate();
+            } else {
+              let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+              for (let i = 0; i < arr.length; i++) {
+                if (arr[i].select) {
+                  this.formTableData.push(arr[i]);
+                }
+              }
+              this.$forceUpdate();
+            }
+          } else {
+            this.$message({
+              message: res.msg ? res.msg : "获取列表信息失败",
+              type: "error"
+            });
+          }
+          console.log(this.formTableData)
+
+        })
+        .catch(r => {
+          this.$message({
+            message: r,
+            type: "error"
+          });
+          console.log(r);
+        });
+    },
+
+    // 查询
+    search() {
+      this.formData.page = 1;
+      this.formData.pageSize = 10;
+      this.getList();
+    },
+
+    /**
+     * 高级查询
+     */
+    moreSearch() {
+      this.advanceQueryDialogVisible = true;
+      this.dialogTitle = "高级查询";
+    },
+    save() {
+      for (var n in this.formData) {
+        this.formData[n] = this.formData[n];
+      }
+      this.formData.inDatas = "";
+      this.time = this.formDataTime;
+      this.formData.page = 1;
+      this.$nextTick(function () {
+        this.advanceQueryDialogVisible = false;
+        this.getList();
+      })
+    },
+    //清空
+    clear() {
+      this.formData.startTime = "";
+      this.formData.endTime = "";
+      this.formData.specification = "";
+      this.formData.salesPersonDept = "";
+      this.formData.auditSign = "";
+      this.formData.materielName = "";//物料名称
+      this.formData.salesPersonName = "";
+      this.formData.salesPerson = "";
+      this.formData.deptId = "";
+      this.formData.createBy = "";
+      this.formData.createByName = "";
+      this.formDataTime = "";
+      this.salesPersonDept = "";
+    },
+    changeFacility() {
+      this.$forceUpdate();
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pageSize = val;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.page = val;
+      this.getList();
+    },
+
+    // 每页显示多少条
+    handleApproveSizeChange(val) {
+      this.approveListQuery.pagesize = val;
+      this.myApproveList();
+    },
+    // 上下分页
+    handleApproveCurrentChange(val) {
+      this.approveListQuery.pageno = val;
+      this.myApproveList();
+    },
+
+    // 所有列表展示
+    isExist(val){
+      let isExist = false
+      // 从浏览器缓存中获取权限数组
+      var buttonpermsStr = localStorage.getItem('btnContext');
+      if (buttonpermsStr === undefined || buttonpermsStr == null) {
+        return false
+      } else {
+        JSON.parse(buttonpermsStr).forEach(element => {
+          //匹配缓存中的数据中有没有匹配的值
+          if (element == val) {
+            // 若在按钮中定义的权限字段能在后端返回的权限数组中能找到，则该按钮可显示
+            isExist = true
+          }
+        });
+      }
+      return isExist
+    },
+
+    /**
+     * 初始化
+     */
+    initData() {
+      // 获取审核状态
+      this.$api.salesAPI
+        .listAauditSign({
+          type: "audit_status",
+        })
+        .then(res => {
+          this.options = res.datas
+        });
+      // 获取生产部门
+      Promise.all([this.$api.commonAPI.getDeptsTree(), this.$api.roleAPI.list()])
+        .then(([r1, r2]) => {
+          if (r1.code === 0) {
+            this.depOptions = r1.data.children;
+            // this.setDefaultDept();
+            this.setDeptList(this.depOptions);
+          }
+          if (r2.code === 0) {
+            this.roleList = r2.datas;
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    getMateriel(val) {
+      if (val) {
+        this.$set(this.formData, 'materiel', val.id);
+        this.$set(this.formData, 'materielName', val.name);
+      } else {
+        this.$set(this.formData, 'materiel', "");
+        this.$set(this.formData, 'materielName', "");
+      }
+    },
+
+    /**
+     * 获取用户
+     */
+    getUser(data) {
+      if (data) {
+        this.$set(this.formData, 'salesPersonName', data.name);
+        this.$set(this.formData, 'salesPerson', data.id);
+      }
+    },
+    /**
+     * 获取制单人
+     */
+    getUser1(data) {
+      console.log(data);
+      var self = this;
+      if (data) {
+        this.formData.createByName = data.name;
+        this.formData.createBy = data.id;
+      }
+    },
+    //根据当前id,获取一条树枝上的所有id数据
+    treeFindPath(tree, func, path = []) {
+      if (!tree) return [];
+      for (const data of tree) {
+        path.push(data.id);
+        if (func(data)) return path;
+        if (data.children) {
+          const findChildren = this.treeFindPath(data.children, func, path)
+          if (findChildren.length) return findChildren
+        }
+        path.pop()
+      }
+      return []
+    },
+    //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
+    setDeptList(tree) {
+      for (const data of tree) {
+        if (!data.hasChildren) {
+          data.children = undefined;
+        } else {
+          this.setDeptList(data.children)
+        }
+      }
+    },
+    // 选择部门
+    handleChange: function (value) {
+      this.formData.deptId = value.length >= 1 ? value[value.length - 1] : '';
+      this.salesPersonDept = value;
+    },
+
+
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      console.log(val);
+      this.selectedItems = val;
+      this.setBtn(val);
+    },
+
+    /**
+     * 删除
+     */
+    remove() {
+      let ids = [];
+      this.selectedItems.forEach(item => {
+        ids.push(item.mainId);
+        console.log(ids)
+      });
+      this.$confirm("确认删除选中的项吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        deliveryNoteApi.batchDelete({ids: ids}).then(res => {
+          if (res.code === 0) {
+            this.$message({
+              message: '删除成功！',
+              type: "success"
+            });
+            this.search();
+          } else {
+            this.$message({
+              message: res.msg ? res.msg : "删除失败，请重试",
+              type: "error"
+            });
+          }
+        }).catch(error => {
+          this.$message({
+            message: "删除失败，请重试",
+            type: "error"
+          });
+        });
+      });
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        // 将删除的按钮状态改成可选
+        this.buttons[1].disabled=false
+        // this.allListButton[1].disabled=false
+        // this.approvedButton[1].disabled=false
+        if (val.length === 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnOtherDisabled = isDelFlag;
+      this.btnDelDisabled = isFlag;
+    },
+    // 合计
+    getSummaries(param) {
+      const {columns, data} = param;
+      let sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计';
+          return;
+        }
+        if (column.property !== 'deliveryCount' && column.property !== 'deliveryCountSupport' && column.property !== 'sellAmount') {
+          sums[index] = '';
+          return;
+        }
+
+        const values = data.map(item => Number(item[column.property]));
+        if (!values.every(value => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+        } else {
+          sums[index] = '';
+        }
+        if (column.property === 'deliveryCount') {
+          if (sums[index]) {
+            sums[index] = this.summary.totalDeliveryCount;
+          }
+          return;
+        }
+        if (column.property === 'deliveryCountSupport') {
+          if (sums[index]) {
+            sums[index] = this.summary.totalDeliveryCountSupport;
+          }
+          return;
+        }
+        if (column.property === 'sellAmount') {
+          if (sums[index]) {
+            sums[index] = this.summary.totalSellAmount;
+          }
+        }
+      });
+
+      return sums;
+    },
+    /**
+     * 查看源单明细
+     */
+    viewDetail(row) {
+      const queryId = row.queryId;
+      if (queryId) {
+        this.$router.push({path: '/sales/salesContract_add', query: {id: queryId, t: Date.now()}})
+      }
+    },
+    // 点击源单单号查看相应源单明细页面
+    goToLink(row){
+      this.$router.push({
+        path: "/sales/salesContract_add",
+        query: {id:row.queryId,t: Date.now()}
+      });
+    },
+  }
+}
+</script>
+
+<style scoped>
+.approve-box .sys-tabs .el-tabs__nav-wrap {
+  padding: 5px 20px 0px;
+}
+.approve-box .sys-tabs .el-tabs__item {
+  padding-top: 10px;
+  height: 50px;
+}
+.approve-box .el-timeline-item__content {
+  line-height: 1.5;
+}
+.approve-box .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+<style>
+.approve-box .sys-tabs .el-tabs__nav-wrap {
+  padding: 5px 20px 0px;
+}
+.approve-box .sys-tabs .el-tabs__item {
+  padding-top: 10px;
+  height: 50px;
+}
+.approve-box .el-timeline-item__content {
+  line-height: 1.5;
+}
+.approve-box .el-dialog__body {
+  padding-top: 0px;
+}
+.approve-form .el-form-item {
+  margin-bottom: 0px;
+}
+.approve-timeline .el-timeline-item__wrapper {
+  padding-top: 10px;
+  padding-left: 80px;
+}
+.approve-timeline .el-timeline-item__tail {
+  left: 30px;
+  border-left-width: 4px;
+}
+</style>
+
+
+
+
diff --git a/src/pages/scm/sales/sales_contract/index.vue b/src/pages/scm/sales/sales_contract/index.vue
index 441e9c2..131f1f6 100644
--- a/src/pages/scm/sales/sales_contract/index.vue
+++ b/src/pages/scm/sales/sales_contract/index.vue
@@ -1,1005 +1,1006 @@
-<template>
-  <div class="sys-box knowledge-box">
-    <div class="sys-operate">
-      <el-button type="primary" @click="goAdd()" v-has="'sales:salesContract:add'">新增</el-button>
-      <el-button type="primary" @click="remove()" :disabled="btnOtherDisabled"
-        v-has="'sales:salesContract:remove'">删除</el-button>
-      <el-button type="primary" @click="exportExcel()" v-has="'sales:salesContract:exportExcel'">导出</el-button>
-      <el-button type="primary" @click="audit" :disabled="btnDelDisabled"
-        v-has="'sales:salesContract:audit'">审核</el-button>
-      <el-button type="primary" @click="disAudit" :disabled="btnDelDisabled"
-        v-has="'sales:salesContract:disAudit'">反审核</el-button>
-      <el-button type="primary" @click="close" :disabled="btnDelDisabled" v-has="'sales:salesContract:close'">{{
-        config.closeContractText }}</el-button>
-      <el-button type="primary" @click="reverseClose" :disabled="btnDelDisabled"
-        v-has="'sales:salesContract:reverseClose'">{{ config.openContractText }}</el-button>
-      <el-button type="primary" @click="change" :disabled="btnDelDisabled"
-        v-has="'sales:salesContract:change'">变更</el-button>
-      <el-button type="primary" @click="gotoAlterationList" :disabled="btnDelDisabled"
-        v-has="'sales:salesContract:gotoAlterationList'">变更记录</el-button>
-      <el-button type="primary" @click="showColumnSetDialog">{{ config.configureBtnName }}</el-button>
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class='form_item_input_out'>
-          <el-form-item label="合同编号" style='width:22%' class="form_item-inline">
-            <el-input v-model="search_data.contractCode" placeholder="请输入合同编号" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="客户" style='width:22%' class="form_item-inline">
-            <el-input v-model="search_data.clientName" placeholder="请输入客户" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="物料名称" style='width:22%' class="form_item-inline">
-            <el-input v-model="search_data.materielName" placeholder="物料" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="合同日期" style='width:34%' class="form_item-inline">
-            <el-date-picker v-model="time" type="daterange" format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
-              range-separator="—" start-placeholder="开始时间" end-placeholder="结束时间"></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class='form_item_btn_out'>
-          <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="moreSearch()">高级查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table border v-if="formTableData.length > 0" id="out-table" @row-click="gotoDetail" ref="tb"
-        v-loading="pictLoading" show-summary :summary-method="getSummaries" :data="tableData"
-        @selection-change="handleSelectionChange"
-        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column v-for="(items, index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
-          :sortable="items.sortAble" align="center" show-overflow-tooltip>
-
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
-      :before-close="handleClose">
-      <el-table border :data="showTableColumns" :key="Math.random()" max-height="350" style="width: 100%">
-        <el-table-column prop="title" label="列表名称" width="180" fixed>
-        </el-table-column>
-        <el-table-column prop="select" label="是否显示" width="180">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-
-    <!-- 高级查询对话框 -->
-    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
-      <el-form :inline="true" v-loading="dialogLoading" label-width="80px" class="dialog-form" ref="form"
-        style="width: 620px">
-        <div class="dialog-line">
-          <el-form-item label="合同时间" class="dialog-form-inline-single">
-            <el-date-picker v-model="formDataTime" type="daterange" format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd HH:mm:ss" range-separator="—" start-placeholder="开始时间"
-              end-placeholder="结束时间"></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="合同类型" class="dialog-form-inline">
-            <el-select v-model="formData.contractType" style="width:100%" clearable placeholder="请选择"
-              @change="changeFacility">
-              <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="客户" class="dialog-form-inline">
-            <el-input placeholder="请输入客户名" v-model="formData.clientName" clearable></el-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="物料" class="dialog-form-inline">
-            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel'
-              :chooseVisible.sync='chooseMaterielVisible'></btn-input>
-          </el-form-item>
-          <el-form-item label="规格型号" class="dialog-form-inline">
-            <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="销售部门" class="dialog-form-inline">
-            <el-cascader v-model="salesPersonDept" clearable :options="depOptions"
-              :props="{ expandTrigger: 'hover', label: 'text', value: 'id', checkStrictly: true }"
-              @change="handleChange"></el-cascader>
-          </el-form-item>
-          <el-form-item label="审核状态" class="dialog-form-inline">
-            <el-select v-model="formData.auditSign" style="width:100%" clearable placeholder="请选择"
-              @change="changeFacility">
-              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="销售员" prop="salesPersonName" class="dialog-form-inline">
-            >
-            <btn-input :valueText.sync='formData.salesPersonName' :valueId.sync='formData.salesPerson'
-              :chooseVisible.sync='chooseUserVisible'></btn-input>
-          </el-form-item>
-          <el-form-item label="制单人" prop="createByName" class="dialog-form-inline">
-
-            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy'
-              :chooseVisible.sync='chooseUserVisible1'></btn-input>
-          </el-form-item>
-        </div>
-
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">确定</el-button>
-        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
-        <el-button type="primary" @click="clear">清空</el-button>
-      </span>
-    </el-dialog>
-
-    <!--选择用户-->
-    <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
-    <!--选择制单人-->
-    <DialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></DialogChooseSingleUser1>
-    <!--选择物料-->
-    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel"></dialogChooseSingleParts>
-  </div>
-</template>
-
-<script>
-import {mapState, mapActions, mapGetters} from "vuex";
-import btnInput from "@/components/btnInput.vue";
-import FileSaver from 'file-saver'
-import config from "@/utils/config.js";
-import Cookies from "js-cookie";
-import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
-import DialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
-import { formatDateTime, getCurrentDate } from "@/utils/tools.js";
-export default {
-  components: {
-    btnInput,DialogChooseSingleUser,DialogChooseSingleUser1,dialogChooseSingleParts
-  },
-  data() {
-    return {
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10,
-      },
-      search_data1: {
-        pageno: 1,
-        pagesize: 10,
-        startTime: "",
-        endTime: "",
-        contractCode: '',
-        createByName: '',
-      },
-      formData: {
-        startTime: "",
-        endTime: "",
-        contractType: '',
-        contractTypeName: '',
-        unitUomName: '',
-        clientName: '',
-        materielName: '',
-        specification: '',
-        auditSign: '',
-        salesPersonName: '',
-        salesPerson: '',
-        // createTime: '',
-        deptId: '',
-        salesPersonDept: '',
-        createBy: "",//制单人id
-        createByName:"",
-      },
-      //默认列表数据
-      showTableColumnsDefault: [
-          {title: "合同日期", prop_: "contractDate", select: true},
-          {title: "合同编号", prop_: "contractCode", select: true},
-          {title: "客户合同编号", prop_: "clientContractCode", select: true},
-          {title: "合同类型", prop_: "contractTypeName", select: true},
-          {title: "关闭标志", prop_: "closeStatusName", select: true},
-          {title: "客户名称", prop_: "clientName", select: true},
-          {title: "销售员", prop_: "salesPersonName", select: true},
-          {title: "销售部门", prop_: "salesPersonDeptName", select: true},
-          {title: "发货是否检验", prop_: "isCheck", select: true},
-          {title: "物料代码", prop_: "materielSerialNo", select: true},
-          {title: "物料名称", prop_: "materielName", select: true},
-          {title: "规格型号", prop_: "specification", select: true},
-          {title: "主计量单位", prop_: "unitUomName", select: true},
-          {title: "主单位数量", prop_: "count", select: true},
-          {title: "辅助单位", prop_: "supportUomName", select: true},
-          {title: "销售数量", prop_: "saleCount", select: true},
-          {title: "含税单价（元）", prop_: "taxUnitPrice", select: true},
-          {title: "销售金额（元）", prop_: "taxAmount", select: true},
-          {title: "交货日期", prop_: "deliveryDate", select: true,sortAble:true},
-          {title: "审核状态", prop_: "auditSignName", select: true},
-          {title: "行关闭状态", prop_: "itemCloseStatusName", select: true},
-          {title: "行关闭时间", prop_: "itemCloseTime", select: true},
-          {title: "行关闭原因", prop_: "itemCloseReason", select: true}
-        ],
-        ///弹出页面列表数据
-        showTableColumns: [
-          {title: "合同日期", prop_: "contractDate", select: true},
-          {title: "合同编号", prop_: "contractCode", select: true},
-          {title: "客户合同编号", prop_: "clientContractCode", select: true},
-          {title: "合同类型", prop_: "contractTypeName", select: true},
-          {title: "关闭标志", prop_: "closeStatusName", select: true},
-          {title: "客户名称", prop_: "clientName", select: true},
-          {title: "销售员", prop_: "salesPersonName", select: true},
-          {title: "销售部门", prop_: "salesPersonDeptName", select: true},
-          {title: "发货是否检验", prop_: "isCheck", select: true},
-          {title: "物料代码", prop_: "materielSerialNo", select: true},
-          {title: "物料名称", prop_: "materielName", select: true},
-          {title: "规格型号", prop_: "specification", select: true},
-          {title: "主计量单位", prop_: "unitUomName", select: true},
-          {title: "主单位数量", prop_: "count", select: true},
-          {title: "辅助单位", prop_: "supportUomName", select: true},
-          {title: "销售数量", prop_: "saleCount", select: true},
-          {title: "含税单价（元）", prop_: "taxUnitPrice", select: true},
-          {title: "销售金额（元）", prop_: "taxAmount", select: true},
-          {title: "交货日期", prop_: "deliveryDate", select: true},
-          {title: "审核状态", prop_: "auditSignName", select: true},
-          {title: "行关闭状态", prop_: "itemCloseStatusName", select: true},
-          {title: "行关闭时间", prop_: "itemCloseTime", select: true},
-          {title: "行关闭原因", prop_: "itemCloseReason", select: true}
-        ],
-        showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
-        //显示的列表字段
-        alterationDetailId: '',
-      formTableData: [],
-          contractList: [],
-          contractData: [],
-          tableData1: [],
-          summary: {},
-      formDataTime: "",
-      time: '',
-      salesTime: '',
-      tableData: [],
-      depOptions: [],
-      salesPersonDept: '',
-      options: [],
-      typeList: [],
-      config: config,
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      advanceQueryDialogVisible: false,
-      chooseUserVisible: false,
-      chooseUserVisible1: false,
-      chooseMaterielVisible:false,//物料
-      dialogLoading: false,
-      dialogTitle: "",
-      pictLoading: false,
-      columnSetDialogTitle: "设置显示字段列表",
-      columnSetDialogVisible: false,
-      salesContractIds: [],
-      tableId: 'sales_contract_table'
-    }
-  },
-  watch: {
-      time(val) {
-        if (val) {
-          this.search_data.startTime = val[0];
-          this.search_data.endTime = val[1];
-        } else {
-          this.search_data.startTime = "";
-          this.search_data.endTime = "";
-        }
-
-      },
-      formDataTime(val) {
-        if (val) {
-          this.formData.startTime = val[0];
-          this.formData.endTime = val[1];
-        } else {
-          this.formData.startTime = "";
-          this.formData.endTime = "";
-        }
-
-      },
-    },
-  created() {
-    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.getList()
-    this.getShowColumns();
-    this.initData()
-  },
-  methods: {
-
-    // 变更合同列表页
-    gotoAlterationList() {
-      let id = this.salesContractIds[0].salesContractId
-      this.$router.push({ path: "/sales/salesContract_alterationList", query: { id: id, t: Date.now()} })
-    },
-
-    // 返回首页
-    gotoIndex() {
-      this.chooseProVisible = false
-    },
-    // 变更
-    change() {
-      let id = this.salesContractIds[0].salesContractId
-      this.$router.push({ path: "/sales/salesContract_edit", query: { id: id, t: Date.now()} })
-    },
-
-    /**
-   * 关闭
-   */
-   close() {
-    let id = this.salesContractIds[0].salesContractId
-    this.$confirm("确认终止选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.salesAPI
-          .closeContract({id: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                  message: res.msg,
-                  type: "success"
-                })
-                this. getList();
-            } else {
-              this.$message({
-                  message: res.msg,
-                  type: "error"
-                })
-            }
-          })
-        })
-
-   },
-   // 反关闭
-  reverseClose () {
-    let id = this.salesContractIds[0].salesContractId
-    this.$confirm("确认开启选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.salesAPI
-          .reverseClose({id: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                  message: res.msg,
-                  type: "success"
-                })
-                this. getList();
-            } else {
-              this.$message({
-                  message: res.msg,
-                  type: "error"
-                })
-            }
-          })
-        })
-  },
-   // 导出
-   exportExcel() {
-       delete this.search_data.pagesize
-       delete this.search_data.pageno
-        this.$api.salesAPI
-        .exportExcel(this.search_data)
-        .then(res => {
-        })
-      },
-   /**
-   * 反审核
-   */
-   disAudit() {
-      let id = this.salesContractIds[0].salesContractId
-      this.$confirm("确认反审核选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.salesAPI
-          .reverseAuditContract({id: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              })
-              this. getList();
-            } else {
-              this.$message({
-                message: res.msg,
-                type: "error"
-              })
-            }
-          })
-        })
-
-    },
-
-   /**
-   * 审核
-   */
-   audit() {
-    let id = this.salesContractIds[0].salesContractId
-    this.$confirm("确认审核选中的项吗?", "提示", {
-      type: "warning"
-    }).then(() => {
-      this.$api.salesAPI
-    .auditContract({id: id})
-    .then(res => {
-      if(res.code === 0) {
-        this.$message({
-            message: res.msg,
-            type: "success"
-          })
-          this. getList();
-      } else {
-        this.$message({
-            message: res.msg,
-            type: "error"
-          })
-      }
-    })
-    })
-
-   },
-
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-
-    // 跳转到查看页面
-    gotoDetail(row) {
-        this.$router.push({ path: "/sales/salesContract_add", query: { id: row.salesContractId,t: Date.now() } })
-    },
-
-    // 前往新增页面
-    goAdd() {
-      this.$router.push({ path: "/sales/salesContract_add", query: {t: Date.now() } })
-    },
-
-    // 获取销售订单列表
-    getList() {
-      this.pictLoading = true;
-      this.$api.salesAPI
-      .listSalesContract(this.search_data)
-      .then(res => {
-        this.pictLoading = false;
-        if(res.data) {
-          this.summary = res.total
-          this.total = res.data.totalRows;
-          this.tableData = res.data.datas ? res.data.datas : [];
-          this.tableData.forEach(item => {
-            item.contractDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.contractDate)
-            item.deliveryDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.deliveryDate)
-          })
-        } else {
-          this.total = 0;
-          this.tableData = [];
-        }
-      }).catch(r => {
-            console.log(r);
-          });
-    },
-
-      //设置显示字段
-      showColumnSetDialog() {
-        this.columnSetDialogVisible = true;
-        this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-      },
-      //前移
-      toUp(scope) {
-        if (scope.$index == 0) {
-          return false;
-        }
-        let n;
-        for (let i = 0; i < this.showTableColumns.length; i++) {
-          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-            n = i;
-          }
-        }
-        let temp = this.showTableColumns[n];
-        this.showTableColumns[n] = this.showTableColumns[n - 1];
-        this.showTableColumns[n - 1] = temp;
-        this.$forceUpdate();
-      },
-      //后移
-      toDown(scope) {
-        if (scope.$index == this.showTableColumns.length - 1) {
-          return false;
-        }
-        let n;
-        for (let i = 0; i < this.showTableColumns.length; i++) {
-          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-            n = i;
-          }
-        }
-        let temp = this.showTableColumns[n];
-        this.showTableColumns[n] = this.showTableColumns[n + 1];
-        this.showTableColumns[n + 1] = temp;
-        this.$forceUpdate();
-      },
-      //恢复默认
-      toDefault() {
-        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-        this.$forceUpdate();
-      },
-      //完成列表字段设置
-      saveAndCloseColumnSetDialog() {
-        let tableNo = this.tableId;
-        let tableColumns = JSON.stringify(this.showTableColumns);
-        this.columnSetDialogVisible = false;
-        this.$api.tableColumnAPI
-          .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
-          .then(res => {
-              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-              this.formTableData = [];
-              for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                      this.formTableData.push(arr[i]);
-                  }
-              }
-          })
-          .catch(r => {
-            console.log(r);
-          });
-      },
-      //关闭字段设置弹出
-      handleClose() {
-        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
-        this.columnSetDialogVisible = false;
-
-      },
-      /**
-       * 获取显示字段
-       */
-       getShowColumns() {
-        let tableNo = this.tableId;
-        this.formTableData = [];
-
-        this.$api.tableColumnAPI
-          .getShowColumns({tableNo:tableNo})
-          .then(res => {
-            if(res.code==0){
-              if(res.results){
-                this.showTableColumns = JSON.parse(res.results);
-                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-                for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                    this.formTableData.push(arr[i]);
-                  }
-                }
-                this.$forceUpdate();
-              }else{
-                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-                for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                    this.formTableData.push(arr[i]);
-                  }
-                }
-                this.$forceUpdate();
-              }
-            }else{
-              this.$message({
-                message: res.msg ? res.msg : "获取列表信息失败",
-                type: "error"
-              });
-            }
-
-          })
-          .catch(r => {
-            this.$message({
-              message: r,
-              type: "error"
-            });
-            console.log(r);
-          });
-      },
-
-    // 查询
-    search() {
-      this.search_data.pageno = 1;
-      this.search_data.pagesize = 10;
-      this.getList();
-    },
-
-    /**
-     * 高级查询
-     */
-      moreSearch() {
-      this.advanceQueryDialogVisible = true;
-      this.dialogTitle = "高级查询";
-    },
-    save() {
-        for (var n in this.formData) {
-          this.search_data[n] = this.formData[n];
-        }
-        this.search_data.inDatas = "";
-        this.time = this.formDataTime;
-        this.search_data.pageno = 1;
-        this.$nextTick(function () {
-          this.advanceQueryDialogVisible = false;
-          this.getList();
-        })
-      },
-      //清空
-      clear() {
-        for (var n in this.formData) {
-          this.formData[n] = '';
-        }
-        this.formDataTime = "";
-        this.salesPersonDept=''
-        // this.createTime = "";
-      },
-      changeFacility() {
-        this.$forceUpdate();
-      },
-
-    //设置显示字段
-    showColumnSetDialog() {
-      this.columnSetDialogVisible = true;
-      this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-
-    /**
-     * 初始化
-     */
-     initData() {
-      // 获取审核状态
-      this.$api.salesAPI
-      .listAauditSign({
-        type: "audit_status",
-      })
-      .then(res => {
-        this.options = res.datas
-      });
-      //  获取合同类型
-      this.$api.salesAPI
-      .listContractType({
-        type: "sales_contract_type",
-      })
-      .then(res => {
-        this.typeList = res.datas
-      });
-      // 获取生产部门
-      Promise.all([this.$api.commonAPI.getDeptsTree(), this.$api.roleAPI.list()])
-            .then(([r1, r2]) => {
-                if (r1.code === 0) {
-                    this.depOptions=r1.data.children;
-                    // this.setDefaultDept();
-                    this.setDeptList(this.depOptions);
-                }
-                if (r2.code === 0) {
-                    this.roleList = r2.datas;
-                }
-            })
-            .catch(error => {
-                console.log(error);
-            });
-     },
-     getMateriel(val){
-        if (val) {
-          this.$set(this.formData,'materiel',val.id)
-          this.$set(this.formData,'materielName',val.name)
-        }else{
-          this.$set(this.formData,'materiel',"")
-          this.$set(this.formData,'materielName',"")
-        }
-      },
-
-     /**
-     * 获取用户
-     */
-     getUser(data) {
-        if (data) {
-          this.$set(this.formData,'salesPersonName',data.name)
-          this.$set(this.formData,'salesPerson',data.id)
-        //   this.formData.salesPersonName = data.name;
-        //   this.formData.salesPerson = data.id;
-        //   this.getUserList.forEach(item => {
-        //     if (data.id === item.id) {
-        //       self.formData.salesPersonDept = item.deptId;
-        //         self.formData.deptId= item.deptId;
-        //       return;
-        //     }
-        //   });
-          // if (self.formData.deptId == 0) {
-          //   self.formData.salesPersonDept = "";
-          // }
-          this.setDefaultDept()
-        }
-      },
-      /**
-     * 获取制单人
-     */
-     getUser1(data) {
-        console.log(data)
-        var self = this;
-        if (data) {
-          this.formData.createByName = data.name;
-          this.formData.createBy = data.id;
-        }
-      },
-       //根据当前id,获取一条树枝上的所有id数据
-       treeFindPath (tree, func, path = []) {
-                if (!tree) return []
-                for (const data of tree) {
-                    path.push(data.id)
-                    if (func(data)) return path
-                    if (data.children) {
-                        const findChildren = this.treeFindPath(data.children, func, path)
-                        if (findChildren.length) return findChildren
-                    }
-                    path.pop()
-                }
-                return []
-            },
-      //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
-      setDeptList(tree){
-          for (const data of tree) {
-              if(!data.hasChildren){
-                  data.children=undefined;
-              }else{
-                  this.setDeptList(data.children)
-              }
-          }
-      },
-    //显示默认部门
-    // setDefaultDept(){
-    //     if(this.depOptions.length>0&&this.formData.deptId){
-    //       let id=JSON.stringify( this.formData.deptId)
-    //       let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
-    //       this.salesPersonDept=JSON.parse(JSON.stringify(select_id))
-    //     }
-    //   },
-      // 选择部门
-      handleChange:function(value){
-        this.formData.salesPersonDept=value.length>=1?value[value.length-1]:'';
-        this.salesPersonDept=value;
-      },
-
-
-        /**
-       * 处理选中
-       */
-       handleSelectionChange(val) {
-        this.salesContractIds= val;
-        this.setBtn(val);
-      },
-
-      /**
-       * 删除
-       */
-       remove() {
-        let ids = [];
-          this.salesContractIds.forEach(item => {
-            ids.push(item.salesContractId)
-            console.log(ids)
-          })
-        this.$confirm("确认删除选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.salesAPI
-            .removeContract({salesContractIds: ids})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.search();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "删除失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "删除失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      },
-      /**
-     * 控件操作按钮状态
-     */
-        setBtn(val) {
-        let isFlag = true;
-        let isDelFlag = true;
-        if (val.length > 0) {
-          isDelFlag = false;
-          if (val.length == 1) {
-            isFlag = false;
-          }
-        } else {
-          isFlag = true;
-          isDelFlag = true;
-        }
-        this.btnOtherDisabled = isDelFlag;
-        this.btnDelDisabled = isFlag;
-      },
-      // 合计
-      getSummaries(param){
-        const { columns, data } = param;
-        let sums=[];
-        columns.forEach((column, index) => { //计算不含税金额总计
-
-          if (index === 0) {
-            sums[index] = '合计';
-            return;
-          }
-          if (column.property!=='count'&&column.property!=='taxAmount'&&column.property!=='saleCount') {
-            sums[index] = '';
-            return;
-          }
-
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-          } else {
-            sums[index] = '';
-          }
-          if (column.property==='count') {
-            if(sums[index]) {
-              sums[index] = this.summary.totalCount;
-            }
-            return;
-          }
-          if (column.property==='saleCount') {
-            if(sums[index]) {
-              sums[index] = this.summary.totalSaleCount;
-            }
-            return;
-          }
-          if (column.property==='taxAmount') {
-            if(sums[index]) {
-              sums[index] = this.summary.totalTaxAmount;
-            }
-            return;
-          }
-        });
-
-        return sums;
-      },
-
-  }
-}
-</script>
-
-<style scoped></style>
-
-<style>
-/*.el-cascader .el-input {*/
-/*  width: 100% !important;*/
-/*}*/
-
-.process-box .el-select,
-.process-box .el-input {
-  width: 100%;
-}
-
-.process-box .el-table thead {
-  line-height: 1;
-}
-
-.process-box .el-input-number .el-input {
-  width: 100% !important;
-}
-
-.process-box .el-input-number--small {
-  width: 70% !important;
-}
-
-.process-box .form-inline {
-  width: 33.3% !important;
-}
-
-.process-box .el-input-number el-input-number--small {
-  white-space: nowrap;
-
-}
-
-.process-box .el-form-item__content {
-  margin-left: 100px !important;
-}
-
-.process-box .el-form-item__label {
-  width: 100px !important;
-}
-
-.process-box .el-input,
-.process-box .el-form--inline .el-input,
-.process-box .el-cascader--small {
-  width: 100% !important;
-}
-
-.childlist .el-form-item__content {
-  margin-left: 0 !important;
-}
-
-.process-box .el-input--small {
-  width: 70% !important;
-}
-</style>
-
-<style scoped>
->>>.sys-search .el-input__inner {
-  width: 100%;
-}
-
-.dialog-form {
-  position: relative;
-}
-
-.dialog-line {
-  position: relative;
-  display: flex;
-  justify-content: center;
-  width: 100%;
-}
-
-.dialog-line .dialog-form-inline {
-  position: relative;
-  width: 50%;
-  margin-right: 0;
-}
-
-.dialog-line .dialog-form-inline-single {
-  position: relative;
-  width: 100%;
-  margin-right: 0;
-}
-
->>>.dialog-line .el-input__inner {
-  width: 100% !important;
-  ;
-}
-
->>>.dialog-line .el-form-item__content {
-  width: calc(100% - 80px) !important;
-  ;
-}
-
->>>.dialog-line .el-input,
->>>.dialog-line .el-cascader {
-  width: 100% !important;
-}
-</style>
+<template>
+  <div class="sys-box knowledge-box">
+    <div class="sys-operate">
+
+      <el-button type="primary" @click="goAdd()" v-has="'sales:salesContract:add'">新增</el-button>
+      <el-button type="primary" @click="remove()" :disabled="btnOtherDisabled"
+        v-has="'sales:salesContract:remove'">删除</el-button>
+      <el-button type="primary" @click="exportExcel()" v-has="'sales:salesContract:exportExcel'">导出</el-button>
+      <el-button type="primary" @click="audit" :disabled="btnDelDisabled"
+        v-has="'sales:salesContract:audit'">审核</el-button>
+      <el-button type="primary" @click="disAudit" :disabled="btnDelDisabled"
+        v-has="'sales:salesContract:disAudit'">反审核</el-button>
+      <el-button type="primary" @click="close" :disabled="btnDelDisabled" v-has="'sales:salesContract:close'">{{
+        config.closeContractText }}</el-button>
+      <el-button type="primary" @click="reverseClose" :disabled="btnDelDisabled"
+        v-has="'sales:salesContract:reverseClose'">{{ config.openContractText }}</el-button>
+      <el-button type="primary" @click="change" :disabled="btnDelDisabled"
+        v-has="'sales:salesContract:change'">变更</el-button>
+      <el-button type="primary" @click="gotoAlterationList" :disabled="btnDelDisabled"
+        v-has="'sales:salesContract:gotoAlterationList'">变更记录</el-button>
+      <el-button type="primary" @click="showColumnSetDialog">{{ config.configureBtnName }}</el-button>
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class='form_item_input_out'>
+          <el-form-item label="合同编号" style='width:22%' class="form_item-inline">
+            <el-input v-model="search_data.contractCode" placeholder="请输入合同编号" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="客户" style='width:22%' class="form_item-inline">
+            <el-input v-model="search_data.clientName" placeholder="请输入客户" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="物料名称" style='width:22%' class="form_item-inline">
+            <el-input v-model="search_data.materielName" placeholder="物料" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="合同日期" style='width:34%' class="form_item-inline">
+            <el-date-picker v-model="time" type="daterange" format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
+              range-separator="—" start-placeholder="开始时间" end-placeholder="结束时间"></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class='form_item_btn_out'>
+          <el-form-item>
+            <el-button type="primary" @click="search()">查询</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="moreSearch()">高级查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table border v-if="formTableData.length > 0" id="out-table" @row-click="gotoDetail" ref="tb"
+        v-loading="pictLoading" show-summary :summary-method="getSummaries" :data="tableData"
+        @selection-change="handleSelectionChange"
+        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column v-for="(items, index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
+          :sortable="items.sortAble" align="center" show-overflow-tooltip>
+
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
+      :before-close="handleClose">
+      <el-table border :data="showTableColumns" :key="Math.random()" max-height="350" style="width: 100%">
+        <el-table-column prop="title" label="列表名称" width="180" fixed>
+        </el-table-column>
+        <el-table-column prop="select" label="是否显示" width="180">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+
+    <!-- 高级查询对话框 -->
+    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
+      <el-form :inline="true" v-loading="dialogLoading" label-width="80px" class="dialog-form" ref="form"
+        style="width: 620px">
+        <div class="dialog-line">
+          <el-form-item label="合同时间" class="dialog-form-inline-single">
+            <el-date-picker v-model="formDataTime" type="daterange" format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss" range-separator="—" start-placeholder="开始时间"
+              end-placeholder="结束时间"></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="合同类型" class="dialog-form-inline">
+            <el-select v-model="formData.contractType" style="width:100%" clearable placeholder="请选择"
+              @change="changeFacility">
+              <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="客户" class="dialog-form-inline">
+            <el-input placeholder="请输入客户名" v-model="formData.clientName" clearable></el-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="物料" class="dialog-form-inline">
+            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel'
+              :chooseVisible.sync='chooseMaterielVisible'></btn-input>
+          </el-form-item>
+          <el-form-item label="规格型号" class="dialog-form-inline">
+            <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="销售部门" class="dialog-form-inline">
+            <el-cascader v-model="salesPersonDept" clearable :options="depOptions"
+              :props="{ expandTrigger: 'hover', label: 'text', value: 'id', checkStrictly: true }"
+              @change="handleChange"></el-cascader>
+          </el-form-item>
+          <el-form-item label="审核状态" class="dialog-form-inline">
+            <el-select v-model="formData.auditSign" style="width:100%" clearable placeholder="请选择"
+              @change="changeFacility">
+              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="销售员" prop="salesPersonName" class="dialog-form-inline">
+            >
+            <btn-input :valueText.sync='formData.salesPersonName' :valueId.sync='formData.salesPerson'
+              :chooseVisible.sync='chooseUserVisible'></btn-input>
+          </el-form-item>
+          <el-form-item label="制单人" prop="createByName" class="dialog-form-inline">
+
+            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy'
+              :chooseVisible.sync='chooseUserVisible1'></btn-input>
+          </el-form-item>
+        </div>
+
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">确定</el-button>
+        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="clear">清空</el-button>
+      </span>
+    </el-dialog>
+
+    <!--选择用户-->
+    <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
+    <!--选择制单人-->
+    <DialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></DialogChooseSingleUser1>
+    <!--选择物料-->
+    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel"></dialogChooseSingleParts>
+  </div>
+</template>
+
+<script>
+import {mapState, mapActions, mapGetters} from "vuex";
+import btnInput from "@/components/btnInput.vue";
+import FileSaver from 'file-saver'
+import config from "@/utils/config.js";
+import Cookies from "js-cookie";
+import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
+import DialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
+import { formatDateTime, getCurrentDate } from "@/utils/tools.js";
+export default {
+  components: {
+    btnInput,DialogChooseSingleUser,DialogChooseSingleUser1,dialogChooseSingleParts
+  },
+  data() {
+    return {
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10,
+      },
+      search_data1: {
+        pageno: 1,
+        pagesize: 10,
+        startTime: "",
+        endTime: "",
+        contractCode: '',
+        createByName: '',
+      },
+      formData: {
+        startTime: "",
+        endTime: "",
+        contractType: '',
+        contractTypeName: '',
+        unitUomName: '',
+        clientName: '',
+        materielName: '',
+        specification: '',
+        auditSign: '',
+        salesPersonName: '',
+        salesPerson: '',
+        // createTime: '',
+        deptId: '',
+        salesPersonDept: '',
+        createBy: "",//制单人id
+        createByName:"",
+      },
+      //默认列表数据
+      showTableColumnsDefault: [
+          {title: "合同日期", prop_: "contractDate", select: true},
+          {title: "合同编号", prop_: "contractCode", select: true},
+          {title: "客户合同编号", prop_: "clientContractCode", select: true},
+          {title: "合同类型", prop_: "contractTypeName", select: true},
+          {title: "关闭标志", prop_: "closeStatusName", select: true},
+          {title: "客户名称", prop_: "clientName", select: true},
+          {title: "销售员", prop_: "salesPersonName", select: true},
+          {title: "销售部门", prop_: "salesPersonDeptName", select: true},
+          {title: "发货是否检验", prop_: "isCheck", select: true},
+          {title: "物料代码", prop_: "materielSerialNo", select: true},
+          {title: "物料名称", prop_: "materielName", select: true},
+          {title: "规格型号", prop_: "specification", select: true},
+          {title: "主计量单位", prop_: "unitUomName", select: true},
+          {title: "主单位数量", prop_: "count", select: true},
+          {title: "辅助单位", prop_: "supportUomName", select: true},
+          {title: "销售数量", prop_: "saleCount", select: true},
+          {title: "含税单价（元）", prop_: "taxUnitPrice", select: true},
+          {title: "销售金额（元）", prop_: "taxAmount", select: true},
+          {title: "交货日期", prop_: "deliveryDate", select: true,sortAble:true},
+          {title: "审核状态", prop_: "auditSignName", select: true},
+          {title: "行关闭状态", prop_: "itemCloseStatusName", select: true},
+          {title: "行关闭时间", prop_: "itemCloseTime", select: true},
+          {title: "行关闭原因", prop_: "itemCloseReason", select: true}
+        ],
+        ///弹出页面列表数据
+        showTableColumns: [
+          {title: "合同日期", prop_: "contractDate", select: true},
+          {title: "合同编号", prop_: "contractCode", select: true},
+          {title: "客户合同编号", prop_: "clientContractCode", select: true},
+          {title: "合同类型", prop_: "contractTypeName", select: true},
+          {title: "关闭标志", prop_: "closeStatusName", select: true},
+          {title: "客户名称", prop_: "clientName", select: true},
+          {title: "销售员", prop_: "salesPersonName", select: true},
+          {title: "销售部门", prop_: "salesPersonDeptName", select: true},
+          {title: "发货是否检验", prop_: "isCheck", select: true},
+          {title: "物料代码", prop_: "materielSerialNo", select: true},
+          {title: "物料名称", prop_: "materielName", select: true},
+          {title: "规格型号", prop_: "specification", select: true},
+          {title: "主计量单位", prop_: "unitUomName", select: true},
+          {title: "主单位数量", prop_: "count", select: true},
+          {title: "辅助单位", prop_: "supportUomName", select: true},
+          {title: "销售数量", prop_: "saleCount", select: true},
+          {title: "含税单价（元）", prop_: "taxUnitPrice", select: true},
+          {title: "销售金额（元）", prop_: "taxAmount", select: true},
+          {title: "交货日期", prop_: "deliveryDate", select: true},
+          {title: "审核状态", prop_: "auditSignName", select: true},
+          {title: "行关闭状态", prop_: "itemCloseStatusName", select: true},
+          {title: "行关闭时间", prop_: "itemCloseTime", select: true},
+          {title: "行关闭原因", prop_: "itemCloseReason", select: true}
+        ],
+        showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
+        //显示的列表字段
+        alterationDetailId: '',
+      formTableData: [],
+          contractList: [],
+          contractData: [],
+          tableData1: [],
+          summary: {},
+      formDataTime: "",
+      time: '',
+      salesTime: '',
+      tableData: [],
+      depOptions: [],
+      salesPersonDept: '',
+      options: [],
+      typeList: [],
+      config: config,
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      advanceQueryDialogVisible: false,
+      chooseUserVisible: false,
+      chooseUserVisible1: false,
+      chooseMaterielVisible:false,//物料
+      dialogLoading: false,
+      dialogTitle: "",
+      pictLoading: false,
+      columnSetDialogTitle: "设置显示字段列表",
+      columnSetDialogVisible: false,
+      salesContractIds: [],
+      tableId: 'sales_contract_table'
+    }
+  },
+  watch: {
+      time(val) {
+        if (val) {
+          this.search_data.startTime = val[0];
+          this.search_data.endTime = val[1];
+        } else {
+          this.search_data.startTime = "";
+          this.search_data.endTime = "";
+        }
+
+      },
+      formDataTime(val) {
+        if (val) {
+          this.formData.startTime = val[0];
+          this.formData.endTime = val[1];
+        } else {
+          this.formData.startTime = "";
+          this.formData.endTime = "";
+        }
+
+      },
+    },
+  created() {
+    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.getList()
+    this.getShowColumns();
+    this.initData()
+  },
+  methods: {
+
+    // 变更合同列表页
+    gotoAlterationList() {
+      let id = this.salesContractIds[0].salesContractId
+      this.$router.push({ path: "/sales/salesContract_alterationList", query: { id: id, t: Date.now()} })
+    },
+
+    // 返回首页
+    gotoIndex() {
+      this.chooseProVisible = false
+    },
+    // 变更
+    change() {
+      let id = this.salesContractIds[0].salesContractId
+      this.$router.push({ path: "/sales/salesContract_edit", query: { id: id, t: Date.now()} })
+    },
+
+    /**
+   * 关闭
+   */
+   close() {
+    let id = this.salesContractIds[0].salesContractId
+    this.$confirm("确认终止选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.salesAPI
+          .closeContract({id: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                  message: res.msg,
+                  type: "success"
+                })
+                this. getList();
+            } else {
+              this.$message({
+                  message: res.msg,
+                  type: "error"
+                })
+            }
+          })
+        })
+
+   },
+   // 反关闭
+  reverseClose () {
+    let id = this.salesContractIds[0].salesContractId
+    this.$confirm("确认开启选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.salesAPI
+          .reverseClose({id: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                  message: res.msg,
+                  type: "success"
+                })
+                this. getList();
+            } else {
+              this.$message({
+                  message: res.msg,
+                  type: "error"
+                })
+            }
+          })
+        })
+  },
+   // 导出
+   exportExcel() {
+       delete this.search_data.pagesize
+       delete this.search_data.pageno
+        this.$api.salesAPI
+        .exportExcel(this.search_data)
+        .then(res => {
+        })
+      },
+   /**
+   * 反审核
+   */
+   disAudit() {
+      let id = this.salesContractIds[0].salesContractId
+      this.$confirm("确认反审核选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.salesAPI
+          .reverseAuditContract({id: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              })
+              this. getList();
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "error"
+              })
+            }
+          })
+        })
+
+    },
+
+   /**
+   * 审核
+   */
+   audit() {
+    let id = this.salesContractIds[0].salesContractId
+    this.$confirm("确认审核选中的项吗?", "提示", {
+      type: "warning"
+    }).then(() => {
+      this.$api.salesAPI
+    .auditContract({id: id})
+    .then(res => {
+      if(res.code === 0) {
+        this.$message({
+            message: res.msg,
+            type: "success"
+          })
+          this. getList();
+      } else {
+        this.$message({
+            message: res.msg,
+            type: "error"
+          })
+      }
+    })
+    })
+
+   },
+
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+
+    // 跳转到查看页面
+    gotoDetail(row) {
+        this.$router.push({ path: "/sales/salesContract_add", query: { id: row.salesContractId,t: Date.now() } })
+    },
+
+    // 前往新增页面
+    goAdd() {
+      this.$router.push({ path: "/sales/salesContract_add", query: {t: Date.now() } })
+    },
+
+    // 获取销售订单列表
+    getList() {
+      this.pictLoading = true;
+      this.$api.salesAPI
+      .listSalesContract(this.search_data)
+      .then(res => {
+        this.pictLoading = false;
+        if(res.data) {
+          this.summary = res.total
+          this.total = res.data.totalRows;
+          this.tableData = res.data.datas ? res.data.datas : [];
+          this.tableData.forEach(item => {
+            item.contractDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.contractDate)
+            item.deliveryDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.deliveryDate)
+          })
+        } else {
+          this.total = 0;
+          this.tableData = [];
+        }
+      }).catch(r => {
+            console.log(r);
+          });
+    },
+
+      //设置显示字段
+      showColumnSetDialog() {
+        this.columnSetDialogVisible = true;
+        this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+      },
+      //前移
+      toUp(scope) {
+        if (scope.$index == 0) {
+          return false;
+        }
+        let n;
+        for (let i = 0; i < this.showTableColumns.length; i++) {
+          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+            n = i;
+          }
+        }
+        let temp = this.showTableColumns[n];
+        this.showTableColumns[n] = this.showTableColumns[n - 1];
+        this.showTableColumns[n - 1] = temp;
+        this.$forceUpdate();
+      },
+      //后移
+      toDown(scope) {
+        if (scope.$index == this.showTableColumns.length - 1) {
+          return false;
+        }
+        let n;
+        for (let i = 0; i < this.showTableColumns.length; i++) {
+          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+            n = i;
+          }
+        }
+        let temp = this.showTableColumns[n];
+        this.showTableColumns[n] = this.showTableColumns[n + 1];
+        this.showTableColumns[n + 1] = temp;
+        this.$forceUpdate();
+      },
+      //恢复默认
+      toDefault() {
+        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+        this.$forceUpdate();
+      },
+      //完成列表字段设置
+      saveAndCloseColumnSetDialog() {
+        let tableNo = this.tableId;
+        let tableColumns = JSON.stringify(this.showTableColumns);
+        this.columnSetDialogVisible = false;
+        this.$api.tableColumnAPI
+          .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
+          .then(res => {
+              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+              this.formTableData = [];
+              for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                      this.formTableData.push(arr[i]);
+                  }
+              }
+          })
+          .catch(r => {
+            console.log(r);
+          });
+      },
+      //关闭字段设置弹出
+      handleClose() {
+        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
+        this.columnSetDialogVisible = false;
+
+      },
+      /**
+       * 获取显示字段
+       */
+       getShowColumns() {
+        let tableNo = this.tableId;
+        this.formTableData = [];
+
+        this.$api.tableColumnAPI
+          .getShowColumns({tableNo:tableNo})
+          .then(res => {
+            if(res.code==0){
+              if(res.results){
+                this.showTableColumns = JSON.parse(res.results);
+                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+                for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                    this.formTableData.push(arr[i]);
+                  }
+                }
+                this.$forceUpdate();
+              }else{
+                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+                for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                    this.formTableData.push(arr[i]);
+                  }
+                }
+                this.$forceUpdate();
+              }
+            }else{
+              this.$message({
+                message: res.msg ? res.msg : "获取列表信息失败",
+                type: "error"
+              });
+            }
+
+          })
+          .catch(r => {
+            this.$message({
+              message: r,
+              type: "error"
+            });
+            console.log(r);
+          });
+      },
+
+    // 查询
+    search() {
+      this.search_data.pageno = 1;
+      this.search_data.pagesize = 10;
+      this.getList();
+    },
+
+    /**
+     * 高级查询
+     */
+      moreSearch() {
+      this.advanceQueryDialogVisible = true;
+      this.dialogTitle = "高级查询";
+    },
+    save() {
+        for (var n in this.formData) {
+          this.search_data[n] = this.formData[n];
+        }
+        this.search_data.inDatas = "";
+        this.time = this.formDataTime;
+        this.search_data.pageno = 1;
+        this.$nextTick(function () {
+          this.advanceQueryDialogVisible = false;
+          this.getList();
+        })
+      },
+      //清空
+      clear() {
+        for (var n in this.formData) {
+          this.formData[n] = '';
+        }
+        this.formDataTime = "";
+        this.salesPersonDept=''
+        // this.createTime = "";
+      },
+      changeFacility() {
+        this.$forceUpdate();
+      },
+
+    //设置显示字段
+    showColumnSetDialog() {
+      this.columnSetDialogVisible = true;
+      this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+
+    /**
+     * 初始化
+     */
+     initData() {
+      // 获取审核状态
+      this.$api.salesAPI
+      .listAauditSign({
+        type: "audit_status",
+      })
+      .then(res => {
+        this.options = res.datas
+      });
+      //  获取合同类型
+      this.$api.salesAPI
+      .listContractType({
+        type: "sales_contract_type",
+      })
+      .then(res => {
+        this.typeList = res.datas
+      });
+      // 获取生产部门
+      Promise.all([this.$api.commonAPI.getDeptsTree(), this.$api.roleAPI.list()])
+            .then(([r1, r2]) => {
+                if (r1.code === 0) {
+                    this.depOptions=r1.data.children;
+                    // this.setDefaultDept();
+                    this.setDeptList(this.depOptions);
+                }
+                if (r2.code === 0) {
+                    this.roleList = r2.datas;
+                }
+            })
+            .catch(error => {
+                console.log(error);
+            });
+     },
+     getMateriel(val){
+        if (val) {
+          this.$set(this.formData,'materiel',val.id)
+          this.$set(this.formData,'materielName',val.name)
+        }else{
+          this.$set(this.formData,'materiel',"")
+          this.$set(this.formData,'materielName',"")
+        }
+      },
+
+     /**
+     * 获取用户
+     */
+     getUser(data) {
+        if (data) {
+          this.$set(this.formData,'salesPersonName',data.name)
+          this.$set(this.formData,'salesPerson',data.id)
+        //   this.formData.salesPersonName = data.name;
+        //   this.formData.salesPerson = data.id;
+        //   this.getUserList.forEach(item => {
+        //     if (data.id === item.id) {
+        //       self.formData.salesPersonDept = item.deptId;
+        //         self.formData.deptId= item.deptId;
+        //       return;
+        //     }
+        //   });
+          // if (self.formData.deptId == 0) {
+          //   self.formData.salesPersonDept = "";
+          // }
+          this.setDefaultDept()
+        }
+      },
+      /**
+     * 获取制单人
+     */
+     getUser1(data) {
+        console.log(data)
+        var self = this;
+        if (data) {
+          this.formData.createByName = data.name;
+          this.formData.createBy = data.id;
+        }
+      },
+       //根据当前id,获取一条树枝上的所有id数据
+       treeFindPath (tree, func, path = []) {
+                if (!tree) return []
+                for (const data of tree) {
+                    path.push(data.id)
+                    if (func(data)) return path
+                    if (data.children) {
+                        const findChildren = this.treeFindPath(data.children, func, path)
+                        if (findChildren.length) return findChildren
+                    }
+                    path.pop()
+                }
+                return []
+            },
+      //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
+      setDeptList(tree){
+          for (const data of tree) {
+              if(!data.hasChildren){
+                  data.children=undefined;
+              }else{
+                  this.setDeptList(data.children)
+              }
+          }
+      },
+    //显示默认部门
+    // setDefaultDept(){
+    //     if(this.depOptions.length>0&&this.formData.deptId){
+    //       let id=JSON.stringify( this.formData.deptId)
+    //       let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
+    //       this.salesPersonDept=JSON.parse(JSON.stringify(select_id))
+    //     }
+    //   },
+      // 选择部门
+      handleChange:function(value){
+        this.formData.salesPersonDept=value.length>=1?value[value.length-1]:'';
+        this.salesPersonDept=value;
+      },
+
+
+        /**
+       * 处理选中
+       */
+       handleSelectionChange(val) {
+        this.salesContractIds= val;
+        this.setBtn(val);
+      },
+
+      /**
+       * 删除
+       */
+       remove() {
+        let ids = [];
+          this.salesContractIds.forEach(item => {
+            ids.push(item.salesContractId)
+            console.log(ids)
+          })
+        this.$confirm("确认删除选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.salesAPI
+            .removeContract({salesContractIds: ids})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.search();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "删除失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "删除失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      },
+      /**
+     * 控件操作按钮状态
+     */
+        setBtn(val) {
+        let isFlag = true;
+        let isDelFlag = true;
+        if (val.length > 0) {
+          isDelFlag = false;
+          if (val.length == 1) {
+            isFlag = false;
+          }
+        } else {
+          isFlag = true;
+          isDelFlag = true;
+        }
+        this.btnOtherDisabled = isDelFlag;
+        this.btnDelDisabled = isFlag;
+      },
+      // 合计
+      getSummaries(param){
+        const { columns, data } = param;
+        let sums=[];
+        columns.forEach((column, index) => { //计算不含税金额总计
+
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          if (column.property!=='count'&&column.property!=='taxAmount'&&column.property!=='saleCount') {
+            sums[index] = '';
+            return;
+          }
+
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = '';
+          }
+          if (column.property==='count') {
+            if(sums[index]) {
+              sums[index] = this.summary.totalCount;
+            }
+            return;
+          }
+          if (column.property==='saleCount') {
+            if(sums[index]) {
+              sums[index] = this.summary.totalSaleCount;
+            }
+            return;
+          }
+          if (column.property==='taxAmount') {
+            if(sums[index]) {
+              sums[index] = this.summary.totalTaxAmount;
+            }
+            return;
+          }
+        });
+
+        return sums;
+      },
+
+  }
+}
+</script>
+
+<style scoped></style>
+
+<style>
+/*.el-cascader .el-input {*/
+/*  width: 100% !important;*/
+/*}*/
+
+.process-box .el-select,
+.process-box .el-input {
+  width: 100%;
+}
+
+.process-box .el-table thead {
+  line-height: 1;
+}
+
+.process-box .el-input-number .el-input {
+  width: 100% !important;
+}
+
+.process-box .el-input-number--small {
+  width: 70% !important;
+}
+
+.process-box .form-inline {
+  width: 33.3% !important;
+}
+
+.process-box .el-input-number el-input-number--small {
+  white-space: nowrap;
+
+}
+
+.process-box .el-form-item__content {
+  margin-left: 100px !important;
+}
+
+.process-box .el-form-item__label {
+  width: 100px !important;
+}
+
+.process-box .el-input,
+.process-box .el-form--inline .el-input,
+.process-box .el-cascader--small {
+  width: 100% !important;
+}
+
+.childlist .el-form-item__content {
+  margin-left: 0 !important;
+}
+
+.process-box .el-input--small {
+  width: 70% !important;
+}
+</style>
+
+<style scoped>
+>>>.sys-search .el-input__inner {
+  width: 100%;
+}
+
+.dialog-form {
+  position: relative;
+}
+
+.dialog-line {
+  position: relative;
+  display: flex;
+  justify-content: center;
+  width: 100%;
+}
+
+.dialog-line .dialog-form-inline {
+  position: relative;
+  width: 50%;
+  margin-right: 0;
+}
+
+.dialog-line .dialog-form-inline-single {
+  position: relative;
+  width: 100%;
+  margin-right: 0;
+}
+
+>>>.dialog-line .el-input__inner {
+  width: 100% !important;
+  ;
+}
+
+>>>.dialog-line .el-form-item__content {
+  width: calc(100% - 80px) !important;
+  ;
+}
+
+>>>.dialog-line .el-input,
+>>>.dialog-line .el-cascader {
+  width: 100% !important;
+}
+</style>
diff --git a/src/pages/scm/sales/sales_contract/indexNew.vue b/src/pages/scm/sales/sales_contract/indexNew.vue
index 34dd156..ec5d5a4 100644
--- a/src/pages/scm/sales/sales_contract/indexNew.vue
+++ b/src/pages/scm/sales/sales_contract/indexNew.vue
@@ -1,1492 +1,1516 @@
-<template>
-  <div class="sys-box approve-box">
-    <div class="sys-tabs">
-      <el-tabs v-model="activeName">
-        <el-tab-pane label="我发起的" name="first">
-          <mineTabPage :disableBtn="false" :formTableData="formTableData" :searchParamElement="searchParamElement"
-            :tableData="tableData" :listQuery="search_data" :total="total" :pictLoading="pictLoading" :buttons="buttons"
-            :summary="summary" :showMoreSearch="true" @sortChange="sortChange" @btnClick="btnClick" @getList="getList"
-            @search="search" @moreSearch="moreSearch" @goLink="gotoDetailAll" @handleCurrentChange="handleCurrentChange"
-            @handleSizeChange="handleSizeChange" @getSummaries="getSummaries"
-            @handleSelectionChange="handleSelectionChange"></mineTabPage>
-        </el-tab-pane>
-        <el-tab-pane label="我的审批" name="second">
-          <span slot="label">
-            <el-badge class="item" :value="approveTotal">我审批的</el-badge>
-          </span>
-          <auditTabPage :formTableData="showAuditColumnsDefault" :searchParamElement="searchApproveParamElement"
-            :tableData="auditTableData" :listTitle="'销售订单审批'" :listQuery="approveListQuery" :total="approveTotal"
-            :pictLoading="pictLoading" :buttons="buttons" @btnClick="btnClick" @getList="searchApproveList"
-            @search="searchApproveList" @moreSearch="moreSearch" @gotoDetail="gotoApproveDetail"
-            @handleCurrentChange="handleApproveCurrentChange" @handleSizeChange="handleApproveSizeChange"
-            @handleSelectionChange="handleSelectionChange"></auditTabPage>
-        </el-tab-pane>
-        <el-tab-pane label="已审批的" name="fourth">
-          <approvedPage :disableBtn="false" :formTableData="formTableData" :searchParamElement="searchParamElement"
-            :tableData="tableData" :listQuery="search_data4" :total="total" :pictLoading="pictLoading"
-            :buttons="approvedButton" :summary="summary" :showMoreSearch="true" @btnClick="btnClick" @getList="getList"
-            @search="search" @moreSearch="moreSearch" @goLink="gotoDetailAll" @handleCurrentChange="handleCurrentChange"
-            @handleSizeChange="handleSizeChange" @handleSelectionChange="handleSelectionChange">
-          </approvedPage>
-        </el-tab-pane>
-        <el-tab-pane label="我的团队" name="third">
-          <listTabPage :disableBtn="false" :formTableData="formTableData" :searchParamElement="searchParamElement"
-            :tableData="tableData" :listQuery="search_data2" :total="total" :pictLoading="pictLoading"
-            :buttons="otherButton" :summary="summary" :showMoreSearch="true" @btnClick="btnClick" @getList="getList"
-            @search="search" @moreSearch="moreSearch" @goLink="gotoDetailAll" @handleCurrentChange="handleCurrentChange"
-            @handleSizeChange="handleSizeChange" @handleSelectionChange="handleSelectionChange">
-          </listTabPage>
-        </el-tab-pane>
-        <el-tab-pane label="所有列表" name="end" v-if="isExist('sales:salesContract:allList')">
-          <listTabPage :disableBtn="false" :formTableData="formTableData" :searchParamElement="searchParamElement"
-            :tableData="tableData" :listQuery="search_data3" :total="total" :pictLoading="pictLoading"
-            :buttons="allListButton" :summary="summary" :showMoreSearch="true" @btnClick="btnClick" @getList="getList"
-            @search="search" @moreSearch="moreSearch" @goLink="gotoDetailAll" @handleCurrentChange="handleCurrentChange"
-            @handleSizeChange="handleSizeChange" @handleSelectionChange="handleSelectionChange">
-          </listTabPage>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
-      :before-close="handleClose">
-      <el-table border class="move-table" :data="showTableColumns" row-key="prop_" :key="Math.random()" max-height="350"
-        style="width: 100%">
-        <el-table-column prop="title" label="列表名称"> </el-table-column>
-        <el-table-column prop="select" label="是否显示">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select"> </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-    <!-- 高级查询对话框 -->
-    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
-      <el-form :inline="true" v-loading="dialogLoading" label-width="80px" class="dialog-form" ref="form"
-        style="width: 620px">
-        <div class="dialog-line">
-          <el-form-item label="合同时间" class="dialog-form-inline-single">
-            <el-date-picker v-model="formDataTime" type="daterange" format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd HH:mm:ss" range-separator="—" start-placeholder="开始时间"
-              end-placeholder="结束时间"></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="合同类型" class="dialog-form-inline">
-            <el-select v-model="formData.contractType" style="width:100%" clearable placeholder="请选择"
-              @change="changeFacility">
-              <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="客户" class="dialog-form-inline">
-            <el-input placeholder="请输入客户名" v-model="formData.clientName" clearable></el-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="物料" class="dialog-form-inline">
-            <btn-input :valueText.sync="formData.materielName" :valueId.sync="formData.materiel"
-              :chooseVisible.sync="chooseMaterielVisible"></btn-input>
-          </el-form-item>
-          <el-form-item label="规格型号" class="dialog-form-inline">
-            <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="销售部门" class="dialog-form-inline">
-            <el-cascader v-model="salesPersonDept" clearable :options="depOptions" :props="{
-              expandTrigger: 'hover',
-              label: 'text',
-              value: 'id',
-              checkStrictly: true
-            }" @change="handleChange"></el-cascader>
-          </el-form-item>
-          <el-form-item label="审核状态" class="dialog-form-inline">
-            <el-select v-model="formData.auditSign" style="width:100%" clearable placeholder="请选择"
-              @change="changeFacility">
-              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="销售员" prop="salesPersonName" class="dialog-form-inline">
-            <btn-input :valueText.sync="formData.salesPersonName" :valueId.sync="formData.salesPerson"
-              :chooseVisible.sync="chooseUserVisible"></btn-input>
-          </el-form-item>
-          <el-form-item label="制单人" prop="createByName" class="dialog-form-inline">
-            <btn-input :valueText.sync="formData.createByName" :valueId.sync="formData.createBy"
-              :chooseVisible.sync="chooseUserVisible1"></btn-input>
-          </el-form-item>
-        </div>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">确定</el-button>
-        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
-        <el-button type="primary" @click="clear">清空</el-button>
-      </span>
-    </el-dialog>
-    <!--选择用户-->
-    <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
-    <!--选择制单人-->
-    <DialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></DialogChooseSingleUser1>
-    <!--选择物料-->
-    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel"></dialogChooseSingleParts>
-  </div>
-</template>
-
-<script>
-import { mapState, mapActions, mapGetters } from "vuex";
-import btnInput from "@/components/btnInput.vue";
-import FileSaver from "file-saver";
-import config from "@/utils/config.js";
-import Cookies from "js-cookie";
-import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
-import DialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
-import { formatDateTime, getCurrentDate } from "@/utils/tools.js";
-import mineTabPage from "@/components/TabPages/mineTabPage";
-import listTabPage from "@/components/TabPages/listTabPage";
-import auditTabPage from "@/components/TabPages/auditTabPage";
-import approvedPage from "@/components/TabPages/approvedPage";
-import Sortable from "sortablejs";
-export default {
-  components: {
-    btnInput,
-    DialogChooseSingleUser,
-    DialogChooseSingleUser1,
-    dialogChooseSingleParts,
-    mineTabPage,
-    listTabPage,
-    auditTabPage,
-    approvedPage
-  },
-  data() {
-    return {
-      total: 0, //总条数
-      approveTotal: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      activeName: "first",
-      search_data: {
-        tabType: 0,
-        pageno: 1,
-        pagesize: 10
-      },
-      search_data1: {
-        tabType: 0,
-        pageno: 1,
-        pagesize: 10
-      },
-      search_data2: {
-        tabType: 1,
-        pageno: 1,
-        pagesize: 10
-      },
-      search_data3: {
-        tabType: 2,
-        pageno: 1,
-        pagesize: 10
-      },
-      search_data4: {
-        tabType: 3,
-        pageno: 1,
-        pagesize: 10
-      },
-      approveListQuery: {
-        type: 3,
-        pageno: 1,
-        pagesize: 5
-      },
-      formData: {
-        startTime: "",
-        endTime: "",
-        contractType: "",
-        contractTypeName: "",
-        unitUomName: "",
-        clientName: "",
-        materielName: "",
-        specification: "",
-        auditSign: "",
-        salesPersonName: "",
-        salesPerson: "",
-        // createTime: '',
-        deptId: "",
-        salesPersonDept: "",
-        createBy: "", //制单人id
-        createByName: ""
-      },
-      exportList: [],
-      elOptionList: [],
-      searchParamElement: [
-        {
-          key: 0,
-          label: "合同编号",
-          searchType: "inputElement",
-          placeholder: "合同编号",
-          model: "contractCode",
-          clearable: true
-        },
-        {
-          key: 1,
-          label: "客户名称",
-          searchType: "inputElement",
-          placeholder: "客户",
-          model: "clientName",
-          clearable: true
-        },
-        {
-          key: 2,
-          label: "物料名称",
-          searchType: "inputElement",
-          placeholder: "物料名称",
-          model: "materielName",
-          clearable: true
-        },
-        {
-          key: 3,
-          label: "客户合同编号",
-          searchType: "inputElement",
-          placeholder: "客户合同编号",
-          model: "clientContractCode",
-          clearable: true
-        },
-        {
-          key: 4,
-          label: "合同日期",
-          searchType: "dateElement",
-          placeholder: "请选择时间段",
-          model: "timeArea",
-          clearable: true
-        }
-      ],
-      searchApproveParamElement: [
-        {
-          label: "合同编号",
-          searchType: "inputElement",
-          placeholder: "合同编号",
-          model: "dataCode",
-          clearable: true
-        },
-        {
-          label: "客户",
-          searchType: "inputElement",
-          placeholder: "模糊搜索",
-          model: "clientName",
-          clearable: true
-        },
-        // {label:"物料",searchType:"inputElement",placeholder:"模糊搜索",model: "materielName",clearable:true},
-        {
-          label: "合同日期",
-          searchType: "dateElement",
-          placeholder: "请选择时间段",
-          model: "timeArea",
-          clearable: true
-        }
-      ],
-      buttons: [
-        {
-          key: 0,
-          btnName: "新增",
-          vhas: "sales:salesContract:add",
-          click: "goAdd",
-          type: "primary",
-          disabled: false
-        },
-        {
-          key: 1,
-          btnName: "删除",
-          vhas: "sales:salesContract:remove",
-          click: "remove",
-          type: "primary",
-          disabled: true
-        },
-        {
-          key: 2,
-          btnName: "导出",
-          vhas: "sales:salesContract:exportExcel",
-          click: "exportExcel",
-          type: "primary",
-          disabled: false
-        },
-        {
-          key: 3,
-          btnName: "关闭",
-          vhas: "sales:salesContract:close",
-          click: "close",
-          type: "primary",
-          disabled: true
-        },
-        {
-          key: 4,
-          btnName: "开启",
-          vhas: "sales:salesContract:reverseClose",
-          click: "reverseClose",
-          type: "primary",
-          disabled: true
-        },
-        {
-          key: 5,
-          btnName: "变更",
-          vhas: "sales:salesContract:change",
-          click: "change",
-          type: "primary",
-          disabled: true
-        },
-        {
-          key: 6,
-          btnName: "变更记录",
-          vhas: "sales:salesContract:gotoAlterationList",
-          click: "gotoAlterationList",
-          type: "primary",
-          disabled: true
-        },
-        {
-          key: 7,
-          btnName: "列表配置",
-          click: "showColumnSetDialog",
-          vhas: "",
-          type: "primary",
-          disabled: false
-        },
-        {
-          key: 8,
-          btnName: "关联单据",
-          click: "associatedDocument",
-          type: "primary",
-          disabled: true
-        },
-        {
-          key: 9,
-          btnName: "同步ERP",
-          click: "tberp",
-          type: "primary",
-          disabled: false
-        }
-      ],
-      //
-      otherButton: [
-        {
-          key: 0,
-          btnName: "导出",
-          vhas: "sales:salesContract:exportExcel",
-          click: "exportExcel",
-          type: "primary",
-          disabled: false
-        },
-        {
-          key: 1,
-          btnName: "变更记录",
-          vhas: "sales:salesContract:gotoAlterationList",
-          click: "gotoAlterationList",
-          type: "primary",
-          disabled: true
-        }
-      ],
-      allListButton: [
-        {
-          key: 0,
-          btnName: "导出",
-          vhas: "sales:salesContract:exportExcel",
-          click: "exportExcel",
-          type: "primary",
-          disabled: false
-        },
-        // {key:1,btnName:"删除",vhas:"sales:salesContract:remove",click:"remove",type:"primary",disabled:true},
-        // {key:1,btnName:"反审核",vhas:"sales:salesContract:disAudit",click:"disAudit",type:"primary",disabled:true},
-        {
-          key: 2,
-          btnName: "变更记录",
-          vhas: "sales:salesContract:gotoAlterationList",
-          click: "gotoAlterationList",
-          type: "primary",
-          disabled: true
-        }
-      ],
-      approvedButton: [
-        {
-          key: 0,
-          btnName: "导出",
-          vhas: "sales:salesContract:exportExcel",
-          click: "exportExcel",
-          type: "primary",
-          disabled: false
-        },
-        // {key:1,btnName:"删除",vhas:"sales:salesContract:remove",click:"remove",type:"primary",disabled:true},
-        // {key:1,btnName:"反审核",vhas:"sales:salesContract:disAudit",click:"disAudit",type:"primary",disabled:true},
-        {
-          key: 2,
-          btnName: "变更记录",
-          vhas: "sales:salesContract:gotoAlterationList",
-          click: "gotoAlterationList",
-          type: "primary",
-          disabled: true
-        }
-      ],
-      //默认审批页面列表
-      showAuditColumnsDefault: [
-        // {title: "审批标题", prop_: "title",content:"销售订单审批", select: true},
-        { title: "申请人", prop_: "approveApplicantName", select: true },
-        { title: "申请时间", prop_: "submitTime", select: true },
-        {
-          title: "审批状态",
-          prop_: "approveStatusName",
-          select: true,
-          sortable: true
-        }
-      ],
-      auditTableData: [],
-      //默认列表数据
-      showTableColumnsDefault: [
-        { title: "合同日期", prop_: "contractDate", select: true },
-        { title: "合同编号", prop_: "contractCode", select: true },
-        { title: "合同类型", prop_: "contractTypeName", select: true },
-        { title: "客户合同编号", prop_: "clientContractCode", select: true },
-        { title: "关闭标志", prop_: "closeStatusName", select: true },
-        { title: "客户名称", prop_: "clientName", select: true },
-        { title: "销售员", prop_: "salesPersonName", select: true },
-        { title: "销售部门", prop_: "salesPersonDeptName", select: true },
-        { title: "发货是否检验", prop_: "isCheck", select: true },
-        { title: "物料代码", prop_: "materielSerialNo", select: true },
-        { title: "物料名称", prop_: "materielName", select: true },
-        { title: "规格型号", prop_: "specification", select: true },
-        { title: "主计量单位", prop_: "unitUomName", select: true },
-        { title: "主单位数量", prop_: "count", select: true },
-        { title: "辅助单位", prop_: "supportUomName", select: true },
-        { title: "销售数量", prop_: "saleCount", select: true },
-        { title: "含税单价（元）", prop_: "taxUnitPrice", select: true },
-        { title: "销售金额（元）", prop_: "taxAmount", select: true },
-        {
-          title: "交货日期",
-          prop_: "deliveryDate",
-          select: true,
-          sortable: true
-        },
-        // {title: "审核状态", prop_: "auditSignName", select: true},
-        { title: "审批状态", prop_: "approveStatusName", select: true },
-        { title: "行关闭状态", prop_: "itemCloseStatusName", select: true },
-        { title: "行关闭时间", prop_: "itemCloseTime", select: true },
-        { title: "行关闭原因", prop_: "itemCloseReason", select: true }
-      ],
-      ///弹出页面列表数据
-      showTableColumns: [
-        { title: "合同日期", prop_: "contractDate", select: true },
-        { title: "合同编号", prop_: "contractCode", select: true },
-        { title: "合同类型", prop_: "contractTypeName", select: true },
-        { title: "关闭标志", prop_: "closeStatusName", select: true },
-        { title: "客户名称", prop_: "clientName", select: true },
-        { title: "销售员", prop_: "salesPersonName", select: true },
-        { title: "销售部门", prop_: "salesPersonDeptName", select: true },
-        { title: "发货是否检验", prop_: "isCheck", select: true },
-        { title: "物料代码", prop_: "materielSerialNo", select: true },
-        { title: "物料名称", prop_: "materielName", select: true },
-        { title: "规格型号", prop_: "specification", select: true },
-        { title: "主计量单位", prop_: "unitUomName", select: true },
-        { title: "主单位数量", prop_: "count", select: true },
-        { title: "辅助单位", prop_: "supportUomName", select: true },
-        { title: "销售数量", prop_: "saleCount", select: true },
-        { title: "含税单价（元）", prop_: "taxUnitPrice", select: true },
-        { title: "销售金额（元）", prop_: "taxAmount", select: true },
-        {
-          title: "交货日期",
-          prop_: "deliveryDate",
-          select: true,
-          sortable: true
-        },
-        // {title: "审核状态", prop_: "auditSignName", select: true},
-        { title: "审批状态", prop_: "approveStatusName", select: true },
-        { title: "行关闭状态", prop_: "itemCloseStatusName", select: true },
-        { title: "行关闭时间", prop_: "itemCloseTime", select: true },
-        { title: "行关闭原因", prop_: "itemCloseReason", select: true }
-      ],
-      showTableColumnsTemp: [], //弹框弹出的时候，保存当前的列表数据
-      //显示的列表字段
-      formTableData: [],
-      alterationDetailId: "",
-      contractList: [],
-      contractData: [],
-      tableData1: [],
-      summary: {},
-      formDataTime: "",
-      time: "",
-      salesTime: "",
-      tableData: [],
-      depOptions: [],
-      salesPersonDept: "",
-      options: [],
-      typeList: [],
-      config: config,
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      advanceQueryDialogVisible: false,
-      chooseUserVisible: false,
-      chooseUserVisible1: false,
-      chooseMaterielVisible: false, //物料
-      dialogLoading: false,
-      dialogTitle: "",
-      pictLoading: false,
-      columnSetDialogTitle: "设置显示字段列表",
-      columnSetDialogVisible: false,
-      salesContractIds: [],
-      tableId: "sales_contract_table",
-      tbody: ""
-    };
-  },
-  watch: {
-    time(val) {
-      if (val) {
-        this.search_data.startTime = val[0];
-        this.search_data.endTime = val[1];
-      } else {
-        this.search_data.startTime = "";
-        this.search_data.endTime = "";
-      }
-    },
-
-    btnDelDisabled(val) {
-      this.buttons[1].disabled = val;
-      // this.allListButton[1].disabled = val
-      // this.approvedButton[1].disabled = val
-    },
-    btnOtherDisabled(val) {
-      // this.buttons[2].disabled = val
-      this.buttons[3].disabled = val;
-      this.buttons[4].disabled = val;
-      this.buttons[5].disabled = val;
-      this.buttons[6].disabled = val;
-      this.buttons[8].disabled = val;
-      this.otherButton[1].disabled = val;
-      this.allListButton[1].disabled = val;
-      // this.allListButton[3].disabled = val
-      this.approvedButton[1].disabled = val;
-      // this.approvedButton[3].disabled = val
-    },
-    activeName(val) {
-      if (val === "first") {
-        this.search_data = this.search_data1;
-        this.getList(0);
-      } else if (val === "second") {
-        // this.search_data.tabType=null
-      } else if (val === "third") {
-        this.search_data = this.search_data2;
-        this.getList();
-      } else if (val === "fourth") {
-        this.search_data = this.search_data4;
-        this.getList();
-      } else if (val === "end") {
-        this.search_data = this.search_data3;
-        this.getList();
-      }
-    },
-    formDataTime(val) {
-      if (val) {
-        this.formData.startTime = val[0];
-        this.formData.endTime = val[1];
-      } else {
-        this.formData.startTime = "";
-        this.formData.endTime = "";
-      }
-    }
-  },
-  created() {
-    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.showTableColumnsTemp = JSON.parse(
-      JSON.stringify(this.showTableColumns)
-    );
-    this.myApproveList();
-    this.getList(0);
-    this.getShowColumns();
-    this.initData();
-  },
-  mounted() {
-    // this.rowDrop()
-    if (this.$route.query.active) {
-      this.activeName = "second";
-    }
-  },
-  methods: {
-    associatedDocument() {
-      let data = this.salesContractIds[0];
-      this.$router.push({
-        path: "/sales/salesContract_associatedDocument",
-        query: {
-          id: data.salesContractId,
-          clientName: data.clientName,
-          contractCode: data.contractCode,
-          t: Date.now()
-        }
-      });
-    },
-    // 所有列表展示
-    isExist(val) {
-      let isExist = false;
-      // 从浏览器缓存中获取权限数组
-      var buttonpermsStr = localStorage.getItem("btnContext");
-      if (buttonpermsStr === undefined || buttonpermsStr == null) {
-        return false;
-      } else {
-        JSON.parse(buttonpermsStr).forEach(element => {
-          //匹配缓存中的数据中有没有匹配的值
-          if (element == val) {
-            // 若在按钮中定义的权限字段能在后端返回的权限数组中能找到，则该按钮可显示
-            isExist = true;
-          }
-        });
-      }
-      return isExist;
-    },
-    btnClick(val) {
-      console.log("根据方法名称调用");
-      if (val === "goAdd") {
-        this.goAdd();
-      } else if (val == "showColumnSetDialog") {
-        this.showColumnSetDialog();
-      } else if (val == "remove") {
-        this.remove();
-      } else if (val == "disAudit") {
-        this.disAudit();
-      } else if (val === "exportExcel") {
-        this.exportExcel();
-      } else if (val === "close") {
-        this.close();
-      } else if (val === "reverseClose") {
-        this.reverseClose();
-      } else if (val === "change") {
-        this.change();
-      } else if (val === "gotoAlterationList") {
-        this.gotoAlterationList();
-      } else if (val === "associatedDocument") {
-        this.associatedDocument();
-      } else if (val === "tberp") {
-        this.tberp();
-      }
-    },
-    tberp() {
-      this.$api.yxkAPI.yxkGet("/api/saleContract/u8Sync", {}).then(res => {
-        if (res.code == 0) {
-          this.$confirm("数据同步成功,请确认", "提醒", {
-            type: "warning"
-          }).then(() => {
-            this.search_data = {
-              tabType: 0,
-              pageno: 1,
-              pagesize: 10
-            };
-            this.getList();
-          });
-        }
-      });
-    },
-    // 查询审批列表
-    searchApproveList() {
-      this.approveListQuery.pagesize = 5;
-      this.approveListQuery.pageno = 1;
-      this.myApproveList();
-    },
-    //进入审核页面
-    gotoApproveDetail(row) {
-      this.$router.push({
-        path: "/sales/salesContract_approve_detail",
-        query: {
-          id: row.salesContractId,
-          instanceId: row.instanceId,
-          taskId: row.taskId,
-          tabType: this.search_data.tabType,
-          t: Date.now()
-        }
-      });
-    },
-    gotoDetailAll(row) {
-      if (
-        row.approveState == 0 ||
-        row.approveState == 2 ||
-        row.approveState == 3
-      ) {
-        this.$router.push({
-          path: "/sales/salesContract_add",
-          query: { id: row.salesContractId, t: Date.now() }
-        });
-      } else {
-        this.$router.push({
-          path: "/sales/salesContract_detail",
-          query: { id: row.salesContractId, t: Date.now() }
-        });
-      }
-    },
-    sortChange(val) {
-      console.log(val);
-      this.search_data.sort = "item.delivery_date";
-      this.search_data.order = val.order == "ascending" ? "asc" : "desc";
-      this.getList();
-    },
-    myApproveList() {
-      this.pictLoading = true;
-      console.log(this.approveListQuery);
-      this.$api.scmApproveAPI
-        .myApproveList(this.approveListQuery)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.code == 0) {
-            if (res.data && res.data.list) {
-              this.auditTableData = res.data.list;
-              this.approveTotal = res.data.total;
-            } else {
-              this.auditTableData = [];
-              this.approveTotal = 0;
-            }
-            if (this.auditTableData.length) {
-              this.auditTableData.forEach(item => {
-                if (item.approveState == 0) {
-                  item.approveStatusName = "暂存";
-                } else if (item.approveState == 1) {
-                  item.approveStatusName = "待审批";
-                } else if (item.approveState == 2) {
-                  item.approveStatusName = "已驳回";
-                } else if (item.approveState == 3) {
-                  item.approveStatusName = "审批通过";
-                }
-                item.summary = [
-                  { label: "合同编号", value: item.contractCode },
-                  { label: "客户", value: item.clientName },
-                  { label: "合同类型", value: item.contractTypeName },
-                  { label: "合同日期", value: item.contractDate },
-                  { label: "合同总金额", value: item.allTaxAmount }
-                ];
-              });
-            }
-          }
-        })
-        .catch(r => {});
-    },
-    // 变更合同列表页
-    gotoAlterationList() {
-      let id = this.salesContractIds[0].salesContractId;
-      this.$router.push({
-        path: "/sales/salesContract_alterationList",
-        query: { id: id, t: Date.now() }
-      });
-    },
-
-    // 返回首页
-    gotoIndex() {
-      this.chooseProVisible = false;
-    },
-    // 变更
-    change() {
-      if (
-        this.salesContractIds[0].approveStatusName === "审批通过" &&
-        this.salesContractIds[0].closeStatusName === "未关闭"
-      ) {
-        let id = this.salesContractIds[0].salesContractId;
-        this.$router.push({
-          path: "/sales/salesContract_edit",
-          query: { id: id, t: Date.now() }
-        });
-      } else {
-        this.$message({
-          message: "选中项已关闭或未审核",
-          type: "error"
-        });
-      }
-    },
-
-    /**
-     * 关闭
-     */
-    close() {
-      let id = this.salesContractIds[0].salesContractId;
-      this.$confirm("确认终止选中的项吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.salesAPI.closeContract({ id: id }).then(res => {
-          if (res.code === 0) {
-            this.$message({
-              message: res.msg,
-              type: "success"
-            });
-            this.getList();
-          } else {
-            this.$message({
-              message: res.msg,
-              type: "error"
-            });
-          }
-        });
-      });
-    },
-    // 反关闭
-    reverseClose() {
-      let id = this.salesContractIds[0].salesContractId;
-      this.$confirm("确认开启选中的项吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.salesAPI.reverseClose({ id: id }).then(res => {
-          if (res.code === 0) {
-            this.$message({
-              message: res.msg,
-              type: "success"
-            });
-            this.getList();
-          } else {
-            this.$message({
-              message: res.msg,
-              type: "error"
-            });
-          }
-        });
-      });
-    },
-    // 导出
-    exportExcel() {
-      delete this.search_data.pagesize;
-      delete this.search_data.pageno;
-      this.$api.salesAPI.exportExcel(this.search_data).then(res => {});
-    },
-    /**
-     * 反审核
-     */
-    disAudit() {
-      let id = this.salesContractIds[0].salesContractId;
-      this.$confirm("确认反审核选中的项吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.salesAPI.reverseAuditContract({ id: id }).then(res => {
-          if (res.code === 0) {
-            this.$message({
-              message: res.msg,
-              type: "success"
-            });
-            this.getList();
-          } else {
-            this.$message({
-              message: res.msg,
-              type: "error"
-            });
-          }
-        });
-      });
-    },
-
-    /**
-     * 审核
-     */
-    audit() {
-      let id = this.salesContractIds[0].salesContractId;
-      this.$confirm("确认审核选中的项吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.salesAPI.auditContract({ id: id }).then(res => {
-          if (res.code === 0) {
-            this.$message({
-              message: res.msg,
-              type: "success"
-            });
-            this.getList();
-          } else {
-            this.$message({
-              message: res.msg,
-              type: "error"
-            });
-          }
-        });
-      });
-    },
-
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-
-    // 跳转到查看页面
-    gotoDetail(row) {
-      console.log("跳转详情页面");
-      this.$router.push({
-        path: "/sales/salesContract_add",
-        query: { id: row.salesContractId, t: Date.now() }
-      });
-    },
-
-    // 前往新增页面
-    goAdd() {
-      this.$router.push({
-        path: "/sales/salesContract_add",
-        query: { t: Date.now() }
-      });
-    },
-    liftForExport() {
-      if (n == 0) {
-        this.search_data1 = this.search_data;
-      }
-      // this.pictLoading = true;
-      this.$api.salesAPI
-        .listForExport(this.search_data)
-        .then(res => {
-          // this.pictLoading = false;
-          if (res.data) {
-            // this.summary = res.total
-            // this.total = res.data.totalRows;
-            this.exportList = res.data.list ? res.data.list : [];
-            this.exportList.forEach(item => {
-              // item.contractDate = item.contractDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.contractDate):""
-              // item.deliveryDate = item.deliveryDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.deliveryDate):""
-              if (item.approveState == 0) {
-                item.approveStatusName = "暂存";
-              } else if (item.approveState == 1) {
-                item.approveStatusName = "待审批";
-              } else if (item.approveState == 2) {
-                item.approveStatusName = "已驳回";
-              } else if (item.approveState == 3) {
-                item.approveStatusName = "审批通过";
-              }
-            });
-          } else {
-            // this.total = 0;
-            this.exportList = [];
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    // 获取销售订单列表
-    getList(n) {
-      // if(val){
-      //   this.search_data.contractCode=val[0]
-      //   this.search_data.clientName=val[1]
-      //   this.search_data.materielName=val[2]
-      // }
-      if (n == 0) {
-        this.search_data1 = this.search_data;
-      }
-      this.pictLoading = true;
-      this.$api.salesAPI
-        .listSalesContract(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if (res.data) {
-            this.summary = res.total;
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-            this.tableData.forEach(item => {
-              // item.contractDate = item.contractDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.contractDate):""
-              // item.deliveryDate = item.deliveryDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.deliveryDate):""
-              if (item.approveState == 0) {
-                item.approveStatusName = "暂存";
-              } else if (item.approveState == 1) {
-                item.approveStatusName = "待审批";
-              } else if (item.approveState == 2) {
-                item.approveStatusName = "已驳回";
-              } else if (item.approveState == 3) {
-                item.approveStatusName = "审批通过";
-              }
-            });
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-
-    //设置显示字段
-    showColumnSetDialog() {
-      this.columnSetDialogVisible = true;
-      this.showTableColumnsTemp = JSON.parse(
-        JSON.stringify(this.showTableColumns)
-      );
-      // 行拖拽
-      // this.rowDrop()
-    },
-    //前移
-    toUp(scope) {
-      if (scope.$index == 0) {
-        return false;
-      }
-      let n;
-      for (let i = 0; i < this.showTableColumns.length; i++) {
-        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-          n = i;
-        }
-      }
-      let temp = this.showTableColumns[n];
-      this.showTableColumns[n] = this.showTableColumns[n - 1];
-      this.showTableColumns[n - 1] = temp;
-      this.$forceUpdate();
-    },
-    //后移
-    toDown(scope) {
-      if (scope.$index == this.showTableColumns.length - 1) {
-        return false;
-      }
-      let n;
-      for (let i = 0; i < this.showTableColumns.length; i++) {
-        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-          n = i;
-        }
-      }
-      let temp = this.showTableColumns[n];
-      this.showTableColumns[n] = this.showTableColumns[n + 1];
-      this.showTableColumns[n + 1] = temp;
-      this.$forceUpdate();
-    },
-    //恢复默认
-    toDefault() {
-      this.showTableColumns = JSON.parse(
-        JSON.stringify(this.showTableColumnsDefault)
-      );
-      this.$forceUpdate();
-    },
-    //完成列表字段设置
-    saveAndCloseColumnSetDialog() {
-      let tableNo = this.tableId;
-      let tableColumns = JSON.stringify(this.showTableColumns);
-      this.columnSetDialogVisible = false;
-      this.$api.tableColumnAPI
-        .saveShowColumns({ tableNo: tableNo, tableColumns: tableColumns })
-        .then(res => {
-          let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-          this.formTableData = [];
-          for (let i = 0; i < arr.length; i++) {
-            if (arr[i].select) {
-              this.formTableData.push(arr[i]);
-            }
-          }
-          this.getShowColumns();
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    //关闭字段设置弹出
-    handleClose() {
-      this.showTableColumns = JSON.parse(
-        JSON.stringify(this.showTableColumnsTemp)
-      );
-      this.columnSetDialogVisible = false;
-    },
-    /**
-     * 获取显示字段
-     */
-    getShowColumns() {
-      let tableNo = this.tableId;
-      this.formTableData = [];
-
-      this.$api.tableColumnAPI
-        .getShowColumns({ tableNo: tableNo })
-        .then(res => {
-          if (res.code == 0) {
-            if (res.results) {
-              this.showTableColumns = JSON.parse(res.results);
-              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-              for (let i = 0; i < arr.length; i++) {
-                if (arr[i].select) {
-                  this.formTableData.push(arr[i]);
-                }
-              }
-              this.$forceUpdate();
-            } else {
-              let arr = JSON.parse(
-                JSON.stringify(this.showTableColumnsDefault)
-              );
-              for (let i = 0; i < arr.length; i++) {
-                if (arr[i].select) {
-                  this.formTableData.push(arr[i]);
-                }
-              }
-              this.$forceUpdate();
-            }
-          } else {
-            this.$message({
-              message: res.msg ? res.msg : "获取列表信息失败",
-              type: "error"
-            });
-          }
-        })
-        .catch(r => {
-          this.$message({
-            message: r,
-            type: "error"
-          });
-          console.log(r);
-        });
-    },
-
-    // 查询
-    search() {
-      this.search_data.pageno = 1;
-      this.search_data.pagesize = 10;
-      this.getList();
-    },
-
-    /**
-     * 高级查询
-     */
-    moreSearch() {
-      this.advanceQueryDialogVisible = true;
-      this.dialogTitle = "高级查询";
-    },
-    save() {
-      for (var n in this.formData) {
-        this.search_data[n] = this.formData[n];
-      }
-      this.search_data.inDatas = "";
-      this.time = this.formDataTime;
-      this.search_data.pageno = 1;
-      this.$nextTick(function() {
-        this.advanceQueryDialogVisible = false;
-        this.getList();
-      });
-    },
-    //清空
-    clear() {
-      for (var n in this.formData) {
-        this.formData[n] = "";
-      }
-      this.formDataTime = "";
-      this.salesPersonDept = "";
-      // this.createTime = "";
-    },
-    changeFacility() {
-      this.$forceUpdate();
-    },
-
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-    // 每页显示多少条
-    handleApproveSizeChange(val) {
-      this.approveListQuery.pagesize = val;
-      this.myApproveList();
-    },
-    // 上下分页
-    handleApproveCurrentChange(val) {
-      this.approveListQuery.pageno = val;
-      this.myApproveList();
-    },
-    /**
-     * 初始化
-     */
-    initData() {
-      // 获取审核状态
-      this.$api.salesAPI
-        .listAauditSign({
-          type: "audit_status"
-        })
-        .then(res => {
-          this.options = res.datas;
-        });
-      //  获取合同类型
-      this.$api.salesAPI
-        .listContractType({
-          type: "sales_contract_type"
-        })
-        .then(res => {
-          this.typeList = res.datas;
-        });
-      // 获取生产部门
-      Promise.all([
-        this.$api.commonAPI.getDeptsTree(),
-        this.$api.roleAPI.list()
-      ])
-        .then(([r1, r2]) => {
-          if (r1.code === 0) {
-            this.depOptions = r1.data.children;
-            // this.setDefaultDept();
-            this.setDeptList(this.depOptions);
-          }
-          if (r2.code === 0) {
-            this.roleList = r2.datas;
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    getMateriel(val) {
-      if (val) {
-        this.$set(this.formData, "materiel", val.id);
-        this.$set(this.formData, "materielName", val.name);
-      } else {
-        this.$set(this.formData, "materiel", "");
-        this.$set(this.formData, "materielName", "");
-      }
-    },
-
-    /**
-     * 获取用户
-     */
-    getUser(data) {
-      if (data) {
-        this.$set(this.formData, "salesPersonName", data.name);
-        this.$set(this.formData, "salesPerson", data.id);
-        //   this.formData.salesPersonName = data.name;
-        //   this.formData.salesPerson = data.id;
-        //   this.getUserList.forEach(item => {
-        //     if (data.id === item.id) {
-        //       self.formData.salesPersonDept = item.deptId;
-        //         self.formData.deptId= item.deptId;
-        //       return;
-        //     }
-        //   });
-        // if (self.formData.deptId == 0) {
-        //   self.formData.salesPersonDept = "";
-        // }
-        this.setDefaultDept();
-      }
-    },
-    /**
-     * 获取制单人
-     */
-    getUser1(data) {
-      console.log(data);
-      var self = this;
-      if (data) {
-        this.formData.createByName = data.name;
-        this.formData.createBy = data.id;
-      }
-    },
-    //根据当前id,获取一条树枝上的所有id数据
-    treeFindPath(tree, func, path = []) {
-      if (!tree) return [];
-      for (const data of tree) {
-        path.push(data.id);
-        if (func(data)) return path;
-        if (data.children) {
-          const findChildren = this.treeFindPath(data.children, func, path);
-          if (findChildren.length) return findChildren;
-        }
-        path.pop();
-      }
-      return [];
-    },
-    //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
-    setDeptList(tree) {
-      for (const data of tree) {
-        if (!data.hasChildren) {
-          data.children = undefined;
-        } else {
-          this.setDeptList(data.children);
-        }
-      }
-    },
-    //显示默认部门
-    // setDefaultDept(){
-    //     if(this.depOptions.length>0&&this.formData.deptId){
-    //       let id=JSON.stringify( this.formData.deptId)
-    //       let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
-    //       this.salesPersonDept=JSON.parse(JSON.stringify(select_id))
-    //     }
-    //   },
-    // 选择部门
-    handleChange: function(value) {
-      this.formData.salesPersonDept =
-        value.length >= 1 ? value[value.length - 1] : "";
-      this.salesPersonDept = value;
-    },
-
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.salesContractIds = val;
-      this.setBtn(val);
-    },
-
-    /**
-     * 删除
-     */
-    remove() {
-      let ids = [];
-      this.salesContractIds.forEach(item => {
-        ids.push(item.salesContractId);
-        console.log(ids);
-      });
-      this.$confirm("确认删除选中的项吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.salesAPI
-          .removeContract({ salesContractIds: ids })
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.search();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    },
-    // 合计
-    getSummaries(param) {
-      const { columns, data } = param;
-      console.log("zhuyemian汇总");
-      console.log(param);
-      let sums = [];
-      columns.forEach((column, index) => {
-        //计算不含税金额总计
-
-        if (index === 0) {
-          sums[index] = "合计";
-          return;
-        }
-        if (
-          column.property !== "count" &&
-          column.property !== "taxAmount" &&
-          column.property !== "saleCount"
-        ) {
-          sums[index] = "";
-          return;
-        }
-
-        const values = data.map(item => Number(item[column.property]));
-        if (!values.every(value => isNaN(value))) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0);
-        } else {
-          sums[index] = "";
-        }
-        if (column.property === "count") {
-          if (sums[index]) {
-            sums[index] = this.summary.totalCount;
-          }
-          return;
-        }
-        if (column.property === "saleCount") {
-          if (sums[index]) {
-            sums[index] = this.summary.totalSaleCount;
-          }
-          return;
-        }
-        if (column.property === "taxAmount") {
-          if (sums[index]) {
-            sums[index] = this.summary.totalTaxAmount;
-          }
-          return;
-        }
-      });
-      console.log(this.summary);
-      return sums;
-    },
-    //行拖拽
-    rowDrop() {
-      const _this = this;
-      this.$nextTick(() => {
-        const tbody = document.querySelector(
-          ".move-table .el-table__body-wrapper tbody"
-        );
-        Sortable.create(tbody, {
-          onEnd({ newIndex, oldIndex }) {
-            const currRow = _this.showTableColumns.splice(oldIndex, 1)[0];
-            _this.showTableColumns.splice(newIndex, 0, currRow);
-          }
-        });
-      });
-    }
-  }
-};
-</script>
-<style scoped>
-.approve-box .sys-tabs .el-tabs__nav-wrap {
-  padding: 5px 20px 0px;
-}
-
-.approve-box .sys-tabs .el-tabs__item {
-  padding-top: 10px;
-  height: 50px;
-}
-
-.approve-box .el-timeline-item__content {
-  line-height: 1.5;
-}
-
-.approve-box .el-dialog__body {
-  padding-top: 0px;
-}
-</style>
-<style>
-.approve-box .sys-tabs .el-tabs__nav-wrap {
-  padding: 5px 20px 0px;
-}
-
-.approve-box .sys-tabs .el-tabs__item {
-  padding-top: 10px;
-  height: 50px;
-}
-
-.approve-box .el-timeline-item__content {
-  line-height: 1.5;
-}
-
-.approve-box .el-dialog__body {
-  padding-top: 0px;
-}
-
-.approve-form .el-form-item {
-  margin-bottom: 0px;
-}
-
-.approve-timeline .el-timeline-item__wrapper {
-  padding-top: 10px;
-  padding-left: 80px;
-}
-
-.approve-timeline .el-timeline-item__tail {
-  left: 30px;
-  border-left-width: 4px;
-}
-</style>
+<template>
+  <div class="sys-box approve-box">
+    <div class="sys-tabs">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="我发起的" name="first">
+          <mineTabPage :disableBtn="false" :formTableData="formTableData" :searchParamElement="searchParamElement"
+            :tableData="tableData" :listQuery="search_data" :total="total" :pictLoading="pictLoading" :buttons="buttons"
+            :summary="summary" :showMoreSearch="true" @sortChange="sortChange" @btnClick="btnClick" @getList="getList"
+            @search="search" @moreSearch="moreSearch" @goLink="gotoDetailAll" @handleCurrentChange="handleCurrentChange"
+            @handleSizeChange="handleSizeChange" @getSummaries="getSummaries"
+            @handleSelectionChange="handleSelectionChange"></mineTabPage>
+        </el-tab-pane>
+        <el-tab-pane label="我的审批" name="second">
+          <span slot="label">
+            <el-badge class="item" :value="approveTotal">我审批的</el-badge>
+          </span>
+          <auditTabPage :formTableData="showAuditColumnsDefault" :searchParamElement="searchApproveParamElement"
+            :tableData="auditTableData" :listTitle="'销售订单审批'" :listQuery="approveListQuery" :total="approveTotal"
+            :pictLoading="pictLoading" :buttons="buttons" @btnClick="btnClick" @getList="searchApproveList"
+            @search="searchApproveList" @moreSearch="moreSearch" @gotoDetail="gotoApproveDetail"
+            @handleCurrentChange="handleApproveCurrentChange" @handleSizeChange="handleApproveSizeChange"
+            @handleSelectionChange="handleSelectionChange"></auditTabPage>
+        </el-tab-pane>
+        <el-tab-pane label="已审批的" name="fourth">
+          <approvedPage :disableBtn="false" :formTableData="formTableData" :searchParamElement="searchParamElement"
+            :tableData="tableData" :listQuery="search_data4" :total="total" :pictLoading="pictLoading"
+            :buttons="approvedButton" :summary="summary" :showMoreSearch="true" @btnClick="btnClick" @getList="getList"
+            @search="search" @moreSearch="moreSearch" @goLink="gotoDetailAll" @handleCurrentChange="handleCurrentChange"
+            @handleSizeChange="handleSizeChange" @handleSelectionChange="handleSelectionChange">
+          </approvedPage>
+        </el-tab-pane>
+        <el-tab-pane label="我的团队" name="third">
+          <listTabPage :disableBtn="false" :formTableData="formTableData" :searchParamElement="searchParamElement"
+            :tableData="tableData" :listQuery="search_data2" :total="total" :pictLoading="pictLoading"
+            :buttons="otherButton" :summary="summary" :showMoreSearch="true" @btnClick="btnClick" @getList="getList"
+            @search="search" @moreSearch="moreSearch" @goLink="gotoDetailAll" @handleCurrentChange="handleCurrentChange"
+            @handleSizeChange="handleSizeChange" @handleSelectionChange="handleSelectionChange">
+          </listTabPage>
+        </el-tab-pane>
+        <el-tab-pane label="所有列表" name="end" v-if="isExist('sales:salesContract:allList')">
+          <listTabPage :disableBtn="false" :formTableData="formTableData" :searchParamElement="searchParamElement"
+            :tableData="tableData" :listQuery="search_data3" :total="total" :pictLoading="pictLoading"
+            :buttons="allListButton" :summary="summary" :showMoreSearch="true" @btnClick="btnClick" @getList="getList"
+            @search="search" @moreSearch="moreSearch" @goLink="gotoDetailAll" @handleCurrentChange="handleCurrentChange"
+            @handleSizeChange="handleSizeChange" @handleSelectionChange="handleSelectionChange">
+          </listTabPage>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
+      :before-close="handleClose">
+      <el-table border class="move-table" :data="showTableColumns" row-key="prop_" :key="Math.random()" max-height="350"
+        style="width: 100%">
+        <el-table-column prop="title" label="列表名称"> </el-table-column>
+        <el-table-column prop="select" label="是否显示">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select"> </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+    <!-- 高级查询对话框 -->
+    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
+      <el-form :inline="true" v-loading="dialogLoading" label-width="80px" class="dialog-form" ref="form"
+        style="width: 620px">
+        <div class="dialog-line">
+          <el-form-item label="合同时间" class="dialog-form-inline-single">
+            <el-date-picker v-model="formDataTime" type="daterange" format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss" range-separator="—" start-placeholder="开始时间"
+              end-placeholder="结束时间"></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="合同类型" class="dialog-form-inline">
+            <el-select v-model="formData.contractType" style="width:100%" clearable placeholder="请选择"
+              @change="changeFacility">
+              <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="客户" class="dialog-form-inline">
+            <el-input placeholder="请输入客户名" v-model="formData.clientName" clearable></el-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="物料" class="dialog-form-inline">
+            <btn-input :valueText.sync="formData.materielName" :valueId.sync="formData.materiel"
+              :chooseVisible.sync="chooseMaterielVisible"></btn-input>
+          </el-form-item>
+          <el-form-item label="规格型号" class="dialog-form-inline">
+            <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="销售部门" class="dialog-form-inline">
+            <el-cascader v-model="salesPersonDept" clearable :options="depOptions" :props="{
+              expandTrigger: 'hover',
+              label: 'text',
+              value: 'id',
+              checkStrictly: true
+            }" @change="handleChange"></el-cascader>
+          </el-form-item>
+          <el-form-item label="审核状态" class="dialog-form-inline">
+            <el-select v-model="formData.auditSign" style="width:100%" clearable placeholder="请选择"
+              @change="changeFacility">
+              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="销售员" prop="salesPersonName" class="dialog-form-inline">
+            <btn-input :valueText.sync="formData.salesPersonName" :valueId.sync="formData.salesPerson"
+              :chooseVisible.sync="chooseUserVisible"></btn-input>
+          </el-form-item>
+          <el-form-item label="制单人" prop="createByName" class="dialog-form-inline">
+            <btn-input :valueText.sync="formData.createByName" :valueId.sync="formData.createBy"
+              :chooseVisible.sync="chooseUserVisible1"></btn-input>
+          </el-form-item>
+        </div>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">确定</el-button>
+        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="clear">清空</el-button>
+      </span>
+    </el-dialog>
+    <!--选择用户-->
+    <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
+    <!--选择制单人-->
+    <DialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></DialogChooseSingleUser1>
+    <!--选择物料-->
+    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel"></dialogChooseSingleParts>
+    <dialog-import-file
+      v-if="showUserImportDialog"
+      :visible.sync="showUserImportDialog"
+      title="销售订单批量导入"
+      source="sales"
+      :upload-data="{ type: 'user' }"
+      @success="handleUserImportSuccess"
+      @close="showUserImportDialog = false"
+    />
+  </div>
+</template>
+
+<script>
+import DialogImportFile from '@/components/Dialog/dialogImportFile.vue';
+import { mapState, mapActions, mapGetters } from "vuex";
+import btnInput from "@/components/btnInput.vue";
+import FileSaver from "file-saver";
+import config from "@/utils/config.js";
+import Cookies from "js-cookie";
+import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
+import DialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
+import { formatDateTime, getCurrentDate } from "@/utils/tools.js";
+import mineTabPage from "@/components/TabPages/mineTabPage";
+import listTabPage from "@/components/TabPages/listTabPage";
+import auditTabPage from "@/components/TabPages/auditTabPage";
+import approvedPage from "@/components/TabPages/approvedPage";
+import Sortable from "sortablejs";
+export default {
+  components: {
+    btnInput,
+    DialogChooseSingleUser,
+    DialogChooseSingleUser1,
+    dialogChooseSingleParts,
+    mineTabPage,
+    listTabPage,
+    auditTabPage,
+    approvedPage,
+    DialogImportFile
+  },
+  data() {
+    return {
+      userUploadUrl:'/apis/standard/importExcel/sales',
+      showUserImportDialog:false,
+      total: 0, //总条数
+      approveTotal: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      activeName: "first",
+      search_data: {
+        tabType: 0,
+        pageno: 1,
+        pagesize: 10
+      },
+      search_data1: {
+        tabType: 0,
+        pageno: 1,
+        pagesize: 10
+      },
+      search_data2: {
+        tabType: 1,
+        pageno: 1,
+        pagesize: 10
+      },
+      search_data3: {
+        tabType: 2,
+        pageno: 1,
+        pagesize: 10
+      },
+      search_data4: {
+        tabType: 3,
+        pageno: 1,
+        pagesize: 10
+      },
+      approveListQuery: {
+        type: 3,
+        pageno: 1,
+        pagesize: 5
+      },
+      formData: {
+        startTime: "",
+        endTime: "",
+        contractType: "",
+        contractTypeName: "",
+        unitUomName: "",
+        clientName: "",
+        materielName: "",
+        specification: "",
+        auditSign: "",
+        salesPersonName: "",
+        salesPerson: "",
+        // createTime: '',
+        deptId: "",
+        salesPersonDept: "",
+        createBy: "", //制单人id
+        createByName: ""
+      },
+      exportList: [],
+      elOptionList: [],
+      searchParamElement: [
+        {
+          key: 0,
+          label: "合同编号",
+          searchType: "inputElement",
+          placeholder: "合同编号",
+          model: "contractCode",
+          clearable: true
+        },
+        {
+          key: 1,
+          label: "客户名称",
+          searchType: "inputElement",
+          placeholder: "客户",
+          model: "clientName",
+          clearable: true
+        },
+        {
+          key: 2,
+          label: "物料名称",
+          searchType: "inputElement",
+          placeholder: "物料名称",
+          model: "materielName",
+          clearable: true
+        },
+        {
+          key: 3,
+          label: "客户合同编号",
+          searchType: "inputElement",
+          placeholder: "客户合同编号",
+          model: "clientContractCode",
+          clearable: true
+        },
+        {
+          key: 4,
+          label: "合同日期",
+          searchType: "dateElement",
+          placeholder: "请选择时间段",
+          model: "timeArea",
+          clearable: true
+        }
+      ],
+      searchApproveParamElement: [
+        {
+          label: "合同编号",
+          searchType: "inputElement",
+          placeholder: "合同编号",
+          model: "dataCode",
+          clearable: true
+        },
+        {
+          label: "客户",
+          searchType: "inputElement",
+          placeholder: "模糊搜索",
+          model: "clientName",
+          clearable: true
+        },
+        // {label:"物料",searchType:"inputElement",placeholder:"模糊搜索",model: "materielName",clearable:true},
+        {
+          label: "合同日期",
+          searchType: "dateElement",
+          placeholder: "请选择时间段",
+          model: "timeArea",
+          clearable: true
+        }
+      ],
+      buttons: [
+        {
+          key: 0,
+          btnName: "新增",
+          vhas: "sales:salesContract:add",
+          click: "goAdd",
+          type: "primary",
+          disabled: false
+        },
+        {
+          key: 1,
+          btnName: "删除",
+          vhas: "sales:salesContract:remove",
+          click: "remove",
+          type: "primary",
+          disabled: true
+        },
+        {
+          key: 2,
+          btnName: "导出",
+          vhas: "sales:salesContract:exportExcel",
+          click: "exportExcel",
+          type: "primary",
+          disabled: false
+        },
+        {
+          key: 3,
+          btnName: "关闭",
+          vhas: "sales:salesContract:close",
+          click: "close",
+          type: "primary",
+          disabled: true
+        },
+        {
+          key: 4,
+          btnName: "开启",
+          vhas: "sales:salesContract:reverseClose",
+          click: "reverseClose",
+          type: "primary",
+          disabled: true
+        },
+        {
+          key: 5,
+          btnName: "变更",
+          vhas: "sales:salesContract:change",
+          click: "change",
+          type: "primary",
+          disabled: true
+        },
+        {
+          key: 6,
+          btnName: "变更记录",
+          vhas: "sales:salesContract:gotoAlterationList",
+          click: "gotoAlterationList",
+          type: "primary",
+          disabled: true
+        },
+        {
+          key: 7,
+          btnName: "列表配置",
+          click: "showColumnSetDialog",
+          vhas: "",
+          type: "primary",
+          disabled: false
+        },
+        {
+          key: 8,
+          btnName: "关联单据",
+          click: "associatedDocument",
+          type: "primary",
+          disabled: true
+        },
+        {
+          key: 9,
+          btnName: "同步ERP",
+          click: "tberp",
+          type: "primary",
+          disabled: false
+        },
+        {key:10,btnName:"导入",vhas:"sales:salesContract:import",click:"importFile",type:"primary",disabled:false},
+
+      ],
+      //
+      otherButton: [
+        {
+          key: 0,
+          btnName: "导出",
+          vhas: "sales:salesContract:exportExcel",
+          click: "exportExcel",
+          type: "primary",
+          disabled: false
+        },
+        {
+          key: 1,
+          btnName: "变更记录",
+          vhas: "sales:salesContract:gotoAlterationList",
+          click: "gotoAlterationList",
+          type: "primary",
+          disabled: true
+        }
+      ],
+      allListButton: [
+        {
+          key: 0,
+          btnName: "导出",
+          vhas: "sales:salesContract:exportExcel",
+          click: "exportExcel",
+          type: "primary",
+          disabled: false
+        },
+        // {key:1,btnName:"删除",vhas:"sales:salesContract:remove",click:"remove",type:"primary",disabled:true},
+        // {key:1,btnName:"反审核",vhas:"sales:salesContract:disAudit",click:"disAudit",type:"primary",disabled:true},
+        {
+          key: 2,
+          btnName: "变更记录",
+          vhas: "sales:salesContract:gotoAlterationList",
+          click: "gotoAlterationList",
+          type: "primary",
+          disabled: true
+        }
+      ],
+      approvedButton: [
+        {
+          key: 0,
+          btnName: "导出",
+          vhas: "sales:salesContract:exportExcel",
+          click: "exportExcel",
+          type: "primary",
+          disabled: false
+        },
+        // {key:1,btnName:"删除",vhas:"sales:salesContract:remove",click:"remove",type:"primary",disabled:true},
+        // {key:1,btnName:"反审核",vhas:"sales:salesContract:disAudit",click:"disAudit",type:"primary",disabled:true},
+        {
+          key: 2,
+          btnName: "变更记录",
+          vhas: "sales:salesContract:gotoAlterationList",
+          click: "gotoAlterationList",
+          type: "primary",
+          disabled: true
+        }
+      ],
+      //默认审批页面列表
+      showAuditColumnsDefault: [
+        // {title: "审批标题", prop_: "title",content:"销售订单审批", select: true},
+        { title: "申请人", prop_: "approveApplicantName", select: true },
+        { title: "申请时间", prop_: "submitTime", select: true },
+        {
+          title: "审批状态",
+          prop_: "approveStatusName",
+          select: true,
+          sortable: true
+        }
+      ],
+      auditTableData: [],
+      //默认列表数据
+      showTableColumnsDefault: [
+        { title: "合同日期", prop_: "contractDate", select: true },
+        { title: "合同编号", prop_: "contractCode", select: true },
+        { title: "合同类型", prop_: "contractTypeName", select: true },
+        { title: "客户合同编号", prop_: "clientContractCode", select: false },
+        { title: "关闭标志", prop_: "closeStatusName", select: false },
+        { title: "客户名称", prop_: "clientName", select: true },
+        { title: "销售员", prop_: "salesPersonName", select: true },
+        { title: "销售部门", prop_: "salesPersonDeptName", select: false},
+        { title: "发货是否检验", prop_: "isCheck", select: false },
+        { title: "物料代码", prop_: "materielSerialNo", select: true },
+        { title: "物料名称", prop_: "materielName", select: false },
+        { title: "规格型号", prop_: "specification", select: true },
+        { title: "主计量单位", prop_: "unitUomName", select: false },
+        { title: "主单位数量", prop_: "count", select: false },
+        { title: "辅助单位", prop_: "supportUomName", select: false },
+        { title: "销售数量", prop_: "saleCount", select: true },
+        { title: "含税单价（元）", prop_: "taxUnitPrice", select: true },
+        { title: "销售金额（元）", prop_: "taxAmount", select: true },
+        {
+          title: "交货日期",
+          prop_: "deliveryDate",
+          select: true,
+          sortable: false
+        },
+        // {title: "审核状态", prop_: "auditSignName", select: true},
+        { title: "审批状态", prop_: "approveStatusName", select: true },
+        { title: "行关闭状态", prop_: "itemCloseStatusName", select: false },
+        { title: "行关闭时间", prop_: "itemCloseTime", select: false },
+        { title: "行关闭原因", prop_: "itemCloseReason", select: false }
+      ],
+      ///弹出页面列表数据
+      showTableColumns: [
+        { title: "合同日期", prop_: "contractDate", select: true },
+        { title: "合同编号", prop_: "contractCode", select: true },
+        { title: "合同类型", prop_: "contractTypeName", select: true },
+        { title: "关闭标志", prop_: "closeStatusName", select: true },
+        { title: "客户名称", prop_: "clientName", select: true },
+        { title: "销售员", prop_: "salesPersonName", select: true },
+        { title: "销售部门", prop_: "salesPersonDeptName", select: true },
+        { title: "发货是否检验", prop_: "isCheck", select: true },
+        { title: "物料代码", prop_: "materielSerialNo", select: true },
+        { title: "物料名称", prop_: "materielName", select: true },
+        { title: "规格型号", prop_: "specification", select: true },
+        { title: "主计量单位", prop_: "unitUomName", select: true },
+        { title: "主单位数量", prop_: "count", select: true },
+        { title: "辅助单位", prop_: "supportUomName", select: true },
+        { title: "销售数量", prop_: "saleCount", select: true },
+        { title: "含税单价（元）", prop_: "taxUnitPrice", select: true },
+        { title: "销售金额（元）", prop_: "taxAmount", select: true },
+        {
+          title: "交货日期",
+          prop_: "deliveryDate",
+          select: true,
+          sortable: true
+        },
+        // {title: "审核状态", prop_: "auditSignName", select: true},
+        { title: "审批状态", prop_: "approveStatusName", select: true },
+        { title: "行关闭状态", prop_: "itemCloseStatusName", select: true },
+        { title: "行关闭时间", prop_: "itemCloseTime", select: true },
+        { title: "行关闭原因", prop_: "itemCloseReason", select: true }
+      ],
+      showTableColumnsTemp: [], //弹框弹出的时候，保存当前的列表数据
+      //显示的列表字段
+      formTableData: [],
+      alterationDetailId: "",
+      contractList: [],
+      contractData: [],
+      tableData1: [],
+      summary: {},
+      formDataTime: "",
+      time: "",
+      salesTime: "",
+      tableData: [],
+      depOptions: [],
+      salesPersonDept: "",
+      options: [],
+      typeList: [],
+      config: config,
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      advanceQueryDialogVisible: false,
+      chooseUserVisible: false,
+      chooseUserVisible1: false,
+      chooseMaterielVisible: false, //物料
+      dialogLoading: false,
+      dialogTitle: "",
+      pictLoading: false,
+      columnSetDialogTitle: "设置显示字段列表",
+      columnSetDialogVisible: false,
+      salesContractIds: [],
+      tableId: "sales_contract_table",
+      tbody: ""
+    };
+  },
+  watch: {
+    time(val) {
+      if (val) {
+        this.search_data.startTime = val[0];
+        this.search_data.endTime = val[1];
+      } else {
+        this.search_data.startTime = "";
+        this.search_data.endTime = "";
+      }
+    },
+
+    btnDelDisabled(val) {
+      this.buttons[1].disabled = val;
+      // this.allListButton[1].disabled = val
+      // this.approvedButton[1].disabled = val
+    },
+    btnOtherDisabled(val) {
+      // this.buttons[2].disabled = val
+      this.buttons[3].disabled = val;
+      this.buttons[4].disabled = val;
+      this.buttons[5].disabled = val;
+      this.buttons[6].disabled = val;
+      this.buttons[8].disabled = val;
+      this.otherButton[1].disabled = val;
+      this.allListButton[1].disabled = val;
+      // this.allListButton[3].disabled = val
+      this.approvedButton[1].disabled = val;
+      // this.approvedButton[3].disabled = val
+    },
+    activeName(val) {
+      if (val === "first") {
+        this.search_data = this.search_data1;
+        this.getList(0);
+      } else if (val === "second") {
+        // this.search_data.tabType=null
+      } else if (val === "third") {
+        this.search_data = this.search_data2;
+        this.getList();
+      } else if (val === "fourth") {
+        this.search_data = this.search_data4;
+        this.getList();
+      } else if (val === "end") {
+        this.search_data = this.search_data3;
+        this.getList();
+      }
+    },
+    formDataTime(val) {
+      if (val) {
+        this.formData.startTime = val[0];
+        this.formData.endTime = val[1];
+      } else {
+        this.formData.startTime = "";
+        this.formData.endTime = "";
+      }
+    }
+  },
+  created() {
+    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.showTableColumnsTemp = JSON.parse(
+      JSON.stringify(this.showTableColumns)
+    );
+    this.myApproveList();
+    this.getList(0);
+    this.getShowColumns();
+    this.initData();
+  },
+  mounted() {
+    // this.rowDrop()
+    if (this.$route.query.active) {
+      this.activeName = "second";
+    }
+  },
+  methods: {
+    handleUserImportSuccess(response, file, fileList) {
+      this.getList()
+    },
+    associatedDocument() {
+      let data = this.salesContractIds[0];
+      this.$router.push({
+        path: "/sales/salesContract_associatedDocument",
+        query: {
+          id: data.salesContractId,
+          clientName: data.clientName,
+          contractCode: data.contractCode,
+          t: Date.now()
+        }
+      });
+    },
+    // 所有列表展示
+    isExist(val) {
+      let isExist = false;
+      // 从浏览器缓存中获取权限数组
+      var buttonpermsStr = localStorage.getItem("btnContext");
+      if (buttonpermsStr === undefined || buttonpermsStr == null) {
+        return false;
+      } else {
+        JSON.parse(buttonpermsStr).forEach(element => {
+          //匹配缓存中的数据中有没有匹配的值
+          if (element == val) {
+            // 若在按钮中定义的权限字段能在后端返回的权限数组中能找到，则该按钮可显示
+            isExist = true;
+          }
+        });
+      }
+      return isExist;
+    },
+    btnClick(val) {
+      console.log("根据方法名称调用");
+      if (val === "goAdd") {
+        this.goAdd();
+      } else if (val == "showColumnSetDialog") {
+        this.showColumnSetDialog();
+      } else if (val == "remove") {
+        this.remove();
+      } else if (val == "disAudit") {
+        this.disAudit();
+      } else if (val === "exportExcel") {
+        this.exportExcel();
+      } else if (val === "close") {
+        this.close();
+      } else if (val === "reverseClose") {
+        this.reverseClose();
+      } else if (val === "change") {
+        this.change();
+      } else if (val === "gotoAlterationList") {
+        this.gotoAlterationList();
+      } else if (val === "associatedDocument") {
+        this.associatedDocument();
+      } else if (val === "tberp") {
+        this.tberp();
+      } else if( val === 'importFile'){
+        this.importFile()
+      }
+    },
+    importFile(){
+      console.log("123")
+      this.showUserImportDialog = true
+    },
+    tberp() {
+      this.$api.yxkAPI.yxkGet("/api/saleContract/u8Sync", {}).then(res => {
+        if (res.code == 0) {
+          this.$confirm("数据同步成功,请确认", "提醒", {
+            type: "warning"
+          }).then(() => {
+            this.search_data = {
+              tabType: 0,
+              pageno: 1,
+              pagesize: 10
+            };
+            this.getList();
+          });
+        }
+      });
+    },
+    // 查询审批列表
+    searchApproveList() {
+      this.approveListQuery.pagesize = 5;
+      this.approveListQuery.pageno = 1;
+      this.myApproveList();
+    },
+    //进入审核页面
+    gotoApproveDetail(row) {
+      this.$router.push({
+        path: "/sales/salesContract_approve_detail",
+        query: {
+          id: row.salesContractId,
+          instanceId: row.instanceId,
+          taskId: row.taskId,
+          tabType: this.search_data.tabType,
+          t: Date.now()
+        }
+      });
+    },
+    gotoDetailAll(row) {
+      if (
+        row.approveState == 0 ||
+        row.approveState == 2 ||
+        row.approveState == 3
+      ) {
+        this.$router.push({
+          path: "/sales/salesContract_add",
+          query: { id: row.salesContractId, t: Date.now() }
+        });
+      } else {
+        this.$router.push({
+          path: "/sales/salesContract_detail",
+          query: { id: row.salesContractId, t: Date.now() }
+        });
+      }
+    },
+    sortChange(val) {
+      console.log(val);
+      this.search_data.sort = "item.delivery_date";
+      this.search_data.order = val.order == "ascending" ? "asc" : "desc";
+      this.getList();
+    },
+    myApproveList() {
+      this.pictLoading = true;
+      console.log(this.approveListQuery);
+      this.$api.scmApproveAPI
+        .myApproveList(this.approveListQuery)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.code == 0) {
+            if (res.data && res.data.list) {
+              this.auditTableData = res.data.list;
+              this.approveTotal = res.data.total;
+            } else {
+              this.auditTableData = [];
+              this.approveTotal = 0;
+            }
+            if (this.auditTableData.length) {
+              this.auditTableData.forEach(item => {
+                if (item.approveState == 0) {
+                  item.approveStatusName = "暂存";
+                } else if (item.approveState == 1) {
+                  item.approveStatusName = "待审批";
+                } else if (item.approveState == 2) {
+                  item.approveStatusName = "已驳回";
+                } else if (item.approveState == 3) {
+                  item.approveStatusName = "审批通过";
+                }
+                item.summary = [
+                  { label: "合同编号", value: item.contractCode },
+                  { label: "客户", value: item.clientName },
+                  { label: "合同类型", value: item.contractTypeName },
+                  { label: "合同日期", value: item.contractDate },
+                  { label: "合同总金额", value: item.allTaxAmount }
+                ];
+              });
+            }
+          }
+        })
+        .catch(r => {});
+    },
+    // 变更合同列表页
+    gotoAlterationList() {
+      let id = this.salesContractIds[0].salesContractId;
+      this.$router.push({
+        path: "/sales/salesContract_alterationList",
+        query: { id: id, t: Date.now() }
+      });
+    },
+
+    // 返回首页
+    gotoIndex() {
+      this.chooseProVisible = false;
+    },
+    // 变更
+    change() {
+      if (
+        this.salesContractIds[0].approveStatusName === "审批通过" &&
+        this.salesContractIds[0].closeStatusName === "未关闭"
+      ) {
+        let id = this.salesContractIds[0].salesContractId;
+        this.$router.push({
+          path: "/sales/salesContract_edit",
+          query: { id: id, t: Date.now() }
+        });
+      } else {
+        this.$message({
+          message: "选中项已关闭或未审核",
+          type: "error"
+        });
+      }
+    },
+
+    /**
+     * 关闭
+     */
+    close() {
+      let id = this.salesContractIds[0].salesContractId;
+      this.$confirm("确认终止选中的项吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.salesAPI.closeContract({ id: id }).then(res => {
+          if (res.code === 0) {
+            this.$message({
+              message: res.msg,
+              type: "success"
+            });
+            this.getList();
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "error"
+            });
+          }
+        });
+      });
+    },
+    // 反关闭
+    reverseClose() {
+      let id = this.salesContractIds[0].salesContractId;
+      this.$confirm("确认开启选中的项吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.salesAPI.reverseClose({ id: id }).then(res => {
+          if (res.code === 0) {
+            this.$message({
+              message: res.msg,
+              type: "success"
+            });
+            this.getList();
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "error"
+            });
+          }
+        });
+      });
+    },
+    // 导出
+    exportExcel() {
+      delete this.search_data.pagesize;
+      delete this.search_data.pageno;
+      this.$api.salesAPI.exportExcel(this.search_data).then(res => {});
+    },
+    /**
+     * 反审核
+     */
+    disAudit() {
+      let id = this.salesContractIds[0].salesContractId;
+      this.$confirm("确认反审核选中的项吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.salesAPI.reverseAuditContract({ id: id }).then(res => {
+          if (res.code === 0) {
+            this.$message({
+              message: res.msg,
+              type: "success"
+            });
+            this.getList();
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "error"
+            });
+          }
+        });
+      });
+    },
+
+    /**
+     * 审核
+     */
+    audit() {
+      let id = this.salesContractIds[0].salesContractId;
+      this.$confirm("确认审核选中的项吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.salesAPI.auditContract({ id: id }).then(res => {
+          if (res.code === 0) {
+            this.$message({
+              message: res.msg,
+              type: "success"
+            });
+            this.getList();
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "error"
+            });
+          }
+        });
+      });
+    },
+
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+
+    // 跳转到查看页面
+    gotoDetail(row) {
+      console.log("跳转详情页面");
+      this.$router.push({
+        path: "/sales/salesContract_add",
+        query: { id: row.salesContractId, t: Date.now() }
+      });
+    },
+
+    // 前往新增页面
+    goAdd() {
+      this.$router.push({
+        path: "/sales/salesContract_add",
+        query: { t: Date.now() }
+      });
+    },
+    liftForExport() {
+      if (n == 0) {
+        this.search_data1 = this.search_data;
+      }
+      // this.pictLoading = true;
+      this.$api.salesAPI
+        .listForExport(this.search_data)
+        .then(res => {
+          // this.pictLoading = false;
+          if (res.data) {
+            // this.summary = res.total
+            // this.total = res.data.totalRows;
+            this.exportList = res.data.list ? res.data.list : [];
+            this.exportList.forEach(item => {
+              // item.contractDate = item.contractDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.contractDate):""
+              // item.deliveryDate = item.deliveryDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.deliveryDate):""
+              if (item.approveState == 0) {
+                item.approveStatusName = "暂存";
+              } else if (item.approveState == 1) {
+                item.approveStatusName = "待审批";
+              } else if (item.approveState == 2) {
+                item.approveStatusName = "已驳回";
+              } else if (item.approveState == 3) {
+                item.approveStatusName = "审批通过";
+              }
+            });
+          } else {
+            // this.total = 0;
+            this.exportList = [];
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    // 获取销售订单列表
+    getList(n) {
+      // if(val){
+      //   this.search_data.contractCode=val[0]
+      //   this.search_data.clientName=val[1]
+      //   this.search_data.materielName=val[2]
+      // }
+      if (n == 0) {
+        this.search_data1 = this.search_data;
+      }
+      this.pictLoading = true;
+      this.$api.salesAPI
+        .listSalesContract(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if (res.data) {
+            this.summary = res.total;
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+            this.tableData.forEach(item => {
+              // item.contractDate = item.contractDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.contractDate):""
+              // item.deliveryDate = item.deliveryDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.deliveryDate):""
+              if (item.approveState == 0) {
+                item.approveStatusName = "暂存";
+              } else if (item.approveState == 1) {
+                item.approveStatusName = "待审批";
+              } else if (item.approveState == 2) {
+                item.approveStatusName = "已驳回";
+              } else if (item.approveState == 3) {
+                item.approveStatusName = "审批通过";
+              }
+            });
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+
+    //设置显示字段
+    showColumnSetDialog() {
+      this.columnSetDialogVisible = true;
+      this.showTableColumnsTemp = JSON.parse(
+        JSON.stringify(this.showTableColumns)
+      );
+      // 行拖拽
+      // this.rowDrop()
+    },
+    //前移
+    toUp(scope) {
+      if (scope.$index == 0) {
+        return false;
+      }
+      let n;
+      for (let i = 0; i < this.showTableColumns.length; i++) {
+        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+          n = i;
+        }
+      }
+      let temp = this.showTableColumns[n];
+      this.showTableColumns[n] = this.showTableColumns[n - 1];
+      this.showTableColumns[n - 1] = temp;
+      this.$forceUpdate();
+    },
+    //后移
+    toDown(scope) {
+      if (scope.$index == this.showTableColumns.length - 1) {
+        return false;
+      }
+      let n;
+      for (let i = 0; i < this.showTableColumns.length; i++) {
+        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+          n = i;
+        }
+      }
+      let temp = this.showTableColumns[n];
+      this.showTableColumns[n] = this.showTableColumns[n + 1];
+      this.showTableColumns[n + 1] = temp;
+      this.$forceUpdate();
+    },
+    //恢复默认
+    toDefault() {
+      this.showTableColumns = JSON.parse(
+        JSON.stringify(this.showTableColumnsDefault)
+      );
+      this.$forceUpdate();
+    },
+    //完成列表字段设置
+    saveAndCloseColumnSetDialog() {
+      let tableNo = this.tableId;
+      let tableColumns = JSON.stringify(this.showTableColumns);
+      this.columnSetDialogVisible = false;
+      this.$api.tableColumnAPI
+        .saveShowColumns({ tableNo: tableNo, tableColumns: tableColumns })
+        .then(res => {
+          let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+          this.formTableData = [];
+          for (let i = 0; i < arr.length; i++) {
+            if (arr[i].select) {
+              this.formTableData.push(arr[i]);
+            }
+          }
+          this.getShowColumns();
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    //关闭字段设置弹出
+    handleClose() {
+      this.showTableColumns = JSON.parse(
+        JSON.stringify(this.showTableColumnsTemp)
+      );
+      this.columnSetDialogVisible = false;
+    },
+    /**
+     * 获取显示字段
+     */
+    getShowColumns() {
+      let tableNo = this.tableId;
+      this.formTableData = [];
+
+      this.$api.tableColumnAPI
+        .getShowColumns({ tableNo: tableNo })
+        .then(res => {
+          if (res.code == 0) {
+            if (res.results) {
+              this.showTableColumns = JSON.parse(res.results);
+              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+              for (let i = 0; i < arr.length; i++) {
+                if (arr[i].select) {
+                  this.formTableData.push(arr[i]);
+                }
+              }
+              this.$forceUpdate();
+            } else {
+              let arr = JSON.parse(
+                JSON.stringify(this.showTableColumnsDefault)
+              );
+              for (let i = 0; i < arr.length; i++) {
+                if (arr[i].select) {
+                  this.formTableData.push(arr[i]);
+                }
+              }
+              this.$forceUpdate();
+            }
+          } else {
+            this.$message({
+              message: res.msg ? res.msg : "获取列表信息失败",
+              type: "error"
+            });
+          }
+        })
+        .catch(r => {
+          this.$message({
+            message: r,
+            type: "error"
+          });
+          console.log(r);
+        });
+    },
+
+    // 查询
+    search() {
+      this.search_data.pageno = 1;
+      this.search_data.pagesize = 10;
+      this.getList();
+    },
+
+    /**
+     * 高级查询
+     */
+    moreSearch() {
+      this.advanceQueryDialogVisible = true;
+      this.dialogTitle = "高级查询";
+    },
+    save() {
+      for (var n in this.formData) {
+        this.search_data[n] = this.formData[n];
+      }
+      this.search_data.inDatas = "";
+      this.time = this.formDataTime;
+      this.search_data.pageno = 1;
+      this.$nextTick(function() {
+        this.advanceQueryDialogVisible = false;
+        this.getList();
+      });
+    },
+    //清空
+    clear() {
+      for (var n in this.formData) {
+        this.formData[n] = "";
+      }
+      this.formDataTime = "";
+      this.salesPersonDept = "";
+      // this.createTime = "";
+    },
+    changeFacility() {
+      this.$forceUpdate();
+    },
+
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+    // 每页显示多少条
+    handleApproveSizeChange(val) {
+      this.approveListQuery.pagesize = val;
+      this.myApproveList();
+    },
+    // 上下分页
+    handleApproveCurrentChange(val) {
+      this.approveListQuery.pageno = val;
+      this.myApproveList();
+    },
+    /**
+     * 初始化
+     */
+    initData() {
+      // 获取审核状态
+      this.$api.salesAPI
+        .listAauditSign({
+          type: "audit_status"
+        })
+        .then(res => {
+          this.options = res.datas;
+        });
+      //  获取合同类型
+      this.$api.salesAPI
+        .listContractType({
+          type: "sales_contract_type"
+        })
+        .then(res => {
+          this.typeList = res.datas;
+        });
+      // 获取生产部门
+      Promise.all([
+        this.$api.commonAPI.getDeptsTree(),
+        this.$api.roleAPI.list()
+      ])
+        .then(([r1, r2]) => {
+          if (r1.code === 0) {
+            this.depOptions = r1.data.children;
+            // this.setDefaultDept();
+            this.setDeptList(this.depOptions);
+          }
+          if (r2.code === 0) {
+            this.roleList = r2.datas;
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    getMateriel(val) {
+      if (val) {
+        this.$set(this.formData, "materiel", val.id);
+        this.$set(this.formData, "materielName", val.name);
+      } else {
+        this.$set(this.formData, "materiel", "");
+        this.$set(this.formData, "materielName", "");
+      }
+    },
+
+    /**
+     * 获取用户
+     */
+    getUser(data) {
+      if (data) {
+        this.$set(this.formData, "salesPersonName", data.name);
+        this.$set(this.formData, "salesPerson", data.id);
+        //   this.formData.salesPersonName = data.name;
+        //   this.formData.salesPerson = data.id;
+        //   this.getUserList.forEach(item => {
+        //     if (data.id === item.id) {
+        //       self.formData.salesPersonDept = item.deptId;
+        //         self.formData.deptId= item.deptId;
+        //       return;
+        //     }
+        //   });
+        // if (self.formData.deptId == 0) {
+        //   self.formData.salesPersonDept = "";
+        // }
+        this.setDefaultDept();
+      }
+    },
+    /**
+     * 获取制单人
+     */
+    getUser1(data) {
+      console.log(data);
+      var self = this;
+      if (data) {
+        this.formData.createByName = data.name;
+        this.formData.createBy = data.id;
+      }
+    },
+    //根据当前id,获取一条树枝上的所有id数据
+    treeFindPath(tree, func, path = []) {
+      if (!tree) return [];
+      for (const data of tree) {
+        path.push(data.id);
+        if (func(data)) return path;
+        if (data.children) {
+          const findChildren = this.treeFindPath(data.children, func, path);
+          if (findChildren.length) return findChildren;
+        }
+        path.pop();
+      }
+      return [];
+    },
+    //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
+    setDeptList(tree) {
+      for (const data of tree) {
+        if (!data.hasChildren) {
+          data.children = undefined;
+        } else {
+          this.setDeptList(data.children);
+        }
+      }
+    },
+    //显示默认部门
+    // setDefaultDept(){
+    //     if(this.depOptions.length>0&&this.formData.deptId){
+    //       let id=JSON.stringify( this.formData.deptId)
+    //       let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
+    //       this.salesPersonDept=JSON.parse(JSON.stringify(select_id))
+    //     }
+    //   },
+    // 选择部门
+    handleChange: function(value) {
+      this.formData.salesPersonDept =
+        value.length >= 1 ? value[value.length - 1] : "";
+      this.salesPersonDept = value;
+    },
+
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.salesContractIds = val;
+      this.setBtn(val);
+    },
+
+    /**
+     * 删除
+     */
+    remove() {
+      let ids = [];
+      this.salesContractIds.forEach(item => {
+        ids.push(item.salesContractId);
+        console.log(ids);
+      });
+      this.$confirm("确认删除选中的项吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.salesAPI
+          .removeContract({ salesContractIds: ids })
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.search();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    },
+    // 合计
+    getSummaries(param) {
+      const { columns, data } = param;
+      console.log("zhuyemian汇总");
+      console.log(param);
+      let sums = [];
+      columns.forEach((column, index) => {
+        //计算不含税金额总计
+
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+        if (
+          column.property !== "count" &&
+          column.property !== "taxAmount" &&
+          column.property !== "saleCount"
+        ) {
+          sums[index] = "";
+          return;
+        }
+
+        const values = data.map(item => Number(item[column.property]));
+        if (!values.every(value => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+        } else {
+          sums[index] = "";
+        }
+        if (column.property === "count") {
+          if (sums[index]) {
+            sums[index] = this.summary.totalCount;
+          }
+          return;
+        }
+        if (column.property === "saleCount") {
+          if (sums[index]) {
+            sums[index] = this.summary.totalSaleCount;
+          }
+          return;
+        }
+        if (column.property === "taxAmount") {
+          if (sums[index]) {
+            sums[index] = this.summary.totalTaxAmount;
+          }
+          return;
+        }
+      });
+      console.log(this.summary);
+      return sums;
+    },
+    //行拖拽
+    rowDrop() {
+      const _this = this;
+      this.$nextTick(() => {
+        const tbody = document.querySelector(
+          ".move-table .el-table__body-wrapper tbody"
+        );
+        Sortable.create(tbody, {
+          onEnd({ newIndex, oldIndex }) {
+            const currRow = _this.showTableColumns.splice(oldIndex, 1)[0];
+            _this.showTableColumns.splice(newIndex, 0, currRow);
+          }
+        });
+      });
+    }
+  }
+};
+</script>
+<style scoped>
+.approve-box .sys-tabs .el-tabs__nav-wrap {
+  padding: 5px 20px 0px;
+}
+
+.approve-box .sys-tabs .el-tabs__item {
+  padding-top: 10px;
+  height: 50px;
+}
+
+.approve-box .el-timeline-item__content {
+  line-height: 1.5;
+}
+
+.approve-box .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+<style>
+.approve-box .sys-tabs .el-tabs__nav-wrap {
+  padding: 5px 20px 0px;
+}
+
+.approve-box .sys-tabs .el-tabs__item {
+  padding-top: 10px;
+  height: 50px;
+}
+
+.approve-box .el-timeline-item__content {
+  line-height: 1.5;
+}
+
+.approve-box .el-dialog__body {
+  padding-top: 0px;
+}
+
+.approve-form .el-form-item {
+  margin-bottom: 0px;
+}
+
+.approve-timeline .el-timeline-item__wrapper {
+  padding-top: 10px;
+  padding-left: 80px;
+}
+
+.approve-timeline .el-timeline-item__tail {
+  left: 30px;
+  border-left-width: 4px;
+}
+</style>
diff --git a/src/pages/scm/sales/sales_contract/indexNew_1.vue b/src/pages/scm/sales/sales_contract/indexNew_1.vue
index 0d3d427..abedc7e 100644
--- a/src/pages/scm/sales/sales_contract/indexNew_1.vue
+++ b/src/pages/scm/sales/sales_contract/indexNew_1.vue
@@ -1,1324 +1,1325 @@
-<template>
-  <div class="sys-box approve-box">
-    <div class="sys-tabs">
-      <el-tabs v-model="activeName">
-        <el-tab-pane label="我发起的" name="first">
-          <mineTabPage :disableBtn="false"
-                       :formTableData="formTableData"
-                       :searchParamElement="searchParamElement"
-                       :tableData="tableData"
-                       :listQuery="search_data"
-                       :total="total"
-                       :pictLoading="pictLoading"
-                       :buttons="buttons"
-                       :summary = "summary"
-                       :showMoreSearch="true"
-                       @sortChange = "sortChange"
-                       @btnClick="btnClick"
-                       @getList="getList"
-                       @search="search"
-                       @moreSearch="moreSearch"
-                       @goLink="gotoDetailAll"
-                       @handleCurrentChange="handleCurrentChange"
-                       @handleSizeChange="handleSizeChange"
-                       @getSummaries="getSummaries"
-                       @handleSelectionChange="handleSelectionChange"
-          ></mineTabPage>
-        </el-tab-pane>
-        <el-tab-pane label="我的审批" name="second">
-          <span slot="label">
-            <el-badge class="item" :value="approveTotal">我审批的</el-badge>
-          </span>
-          <auditTabPage :formTableData="showAuditColumnsDefault"
-                        :searchParamElement="searchApproveParamElement"
-                        :tableData="auditTableData"
-                        :listTitle="'销售订单审批'"
-                        :listQuery="approveListQuery"
-                        :total="approveTotal"
-                        :pictLoading="pictLoading"
-                        :buttons="buttons"
-                        @btnClick="btnClick"
-                        @getList="searchApproveList"
-                        @search="searchApproveList"
-                        @moreSearch="moreSearch"
-                        @gotoDetail="gotoApproveDetail"
-                        @handleCurrentChange="handleApproveCurrentChange"
-                        @handleSizeChange="handleApproveSizeChange"
-                        @handleSelectionChange="handleSelectionChange"
-          ></auditTabPage>
-        </el-tab-pane>
-        <el-tab-pane label="已审批的" name="fourth">
-          <approvedPage :disableBtn="false"
-                        :formTableData="formTableData"
-                        :searchParamElement="searchParamElement"
-                        :tableData="tableData"
-                        :listQuery="search_data4"
-                        :total="total"
-                        :pictLoading="pictLoading"
-                        :buttons="approvedButton"
-                        :summary = "summary"
-                        :showMoreSearch="true"
-                        @btnClick="btnClick"
-                        @getList="getList"
-                        @search="search"
-                        @moreSearch="moreSearch"
-                        @goLink="gotoDetailAll"
-                        @handleCurrentChange="handleCurrentChange"
-                        @handleSizeChange="handleSizeChange"
-                        @handleSelectionChange="handleSelectionChange">
-          </approvedPage>
-        </el-tab-pane>
-        <el-tab-pane label="我的团队" name="third">
-          <listTabPage :disableBtn="false"
-                       :formTableData="formTableData"
-                       :searchParamElement="searchParamElement"
-                       :tableData="tableData"
-                       :listQuery="search_data2"
-                       :total="total"
-                       :pictLoading="pictLoading"
-                       :buttons="otherButton"
-                       :summary = "summary"
-                       :showMoreSearch="true"
-                       @btnClick="btnClick"
-                       @getList="getList"
-                       @search="search"
-                       @moreSearch="moreSearch"
-                       @goLink="gotoDetailAll"
-                       @handleCurrentChange="handleCurrentChange"
-                       @handleSizeChange="handleSizeChange"
-                       @handleSelectionChange="handleSelectionChange">
-          </listTabPage>
-        </el-tab-pane>
-        <el-tab-pane label="所有列表" name="end" v-if="isExist('sales:salesContract:allList')">
-          <listTabPage :disableBtn="false"
-                       :formTableData="formTableData"
-                       :searchParamElement="searchParamElement"
-                       :tableData="tableData"
-                       :listQuery="search_data3"
-                       :total="total"
-                       :pictLoading="pictLoading"
-                       :buttons="allListButton"
-                       :summary = "summary"
-                       :showMoreSearch="true"
-                       @btnClick="btnClick"
-                       @getList="getList"
-                       @search="search"
-                       @moreSearch="moreSearch"
-                       @goLink="gotoDetailAll"
-                       @handleCurrentChange="handleCurrentChange"
-                       @handleSizeChange="handleSizeChange"
-                       @handleSelectionChange="handleSelectionChange">
-          </listTabPage>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px" :before-close="handleClose">
-      <el-table border
-      class="move-table"
-                :data="showTableColumns"
-                row-key="prop_"
-                :key="Math.random()"
-                max-height="350"
-                style="width: 100%">
-        <el-table-column
-          prop="title"
-          label="列表名称">
-        </el-table-column>
-        <el-table-column
-          prop="select"
-          label="是否显示"
-          >
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作"
-        >
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-    <!-- 高级查询对话框 -->
-    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
-      <el-form :inline="true"
-               v-loading="dialogLoading"
-               label-width="80px"
-               class="dialog-form"
-               ref="form" style="width: 620px"
-      >
-        <div class="dialog-line">
-          <el-form-item label="合同时间"  class="dialog-form-inline-single">
-            <el-date-picker
-              v-model="formDataTime"
-              type="daterange"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              range-separator="—"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-            ></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="合同类型" class="dialog-form-inline">
-            <el-select v-model="formData.contractType" style="width:100%" clearable placeholder="请选择" @change="changeFacility">
-              <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="客户" class="dialog-form-inline">
-            <el-input placeholder="请输入客户名" v-model="formData.clientName" clearable></el-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="物料" class="dialog-form-inline">
-            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel' :chooseVisible.sync='chooseMaterielVisible'></btn-input>
-          </el-form-item>
-          <el-form-item label="规格型号" class="dialog-form-inline">
-            <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="销售部门" class="dialog-form-inline">
-            <el-cascader
-              v-model="salesPersonDept"
-              clearable
-              :options="depOptions"
-              :props="{ expandTrigger: 'hover',label:'text',value:'id', checkStrictly: true}"
-              @change="handleChange"></el-cascader>
-          </el-form-item>
-          <el-form-item label="审核状态" class="dialog-form-inline">
-            <el-select v-model="formData.auditSign" style="width:100%" clearable placeholder="请选择" @change="changeFacility">
-              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="销售员" prop="salesPersonName" class="dialog-form-inline">
-            <btn-input :valueText.sync='formData.salesPersonName' :valueId.sync='formData.salesPerson' :chooseVisible.sync='chooseUserVisible'></btn-input>
-          </el-form-item>
-          <el-form-item label="制单人" prop="createByName" class="dialog-form-inline">
-
-            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy' :chooseVisible.sync='chooseUserVisible1'></btn-input>
-          </el-form-item>
-        </div>
-
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">确定</el-button>
-        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
-        <el-button type="primary" @click="clear">清空</el-button>
-      </span>
-    </el-dialog>
-    <!--选择用户-->
-    <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
-    <!--选择制单人-->
-    <DialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></DialogChooseSingleUser1>
-    <!--选择物料-->
-    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel" ></dialogChooseSingleParts>
-  </div>
-</template>
-
-<script>
-import {mapState, mapActions, mapGetters} from "vuex";
-import btnInput from "@/components/btnInput.vue";
-import FileSaver from 'file-saver'
-import config from "@/utils/config.js";
-import Cookies from "js-cookie";
-import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
-import DialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
-import { formatDateTime, getCurrentDate } from "@/utils/tools.js";
-import mineTabPage from "@/components/TabPages/mineTabPage";
-import listTabPage from "@/components/TabPages/listTabPage";
-import auditTabPage from "@/components/TabPages/auditTabPage";
-import approvedPage from "@/components/TabPages/approvedPage";
-import Sortable from 'sortablejs';
-export default {
-  components: {
-    btnInput,DialogChooseSingleUser,DialogChooseSingleUser1,dialogChooseSingleParts,mineTabPage,listTabPage,auditTabPage,approvedPage
-  },
-  data() {
-    return {
-      total: 0, //总条数
-      approveTotal: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      activeName:"first",
-      search_data: {
-        tabType:0,
-        pageno: 1,
-        pagesize: 10,
-      },search_data1: {
-        tabType:0,
-        pageno: 1,
-        pagesize: 10,
-      },search_data2: {
-        tabType:1,
-        pageno: 1,
-        pagesize: 10,
-      },search_data3: {
-        tabType:2,
-        pageno: 1,
-        pagesize: 10,
-      },search_data4: {
-        tabType:3,
-        pageno: 1,
-        pagesize: 10,
-      },
-      approveListQuery:{
-        type:3,
-        pageno: 1,
-        pagesize: 5
-      },
-      formData: {
-        startTime: "",
-        endTime: "",
-        contractType: '',
-        contractTypeName: '',
-        unitUomName: '',
-        clientName: '',
-        materielName: '',
-        specification: '',
-        auditSign: '',
-        salesPersonName: '',
-        salesPerson: '',
-        // createTime: '',
-        deptId: '',
-        salesPersonDept: '',
-        createBy: "",//制单人id
-        createByName:"",
-      },
-      exportList:[],
-      elOptionList:[],
-      searchParamElement: [
-        {key:0,label:"合同编号",searchType:"inputElement",placeholder:"合同编号",model:"contractCode",clearable:true},
-        {key:1,label:"客户名称",searchType:"inputElement",placeholder:"客户",model:"clientName",clearable:true},
-        {key:2,label:"物料名称",searchType:"inputElement",placeholder:"物料名称",model: "materielName",clearable:true},
-        {key:3,label:"合同日期",searchType:"dateElement",placeholder:"请选择时间段",model: "timeArea",clearable:true}
-      ],
-      searchApproveParamElement: [
-        {label:"合同编号",searchType:"inputElement",placeholder:"合同编号",model:"dataCode",clearable:true},
-        {label:"客户",searchType:"inputElement",placeholder:"模糊搜索",model: "clientName",clearable:true},
-        // {label:"物料",searchType:"inputElement",placeholder:"模糊搜索",model: "materielName",clearable:true},
-        {label:"合同日期",searchType:"dateElement",placeholder:"请选择时间段",model: "timeArea",clearable:true}
-      ],
-      buttons:[
-        {key:0,btnName:"新增",vhas:"sales:salesContract:add",click:"goAdd",type:"primary",disabled:false},
-        {key:1,btnName:"删除",vhas:"sales:salesContract:remove",click:"remove",type:"primary",disabled:true},
-        {key:2,btnName:"导出",vhas:"sales:salesContract:exportExcel",click:"exportExcel",type:"primary",disabled:false},
-        {key:3,btnName:"关闭",vhas:"sales:salesContract:close",click:"close",type:"primary",disabled:true},
-        {key:4,btnName:"开启",vhas:"sales:salesContract:reverseClose",click:"reverseClose",type:"primary",disabled:true},
-        {key:5,btnName:"变更",vhas:"sales:salesContract:change",click:"change",type:"primary",disabled:true},
-        {key:6,btnName:"变更记录",vhas:"sales:salesContract:gotoAlterationList",click:"gotoAlterationList",type:"primary",disabled:true},
-        {key:7,btnName:"列表配置",click:"showColumnSetDialog",vhas:'',type:"primary",disabled:false},
-        {key:8,btnName:"关联单据",click:"associatedDocument",type:"primary",disabled:true}
-      ],
-      //
-      otherButton:[
-        {key:0,btnName:"导出",vhas:"sales:salesContract:exportExcel",click:"exportExcel",type:"primary",disabled:false},
-        {key:1,btnName:"变更记录",vhas:"sales:salesContract:gotoAlterationList",click:"gotoAlterationList",type:"primary",disabled:true},
-      ],
-      allListButton:[
-        {key:0,btnName:"导出",vhas:"sales:salesContract:exportExcel",click:"exportExcel",type:"primary",disabled:false},
-        // {key:1,btnName:"删除",vhas:"sales:salesContract:remove",click:"remove",type:"primary",disabled:true},
-        // {key:1,btnName:"反审核",vhas:"sales:salesContract:disAudit",click:"disAudit",type:"primary",disabled:true},
-        {key:2,btnName:"变更记录",vhas:"sales:salesContract:gotoAlterationList",click:"gotoAlterationList",type:"primary",disabled:true},
-      ],
-      approvedButton:[
-        {key:0,btnName:"导出",vhas:"sales:salesContract:exportExcel",click:"exportExcel",type:"primary",disabled:false},
-        // {key:1,btnName:"删除",vhas:"sales:salesContract:remove",click:"remove",type:"primary",disabled:true},
-        // {key:1,btnName:"反审核",vhas:"sales:salesContract:disAudit",click:"disAudit",type:"primary",disabled:true},
-        {key:2,btnName:"变更记录",vhas:"sales:salesContract:gotoAlterationList",click:"gotoAlterationList",type:"primary",disabled:true},
-      ],
-      //默认审批页面列表
-      showAuditColumnsDefault:[
-        // {title: "审批标题", prop_: "title",content:"销售订单审批", select: true},
-        {title: "申请人", prop_: "approveApplicantName", select: true},
-        {title: "申请时间", prop_: "submitTime", select: true},
-        {title: "审批状态", prop_: "approveStatusName", select: true,sortable:true},
-      ],
-      auditTableData:[],
-      //默认列表数据
-      showTableColumnsDefault: [
-        {title: "合同日期", prop_: "contractDate", select: true},
-        {title: "合同编号", prop_: "contractCode", select: true},
-        {title: "合同类型", prop_: "contractTypeName", select: true},
-        {title: "关闭标志", prop_: "closeStatusName", select: true},
-        {title: "客户名称", prop_: "clientName", select: true},
-        {title: "销售员", prop_: "salesPersonName", select: true},
-        {title: "销售部门", prop_: "salesPersonDeptName", select: true},
-        {title: "发货是否检验", prop_: "isCheck", select: true},
-        {title: "物料代码", prop_: "materielSerialNo", select: true},
-        {title: "物料名称", prop_: "materielName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "主计量单位", prop_: "unitUomName", select: true},
-        {title: "主单位数量", prop_: "count", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "销售数量", prop_: "saleCount", select: true},
-        {title: "含税单价（元）", prop_: "taxUnitPrice", select: true},
-        {title: "销售金额（元）", prop_: "taxAmount", select: true},
-        {title: "交货日期", prop_: "deliveryDate", select: true,sortable:true},
-        // {title: "审核状态", prop_: "auditSignName", select: true},
-        {title: "审批状态", prop_: "approveStatusName", select: true},
-        {title: "行关闭状态", prop_: "itemCloseStatusName", select: true},
-        {title: "行关闭时间", prop_: "itemCloseTime", select: true},
-        {title: "行关闭原因", prop_: "itemCloseReason", select: true}
-      ],
-      ///弹出页面列表数据
-      showTableColumns: [
-        {title: "合同日期", prop_: "contractDate", select: true},
-        {title: "合同编号", prop_: "contractCode", select: true},
-        {title: "合同类型", prop_: "contractTypeName", select: true},
-        {title: "关闭标志", prop_: "closeStatusName", select: true},
-        {title: "客户名称", prop_: "clientName", select: true},
-        {title: "销售员", prop_: "salesPersonName", select: true},
-        {title: "销售部门", prop_: "salesPersonDeptName", select: true},
-        {title: "发货是否检验", prop_: "isCheck", select: true},
-        {title: "物料代码", prop_: "materielSerialNo", select: true},
-        {title: "物料名称", prop_: "materielName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "主计量单位", prop_: "unitUomName", select: true},
-        {title: "主单位数量", prop_: "count", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "销售数量", prop_: "saleCount", select: true},
-        {title: "含税单价（元）", prop_: "taxUnitPrice", select: true},
-        {title: "销售金额（元）", prop_: "taxAmount", select: true},
-        {title: "交货日期", prop_: "deliveryDate", select: true,sortable:true},
-        // {title: "审核状态", prop_: "auditSignName", select: true},
-        {title: "审批状态", prop_: "approveStatusName", select: true},
-        {title: "行关闭状态", prop_: "itemCloseStatusName", select: true},
-        {title: "行关闭时间", prop_: "itemCloseTime", select: true},
-        {title: "行关闭原因", prop_: "itemCloseReason", select: true}
-      ],
-      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
-      //显示的列表字段
-      formTableData: [],
-      alterationDetailId: '',
-      contractList: [],
-      contractData: [],
-      tableData1: [],
-      summary: {},
-      formDataTime: "",
-      time: '',
-      salesTime: '',
-      tableData: [],
-      depOptions: [],
-      salesPersonDept: '',
-      options: [],
-      typeList: [],
-      config: config,
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      advanceQueryDialogVisible: false,
-      chooseUserVisible: false,
-      chooseUserVisible1: false,
-      chooseMaterielVisible:false,//物料
-      dialogLoading: false,
-      dialogTitle: "",
-      pictLoading: false,
-      columnSetDialogTitle: "设置显示字段列表",
-      columnSetDialogVisible: false,
-      salesContractIds: [],
-      tableId: 'sales_contract_table',
-      tbody:''
-    }
-  },
-  watch: {
-    time(val) {
-      if (val) {
-        this.search_data.startTime = val[0];
-        this.search_data.endTime = val[1];
-      } else {
-        this.search_data.startTime = "";
-        this.search_data.endTime = "";
-      }
-
-    },
-
-    btnDelDisabled(val){
-      this.buttons[1].disabled = val
-      // this.allListButton[1].disabled = val
-      // this.approvedButton[1].disabled = val
-    },
-    btnOtherDisabled(val){
-      // this.buttons[2].disabled = val
-      this.buttons[3].disabled = val
-      this.buttons[4].disabled = val
-      this.buttons[5].disabled = val
-      this.buttons[6].disabled = val
-      this.buttons[8].disabled = val
-      this.otherButton[1].disabled = val
-      this.allListButton[1].disabled = val
-      // this.allListButton[3].disabled = val
-      this.approvedButton[1].disabled = val
-      // this.approvedButton[3].disabled = val
-    },
-    activeName(val){
-      if(val==="first"){
-        this.search_data=this.search_data1
-        this.getList(0)
-      }else if(val==="second"){
-        // this.search_data.tabType=null
-      }else if(val==="third"){
-        this.search_data=this.search_data2
-        this.getList()
-      }else if(val==="fourth"){
-        this.search_data=this.search_data4
-        this.getList()
-      }else if(val==="end"){
-        this.search_data=this.search_data3
-        this.getList()
-      }
-    },
-    formDataTime(val) {
-      if (val) {
-        this.formData.startTime = val[0];
-        this.formData.endTime = val[1];
-      } else {
-        this.formData.startTime = "";
-        this.formData.endTime = "";
-      }
-
-    },
-  },
-  created() {
-    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.myApproveList()
-    this.getList(0)
-    this.getShowColumns();
-    this.initData()
-  },
-  mounted() {
-    // this.rowDrop()
-    if (this.$route.query.active) {
-      this.activeName = "second";
-    }
-  },
-  methods: {
-    associatedDocument(){
-      let data = this.salesContractIds[0]
-      this.$router.push({
-        path: "/sales/salesContract_associatedDocument",
-        query: {id: data.salesContractId,clientName:data.clientName,contractCode:data.contractCode,t:Date.now() }
-      });
-    },
-    // 所有列表展示
-    isExist(val){
-      let isExist = false
-      // 从浏览器缓存中获取权限数组
-      var buttonpermsStr = localStorage.getItem('btnContext');
-      if (buttonpermsStr === undefined || buttonpermsStr == null) {
-        return false
-      } else {
-        JSON.parse(buttonpermsStr).forEach(element => {
-          //匹配缓存中的数据中有没有匹配的值
-          if (element == val) {
-            // 若在按钮中定义的权限字段能在后端返回的权限数组中能找到，则该按钮可显示
-            isExist = true
-          }
-        });
-      }
-      return isExist
-    },
-    btnClick(val){
-      console.log("根据方法名称调用")
-      if(val==="goAdd"){
-        this.goAdd()
-      }else if(val=="showColumnSetDialog"){
-        this.showColumnSetDialog()
-      }else if(val=="remove"){
-        this.remove()
-      }else if(val=="disAudit"){
-        this.disAudit()
-      } else if(val==="exportExcel"){
-        this.exportExcel()
-      }else if(val==="close"){
-        this.close()
-      }else if(val==="reverseClose"){
-        this.reverseClose()
-      }else if(val==="change"){
-        this.change()
-      }else if(val==="gotoAlterationList"){
-        this.gotoAlterationList()
-      } else if (val==="associatedDocument") {
-        this.associatedDocument()
-      }
-    },
-// 查询审批列表
-    searchApproveList(){
-      this.approveListQuery.pagesize = 5
-      this.approveListQuery.pageno =1
-      this.myApproveList()
-    },
-    //进入审核页面
-    gotoApproveDetail(row){
-      this.$router.push({
-        path: "/sales/salesContract_approve_detail",
-        query: {id: row.salesContractId,instanceId:row.instanceId,taskId:row.taskId,tabType:this.search_data.tabType,  t:Date.now() }
-      });
-    },
-    gotoDetailAll(row){
-      if(row.approveState==0 || row.approveState==2 || row.approveState==3){
-        this.$router.push({ path: "/sales/salesContract_add", query: { id: row.salesContractId,t: Date.now() } })
-      }else{
-        this.$router.push({ path: "/sales/salesContract_detail", query: { id: row.salesContractId,t: Date.now() } })
-      }
-    },
-    sortChange(val){
-      console.log(val)
-      this.search_data.sort = "item.delivery_date"
-      this.search_data.order = (val.order=="ascending")?"asc":"desc"
-      this.getList()
-    },
-    myApproveList(){
-      this.pictLoading = true;
-      console.log(this.approveListQuery)
-      this.$api.scmApproveAPI.myApproveList(this.approveListQuery).then(res=>{
-        this.pictLoading = false
-        if(res.code == 0){
-          if (res.data &&  res.data.list) {
-            this.auditTableData = res.data.list;
-            this.approveTotal = res.data.total;
-          } else {
-            this.auditTableData = [];
-            this.approveTotal = 0;
-          }
-          if(this.auditTableData.length){
-            this.auditTableData.forEach(item=>{
-              if(item.approveState==0){
-                item.approveStatusName = "暂存"
-              } else if(item.approveState==1){
-                item.approveStatusName = "待审批"
-              }else if(item.approveState==2){
-                item.approveStatusName = "已驳回"
-              }else if(item.approveState==3){
-                item.approveStatusName = "审批通过"
-              }
-              item.summary = [
-                {label:"合同编号",value:item.contractCode},
-                {label:"客户",value:item.clientName},
-                {label:"合同类型",value:item.contractTypeName},
-                {label:"合同日期",value:item.contractDate},
-                {label:"合同总金额",value:item.allTaxAmount},
-              ]
-            })
-          }
-        }
-      }).catch(r=>{
-      })
-    },
-    // 变更合同列表页
-    gotoAlterationList() {
-      let id = this.salesContractIds[0].salesContractId
-      this.$router.push({ path: "/sales/salesContract_alterationList", query: { id: id, t: Date.now()} })
-    },
-
-    // 返回首页
-    gotoIndex() {
-      this.chooseProVisible = false
-    },
-    // 变更
-    change() {
-      if (this.salesContractIds[0].approveStatusName === "审批通过" && this.salesContractIds[0].closeStatusName === "未关闭") {
-        let id = this.salesContractIds[0].salesContractId
-        this.$router.push({ path: "/sales/salesContract_edit", query: { id: id, t: Date.now()} })
-      } else {
-        this.$message({
-          message: "选中项已关闭或未审核",
-          type: "error"
-        })
-      }
-    },
-
-    /**
-     * 关闭
-     */
-    close() {
-      let id = this.salesContractIds[0].salesContractId
-      this.$confirm("确认终止选中的项吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.salesAPI
-          .closeContract({id: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              })
-              this. getList();
-            } else {
-              this.$message({
-                message: res.msg,
-                type: "error"
-              })
-            }
-          })
-      })
-
-    },
-    // 反关闭
-    reverseClose () {
-      let id = this.salesContractIds[0].salesContractId
-      this.$confirm("确认开启选中的项吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.salesAPI
-          .reverseClose({id: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              })
-              this. getList();
-            } else {
-              this.$message({
-                message: res.msg,
-                type: "error"
-              })
-            }
-          })
-      })
-    },
-    // 导出
-    exportExcel() {
-      delete this.search_data.pagesize
-      delete this.search_data.pageno
-      this.$api.salesAPI
-        .exportExcel(this.search_data)
-        .then(res => {
-        })
-    },
-    /**
-     * 反审核
-     */
-    disAudit() {
-      let id = this.salesContractIds[0].salesContractId
-      this.$confirm("确认反审核选中的项吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.salesAPI
-          .reverseAuditContract({id: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              })
-              this. getList();
-            } else {
-              this.$message({
-                message: res.msg,
-                type: "error"
-              })
-            }
-          })
-      })
-
-    },
-
-    /**
-     * 审核
-     */
-    audit() {
-      let id = this.salesContractIds[0].salesContractId
-      this.$confirm("确认审核选中的项吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.salesAPI
-          .auditContract({id: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              })
-              this. getList();
-            } else {
-              this.$message({
-                message: res.msg,
-                type: "error"
-              })
-            }
-          })
-      })
-
-    },
-
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-
-    // 跳转到查看页面
-    gotoDetail(row) {
-      console.log('跳转详情页面')
-      this.$router.push({ path: "/sales/salesContract_add", query: { id: row.salesContractId,t: Date.now() } })
-    },
-
-    // 前往新增页面
-    goAdd() {
-      this.$router.push({ path: "/sales/salesContract_add", query: {t: Date.now() } })
-    },
-    liftForExport(){
-      if(n==0){
-        this.search_data1 = this.search_data
-      }
-      // this.pictLoading = true;
-      this.$api.salesAPI
-        .listForExport(this.search_data)
-        .then(res => {
-          // this.pictLoading = false;
-          if(res.data) {
-            // this.summary = res.total
-            // this.total = res.data.totalRows;
-            this.exportList = res.data.list ? res.data.list : [];
-            this.exportList.forEach(item => {
-              // item.contractDate = item.contractDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.contractDate):""
-              // item.deliveryDate = item.deliveryDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.deliveryDate):""
-              if(item.approveState==0){
-                item.approveStatusName = "暂存"
-              } else if(item.approveState==1){
-                item.approveStatusName = "待审批"
-              }else if(item.approveState==2){
-                item.approveStatusName = "已驳回"
-              }else if(item.approveState==3){
-                item.approveStatusName = "审批通过"
-              }
-            })
-          } else {
-            // this.total = 0;
-            this.exportList = [];
-          }
-        }).catch(r => {
-        console.log(r);
-      });
-    },
-    // 获取销售订单列表
-    getList(n) {
-      // if(val){
-      //   this.search_data.contractCode=val[0]
-      //   this.search_data.clientName=val[1]
-      //   this.search_data.materielName=val[2]
-      // }
-      if(n==0){
-        this.search_data1 = this.search_data
-      }
-      this.pictLoading = true;
-      this.$api.salesAPI
-        .listSalesContract(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if(res.data) {
-            this.summary = res.total
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-            this.tableData.forEach(item => {
-              // item.contractDate = item.contractDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.contractDate):""
-              // item.deliveryDate = item.deliveryDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.deliveryDate):""
-              if(item.approveState==0){
-                item.approveStatusName = "暂存"
-              } else if(item.approveState==1){
-                item.approveStatusName = "待审批"
-              }else if(item.approveState==2){
-                item.approveStatusName = "已驳回"
-              }else if(item.approveState==3){
-                item.approveStatusName = "审批通过"
-              }
-            })
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        }).catch(r => {
-        console.log(r);
-      });
-    },
-
-    //设置显示字段
-    showColumnSetDialog() {
-      this.columnSetDialogVisible = true;
-      this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-      // 行拖拽
-        // this.rowDrop()
-    },
-    //前移
-    toUp(scope) {
-      if (scope.$index == 0) {
-        return false;
-      }
-      let n;
-      for (let i = 0; i < this.showTableColumns.length; i++) {
-        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-          n = i;
-        }
-      }
-      let temp = this.showTableColumns[n];
-      this.showTableColumns[n] = this.showTableColumns[n - 1];
-      this.showTableColumns[n - 1] = temp;
-      this.$forceUpdate();
-    },
-    //后移
-    toDown(scope) {
-      if (scope.$index == this.showTableColumns.length - 1) {
-        return false;
-      }
-      let n;
-      for (let i = 0; i < this.showTableColumns.length; i++) {
-        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-          n = i;
-        }
-      }
-      let temp = this.showTableColumns[n];
-      this.showTableColumns[n] = this.showTableColumns[n + 1];
-      this.showTableColumns[n + 1] = temp;
-      this.$forceUpdate();
-    },
-    //恢复默认
-    toDefault() {
-      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-      this.$forceUpdate();
-    },
-    //完成列表字段设置
-    saveAndCloseColumnSetDialog() {
-      let tableNo = this.tableId;
-      let tableColumns = JSON.stringify(this.showTableColumns);
-      this.columnSetDialogVisible = false;
-      this.$api.tableColumnAPI
-        .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
-        .then(res => {
-          let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-          this.formTableData = [];
-          for (let i = 0; i < arr.length; i++) {
-            if (arr[i].select) {
-              this.formTableData.push(arr[i]);
-            }
-          }
-          this.getShowColumns();
-        })
-        .catch(r => {
-          console.log(r);
-        });
-    },
-    //关闭字段设置弹出
-    handleClose() {
-      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
-      this.columnSetDialogVisible = false;
-
-    },
-    /**
-     * 获取显示字段
-     */
-    getShowColumns() {
-      let tableNo = this.tableId;
-      this.formTableData = [];
-
-      this.$api.tableColumnAPI
-        .getShowColumns({tableNo:tableNo})
-        .then(res => {
-          if(res.code==0){
-            if(res.results){
-              this.showTableColumns = JSON.parse(res.results);
-              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-              for (let i = 0; i < arr.length; i++) {
-                if (arr[i].select) {
-                  this.formTableData.push(arr[i]);
-                }
-              }
-              this.$forceUpdate();
-            }else{
-              let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-              for (let i = 0; i < arr.length; i++) {
-                if (arr[i].select) {
-                  this.formTableData.push(arr[i]);
-                }
-              }
-              this.$forceUpdate();
-            }
-          }else{
-            this.$message({
-              message: res.msg ? res.msg : "获取列表信息失败",
-              type: "error"
-            });
-          }
-
-        })
-        .catch(r => {
-          this.$message({
-            message: r,
-            type: "error"
-          });
-          console.log(r);
-        });
-    },
-
-    // 查询
-    search() {
-      this.search_data.pageno = 1;
-      this.search_data.pagesize = 10;
-      this.getList();
-    },
-
-    /**
-     * 高级查询
-     */
-    moreSearch() {
-      this.advanceQueryDialogVisible = true;
-      this.dialogTitle = "高级查询";
-    },
-    save() {
-      for (var n in this.formData) {
-        this.search_data[n] = this.formData[n];
-      }
-      this.search_data.inDatas = "";
-      this.time = this.formDataTime;
-      this.search_data.pageno = 1;
-      this.$nextTick(function () {
-        this.advanceQueryDialogVisible = false;
-        this.getList();
-      })
-    },
-    //清空
-    clear() {
-      for (var n in this.formData) {
-        this.formData[n] = '';
-      }
-      this.formDataTime = "";
-      this.salesPersonDept=''
-      // this.createTime = "";
-    },
-    changeFacility() {
-      this.$forceUpdate();
-    },
-
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-// 每页显示多少条
-    handleApproveSizeChange(val) {
-      this.approveListQuery.pagesize = val;
-      this.myApproveList();
-    },
-    // 上下分页
-    handleApproveCurrentChange(val) {
-      this.approveListQuery.pageno = val;
-      this.myApproveList();
-    },
-    /**
-     * 初始化
-     */
-    initData() {
-      // 获取审核状态
-      this.$api.salesAPI
-        .listAauditSign({
-          type: "audit_status",
-        })
-        .then(res => {
-          this.options = res.datas
-        });
-      //  获取合同类型
-      this.$api.salesAPI
-        .listContractType({
-          type: "sales_contract_type",
-        })
-        .then(res => {
-          this.typeList = res.datas
-        });
-      // 获取生产部门
-      Promise.all([this.$api.commonAPI.getDeptsTree(), this.$api.roleAPI.list()])
-        .then(([r1, r2]) => {
-          if (r1.code === 0) {
-            this.depOptions=r1.data.children;
-            // this.setDefaultDept();
-            this.setDeptList(this.depOptions);
-          }
-          if (r2.code === 0) {
-            this.roleList = r2.datas;
-          }
-        })
-        .catch(error => {
-          console.log(error);
-        });
-    },
-    getMateriel(val){
-      if (val) {
-        this.$set(this.formData,'materiel',val.id)
-        this.$set(this.formData,'materielName',val.name)
-      }else{
-        this.$set(this.formData,'materiel',"")
-        this.$set(this.formData,'materielName',"")
-      }
-    },
-
-    /**
-     * 获取用户
-     */
-    getUser(data) {
-      if (data) {
-        this.$set(this.formData,'salesPersonName',data.name)
-        this.$set(this.formData,'salesPerson',data.id)
-        //   this.formData.salesPersonName = data.name;
-        //   this.formData.salesPerson = data.id;
-        //   this.getUserList.forEach(item => {
-        //     if (data.id === item.id) {
-        //       self.formData.salesPersonDept = item.deptId;
-        //         self.formData.deptId= item.deptId;
-        //       return;
-        //     }
-        //   });
-        // if (self.formData.deptId == 0) {
-        //   self.formData.salesPersonDept = "";
-        // }
-        this.setDefaultDept()
-      }
-    },
-    /**
-     * 获取制单人
-     */
-    getUser1(data) {
-      console.log(data)
-      var self = this;
-      if (data) {
-        this.formData.createByName = data.name;
-        this.formData.createBy = data.id;
-      }
-    },
-    //根据当前id,获取一条树枝上的所有id数据
-    treeFindPath (tree, func, path = []) {
-      if (!tree) return []
-      for (const data of tree) {
-        path.push(data.id)
-        if (func(data)) return path
-        if (data.children) {
-          const findChildren = this.treeFindPath(data.children, func, path)
-          if (findChildren.length) return findChildren
-        }
-        path.pop()
-      }
-      return []
-    },
-    //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
-    setDeptList(tree){
-      for (const data of tree) {
-        if(!data.hasChildren){
-          data.children=undefined;
-        }else{
-          this.setDeptList(data.children)
-        }
-      }
-    },
-    //显示默认部门
-    // setDefaultDept(){
-    //     if(this.depOptions.length>0&&this.formData.deptId){
-    //       let id=JSON.stringify( this.formData.deptId)
-    //       let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
-    //       this.salesPersonDept=JSON.parse(JSON.stringify(select_id))
-    //     }
-    //   },
-    // 选择部门
-    handleChange:function(value){
-      this.formData.salesPersonDept=value.length>=1?value[value.length-1]:'';
-      this.salesPersonDept=value;
-    },
-
-
-    /**
-     * 处理选中
-     */
-    handleSelectionChange(val) {
-      this.salesContractIds= val;
-      this.setBtn(val);
-    },
-
-    /**
-     * 删除
-     */
-    remove() {
-      let ids = [];
-      this.salesContractIds.forEach(item => {
-        ids.push(item.salesContractId)
-        console.log(ids)
-      })
-      this.$confirm("确认删除选中的项吗?", "提示", {
-        type: "warning"
-      }).then(() => {
-        this.$api.salesAPI
-          .removeContract({salesContractIds: ids})
-          .then(res => {
-            if (res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              });
-              this.search();
-            } else {
-              this.$message({
-                message: res.msg ? res.msg : "删除失败，请重试",
-                type: "error"
-              });
-            }
-          })
-          .catch(error => {
-            this.$message({
-              message: "删除失败，请重试",
-              type: "error"
-            });
-          });
-      });
-    },
-    /**
-     * 控件操作按钮状态
-     */
-    setBtn(val) {
-      let isFlag = true;
-      let isDelFlag = true;
-      if (val.length > 0) {
-        isDelFlag = false;
-        if (val.length == 1) {
-          isFlag = false;
-        }
-      } else {
-        isFlag = true;
-        isDelFlag = true;
-      }
-      this.btnDelDisabled = isDelFlag;
-      this.btnOtherDisabled = isFlag;
-    },
-    // 合计
-    getSummaries(param){
-      const { columns, data } = param;
-      console.log("zhuyemian汇总")
-      console.log(param)
-      let sums=[];
-      columns.forEach((column, index) => { //计算不含税金额总计
-
-        if (index === 0) {
-          sums[index] = '合计';
-          return;
-        }
-        if (column.property!=='count'&&column.property!=='taxAmount'&&column.property!=='saleCount') {
-          sums[index] = '';
-          return;
-        }
-
-        const values = data.map(item => Number(item[column.property]));
-        if (!values.every(value => isNaN(value))) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0);
-        } else {
-          sums[index] = '';
-        }
-        if (column.property==='count') {
-          if(sums[index]) {
-            sums[index] = this.summary.totalCount;
-          }
-          return;
-        }
-        if (column.property==='saleCount') {
-          if(sums[index]) {
-            sums[index] = this.summary.totalSaleCount;
-          }
-          return;
-        }
-        if (column.property==='taxAmount') {
-          if(sums[index]) {
-            sums[index] = this.summary.totalTaxAmount;
-          }
-          return;
-        }
-      });
-      console.log("--------------")
-      console.log(this.summary)
-      return sums;
-    },
-    //行拖拽
-    rowDrop() {
-      const _this=this
-      this.$nextTick(()=>{
-       const tbody = document.querySelector('.move-table .el-table__body-wrapper tbody')
-         Sortable.create(tbody, {
-        onEnd({ newIndex, oldIndex }) {
-          const currRow = _this.showTableColumns.splice(oldIndex, 1)[0]
-          _this.showTableColumns.splice(newIndex, 0, currRow)
-          console.log(_this.showTableColumns)
-        }
-      })
-      })
-    },
-
-  }
-}
-</script>
-<style scoped>
-.approve-box .sys-tabs .el-tabs__nav-wrap {
-  padding: 5px 20px 0px;
-}
-.approve-box .sys-tabs .el-tabs__item {
-  padding-top: 10px;
-  height: 50px;
-}
-.approve-box .el-timeline-item__content {
-  line-height: 1.5;
-}
-.approve-box .el-dialog__body {
-  padding-top: 0px;
-}
-</style>
-<style>
-.approve-box .sys-tabs .el-tabs__nav-wrap {
-  padding: 5px 20px 0px;
-}
-.approve-box .sys-tabs .el-tabs__item {
-  padding-top: 10px;
-  height: 50px;
-}
-.approve-box .el-timeline-item__content {
-  line-height: 1.5;
-}
-.approve-box .el-dialog__body {
-  padding-top: 0px;
-}
-.approve-form .el-form-item {
-  margin-bottom: 0px;
-}
-.approve-timeline .el-timeline-item__wrapper {
-  padding-top: 10px;
-  padding-left: 80px;
-}
-.approve-timeline .el-timeline-item__tail {
-  left: 30px;
-  border-left-width: 4px;
-}
-</style>
-
-
-
-
-
+<template>
+  <div class="sys-box approve-box">
+    <div class="sys-tabs">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="我发起的" name="first">
+          <mineTabPage :disableBtn="false"
+                       :formTableData="formTableData"
+                       :searchParamElement="searchParamElement"
+                       :tableData="tableData"
+                       :listQuery="search_data"
+                       :total="total"
+                       :pictLoading="pictLoading"
+                       :buttons="buttons"
+                       :summary = "summary"
+                       :showMoreSearch="true"
+                       @sortChange = "sortChange"
+                       @btnClick="btnClick"
+                       @getList="getList"
+                       @search="search"
+                       @moreSearch="moreSearch"
+                       @goLink="gotoDetailAll"
+                       @handleCurrentChange="handleCurrentChange"
+                       @handleSizeChange="handleSizeChange"
+                       @getSummaries="getSummaries"
+                       @handleSelectionChange="handleSelectionChange"
+          ></mineTabPage>
+        </el-tab-pane>
+        <el-tab-pane label="我的审批" name="second">
+          <span slot="label">
+            <el-badge class="item" :value="approveTotal">我审批的</el-badge>
+          </span>
+          <auditTabPage :formTableData="showAuditColumnsDefault"
+                        :searchParamElement="searchApproveParamElement"
+                        :tableData="auditTableData"
+                        :listTitle="'销售订单审批'"
+                        :listQuery="approveListQuery"
+                        :total="approveTotal"
+                        :pictLoading="pictLoading"
+                        :buttons="buttons"
+                        @btnClick="btnClick"
+                        @getList="searchApproveList"
+                        @search="searchApproveList"
+                        @moreSearch="moreSearch"
+                        @gotoDetail="gotoApproveDetail"
+                        @handleCurrentChange="handleApproveCurrentChange"
+                        @handleSizeChange="handleApproveSizeChange"
+                        @handleSelectionChange="handleSelectionChange"
+          ></auditTabPage>
+        </el-tab-pane>
+        <el-tab-pane label="已审批的" name="fourth">
+          <approvedPage :disableBtn="false"
+                        :formTableData="formTableData"
+                        :searchParamElement="searchParamElement"
+                        :tableData="tableData"
+                        :listQuery="search_data4"
+                        :total="total"
+                        :pictLoading="pictLoading"
+                        :buttons="approvedButton"
+                        :summary = "summary"
+                        :showMoreSearch="true"
+                        @btnClick="btnClick"
+                        @getList="getList"
+                        @search="search"
+                        @moreSearch="moreSearch"
+                        @goLink="gotoDetailAll"
+                        @handleCurrentChange="handleCurrentChange"
+                        @handleSizeChange="handleSizeChange"
+                        @handleSelectionChange="handleSelectionChange">
+          </approvedPage>
+        </el-tab-pane>
+        <el-tab-pane label="我的团队" name="third">
+          <listTabPage :disableBtn="false"
+                       :formTableData="formTableData"
+                       :searchParamElement="searchParamElement"
+                       :tableData="tableData"
+                       :listQuery="search_data2"
+                       :total="total"
+                       :pictLoading="pictLoading"
+                       :buttons="otherButton"
+                       :summary = "summary"
+                       :showMoreSearch="true"
+                       @btnClick="btnClick"
+                       @getList="getList"
+                       @search="search"
+                       @moreSearch="moreSearch"
+                       @goLink="gotoDetailAll"
+                       @handleCurrentChange="handleCurrentChange"
+                       @handleSizeChange="handleSizeChange"
+                       @handleSelectionChange="handleSelectionChange">
+          </listTabPage>
+        </el-tab-pane>
+        <el-tab-pane label="所有列表" name="end" v-if="isExist('sales:salesContract:allList')">
+          <listTabPage :disableBtn="false"
+                       :formTableData="formTableData"
+                       :searchParamElement="searchParamElement"
+                       :tableData="tableData"
+                       :listQuery="search_data3"
+                       :total="total"
+                       :pictLoading="pictLoading"
+                       :buttons="allListButton"
+                       :summary = "summary"
+                       :showMoreSearch="true"
+                       @btnClick="btnClick"
+                       @getList="getList"
+                       @search="search"
+                       @moreSearch="moreSearch"
+                       @goLink="gotoDetailAll"
+                       @handleCurrentChange="handleCurrentChange"
+                       @handleSizeChange="handleSizeChange"
+                       @handleSelectionChange="handleSelectionChange">
+          </listTabPage>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px" :before-close="handleClose">
+      <el-table border
+      class="move-table"
+                :data="showTableColumns"
+                row-key="prop_"
+                :key="Math.random()"
+                max-height="350"
+                style="width: 100%">
+        <el-table-column
+          prop="title"
+          label="列表名称">
+        </el-table-column>
+        <el-table-column
+          prop="select"
+          label="是否显示"
+          >
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+    <!-- 高级查询对话框 -->
+    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
+      <el-form :inline="true"
+               v-loading="dialogLoading"
+               label-width="80px"
+               class="dialog-form"
+               ref="form" style="width: 620px"
+      >
+        <div class="dialog-line">
+          <el-form-item label="合同时间"  class="dialog-form-inline-single">
+            <el-date-picker
+              v-model="formDataTime"
+              type="daterange"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              range-separator="—"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="合同类型" class="dialog-form-inline">
+            <el-select v-model="formData.contractType" style="width:100%" clearable placeholder="请选择" @change="changeFacility">
+              <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="客户" class="dialog-form-inline">
+            <el-input placeholder="请输入客户名" v-model="formData.clientName" clearable></el-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="物料" class="dialog-form-inline">
+            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel' :chooseVisible.sync='chooseMaterielVisible'></btn-input>
+          </el-form-item>
+          <el-form-item label="规格型号" class="dialog-form-inline">
+            <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="销售部门" class="dialog-form-inline">
+            <el-cascader
+              v-model="salesPersonDept"
+              clearable
+              :options="depOptions"
+              :props="{ expandTrigger: 'hover',label:'text',value:'id', checkStrictly: true}"
+              @change="handleChange"></el-cascader>
+          </el-form-item>
+          <el-form-item label="审核状态" class="dialog-form-inline">
+            <el-select v-model="formData.auditSign" style="width:100%" clearable placeholder="请选择" @change="changeFacility">
+              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="销售员" prop="salesPersonName" class="dialog-form-inline">
+            <btn-input :valueText.sync='formData.salesPersonName' :valueId.sync='formData.salesPerson' :chooseVisible.sync='chooseUserVisible'></btn-input>
+          </el-form-item>
+          <el-form-item label="制单人" prop="createByName" class="dialog-form-inline">
+
+            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy' :chooseVisible.sync='chooseUserVisible1'></btn-input>
+          </el-form-item>
+        </div>
+
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">确定</el-button>
+        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="clear">清空</el-button>
+      </span>
+    </el-dialog>
+    <!--选择用户-->
+    <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
+    <!--选择制单人-->
+    <DialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></DialogChooseSingleUser1>
+    <!--选择物料-->
+    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel" ></dialogChooseSingleParts>
+  </div>
+</template>
+
+<script>
+import {mapState, mapActions, mapGetters} from "vuex";
+import btnInput from "@/components/btnInput.vue";
+import FileSaver from 'file-saver'
+import config from "@/utils/config.js";
+import Cookies from "js-cookie";
+import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
+import DialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
+import { formatDateTime, getCurrentDate } from "@/utils/tools.js";
+import mineTabPage from "@/components/TabPages/mineTabPage";
+import listTabPage from "@/components/TabPages/listTabPage";
+import auditTabPage from "@/components/TabPages/auditTabPage";
+import approvedPage from "@/components/TabPages/approvedPage";
+import Sortable from 'sortablejs';
+export default {
+  components: {
+    btnInput,DialogChooseSingleUser,DialogChooseSingleUser1,dialogChooseSingleParts,mineTabPage,listTabPage,auditTabPage,approvedPage
+  },
+  data() {
+    return {
+      total: 0, //总条数
+      approveTotal: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      activeName:"first",
+      search_data: {
+        tabType:0,
+        pageno: 1,
+        pagesize: 10,
+      },search_data1: {
+        tabType:0,
+        pageno: 1,
+        pagesize: 10,
+      },search_data2: {
+        tabType:1,
+        pageno: 1,
+        pagesize: 10,
+      },search_data3: {
+        tabType:2,
+        pageno: 1,
+        pagesize: 10,
+      },search_data4: {
+        tabType:3,
+        pageno: 1,
+        pagesize: 10,
+      },
+      approveListQuery:{
+        type:3,
+        pageno: 1,
+        pagesize: 5
+      },
+      formData: {
+        startTime: "",
+        endTime: "",
+        contractType: '',
+        contractTypeName: '',
+        unitUomName: '',
+        clientName: '',
+        materielName: '',
+        specification: '',
+        auditSign: '',
+        salesPersonName: '',
+        salesPerson: '',
+        // createTime: '',
+        deptId: '',
+        salesPersonDept: '',
+        createBy: "",//制单人id
+        createByName:"",
+      },
+      exportList:[],
+      elOptionList:[],
+      searchParamElement: [
+        {key:0,label:"合同编号",searchType:"inputElement",placeholder:"合同编号",model:"contractCode",clearable:true},
+        {key:1,label:"客户名称",searchType:"inputElement",placeholder:"客户",model:"clientName",clearable:true},
+        {key:2,label:"物料名称",searchType:"inputElement",placeholder:"物料名称",model: "materielName",clearable:true},
+        {key:3,label:"合同日期",searchType:"dateElement",placeholder:"请选择时间段",model: "timeArea",clearable:true}
+      ],
+      searchApproveParamElement: [
+        {label:"合同编号",searchType:"inputElement",placeholder:"合同编号",model:"dataCode",clearable:true},
+        {label:"客户",searchType:"inputElement",placeholder:"模糊搜索",model: "clientName",clearable:true},
+        // {label:"物料",searchType:"inputElement",placeholder:"模糊搜索",model: "materielName",clearable:true},
+        {label:"合同日期",searchType:"dateElement",placeholder:"请选择时间段",model: "timeArea",clearable:true}
+      ],
+      buttons:[
+        {key:0,btnName:"新增",vhas:"sales:salesContract:add",click:"goAdd",type:"primary",disabled:false},
+        {key:1,btnName:"删除",vhas:"sales:salesContract:remove",click:"remove",type:"primary",disabled:true},
+        {key:2,btnName:"导出",vhas:"sales:salesContract:exportExcel",click:"exportExcel",type:"primary",disabled:false},
+        {key:3,btnName:"关闭",vhas:"sales:salesContract:close",click:"close",type:"primary",disabled:true},
+        {key:4,btnName:"开启",vhas:"sales:salesContract:reverseClose",click:"reverseClose",type:"primary",disabled:true},
+        {key:5,btnName:"变更",vhas:"sales:salesContract:change",click:"change",type:"primary",disabled:true},
+        {key:6,btnName:"变更记录",vhas:"sales:salesContract:gotoAlterationList",click:"gotoAlterationList",type:"primary",disabled:true},
+        {key:7,btnName:"列表配置",click:"showColumnSetDialog",vhas:'',type:"primary",disabled:false},
+        {key:8,btnName:"关联单据",click:"associatedDocument",type:"primary",disabled:true},
+
+      ],
+      //
+      otherButton:[
+        {key:0,btnName:"导出",vhas:"sales:salesContract:exportExcel",click:"exportExcel",type:"primary",disabled:false},
+        {key:1,btnName:"变更记录",vhas:"sales:salesContract:gotoAlterationList",click:"gotoAlterationList",type:"primary",disabled:true},
+      ],
+      allListButton:[
+        {key:0,btnName:"导出",vhas:"sales:salesContract:exportExcel",click:"exportExcel",type:"primary",disabled:false},
+        // {key:1,btnName:"删除",vhas:"sales:salesContract:remove",click:"remove",type:"primary",disabled:true},
+        // {key:1,btnName:"反审核",vhas:"sales:salesContract:disAudit",click:"disAudit",type:"primary",disabled:true},
+        {key:2,btnName:"变更记录",vhas:"sales:salesContract:gotoAlterationList",click:"gotoAlterationList",type:"primary",disabled:true},
+      ],
+      approvedButton:[
+        {key:0,btnName:"导出",vhas:"sales:salesContract:exportExcel",click:"exportExcel",type:"primary",disabled:false},
+        // {key:1,btnName:"删除",vhas:"sales:salesContract:remove",click:"remove",type:"primary",disabled:true},
+        // {key:1,btnName:"反审核",vhas:"sales:salesContract:disAudit",click:"disAudit",type:"primary",disabled:true},
+        {key:2,btnName:"变更记录",vhas:"sales:salesContract:gotoAlterationList",click:"gotoAlterationList",type:"primary",disabled:true},
+      ],
+      //默认审批页面列表
+      showAuditColumnsDefault:[
+        // {title: "审批标题", prop_: "title",content:"销售订单审批", select: true},
+        {title: "申请人", prop_: "approveApplicantName", select: true},
+        {title: "申请时间", prop_: "submitTime", select: true},
+        {title: "审批状态", prop_: "approveStatusName", select: true,sortable:true},
+      ],
+      auditTableData:[],
+      //默认列表数据
+      showTableColumnsDefault: [
+        {title: "合同日期", prop_: "contractDate", select: true},
+        {title: "合同编号", prop_: "contractCode", select: true},
+        {title: "合同类型", prop_: "contractTypeName", select: true},
+        {title: "关闭标志", prop_: "closeStatusName", select: true},
+        {title: "客户名称", prop_: "clientName", select: true},
+        {title: "销售员", prop_: "salesPersonName", select: true},
+        {title: "销售部门", prop_: "salesPersonDeptName", select: true},
+        {title: "发货是否检验", prop_: "isCheck", select: true},
+        {title: "物料代码", prop_: "materielSerialNo", select: true},
+        {title: "物料名称", prop_: "materielName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "主计量单位", prop_: "unitUomName", select: true},
+        {title: "主单位数量", prop_: "count", select: true},
+        {title: "辅助单位", prop_: "supportUomName", select: true},
+        {title: "销售数量", prop_: "saleCount", select: true},
+        {title: "含税单价（元）", prop_: "taxUnitPrice", select: true},
+        {title: "销售金额（元）", prop_: "taxAmount", select: true},
+        {title: "交货日期", prop_: "deliveryDate", select: true,sortable:true},
+        // {title: "审核状态", prop_: "auditSignName", select: true},
+        {title: "审批状态", prop_: "approveStatusName", select: true},
+        {title: "行关闭状态", prop_: "itemCloseStatusName", select: true},
+        {title: "行关闭时间", prop_: "itemCloseTime", select: true},
+        {title: "行关闭原因", prop_: "itemCloseReason", select: true}
+      ],
+      ///弹出页面列表数据
+      showTableColumns: [
+        {title: "合同日期", prop_: "contractDate", select: true},
+        {title: "合同编号", prop_: "contractCode", select: true},
+        {title: "合同类型", prop_: "contractTypeName", select: true},
+        {title: "关闭标志", prop_: "closeStatusName", select: true},
+        {title: "客户名称", prop_: "clientName", select: true},
+        {title: "销售员", prop_: "salesPersonName", select: true},
+        {title: "销售部门", prop_: "salesPersonDeptName", select: true},
+        {title: "发货是否检验", prop_: "isCheck", select: true},
+        {title: "物料代码", prop_: "materielSerialNo", select: true},
+        {title: "物料名称", prop_: "materielName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "主计量单位", prop_: "unitUomName", select: true},
+        {title: "主单位数量", prop_: "count", select: true},
+        {title: "辅助单位", prop_: "supportUomName", select: true},
+        {title: "销售数量", prop_: "saleCount", select: true},
+        {title: "含税单价（元）", prop_: "taxUnitPrice", select: true},
+        {title: "销售金额（元）", prop_: "taxAmount", select: true},
+        {title: "交货日期", prop_: "deliveryDate", select: true,sortable:true},
+        // {title: "审核状态", prop_: "auditSignName", select: true},
+        {title: "审批状态", prop_: "approveStatusName", select: true},
+        {title: "行关闭状态", prop_: "itemCloseStatusName", select: true},
+        {title: "行关闭时间", prop_: "itemCloseTime", select: true},
+        {title: "行关闭原因", prop_: "itemCloseReason", select: true}
+      ],
+      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
+      //显示的列表字段
+      formTableData: [],
+      alterationDetailId: '',
+      contractList: [],
+      contractData: [],
+      tableData1: [],
+      summary: {},
+      formDataTime: "",
+      time: '',
+      salesTime: '',
+      tableData: [],
+      depOptions: [],
+      salesPersonDept: '',
+      options: [],
+      typeList: [],
+      config: config,
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      advanceQueryDialogVisible: false,
+      chooseUserVisible: false,
+      chooseUserVisible1: false,
+      chooseMaterielVisible:false,//物料
+      dialogLoading: false,
+      dialogTitle: "",
+      pictLoading: false,
+      columnSetDialogTitle: "设置显示字段列表",
+      columnSetDialogVisible: false,
+      salesContractIds: [],
+      tableId: 'sales_contract_table',
+      tbody:''
+    }
+  },
+  watch: {
+    time(val) {
+      if (val) {
+        this.search_data.startTime = val[0];
+        this.search_data.endTime = val[1];
+      } else {
+        this.search_data.startTime = "";
+        this.search_data.endTime = "";
+      }
+
+    },
+
+    btnDelDisabled(val){
+      this.buttons[1].disabled = val
+      // this.allListButton[1].disabled = val
+      // this.approvedButton[1].disabled = val
+    },
+    btnOtherDisabled(val){
+      // this.buttons[2].disabled = val
+      this.buttons[3].disabled = val
+      this.buttons[4].disabled = val
+      this.buttons[5].disabled = val
+      this.buttons[6].disabled = val
+      this.buttons[8].disabled = val
+      this.otherButton[1].disabled = val
+      this.allListButton[1].disabled = val
+      // this.allListButton[3].disabled = val
+      this.approvedButton[1].disabled = val
+      // this.approvedButton[3].disabled = val
+    },
+    activeName(val){
+      if(val==="first"){
+        this.search_data=this.search_data1
+        this.getList(0)
+      }else if(val==="second"){
+        // this.search_data.tabType=null
+      }else if(val==="third"){
+        this.search_data=this.search_data2
+        this.getList()
+      }else if(val==="fourth"){
+        this.search_data=this.search_data4
+        this.getList()
+      }else if(val==="end"){
+        this.search_data=this.search_data3
+        this.getList()
+      }
+    },
+    formDataTime(val) {
+      if (val) {
+        this.formData.startTime = val[0];
+        this.formData.endTime = val[1];
+      } else {
+        this.formData.startTime = "";
+        this.formData.endTime = "";
+      }
+
+    },
+  },
+  created() {
+    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.myApproveList()
+    this.getList(0)
+    this.getShowColumns();
+    this.initData()
+  },
+  mounted() {
+    // this.rowDrop()
+    if (this.$route.query.active) {
+      this.activeName = "second";
+    }
+  },
+  methods: {
+    associatedDocument(){
+      let data = this.salesContractIds[0]
+      this.$router.push({
+        path: "/sales/salesContract_associatedDocument",
+        query: {id: data.salesContractId,clientName:data.clientName,contractCode:data.contractCode,t:Date.now() }
+      });
+    },
+    // 所有列表展示
+    isExist(val){
+      let isExist = false
+      // 从浏览器缓存中获取权限数组
+      var buttonpermsStr = localStorage.getItem('btnContext');
+      if (buttonpermsStr === undefined || buttonpermsStr == null) {
+        return false
+      } else {
+        JSON.parse(buttonpermsStr).forEach(element => {
+          //匹配缓存中的数据中有没有匹配的值
+          if (element == val) {
+            // 若在按钮中定义的权限字段能在后端返回的权限数组中能找到，则该按钮可显示
+            isExist = true
+          }
+        });
+      }
+      return isExist
+    },
+    btnClick(val){
+      console.log("根据方法名称调用")
+      if(val==="goAdd"){
+        this.goAdd()
+      }else if(val=="showColumnSetDialog"){
+        this.showColumnSetDialog()
+      }else if(val=="remove"){
+        this.remove()
+      }else if(val=="disAudit"){
+        this.disAudit()
+      } else if(val==="exportExcel"){
+        this.exportExcel()
+      }else if(val==="close"){
+        this.close()
+      }else if(val==="reverseClose"){
+        this.reverseClose()
+      }else if(val==="change"){
+        this.change()
+      }else if(val==="gotoAlterationList"){
+        this.gotoAlterationList()
+      } else if (val==="associatedDocument") {
+        this.associatedDocument()
+      }
+    },
+// 查询审批列表
+    searchApproveList(){
+      this.approveListQuery.pagesize = 5
+      this.approveListQuery.pageno =1
+      this.myApproveList()
+    },
+    //进入审核页面
+    gotoApproveDetail(row){
+      this.$router.push({
+        path: "/sales/salesContract_approve_detail",
+        query: {id: row.salesContractId,instanceId:row.instanceId,taskId:row.taskId,tabType:this.search_data.tabType,  t:Date.now() }
+      });
+    },
+    gotoDetailAll(row){
+      if(row.approveState==0 || row.approveState==2 || row.approveState==3){
+        this.$router.push({ path: "/sales/salesContract_add", query: { id: row.salesContractId,t: Date.now() } })
+      }else{
+        this.$router.push({ path: "/sales/salesContract_detail", query: { id: row.salesContractId,t: Date.now() } })
+      }
+    },
+    sortChange(val){
+      console.log(val)
+      this.search_data.sort = "item.delivery_date"
+      this.search_data.order = (val.order=="ascending")?"asc":"desc"
+      this.getList()
+    },
+    myApproveList(){
+      this.pictLoading = true;
+      console.log(this.approveListQuery)
+      this.$api.scmApproveAPI.myApproveList(this.approveListQuery).then(res=>{
+        this.pictLoading = false
+        if(res.code == 0){
+          if (res.data &&  res.data.list) {
+            this.auditTableData = res.data.list;
+            this.approveTotal = res.data.total;
+          } else {
+            this.auditTableData = [];
+            this.approveTotal = 0;
+          }
+          if(this.auditTableData.length){
+            this.auditTableData.forEach(item=>{
+              if(item.approveState==0){
+                item.approveStatusName = "暂存"
+              } else if(item.approveState==1){
+                item.approveStatusName = "待审批"
+              }else if(item.approveState==2){
+                item.approveStatusName = "已驳回"
+              }else if(item.approveState==3){
+                item.approveStatusName = "审批通过"
+              }
+              item.summary = [
+                {label:"合同编号",value:item.contractCode},
+                {label:"客户",value:item.clientName},
+                {label:"合同类型",value:item.contractTypeName},
+                {label:"合同日期",value:item.contractDate},
+                {label:"合同总金额",value:item.allTaxAmount},
+              ]
+            })
+          }
+        }
+      }).catch(r=>{
+      })
+    },
+    // 变更合同列表页
+    gotoAlterationList() {
+      let id = this.salesContractIds[0].salesContractId
+      this.$router.push({ path: "/sales/salesContract_alterationList", query: { id: id, t: Date.now()} })
+    },
+
+    // 返回首页
+    gotoIndex() {
+      this.chooseProVisible = false
+    },
+    // 变更
+    change() {
+      if (this.salesContractIds[0].approveStatusName === "审批通过" && this.salesContractIds[0].closeStatusName === "未关闭") {
+        let id = this.salesContractIds[0].salesContractId
+        this.$router.push({ path: "/sales/salesContract_edit", query: { id: id, t: Date.now()} })
+      } else {
+        this.$message({
+          message: "选中项已关闭或未审核",
+          type: "error"
+        })
+      }
+    },
+
+    /**
+     * 关闭
+     */
+    close() {
+      let id = this.salesContractIds[0].salesContractId
+      this.$confirm("确认终止选中的项吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.salesAPI
+          .closeContract({id: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              })
+              this. getList();
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "error"
+              })
+            }
+          })
+      })
+
+    },
+    // 反关闭
+    reverseClose () {
+      let id = this.salesContractIds[0].salesContractId
+      this.$confirm("确认开启选中的项吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.salesAPI
+          .reverseClose({id: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              })
+              this. getList();
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "error"
+              })
+            }
+          })
+      })
+    },
+    // 导出
+    exportExcel() {
+      delete this.search_data.pagesize
+      delete this.search_data.pageno
+      this.$api.salesAPI
+        .exportExcel(this.search_data)
+        .then(res => {
+        })
+    },
+    /**
+     * 反审核
+     */
+    disAudit() {
+      let id = this.salesContractIds[0].salesContractId
+      this.$confirm("确认反审核选中的项吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.salesAPI
+          .reverseAuditContract({id: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              })
+              this. getList();
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "error"
+              })
+            }
+          })
+      })
+
+    },
+
+    /**
+     * 审核
+     */
+    audit() {
+      let id = this.salesContractIds[0].salesContractId
+      this.$confirm("确认审核选中的项吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.salesAPI
+          .auditContract({id: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              })
+              this. getList();
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "error"
+              })
+            }
+          })
+      })
+
+    },
+
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+
+    // 跳转到查看页面
+    gotoDetail(row) {
+      console.log('跳转详情页面')
+      this.$router.push({ path: "/sales/salesContract_add", query: { id: row.salesContractId,t: Date.now() } })
+    },
+
+    // 前往新增页面
+    goAdd() {
+      this.$router.push({ path: "/sales/salesContract_add", query: {t: Date.now() } })
+    },
+    liftForExport(){
+      if(n==0){
+        this.search_data1 = this.search_data
+      }
+      // this.pictLoading = true;
+      this.$api.salesAPI
+        .listForExport(this.search_data)
+        .then(res => {
+          // this.pictLoading = false;
+          if(res.data) {
+            // this.summary = res.total
+            // this.total = res.data.totalRows;
+            this.exportList = res.data.list ? res.data.list : [];
+            this.exportList.forEach(item => {
+              // item.contractDate = item.contractDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.contractDate):""
+              // item.deliveryDate = item.deliveryDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.deliveryDate):""
+              if(item.approveState==0){
+                item.approveStatusName = "暂存"
+              } else if(item.approveState==1){
+                item.approveStatusName = "待审批"
+              }else if(item.approveState==2){
+                item.approveStatusName = "已驳回"
+              }else if(item.approveState==3){
+                item.approveStatusName = "审批通过"
+              }
+            })
+          } else {
+            // this.total = 0;
+            this.exportList = [];
+          }
+        }).catch(r => {
+        console.log(r);
+      });
+    },
+    // 获取销售订单列表
+    getList(n) {
+      // if(val){
+      //   this.search_data.contractCode=val[0]
+      //   this.search_data.clientName=val[1]
+      //   this.search_data.materielName=val[2]
+      // }
+      if(n==0){
+        this.search_data1 = this.search_data
+      }
+      this.pictLoading = true;
+      this.$api.salesAPI
+        .listSalesContract(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if(res.data) {
+            this.summary = res.total
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+            this.tableData.forEach(item => {
+              // item.contractDate = item.contractDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.contractDate):""
+              // item.deliveryDate = item.deliveryDate?/\d{4}-\d{1,2}-\d{1,2}/g.exec(item.deliveryDate):""
+              if(item.approveState==0){
+                item.approveStatusName = "暂存"
+              } else if(item.approveState==1){
+                item.approveStatusName = "待审批"
+              }else if(item.approveState==2){
+                item.approveStatusName = "已驳回"
+              }else if(item.approveState==3){
+                item.approveStatusName = "审批通过"
+              }
+            })
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        }).catch(r => {
+        console.log(r);
+      });
+    },
+
+    //设置显示字段
+    showColumnSetDialog() {
+      this.columnSetDialogVisible = true;
+      this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+      // 行拖拽
+        // this.rowDrop()
+    },
+    //前移
+    toUp(scope) {
+      if (scope.$index == 0) {
+        return false;
+      }
+      let n;
+      for (let i = 0; i < this.showTableColumns.length; i++) {
+        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+          n = i;
+        }
+      }
+      let temp = this.showTableColumns[n];
+      this.showTableColumns[n] = this.showTableColumns[n - 1];
+      this.showTableColumns[n - 1] = temp;
+      this.$forceUpdate();
+    },
+    //后移
+    toDown(scope) {
+      if (scope.$index == this.showTableColumns.length - 1) {
+        return false;
+      }
+      let n;
+      for (let i = 0; i < this.showTableColumns.length; i++) {
+        if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+          n = i;
+        }
+      }
+      let temp = this.showTableColumns[n];
+      this.showTableColumns[n] = this.showTableColumns[n + 1];
+      this.showTableColumns[n + 1] = temp;
+      this.$forceUpdate();
+    },
+    //恢复默认
+    toDefault() {
+      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+      this.$forceUpdate();
+    },
+    //完成列表字段设置
+    saveAndCloseColumnSetDialog() {
+      let tableNo = this.tableId;
+      let tableColumns = JSON.stringify(this.showTableColumns);
+      this.columnSetDialogVisible = false;
+      this.$api.tableColumnAPI
+        .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
+        .then(res => {
+          let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+          this.formTableData = [];
+          for (let i = 0; i < arr.length; i++) {
+            if (arr[i].select) {
+              this.formTableData.push(arr[i]);
+            }
+          }
+          this.getShowColumns();
+        })
+        .catch(r => {
+          console.log(r);
+        });
+    },
+    //关闭字段设置弹出
+    handleClose() {
+      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
+      this.columnSetDialogVisible = false;
+
+    },
+    /**
+     * 获取显示字段
+     */
+    getShowColumns() {
+      let tableNo = this.tableId;
+      this.formTableData = [];
+
+      this.$api.tableColumnAPI
+        .getShowColumns({tableNo:tableNo})
+        .then(res => {
+          if(res.code==0){
+            if(res.results){
+              this.showTableColumns = JSON.parse(res.results);
+              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+              for (let i = 0; i < arr.length; i++) {
+                if (arr[i].select) {
+                  this.formTableData.push(arr[i]);
+                }
+              }
+              this.$forceUpdate();
+            }else{
+              let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+              for (let i = 0; i < arr.length; i++) {
+                if (arr[i].select) {
+                  this.formTableData.push(arr[i]);
+                }
+              }
+              this.$forceUpdate();
+            }
+          }else{
+            this.$message({
+              message: res.msg ? res.msg : "获取列表信息失败",
+              type: "error"
+            });
+          }
+
+        })
+        .catch(r => {
+          this.$message({
+            message: r,
+            type: "error"
+          });
+          console.log(r);
+        });
+    },
+
+    // 查询
+    search() {
+      this.search_data.pageno = 1;
+      this.search_data.pagesize = 10;
+      this.getList();
+    },
+
+    /**
+     * 高级查询
+     */
+    moreSearch() {
+      this.advanceQueryDialogVisible = true;
+      this.dialogTitle = "高级查询";
+    },
+    save() {
+      for (var n in this.formData) {
+        this.search_data[n] = this.formData[n];
+      }
+      this.search_data.inDatas = "";
+      this.time = this.formDataTime;
+      this.search_data.pageno = 1;
+      this.$nextTick(function () {
+        this.advanceQueryDialogVisible = false;
+        this.getList();
+      })
+    },
+    //清空
+    clear() {
+      for (var n in this.formData) {
+        this.formData[n] = '';
+      }
+      this.formDataTime = "";
+      this.salesPersonDept=''
+      // this.createTime = "";
+    },
+    changeFacility() {
+      this.$forceUpdate();
+    },
+
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+// 每页显示多少条
+    handleApproveSizeChange(val) {
+      this.approveListQuery.pagesize = val;
+      this.myApproveList();
+    },
+    // 上下分页
+    handleApproveCurrentChange(val) {
+      this.approveListQuery.pageno = val;
+      this.myApproveList();
+    },
+    /**
+     * 初始化
+     */
+    initData() {
+      // 获取审核状态
+      this.$api.salesAPI
+        .listAauditSign({
+          type: "audit_status",
+        })
+        .then(res => {
+          this.options = res.datas
+        });
+      //  获取合同类型
+      this.$api.salesAPI
+        .listContractType({
+          type: "sales_contract_type",
+        })
+        .then(res => {
+          this.typeList = res.datas
+        });
+      // 获取生产部门
+      Promise.all([this.$api.commonAPI.getDeptsTree(), this.$api.roleAPI.list()])
+        .then(([r1, r2]) => {
+          if (r1.code === 0) {
+            this.depOptions=r1.data.children;
+            // this.setDefaultDept();
+            this.setDeptList(this.depOptions);
+          }
+          if (r2.code === 0) {
+            this.roleList = r2.datas;
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+    getMateriel(val){
+      if (val) {
+        this.$set(this.formData,'materiel',val.id)
+        this.$set(this.formData,'materielName',val.name)
+      }else{
+        this.$set(this.formData,'materiel',"")
+        this.$set(this.formData,'materielName',"")
+      }
+    },
+
+    /**
+     * 获取用户
+     */
+    getUser(data) {
+      if (data) {
+        this.$set(this.formData,'salesPersonName',data.name)
+        this.$set(this.formData,'salesPerson',data.id)
+        //   this.formData.salesPersonName = data.name;
+        //   this.formData.salesPerson = data.id;
+        //   this.getUserList.forEach(item => {
+        //     if (data.id === item.id) {
+        //       self.formData.salesPersonDept = item.deptId;
+        //         self.formData.deptId= item.deptId;
+        //       return;
+        //     }
+        //   });
+        // if (self.formData.deptId == 0) {
+        //   self.formData.salesPersonDept = "";
+        // }
+        this.setDefaultDept()
+      }
+    },
+    /**
+     * 获取制单人
+     */
+    getUser1(data) {
+      console.log(data)
+      var self = this;
+      if (data) {
+        this.formData.createByName = data.name;
+        this.formData.createBy = data.id;
+      }
+    },
+    //根据当前id,获取一条树枝上的所有id数据
+    treeFindPath (tree, func, path = []) {
+      if (!tree) return []
+      for (const data of tree) {
+        path.push(data.id)
+        if (func(data)) return path
+        if (data.children) {
+          const findChildren = this.treeFindPath(data.children, func, path)
+          if (findChildren.length) return findChildren
+        }
+        path.pop()
+      }
+      return []
+    },
+    //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
+    setDeptList(tree){
+      for (const data of tree) {
+        if(!data.hasChildren){
+          data.children=undefined;
+        }else{
+          this.setDeptList(data.children)
+        }
+      }
+    },
+    //显示默认部门
+    // setDefaultDept(){
+    //     if(this.depOptions.length>0&&this.formData.deptId){
+    //       let id=JSON.stringify( this.formData.deptId)
+    //       let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
+    //       this.salesPersonDept=JSON.parse(JSON.stringify(select_id))
+    //     }
+    //   },
+    // 选择部门
+    handleChange:function(value){
+      this.formData.salesPersonDept=value.length>=1?value[value.length-1]:'';
+      this.salesPersonDept=value;
+    },
+
+
+    /**
+     * 处理选中
+     */
+    handleSelectionChange(val) {
+      this.salesContractIds= val;
+      this.setBtn(val);
+    },
+
+    /**
+     * 删除
+     */
+    remove() {
+      let ids = [];
+      this.salesContractIds.forEach(item => {
+        ids.push(item.salesContractId)
+        console.log(ids)
+      })
+      this.$confirm("确认删除选中的项吗?", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$api.salesAPI
+          .removeContract({salesContractIds: ids})
+          .then(res => {
+            if (res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              this.search();
+            } else {
+              this.$message({
+                message: res.msg ? res.msg : "删除失败，请重试",
+                type: "error"
+              });
+            }
+          })
+          .catch(error => {
+            this.$message({
+              message: "删除失败，请重试",
+              type: "error"
+            });
+          });
+      });
+    },
+    /**
+     * 控件操作按钮状态
+     */
+    setBtn(val) {
+      let isFlag = true;
+      let isDelFlag = true;
+      if (val.length > 0) {
+        isDelFlag = false;
+        if (val.length == 1) {
+          isFlag = false;
+        }
+      } else {
+        isFlag = true;
+        isDelFlag = true;
+      }
+      this.btnDelDisabled = isDelFlag;
+      this.btnOtherDisabled = isFlag;
+    },
+    // 合计
+    getSummaries(param){
+      const { columns, data } = param;
+      console.log("zhuyemian汇总")
+      console.log(param)
+      let sums=[];
+      columns.forEach((column, index) => { //计算不含税金额总计
+
+        if (index === 0) {
+          sums[index] = '合计';
+          return;
+        }
+        if (column.property!=='count'&&column.property!=='taxAmount'&&column.property!=='saleCount') {
+          sums[index] = '';
+          return;
+        }
+
+        const values = data.map(item => Number(item[column.property]));
+        if (!values.every(value => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+        } else {
+          sums[index] = '';
+        }
+        if (column.property==='count') {
+          if(sums[index]) {
+            sums[index] = this.summary.totalCount;
+          }
+          return;
+        }
+        if (column.property==='saleCount') {
+          if(sums[index]) {
+            sums[index] = this.summary.totalSaleCount;
+          }
+          return;
+        }
+        if (column.property==='taxAmount') {
+          if(sums[index]) {
+            sums[index] = this.summary.totalTaxAmount;
+          }
+          return;
+        }
+      });
+      console.log("--------------")
+      console.log(this.summary)
+      return sums;
+    },
+    //行拖拽
+    rowDrop() {
+      const _this=this
+      this.$nextTick(()=>{
+       const tbody = document.querySelector('.move-table .el-table__body-wrapper tbody')
+         Sortable.create(tbody, {
+        onEnd({ newIndex, oldIndex }) {
+          const currRow = _this.showTableColumns.splice(oldIndex, 1)[0]
+          _this.showTableColumns.splice(newIndex, 0, currRow)
+          console.log(_this.showTableColumns)
+        }
+      })
+      })
+    },
+
+  }
+}
+</script>
+<style scoped>
+.approve-box .sys-tabs .el-tabs__nav-wrap {
+  padding: 5px 20px 0px;
+}
+.approve-box .sys-tabs .el-tabs__item {
+  padding-top: 10px;
+  height: 50px;
+}
+.approve-box .el-timeline-item__content {
+  line-height: 1.5;
+}
+.approve-box .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+<style>
+.approve-box .sys-tabs .el-tabs__nav-wrap {
+  padding: 5px 20px 0px;
+}
+.approve-box .sys-tabs .el-tabs__item {
+  padding-top: 10px;
+  height: 50px;
+}
+.approve-box .el-timeline-item__content {
+  line-height: 1.5;
+}
+.approve-box .el-dialog__body {
+  padding-top: 0px;
+}
+.approve-form .el-form-item {
+  margin-bottom: 0px;
+}
+.approve-timeline .el-timeline-item__wrapper {
+  padding-top: 10px;
+  padding-left: 80px;
+}
+.approve-timeline .el-timeline-item__tail {
+  left: 30px;
+  border-left-width: 4px;
+}
+</style>
+
+
+
+
+
diff --git a/src/pages/scm/sales/sales_contract/index_1.vue b/src/pages/scm/sales/sales_contract/index_1.vue
index 6649d45..42965dd 100644
--- a/src/pages/scm/sales/sales_contract/index_1.vue
+++ b/src/pages/scm/sales/sales_contract/index_1.vue
@@ -1,1023 +1,1023 @@
-<template>
-  <div class="sys-box knowledge-box">
-    <div class="sys-operate">
-      <el-button type="primary" @click="goAdd()" v-has="'sales:salesContract:add'">新增</el-button>
-      <el-button type="primary" @click="remove()" :disabled="btnOtherDisabled" v-has="'sales:salesContract:remove'">删除</el-button>
-      <el-button type="primary" @click="exportExcel()"  v-has="'sales:salesContract:exportExcel'">导出</el-button>
-      <el-button type="primary" @click="audit" :disabled="btnDelDisabled" v-has="'sales:salesContract:audit'">审核</el-button>
-      <el-button type="primary" @click="disAudit" :disabled="btnDelDisabled" v-has="'sales:salesContract:disAudit'">反审核</el-button>
-      <el-button type="primary" @click="close" :disabled="btnDelDisabled" v-has="'sales:salesContract:close'">{{config.closeContractText}}</el-button>
-      <el-button type="primary" @click="reverseClose" :disabled="btnDelDisabled" v-has="'sales:salesContract:reverseClose'">{{config.openContractText}}</el-button>
-      <el-button type="primary" @click="change" :disabled="btnDelDisabled" v-has="'sales:salesContract:change'">变更</el-button>
-      <el-button type="primary" @click="gotoAlterationList" :disabled="btnDelDisabled" v-has="'sales:salesContract:gotoAlterationList'">变更记录</el-button>
-      <el-button type="primary" @click="showColumnSetDialog">{{config.configureBtnName}}</el-button>
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class='form_item_input_out'>
-          <el-form-item label="合同编号"  style='width:22%' class="form_item-inline">
-            <el-input v-model="search_data.contractCode" placeholder="请输入合同编号" clearable ></el-input>
-          </el-form-item>
-          <el-form-item label="客户"  style='width:22%' class="form_item-inline">
-            <el-input v-model="search_data.clientName" placeholder="请输入客户" clearable ></el-input>
-          </el-form-item>
-          <el-form-item label="物料名称"  style='width:22%' class="form_item-inline">
-            <el-input v-model="search_data.materielName" placeholder="物料" clearable ></el-input>
-          </el-form-item>
-          <el-form-item label="合同日期"  style='width:34%' class="form_item-inline">
-            <el-date-picker
-              v-model="time"
-              type="daterange"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              range-separator="—"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-            ></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class='form_item_btn_out'>
-        <el-form-item>
-          <el-button type="primary" @click="search()">查询</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="moreSearch()">高级查询</el-button>
-        </el-form-item>
-      </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table border
-      v-if="formTableData.length>0"
-      id="out-table"
-      @row-click="gotoDetail"
-        ref="tb"
-        v-loading="pictLoading"
-        show-summary
-        :summary-method="getSummaries"
-        :data="tableData"
-        @selection-change="handleSelectionChange"
-        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
-      >
-      <el-table-column type="selection" width="55" align="center"></el-table-column>
-      <el-table-column v-for="(items,index) in formTableData" :key="index" :prop="items.prop_" :label="items.title" :sortable="items.sortAble"
-                         align="center" show-overflow-tooltip>
-
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="search_data.pageno"
-        :page-sizes="pageSizes"
-        :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
-    </div>
-
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px" :before-close="handleClose">
-      <el-table border
-                :data="showTableColumns"
-                :key="Math.random()"
-                max-height="350"
-                style="width: 100%">
-        <el-table-column
-          prop="title"
-          label="列表名称"
-          width="180" fixed>
-        </el-table-column>
-        <el-table-column
-          prop="select"
-          label="是否显示"
-          width="180">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作"
-        >
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-
-    <!-- 高级查询对话框 -->
-    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
-      <el-form :inline="true"
-               v-loading="dialogLoading"
-               label-width="80px"
-               class="dialog-form"
-               ref="form" style="width: 620px"
-      >
-        <div class="dialog-line">
-          <el-form-item label="合同时间"  class="dialog-form-inline-single">
-            <el-date-picker
-              v-model="formDataTime"
-              type="daterange"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              range-separator="—"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-            ></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="合同类型" class="dialog-form-inline">
-            <el-select v-model="formData.contractType" style="width:100%" clearable placeholder="请选择" @change="changeFacility">
-              <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-        <el-form-item label="客户" class="dialog-form-inline">
-          <el-input placeholder="请输入客户名" v-model="formData.clientName" clearable></el-input>
-        </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="物料" class="dialog-form-inline">
-            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel' :chooseVisible.sync='chooseMaterielVisible'></btn-input>
-          </el-form-item>
-        <el-form-item label="规格型号" class="dialog-form-inline">
-          <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
-        </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="销售部门" class="dialog-form-inline">
-            <el-cascader
-              v-model="salesPersonDept"
-              clearable
-              :options="depOptions"
-              :props="{ expandTrigger: 'hover',label:'text',value:'id', checkStrictly: true}"
-              @change="handleChange"></el-cascader>
-          </el-form-item>
-          <el-form-item label="审核状态" class="dialog-form-inline">
-            <el-select v-model="formData.auditSign" style="width:100%" clearable placeholder="请选择" @change="changeFacility">
-              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="销售员" prop="salesPersonName" class="dialog-form-inline">
-     >
-            <btn-input :valueText.sync='formData.salesPersonName' :valueId.sync='formData.salesPerson' :chooseVisible.sync='chooseUserVisible'></btn-input>
-          </el-form-item>
-          <el-form-item label="制单人" prop="createByName" class="dialog-form-inline">
-
-            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy' :chooseVisible.sync='chooseUserVisible1'></btn-input>
-          </el-form-item>
-        </div>
-
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">确定</el-button>
-        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
-        <el-button type="primary" @click="clear">清空</el-button>
-      </span>
-    </el-dialog>
-
-    <!--选择用户-->
-  <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
-   <!--选择制单人-->
-   <DialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></DialogChooseSingleUser1>
-   <!--选择物料-->
-   <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel" ></dialogChooseSingleParts>
-  </div>
-</template>
-
-<script>
-import {mapState, mapActions, mapGetters} from "vuex";
-import btnInput from "@/components/btnInput.vue";
-import FileSaver from 'file-saver'
-import config from "@/utils/config.js";
-import Cookies from "js-cookie";
-import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
-import DialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
-import { formatDateTime, getCurrentDate } from "@/utils/tools.js";
-export default {
-  components: {
-    btnInput,DialogChooseSingleUser,DialogChooseSingleUser1,dialogChooseSingleParts
-  },
-  data() {
-    return {
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10,
-      },
-      search_data1: {
-        pageno: 1,
-        pagesize: 10,
-        startTime: "",
-        endTime: "",
-        contractCode: '',
-        createByName: '',
-      },
-      formData: {
-        startTime: "",
-        endTime: "",
-        contractType: '',
-        contractTypeName: '',
-        unitUomName: '',
-        clientName: '',
-        materielName: '',
-        specification: '',
-        auditSign: '',
-        salesPersonName: '',
-        salesPerson: '',
-        // createTime: '',
-        deptId: '',
-        salesPersonDept: '',
-        createBy: "",//制单人id
-        createByName:"",
-      },
-      //默认列表数据
-      showTableColumnsDefault: [
-          {title: "合同日期", prop_: "contractDate", select: true},
-          {title: "合同编号", prop_: "contractCode", select: true},
-          {title: "合同类型", prop_: "contractTypeName", select: true},
-          {title: "关闭标志", prop_: "closeStatusName", select: true},
-          {title: "客户名称", prop_: "clientName", select: true},
-          {title: "销售员", prop_: "salesPersonName", select: true},
-          {title: "销售部门", prop_: "salesPersonDeptName", select: true},
-          {title: "发货是否检验", prop_: "isCheck", select: true},
-          {title: "物料代码", prop_: "materielSerialNo", select: true},
-          {title: "物料名称", prop_: "materielName", select: true},
-          {title: "规格型号", prop_: "specification", select: true},
-          {title: "主计量单位", prop_: "unitUomName", select: true},
-          {title: "主单位数量", prop_: "count", select: true},
-          {title: "辅助单位", prop_: "supportUomName", select: true},
-          {title: "销售数量", prop_: "saleCount", select: true},
-          {title: "含税单价（元）", prop_: "taxUnitPrice", select: true},
-          {title: "销售金额（元）", prop_: "taxAmount", select: true},
-          {title: "交货日期", prop_: "deliveryDate", select: true,sortAble:true},
-          {title: "审核状态", prop_: "auditSignName", select: true},
-          {title: "行关闭状态", prop_: "itemCloseStatusName", select: true},
-          {title: "行关闭时间", prop_: "itemCloseTime", select: true},
-          {title: "行关闭原因", prop_: "itemCloseReason", select: true}
-        ],
-        ///弹出页面列表数据
-        showTableColumns: [
-          {title: "合同日期", prop_: "contractDate", select: true},
-          {title: "合同编号", prop_: "contractCode", select: true},
-          {title: "合同类型", prop_: "contractTypeName", select: true},
-          {title: "关闭标志", prop_: "closeStatusName", select: true},
-          {title: "客户名称", prop_: "clientName", select: true},
-          {title: "销售员", prop_: "salesPersonName", select: true},
-          {title: "销售部门", prop_: "salesPersonDeptName", select: true},
-          {title: "发货是否检验", prop_: "isCheck", select: true},
-          {title: "物料代码", prop_: "materielSerialNo", select: true},
-          {title: "物料名称", prop_: "materielName", select: true},
-          {title: "规格型号", prop_: "specification", select: true},
-          {title: "主计量单位", prop_: "unitUomName", select: true},
-          {title: "主单位数量", prop_: "count", select: true},
-          {title: "辅助单位", prop_: "supportUomName", select: true},
-          {title: "销售数量", prop_: "saleCount", select: true},
-          {title: "含税单价（元）", prop_: "taxUnitPrice", select: true},
-          {title: "销售金额（元）", prop_: "taxAmount", select: true},
-          {title: "交货日期", prop_: "deliveryDate", select: true},
-          {title: "审核状态", prop_: "auditSignName", select: true},
-          {title: "行关闭状态", prop_: "itemCloseStatusName", select: true},
-          {title: "行关闭时间", prop_: "itemCloseTime", select: true},
-          {title: "行关闭原因", prop_: "itemCloseReason", select: true}
-        ],
-        showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
-        //显示的列表字段
-        alterationDetailId: '',
-      formTableData: [],
-          contractList: [],
-          contractData: [],
-          tableData1: [],
-          summary: {},
-      formDataTime: "",
-      time: '',
-      salesTime: '',
-      tableData: [],
-      depOptions: [],
-      salesPersonDept: '',
-      options: [],
-      typeList: [],
-      config: config,
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      advanceQueryDialogVisible: false,
-      chooseUserVisible: false,
-      chooseUserVisible1: false,
-      chooseMaterielVisible:false,//物料
-      dialogLoading: false,
-      dialogTitle: "",
-      pictLoading: false,
-      columnSetDialogTitle: "设置显示字段列表",
-      columnSetDialogVisible: false,
-      salesContractIds: [],
-      tableId: 'sales_contract_table'
-    }
-  },
-  watch: {
-      time(val) {
-        if (val) {
-          this.search_data.startTime = val[0];
-          this.search_data.endTime = val[1];
-        } else {
-          this.search_data.startTime = "";
-          this.search_data.endTime = "";
-        }
-
-      },
-      formDataTime(val) {
-        if (val) {
-          this.formData.startTime = val[0];
-          this.formData.endTime = val[1];
-        } else {
-          this.formData.startTime = "";
-          this.formData.endTime = "";
-        }
-
-      },
-    },
-  created() {
-    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.getList()
-    this.getShowColumns();
-    this.initData()
-  },
-  methods: {
-
-    // 变更合同列表页
-    gotoAlterationList() {
-      let id = this.salesContractIds[0].salesContractId
-      this.$router.push({ path: "/sales/salesContract_alterationList", query: { id: id, t: Date.now()} })
-    },
-
-    // 返回首页
-    gotoIndex() {
-      this.chooseProVisible = false
-    },
-    // 变更
-    change() {
-      let id = this.salesContractIds[0].salesContractId
-      this.$router.push({ path: "/sales/salesContract_edit", query: { id: id, t: Date.now()} })
-    },
-
-    /**
-   * 关闭
-   */
-   close() {
-    let id = this.salesContractIds[0].salesContractId
-    this.$confirm("确认终止选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.salesAPI
-          .closeContract({id: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                  message: res.msg,
-                  type: "success"
-                })
-                this. getList();
-            } else {
-              this.$message({
-                  message: res.msg,
-                  type: "error"
-                })
-            }
-          })
-        })
-
-   },
-   // 反关闭
-  reverseClose () {
-    let id = this.salesContractIds[0].salesContractId
-    this.$confirm("确认开启选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.salesAPI
-          .reverseClose({id: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                  message: res.msg,
-                  type: "success"
-                })
-                this. getList();
-            } else {
-              this.$message({
-                  message: res.msg,
-                  type: "error"
-                })
-            }
-          })
-        })
-  },
-   // 导出
-   exportExcel() {
-       delete this.search_data.pagesize
-       delete this.search_data.pageno
-        this.$api.salesAPI
-        .exportExcel(this.search_data)
-        .then(res => {
-        })
-      },
-   /**
-   * 反审核
-   */
-   disAudit() {
-      let id = this.salesContractIds[0].salesContractId
-      this.$confirm("确认反审核选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.salesAPI
-          .reverseAuditContract({id: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                message: res.msg,
-                type: "success"
-              })
-              this. getList();
-            } else {
-              this.$message({
-                message: res.msg,
-                type: "error"
-              })
-            }
-          })
-        })
-
-    },
-
-   /**
-   * 审核
-   */
-   audit() {
-    let id = this.salesContractIds[0].salesContractId
-    this.$confirm("确认审核选中的项吗?", "提示", {
-      type: "warning"
-    }).then(() => {
-      this.$api.salesAPI
-    .auditContract({id: id})
-    .then(res => {
-      if(res.code === 0) {
-        this.$message({
-            message: res.msg,
-            type: "success"
-          })
-          this. getList();
-      } else {
-        this.$message({
-            message: res.msg,
-            type: "error"
-          })
-      }
-    })
-    })
-
-   },
-
-    clickRow(row) {
-      this.$refs.tb.toggleRowSelection(row);
-    },
-
-    // 跳转到查看页面
-    gotoDetail(row) {
-        this.$router.push({ path: "/sales/salesContract_add", query: { id: row.salesContractId,t: Date.now() } })
-    },
-
-    // 前往新增页面
-    goAdd() {
-      this.$router.push({ path: "/sales/salesContract_add", query: {t: Date.now() } })
-    },
-
-    // 获取销售订单列表
-    getList() {
-      this.pictLoading = true;
-      this.$api.salesAPI
-      .listSalesContract(this.search_data)
-      .then(res => {
-        this.pictLoading = false;
-        if(res.data) {
-          this.summary = res.total
-          this.total = res.data.totalRows;
-          this.tableData = res.data.datas ? res.data.datas : [];
-          this.tableData.forEach(item => {
-            item.contractDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.contractDate)
-            item.deliveryDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.deliveryDate)
-          })
-        } else {
-          this.total = 0;
-          this.tableData = [];
-        }
-      }).catch(r => {
-            console.log(r);
-          });
-    },
-
-      //设置显示字段
-      showColumnSetDialog() {
-        this.columnSetDialogVisible = true;
-        this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-      },
-      //前移
-      toUp(scope) {
-        if (scope.$index == 0) {
-          return false;
-        }
-        let n;
-        for (let i = 0; i < this.showTableColumns.length; i++) {
-          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-            n = i;
-          }
-        }
-        let temp = this.showTableColumns[n];
-        this.showTableColumns[n] = this.showTableColumns[n - 1];
-        this.showTableColumns[n - 1] = temp;
-        this.$forceUpdate();
-      },
-      //后移
-      toDown(scope) {
-        if (scope.$index == this.showTableColumns.length - 1) {
-          return false;
-        }
-        let n;
-        for (let i = 0; i < this.showTableColumns.length; i++) {
-          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-            n = i;
-          }
-        }
-        let temp = this.showTableColumns[n];
-        this.showTableColumns[n] = this.showTableColumns[n + 1];
-        this.showTableColumns[n + 1] = temp;
-        this.$forceUpdate();
-      },
-      //恢复默认
-      toDefault() {
-        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-        this.$forceUpdate();
-      },
-      //完成列表字段设置
-      saveAndCloseColumnSetDialog() {
-        let tableNo = this.tableId;
-        let tableColumns = JSON.stringify(this.showTableColumns);
-        this.columnSetDialogVisible = false;
-        this.$api.tableColumnAPI
-          .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
-          .then(res => {
-              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-              this.formTableData = [];
-              for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                      this.formTableData.push(arr[i]);
-                  }
-              }
-          })
-          .catch(r => {
-            console.log(r);
-          });
-      },
-      //关闭字段设置弹出
-      handleClose() {
-        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
-        this.columnSetDialogVisible = false;
-
-      },
-      /**
-       * 获取显示字段
-       */
-       getShowColumns() {
-        let tableNo = this.tableId;
-        this.formTableData = [];
-
-        this.$api.tableColumnAPI
-          .getShowColumns({tableNo:tableNo})
-          .then(res => {
-            if(res.code==0){
-              if(res.results){
-                this.showTableColumns = JSON.parse(res.results);
-                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-                for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                    this.formTableData.push(arr[i]);
-                  }
-                }
-                this.$forceUpdate();
-              }else{
-                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-                for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                    this.formTableData.push(arr[i]);
-                  }
-                }
-                this.$forceUpdate();
-              }
-            }else{
-              this.$message({
-                message: res.msg ? res.msg : "获取列表信息失败",
-                type: "error"
-              });
-            }
-
-          })
-          .catch(r => {
-            this.$message({
-              message: r,
-              type: "error"
-            });
-            console.log(r);
-          });
-      },
-
-    // 查询
-    search() {
-      this.search_data.pageno = 1;
-      this.search_data.pagesize = 10;
-      this.getList();
-    },
-
-    /**
-     * 高级查询
-     */
-      moreSearch() {
-      this.advanceQueryDialogVisible = true;
-      this.dialogTitle = "高级查询";
-    },
-    save() {
-        for (var n in this.formData) {
-          this.search_data[n] = this.formData[n];
-        }
-        this.search_data.inDatas = "";
-        this.time = this.formDataTime;
-        this.search_data.pageno = 1;
-        this.$nextTick(function () {
-          this.advanceQueryDialogVisible = false;
-          this.getList();
-        })
-      },
-      //清空
-      clear() {
-        for (var n in this.formData) {
-          this.formData[n] = '';
-        }
-        this.formDataTime = "";
-        this.salesPersonDept=''
-        // this.createTime = "";
-      },
-      changeFacility() {
-        this.$forceUpdate();
-      },
-
-    //设置显示字段
-    showColumnSetDialog() {
-      this.columnSetDialogVisible = true;
-      this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    },
-    // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-
-    /**
-     * 初始化
-     */
-     initData() {
-      // 获取审核状态
-      this.$api.salesAPI
-      .listAauditSign({
-        type: "audit_status",
-      })
-      .then(res => {
-        this.options = res.datas
-      });
-      //  获取合同类型
-      this.$api.salesAPI
-      .listContractType({
-        type: "sales_contract_type",
-      })
-      .then(res => {
-        this.typeList = res.datas
-      });
-      // 获取生产部门
-      Promise.all([this.$api.commonAPI.getDeptsTree(), this.$api.roleAPI.list()])
-            .then(([r1, r2]) => {
-                if (r1.code === 0) {
-                    this.depOptions=r1.data.children;
-                    // this.setDefaultDept();
-                    this.setDeptList(this.depOptions);
-                }
-                if (r2.code === 0) {
-                    this.roleList = r2.datas;
-                }
-            })
-            .catch(error => {
-                console.log(error);
-            });
-     },
-     getMateriel(val){
-        if (val) {
-          this.$set(this.formData,'materiel',val.id)
-          this.$set(this.formData,'materielName',val.name)
-        }else{
-          this.$set(this.formData,'materiel',"")
-          this.$set(this.formData,'materielName',"")
-        }
-      },
-
-     /**
-     * 获取用户
-     */
-     getUser(data) {
-        if (data) {
-          this.$set(this.formData,'salesPersonName',data.name)
-          this.$set(this.formData,'salesPerson',data.id)
-        //   this.formData.salesPersonName = data.name;
-        //   this.formData.salesPerson = data.id;
-        //   this.getUserList.forEach(item => {
-        //     if (data.id === item.id) {
-        //       self.formData.salesPersonDept = item.deptId;
-        //         self.formData.deptId= item.deptId;
-        //       return;
-        //     }
-        //   });
-          // if (self.formData.deptId == 0) {
-          //   self.formData.salesPersonDept = "";
-          // }
-          this.setDefaultDept()
-        }
-      },
-      /**
-     * 获取制单人
-     */
-     getUser1(data) {
-        console.log(data)
-        var self = this;
-        if (data) {
-          this.formData.createByName = data.name;
-          this.formData.createBy = data.id;
-        }
-      },
-       //根据当前id,获取一条树枝上的所有id数据
-       treeFindPath (tree, func, path = []) {
-                if (!tree) return []
-                for (const data of tree) {
-                    path.push(data.id)
-                    if (func(data)) return path
-                    if (data.children) {
-                        const findChildren = this.treeFindPath(data.children, func, path)
-                        if (findChildren.length) return findChildren
-                    }
-                    path.pop()
-                }
-                return []
-            },
-      //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
-      setDeptList(tree){
-          for (const data of tree) {
-              if(!data.hasChildren){
-                  data.children=undefined;
-              }else{
-                  this.setDeptList(data.children)
-              }
-          }
-      },
-    //显示默认部门
-    // setDefaultDept(){
-    //     if(this.depOptions.length>0&&this.formData.deptId){
-    //       let id=JSON.stringify( this.formData.deptId)
-    //       let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
-    //       this.salesPersonDept=JSON.parse(JSON.stringify(select_id))
-    //     }
-    //   },
-      // 选择部门
-      handleChange:function(value){
-        this.formData.salesPersonDept=value.length>=1?value[value.length-1]:'';
-        this.salesPersonDept=value;
-      },
-
-
-        /**
-       * 处理选中
-       */
-       handleSelectionChange(val) {
-        this.salesContractIds= val;
-        this.setBtn(val);
-      },
-
-      /**
-       * 删除
-       */
-       remove() {
-        let ids = [];
-          this.salesContractIds.forEach(item => {
-            ids.push(item.salesContractId)
-            console.log(ids)
-          })
-        this.$confirm("确认删除选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.salesAPI
-            .removeContract({salesContractIds: ids})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.search();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "删除失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "删除失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      },
-      /**
-     * 控件操作按钮状态
-     */
-        setBtn(val) {
-        let isFlag = true;
-        let isDelFlag = true;
-        if (val.length > 0) {
-          isDelFlag = false;
-          if (val.length == 1) {
-            isFlag = false;
-          }
-        } else {
-          isFlag = true;
-          isDelFlag = true;
-        }
-        this.btnOtherDisabled = isDelFlag;
-        this.btnDelDisabled = isFlag;
-      },
-      // 合计
-      getSummaries(param){
-        const { columns, data } = param;
-        let sums=[];
-        columns.forEach((column, index) => { //计算不含税金额总计
-
-          if (index === 0) {
-            sums[index] = '合计';
-            return;
-          }
-          if (column.property!=='count'&&column.property!=='taxAmount'&&column.property!=='saleCount') {
-            sums[index] = '';
-            return;
-          }
-
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-          } else {
-            sums[index] = '';
-          }
-          if (column.property==='count') {
-            if(sums[index]) {
-              sums[index] = this.summary.totalCount;
-            }
-            return;
-          }
-          if (column.property==='saleCount') {
-            if(sums[index]) {
-              sums[index] = this.summary.totalSaleCount;
-            }
-            return;
-          }
-          if (column.property==='taxAmount') {
-            if(sums[index]) {
-              sums[index] = this.summary.totalTaxAmount;
-            }
-            return;
-          }
-        });
-
-        return sums;
-      },
-
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
-
-<style>
-  /*.el-cascader .el-input {*/
-  /*  width: 100% !important;*/
-  /*}*/
-
-  .process-box  .el-select,
-  .process-box .el-input {
-    width: 100%;
-  }
-
-  .process-box .el-table thead {
-    line-height: 1;
-  }
-
- .process-box .el-input-number .el-input {
-    width: 100% !important;
-  }
-  .process-box .el-input-number--small{
-    width: 70% !important;
-  }
-  .process-box .form-inline {
-    width: 33.3% !important;
-  }
-  .process-box .el-input-number el-input-number--small{
-    white-space: nowrap;
-
-  }
-  .process-box .el-form-item__content{
-    margin-left: 100px !important;
-  }
- .process-box .el-form-item__label{
-   width: 100px !important;
- }
-  .process-box  .el-input,.process-box  .el-form--inline .el-input,.process-box .el-cascader--small{
-    width: 100% !important;
-  }
-  .childlist .el-form-item__content{
-    margin-left: 0 !important;
-  }
-
-  .process-box .el-input--small{
-    width: 70% !important;
-  }
-</style>
-
-<style scoped>
-  >>>.sys-search .el-input__inner{
-    width: 100%;
-  }
-  .dialog-form{
-    position: relative;
-  }
-  .dialog-line{
-    position: relative;
-    display: flex;
-    justify-content: center;
-    width: 100%;
-  }
-  .dialog-line .dialog-form-inline{
-    position: relative;
-    width: 50%;
-    margin-right: 0;
-  }
-  .dialog-line  .dialog-form-inline-single{
-    position: relative;
-    width: 100%;
-    margin-right: 0;
-  }
-  >>>.dialog-line .el-input__inner{
-    width: 100% !important;;
-  }
-  >>>.dialog-line .el-form-item__content{
-    width: calc(100% - 80px) !important;;
-  }
-  >>>.dialog-line .el-input,>>>.dialog-line .el-cascader{
-    width: 100% !important;
-  }
-</style>
-
-
-
-
+<template>
+  <div class="sys-box knowledge-box">
+    <div class="sys-operate">
+      <el-button type="primary" @click="goAdd()" v-has="'sales:salesContract:add'">新增</el-button>
+      <el-button type="primary" @click="remove()" :disabled="btnOtherDisabled" v-has="'sales:salesContract:remove'">删除</el-button>
+      <el-button type="primary" @click="exportExcel()"  v-has="'sales:salesContract:exportExcel'">导出</el-button>
+      <el-button type="primary" @click="audit" :disabled="btnDelDisabled" v-has="'sales:salesContract:audit'">审核</el-button>
+      <el-button type="primary" @click="disAudit" :disabled="btnDelDisabled" v-has="'sales:salesContract:disAudit'">反审核</el-button>
+      <el-button type="primary" @click="close" :disabled="btnDelDisabled" v-has="'sales:salesContract:close'">{{config.closeContractText}}</el-button>
+      <el-button type="primary" @click="reverseClose" :disabled="btnDelDisabled" v-has="'sales:salesContract:reverseClose'">{{config.openContractText}}</el-button>
+      <el-button type="primary" @click="change" :disabled="btnDelDisabled" v-has="'sales:salesContract:change'">变更</el-button>
+      <el-button type="primary" @click="gotoAlterationList" :disabled="btnDelDisabled" v-has="'sales:salesContract:gotoAlterationList'">变更记录</el-button>
+      <el-button type="primary" @click="showColumnSetDialog">{{config.configureBtnName}}</el-button>
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class='form_item_input_out'>
+          <el-form-item label="合同编号"  style='width:22%' class="form_item-inline">
+            <el-input v-model="search_data.contractCode" placeholder="请输入合同编号" clearable ></el-input>
+          </el-form-item>
+          <el-form-item label="客户"  style='width:22%' class="form_item-inline">
+            <el-input v-model="search_data.clientName" placeholder="请输入客户" clearable ></el-input>
+          </el-form-item>
+          <el-form-item label="物料名称"  style='width:22%' class="form_item-inline">
+            <el-input v-model="search_data.materielName" placeholder="物料" clearable ></el-input>
+          </el-form-item>
+          <el-form-item label="合同日期"  style='width:34%' class="form_item-inline">
+            <el-date-picker
+              v-model="time"
+              type="daterange"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              range-separator="—"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class='form_item_btn_out'>
+        <el-form-item>
+          <el-button type="primary" @click="search()">查询</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="moreSearch()">高级查询</el-button>
+        </el-form-item>
+      </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table border
+      v-if="formTableData.length>0"
+      id="out-table"
+      @row-click="gotoDetail"
+        ref="tb"
+        v-loading="pictLoading"
+        show-summary
+        :summary-method="getSummaries"
+        :data="tableData"
+        @selection-change="handleSelectionChange"
+        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
+      >
+      <el-table-column type="selection" width="55" align="center"></el-table-column>
+      <el-table-column v-for="(items,index) in formTableData" :key="index" :prop="items.prop_" :label="items.title" :sortable="items.sortAble"
+                         align="center" show-overflow-tooltip>
+
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="search_data.pageno"
+        :page-sizes="pageSizes"
+        :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px" :before-close="handleClose">
+      <el-table border
+                :data="showTableColumns"
+                :key="Math.random()"
+                max-height="350"
+                style="width: 100%">
+        <el-table-column
+          prop="title"
+          label="列表名称"
+          width="180" fixed>
+        </el-table-column>
+        <el-table-column
+          prop="select"
+          label="是否显示"
+          width="180">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+
+    <!-- 高级查询对话框 -->
+    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
+      <el-form :inline="true"
+               v-loading="dialogLoading"
+               label-width="80px"
+               class="dialog-form"
+               ref="form" style="width: 620px"
+      >
+        <div class="dialog-line">
+          <el-form-item label="合同时间"  class="dialog-form-inline-single">
+            <el-date-picker
+              v-model="formDataTime"
+              type="daterange"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              range-separator="—"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="合同类型" class="dialog-form-inline">
+            <el-select v-model="formData.contractType" style="width:100%" clearable placeholder="请选择" @change="changeFacility">
+              <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+        <el-form-item label="客户" class="dialog-form-inline">
+          <el-input placeholder="请输入客户名" v-model="formData.clientName" clearable></el-input>
+        </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="物料" class="dialog-form-inline">
+            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel' :chooseVisible.sync='chooseMaterielVisible'></btn-input>
+          </el-form-item>
+        <el-form-item label="规格型号" class="dialog-form-inline">
+          <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
+        </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="销售部门" class="dialog-form-inline">
+            <el-cascader
+              v-model="salesPersonDept"
+              clearable
+              :options="depOptions"
+              :props="{ expandTrigger: 'hover',label:'text',value:'id', checkStrictly: true}"
+              @change="handleChange"></el-cascader>
+          </el-form-item>
+          <el-form-item label="审核状态" class="dialog-form-inline">
+            <el-select v-model="formData.auditSign" style="width:100%" clearable placeholder="请选择" @change="changeFacility">
+              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="销售员" prop="salesPersonName" class="dialog-form-inline">
+     >
+            <btn-input :valueText.sync='formData.salesPersonName' :valueId.sync='formData.salesPerson' :chooseVisible.sync='chooseUserVisible'></btn-input>
+          </el-form-item>
+          <el-form-item label="制单人" prop="createByName" class="dialog-form-inline">
+
+            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy' :chooseVisible.sync='chooseUserVisible1'></btn-input>
+          </el-form-item>
+        </div>
+
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">确定</el-button>
+        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="clear">清空</el-button>
+      </span>
+    </el-dialog>
+
+    <!--选择用户-->
+  <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
+   <!--选择制单人-->
+   <DialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></DialogChooseSingleUser1>
+   <!--选择物料-->
+   <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel" ></dialogChooseSingleParts>
+  </div>
+</template>
+
+<script>
+import {mapState, mapActions, mapGetters} from "vuex";
+import btnInput from "@/components/btnInput.vue";
+import FileSaver from 'file-saver'
+import config from "@/utils/config.js";
+import Cookies from "js-cookie";
+import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
+import DialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
+import { formatDateTime, getCurrentDate } from "@/utils/tools.js";
+export default {
+  components: {
+    btnInput,DialogChooseSingleUser,DialogChooseSingleUser1,dialogChooseSingleParts
+  },
+  data() {
+    return {
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10,
+      },
+      search_data1: {
+        pageno: 1,
+        pagesize: 10,
+        startTime: "",
+        endTime: "",
+        contractCode: '',
+        createByName: '',
+      },
+      formData: {
+        startTime: "",
+        endTime: "",
+        contractType: '',
+        contractTypeName: '',
+        unitUomName: '',
+        clientName: '',
+        materielName: '',
+        specification: '',
+        auditSign: '',
+        salesPersonName: '',
+        salesPerson: '',
+        // createTime: '',
+        deptId: '',
+        salesPersonDept: '',
+        createBy: "",//制单人id
+        createByName:"",
+      },
+      //默认列表数据
+      showTableColumnsDefault: [
+          {title: "合同日期", prop_: "contractDate", select: true},
+          {title: "合同编号", prop_: "contractCode", select: true},
+          {title: "合同类型", prop_: "contractTypeName", select: true},
+          {title: "关闭标志", prop_: "closeStatusName", select: true},
+          {title: "客户名称", prop_: "clientName", select: true},
+          {title: "销售员", prop_: "salesPersonName", select: true},
+          {title: "销售部门", prop_: "salesPersonDeptName", select: true},
+          {title: "发货是否检验", prop_: "isCheck", select: true},
+          {title: "物料代码", prop_: "materielSerialNo", select: true},
+          {title: "物料名称", prop_: "materielName", select: true},
+          {title: "规格型号", prop_: "specification", select: true},
+          {title: "主计量单位", prop_: "unitUomName", select: true},
+          {title: "主单位数量", prop_: "count", select: true},
+          {title: "辅助单位", prop_: "supportUomName", select: true},
+          {title: "销售数量", prop_: "saleCount", select: true},
+          {title: "含税单价（元）", prop_: "taxUnitPrice", select: true},
+          {title: "销售金额（元）", prop_: "taxAmount", select: true},
+          {title: "交货日期", prop_: "deliveryDate", select: true,sortAble:true},
+          {title: "审核状态", prop_: "auditSignName", select: true},
+          {title: "行关闭状态", prop_: "itemCloseStatusName", select: true},
+          {title: "行关闭时间", prop_: "itemCloseTime", select: true},
+          {title: "行关闭原因", prop_: "itemCloseReason", select: true}
+        ],
+        ///弹出页面列表数据
+        showTableColumns: [
+          {title: "合同日期", prop_: "contractDate", select: true},
+          {title: "合同编号", prop_: "contractCode", select: true},
+          {title: "合同类型", prop_: "contractTypeName", select: true},
+          {title: "关闭标志", prop_: "closeStatusName", select: true},
+          {title: "客户名称", prop_: "clientName", select: true},
+          {title: "销售员", prop_: "salesPersonName", select: true},
+          {title: "销售部门", prop_: "salesPersonDeptName", select: true},
+          {title: "发货是否检验", prop_: "isCheck", select: true},
+          {title: "物料代码", prop_: "materielSerialNo", select: true},
+          {title: "物料名称", prop_: "materielName", select: true},
+          {title: "规格型号", prop_: "specification", select: true},
+          {title: "主计量单位", prop_: "unitUomName", select: true},
+          {title: "主单位数量", prop_: "count", select: true},
+          {title: "辅助单位", prop_: "supportUomName", select: true},
+          {title: "销售数量", prop_: "saleCount", select: true},
+          {title: "含税单价（元）", prop_: "taxUnitPrice", select: true},
+          {title: "销售金额（元）", prop_: "taxAmount", select: true},
+          {title: "交货日期", prop_: "deliveryDate", select: true},
+          {title: "审核状态", prop_: "auditSignName", select: true},
+          {title: "行关闭状态", prop_: "itemCloseStatusName", select: true},
+          {title: "行关闭时间", prop_: "itemCloseTime", select: true},
+          {title: "行关闭原因", prop_: "itemCloseReason", select: true}
+        ],
+        showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
+        //显示的列表字段
+        alterationDetailId: '',
+      formTableData: [],
+          contractList: [],
+          contractData: [],
+          tableData1: [],
+          summary: {},
+      formDataTime: "",
+      time: '',
+      salesTime: '',
+      tableData: [],
+      depOptions: [],
+      salesPersonDept: '',
+      options: [],
+      typeList: [],
+      config: config,
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      advanceQueryDialogVisible: false,
+      chooseUserVisible: false,
+      chooseUserVisible1: false,
+      chooseMaterielVisible:false,//物料
+      dialogLoading: false,
+      dialogTitle: "",
+      pictLoading: false,
+      columnSetDialogTitle: "设置显示字段列表",
+      columnSetDialogVisible: false,
+      salesContractIds: [],
+      tableId: 'sales_contract_table'
+    }
+  },
+  watch: {
+      time(val) {
+        if (val) {
+          this.search_data.startTime = val[0];
+          this.search_data.endTime = val[1];
+        } else {
+          this.search_data.startTime = "";
+          this.search_data.endTime = "";
+        }
+
+      },
+      formDataTime(val) {
+        if (val) {
+          this.formData.startTime = val[0];
+          this.formData.endTime = val[1];
+        } else {
+          this.formData.startTime = "";
+          this.formData.endTime = "";
+        }
+
+      },
+    },
+  created() {
+    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.getList()
+    this.getShowColumns();
+    this.initData()
+  },
+  methods: {
+
+    // 变更合同列表页
+    gotoAlterationList() {
+      let id = this.salesContractIds[0].salesContractId
+      this.$router.push({ path: "/sales/salesContract_alterationList", query: { id: id, t: Date.now()} })
+    },
+
+    // 返回首页
+    gotoIndex() {
+      this.chooseProVisible = false
+    },
+    // 变更
+    change() {
+      let id = this.salesContractIds[0].salesContractId
+      this.$router.push({ path: "/sales/salesContract_edit", query: { id: id, t: Date.now()} })
+    },
+
+    /**
+   * 关闭
+   */
+   close() {
+    let id = this.salesContractIds[0].salesContractId
+    this.$confirm("确认终止选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.salesAPI
+          .closeContract({id: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                  message: res.msg,
+                  type: "success"
+                })
+                this. getList();
+            } else {
+              this.$message({
+                  message: res.msg,
+                  type: "error"
+                })
+            }
+          })
+        })
+
+   },
+   // 反关闭
+  reverseClose () {
+    let id = this.salesContractIds[0].salesContractId
+    this.$confirm("确认开启选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.salesAPI
+          .reverseClose({id: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                  message: res.msg,
+                  type: "success"
+                })
+                this. getList();
+            } else {
+              this.$message({
+                  message: res.msg,
+                  type: "error"
+                })
+            }
+          })
+        })
+  },
+   // 导出
+   exportExcel() {
+       delete this.search_data.pagesize
+       delete this.search_data.pageno
+        this.$api.salesAPI
+        .exportExcel(this.search_data)
+        .then(res => {
+        })
+      },
+   /**
+   * 反审核
+   */
+   disAudit() {
+      let id = this.salesContractIds[0].salesContractId
+      this.$confirm("确认反审核选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.salesAPI
+          .reverseAuditContract({id: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              })
+              this. getList();
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "error"
+              })
+            }
+          })
+        })
+
+    },
+
+   /**
+   * 审核
+   */
+   audit() {
+    let id = this.salesContractIds[0].salesContractId
+    this.$confirm("确认审核选中的项吗?", "提示", {
+      type: "warning"
+    }).then(() => {
+      this.$api.salesAPI
+    .auditContract({id: id})
+    .then(res => {
+      if(res.code === 0) {
+        this.$message({
+            message: res.msg,
+            type: "success"
+          })
+          this. getList();
+      } else {
+        this.$message({
+            message: res.msg,
+            type: "error"
+          })
+      }
+    })
+    })
+
+   },
+
+    clickRow(row) {
+      this.$refs.tb.toggleRowSelection(row);
+    },
+
+    // 跳转到查看页面
+    gotoDetail(row) {
+        this.$router.push({ path: "/sales/salesContract_add", query: { id: row.salesContractId,t: Date.now() } })
+    },
+
+    // 前往新增页面
+    goAdd() {
+      this.$router.push({ path: "/sales/salesContract_add", query: {t: Date.now() } })
+    },
+
+    // 获取销售订单列表
+    getList() {
+      this.pictLoading = true;
+      this.$api.salesAPI
+      .listSalesContract(this.search_data)
+      .then(res => {
+        this.pictLoading = false;
+        if(res.data) {
+          this.summary = res.total
+          this.total = res.data.totalRows;
+          this.tableData = res.data.datas ? res.data.datas : [];
+          this.tableData.forEach(item => {
+            item.contractDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.contractDate)
+            item.deliveryDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.deliveryDate)
+          })
+        } else {
+          this.total = 0;
+          this.tableData = [];
+        }
+      }).catch(r => {
+            console.log(r);
+          });
+    },
+
+      //设置显示字段
+      showColumnSetDialog() {
+        this.columnSetDialogVisible = true;
+        this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+      },
+      //前移
+      toUp(scope) {
+        if (scope.$index == 0) {
+          return false;
+        }
+        let n;
+        for (let i = 0; i < this.showTableColumns.length; i++) {
+          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+            n = i;
+          }
+        }
+        let temp = this.showTableColumns[n];
+        this.showTableColumns[n] = this.showTableColumns[n - 1];
+        this.showTableColumns[n - 1] = temp;
+        this.$forceUpdate();
+      },
+      //后移
+      toDown(scope) {
+        if (scope.$index == this.showTableColumns.length - 1) {
+          return false;
+        }
+        let n;
+        for (let i = 0; i < this.showTableColumns.length; i++) {
+          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+            n = i;
+          }
+        }
+        let temp = this.showTableColumns[n];
+        this.showTableColumns[n] = this.showTableColumns[n + 1];
+        this.showTableColumns[n + 1] = temp;
+        this.$forceUpdate();
+      },
+      //恢复默认
+      toDefault() {
+        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+        this.$forceUpdate();
+      },
+      //完成列表字段设置
+      saveAndCloseColumnSetDialog() {
+        let tableNo = this.tableId;
+        let tableColumns = JSON.stringify(this.showTableColumns);
+        this.columnSetDialogVisible = false;
+        this.$api.tableColumnAPI
+          .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
+          .then(res => {
+              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+              this.formTableData = [];
+              for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                      this.formTableData.push(arr[i]);
+                  }
+              }
+          })
+          .catch(r => {
+            console.log(r);
+          });
+      },
+      //关闭字段设置弹出
+      handleClose() {
+        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
+        this.columnSetDialogVisible = false;
+
+      },
+      /**
+       * 获取显示字段
+       */
+       getShowColumns() {
+        let tableNo = this.tableId;
+        this.formTableData = [];
+
+        this.$api.tableColumnAPI
+          .getShowColumns({tableNo:tableNo})
+          .then(res => {
+            if(res.code==0){
+              if(res.results){
+                this.showTableColumns = JSON.parse(res.results);
+                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+                for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                    this.formTableData.push(arr[i]);
+                  }
+                }
+                this.$forceUpdate();
+              }else{
+                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+                for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                    this.formTableData.push(arr[i]);
+                  }
+                }
+                this.$forceUpdate();
+              }
+            }else{
+              this.$message({
+                message: res.msg ? res.msg : "获取列表信息失败",
+                type: "error"
+              });
+            }
+
+          })
+          .catch(r => {
+            this.$message({
+              message: r,
+              type: "error"
+            });
+            console.log(r);
+          });
+      },
+
+    // 查询
+    search() {
+      this.search_data.pageno = 1;
+      this.search_data.pagesize = 10;
+      this.getList();
+    },
+
+    /**
+     * 高级查询
+     */
+      moreSearch() {
+      this.advanceQueryDialogVisible = true;
+      this.dialogTitle = "高级查询";
+    },
+    save() {
+        for (var n in this.formData) {
+          this.search_data[n] = this.formData[n];
+        }
+        this.search_data.inDatas = "";
+        this.time = this.formDataTime;
+        this.search_data.pageno = 1;
+        this.$nextTick(function () {
+          this.advanceQueryDialogVisible = false;
+          this.getList();
+        })
+      },
+      //清空
+      clear() {
+        for (var n in this.formData) {
+          this.formData[n] = '';
+        }
+        this.formDataTime = "";
+        this.salesPersonDept=''
+        // this.createTime = "";
+      },
+      changeFacility() {
+        this.$forceUpdate();
+      },
+
+    //设置显示字段
+    showColumnSetDialog() {
+      this.columnSetDialogVisible = true;
+      this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    },
+    // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+
+    /**
+     * 初始化
+     */
+     initData() {
+      // 获取审核状态
+      this.$api.salesAPI
+      .listAauditSign({
+        type: "audit_status",
+      })
+      .then(res => {
+        this.options = res.datas
+      });
+      //  获取合同类型
+      this.$api.salesAPI
+      .listContractType({
+        type: "sales_contract_type",
+      })
+      .then(res => {
+        this.typeList = res.datas
+      });
+      // 获取生产部门
+      Promise.all([this.$api.commonAPI.getDeptsTree(), this.$api.roleAPI.list()])
+            .then(([r1, r2]) => {
+                if (r1.code === 0) {
+                    this.depOptions=r1.data.children;
+                    // this.setDefaultDept();
+                    this.setDeptList(this.depOptions);
+                }
+                if (r2.code === 0) {
+                    this.roleList = r2.datas;
+                }
+            })
+            .catch(error => {
+                console.log(error);
+            });
+     },
+     getMateriel(val){
+        if (val) {
+          this.$set(this.formData,'materiel',val.id)
+          this.$set(this.formData,'materielName',val.name)
+        }else{
+          this.$set(this.formData,'materiel',"")
+          this.$set(this.formData,'materielName',"")
+        }
+      },
+
+     /**
+     * 获取用户
+     */
+     getUser(data) {
+        if (data) {
+          this.$set(this.formData,'salesPersonName',data.name)
+          this.$set(this.formData,'salesPerson',data.id)
+        //   this.formData.salesPersonName = data.name;
+        //   this.formData.salesPerson = data.id;
+        //   this.getUserList.forEach(item => {
+        //     if (data.id === item.id) {
+        //       self.formData.salesPersonDept = item.deptId;
+        //         self.formData.deptId= item.deptId;
+        //       return;
+        //     }
+        //   });
+          // if (self.formData.deptId == 0) {
+          //   self.formData.salesPersonDept = "";
+          // }
+          this.setDefaultDept()
+        }
+      },
+      /**
+     * 获取制单人
+     */
+     getUser1(data) {
+        console.log(data)
+        var self = this;
+        if (data) {
+          this.formData.createByName = data.name;
+          this.formData.createBy = data.id;
+        }
+      },
+       //根据当前id,获取一条树枝上的所有id数据
+       treeFindPath (tree, func, path = []) {
+                if (!tree) return []
+                for (const data of tree) {
+                    path.push(data.id)
+                    if (func(data)) return path
+                    if (data.children) {
+                        const findChildren = this.treeFindPath(data.children, func, path)
+                        if (findChildren.length) return findChildren
+                    }
+                    path.pop()
+                }
+                return []
+            },
+      //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
+      setDeptList(tree){
+          for (const data of tree) {
+              if(!data.hasChildren){
+                  data.children=undefined;
+              }else{
+                  this.setDeptList(data.children)
+              }
+          }
+      },
+    //显示默认部门
+    // setDefaultDept(){
+    //     if(this.depOptions.length>0&&this.formData.deptId){
+    //       let id=JSON.stringify( this.formData.deptId)
+    //       let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
+    //       this.salesPersonDept=JSON.parse(JSON.stringify(select_id))
+    //     }
+    //   },
+      // 选择部门
+      handleChange:function(value){
+        this.formData.salesPersonDept=value.length>=1?value[value.length-1]:'';
+        this.salesPersonDept=value;
+      },
+
+
+        /**
+       * 处理选中
+       */
+       handleSelectionChange(val) {
+        this.salesContractIds= val;
+        this.setBtn(val);
+      },
+
+      /**
+       * 删除
+       */
+       remove() {
+        let ids = [];
+          this.salesContractIds.forEach(item => {
+            ids.push(item.salesContractId)
+            console.log(ids)
+          })
+        this.$confirm("确认删除选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.salesAPI
+            .removeContract({salesContractIds: ids})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.search();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "删除失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "删除失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      },
+      /**
+     * 控件操作按钮状态
+     */
+        setBtn(val) {
+        let isFlag = true;
+        let isDelFlag = true;
+        if (val.length > 0) {
+          isDelFlag = false;
+          if (val.length == 1) {
+            isFlag = false;
+          }
+        } else {
+          isFlag = true;
+          isDelFlag = true;
+        }
+        this.btnOtherDisabled = isDelFlag;
+        this.btnDelDisabled = isFlag;
+      },
+      // 合计
+      getSummaries(param){
+        const { columns, data } = param;
+        let sums=[];
+        columns.forEach((column, index) => { //计算不含税金额总计
+
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          if (column.property!=='count'&&column.property!=='taxAmount'&&column.property!=='saleCount') {
+            sums[index] = '';
+            return;
+          }
+
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = '';
+          }
+          if (column.property==='count') {
+            if(sums[index]) {
+              sums[index] = this.summary.totalCount;
+            }
+            return;
+          }
+          if (column.property==='saleCount') {
+            if(sums[index]) {
+              sums[index] = this.summary.totalSaleCount;
+            }
+            return;
+          }
+          if (column.property==='taxAmount') {
+            if(sums[index]) {
+              sums[index] = this.summary.totalTaxAmount;
+            }
+            return;
+          }
+        });
+
+        return sums;
+      },
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
+
+<style>
+  /*.el-cascader .el-input {*/
+  /*  width: 100% !important;*/
+  /*}*/
+
+  .process-box  .el-select,
+  .process-box .el-input {
+    width: 100%;
+  }
+
+  .process-box .el-table thead {
+    line-height: 1;
+  }
+
+ .process-box .el-input-number .el-input {
+    width: 100% !important;
+  }
+  .process-box .el-input-number--small{
+    width: 70% !important;
+  }
+  .process-box .form-inline {
+    width: 33.3% !important;
+  }
+  .process-box .el-input-number el-input-number--small{
+    white-space: nowrap;
+
+  }
+  .process-box .el-form-item__content{
+    margin-left: 100px !important;
+  }
+ .process-box .el-form-item__label{
+   width: 100px !important;
+ }
+  .process-box  .el-input,.process-box  .el-form--inline .el-input,.process-box .el-cascader--small{
+    width: 100% !important;
+  }
+  .childlist .el-form-item__content{
+    margin-left: 0 !important;
+  }
+
+  .process-box .el-input--small{
+    width: 70% !important;
+  }
+</style>
+
+<style scoped>
+  >>>.sys-search .el-input__inner{
+    width: 100%;
+  }
+  .dialog-form{
+    position: relative;
+  }
+  .dialog-line{
+    position: relative;
+    display: flex;
+    justify-content: center;
+    width: 100%;
+  }
+  .dialog-line .dialog-form-inline{
+    position: relative;
+    width: 50%;
+    margin-right: 0;
+  }
+  .dialog-line  .dialog-form-inline-single{
+    position: relative;
+    width: 100%;
+    margin-right: 0;
+  }
+  >>>.dialog-line .el-input__inner{
+    width: 100% !important;;
+  }
+  >>>.dialog-line .el-form-item__content{
+    width: calc(100% - 80px) !important;;
+  }
+  >>>.dialog-line .el-input,>>>.dialog-line .el-cascader{
+    width: 100% !important;
+  }
+</style>
+
+
+
+
diff --git a/src/pages/scm/sales/sales_stock/index.vue b/src/pages/scm/sales/sales_stock/index.vue
index 56b4042..ca15a2a 100644
--- a/src/pages/scm/sales/sales_stock/index.vue
+++ b/src/pages/scm/sales/sales_stock/index.vue
@@ -1,899 +1,902 @@
-<template>
-  <div class="sys-box">
-    <div class="sys-operate">
-      <el-button type="primary" @click="goAdd()" v-has="'sales:salesStock:add'">新增</el-button>
-      <el-button type="primary" @click="remove()" :disabled="btnOtherDisabled" v-has="'sales:salesStock:remove'">删除</el-button>
-      <el-button type="primary" @click="exportExcel" v-has="'sales:salesStock:exportExcel'">导出</el-button>
-      <el-button type="primary" @click="audit" :disabled="btnDelDisabled" v-has="'sales:salesStock:audit'">审核</el-button>
-      <el-button type="primary" @click="disAudit" :disabled="btnDelDisabled" v-has="'sales:salesStock:disAudit'">反审核</el-button>
-      <el-button type="primary" @click="showColumnSetDialog">{{config.configureBtnName}}</el-button>
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class='form_item_input_out'>
-        <el-form-item label="出库单号" style='width:22%' class="form_item-inline">
-          <el-input v-model="search_data.outCode" placeholder="请输入出库单号" clearable ></el-input>
-        </el-form-item>
-        <el-form-item label="客户" style='width:22%' class="form_item-inline">
-          <el-input v-model="search_data.clientName" placeholder="请输入客户" clearable ></el-input>
-        </el-form-item>
-        <el-form-item label="物料" style='width:22%' class="form_item-inline">
-          <el-input v-model="search_data.materielName" placeholder="模糊查询" clearable ></el-input>
-        </el-form-item>
-        <el-form-item label="出库日期" style='width:34%' class="form_item-inline">
-          <el-date-picker
-            v-model="time"
-            type="daterange"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            range-separator="—"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          ></el-date-picker>
-        </el-form-item>
-      </div>
-      <div class='form_item_btn_out'>
-        <el-form-item>
-          <el-button type="primary" @click="search()">查询</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="moreSearch()">高级查询</el-button>
-        </el-form-item>
-      </div>
-      </el-form>
-    </div>
-    <div class="sys-table">
-      <el-table border
-      v-if="formTableData.length>0"
-      id="out-table"
-        ref="tb"
-        show-summary
-        :summary-method="getSummaries"
-        v-loading="pictLoading"
-        :data="tableData"
-        @selection-change="handleSelectionChange"
-        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
-      >
-      <el-table-column type="selection" width="55" align="center"></el-table-column>
-      <el-table-column v-for="(items,index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
-                         align="center" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <div>
-                  <div v-if="items.prop_=='sourceCode'">
-                    <el-link type="primary" @click="viewDetail(scope.row)">{{scope.row.sourceCode}}</el-link>
-                  </div>
-                  <div v-else-if="items.prop_=='outCode'">
-                    <el-link type="primary" @click="gotoDetail(scope.row)">{{scope.row.code}}</el-link>
-                  </div>
-                  <div v-else>
-                    <div style="overflow:hidden">{{scope.row[items.prop_]}}</div>
-                  </div>
-                </div>
-              </template>
-
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="search_data.pageno"
-        :page-sizes="pageSizes"
-        :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
-    </div>
-
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px" :before-close="handleClose">
-      <el-table border
-                :data="showTableColumns"
-                :key="Math.random()"
-                max-height="350"
-                style="width: 100%">
-        <el-table-column
-          prop="title"
-          label="列表名称"
-          width="180" fixed>
-        </el-table-column>
-        <el-table-column
-          prop="select"
-          label="是否显示"
-          width="180">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作"
-        >
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-
-    <!-- 高级查询对话框 -->
-    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
-      <el-form :inline="true"
-               v-loading="dialogLoading"
-               label-width="80px"
-               class="dialog-form"
-               ref="form" style="width: 620px"
-      >
-        <div class="dialog-line">
-          <el-form-item label="出库日期"  class="dialog-form-inline-single">
-            <el-date-picker
-              v-model="formDataTime"
-              type="daterange"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              range-separator="—"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-            ></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="销售方式" class="dialog-form-inline">
-            <el-radio-group v-model="formData.salesType">
-              <el-radio :label="1">赊销</el-radio>
-              <el-radio :label="0">现销</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        <el-form-item label="客户" class="dialog-form-inline">
-          <el-input placeholder="请输入客户名" v-model="formData.clientName" clearable></el-input>
-        </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="物料名称" class="dialog-form-inline">
-            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel' :chooseVisible.sync='chooseMaterielVisible'></btn-input>
-          </el-form-item>
-        <el-form-item label="规格型号" class="dialog-form-inline">
-          <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
-        </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="销售部门" prop="deptId" class="dialog-form-inline">
-            <el-cascader
-              v-model="formData.selectDeptId"
-              clearable
-              :options="depOptions"
-              :props="{ expandTrigger: 'hover',label:'text',value:'id', checkStrictly: true}"
-              @change="handleChange"></el-cascader>
-          </el-form-item>
-          <el-form-item label="审核状态" class="dialog-form-inline">
-            <el-select v-model="formData.auditSign" style="width:100%" clearable placeholder="请选择" @change="changeFacility">
-              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="销售员" prop="salesPersonName" class="dialog-form-inline">
-            <!-- <el-input placeholder="请选择销售员" readonly v-model="formData.salesPersonName" size="small">
-              <el-button slot="append" @click="chooseUserVisible = true" icon="el-icon-search"></el-button>
-            </el-input> -->
-            <btn-input :valueText.sync='formData.salesPersonName' :valueId.sync='formData.salesPerson' :chooseVisible.sync='chooseUserVisible'></btn-input>
-          </el-form-item>
-          <el-form-item label="制单人" prop="createByName" class="dialog-form-inline">
-            <!-- <el-input placeholder="请选择制单人" readonly v-model="formData.createByName" size="small">
-              <el-button slot="append" @click="chooseUserVisible1 = true" icon="el-icon-search"></el-button>
-            </el-input> -->
-            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy' :chooseVisible.sync='chooseUserVisible1'></btn-input>
-          </el-form-item>
-        </div>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">确定</el-button>
-        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
-        <el-button type="primary" @click="clear">清空</el-button>
-      </span>
-    </el-dialog>
-
-    <!--选择销售员-->
-  <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
-   <!--选择制单人-->
-   <DialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></DialogChooseSingleUser1>
-   <!--选择物料-->
-   <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel" ></dialogChooseSingleParts>
-  </div>
-</template>
-
-<script>
-  import btnInput from "@/components/btnInput.vue";
-  import {mapState, mapActions, mapGetters} from "vuex";
-  import FileSaver from 'file-saver'
-  import config from "@/utils/config.js";
-  import Cookies from "js-cookie";
-  import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-  import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
-  import DialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
-  import { formatDateTime, getCurrentDate } from "@/utils/tools.js";
-  export default {
-    components: {
-        btnInput,DialogChooseSingleUser,DialogChooseSingleUser1,dialogChooseSingleParts
-      },
-      data() {
-        return {
-          total: 0, //总条数
-          pageSizes: [10, 20, 50], //每页展示多少条
-          search_data: {
-            pageno: 1,
-            pagesize: 10,
-            startTime: "",
-            endTime: "",
-            outCode: '',
-            clientName: '',
-            materielName: '',
-          },
-          formData: {
-            startTime: "",
-            endTime: "",
-            contractType: '',
-            contractTypeName: '',
-            unitUomName: '',
-            clientName: '',
-            materielName: '',
-            specification: '',
-            selectDeptId: '',
-            auditSign: '',
-            salesPersonName: '',
-            salesPerson: '',
-            createByName: '',
-            createTime: '',
-            deptId: '',
-          },
-          //默认列表数据
-          showTableColumnsDefault: [
-              {title: "出库日期", prop_: "outTime", select: true},
-              {title: "单据编号", prop_: "outCode", select: true},
-              {title: "客户名称", prop_: "clientName", select: true},
-              {title: "物料代码", prop_: "materielSerialNo", select: true},
-              {title: "物料名称", prop_: "materielName", select: true},
-              {title: "规格型号", prop_: "specification", select: true},
-              {title: "主计量单位", prop_: "unitUomName", select: true},
-              {title: "主单位数量", prop_: "count", select: true},
-              {title: "辅助单位", prop_: "supportUomName", select: true},
-              {title: "出库数量", prop_: "outCount", select: true},
-              {title: "销售单价（元）", prop_: "sellUnitPrice", select: true},
-              {title: "销售金额（元）", prop_: "sellAmount", select: true},
-              {title: "批号", prop_: "batch", select: true},
-              {title: "仓库", prop_: "facName", select: true},
-              {title: "仓位", prop_: "locationName", select: true},
-              {title: "部门", prop_: "deptName", select: true},
-              {title: "出库员", prop_: "operatorName", select: true},
-              {title: "审核状态", prop_: "auditSignName", select: true},
-              {title: "源单类型", prop_: "sourceTypeName", select: true},
-              {title: "源单单号", prop_: "sourceCode", select: true}
-            ],
-            ///弹出页面列表数据
-              showTableColumns: [
-                  {title: "出库日期", prop_: "outTime", select: true},
-                  {title: "单据编号", prop_: "outCode", select: true},
-                  {title: "客户名称", prop_: "clientName", select: true},
-                  {title: "物料代码", prop_: "materielSerialNo", select: true},
-                  {title: "物料名称", prop_: "materielName", select: true},
-                  {title: "规格型号", prop_: "specification", select: true},
-                  {title: "主计量单位", prop_: "unitUomName", select: true},
-                  {title: "主单位数量", prop_: "count", select: true},
-                  {title: "辅助单位", prop_: "supportUomName", select: true},
-                  {title: "出库数量", prop_: "outCount", select: true},
-                  {title: "销售单价（元）", prop_: "sellUnitPrice", select: true},
-                  {title: "销售金额（元）", prop_: "sellAmount", select: true},
-                  {title: "批号", prop_: "batch", select: true},
-                  {title: "仓库", prop_: "facName", select: true},
-                  {title: "仓位", prop_: "locationName", select: true},
-                  {title: "部门", prop_: "deptName", select: true},
-                  {title: "出库员", prop_: "operatorName", select: true},
-                  {title: "审核状态", prop_: "auditSignName", select: true},
-                  {title: "源单类型", prop_: "sourceTypeName", select: true},
-                  {title: "源单单号", prop_: "sourceCode", select: true}
-              ],
-          showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
-          //显示的列表字段
-          formTableData: [],
-          typeList: [],
-          depOptions: [],
-          options: [],
-          summary: {},
-          config: config,
-          outTime: '',
-          formDataTime: "",
-          time: '',
-          salesStockIds: '',
-          pictLoading: false,
-          btnDelDisabled: true,
-          btnOtherDisabled: true,
-          columnSetDialogVisible: false,
-          chooseUserVisible: false,
-          chooseUserVisible1: false,
-          advanceQueryDialogVisible: false,
-          chooseMaterielVisible:false,//物料
-          dialogLoading: false,
-          dialogTitle: "",
-          columnSetDialogTitle: "设置显示字段列表",
-          tableData: [],
-          tableId: 'sales_stock_table'
-        }
-    },
-    created() {
-      var _this = this;
-      document.onkeydown = e => {
-        if (e.key === "Enter") {
-          _this.search()
-        }
-      }
-    },
-    computed: {
-      ...mapGetters({
-        userInfo: "user/getUserInfo"
-      }),
-    },
-    mounted() {
-      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-      this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-      this.getList()
-      this.getShowColumns();
-      this.initData()
-    },
-    watch: {
-      time(val) {
-        if (val) {
-          this.search_data.startTime = val[0];
-          this.search_data.endTime = val[1];
-        } else {
-          this.search_data.startTime = "";
-          this.search_data.endTime = "";
-        }
-
-      },
-      formDataTime(val) {
-        if (val) {
-          this.formData.startTime = val[0];
-          this.formData.endTime = val[1];
-        } else {
-          this.formData.startTime = "";
-          this.formData.endTime = "";
-        }
-
-      },
-
-    },
-    methods: {
-       /**
-       * 查看源单明细
-       */
-      viewDetail(r) {
-        //路由跳转到发货通知
-          let queryId = r.deliveryNoteId;
-          if (queryId) {
-            this.$router.push({ path: '/sales/deliveryNote_add', query: {id:queryId,t: Date.now() } })
-          }
-      },
-      // 前往详情页
-      gotoDetail(row) {
-        this.$router.push({ path: "/sales/salesStock_add", query: { id: row.id,t: Date.now() } })
-      },
-      // 前往新增页面
-      goAdd() {
-        this.$router.push({ path: "/sales/salesStock_add", query: { t: Date.now() } })
-      },
-      // 导出
-      exportExcel() {
-       delete this.search_data.pagesize
-       delete this.search_data.pageno
-        this.$api.saleStockAPI
-        .exportExcel(this.search_data)
-        .then(res => {
-          console.log(res)
-        })
-      },
-      // 审核
-      audit() {
-        let id = this.salesStockIds[0].id
-        this.$confirm("确认审核选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.saleStockAPI
-          .auditSalesStock({id: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                  message: res.msg,
-                  type: "success"
-                })
-                this. getList();
-            } else {
-              this.$message({
-                  message: res.msg,
-                  type: "error"
-                })
-            }
-          })
-        })
-
-      },
-
-      // 反审核
-      disAudit() {
-        let id = this.salesStockIds[0].id
-        this.$confirm("确认反审核选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.saleStockAPI
-          .reverseAuditSalesStock({id: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                  message: res.msg,
-                  type: "success"
-                })
-                this. getList();
-            } else {
-              this.$message({
-                  message: res.msg,
-                  type: "error"
-                })
-            }
-          })
-        })
-
-      },
-
-      getList() {
-        this.pictLoading = true;
-        this.$api.saleStockAPI
-        .getAdvancedQuery(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if(res.data) {
-            this.summary = res.total
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-            this.tableData.forEach(item => {
-              item.outTime = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.outTime)[0]
-            })
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        }).catch(r => {
-            console.log(r);
-          });
-      },
-          /**
-     * 初始化
-     */
-     initData() {
-      // 获取审核状态
-      this.$api.salesAPI
-      .listAauditSign({
-        type: "audit_status",
-      })
-      .then(res => {
-        this.options = res.datas
-      });
-      //  获取合同类型
-      this.$api.salesAPI
-      .listContractType({
-        type: "contract_type",
-      })
-      .then(res => {
-        this.typeList = res.datas
-      });
-      // 获取生产部门
-      Promise.all([this.$api.commonAPI.getDeptsTree(), this.$api.roleAPI.list()])
-            .then(([r1, r2]) => {
-                if (r1.code === 0) {
-                    this.depOptions=r1.data.children;
-                    this.setDefaultDept();
-                    this.setDeptList(this.depOptions);
-                }
-                if (r2.code === 0) {
-                    this.roleList = r2.datas;
-                }
-            })
-            .catch(error => {
-                console.log(error);
-            });
-     },
-     //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
-     setDeptList(tree){
-        for (const data of tree) {
-          if(!data.hasChildren){
-            data.children=undefined;
-          }else{
-            this.setDeptList(data.children)
-          }
-        }
-
-      },
-     /**
-     * 获取销售员
-     */
-     getUser(data) {
-        // console.log(data)
-        // var self = this;
-        if (data) {
-          this.$set(this.formData,'salesPersonName',data.name)
-          this.$set(this.formData,'salesPerson',data.id)
-          // this.formData.salesPersonName = data.name;
-          // this.formData.salesPerson = data.id;
-          // this.getUserList.forEach(item => {
-          //   if (data.id === item.id) {
-          //     self.formData.selectDeptId = item.deptId;
-          //       self.formData.deptId= item.deptId;
-          //     return;
-          //   }
-          // });
-          // if (self.formData.deptId == 0) {
-          //   self.formData.selectDeptId = "";
-          // }
-          this.setDefaultDept()
-        }
-      },
-      /**
-     * 获取制单人
-     */
-     getUser1(data) {
-        console.log(data)
-        var self = this;
-        if (data) {
-          this.formData.createByName = data.name;
-          this.formData.createBy = data.id;
-        }
-      },
-      getMateriel(val){
-        if (val) {
-          this.$set(this.formData,'materiel',val.id)
-          this.$set(this.formData,'materielName',val.name)
-        }else{
-          this.$set(this.formData,'materiel',"")
-          this.$set(this.formData,'materielName',"")
-        }
-      },
-
-      // 查询
-      search() {
-        this.search_data.pageno = 1;
-        this.search_data.pagesize = 10;
-        this.getList();
-      },
-      /**
-     * 高级查询
-     */
-     moreSearch() {
-      this.advanceQueryDialogVisible = true;
-      this.dialogTitle = "高级查询";
-    },
-    save() {
-        for (var n in this.formData) {
-          this.search_data[n] = this.formData[n];
-        }
-        this.search_data.inDatas = "";
-        this.time = this.formDataTime;
-        this.search_data.pageno = 1;;
-        this.$nextTick(function () {
-          this.advanceQueryDialogVisible = false;
-          this.getList();
-        })
-      },
-      //清空
-      clear() {
-        for (var n in this.formData) {
-          this.formData[n] = '';
-        }
-        this.$forceUpdate()
-        this.formDataTime = "";
-        this.createTime = "";
-      },
-      changeFacility() {
-        this.$forceUpdate();
-      },
-
-       /**
-       * 处理选中
-       */
-       handleSelectionChange(val) {
-         console.log(val)
-        this.salesStockIds= val;
-        this.setBtn(val);
-      },
-
-       // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-
-      /**
-       * 删除
-       */
-       remove() {
-        let ids = [];
-          this.salesStockIds.forEach(item => {
-            ids.push(item.id)
-          })
-        this.$confirm("确认删除选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.saleStockAPI
-            .removeSalesStock({ids: ids})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "删除失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "删除失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      },
-     /**
-     * 控件操作按钮状态
-     */
-     setBtn(val) {
-        let isFlag = true;
-        let isDelFlag = true;
-        if (val.length > 0) {
-          isDelFlag = false;
-          if (val.length == 1) {
-            isFlag = false;
-          }
-        } else {
-          isFlag = true;
-          isDelFlag = true;
-        }
-        this.btnOtherDisabled = isDelFlag;
-        this.btnDelDisabled = isFlag;
-      },
-      //设置显示字段
-    showColumnSetDialog() {
-        this.columnSetDialogVisible = true;
-        this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-      },
-      //前移
-      toUp(scope) {
-        if (scope.$index == 0) {
-          return false;
-        }
-        let n;
-        for (let i = 0; i < this.showTableColumns.length; i++) {
-          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-            n = i;
-          }
-        }
-        let temp = this.showTableColumns[n];
-        this.showTableColumns[n] = this.showTableColumns[n - 1];
-        this.showTableColumns[n - 1] = temp;
-        this.$forceUpdate();
-      },
-      //后移
-      toDown(scope) {
-        if (scope.$index == this.showTableColumns.length - 1) {
-          return false;
-        }
-        let n;
-        for (let i = 0; i < this.showTableColumns.length; i++) {
-          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-            n = i;
-          }
-        }
-        let temp = this.showTableColumns[n];
-        this.showTableColumns[n] = this.showTableColumns[n + 1];
-        this.showTableColumns[n + 1] = temp;
-        this.$forceUpdate();
-      },
-      //恢复默认
-      toDefault() {
-        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-        this.$forceUpdate();
-      },
-      //完成列表字段设置
-      saveAndCloseColumnSetDialog() {
-        let tableNo = this.tableId;
-        let tableColumns = JSON.stringify(this.showTableColumns);
-        this.columnSetDialogVisible = false;
-        this.$api.tableColumnAPI
-          .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
-          .then(res => {
-              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-              this.formTableData = [];
-              for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                      this.formTableData.push(arr[i]);
-                  }
-              }
-          })
-          .catch(r => {
-            console.log(r);
-          });
-      },
-      //关闭字段设置弹出
-      handleClose() {
-        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
-        this.columnSetDialogVisible = false;
-
-      },
-      /**
-       * 获取显示字段
-       */
-       getShowColumns() {
-        let tableNo = this.tableId;
-        this.formTableData = [];
-
-        this.$api.tableColumnAPI
-          .getShowColumns({tableNo:tableNo})
-          .then(res => {
-            if(res.code==0){
-              if(res.results){
-                this.showTableColumns = JSON.parse(res.results);
-                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-                for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                    this.formTableData.push(arr[i]);
-                  }
-                }
-                this.$forceUpdate();
-              }else{
-                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-                for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                    this.formTableData.push(arr[i]);
-                  }
-                }
-                this.$forceUpdate();
-              }
-            }else{
-              this.$message({
-                message: res.msg ? res.msg : "获取列表信息失败",
-                type: "error"
-              });
-            }
-
-          })
-          .catch(r => {
-            this.$message({
-              message: r,
-              type: "error"
-            });
-            console.log(r);
-          });
-      },
-
-      //显示默认部门
-    setDefaultDept(){
-        if(this.depOptions.length>0&&this.formData.deptId){
-          let id=JSON.stringify( this.formData.deptId)
-          let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
-          this.selectDeptId=JSON.parse(JSON.stringify(select_id))
-        }
-      },
-      // 选择部门
-      handleChange:function(value){
-        console.log(value)
-        this.formData.deptId=value.length>=1?value[value.length-1]:'';
-        this.selectDeptId=value;
-      },
-     // 合计
-     getSummaries(param){
-        const { columns, data } = param;
-        let sums=[];
-        columns.forEach((column, index) => { //计算不含税金额总计
-
-          if (index === 0) {
-            sums[index] = '合计';
-            return;
-          }
-          if (column.property !== 'outCount'&&column.property!='count'&&column.property!='sellAmount') {
-            sums[index] = '';
-            return;
-          }
-
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-          } else {
-            sums[index] = '';
-          }
-          if (column.property=='count') {
-            if(sums[index]) {
-              sums[index] = this.summary.totalCount
-            }
-            return;
-          }
-          if (column.property === 'outCount') {
-            if(sums[index]) {
-              sums[index] = this.summary.totalOutCount
-            }
-            return;
-          }
-          if (column.property=='sellAmount') {
-            if(sums[index]) {
-              sums[index] = this.summary.totalSellAmount
-            }
-            return;
-          }
-        });
-
-        return sums;
-      },
-
-
-
-    }
-  }
-
-</script>
-
-<style scoped>
-  >>>.sys-search .el-input__inner{
-    width: 100%;
-  }
-  .dialog-form{
-    position: relative;
-  }
-  .dialog-line{
-    position: relative;
-    display: flex;
-    justify-content: center;
-    width: 100%;
-  }
-  .dialog-line .dialog-form-inline{
-    position: relative;
-    width: 50%;
-    margin-right: 0;
-  }
-  .dialog-line  .dialog-form-inline-single{
-    position: relative;
-    width: 100%;
-    margin-right: 0;
-  }
-  >>>.dialog-line .el-input__inner{
-    width: 100% !important;;
-  }
-  >>>.dialog-line .el-form-item__content{
-    width: calc(100% - 80px) !important;;
-  }
-  >>>.dialog-line .el-input,>>>.dialog-line .el-cascader{
-    width: 100% !important;
-  }
-</style>
-
+<template>
+  <div class="sys-box">
+    <div class="sys-operate">
+      <el-button type="primary" @click="goAdd()" v-has="'sales:salesStock:add'">新增</el-button>
+      <el-button type="primary" @click="remove()" :disabled="btnOtherDisabled" v-has="'sales:salesStock:remove'">删除</el-button>
+      <el-button type="primary" @click="exportExcel" v-has="'sales:salesStock:exportExcel'">导出</el-button>
+      <el-button type="primary" @click="audit" :disabled="btnDelDisabled" v-has="'sales:salesStock:audit'">审核</el-button>
+      <el-button type="primary" @click="disAudit" :disabled="btnDelDisabled" v-has="'sales:salesStock:disAudit'">反审核</el-button>
+      <el-button type="primary" @click="showColumnSetDialog">{{config.configureBtnName}}</el-button>
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class='form_item_input_out'>
+        <el-form-item label="出库单号" style='width:22%' class="form_item-inline">
+          <el-input v-model="search_data.outCode" placeholder="请输入出库单号" clearable ></el-input>
+        </el-form-item>
+        <el-form-item label="客户" style='width:22%' class="form_item-inline">
+          <el-input v-model="search_data.clientName" placeholder="请输入客户" clearable ></el-input>
+        </el-form-item>
+        <el-form-item label="物料" style='width:22%' class="form_item-inline">
+          <el-input v-model="search_data.materielName" placeholder="模糊查询" clearable ></el-input>
+        </el-form-item>
+        <el-form-item label="源单单号" style='width:22%' class="form_item-inline">
+          <el-input v-model="search_data.sourceNo" placeholder="源单单号" clearable ></el-input>
+        </el-form-item>
+        <el-form-item label="出库日期" style='width:34%' class="form_item-inline">
+          <el-date-picker
+            v-model="time"
+            type="daterange"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            range-separator="—"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+          ></el-date-picker>
+        </el-form-item>
+      </div>
+      <div class='form_item_btn_out'>
+        <el-form-item>
+          <el-button type="primary" @click="search()">查询</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="moreSearch()">高级查询</el-button>
+        </el-form-item>
+      </div>
+      </el-form>
+    </div>
+    <div class="sys-table">
+      <el-table border
+      v-if="formTableData.length>0"
+      id="out-table"
+        ref="tb"
+        show-summary
+        :summary-method="getSummaries"
+        v-loading="pictLoading"
+        :data="tableData"
+        @selection-change="handleSelectionChange"
+        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
+      >
+      <el-table-column type="selection" width="55" align="center"></el-table-column>
+      <el-table-column v-for="(items,index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
+                         align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <div>
+                  <div v-if="items.prop_=='sourceCode'">
+                    <el-link type="primary" @click="viewDetail(scope.row)">{{scope.row.sourceCode}}</el-link>
+                  </div>
+                  <div v-else-if="items.prop_=='outCode'">
+                    <el-link type="primary" @click="gotoDetail(scope.row)">{{scope.row.code}}</el-link>
+                  </div>
+                  <div v-else>
+                    <div style="overflow:hidden">{{scope.row[items.prop_]}}</div>
+                  </div>
+                </div>
+              </template>
+
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="search_data.pageno"
+        :page-sizes="pageSizes"
+        :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px" :before-close="handleClose">
+      <el-table border
+                :data="showTableColumns"
+                :key="Math.random()"
+                max-height="350"
+                style="width: 100%">
+        <el-table-column
+          prop="title"
+          label="列表名称"
+          width="180" fixed>
+        </el-table-column>
+        <el-table-column
+          prop="select"
+          label="是否显示"
+          width="180">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+
+    <!-- 高级查询对话框 -->
+    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
+      <el-form :inline="true"
+               v-loading="dialogLoading"
+               label-width="80px"
+               class="dialog-form"
+               ref="form" style="width: 620px"
+      >
+        <div class="dialog-line">
+          <el-form-item label="出库日期"  class="dialog-form-inline-single">
+            <el-date-picker
+              v-model="formDataTime"
+              type="daterange"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              range-separator="—"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="销售方式" class="dialog-form-inline">
+            <el-radio-group v-model="formData.salesType">
+              <el-radio :label="1">赊销</el-radio>
+              <el-radio :label="0">现销</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        <el-form-item label="客户" class="dialog-form-inline">
+          <el-input placeholder="请输入客户名" v-model="formData.clientName" clearable></el-input>
+        </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="物料名称" class="dialog-form-inline">
+            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel' :chooseVisible.sync='chooseMaterielVisible'></btn-input>
+          </el-form-item>
+        <el-form-item label="规格型号" class="dialog-form-inline">
+          <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
+        </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="销售部门" prop="deptId" class="dialog-form-inline">
+            <el-cascader
+              v-model="formData.selectDeptId"
+              clearable
+              :options="depOptions"
+              :props="{ expandTrigger: 'hover',label:'text',value:'id', checkStrictly: true}"
+              @change="handleChange"></el-cascader>
+          </el-form-item>
+          <el-form-item label="审核状态" class="dialog-form-inline">
+            <el-select v-model="formData.auditSign" style="width:100%" clearable placeholder="请选择" @change="changeFacility">
+              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="销售员" prop="salesPersonName" class="dialog-form-inline">
+            <!-- <el-input placeholder="请选择销售员" readonly v-model="formData.salesPersonName" size="small">
+              <el-button slot="append" @click="chooseUserVisible = true" icon="el-icon-search"></el-button>
+            </el-input> -->
+            <btn-input :valueText.sync='formData.salesPersonName' :valueId.sync='formData.salesPerson' :chooseVisible.sync='chooseUserVisible'></btn-input>
+          </el-form-item>
+          <el-form-item label="制单人" prop="createByName" class="dialog-form-inline">
+            <!-- <el-input placeholder="请选择制单人" readonly v-model="formData.createByName" size="small">
+              <el-button slot="append" @click="chooseUserVisible1 = true" icon="el-icon-search"></el-button>
+            </el-input> -->
+            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy' :chooseVisible.sync='chooseUserVisible1'></btn-input>
+          </el-form-item>
+        </div>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">确定</el-button>
+        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="clear">清空</el-button>
+      </span>
+    </el-dialog>
+
+    <!--选择销售员-->
+  <DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
+   <!--选择制单人-->
+   <DialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></DialogChooseSingleUser1>
+   <!--选择物料-->
+   <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel" ></dialogChooseSingleParts>
+  </div>
+</template>
+
+<script>
+  import btnInput from "@/components/btnInput.vue";
+  import {mapState, mapActions, mapGetters} from "vuex";
+  import FileSaver from 'file-saver'
+  import config from "@/utils/config.js";
+  import Cookies from "js-cookie";
+  import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+  import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
+  import DialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
+  import { formatDateTime, getCurrentDate } from "@/utils/tools.js";
+  export default {
+    components: {
+        btnInput,DialogChooseSingleUser,DialogChooseSingleUser1,dialogChooseSingleParts
+      },
+      data() {
+        return {
+          total: 0, //总条数
+          pageSizes: [10, 20, 50], //每页展示多少条
+          search_data: {
+            pageno: 1,
+            pagesize: 10,
+            startTime: "",
+            endTime: "",
+            outCode: '',
+            clientName: '',
+            materielName: '',
+          },
+          formData: {
+            startTime: "",
+            endTime: "",
+            contractType: '',
+            contractTypeName: '',
+            unitUomName: '',
+            clientName: '',
+            materielName: '',
+            specification: '',
+            selectDeptId: '',
+            auditSign: '',
+            salesPersonName: '',
+            salesPerson: '',
+            createByName: '',
+            createTime: '',
+            deptId: '',
+          },
+          //默认列表数据
+          showTableColumnsDefault: [
+              {title: "出库日期", prop_: "outTime", select: true},
+              {title: "单据编号", prop_: "outCode", select: true},
+              {title: "客户名称", prop_: "clientName", select: true},
+              {title: "物料代码", prop_: "materielSerialNo", select: true},
+              {title: "物料名称", prop_: "materielName", select: true},
+              {title: "规格型号", prop_: "specification", select: true},
+              {title: "主计量单位", prop_: "unitUomName", select: true},
+              {title: "主单位数量", prop_: "count", select: false},
+              {title: "辅助单位", prop_: "supportUomName", select: false},
+              {title: "出库数量", prop_: "outCount", select: true},
+              {title: "销售单价（元）", prop_: "sellUnitPrice", select: false},
+              {title: "销售金额（元）", prop_: "sellAmount", select: false},
+              {title: "批号", prop_: "batch", select: false},
+              {title: "仓库", prop_: "facName", select: true},
+              {title: "仓位", prop_: "locationName", select: false},
+              {title: "部门", prop_: "deptName", select: true},
+              {title: "出库员", prop_: "operatorName", select: true},
+              {title: "审核状态", prop_: "auditSignName", select: true},
+              {title: "源单类型", prop_: "sourceTypeName", select: true},
+              {title: "源单单号", prop_: "sourceCode", select: true}
+          ],
+          ///弹出页面列表数据
+            showTableColumns: [
+              {title: "出库日期", prop_: "outTime", select: true},
+              {title: "单据编号", prop_: "outCode", select: true},
+              {title: "客户名称", prop_: "clientName", select: true},
+              {title: "物料代码", prop_: "materielSerialNo", select: true},
+              {title: "物料名称", prop_: "materielName", select: true},
+              {title: "规格型号", prop_: "specification", select: true},
+              {title: "主计量单位", prop_: "unitUomName", select: true},
+              {title: "主单位数量", prop_: "count", select: false},
+              {title: "辅助单位", prop_: "supportUomName", select: false},
+              {title: "出库数量", prop_: "outCount", select: true},
+              {title: "销售单价（元）", prop_: "sellUnitPrice", select: false},
+              {title: "销售金额（元）", prop_: "sellAmount", select: false},
+              {title: "批号", prop_: "batch", select: false},
+              {title: "仓库", prop_: "facName", select: true},
+              {title: "仓位", prop_: "locationName", select: false},
+              {title: "部门", prop_: "deptName", select: true},
+              {title: "出库员", prop_: "operatorName", select: true},
+              {title: "审核状态", prop_: "auditSignName", select: true},
+              {title: "源单类型", prop_: "sourceTypeName", select: true},
+              {title: "源单单号", prop_: "sourceCode", select: true}
+          ],
+          showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
+          //显示的列表字段
+          formTableData: [],
+          typeList: [],
+          depOptions: [],
+          options: [],
+          summary: {},
+          config: config,
+          outTime: '',
+          formDataTime: "",
+          time: '',
+          salesStockIds: '',
+          pictLoading: false,
+          btnDelDisabled: true,
+          btnOtherDisabled: true,
+          columnSetDialogVisible: false,
+          chooseUserVisible: false,
+          chooseUserVisible1: false,
+          advanceQueryDialogVisible: false,
+          chooseMaterielVisible:false,//物料
+          dialogLoading: false,
+          dialogTitle: "",
+          columnSetDialogTitle: "设置显示字段列表",
+          tableData: [],
+          tableId: 'sales_stock_table'
+        }
+    },
+    created() {
+      var _this = this;
+      document.onkeydown = e => {
+        if (e.key === "Enter") {
+          _this.search()
+        }
+      }
+    },
+    computed: {
+      ...mapGetters({
+        userInfo: "user/getUserInfo"
+      }),
+    },
+    mounted() {
+      this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+      this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+      this.getList()
+      this.getShowColumns();
+      this.initData()
+    },
+    watch: {
+      time(val) {
+        if (val) {
+          this.search_data.startTime = val[0];
+          this.search_data.endTime = val[1];
+        } else {
+          this.search_data.startTime = "";
+          this.search_data.endTime = "";
+        }
+
+      },
+      formDataTime(val) {
+        if (val) {
+          this.formData.startTime = val[0];
+          this.formData.endTime = val[1];
+        } else {
+          this.formData.startTime = "";
+          this.formData.endTime = "";
+        }
+
+      },
+
+    },
+    methods: {
+       /**
+       * 查看源单明细
+       */
+      viewDetail(r) {
+        //路由跳转到发货通知
+          let queryId = r.deliveryNoteId;
+          if (queryId) {
+            this.$router.push({ path: '/sales/deliveryNote_add', query: {id:queryId,t: Date.now() } })
+          }
+      },
+      // 前往详情页
+      gotoDetail(row) {
+        this.$router.push({ path: "/sales/salesStock_add", query: { id: row.id,t: Date.now() } })
+      },
+      // 前往新增页面
+      goAdd() {
+        this.$router.push({ path: "/sales/salesStock_add", query: { t: Date.now() } })
+      },
+      // 导出
+      exportExcel() {
+       delete this.search_data.pagesize
+       delete this.search_data.pageno
+        this.$api.saleStockAPI
+        .exportExcel(this.search_data)
+        .then(res => {
+          console.log(res)
+        })
+      },
+      // 审核
+      audit() {
+        let id = this.salesStockIds[0].id
+        this.$confirm("确认审核选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.saleStockAPI
+          .auditSalesStock({id: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                  message: res.msg,
+                  type: "success"
+                })
+                this. getList();
+            } else {
+              this.$message({
+                  message: res.msg,
+                  type: "error"
+                })
+            }
+          })
+        })
+
+      },
+
+      // 反审核
+      disAudit() {
+        let id = this.salesStockIds[0].id
+        this.$confirm("确认反审核选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.saleStockAPI
+          .reverseAuditSalesStock({id: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                  message: res.msg,
+                  type: "success"
+                })
+                this. getList();
+            } else {
+              this.$message({
+                  message: res.msg,
+                  type: "error"
+                })
+            }
+          })
+        })
+
+      },
+
+      getList() {
+        this.pictLoading = true;
+        this.$api.saleStockAPI
+        .getAdvancedQuery(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if(res.data) {
+            this.summary = res.total
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+            this.tableData.forEach(item => {
+              item.outTime = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.outTime)[0]
+            })
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        }).catch(r => {
+            console.log(r);
+          });
+      },
+          /**
+     * 初始化
+     */
+     initData() {
+      // 获取审核状态
+      this.$api.salesAPI
+      .listAauditSign({
+        type: "audit_status",
+      })
+      .then(res => {
+        this.options = res.datas
+      });
+      //  获取合同类型
+      this.$api.salesAPI
+      .listContractType({
+        type: "contract_type",
+      })
+      .then(res => {
+        this.typeList = res.datas
+      });
+      // 获取生产部门
+      Promise.all([this.$api.commonAPI.getDeptsTree(), this.$api.roleAPI.list()])
+            .then(([r1, r2]) => {
+                if (r1.code === 0) {
+                    this.depOptions=r1.data.children;
+                    this.setDefaultDept();
+                    this.setDeptList(this.depOptions);
+                }
+                if (r2.code === 0) {
+                    this.roleList = r2.datas;
+                }
+            })
+            .catch(error => {
+                console.log(error);
+            });
+     },
+     //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
+     setDeptList(tree){
+        for (const data of tree) {
+          if(!data.hasChildren){
+            data.children=undefined;
+          }else{
+            this.setDeptList(data.children)
+          }
+        }
+
+      },
+     /**
+     * 获取销售员
+     */
+     getUser(data) {
+        // console.log(data)
+        // var self = this;
+        if (data) {
+          this.$set(this.formData,'salesPersonName',data.name)
+          this.$set(this.formData,'salesPerson',data.id)
+          // this.formData.salesPersonName = data.name;
+          // this.formData.salesPerson = data.id;
+          // this.getUserList.forEach(item => {
+          //   if (data.id === item.id) {
+          //     self.formData.selectDeptId = item.deptId;
+          //       self.formData.deptId= item.deptId;
+          //     return;
+          //   }
+          // });
+          // if (self.formData.deptId == 0) {
+          //   self.formData.selectDeptId = "";
+          // }
+          this.setDefaultDept()
+        }
+      },
+      /**
+     * 获取制单人
+     */
+     getUser1(data) {
+        console.log(data)
+        var self = this;
+        if (data) {
+          this.formData.createByName = data.name;
+          this.formData.createBy = data.id;
+        }
+      },
+      getMateriel(val){
+        if (val) {
+          this.$set(this.formData,'materiel',val.id)
+          this.$set(this.formData,'materielName',val.name)
+        }else{
+          this.$set(this.formData,'materiel',"")
+          this.$set(this.formData,'materielName',"")
+        }
+      },
+
+      // 查询
+      search() {
+        this.search_data.pageno = 1;
+        this.search_data.pagesize = 10;
+        this.getList();
+      },
+      /**
+     * 高级查询
+     */
+     moreSearch() {
+      this.advanceQueryDialogVisible = true;
+      this.dialogTitle = "高级查询";
+    },
+    save() {
+        for (var n in this.formData) {
+          this.search_data[n] = this.formData[n];
+        }
+        this.search_data.inDatas = "";
+        this.time = this.formDataTime;
+        this.search_data.pageno = 1;;
+        this.$nextTick(function () {
+          this.advanceQueryDialogVisible = false;
+          this.getList();
+        })
+      },
+      //清空
+      clear() {
+        for (var n in this.formData) {
+          this.formData[n] = '';
+        }
+        this.$forceUpdate()
+        this.formDataTime = "";
+        this.createTime = "";
+      },
+      changeFacility() {
+        this.$forceUpdate();
+      },
+
+       /**
+       * 处理选中
+       */
+       handleSelectionChange(val) {
+         console.log(val)
+        this.salesStockIds= val;
+        this.setBtn(val);
+      },
+
+       // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+
+      /**
+       * 删除
+       */
+       remove() {
+        let ids = [];
+          this.salesStockIds.forEach(item => {
+            ids.push(item.id)
+          })
+        this.$confirm("确认删除选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.saleStockAPI
+            .removeSalesStock({ids: ids})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "删除失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "删除失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      },
+     /**
+     * 控件操作按钮状态
+     */
+     setBtn(val) {
+        let isFlag = true;
+        let isDelFlag = true;
+        if (val.length > 0) {
+          isDelFlag = false;
+          if (val.length == 1) {
+            isFlag = false;
+          }
+        } else {
+          isFlag = true;
+          isDelFlag = true;
+        }
+        this.btnOtherDisabled = isDelFlag;
+        this.btnDelDisabled = isFlag;
+      },
+      //设置显示字段
+    showColumnSetDialog() {
+        this.columnSetDialogVisible = true;
+        this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+      },
+      //前移
+      toUp(scope) {
+        if (scope.$index == 0) {
+          return false;
+        }
+        let n;
+        for (let i = 0; i < this.showTableColumns.length; i++) {
+          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+            n = i;
+          }
+        }
+        let temp = this.showTableColumns[n];
+        this.showTableColumns[n] = this.showTableColumns[n - 1];
+        this.showTableColumns[n - 1] = temp;
+        this.$forceUpdate();
+      },
+      //后移
+      toDown(scope) {
+        if (scope.$index == this.showTableColumns.length - 1) {
+          return false;
+        }
+        let n;
+        for (let i = 0; i < this.showTableColumns.length; i++) {
+          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+            n = i;
+          }
+        }
+        let temp = this.showTableColumns[n];
+        this.showTableColumns[n] = this.showTableColumns[n + 1];
+        this.showTableColumns[n + 1] = temp;
+        this.$forceUpdate();
+      },
+      //恢复默认
+      toDefault() {
+        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+        this.$forceUpdate();
+      },
+      //完成列表字段设置
+      saveAndCloseColumnSetDialog() {
+        let tableNo = this.tableId;
+        let tableColumns = JSON.stringify(this.showTableColumns);
+        this.columnSetDialogVisible = false;
+        this.$api.tableColumnAPI
+          .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
+          .then(res => {
+              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+              this.formTableData = [];
+              for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                      this.formTableData.push(arr[i]);
+                  }
+              }
+          })
+          .catch(r => {
+            console.log(r);
+          });
+      },
+      //关闭字段设置弹出
+      handleClose() {
+        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
+        this.columnSetDialogVisible = false;
+
+      },
+      /**
+       * 获取显示字段
+       */
+       getShowColumns() {
+        let tableNo = this.tableId;
+        this.formTableData = [];
+
+        this.$api.tableColumnAPI
+          .getShowColumns({tableNo:tableNo})
+          .then(res => {
+            if(res.code==0){
+              if(res.results){
+                this.showTableColumns = JSON.parse(res.results);
+                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+                for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                    this.formTableData.push(arr[i]);
+                  }
+                }
+                this.$forceUpdate();
+              }else{
+                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+                for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                    this.formTableData.push(arr[i]);
+                  }
+                }
+                this.$forceUpdate();
+              }
+            }else{
+              this.$message({
+                message: res.msg ? res.msg : "获取列表信息失败",
+                type: "error"
+              });
+            }
+
+          })
+          .catch(r => {
+            this.$message({
+              message: r,
+              type: "error"
+            });
+            console.log(r);
+          });
+      },
+
+      //显示默认部门
+    setDefaultDept(){
+        if(this.depOptions.length>0&&this.formData.deptId){
+          let id=JSON.stringify( this.formData.deptId)
+          let select_id=this.treeFindPath(this.depOptions,data=> data.id===id)
+          this.selectDeptId=JSON.parse(JSON.stringify(select_id))
+        }
+      },
+      // 选择部门
+      handleChange:function(value){
+        console.log(value)
+        this.formData.deptId=value.length>=1?value[value.length-1]:'';
+        this.selectDeptId=value;
+      },
+     // 合计
+     getSummaries(param){
+        const { columns, data } = param;
+        let sums=[];
+        columns.forEach((column, index) => { //计算不含税金额总计
+
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          if (column.property !== 'outCount'&&column.property!='count'&&column.property!='sellAmount') {
+            sums[index] = '';
+            return;
+          }
+
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = '';
+          }
+          if (column.property=='count') {
+            if(sums[index]) {
+              sums[index] = this.summary.totalCount
+            }
+            return;
+          }
+          if (column.property === 'outCount') {
+            if(sums[index]) {
+              sums[index] = this.summary.totalOutCount
+            }
+            return;
+          }
+          if (column.property=='sellAmount') {
+            if(sums[index]) {
+              sums[index] = this.summary.totalSellAmount
+            }
+            return;
+          }
+        });
+
+        return sums;
+      },
+
+
+
+    }
+  }
+
+</script>
+
+<style scoped>
+  >>>.sys-search .el-input__inner{
+    width: 100%;
+  }
+  .dialog-form{
+    position: relative;
+  }
+  .dialog-line{
+    position: relative;
+    display: flex;
+    justify-content: center;
+    width: 100%;
+  }
+  .dialog-line .dialog-form-inline{
+    position: relative;
+    width: 50%;
+    margin-right: 0;
+  }
+  .dialog-line  .dialog-form-inline-single{
+    position: relative;
+    width: 100%;
+    margin-right: 0;
+  }
+  >>>.dialog-line .el-input__inner{
+    width: 100% !important;;
+  }
+  >>>.dialog-line .el-form-item__content{
+    width: calc(100% - 80px) !important;;
+  }
+  >>>.dialog-line .el-input,>>>.dialog-line .el-cascader{
+    width: 100% !important;
+  }
+</style>
+
diff --git a/src/pages/scm/warehouse/otherStock/index.vue b/src/pages/scm/warehouse/otherStock/index.vue
index c850b6a..88bc2e4 100644
--- a/src/pages/scm/warehouse/otherStock/index.vue
+++ b/src/pages/scm/warehouse/otherStock/index.vue
@@ -1,900 +1,900 @@
-<template>
-  <div class="sys-box">
-    <div class="sys-operate">
-      <el-button type="primary" @click="goAdd()" v-has="'warehouse:otherStock:add'">新增</el-button>
-      <el-button type="primary" @click="remove()" :disabled="btnOtherDisabled" v-has="'warehouse:otherStock:remove'">删除</el-button>
-      <el-button type="primary" @click="exportExcel" v-has="'warehouse:otherStock:exportExcel'">导出</el-button>
-      <el-button type="primary" @click="audit" :disabled="btnDelDisabled" v-has="'warehouse:otherStock:audit'">审核</el-button>
-      <el-button type="primary" @click="disAudit" :disabled="btnDelDisabled" v-has="'warehouse:otherStock:disAudit'">反审核</el-button>
-      <el-button type="primary" @click="showColumnSetDialog">{{config.configureBtnName}}</el-button>
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class='form_item_input_out'>
-        <el-form-item label="单据编号" style='width:22%' class="form_item-inline">
-          <el-input v-model="search_data.inheadCode" placeholder="请输入单据编号" clearable ></el-input>
-        </el-form-item>
-        <el-form-item label="供应商"  style='width:22%' class="form_item-inline">
-          <el-input placeholder="模糊查询" v-model="search_data.sourceCompanyName" clearable></el-input>
-        </el-form-item>
-        <el-form-item label="物料" style='width:22%' class="form_item-inline">
-          <el-input v-model="search_data.materielName" placeholder="模糊查询" clearable ></el-input>
-        </el-form-item>
-        <el-form-item label="入库日期" style='width:34%' class="form_item-inline">
-          <el-date-picker
-            v-model="time"
-            type="daterange"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            range-separator="—"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          ></el-date-picker>
-        </el-form-item>
-      </div>
-      <div class='form_item_btn_out'>
-        <el-form-item>
-          <el-button type="primary" @click="search()">查询</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="moreSearch()">高级查询</el-button>
-        </el-form-item>
-      </div>
-      </el-form>
-    </div>
-
-    <div class="sys-table">
-      <el-table border
-      v-if="formTableData.length>0"
-      id="out-table"
-        ref="tb"
-        v-loading="pictLoading"
-        show-summary
-        :summary-method="getSummaries"
-        :data="tableData"
-        @selection-change="handleSelectionChange"
-        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
-      >
-      <el-table-column type="selection" width="55" align="center"></el-table-column>
-      <el-table-column v-for="(items,index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
-                         align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-                <div>
-                  <div v-if="items.prop_=='sourceCode'">
-                    <el-link type="primary" @click.stop="viewDetail(scope.row)">{{scope.row.sourceCode}}</el-link>
-                  </div>
-                  <div v-else-if="items.prop_=='inheadCode'">
-                    <el-link type="primary" @click.stop="gotoDetail(scope.row)">{{scope.row.inheadCode}}</el-link>
-                  </div>
-                  <div v-else>
-                    <div style="overflow:hidden">{{scope.row[items.prop_]}}</div>
-                  </div>
-                </div>
-              </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="search_data.pageno"
-        :page-sizes="pageSizes"
-        :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
-    </div>
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px" :before-close="handleClose">
-      <el-table border
-                :data="showTableColumns"
-                :key="Math.random()"
-                max-height="350"
-                style="width: 100%">
-        <el-table-column
-          prop="title"
-          label="列表名称"
-          width="180" fixed>
-        </el-table-column>
-        <el-table-column
-          prop="select"
-          label="是否显示"
-          width="180">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作"
-        >
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-    <!-- 高级查询 -->
-    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
-      <el-form :inline="true"
-               v-loading="dialogLoading"
-               label-width="80px"
-               class="dialog-form"
-               ref="form" style="width: 620px"
-      >
-        <div class="dialog-line">
-          <el-form-item label="入库时间"  class="dialog-form-inline-single">
-            <el-date-picker
-              v-model="formDataTime"
-              type="daterange"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              range-separator="—"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-            ></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="供应商" class="dialog-form-inline">
-
-            <btn-input :valueText.sync='formData.sourceCompanyName' :valueId.sync='formData.sourceCompany' :chooseVisible.sync='chooseSupplierVisible'></btn-input>
-          </el-form-item>
-
-          <el-form-item label="物料名称" class="dialog-form-inline">
-
-            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel' :chooseVisible.sync='chooseMaterielVisible'></btn-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="规格型号" class="dialog-form-inline">
-            <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="批次" class="dialog-form-inline">
-            <el-input placeholder="请输入批次" v-model="formData.batch" clearable></el-input>
-          </el-form-item>
-
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="审核状态" class="dialog-form-inline" clearable>
-            <el-select  clearable
-                        style="width:100%"
-                        v-model="formData.auditSign"
-                        placeholder="请选择"
-                        @change="changeFacility"
-            >
-              <el-option label="不限" value=""></el-option>
-              <el-option v-for="item in auditSignList" :label="item.name" :value="item.id" :key="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="入库员" class="dialog-form-inline">
-
-            <btn-input :valueText.sync='formData.operatorName' :valueId.sync='formData.operator' :chooseVisible.sync='chooseUserVisible'></btn-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="制单人" class="dialog-form-inline">
-
-            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy' :chooseVisible.sync='chooseUserVisible1'></btn-input>
-          </el-form-item>
-          <el-form-item label="制单日期" class="dialog-form-inline">
-            <el-date-picker style="width:194px;"
-                            v-model="formData.createTime"
-                            type="date"
-                            format="yyyy-MM-dd"
-                            range-separator="—"
-                            placeholder="选择日期"
-                            value-format="yyyy-MM-dd"
-            ></el-date-picker>
-          </el-form-item>
-        </div>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">确定</el-button>
-        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
-        <el-button type="primary" @click="clear">清空</el-button>
-      </span>
-    </el-dialog>
-    <!--    选择入库员-->
-   <dialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser" ></dialogChooseSingleUser>
-   <!--    选择制单人-->
-   <dialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1" ></dialogChooseSingleUser1>
-   <!--    选择物料-->
-   <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel" ></dialogChooseSingleParts>
-   <!--    选择供应商-->
-   <dialogChooseSingleSupplier :visible.sync="chooseSupplierVisible" @change="getSupplier" ></dialogChooseSingleSupplier>
-  </div>
-</template>
-
-<script>
-import dialogChooseSingleSupplier from "@/components/System/dialogChooseSingleSuppliers";
-import btnInput from "@/components/btnInput.vue";
-import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-import dialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
-import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
-import {mapState, mapActions, mapGetters} from "vuex";
-import FileSaver from 'file-saver'
-import config from "@/utils/config.js";
-export default {
-  components: {
-      btnInput,dialogChooseSingleUser,dialogChooseSingleParts,dialogChooseSingleSupplier,dialogChooseSingleUser1
-    },
-  data() {
-    return {
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10,
-        startTime: "",
-        endTime: "",
-        inheadCode: '',
-        materielName: '',
-        sourceCompanyName: '',
-      },
-      summary: {},
-      tableData: [],
-      otherStockIds: [],
-      inOutTime: '',
-      dialogTitle: "",
-      time: "",
-      selectDeptId:'',
-      formDataTime: "",
-      auditSignList: [],
-      companyList: [],
-      createByList: [],
-      depOptions: [],
-      formData: {
-        createBy: "",//制单人id
-          createByName:"",
-      },
-      config: config,
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      dialogLoading: false,
-      chooseUserVisible1: false,
-      chooseUserVisible: false,
-      chooseMaterielVisible: false,
-      columnSetDialogVisible: false,
-      advanceQueryDialogVisible: false,
-      chooseSupplierVisible:false,//选择供应商
-      columnSetDialogTitle: "设置显示字段列表",
-      tableId: 'other_stock_index_table',
-      pictLoading: false,
-      //默认列表数据
-      showTableColumnsDefault: [
-        {title: "入库日期", prop_: "inOutTime", select: true},
-        {title: "单据编号", prop_: "inheadCode", select: true},
-        {title: "物料代码", prop_: "serialno", select: true},
-        {title: "物料名称", prop_: "materielName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "供应商", prop_: "sourceCompanyName", select: true},
-        {title: "批号", prop_: "batch", select: true},
-        {title: "主计量单位", prop_: "unitName", select: true},
-        {title: "主单位数量", prop_: "count", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "入库数量", prop_: "inCount", select: true},
-        {title: "单价（元）", prop_: "unitPrice", select: true},
-        {title: "金额（元）", prop_: "amount", select: true},
-        {title: "仓库", prop_: "warehouseName", select: true},
-        {title: "仓位", prop_: "warehLocationName", select: true},
-        {title: "审核状态", prop_: "auditSignName", select: true},
-      ],
-      ///弹出页面列表数据
-      showTableColumns: [
-      {title: "入库日期", prop_: "inOutTime", select: true},
-        {title: "单据编号", prop_: "inheadCode", select: true},
-        {title: "物料代码", prop_: "serialno", select: true},
-        {title: "物料名称", prop_: "materielName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "供应商", prop_: "sourceCompanyName", select: true},
-        {title: "批号", prop_: "batch", select: true},
-        {title: "主计量单位", prop_: "unitName", select: true},
-        {title: "主单位数量", prop_: "count", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "入库数量", prop_: "inCount", select: true},
-        {title: "单价（元）", prop_: "unitPrice", select: true},
-        {title: "金额（元）", prop_: "amount", select: true},
-        {title: "仓库", prop_: "warehouseName", select: true},
-        {title: "仓位", prop_: "warehLocationName", select: true},
-        {title: "审核状态", prop_: "auditSignName", select: true},
-      ],
-      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
-      //显示的列表字段
-      formTableData: [],
-    }
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search()
-      }
-    }
-  },
-  computed: {
-    ...mapGetters({
-      userInfo: "user/getUserInfo"
-    }),
-  },
-  mounted() {
-    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.formData.createBy = this.userInfo.userId;
-    this.formData.createByName =this.userInfo.name
-    let t = new Date();
-    this.$set(this.formData,'createTime',t.getFullYear() + '-' + this.settime((t.getMonth() + 1)) + '-' + this.settime(t.getDate()))
-    this.getList()
-    this.getTypeList();
-    this.getShowColumns();
-    this.initialize();
-  },
-  methods: {
-    /**
-       * 查看源单明细
-       */
-      viewDetail(r) {
-          let queryId = r.queryId
-        this.$router.push({ path: '/warehouse/inventoryRecord', query: {id:queryId,t: Date.now() } })
-      },
-    /**
-       * 初始化数据
-       */
-       initialize() {
-        Promise.all([this.$api.commonAPI.getDeptsTree()])
-          .then(([r1]) => {
-            if (r1.code === 0) {
-              this.depOptions=r1.data.children;
-              this.setDeptList(this.depOptions);
-            }
-          })
-          .catch(error => {
-            console.log(error);
-          });
-        if (this.formData.userId) {
-          this.loading = true;
-          this.$api.userAPI.detail(this.formData.userId).then(res => {
-            this.loading = false;
-            if (res.code === 0) {
-              this.formData = Object.assign({}, this.formData, res.user);
-              this.setDefaultDept();
-
-
-
-            }
-          });
-        }
-      },
-      //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
-      setDeptList(tree){
-        for (const data of tree) {
-          if(!data.hasChildren){
-            data.children=undefined;
-          }else{
-            this.setDeptList(data.children)
-          }
-        }
-
-      },
-
-      getTypeList() {
-        Promise.all([
-          this.$api.gylCommonAPI.getUsers(),
-          this.$api.gylCommonAPI
-            .getDictsByType({type: "audit_status"}),
-          this.$api.gylInventoryAPI
-            .getDepts()
-        ])
-          .then(([r1, r2, r3]) => {
-            if (r1.code === 0) {
-              this.createByList = r1.datas;
-            }
-            if (r2.code === 0) {
-              this.auditSignList = r2.datas;
-            }
-            if (r3.code === 0) {
-              this.companyList = r3.datas;
-            }
-          })
-          .catch(error => {
-            console.log(error);
-          });
-      },
-      /**
-       * 获取选择的用户
-       */
-       getUser(val){
-
-          if (val) {
-            this.$set(this.formData,'operatorName',val.name)
-            this.$set(this.formData,'operator',val.id)
-          }else{
-            this.$set(this.formData,'operatorName',"")
-            this.$set(this.formData,'operator',"")
-          }
-
-
-      },
-      getUser1(val) {
-        if (val) {
-            this.$set(this.formData,'createByName',val.name)
-            this.$set(this.formData,'createBy',val.id)
-          }else{
-            this.$set(this.formData,'createByName',"")
-            this.$set(this.formData,'createBy',"")
-          }
-      },
-      getSupplier(val){
-        if (val) {
-          this.$set(this.formData,'sourceCompany',val.id)
-          this.$set(this.formData,'sourceCompanyName',val.name)
-        }else{
-          this.$set(this.formData,'sourceCompany',"")
-          this.$set(this.formData,'sourceCompanyName',"")
-        }
-      },
-      getMateriel(val){
-        if (val) {
-          this.$set(this.formData,'materiel',val.id)
-          this.$set(this.formData,'materielName',val.name)
-        }else{
-          this.$set(this.formData,'materiel',"")
-          this.$set(this.formData,'materielName',"")
-        }
-      },
-      //简单搜索时申请人改变
-      changeoperatorName(){
-        this.search_data.operator="";
-      },
-      settime(n) {
-        if (n.toString().length == 1) {
-          return "0" + n.toString()
-        } else {
-          return n;
-        }
-      },
-    // 查询
-    search() {
-        this.search_data.pageno = 1;
-        this.search_data.pagesize = 10;
-        this.getList();
-      },
-    /**
-     * 高级查询
-     */
-      moreSearch() {
-      this.advanceQueryDialogVisible = true;
-      this.$set(this.formData,'operator',this.search_data.operator?this.search_data.operator:"")
-      this.$set(this.formData,'operatorName',this.search_data.operatorName?this.search_data.operatorName:"")
-      this.formDataTime=this.time
-      this.dialogTitle = "高级查询";
-      },
-      save() {
-        for (var n in this.formData) {
-          this.search_data[n] = this.formData[n];
-        }
-        this.search_data.inOutTime = "";
-        this.time = this.formDataTime;
-        this.search_data.pageno = 1;
-        this.$nextTick(function () {
-          this.advanceQueryDialogVisible = false;
-          this.getList();
-        })
-      },
-      //清空
-      clear() {
-        for (var n in this.formData) {
-          this.formData[n] = '';
-        }
-        this.$forceUpdate()
-        this.formDataTime = "";
-        this.search_data.createTime = "";
-
-      },
-      changeFacility() {
-        this.$forceUpdate();
-      },
-
-      showUser(n){
-        this.user_type=n;
-        this.chooseUserVisible=true;
-      },
-    // 生产入库列表
-    getList() {
-        this.pictLoading = true;
-        this.$api.otherStockAPI
-        .getOtherStockList(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if(res.data) {
-            this.summary = res.data
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-            this.tableData.forEach(item => {
-              item.inOutTime = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.inOutTime)[0]
-            })
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        }).catch(r => {
-            console.log(r);
-          });
-      },
-    // 前往详情页
-    gotoDetail(row) {
-        this.$router.push({ path: '/warehouse/otherStock_add', query: { id: row.id,t: Date.now() } })
-      },
-    // 前往新增页面
-    goAdd() {
-      this.$router.push({ path: '/warehouse/otherStock_add', query: {t: Date.now() } })
-      },
-    // 导出
-    exportExcel() {
-      delete this.search_data.pagesize
-       delete this.search_data.pageno
-        this.$api.otherStockAPI
-        .exportExcel(this.search_data)
-        .then(res => {
-          console.log(res)
-        })
-    },
-    // 审核
-    audit() {
-        let id = this.otherStockIds[0].id
-        this.$confirm("确认审核选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.otherStockAPI
-          .auditStatusChange({inHeadId: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                  message: res.msg,
-                  type: "success"
-                })
-                this. getList();
-            } else {
-              this.$message({
-                  message: res.msg,
-                  type: "error"
-                })
-            }
-          })
-        })
-
-      },
-
-      // 反审核
-      disAudit() {
-        let id = this.otherStockIds[0].id
-        this.$confirm("确认反审核选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.otherStockAPI
-          .reverseAuditChange({inHeadId: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                  message: res.msg,
-                  type: "success"
-                })
-                this. getList();
-            } else {
-              this.$message({
-                  message: res.msg,
-                  type: "error"
-                })
-            }
-          })
-        })
-
-      },
-      /**
-       * 删除
-       */
-       remove() {
-        let ids = [];
-          this.otherStockIds.forEach(item => {
-            ids.push(item.id)
-          })
-        this.$confirm("确认删除选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.otherStockAPI
-            .deletAllStock({inHeadIds: ids})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "删除失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "删除失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      },
-       /**
-       * 处理选中
-       */
-       handleSelectionChange(val) {
-         console.log(val)
-        this.otherStockIds= val;
-        this.setBtn(val);
-      },
-
-       // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-
-     /**
-     * 控件操作按钮状态
-     */
-     setBtn(val) {
-        let isFlag = true;
-        let isDelFlag = true;
-        if (val.length > 0) {
-          isDelFlag = false;
-          if (val.length == 1) {
-            isFlag = false;
-          }
-        } else {
-          isFlag = true;
-          isDelFlag = true;
-        }
-        this.btnOtherDisabled = isDelFlag;
-        this.btnDelDisabled = isFlag;
-      },
-       //设置显示字段
-    showColumnSetDialog() {
-        this.columnSetDialogVisible = true;
-        this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-      },
-      //前移
-      toUp(scope) {
-        if (scope.$index == 0) {
-          return false;
-        }
-        let n;
-        for (let i = 0; i < this.showTableColumns.length; i++) {
-          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-            n = i;
-          }
-        }
-        let temp = this.showTableColumns[n];
-        this.showTableColumns[n] = this.showTableColumns[n - 1];
-        this.showTableColumns[n - 1] = temp;
-        this.$forceUpdate();
-      },
-      //后移
-      toDown(scope) {
-        if (scope.$index == this.showTableColumns.length - 1) {
-          return false;
-        }
-        let n;
-        for (let i = 0; i < this.showTableColumns.length; i++) {
-          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-            n = i;
-          }
-        }
-        let temp = this.showTableColumns[n];
-        this.showTableColumns[n] = this.showTableColumns[n + 1];
-        this.showTableColumns[n + 1] = temp;
-        this.$forceUpdate();
-      },
-      //恢复默认
-      toDefault() {
-        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-        this.$forceUpdate();
-      },
-      //完成列表字段设置
-      saveAndCloseColumnSetDialog() {
-        let tableNo = this.tableId;
-        let tableColumns = JSON.stringify(this.showTableColumns);
-        this.columnSetDialogVisible = false;
-        this.$api.tableColumnAPI
-          .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
-          .then(res => {
-              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-              this.formTableData = [];
-              for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                      this.formTableData.push(arr[i]);
-                  }
-              }
-          })
-          .catch(r => {
-            console.log(r);
-          });
-      },
-      //关闭字段设置弹出
-      handleClose() {
-        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
-        this.columnSetDialogVisible = false;
-
-      },
-      /**
-       * 获取显示字段
-       */
-       getShowColumns() {
-        let tableNo = this.tableId;
-        this.formTableData = [];
-
-        this.$api.tableColumnAPI
-          .getShowColumns({tableNo:tableNo})
-          .then(res => {
-            if(res.code==0){
-              if(res.results){
-                this.showTableColumns = JSON.parse(res.results);
-                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-                for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                    this.formTableData.push(arr[i]);
-                  }
-                }
-                this.$forceUpdate();
-              }else{
-                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-                for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                    this.formTableData.push(arr[i]);
-                  }
-                }
-                this.$forceUpdate();
-              }
-            }else{
-              this.$message({
-                message: res.msg ? res.msg : "获取列表信息失败",
-                type: "error"
-              });
-            }
-
-          })
-          .catch(r => {
-            this.$message({
-              message: r,
-              type: "error"
-            });
-            console.log(r);
-          });
-      },
-      // 合计
-      getSummaries(param){
-        const { columns, data } = param;
-        let sums=[];
-        columns.forEach((column, index) => { //计算不含税金额总计
-
-          if (index === 0) {
-            sums[index] = '合计';
-            return;
-          }
-          if (column.property !== 'inCount' && column.property!='count'&&column.property!='amount') {
-            sums[index] = '';
-            return;
-          }
-
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-          } else {
-            sums[index] = '';
-          }
-          if (column.property=='count') {
-            if(sums[index]) {
-              sums[index] = this.summary.toatalCount
-            }
-            return;
-          }
-          if (column.property === 'inCount') {
-            if(sums[index]) {
-              sums[index] = this.summary.totalInCount
-            }
-            return;
-          }
-          if (column.property=='amount') {
-            if(sums[index]) {
-              sums[index] = this.summary.toatalAmount.toFixed(2)
-            }
-            return;
-          }
-        });
-
-        return sums;
-      },
-
-  },
-  watch: {
-      time(val) {
-        if (val) {
-          this.search_data.startTime = val[0];
-          this.search_data.endTime = val[1];
-        } else {
-          this.search_data.startTime = "";
-          this.search_data.endTime = "";
-        }
-
-      },
-      formDataTime(val) {
-        if (val) {
-          this.formData.startTime = val[0];
-          this.formData.endTime = val[1];
-        } else {
-          this.formData.startTime = "";
-          this.formData.endTime = "";
-        }
-
-      },
-
-    }
-}
-</script>
-
-<style scoped>
-  >>>.sys-search .el-input__inner{
-    width: 100%;
-  }
-  .dialog-form{
-    position: relative;
-  }
-  .dialog-line{
-    position: relative;
-    display: flex;
-    justify-content: center;
-    width: 100%;
-  }
-  .dialog-line .dialog-form-inline{
-    position: relative;
-    width: 50%;
-    margin-right: 0;
-  }
-  .dialog-line  .dialog-form-inline-single{
-    position: relative;
-    width: 100%;
-    margin-right: 0;
-  }
-  >>>.dialog-line .el-input__inner{
-    width: 100% !important;;
-  }
-  >>>.dialog-line .el-form-item__content{
-    width: calc(100% - 80px) !important;;
-  }
-  >>>.dialog-line .el-input,>>>.dialog-line .el-cascader{
-    width: 100% !important;
-  }
-</style>
-
+<template>
+  <div class="sys-box">
+    <div class="sys-operate">
+      <el-button type="primary" @click="goAdd()" v-has="'warehouse:otherStock:add'">新增</el-button>
+      <el-button type="primary" @click="remove()" :disabled="btnOtherDisabled" v-has="'warehouse:otherStock:remove'">删除</el-button>
+      <el-button type="primary" @click="exportExcel" v-has="'warehouse:otherStock:exportExcel'">导出</el-button>
+      <el-button type="primary" @click="audit" :disabled="btnDelDisabled" v-has="'warehouse:otherStock:audit'">审核</el-button>
+      <el-button type="primary" @click="disAudit" :disabled="btnDelDisabled" v-has="'warehouse:otherStock:disAudit'">反审核</el-button>
+      <el-button type="primary" @click="showColumnSetDialog">{{config.configureBtnName}}</el-button>
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class='form_item_input_out'>
+        <el-form-item label="单据编号" style='width:22%' class="form_item-inline">
+          <el-input v-model="search_data.inheadCode" placeholder="请输入单据编号" clearable ></el-input>
+        </el-form-item>
+        <el-form-item label="供应商"  style='width:22%' class="form_item-inline">
+          <el-input placeholder="模糊查询" v-model="search_data.sourceCompanyName" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="物料" style='width:22%' class="form_item-inline">
+          <el-input v-model="search_data.materielName" placeholder="模糊查询" clearable ></el-input>
+        </el-form-item>
+        <el-form-item label="入库日期" style='width:34%' class="form_item-inline">
+          <el-date-picker
+            v-model="time"
+            type="daterange"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            range-separator="—"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+          ></el-date-picker>
+        </el-form-item>
+      </div>
+      <div class='form_item_btn_out'>
+        <el-form-item>
+          <el-button type="primary" @click="search()">查询</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="moreSearch()">高级查询</el-button>
+        </el-form-item>
+      </div>
+      </el-form>
+    </div>
+
+    <div class="sys-table">
+      <el-table border
+      v-if="formTableData.length>0"
+      id="out-table"
+        ref="tb"
+        v-loading="pictLoading"
+        show-summary
+        :summary-method="getSummaries"
+        :data="tableData"
+        @selection-change="handleSelectionChange"
+        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
+      >
+      <el-table-column type="selection" width="55" align="center"></el-table-column>
+      <el-table-column v-for="(items,index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
+                         align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+                <div>
+                  <div v-if="items.prop_=='sourceCode'">
+                    <el-link type="primary" @click.stop="viewDetail(scope.row)">{{scope.row.sourceCode}}</el-link>
+                  </div>
+                  <div v-else-if="items.prop_=='inheadCode'">
+                    <el-link type="primary" @click.stop="gotoDetail(scope.row)">{{scope.row.inheadCode}}</el-link>
+                  </div>
+                  <div v-else>
+                    <div style="overflow:hidden">{{scope.row[items.prop_]}}</div>
+                  </div>
+                </div>
+              </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="search_data.pageno"
+        :page-sizes="pageSizes"
+        :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px" :before-close="handleClose">
+      <el-table border
+                :data="showTableColumns"
+                :key="Math.random()"
+                max-height="350"
+                style="width: 100%">
+        <el-table-column
+          prop="title"
+          label="列表名称"
+          width="180" fixed>
+        </el-table-column>
+        <el-table-column
+          prop="select"
+          label="是否显示"
+          width="180">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+    <!-- 高级查询 -->
+    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
+      <el-form :inline="true"
+               v-loading="dialogLoading"
+               label-width="80px"
+               class="dialog-form"
+               ref="form" style="width: 620px"
+      >
+        <div class="dialog-line">
+          <el-form-item label="入库时间"  class="dialog-form-inline-single">
+            <el-date-picker
+              v-model="formDataTime"
+              type="daterange"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              range-separator="—"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="供应商" class="dialog-form-inline">
+
+            <btn-input :valueText.sync='formData.sourceCompanyName' :valueId.sync='formData.sourceCompany' :chooseVisible.sync='chooseSupplierVisible'></btn-input>
+          </el-form-item>
+
+          <el-form-item label="物料名称" class="dialog-form-inline">
+
+            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel' :chooseVisible.sync='chooseMaterielVisible'></btn-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="规格型号" class="dialog-form-inline">
+            <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="批次" class="dialog-form-inline">
+            <el-input placeholder="请输入批次" v-model="formData.batch" clearable></el-input>
+          </el-form-item>
+
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="审核状态" class="dialog-form-inline" clearable>
+            <el-select  clearable
+                        style="width:100%"
+                        v-model="formData.auditSign"
+                        placeholder="请选择"
+                        @change="changeFacility"
+            >
+              <el-option label="不限" value=""></el-option>
+              <el-option v-for="item in auditSignList" :label="item.name" :value="item.id" :key="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="入库员" class="dialog-form-inline">
+
+            <btn-input :valueText.sync='formData.operatorName' :valueId.sync='formData.operator' :chooseVisible.sync='chooseUserVisible'></btn-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="制单人" class="dialog-form-inline">
+
+            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy' :chooseVisible.sync='chooseUserVisible1'></btn-input>
+          </el-form-item>
+          <el-form-item label="制单日期" class="dialog-form-inline">
+            <el-date-picker style="width:194px;"
+                            v-model="formData.createTime"
+                            type="date"
+                            format="yyyy-MM-dd"
+                            range-separator="—"
+                            placeholder="选择日期"
+                            value-format="yyyy-MM-dd"
+            ></el-date-picker>
+          </el-form-item>
+        </div>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">确定</el-button>
+        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="clear">清空</el-button>
+      </span>
+    </el-dialog>
+    <!--    选择入库员-->
+   <dialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser" ></dialogChooseSingleUser>
+   <!--    选择制单人-->
+   <dialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1" ></dialogChooseSingleUser1>
+   <!--    选择物料-->
+   <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel" ></dialogChooseSingleParts>
+   <!--    选择供应商-->
+   <dialogChooseSingleSupplier :visible.sync="chooseSupplierVisible" @change="getSupplier" ></dialogChooseSingleSupplier>
+  </div>
+</template>
+
+<script>
+import dialogChooseSingleSupplier from "@/components/System/dialogChooseSingleSuppliers";
+import btnInput from "@/components/btnInput.vue";
+import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+import dialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
+import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
+import {mapState, mapActions, mapGetters} from "vuex";
+import FileSaver from 'file-saver'
+import config from "@/utils/config.js";
+export default {
+  components: {
+      btnInput,dialogChooseSingleUser,dialogChooseSingleParts,dialogChooseSingleSupplier,dialogChooseSingleUser1
+    },
+  data() {
+    return {
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10,
+        startTime: "",
+        endTime: "",
+        inheadCode: '',
+        materielName: '',
+        sourceCompanyName: '',
+      },
+      summary: {},
+      tableData: [],
+      otherStockIds: [],
+      inOutTime: '',
+      dialogTitle: "",
+      time: "",
+      selectDeptId:'',
+      formDataTime: "",
+      auditSignList: [],
+      companyList: [],
+      createByList: [],
+      depOptions: [],
+      formData: {
+        createBy: "",//制单人id
+          createByName:"",
+      },
+      config: config,
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      dialogLoading: false,
+      chooseUserVisible1: false,
+      chooseUserVisible: false,
+      chooseMaterielVisible: false,
+      columnSetDialogVisible: false,
+      advanceQueryDialogVisible: false,
+      chooseSupplierVisible:false,//选择供应商
+      columnSetDialogTitle: "设置显示字段列表",
+      tableId: 'other_stock_index_table',
+      pictLoading: false,
+      //默认列表数据
+      showTableColumnsDefault: [
+        {title: "入库日期", prop_: "inOutTime", select: true},
+        {title: "单据编号", prop_: "inheadCode", select: true},
+        {title: "物料代码", prop_: "serialno", select: true},
+        {title: "物料名称", prop_: "materielName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "供应商", prop_: "sourceCompanyName", select: false},
+        {title: "批号", prop_: "batch", select: false},
+        {title: "主计量单位", prop_: "unitName", select: true},
+        {title: "主单位数量", prop_: "count", select: false},
+        {title: "辅助单位", prop_: "supportUomName", select: false},
+        {title: "入库数量", prop_: "inCount", select: true},
+        {title: "单价（元）", prop_: "unitPrice", select: false},
+        {title: "金额（元）", prop_: "amount", select: false},
+        {title: "仓库", prop_: "warehouseName", select: true},
+        {title: "仓位", prop_: "warehLocationName", select: false},
+        {title: "审核状态", prop_: "auditSignName", select: true},
+      ],
+      ///弹出页面列表数据
+      showTableColumns: [
+        {title: "入库日期", prop_: "inOutTime", select: true},
+        {title: "单据编号", prop_: "inheadCode", select: true},
+        {title: "物料代码", prop_: "serialno", select: true},
+        {title: "物料名称", prop_: "materielName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "供应商", prop_: "sourceCompanyName", select: false},
+        {title: "批号", prop_: "batch", select: false},
+        {title: "主计量单位", prop_: "unitName", select: true},
+        {title: "主单位数量", prop_: "count", select: false},
+        {title: "辅助单位", prop_: "supportUomName", select: false},
+        {title: "入库数量", prop_: "inCount", select: true},
+        {title: "单价（元）", prop_: "unitPrice", select: false},
+        {title: "金额（元）", prop_: "amount", select: false},
+        {title: "仓库", prop_: "warehouseName", select: true},
+        {title: "仓位", prop_: "warehLocationName", select: false},
+        {title: "审核状态", prop_: "auditSignName", select: true},
+      ],
+      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
+      //显示的列表字段
+      formTableData: [],
+    }
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search()
+      }
+    }
+  },
+  computed: {
+    ...mapGetters({
+      userInfo: "user/getUserInfo"
+    }),
+  },
+  mounted() {
+    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.formData.createBy = this.userInfo.userId;
+    this.formData.createByName =this.userInfo.name
+    let t = new Date();
+    this.$set(this.formData,'createTime',t.getFullYear() + '-' + this.settime((t.getMonth() + 1)) + '-' + this.settime(t.getDate()))
+    this.getList()
+    this.getTypeList();
+    this.getShowColumns();
+    this.initialize();
+  },
+  methods: {
+    /**
+       * 查看源单明细
+       */
+      viewDetail(r) {
+          let queryId = r.queryId
+        this.$router.push({ path: '/warehouse/inventoryRecord', query: {id:queryId,t: Date.now() } })
+      },
+    /**
+       * 初始化数据
+       */
+       initialize() {
+        Promise.all([this.$api.commonAPI.getDeptsTree()])
+          .then(([r1]) => {
+            if (r1.code === 0) {
+              this.depOptions=r1.data.children;
+              this.setDeptList(this.depOptions);
+            }
+          })
+          .catch(error => {
+            console.log(error);
+          });
+        if (this.formData.userId) {
+          this.loading = true;
+          this.$api.userAPI.detail(this.formData.userId).then(res => {
+            this.loading = false;
+            if (res.code === 0) {
+              this.formData = Object.assign({}, this.formData, res.user);
+              this.setDefaultDept();
+
+
+
+            }
+          });
+        }
+      },
+      //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
+      setDeptList(tree){
+        for (const data of tree) {
+          if(!data.hasChildren){
+            data.children=undefined;
+          }else{
+            this.setDeptList(data.children)
+          }
+        }
+
+      },
+
+      getTypeList() {
+        Promise.all([
+          this.$api.gylCommonAPI.getUsers(),
+          this.$api.gylCommonAPI
+            .getDictsByType({type: "audit_status"}),
+          this.$api.gylInventoryAPI
+            .getDepts()
+        ])
+          .then(([r1, r2, r3]) => {
+            if (r1.code === 0) {
+              this.createByList = r1.datas;
+            }
+            if (r2.code === 0) {
+              this.auditSignList = r2.datas;
+            }
+            if (r3.code === 0) {
+              this.companyList = r3.datas;
+            }
+          })
+          .catch(error => {
+            console.log(error);
+          });
+      },
+      /**
+       * 获取选择的用户
+       */
+       getUser(val){
+
+          if (val) {
+            this.$set(this.formData,'operatorName',val.name)
+            this.$set(this.formData,'operator',val.id)
+          }else{
+            this.$set(this.formData,'operatorName',"")
+            this.$set(this.formData,'operator',"")
+          }
+
+
+      },
+      getUser1(val) {
+        if (val) {
+            this.$set(this.formData,'createByName',val.name)
+            this.$set(this.formData,'createBy',val.id)
+          }else{
+            this.$set(this.formData,'createByName',"")
+            this.$set(this.formData,'createBy',"")
+          }
+      },
+      getSupplier(val){
+        if (val) {
+          this.$set(this.formData,'sourceCompany',val.id)
+          this.$set(this.formData,'sourceCompanyName',val.name)
+        }else{
+          this.$set(this.formData,'sourceCompany',"")
+          this.$set(this.formData,'sourceCompanyName',"")
+        }
+      },
+      getMateriel(val){
+        if (val) {
+          this.$set(this.formData,'materiel',val.id)
+          this.$set(this.formData,'materielName',val.name)
+        }else{
+          this.$set(this.formData,'materiel',"")
+          this.$set(this.formData,'materielName',"")
+        }
+      },
+      //简单搜索时申请人改变
+      changeoperatorName(){
+        this.search_data.operator="";
+      },
+      settime(n) {
+        if (n.toString().length == 1) {
+          return "0" + n.toString()
+        } else {
+          return n;
+        }
+      },
+    // 查询
+    search() {
+        this.search_data.pageno = 1;
+        this.search_data.pagesize = 10;
+        this.getList();
+      },
+    /**
+     * 高级查询
+     */
+      moreSearch() {
+      this.advanceQueryDialogVisible = true;
+      this.$set(this.formData,'operator',this.search_data.operator?this.search_data.operator:"")
+      this.$set(this.formData,'operatorName',this.search_data.operatorName?this.search_data.operatorName:"")
+      this.formDataTime=this.time
+      this.dialogTitle = "高级查询";
+      },
+      save() {
+        for (var n in this.formData) {
+          this.search_data[n] = this.formData[n];
+        }
+        this.search_data.inOutTime = "";
+        this.time = this.formDataTime;
+        this.search_data.pageno = 1;
+        this.$nextTick(function () {
+          this.advanceQueryDialogVisible = false;
+          this.getList();
+        })
+      },
+      //清空
+      clear() {
+        for (var n in this.formData) {
+          this.formData[n] = '';
+        }
+        this.$forceUpdate()
+        this.formDataTime = "";
+        this.search_data.createTime = "";
+
+      },
+      changeFacility() {
+        this.$forceUpdate();
+      },
+
+      showUser(n){
+        this.user_type=n;
+        this.chooseUserVisible=true;
+      },
+    // 生产入库列表
+    getList() {
+        this.pictLoading = true;
+        this.$api.otherStockAPI
+        .getOtherStockList(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if(res.data) {
+            this.summary = res.data
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+            this.tableData.forEach(item => {
+              item.inOutTime = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.inOutTime)[0]
+            })
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        }).catch(r => {
+            console.log(r);
+          });
+      },
+    // 前往详情页
+    gotoDetail(row) {
+        this.$router.push({ path: '/warehouse/otherStock_add', query: { id: row.id,t: Date.now() } })
+      },
+    // 前往新增页面
+    goAdd() {
+      this.$router.push({ path: '/warehouse/otherStock_add', query: {t: Date.now() } })
+      },
+    // 导出
+    exportExcel() {
+      delete this.search_data.pagesize
+       delete this.search_data.pageno
+        this.$api.otherStockAPI
+        .exportExcel(this.search_data)
+        .then(res => {
+          console.log(res)
+        })
+    },
+    // 审核
+    audit() {
+        let id = this.otherStockIds[0].id
+        this.$confirm("确认审核选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.otherStockAPI
+          .auditStatusChange({inHeadId: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                  message: res.msg,
+                  type: "success"
+                })
+                this. getList();
+            } else {
+              this.$message({
+                  message: res.msg,
+                  type: "error"
+                })
+            }
+          })
+        })
+
+      },
+
+      // 反审核
+      disAudit() {
+        let id = this.otherStockIds[0].id
+        this.$confirm("确认反审核选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.otherStockAPI
+          .reverseAuditChange({inHeadId: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                  message: res.msg,
+                  type: "success"
+                })
+                this. getList();
+            } else {
+              this.$message({
+                  message: res.msg,
+                  type: "error"
+                })
+            }
+          })
+        })
+
+      },
+      /**
+       * 删除
+       */
+       remove() {
+        let ids = [];
+          this.otherStockIds.forEach(item => {
+            ids.push(item.id)
+          })
+        this.$confirm("确认删除选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.otherStockAPI
+            .deletAllStock({inHeadIds: ids})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "删除失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "删除失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      },
+       /**
+       * 处理选中
+       */
+       handleSelectionChange(val) {
+         console.log(val)
+        this.otherStockIds= val;
+        this.setBtn(val);
+      },
+
+       // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+
+     /**
+     * 控件操作按钮状态
+     */
+     setBtn(val) {
+        let isFlag = true;
+        let isDelFlag = true;
+        if (val.length > 0) {
+          isDelFlag = false;
+          if (val.length == 1) {
+            isFlag = false;
+          }
+        } else {
+          isFlag = true;
+          isDelFlag = true;
+        }
+        this.btnOtherDisabled = isDelFlag;
+        this.btnDelDisabled = isFlag;
+      },
+       //设置显示字段
+    showColumnSetDialog() {
+        this.columnSetDialogVisible = true;
+        this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+      },
+      //前移
+      toUp(scope) {
+        if (scope.$index == 0) {
+          return false;
+        }
+        let n;
+        for (let i = 0; i < this.showTableColumns.length; i++) {
+          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+            n = i;
+          }
+        }
+        let temp = this.showTableColumns[n];
+        this.showTableColumns[n] = this.showTableColumns[n - 1];
+        this.showTableColumns[n - 1] = temp;
+        this.$forceUpdate();
+      },
+      //后移
+      toDown(scope) {
+        if (scope.$index == this.showTableColumns.length - 1) {
+          return false;
+        }
+        let n;
+        for (let i = 0; i < this.showTableColumns.length; i++) {
+          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+            n = i;
+          }
+        }
+        let temp = this.showTableColumns[n];
+        this.showTableColumns[n] = this.showTableColumns[n + 1];
+        this.showTableColumns[n + 1] = temp;
+        this.$forceUpdate();
+      },
+      //恢复默认
+      toDefault() {
+        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+        this.$forceUpdate();
+      },
+      //完成列表字段设置
+      saveAndCloseColumnSetDialog() {
+        let tableNo = this.tableId;
+        let tableColumns = JSON.stringify(this.showTableColumns);
+        this.columnSetDialogVisible = false;
+        this.$api.tableColumnAPI
+          .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
+          .then(res => {
+              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+              this.formTableData = [];
+              for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                      this.formTableData.push(arr[i]);
+                  }
+              }
+          })
+          .catch(r => {
+            console.log(r);
+          });
+      },
+      //关闭字段设置弹出
+      handleClose() {
+        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
+        this.columnSetDialogVisible = false;
+
+      },
+      /**
+       * 获取显示字段
+       */
+       getShowColumns() {
+        let tableNo = this.tableId;
+        this.formTableData = [];
+
+        this.$api.tableColumnAPI
+          .getShowColumns({tableNo:tableNo})
+          .then(res => {
+            if(res.code==0){
+              if(res.results){
+                this.showTableColumns = JSON.parse(res.results);
+                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+                for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                    this.formTableData.push(arr[i]);
+                  }
+                }
+                this.$forceUpdate();
+              }else{
+                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+                for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                    this.formTableData.push(arr[i]);
+                  }
+                }
+                this.$forceUpdate();
+              }
+            }else{
+              this.$message({
+                message: res.msg ? res.msg : "获取列表信息失败",
+                type: "error"
+              });
+            }
+
+          })
+          .catch(r => {
+            this.$message({
+              message: r,
+              type: "error"
+            });
+            console.log(r);
+          });
+      },
+      // 合计
+      getSummaries(param){
+        const { columns, data } = param;
+        let sums=[];
+        columns.forEach((column, index) => { //计算不含税金额总计
+
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          if (column.property !== 'inCount' && column.property!='count'&&column.property!='amount') {
+            sums[index] = '';
+            return;
+          }
+
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = '';
+          }
+          if (column.property=='count') {
+            if(sums[index]) {
+              sums[index] = this.summary.toatalCount
+            }
+            return;
+          }
+          if (column.property === 'inCount') {
+            if(sums[index]) {
+              sums[index] = this.summary.totalInCount
+            }
+            return;
+          }
+          if (column.property=='amount') {
+            if(sums[index]) {
+              sums[index] = this.summary.toatalAmount.toFixed(2)
+            }
+            return;
+          }
+        });
+
+        return sums;
+      },
+
+  },
+  watch: {
+      time(val) {
+        if (val) {
+          this.search_data.startTime = val[0];
+          this.search_data.endTime = val[1];
+        } else {
+          this.search_data.startTime = "";
+          this.search_data.endTime = "";
+        }
+
+      },
+      formDataTime(val) {
+        if (val) {
+          this.formData.startTime = val[0];
+          this.formData.endTime = val[1];
+        } else {
+          this.formData.startTime = "";
+          this.formData.endTime = "";
+        }
+
+      },
+
+    }
+}
+</script>
+
+<style scoped>
+  >>>.sys-search .el-input__inner{
+    width: 100%;
+  }
+  .dialog-form{
+    position: relative;
+  }
+  .dialog-line{
+    position: relative;
+    display: flex;
+    justify-content: center;
+    width: 100%;
+  }
+  .dialog-line .dialog-form-inline{
+    position: relative;
+    width: 50%;
+    margin-right: 0;
+  }
+  .dialog-line  .dialog-form-inline-single{
+    position: relative;
+    width: 100%;
+    margin-right: 0;
+  }
+  >>>.dialog-line .el-input__inner{
+    width: 100% !important;;
+  }
+  >>>.dialog-line .el-form-item__content{
+    width: calc(100% - 80px) !important;;
+  }
+  >>>.dialog-line .el-input,>>>.dialog-line .el-cascader{
+    width: 100% !important;
+  }
+</style>
+
diff --git a/src/pages/scm/warehouse/produceStock/index.vue b/src/pages/scm/warehouse/produceStock/index.vue
index aa0d78c..b835dd3 100644
--- a/src/pages/scm/warehouse/produceStock/index.vue
+++ b/src/pages/scm/warehouse/produceStock/index.vue
@@ -1,870 +1,873 @@
-<template>
-  <div class="sys-box">
-    <div class="sys-operate">
-      <el-button type="primary" @click="goAdd()" v-has="'warehouse:produceStock:add'">新增</el-button>
-      <el-button type="primary" @click="remove()" :disabled="btnOtherDisabled"
-        v-has="'warehouse:produceStock:remove'">删除</el-button>
-      <el-button type="primary" @click="exportExcel" v-has="'warehouse:produceStock:exportExcel'">导出</el-button>
-      <el-button type="primary" @click="audit" :disabled="btnDelDisabled"
-        v-has="'warehouse:produceStock:audit'">审核</el-button>
-      <el-button type="primary" @click="disAudit" :disabled="btnDelDisabled"
-        v-has="'warehouse:produceStock:disAudit'">反审核</el-button>
-      <el-button type="primary" @click="showColumnSetDialog">{{ config.configureBtnName }}</el-button>
-      <el-button type="primary" @click="tberp()" style="color:#fff;background:rgb(24, 134, 254)">同步ERP</el-button>
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class='form_item_input_out'>
-          <el-form-item label="单据编号" style='width:33%' class="form_item-inline">
-            <el-input v-model="search_data.inheadCode" placeholder="请输入单据编号" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="物料" style='width:33%' class="form_item-inline">
-            <el-input v-model="search_data.materielName" placeholder="物料" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="入库日期" style='width:33%' class="form_item-inline">
-            <el-date-picker v-model="time" type="daterange" format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
-              range-separator="—" start-placeholder="开始时间" end-placeholder="结束时间"></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class='form_item_btn_out'>
-          <el-form-item>
-            <el-button type="primary" @click="search()">查询</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="moreSearch()">高级查询</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-
-    <div class="sys-table">
-      <el-table border v-if="formTableData.length > 0" id="out-table" ref="tb" v-loading="pictLoading" show-summary
-        :summary-method="getSummaries" :data="tableData" @selection-change="handleSelectionChange"
-        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column v-for="(items, index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
-          align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <div>
-              <div v-if="items.prop_ == 'sourceCode'">
-                <el-link type="primary" @click.stop="viewDetail(scope.row)">{{ scope.row.sourceCode }}</el-link>
-              </div>
-              <div v-else-if="items.prop_ == 'inheadCode'">
-                <el-link type="primary" @click.stop="gotoDetail(scope.row)">{{ scope.row.inheadCode }}</el-link>
-              </div>
-              <div v-else>
-                <div style="overflow:hidden">{{ scope.row[items.prop_] }}</div>
-              </div>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
-      :before-close="handleClose">
-      <el-table border :data="showTableColumns" :key="Math.random()" max-height="350" style="width: 100%">
-        <el-table-column prop="title" label="列表名称" width="180" fixed>
-        </el-table-column>
-        <el-table-column prop="select" label="是否显示" width="180">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-    <!-- 高级查询 -->
-    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
-      <el-form :inline="true" v-loading="dialogLoading" label-width="80px" class="dialog-form" ref="form"
-        style="width: 620px">
-        <div class="dialog-line">
-          <el-form-item label="入库时间" class="dialog-form-inline-single">
-            <el-date-picker v-model="formDataTime" type="daterange" format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd HH:mm:ss" range-separator="—" start-placeholder="开始时间"
-              end-placeholder="结束时间"></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-
-          <el-form-item label="生产部门" class="dialog-form-inline">
-            <el-cascader v-model="selectDeptId" clearable :options="depOptions"
-              :props="{ expandTrigger: 'hover', label: 'text', value: 'id', checkStrictly: true }"
-              @change="handleChange"></el-cascader>
-          </el-form-item>
-          <el-form-item label="物料名称" class="dialog-form-inline">
-
-            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel'
-              :chooseVisible.sync='chooseMaterielVisible'></btn-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="规格型号" class="dialog-form-inline">
-            <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="批次" class="dialog-form-inline">
-            <el-input placeholder="请输入批次" v-model="formData.batch" clearable></el-input>
-          </el-form-item>
-
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="审核状态" class="dialog-form-inline" clearable>
-            <el-select clearable style="width:100%" v-model="formData.auditSign" placeholder="请选择"
-              @change="changeFacility">
-              <el-option label="不限" value=""></el-option>
-              <el-option v-for="item in auditSignList" :label="item.name" :value="item.id" :key="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="入库员" class="dialog-form-inline">
-
-            <btn-input :valueText.sync='formData.operatorName' :valueId.sync='formData.operator'
-              :chooseVisible.sync='chooseUserVisible'></btn-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="制单人" class="dialog-form-inline">
-
-            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy'
-              :chooseVisible.sync='chooseUserVisible1'></btn-input>
-          </el-form-item>
-          <el-form-item label="制单日期" class="dialog-form-inline">
-            <el-date-picker style="width:194px;" v-model="formData.createTime" type="date" format="yyyy-MM-dd"
-              range-separator="—" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
-          </el-form-item>
-        </div>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">确定</el-button>
-        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
-        <el-button type="primary" @click="clear">清空</el-button>
-      </span>
-    </el-dialog>
-    <!--    选择出库员-->
-    <dialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></dialogChooseSingleUser>
-    <!--    选择制单人-->
-    <dialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></dialogChooseSingleUser1>
-    <!--    选择物料-->
-    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel"></dialogChooseSingleParts>
-  </div>
-</template>
-
-<script>
-import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-import dialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
-import btnInput from "@/components/btnInput.vue";
-import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
-import {mapState, mapActions, mapGetters} from "vuex";
-import FileSaver from 'file-saver'
-import config from "@/utils/config.js";
-export default {
-  components: {
-      btnInput, dialogChooseSingleUser,dialogChooseSingleParts,dialogChooseSingleUser1
-    },
-  data() {
-    return {
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10,
-        startTime: "",
-        endTime: "",
-        inheadCode: '',
-        materielName: '',
-      },
-      config: config,
-      tableData: [],
-      produceStockIds: [],
-      inOutTime: '',
-      dialogTitle: "",
-      time: "",
-      formDataTime: '',
-      selectDeptId:'',
-      auditSignList: [],
-      companyList: [],
-      createByList: [],
-      depOptions: [],
-      formData: {
-        createBy: "",//制单人id
-          createByName:"",
-      },
-      summary: {},
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      dialogLoading: false,
-      chooseUserVisible: false,
-      chooseUserVisible1: false,
-      chooseMaterielVisible: false,
-      columnSetDialogVisible: false,
-      advanceQueryDialogVisible: false,
-      columnSetDialogTitle: "设置显示字段列表",
-      tableId: 'produce_stock_table',
-      pictLoading: false,
-      //默认列表数据
-      showTableColumnsDefault: [
-        {title: "入库日期", prop_: "inOutTime", select: true},
-        {title: "单据编号", prop_: "inheadCode", select: true},
-        {title: "生产部门", prop_: "deptName", select: true},
-        {title: "物料代码", prop_: "serialno", select: true},
-        {title: "物料名称", prop_: "materielName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "批号", prop_: "batch", select: true},
-        {title: "主计量单位", prop_: "unitName", select: true},
-        {title: "主单位数量", prop_: "count", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "入库数量", prop_: "inCount", select: true},
-        {title: "单价（元）", prop_: "unitPrice", select: true},
-        {title: "金额（元）", prop_: "amount", select: true},
-        {title: "仓库", prop_: "warehouseName", select: true},
-        {title: "仓位", prop_: "warehLocationName", select: true},
-        {title: "源单类型", prop_: "sourceTypeName", select: true},
-        {title: "源单单号", prop_: "sourceCode", select: true},
-        {title: "审核状态", prop_: "auditSignName", select: true},
-      ],
-      ///弹出页面列表数据
-      showTableColumns: [
-        {title: "入库日期", prop_: "inOutTime", select: true},
-        {title: "单据编号", prop_: "inheadCode", select: true},
-        {title: "生产部门", prop_: "deptName", select: true},
-        {title: "物料代码", prop_: "serialno", select: true},
-        {title: "物料名称", prop_: "materielName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "批号", prop_: "batch", select: true},
-        {title: "主计量单位", prop_: "unitName", select: true},
-        {title: "主单位数量", prop_: "count", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "入库数量", prop_: "inCount", select: true},
-        {title: "单价（元）", prop_: "unitPrice", select: true},
-        {title: "金额（元）", prop_: "amount", select: true},
-        {title: "仓库", prop_: "warehouseName", select: true},
-        {title: "仓位", prop_: "warehLocationName", select: true},
-        {title: "源单类型", prop_: "sourceTypeName", select: true},
-        {title: "源单单号", prop_: "sourceCode", select: true},
-        {title: "审核状态", prop_: "auditSignName", select: true},
-      ],
-      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
-      //显示的列表字段
-      formTableData: [],
-    }
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search()
-      }
-    }
-  },
-  computed: {
-    ...mapGetters({
-      userInfo: "user/getUserInfo"
-    }),
-  },
-  mounted() {
-    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    // this.formData.createBy = this.userInfo.userId;
-    // this.formData.createByName =this.userInfo.name
-    // let t = new Date();
-    // this.$set(this.formData,'createTime',t.getFullYear() + '-' + this.settime((t.getMonth() + 1)) + '-' + this.settime(t.getDate()))
-    this.getList()
-    this.getTypeList();
-    this.getShowColumns();
-    this.initialize();
-  },
-  methods: {
-     tberp() {
-      this.$api.yxkAPI.yxkGet("/apis/syncU8Stock", {}).then(res => {
-        if (res.code == 0) {
-          this.$confirm("数据同步成功,请确认", "提醒", {
-            type: "warning"
-          }).then(() => {
-            this.search_data = {
-              pageno: 1,
-              pagesize: 10
-            };
-            this.getList();
-          });
-        }
-      });
-    },
-    /**
-       * 查看源单明细
-       */
-      viewDetail(r) {
-          let queryId = r.queryId
-        this.$router.push({ path: '/planManagement/production_add', query: {id:queryId,t: Date.now() } })
-      },
-    /**
-       * 初始化数据
-       */
-       initialize() {
-        Promise.all([this.$api.commonAPI.getDeptsTree()])
-          .then(([r1]) => {
-            if (r1.code === 0) {
-              this.depOptions=r1.data.children;
-              this.setDeptList(this.depOptions);
-            }
-          })
-          .catch(error => {
-            console.log(error);
-          });
-        if (this.formData.userId) {
-          this.loading = true;
-          this.$api.userAPI.detail(this.formData.userId).then(res => {
-            this.loading = false;
-            if (res.code === 0) {
-              this.formData = Object.assign({}, this.formData, res.user);
-              this.setDefaultDept();
-
-
-
-            }
-          });
-        }
-      },
-      //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
-      setDeptList(tree){
-        for (const data of tree) {
-          if(!data.hasChildren){
-            data.children=undefined;
-          }else{
-            this.setDeptList(data.children)
-          }
-        }
-
-      },
-      getTypeList() {
-        Promise.all([
-          this.$api.gylCommonAPI.getUsers(),
-          this.$api.gylCommonAPI
-            .getDictsByType({type: "audit_status"}),
-          this.$api.gylInventoryAPI
-            .getDepts()
-        ])
-          .then(([r1, r2, r3]) => {
-            if (r1.code === 0) {
-              this.createByList = r1.datas;
-            }
-            if (r2.code === 0) {
-              this.auditSignList = r2.datas;
-            }
-            if (r3.code === 0) {
-              this.companyList = r3.datas;
-            }
-          })
-          .catch(error => {
-            console.log(error);
-          });
-      },
-      /**
-       * 获取选择的用户
-       */
-       getUser(val){
-          if (val) {
-            this.$set(this.formData,'operatorName',val.name)
-            this.$set(this.formData,'operator',val.id)
-          }else{
-            this.$set(this.formData,'operatorName',"")
-            this.$set(this.formData,'operator',"")
-          }
-
-
-      },
-      getUser1(val) {
-        if (val) {
-            this.$set(this.formData,'createByName',val.name)
-            this.$set(this.formData,'createBy',val.id)
-          }else{
-            this.$set(this.formData,'createByName',"")
-            this.$set(this.formData,'createBy',"")
-          }
-      },
-      getMateriel(val){
-        if (val) {
-          this.$set(this.formData,'materiel',val.id)
-          this.$set(this.formData,'materielName',val.name)
-        }else{
-          this.$set(this.formData,'materiel',"")
-          this.$set(this.formData,'materielName',"")
-        }
-      },
-      //简单搜索时申请人改变
-      changeoperatorName(){
-        this.search_data.operator="";
-      },
-      settime(n) {
-        if (n.toString().length == 1) {
-          return "0" + n.toString()
-        } else {
-          return n;
-        }
-      },
-    // 查询
-    search() {
-        this.search_data.pageno = 1;
-        this.search_data.pagesize = 10;
-        this.getList();
-      },
-    /**
-     * 高级查询
-     */
-      moreSearch() {
-      this.advanceQueryDialogVisible = true;
-      this.$set(this.formData,'operator',this.search_data.operator?this.search_data.operator:"")
-      this.$set(this.formData,'operatorName',this.search_data.operatorName?this.search_data.operatorName:"")
-      this.formDataTime=this.time
-      this.dialogTitle = "高级查询";
-      },
-      save() {
-        for (var n in this.formData) {
-          this.search_data[n] = this.formData[n];
-        }
-        this.search_data.inOutTime = "";
-        this.time = this.formDataTime;
-        this.search_data.pageno = 1;
-        this.$nextTick(function () {
-          this.advanceQueryDialogVisible = false;
-          this.getList();
-        })
-      },
-      //清空
-      clear() {
-        for (var n in this.formData) {
-          this.formData[n] = '';
-        }
-        this.$forceUpdate()
-        this.formDataTime = "";
-        this.search_data.createTime = "";
-        this.selectDeptId = ""
-
-      },
-      changeFacility() {
-        this.$forceUpdate();
-      },
-      // 选择部门
-      handleChange:function(value){
-        this.formData.deptId=value.length>=1?value[value.length-1]:'';
-        this.selectDeptId=value;
-      },
-      showUser(n){
-        this.user_type=n;
-        this.chooseUserVisible=true;
-      },
-    // 生产入库列表
-    getList() {
-        this.pictLoading = true;
-        this.$api.produceStockAPI
-        .getProdeceList(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if(res.data) {
-            this.summary = res.data
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-            this.tableData.forEach(item => {
-              item.inOutTime = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.inOutTime)[0]
-            })
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        }).catch(r => {
-            console.log(r);
-          });
-      },
-    // 前往详情页
-    gotoDetail(row) {
-        this.$router.push({ path: '/warehouse/produceStock_add', query: { id: row.id,t: Date.now() } })
-      },
-    // 前往新增页面
-    goAdd() {
-      this.$router.push({ path: '/warehouse/produceStock_add', query: {t: Date.now() } })
-      },
-    // 导出
-    exportExcel() {
-      delete this.search_data.pagesize
-      delete this.search_data.pageno
-      this.$api.produceStockAPI
-      .exportExcel(this.search_data)
-      .then(res => {
-        console.log(res)
-      })
-    },
-    // 审核
-    audit() {
-        let id = this.produceStockIds[0].id
-        this.$confirm("确认审核选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.produceStockAPI
-          .auditStatusChange({inHeadId: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                  message: res.msg,
-                  type: "success"
-                })
-                this. getList();
-            } else {
-              this.$message({
-                  message: res.msg,
-                  type: "error"
-                })
-            }
-          })
-        })
-
-      },
-
-      // 反审核
-      disAudit() {
-        let id = this.produceStockIds[0].id
-        this.$confirm("确认反审核选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.produceStockAPI
-          .reverseAuditChange({inHeadId: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                  message: res.msg,
-                  type: "success"
-                })
-                this. getList();
-            } else {
-              this.$message({
-                  message: res.msg,
-                  type: "error"
-                })
-            }
-          })
-        })
-
-      },
-      /**
-       * 删除
-       */
-       remove() {
-        let ids = [];
-          this.produceStockIds.forEach(item => {
-            ids.push(item.id)
-          })
-        this.$confirm("确认删除选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.produceStockAPI
-            .deleteAllStock({inHeadIds: ids})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "删除失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "删除失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      },
-       /**
-       * 处理选中
-       */
-       handleSelectionChange(val) {
-         console.log(val)
-        this.produceStockIds= val;
-        this.setBtn(val);
-      },
-
-       // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-
-     /**
-     * 控件操作按钮状态
-     */
-     setBtn(val) {
-        let isFlag = true;
-        let isDelFlag = true;
-        if (val.length > 0) {
-          isDelFlag = false;
-          if (val.length == 1) {
-            isFlag = false;
-          }
-        } else {
-          isFlag = true;
-          isDelFlag = true;
-        }
-        this.btnOtherDisabled = isDelFlag;
-        this.btnDelDisabled = isFlag;
-      },
-       //设置显示字段
-    showColumnSetDialog() {
-        this.columnSetDialogVisible = true;
-        this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-      },
-      //前移
-      toUp(scope) {
-        if (scope.$index == 0) {
-          return false;
-        }
-        let n;
-        for (let i = 0; i < this.showTableColumns.length; i++) {
-          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-            n = i;
-          }
-        }
-        let temp = this.showTableColumns[n];
-        this.showTableColumns[n] = this.showTableColumns[n - 1];
-        this.showTableColumns[n - 1] = temp;
-        this.$forceUpdate();
-      },
-      //后移
-      toDown(scope) {
-        if (scope.$index == this.showTableColumns.length - 1) {
-          return false;
-        }
-        let n;
-        for (let i = 0; i < this.showTableColumns.length; i++) {
-          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-            n = i;
-          }
-        }
-        let temp = this.showTableColumns[n];
-        this.showTableColumns[n] = this.showTableColumns[n + 1];
-        this.showTableColumns[n + 1] = temp;
-        this.$forceUpdate();
-      },
-      //恢复默认
-      toDefault() {
-        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-        this.$forceUpdate();
-      },
-      //完成列表字段设置
-      saveAndCloseColumnSetDialog() {
-        let tableNo = this.tableId;
-        let tableColumns = JSON.stringify(this.showTableColumns);
-        this.columnSetDialogVisible = false;
-        this.$api.tableColumnAPI
-          .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
-          .then(res => {
-              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-              this.formTableData = [];
-              for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                      this.formTableData.push(arr[i]);
-                  }
-              }
-          })
-          .catch(r => {
-            console.log(r);
-          });
-      },
-      //关闭字段设置弹出
-      handleClose() {
-        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
-        this.columnSetDialogVisible = false;
-
-      },
-      /**
-       * 获取显示字段
-       */
-       getShowColumns() {
-        let tableNo = this.tableId;
-        this.formTableData = [];
-
-        this.$api.tableColumnAPI
-          .getShowColumns({tableNo:tableNo})
-          .then(res => {
-            if(res.code==0){
-              if(res.results){
-                this.showTableColumns = JSON.parse(res.results);
-                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-                for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                    this.formTableData.push(arr[i]);
-                  }
-                }
-                this.$forceUpdate();
-              }else{
-                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-                for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                    this.formTableData.push(arr[i]);
-                  }
-                }
-                this.$forceUpdate();
-              }
-            }else{
-              this.$message({
-                message: res.msg ? res.msg : "获取列表信息失败",
-                type: "error"
-              });
-            }
-
-          })
-          .catch(r => {
-            this.$message({
-              message: r,
-              type: "error"
-            });
-            console.log(r);
-          });
-      },
-      // 合计
-      getSummaries(param){
-        const { columns, data } = param;
-        let sums=[];
-        columns.forEach((column, index) => { //计算不含税金额总计
-
-          if (index === 0) {
-            sums[index] = '合计';
-            return;
-          }
-          if ( column.property !== 'inCount' && column.property!='count'&&column.property!='amount') {
-            sums[index] = '';
-            return;
-          }
-
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-          } else {
-            sums[index] = '';
-          }
-          if (column.property=='count') {
-            if(sums[index]) {
-              sums[index] = this.summary.toatalCount
-            }
-            return;
-          }
-          if (column.property === 'inCount') {
-            if(sums[index]) {
-              sums[index] = this.summary.totalInCount
-            }
-            return;
-          }
-          if (column.property=='amount') {
-            if(sums[index]) {
-              sums[index] = this.summary.toatalAmount
-            }
-            return;
-          }
-        });
-
-        return sums;
-      },
-
-  },
-  watch: {
-      time(val) {
-        if (val) {
-          this.search_data.startTime = val[0];
-          this.search_data.endTime = val[1];
-        } else {
-          this.search_data.startTime = "";
-          this.search_data.endTime = "";
-        }
-
-      },
-      formDataTime(val) {
-        if (val) {
-          this.formData.startTime = val[0];
-          this.formData.endTime = val[1];
-        } else {
-          this.formData.startTime = "";
-          this.formData.endTime = "";
-        }
-
-      },
-
-    }
-}
-</script>
-
-<style scoped>
->>>.sys-search .el-input__inner {
-  width: 100%;
-}
-
-.dialog-form {
-  position: relative;
-}
-
-.dialog-line {
-  position: relative;
-  display: flex;
-  justify-content: center;
-  width: 100%;
-}
-
-.dialog-line .dialog-form-inline {
-  position: relative;
-  width: 50%;
-  margin-right: 0;
-}
-
-.dialog-line .dialog-form-inline-single {
-  position: relative;
-  width: 100%;
-  margin-right: 0;
-}
-
->>>.dialog-line .el-input__inner {
-  width: 100% !important;
-  ;
-}
-
->>>.dialog-line .el-form-item__content {
-  width: calc(100% - 80px) !important;
-  ;
-}
-
->>>.dialog-line .el-input,
->>>.dialog-line .el-cascader {
-  width: 100% !important;
-}
-</style>
+<template>
+  <div class="sys-box">
+    <div class="sys-operate">
+      <el-button type="primary" @click="goAdd()" v-has="'warehouse:produceStock:add'">新增</el-button>
+      <el-button type="primary" @click="remove()" :disabled="btnOtherDisabled"
+        v-has="'warehouse:produceStock:remove'">删除</el-button>
+      <el-button type="primary" @click="exportExcel" v-has="'warehouse:produceStock:exportExcel'">导出</el-button>
+      <el-button type="primary" @click="audit" :disabled="btnDelDisabled"
+        v-has="'warehouse:produceStock:audit'">审核</el-button>
+      <el-button type="primary" @click="disAudit" :disabled="btnDelDisabled"
+        v-has="'warehouse:produceStock:disAudit'">反审核</el-button>
+      <el-button type="primary" @click="showColumnSetDialog">{{ config.configureBtnName }}</el-button>
+      <el-button type="primary" @click="tberp()" style="color:#fff;background:rgb(24, 134, 254)">同步ERP</el-button>
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class='form_item_input_out'>
+          <el-form-item label="单据编号" style='width:33%' class="form_item-inline">
+            <el-input v-model="search_data.inheadCode" placeholder="请输入单据编号" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="物料" style='width:33%' class="form_item-inline">
+            <el-input v-model="search_data.materielName" placeholder="物料" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="源单单号" style='width:22%' class="form_item-inline">
+            <el-input v-model="search_data.sourceNo" placeholder="源单单号" clearable ></el-input>
+          </el-form-item>
+          <el-form-item label="入库日期" style='width:33%' class="form_item-inline">
+            <el-date-picker v-model="time" type="daterange" format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
+              range-separator="—" start-placeholder="开始时间" end-placeholder="结束时间"></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class='form_item_btn_out'>
+          <el-form-item>
+            <el-button type="primary" @click="search()">查询</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="moreSearch()">高级查询</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+
+    <div class="sys-table">
+      <el-table border v-if="formTableData.length > 0" id="out-table" ref="tb" v-loading="pictLoading" show-summary
+        :summary-method="getSummaries" :data="tableData" @selection-change="handleSelectionChange"
+        :header-cell-style="{ fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222' }">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column v-for="(items, index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
+          align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <div>
+              <div v-if="items.prop_ == 'sourceCode'">
+                <el-link type="primary" @click.stop="viewDetail(scope.row)">{{ scope.row.sourceCode }}</el-link>
+              </div>
+              <div v-else-if="items.prop_ == 'inheadCode'">
+                <el-link type="primary" @click.stop="gotoDetail(scope.row)">{{ scope.row.inheadCode }}</el-link>
+              </div>
+              <div v-else>
+                <div style="overflow:hidden">{{ scope.row[items.prop_] }}</div>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="search_data.pageno" :page-sizes="pageSizes" :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px"
+      :before-close="handleClose">
+      <el-table border :data="showTableColumns" :key="Math.random()" max-height="350" style="width: 100%">
+        <el-table-column prop="title" label="列表名称" width="180" fixed>
+        </el-table-column>
+        <el-table-column prop="select" label="是否显示" width="180">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+    <!-- 高级查询 -->
+    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
+      <el-form :inline="true" v-loading="dialogLoading" label-width="80px" class="dialog-form" ref="form"
+        style="width: 620px">
+        <div class="dialog-line">
+          <el-form-item label="入库时间" class="dialog-form-inline-single">
+            <el-date-picker v-model="formDataTime" type="daterange" format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss" range-separator="—" start-placeholder="开始时间"
+              end-placeholder="结束时间"></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+
+          <el-form-item label="生产部门" class="dialog-form-inline">
+            <el-cascader v-model="selectDeptId" clearable :options="depOptions"
+              :props="{ expandTrigger: 'hover', label: 'text', value: 'id', checkStrictly: true }"
+              @change="handleChange"></el-cascader>
+          </el-form-item>
+          <el-form-item label="物料名称" class="dialog-form-inline">
+
+            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel'
+              :chooseVisible.sync='chooseMaterielVisible'></btn-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="规格型号" class="dialog-form-inline">
+            <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="批次" class="dialog-form-inline">
+            <el-input placeholder="请输入批次" v-model="formData.batch" clearable></el-input>
+          </el-form-item>
+
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="审核状态" class="dialog-form-inline" clearable>
+            <el-select clearable style="width:100%" v-model="formData.auditSign" placeholder="请选择"
+              @change="changeFacility">
+              <el-option label="不限" value=""></el-option>
+              <el-option v-for="item in auditSignList" :label="item.name" :value="item.id" :key="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="入库员" class="dialog-form-inline">
+
+            <btn-input :valueText.sync='formData.operatorName' :valueId.sync='formData.operator'
+              :chooseVisible.sync='chooseUserVisible'></btn-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="制单人" class="dialog-form-inline">
+
+            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy'
+              :chooseVisible.sync='chooseUserVisible1'></btn-input>
+          </el-form-item>
+          <el-form-item label="制单日期" class="dialog-form-inline">
+            <el-date-picker style="width:194px;" v-model="formData.createTime" type="date" format="yyyy-MM-dd"
+              range-separator="—" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
+          </el-form-item>
+        </div>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">确定</el-button>
+        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="clear">清空</el-button>
+      </span>
+    </el-dialog>
+    <!--    选择出库员-->
+    <dialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></dialogChooseSingleUser>
+    <!--    选择制单人-->
+    <dialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></dialogChooseSingleUser1>
+    <!--    选择物料-->
+    <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel"></dialogChooseSingleParts>
+  </div>
+</template>
+
+<script>
+import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+import dialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
+import btnInput from "@/components/btnInput.vue";
+import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
+import {mapState, mapActions, mapGetters} from "vuex";
+import FileSaver from 'file-saver'
+import config from "@/utils/config.js";
+export default {
+  components: {
+      btnInput, dialogChooseSingleUser,dialogChooseSingleParts,dialogChooseSingleUser1
+    },
+  data() {
+    return {
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10,
+        startTime: "",
+        endTime: "",
+        inheadCode: '',
+        materielName: '',
+      },
+      config: config,
+      tableData: [],
+      produceStockIds: [],
+      inOutTime: '',
+      dialogTitle: "",
+      time: "",
+      formDataTime: '',
+      selectDeptId:'',
+      auditSignList: [],
+      companyList: [],
+      createByList: [],
+      depOptions: [],
+      formData: {
+        createBy: "",//制单人id
+          createByName:"",
+      },
+      summary: {},
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      dialogLoading: false,
+      chooseUserVisible: false,
+      chooseUserVisible1: false,
+      chooseMaterielVisible: false,
+      columnSetDialogVisible: false,
+      advanceQueryDialogVisible: false,
+      columnSetDialogTitle: "设置显示字段列表",
+      tableId: 'produce_stock_table',
+      pictLoading: false,
+      //默认列表数据
+      showTableColumnsDefault: [
+        {title: "入库日期", prop_: "inOutTime", select: true},
+        {title: "单据编号", prop_: "inheadCode", select: true},
+        {title: "生产部门", prop_: "deptName", select: true},
+        {title: "物料代码", prop_: "serialno", select: true},
+        {title: "物料名称", prop_: "materielName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "批号", prop_: "batch", select: false},
+        {title: "主计量单位", prop_: "unitName", select: true},
+        {title: "主单位数量", prop_: "count", select: false},
+        {title: "辅助单位", prop_: "supportUomName", select: false},
+        {title: "入库数量", prop_: "inCount", select: true},
+        {title: "单价（元）", prop_: "unitPrice", select: false},
+        {title: "金额（元）", prop_: "amount", select: false},
+        {title: "仓库", prop_: "warehouseName", select: true},
+        {title: "仓位", prop_: "warehLocationName", select: false},
+        {title: "源单类型", prop_: "sourceTypeName", select: true},
+        {title: "源单单号", prop_: "sourceCode", select: true},
+        {title: "审核状态", prop_: "auditSignName", select: true},
+      ],
+      ///弹出页面列表数据
+      showTableColumns: [
+        {title: "入库日期", prop_: "inOutTime", select: true},
+        {title: "单据编号", prop_: "inheadCode", select: true},
+        {title: "生产部门", prop_: "deptName", select: true},
+        {title: "物料代码", prop_: "serialno", select: true},
+        {title: "物料名称", prop_: "materielName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "批号", prop_: "batch", select: false},
+        {title: "主计量单位", prop_: "unitName", select: true},
+        {title: "主单位数量", prop_: "count", select: false},
+        {title: "辅助单位", prop_: "supportUomName", select: false},
+        {title: "入库数量", prop_: "inCount", select: true},
+        {title: "单价（元）", prop_: "unitPrice", select: false},
+        {title: "金额（元）", prop_: "amount", select: false},
+        {title: "仓库", prop_: "warehouseName", select: true},
+        {title: "仓位", prop_: "warehLocationName", select: false},
+        {title: "源单类型", prop_: "sourceTypeName", select: true},
+        {title: "源单单号", prop_: "sourceCode", select: true},
+        {title: "审核状态", prop_: "auditSignName", select: true},
+      ],
+      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
+      //显示的列表字段
+      formTableData: [],
+    }
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search()
+      }
+    }
+  },
+  computed: {
+    ...mapGetters({
+      userInfo: "user/getUserInfo"
+    }),
+  },
+  mounted() {
+    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    // this.formData.createBy = this.userInfo.userId;
+    // this.formData.createByName =this.userInfo.name
+    // let t = new Date();
+    // this.$set(this.formData,'createTime',t.getFullYear() + '-' + this.settime((t.getMonth() + 1)) + '-' + this.settime(t.getDate()))
+    this.getList()
+    this.getTypeList();
+    this.getShowColumns();
+    this.initialize();
+  },
+  methods: {
+     tberp() {
+      this.$api.yxkAPI.yxkGet("/apis/syncU8Stock", {}).then(res => {
+        if (res.code == 0) {
+          this.$confirm("数据同步成功,请确认", "提醒", {
+            type: "warning"
+          }).then(() => {
+            this.search_data = {
+              pageno: 1,
+              pagesize: 10
+            };
+            this.getList();
+          });
+        }
+      });
+    },
+    /**
+       * 查看源单明细
+       */
+      viewDetail(r) {
+          let queryId = r.queryId
+        this.$router.push({ path: '/planManagement/production_add', query: {id:queryId,t: Date.now() } })
+      },
+    /**
+       * 初始化数据
+       */
+       initialize() {
+        Promise.all([this.$api.commonAPI.getDeptsTree()])
+          .then(([r1]) => {
+            if (r1.code === 0) {
+              this.depOptions=r1.data.children;
+              this.setDeptList(this.depOptions);
+            }
+          })
+          .catch(error => {
+            console.log(error);
+          });
+        if (this.formData.userId) {
+          this.loading = true;
+          this.$api.userAPI.detail(this.formData.userId).then(res => {
+            this.loading = false;
+            if (res.code === 0) {
+              this.formData = Object.assign({}, this.formData, res.user);
+              this.setDefaultDept();
+
+
+
+            }
+          });
+        }
+      },
+      //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
+      setDeptList(tree){
+        for (const data of tree) {
+          if(!data.hasChildren){
+            data.children=undefined;
+          }else{
+            this.setDeptList(data.children)
+          }
+        }
+
+      },
+      getTypeList() {
+        Promise.all([
+          this.$api.gylCommonAPI.getUsers(),
+          this.$api.gylCommonAPI
+            .getDictsByType({type: "audit_status"}),
+          this.$api.gylInventoryAPI
+            .getDepts()
+        ])
+          .then(([r1, r2, r3]) => {
+            if (r1.code === 0) {
+              this.createByList = r1.datas;
+            }
+            if (r2.code === 0) {
+              this.auditSignList = r2.datas;
+            }
+            if (r3.code === 0) {
+              this.companyList = r3.datas;
+            }
+          })
+          .catch(error => {
+            console.log(error);
+          });
+      },
+      /**
+       * 获取选择的用户
+       */
+       getUser(val){
+          if (val) {
+            this.$set(this.formData,'operatorName',val.name)
+            this.$set(this.formData,'operator',val.id)
+          }else{
+            this.$set(this.formData,'operatorName',"")
+            this.$set(this.formData,'operator',"")
+          }
+
+
+      },
+      getUser1(val) {
+        if (val) {
+            this.$set(this.formData,'createByName',val.name)
+            this.$set(this.formData,'createBy',val.id)
+          }else{
+            this.$set(this.formData,'createByName',"")
+            this.$set(this.formData,'createBy',"")
+          }
+      },
+      getMateriel(val){
+        if (val) {
+          this.$set(this.formData,'materiel',val.id)
+          this.$set(this.formData,'materielName',val.name)
+        }else{
+          this.$set(this.formData,'materiel',"")
+          this.$set(this.formData,'materielName',"")
+        }
+      },
+      //简单搜索时申请人改变
+      changeoperatorName(){
+        this.search_data.operator="";
+      },
+      settime(n) {
+        if (n.toString().length == 1) {
+          return "0" + n.toString()
+        } else {
+          return n;
+        }
+      },
+    // 查询
+    search() {
+        this.search_data.pageno = 1;
+        this.search_data.pagesize = 10;
+        this.getList();
+      },
+    /**
+     * 高级查询
+     */
+      moreSearch() {
+      this.advanceQueryDialogVisible = true;
+      this.$set(this.formData,'operator',this.search_data.operator?this.search_data.operator:"")
+      this.$set(this.formData,'operatorName',this.search_data.operatorName?this.search_data.operatorName:"")
+      this.formDataTime=this.time
+      this.dialogTitle = "高级查询";
+      },
+      save() {
+        for (var n in this.formData) {
+          this.search_data[n] = this.formData[n];
+        }
+        this.search_data.inOutTime = "";
+        this.time = this.formDataTime;
+        this.search_data.pageno = 1;
+        this.$nextTick(function () {
+          this.advanceQueryDialogVisible = false;
+          this.getList();
+        })
+      },
+      //清空
+      clear() {
+        for (var n in this.formData) {
+          this.formData[n] = '';
+        }
+        this.$forceUpdate()
+        this.formDataTime = "";
+        this.search_data.createTime = "";
+        this.selectDeptId = ""
+
+      },
+      changeFacility() {
+        this.$forceUpdate();
+      },
+      // 选择部门
+      handleChange:function(value){
+        this.formData.deptId=value.length>=1?value[value.length-1]:'';
+        this.selectDeptId=value;
+      },
+      showUser(n){
+        this.user_type=n;
+        this.chooseUserVisible=true;
+      },
+    // 生产入库列表
+    getList() {
+        this.pictLoading = true;
+        this.$api.produceStockAPI
+        .getProdeceList(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if(res.data) {
+            this.summary = res.data
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+            this.tableData.forEach(item => {
+              item.inOutTime = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.inOutTime)[0]
+            })
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        }).catch(r => {
+            console.log(r);
+          });
+      },
+    // 前往详情页
+    gotoDetail(row) {
+        this.$router.push({ path: '/warehouse/produceStock_add', query: { id: row.id,t: Date.now() } })
+      },
+    // 前往新增页面
+    goAdd() {
+      this.$router.push({ path: '/warehouse/produceStock_add', query: {t: Date.now() } })
+      },
+    // 导出
+    exportExcel() {
+      delete this.search_data.pagesize
+      delete this.search_data.pageno
+      this.$api.produceStockAPI
+      .exportExcel(this.search_data)
+      .then(res => {
+        console.log(res)
+      })
+    },
+    // 审核
+    audit() {
+        let id = this.produceStockIds[0].id
+        this.$confirm("确认审核选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.produceStockAPI
+          .auditStatusChange({inHeadId: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                  message: res.msg,
+                  type: "success"
+                })
+                this. getList();
+            } else {
+              this.$message({
+                  message: res.msg,
+                  type: "error"
+                })
+            }
+          })
+        })
+
+      },
+
+      // 反审核
+      disAudit() {
+        let id = this.produceStockIds[0].id
+        this.$confirm("确认反审核选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.produceStockAPI
+          .reverseAuditChange({inHeadId: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                  message: res.msg,
+                  type: "success"
+                })
+                this. getList();
+            } else {
+              this.$message({
+                  message: res.msg,
+                  type: "error"
+                })
+            }
+          })
+        })
+
+      },
+      /**
+       * 删除
+       */
+       remove() {
+        let ids = [];
+          this.produceStockIds.forEach(item => {
+            ids.push(item.id)
+          })
+        this.$confirm("确认删除选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.produceStockAPI
+            .deleteAllStock({inHeadIds: ids})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "删除失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "删除失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      },
+       /**
+       * 处理选中
+       */
+       handleSelectionChange(val) {
+         console.log(val)
+        this.produceStockIds= val;
+        this.setBtn(val);
+      },
+
+       // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+
+     /**
+     * 控件操作按钮状态
+     */
+     setBtn(val) {
+        let isFlag = true;
+        let isDelFlag = true;
+        if (val.length > 0) {
+          isDelFlag = false;
+          if (val.length == 1) {
+            isFlag = false;
+          }
+        } else {
+          isFlag = true;
+          isDelFlag = true;
+        }
+        this.btnOtherDisabled = isDelFlag;
+        this.btnDelDisabled = isFlag;
+      },
+       //设置显示字段
+    showColumnSetDialog() {
+        this.columnSetDialogVisible = true;
+        this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+      },
+      //前移
+      toUp(scope) {
+        if (scope.$index == 0) {
+          return false;
+        }
+        let n;
+        for (let i = 0; i < this.showTableColumns.length; i++) {
+          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+            n = i;
+          }
+        }
+        let temp = this.showTableColumns[n];
+        this.showTableColumns[n] = this.showTableColumns[n - 1];
+        this.showTableColumns[n - 1] = temp;
+        this.$forceUpdate();
+      },
+      //后移
+      toDown(scope) {
+        if (scope.$index == this.showTableColumns.length - 1) {
+          return false;
+        }
+        let n;
+        for (let i = 0; i < this.showTableColumns.length; i++) {
+          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+            n = i;
+          }
+        }
+        let temp = this.showTableColumns[n];
+        this.showTableColumns[n] = this.showTableColumns[n + 1];
+        this.showTableColumns[n + 1] = temp;
+        this.$forceUpdate();
+      },
+      //恢复默认
+      toDefault() {
+        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+        this.$forceUpdate();
+      },
+      //完成列表字段设置
+      saveAndCloseColumnSetDialog() {
+        let tableNo = this.tableId;
+        let tableColumns = JSON.stringify(this.showTableColumns);
+        this.columnSetDialogVisible = false;
+        this.$api.tableColumnAPI
+          .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
+          .then(res => {
+              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+              this.formTableData = [];
+              for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                      this.formTableData.push(arr[i]);
+                  }
+              }
+          })
+          .catch(r => {
+            console.log(r);
+          });
+      },
+      //关闭字段设置弹出
+      handleClose() {
+        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
+        this.columnSetDialogVisible = false;
+
+      },
+      /**
+       * 获取显示字段
+       */
+       getShowColumns() {
+        let tableNo = this.tableId;
+        this.formTableData = [];
+
+        this.$api.tableColumnAPI
+          .getShowColumns({tableNo:tableNo})
+          .then(res => {
+            if(res.code==0){
+              if(res.results){
+                this.showTableColumns = JSON.parse(res.results);
+                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+                for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                    this.formTableData.push(arr[i]);
+                  }
+                }
+                this.$forceUpdate();
+              }else{
+                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+                for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                    this.formTableData.push(arr[i]);
+                  }
+                }
+                this.$forceUpdate();
+              }
+            }else{
+              this.$message({
+                message: res.msg ? res.msg : "获取列表信息失败",
+                type: "error"
+              });
+            }
+
+          })
+          .catch(r => {
+            this.$message({
+              message: r,
+              type: "error"
+            });
+            console.log(r);
+          });
+      },
+      // 合计
+      getSummaries(param){
+        const { columns, data } = param;
+        let sums=[];
+        columns.forEach((column, index) => { //计算不含税金额总计
+
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          if ( column.property !== 'inCount' && column.property!='count'&&column.property!='amount') {
+            sums[index] = '';
+            return;
+          }
+
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = '';
+          }
+          if (column.property=='count') {
+            if(sums[index]) {
+              sums[index] = this.summary.toatalCount
+            }
+            return;
+          }
+          if (column.property === 'inCount') {
+            if(sums[index]) {
+              sums[index] = this.summary.totalInCount
+            }
+            return;
+          }
+          if (column.property=='amount') {
+            if(sums[index]) {
+              sums[index] = this.summary.toatalAmount
+            }
+            return;
+          }
+        });
+
+        return sums;
+      },
+
+  },
+  watch: {
+      time(val) {
+        if (val) {
+          this.search_data.startTime = val[0];
+          this.search_data.endTime = val[1];
+        } else {
+          this.search_data.startTime = "";
+          this.search_data.endTime = "";
+        }
+
+      },
+      formDataTime(val) {
+        if (val) {
+          this.formData.startTime = val[0];
+          this.formData.endTime = val[1];
+        } else {
+          this.formData.startTime = "";
+          this.formData.endTime = "";
+        }
+
+      },
+
+    }
+}
+</script>
+
+<style scoped>
+>>>.sys-search .el-input__inner {
+  width: 100%;
+}
+
+.dialog-form {
+  position: relative;
+}
+
+.dialog-line {
+  position: relative;
+  display: flex;
+  justify-content: center;
+  width: 100%;
+}
+
+.dialog-line .dialog-form-inline {
+  position: relative;
+  width: 50%;
+  margin-right: 0;
+}
+
+.dialog-line .dialog-form-inline-single {
+  position: relative;
+  width: 100%;
+  margin-right: 0;
+}
+
+>>>.dialog-line .el-input__inner {
+  width: 100% !important;
+  ;
+}
+
+>>>.dialog-line .el-form-item__content {
+  width: calc(100% - 80px) !important;
+  ;
+}
+
+>>>.dialog-line .el-input,
+>>>.dialog-line .el-cascader {
+  width: 100% !important;
+}
+</style>
diff --git a/src/pages/scm/warehouse/produceStock/index_1.vue b/src/pages/scm/warehouse/produceStock/index_1.vue
index 147842b..3500506 100644
--- a/src/pages/scm/warehouse/produceStock/index_1.vue
+++ b/src/pages/scm/warehouse/produceStock/index_1.vue
@@ -1,894 +1,894 @@
-<template>
-  <div class="sys-box">
-    <div class="sys-operate">
-      <el-button type="primary" @click="goAdd()" v-has="'warehouse:produceStock:add'">新增</el-button>
-      <el-button type="primary" @click="remove()" :disabled="btnOtherDisabled" v-has="'warehouse:produceStock:remove'">删除</el-button>
-      <el-button type="primary" @click="exportExcel" v-has="'warehouse:produceStock:exportExcel'">导出</el-button>
-      <el-button type="primary" @click="audit" :disabled="btnDelDisabled" v-has="'warehouse:produceStock:audit'">审核</el-button>
-      <el-button type="primary" @click="disAudit" :disabled="btnDelDisabled" v-has="'warehouse:produceStock:disAudit'">反审核</el-button>
-      <el-button type="primary" @click="showColumnSetDialog">{{config.configureBtnName}}</el-button>
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class='form_item_input_out'>
-        <el-form-item label="单据编号" style='width:33%' class="form_item-inline">
-          <el-input v-model="search_data.inheadCode" placeholder="请输入单据编号" clearable ></el-input>
-        </el-form-item>
-        <el-form-item label="物料" style='width:33%' class="form_item-inline">
-          <el-input v-model="search_data.materielName" placeholder="物料" clearable ></el-input>
-        </el-form-item>
-        <el-form-item label="入库日期" style='width:33%' class="form_item-inline">
-          <el-date-picker
-            v-model="time"
-            type="daterange"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            range-separator="—"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          ></el-date-picker>
-        </el-form-item>
-      </div>
-      <div class='form_item_btn_out'>
-        <el-form-item>
-          <el-button type="primary" @click="search()">查询</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="moreSearch()">高级查询</el-button>
-        </el-form-item>
-      </div>
-      </el-form>
-    </div>
-
-    <div class="sys-table">
-      <el-table border
-      v-if="formTableData.length>0"
-      id="out-table"
-        ref="tb"
-        v-loading="pictLoading"
-        show-summary
-        :summary-method="getSummaries"
-        :data="tableData"
-        @selection-change="handleSelectionChange"
-        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
-      >
-      <el-table-column type="selection" width="55" align="center"></el-table-column>
-      <el-table-column v-for="(items,index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
-                         align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-                <div>
-                  <div v-if="items.prop_=='sourceCode'">
-                    <el-link type="primary" @click.stop="viewDetail(scope.row)">{{scope.row.sourceCode}}</el-link>
-                  </div>
-                  <div v-else-if="items.prop_=='inheadCode'">
-                    <el-link type="primary" @click.stop="gotoDetail(scope.row)">{{scope.row.inheadCode}}</el-link>
-                  </div>
-                  <div v-else>
-                    <div style="overflow:hidden">{{scope.row[items.prop_]}}</div>
-                  </div>
-                </div>
-              </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="search_data.pageno"
-        :page-sizes="pageSizes"
-        :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
-    </div>
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px" :before-close="handleClose">
-      <el-table border
-                :data="showTableColumns"
-                :key="Math.random()"
-                max-height="350"
-                style="width: 100%">
-        <el-table-column
-          prop="title"
-          label="列表名称"
-          width="180" fixed>
-        </el-table-column>
-        <el-table-column
-          prop="select"
-          label="是否显示"
-          width="180">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作"
-        >
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-    <!-- 高级查询 -->
-    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
-      <el-form :inline="true"
-               v-loading="dialogLoading"
-               label-width="80px"
-               class="dialog-form"
-               ref="form" style="width: 620px"
-      >
-        <div class="dialog-line">
-          <el-form-item label="入库时间"  class="dialog-form-inline-single">
-            <el-date-picker
-              v-model="formDataTime"
-              type="daterange"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              range-separator="—"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-            ></el-date-picker>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-
-          <el-form-item label="生产部门" class="dialog-form-inline">
-            <el-cascader
-            v-model="selectDeptId"
-            clearable
-            :options="depOptions"
-            :props="{ expandTrigger: 'hover',label:'text',value:'id', checkStrictly: true}"
-            @change="handleChange"></el-cascader>
-          </el-form-item>
-          <el-form-item label="物料名称" class="dialog-form-inline">
-
-            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel' :chooseVisible.sync='chooseMaterielVisible'></btn-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="规格型号" class="dialog-form-inline">
-            <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="批次" class="dialog-form-inline">
-            <el-input placeholder="请输入批次" v-model="formData.batch" clearable></el-input>
-          </el-form-item>
-
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="审核状态" class="dialog-form-inline" clearable>
-            <el-select  clearable
-                        style="width:100%"
-                        v-model="formData.auditSign"
-                        placeholder="请选择"
-                        @change="changeFacility"
-            >
-              <el-option label="不限" value=""></el-option>
-              <el-option v-for="item in auditSignList" :label="item.name" :value="item.id" :key="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="入库员" class="dialog-form-inline">
-
-            <btn-input :valueText.sync='formData.operatorName' :valueId.sync='formData.operator' :chooseVisible.sync='chooseUserVisible'></btn-input>
-          </el-form-item>
-        </div>
-        <div class="dialog-line">
-          <el-form-item label="制单人" class="dialog-form-inline">
-
-            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy' :chooseVisible.sync='chooseUserVisible1'></btn-input>
-          </el-form-item>
-          <el-form-item label="制单日期" class="dialog-form-inline">
-           <el-date-picker style="width:194px;"
-                            v-model="formData.createTime"
-                            type="date"
-                            format="yyyy-MM-dd"
-                            range-separator="—"
-                            placeholder="选择日期"
-                            value-format="yyyy-MM-dd"
-            ></el-date-picker>
-          </el-form-item>
-        </div>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">确定</el-button>
-        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
-        <el-button type="primary" @click="clear">清空</el-button>
-      </span>
-    </el-dialog>
-    <!--    选择出库员-->
-   <dialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser" ></dialogChooseSingleUser>
-   <!--    选择制单人-->
-   <dialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1" ></dialogChooseSingleUser1>
-   <!--    选择物料-->
-   <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel" ></dialogChooseSingleParts>
-  </div>
-</template>
-
-<script>
-import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
-import dialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
-import btnInput from "@/components/btnInput.vue";
-import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
-import {mapState, mapActions, mapGetters} from "vuex";
-import FileSaver from 'file-saver'
-import config from "@/utils/config.js";
-export default {
-  components: {
-      btnInput, dialogChooseSingleUser,dialogChooseSingleParts,dialogChooseSingleUser1
-    },
-  data() {
-    return {
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10,
-        startTime: "",
-        endTime: "",
-        inheadCode: '',
-        materielName: '',
-      },
-      config: config,
-      tableData: [],
-      produceStockIds: [],
-      inOutTime: '',
-      dialogTitle: "",
-      time: "",
-      formDataTime: '',
-      selectDeptId:'',
-      auditSignList: [],
-      companyList: [],
-      createByList: [],
-      depOptions: [],
-      formData: {
-        createBy: "",//制单人id
-          createByName:"",
-      },
-      summary: {},
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      dialogLoading: false,
-      chooseUserVisible: false,
-      chooseUserVisible1: false,
-      chooseMaterielVisible: false,
-      columnSetDialogVisible: false,
-      advanceQueryDialogVisible: false,
-      columnSetDialogTitle: "设置显示字段列表",
-      tableId: 'produce_stock_table',
-      pictLoading: false,
-      //默认列表数据
-      showTableColumnsDefault: [
-        {title: "入库日期", prop_: "inOutTime", select: true},
-        {title: "单据编号", prop_: "inheadCode", select: true},
-        {title: "生产部门", prop_: "deptName", select: true},
-        {title: "物料代码", prop_: "serialno", select: true},
-        {title: "物料名称", prop_: "materielName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "批号", prop_: "batch", select: true},
-        {title: "主计量单位", prop_: "unitName", select: true},
-        {title: "主单位数量", prop_: "count", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "入库数量", prop_: "inCount", select: true},
-        {title: "单价（元）", prop_: "unitPrice", select: true},
-        {title: "金额（元）", prop_: "amount", select: true},
-        {title: "仓库", prop_: "warehouseName", select: true},
-        {title: "仓位", prop_: "warehLocationName", select: true},
-        {title: "源单类型", prop_: "sourceTypeName", select: true},
-        {title: "源单单号", prop_: "sourceCode", select: true},
-        {title: "审核状态", prop_: "auditSignName", select: true},
-      ],
-      ///弹出页面列表数据
-      showTableColumns: [
-        {title: "入库日期", prop_: "inOutTime", select: true},
-        {title: "单据编号", prop_: "inheadCode", select: true},
-        {title: "生产部门", prop_: "deptName", select: true},
-        {title: "物料代码", prop_: "serialno", select: true},
-        {title: "物料名称", prop_: "materielName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "批号", prop_: "batch", select: true},
-        {title: "主计量单位", prop_: "unitName", select: true},
-        {title: "主单位数量", prop_: "count", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "入库数量", prop_: "inCount", select: true},
-        {title: "单价（元）", prop_: "unitPrice", select: true},
-        {title: "金额（元）", prop_: "amount", select: true},
-        {title: "仓库", prop_: "warehouseName", select: true},
-        {title: "仓位", prop_: "warehLocationName", select: true},
-        {title: "源单类型", prop_: "sourceTypeName", select: true},
-        {title: "源单单号", prop_: "sourceCode", select: true},
-        {title: "审核状态", prop_: "auditSignName", select: true},
-      ],
-      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
-      //显示的列表字段
-      formTableData: [],
-    }
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search()
-      }
-    }
-  },
-  computed: {
-    ...mapGetters({
-      userInfo: "user/getUserInfo"
-    }),
-  },
-  mounted() {
-    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    // this.formData.createBy = this.userInfo.userId;
-    // this.formData.createByName =this.userInfo.name
-    // let t = new Date();
-    // this.$set(this.formData,'createTime',t.getFullYear() + '-' + this.settime((t.getMonth() + 1)) + '-' + this.settime(t.getDate()))
-    this.getList()
-    this.getTypeList();
-    this.getShowColumns();
-    this.initialize();
-  },
-  methods: {
-
-    /**
-       * 查看源单明细
-       */
-      viewDetail(r) {
-          let queryId = r.queryId
-        this.$router.push({ path: '/planManagement/production_add', query: {id:queryId,t: Date.now() } })
-      },
-    /**
-       * 初始化数据
-       */
-       initialize() {
-        Promise.all([this.$api.commonAPI.getDeptsTree()])
-          .then(([r1]) => {
-            if (r1.code === 0) {
-              this.depOptions=r1.data.children;
-              this.setDeptList(this.depOptions);
-            }
-          })
-          .catch(error => {
-            console.log(error);
-          });
-        if (this.formData.userId) {
-          this.loading = true;
-          this.$api.userAPI.detail(this.formData.userId).then(res => {
-            this.loading = false;
-            if (res.code === 0) {
-              this.formData = Object.assign({}, this.formData, res.user);
-              this.setDefaultDept();
-
-
-
-            }
-          });
-        }
-      },
-      //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
-      setDeptList(tree){
-        for (const data of tree) {
-          if(!data.hasChildren){
-            data.children=undefined;
-          }else{
-            this.setDeptList(data.children)
-          }
-        }
-
-      },
-      getTypeList() {
-        Promise.all([
-          this.$api.gylCommonAPI.getUsers(),
-          this.$api.gylCommonAPI
-            .getDictsByType({type: "audit_status"}),
-          this.$api.gylInventoryAPI
-            .getDepts()
-        ])
-          .then(([r1, r2, r3]) => {
-            if (r1.code === 0) {
-              this.createByList = r1.datas;
-            }
-            if (r2.code === 0) {
-              this.auditSignList = r2.datas;
-            }
-            if (r3.code === 0) {
-              this.companyList = r3.datas;
-            }
-          })
-          .catch(error => {
-            console.log(error);
-          });
-      },
-      /**
-       * 获取选择的用户
-       */
-       getUser(val){
-          if (val) {
-            this.$set(this.formData,'operatorName',val.name)
-            this.$set(this.formData,'operator',val.id)
-          }else{
-            this.$set(this.formData,'operatorName',"")
-            this.$set(this.formData,'operator',"")
-          }
-
-
-      },
-      getUser1(val) {
-        if (val) {
-            this.$set(this.formData,'createByName',val.name)
-            this.$set(this.formData,'createBy',val.id)
-          }else{
-            this.$set(this.formData,'createByName',"")
-            this.$set(this.formData,'createBy',"")
-          }
-      },
-      getMateriel(val){
-        if (val) {
-          this.$set(this.formData,'materiel',val.id)
-          this.$set(this.formData,'materielName',val.name)
-        }else{
-          this.$set(this.formData,'materiel',"")
-          this.$set(this.formData,'materielName',"")
-        }
-      },
-      //简单搜索时申请人改变
-      changeoperatorName(){
-        this.search_data.operator="";
-      },
-      settime(n) {
-        if (n.toString().length == 1) {
-          return "0" + n.toString()
-        } else {
-          return n;
-        }
-      },
-    // 查询
-    search() {
-        this.search_data.pageno = 1;
-        this.search_data.pagesize = 10;
-        this.getList();
-      },
-    /**
-     * 高级查询
-     */
-      moreSearch() {
-      this.advanceQueryDialogVisible = true;
-      this.$set(this.formData,'operator',this.search_data.operator?this.search_data.operator:"")
-      this.$set(this.formData,'operatorName',this.search_data.operatorName?this.search_data.operatorName:"")
-      this.formDataTime=this.time
-      this.dialogTitle = "高级查询";
-      },
-      save() {
-        for (var n in this.formData) {
-          this.search_data[n] = this.formData[n];
-        }
-        this.search_data.inOutTime = "";
-        this.time = this.formDataTime;
-        this.search_data.pageno = 1;
-        this.$nextTick(function () {
-          this.advanceQueryDialogVisible = false;
-          this.getList();
-        })
-      },
-      //清空
-      clear() {
-        for (var n in this.formData) {
-          this.formData[n] = '';
-        }
-        this.$forceUpdate()
-        this.formDataTime = "";
-        this.search_data.createTime = "";
-        this.selectDeptId = ""
-
-      },
-      changeFacility() {
-        this.$forceUpdate();
-      },
-      // 选择部门
-      handleChange:function(value){
-        this.formData.deptId=value.length>=1?value[value.length-1]:'';
-        this.selectDeptId=value;
-      },
-      showUser(n){
-        this.user_type=n;
-        this.chooseUserVisible=true;
-      },
-    // 生产入库列表
-    getList() {
-        this.pictLoading = true;
-        this.$api.produceStockAPI
-        .getProdeceList(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if(res.data) {
-            this.summary = res.data
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-            this.tableData.forEach(item => {
-              item.inOutTime = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.inOutTime)[0]
-            })
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        }).catch(r => {
-            console.log(r);
-          });
-      },
-    // 前往详情页
-    gotoDetail(row) {
-        this.$router.push({ path: '/warehouse/produceStock_add', query: { id: row.id,t: Date.now() } })
-      },
-    // 前往新增页面
-    goAdd() {
-      this.$router.push({ path: '/warehouse/produceStock_add', query: {t: Date.now() } })
-      },
-    // 导出
-    exportExcel() {
-      delete this.search_data.pagesize
-      delete this.search_data.pageno
-      this.$api.produceStockAPI
-      .exportExcel(this.search_data)
-      .then(res => {
-        console.log(res)
-      })
-    },
-    // 审核
-    audit() {
-        let id = this.produceStockIds[0].id
-        this.$confirm("确认审核选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.produceStockAPI
-          .auditStatusChange({inHeadId: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                  message: res.msg,
-                  type: "success"
-                })
-                this. getList();
-            } else {
-              this.$message({
-                  message: res.msg,
-                  type: "error"
-                })
-            }
-          })
-        })
-
-      },
-
-      // 反审核
-      disAudit() {
-        let id = this.produceStockIds[0].id
-        this.$confirm("确认反审核选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.produceStockAPI
-          .reverseAuditChange({inHeadId: id})
-          .then(res => {
-            if(res.code === 0) {
-              this.$message({
-                  message: res.msg,
-                  type: "success"
-                })
-                this. getList();
-            } else {
-              this.$message({
-                  message: res.msg,
-                  type: "error"
-                })
-            }
-          })
-        })
-
-      },
-      /**
-       * 删除
-       */
-       remove() {
-        let ids = [];
-          this.produceStockIds.forEach(item => {
-            ids.push(item.id)
-          })
-        this.$confirm("确认删除选中的项吗?", "提示", {
-          type: "warning"
-        }).then(() => {
-          this.$api.produceStockAPI
-            .deleteAllStock({inHeadIds: ids})
-            .then(res => {
-              if (res.code === 0) {
-                this.$message({
-                  message: res.msg,
-                  type: "success"
-                });
-                this.getList();
-              } else {
-                this.$message({
-                  message: res.msg ? res.msg : "删除失败，请重试",
-                  type: "error"
-                });
-              }
-            })
-            .catch(error => {
-              this.$message({
-                message: "删除失败，请重试",
-                type: "error"
-              });
-            });
-        });
-      },
-       /**
-       * 处理选中
-       */
-       handleSelectionChange(val) {
-         console.log(val)
-        this.produceStockIds= val;
-        this.setBtn(val);
-      },
-
-       // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-
-     /**
-     * 控件操作按钮状态
-     */
-     setBtn(val) {
-        let isFlag = true;
-        let isDelFlag = true;
-        if (val.length > 0) {
-          isDelFlag = false;
-          if (val.length == 1) {
-            isFlag = false;
-          }
-        } else {
-          isFlag = true;
-          isDelFlag = true;
-        }
-        this.btnOtherDisabled = isDelFlag;
-        this.btnDelDisabled = isFlag;
-      },
-       //设置显示字段
-    showColumnSetDialog() {
-        this.columnSetDialogVisible = true;
-        this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-      },
-      //前移
-      toUp(scope) {
-        if (scope.$index == 0) {
-          return false;
-        }
-        let n;
-        for (let i = 0; i < this.showTableColumns.length; i++) {
-          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-            n = i;
-          }
-        }
-        let temp = this.showTableColumns[n];
-        this.showTableColumns[n] = this.showTableColumns[n - 1];
-        this.showTableColumns[n - 1] = temp;
-        this.$forceUpdate();
-      },
-      //后移
-      toDown(scope) {
-        if (scope.$index == this.showTableColumns.length - 1) {
-          return false;
-        }
-        let n;
-        for (let i = 0; i < this.showTableColumns.length; i++) {
-          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-            n = i;
-          }
-        }
-        let temp = this.showTableColumns[n];
-        this.showTableColumns[n] = this.showTableColumns[n + 1];
-        this.showTableColumns[n + 1] = temp;
-        this.$forceUpdate();
-      },
-      //恢复默认
-      toDefault() {
-        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-        this.$forceUpdate();
-      },
-      //完成列表字段设置
-      saveAndCloseColumnSetDialog() {
-        let tableNo = this.tableId;
-        let tableColumns = JSON.stringify(this.showTableColumns);
-        this.columnSetDialogVisible = false;
-        this.$api.tableColumnAPI
-          .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
-          .then(res => {
-              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-              this.formTableData = [];
-              for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                      this.formTableData.push(arr[i]);
-                  }
-              }
-          })
-          .catch(r => {
-            console.log(r);
-          });
-      },
-      //关闭字段设置弹出
-      handleClose() {
-        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
-        this.columnSetDialogVisible = false;
-
-      },
-      /**
-       * 获取显示字段
-       */
-       getShowColumns() {
-        let tableNo = this.tableId;
-        this.formTableData = [];
-
-        this.$api.tableColumnAPI
-          .getShowColumns({tableNo:tableNo})
-          .then(res => {
-            if(res.code==0){
-              if(res.results){
-                this.showTableColumns = JSON.parse(res.results);
-                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-                for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                    this.formTableData.push(arr[i]);
-                  }
-                }
-                this.$forceUpdate();
-              }else{
-                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-                for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                    this.formTableData.push(arr[i]);
-                  }
-                }
-                this.$forceUpdate();
-              }
-            }else{
-              this.$message({
-                message: res.msg ? res.msg : "获取列表信息失败",
-                type: "error"
-              });
-            }
-
-          })
-          .catch(r => {
-            this.$message({
-              message: r,
-              type: "error"
-            });
-            console.log(r);
-          });
-      },
-      // 合计
-      getSummaries(param){
-        const { columns, data } = param;
-        let sums=[];
-        columns.forEach((column, index) => { //计算不含税金额总计
-
-          if (index === 0) {
-            sums[index] = '合计';
-            return;
-          }
-          if ( column.property !== 'inCount' && column.property!='count'&&column.property!='amount') {
-            sums[index] = '';
-            return;
-          }
-
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-          } else {
-            sums[index] = '';
-          }
-          if (column.property=='count') {
-            if(sums[index]) {
-              sums[index] = this.summary.toatalCount
-            }
-            return;
-          }
-          if (column.property === 'inCount') {
-            if(sums[index]) {
-              sums[index] = this.summary.totalInCount
-            }
-            return;
-          }
-          if (column.property=='amount') {
-            if(sums[index]) {
-              sums[index] = this.summary.toatalAmount
-            }
-            return;
-          }
-        });
-
-        return sums;
-      },
-
-  },
-  watch: {
-      time(val) {
-        if (val) {
-          this.search_data.startTime = val[0];
-          this.search_data.endTime = val[1];
-        } else {
-          this.search_data.startTime = "";
-          this.search_data.endTime = "";
-        }
-
-      },
-      formDataTime(val) {
-        if (val) {
-          this.formData.startTime = val[0];
-          this.formData.endTime = val[1];
-        } else {
-          this.formData.startTime = "";
-          this.formData.endTime = "";
-        }
-
-      },
-
-    }
-}
-</script>
-
-<style scoped>
-  >>>.sys-search .el-input__inner{
-    width: 100%;
-  }
-  .dialog-form{
-    position: relative;
-  }
-  .dialog-line{
-    position: relative;
-    display: flex;
-    justify-content: center;
-    width: 100%;
-  }
-  .dialog-line .dialog-form-inline{
-    position: relative;
-    width: 50%;
-    margin-right: 0;
-  }
-  .dialog-line  .dialog-form-inline-single{
-    position: relative;
-    width: 100%;
-    margin-right: 0;
-  }
-  >>>.dialog-line .el-input__inner{
-    width: 100% !important;;
-  }
-  >>>.dialog-line .el-form-item__content{
-    width: calc(100% - 80px) !important;;
-  }
-  >>>.dialog-line .el-input,>>>.dialog-line .el-cascader{
-    width: 100% !important;
-  }
-</style>
+<template>
+  <div class="sys-box">
+    <div class="sys-operate">
+      <el-button type="primary" @click="goAdd()" v-has="'warehouse:produceStock:add'">新增</el-button>
+      <el-button type="primary" @click="remove()" :disabled="btnOtherDisabled" v-has="'warehouse:produceStock:remove'">删除</el-button>
+      <el-button type="primary" @click="exportExcel" v-has="'warehouse:produceStock:exportExcel'">导出</el-button>
+      <el-button type="primary" @click="audit" :disabled="btnDelDisabled" v-has="'warehouse:produceStock:audit'">审核</el-button>
+      <el-button type="primary" @click="disAudit" :disabled="btnDelDisabled" v-has="'warehouse:produceStock:disAudit'">反审核</el-button>
+      <el-button type="primary" @click="showColumnSetDialog">{{config.configureBtnName}}</el-button>
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class='form_item_input_out'>
+        <el-form-item label="单据编号" style='width:33%' class="form_item-inline">
+          <el-input v-model="search_data.inheadCode" placeholder="请输入单据编号" clearable ></el-input>
+        </el-form-item>
+        <el-form-item label="物料" style='width:33%' class="form_item-inline">
+          <el-input v-model="search_data.materielName" placeholder="物料" clearable ></el-input>
+        </el-form-item>
+        <el-form-item label="入库日期" style='width:33%' class="form_item-inline">
+          <el-date-picker
+            v-model="time"
+            type="daterange"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            range-separator="—"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+          ></el-date-picker>
+        </el-form-item>
+      </div>
+      <div class='form_item_btn_out'>
+        <el-form-item>
+          <el-button type="primary" @click="search()">查询</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="moreSearch()">高级查询</el-button>
+        </el-form-item>
+      </div>
+      </el-form>
+    </div>
+
+    <div class="sys-table">
+      <el-table border
+      v-if="formTableData.length>0"
+      id="out-table"
+        ref="tb"
+        v-loading="pictLoading"
+        show-summary
+        :summary-method="getSummaries"
+        :data="tableData"
+        @selection-change="handleSelectionChange"
+        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
+      >
+      <el-table-column type="selection" width="55" align="center"></el-table-column>
+      <el-table-column v-for="(items,index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
+                         align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+                <div>
+                  <div v-if="items.prop_=='sourceCode'">
+                    <el-link type="primary" @click.stop="viewDetail(scope.row)">{{scope.row.sourceCode}}</el-link>
+                  </div>
+                  <div v-else-if="items.prop_=='inheadCode'">
+                    <el-link type="primary" @click.stop="gotoDetail(scope.row)">{{scope.row.inheadCode}}</el-link>
+                  </div>
+                  <div v-else>
+                    <div style="overflow:hidden">{{scope.row[items.prop_]}}</div>
+                  </div>
+                </div>
+              </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="search_data.pageno"
+        :page-sizes="pageSizes"
+        :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px" :before-close="handleClose">
+      <el-table border
+                :data="showTableColumns"
+                :key="Math.random()"
+                max-height="350"
+                style="width: 100%">
+        <el-table-column
+          prop="title"
+          label="列表名称"
+          width="180" fixed>
+        </el-table-column>
+        <el-table-column
+          prop="select"
+          label="是否显示"
+          width="180">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+    <!-- 高级查询 -->
+    <el-dialog :title="dialogTitle" center :visible.sync="advanceQueryDialogVisible" width="670px">
+      <el-form :inline="true"
+               v-loading="dialogLoading"
+               label-width="80px"
+               class="dialog-form"
+               ref="form" style="width: 620px"
+      >
+        <div class="dialog-line">
+          <el-form-item label="入库时间"  class="dialog-form-inline-single">
+            <el-date-picker
+              v-model="formDataTime"
+              type="daterange"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              range-separator="—"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+
+          <el-form-item label="生产部门" class="dialog-form-inline">
+            <el-cascader
+            v-model="selectDeptId"
+            clearable
+            :options="depOptions"
+            :props="{ expandTrigger: 'hover',label:'text',value:'id', checkStrictly: true}"
+            @change="handleChange"></el-cascader>
+          </el-form-item>
+          <el-form-item label="物料名称" class="dialog-form-inline">
+
+            <btn-input :valueText.sync='formData.materielName' :valueId.sync='formData.materiel' :chooseVisible.sync='chooseMaterielVisible'></btn-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="规格型号" class="dialog-form-inline">
+            <el-input placeholder="请输入规格型号" v-model="formData.specification" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="批次" class="dialog-form-inline">
+            <el-input placeholder="请输入批次" v-model="formData.batch" clearable></el-input>
+          </el-form-item>
+
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="审核状态" class="dialog-form-inline" clearable>
+            <el-select  clearable
+                        style="width:100%"
+                        v-model="formData.auditSign"
+                        placeholder="请选择"
+                        @change="changeFacility"
+            >
+              <el-option label="不限" value=""></el-option>
+              <el-option v-for="item in auditSignList" :label="item.name" :value="item.id" :key="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="入库员" class="dialog-form-inline">
+
+            <btn-input :valueText.sync='formData.operatorName' :valueId.sync='formData.operator' :chooseVisible.sync='chooseUserVisible'></btn-input>
+          </el-form-item>
+        </div>
+        <div class="dialog-line">
+          <el-form-item label="制单人" class="dialog-form-inline">
+
+            <btn-input :valueText.sync='formData.createByName' :valueId.sync='formData.createBy' :chooseVisible.sync='chooseUserVisible1'></btn-input>
+          </el-form-item>
+          <el-form-item label="制单日期" class="dialog-form-inline">
+           <el-date-picker style="width:194px;"
+                            v-model="formData.createTime"
+                            type="date"
+                            format="yyyy-MM-dd"
+                            range-separator="—"
+                            placeholder="选择日期"
+                            value-format="yyyy-MM-dd"
+            ></el-date-picker>
+          </el-form-item>
+        </div>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">确定</el-button>
+        <el-button type="primary" @click="advanceQueryDialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="clear">清空</el-button>
+      </span>
+    </el-dialog>
+    <!--    选择出库员-->
+   <dialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser" ></dialogChooseSingleUser>
+   <!--    选择制单人-->
+   <dialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1" ></dialogChooseSingleUser1>
+   <!--    选择物料-->
+   <dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel" ></dialogChooseSingleParts>
+  </div>
+</template>
+
+<script>
+import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
+import dialogChooseSingleUser1 from "@/components/System/dialogChooseSingleUser";
+import btnInput from "@/components/btnInput.vue";
+import dialogChooseSingleParts from "@/components/System/dialogChooseSingleParts";
+import {mapState, mapActions, mapGetters} from "vuex";
+import FileSaver from 'file-saver'
+import config from "@/utils/config.js";
+export default {
+  components: {
+      btnInput, dialogChooseSingleUser,dialogChooseSingleParts,dialogChooseSingleUser1
+    },
+  data() {
+    return {
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10,
+        startTime: "",
+        endTime: "",
+        inheadCode: '',
+        materielName: '',
+      },
+      config: config,
+      tableData: [],
+      produceStockIds: [],
+      inOutTime: '',
+      dialogTitle: "",
+      time: "",
+      formDataTime: '',
+      selectDeptId:'',
+      auditSignList: [],
+      companyList: [],
+      createByList: [],
+      depOptions: [],
+      formData: {
+        createBy: "",//制单人id
+          createByName:"",
+      },
+      summary: {},
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      dialogLoading: false,
+      chooseUserVisible: false,
+      chooseUserVisible1: false,
+      chooseMaterielVisible: false,
+      columnSetDialogVisible: false,
+      advanceQueryDialogVisible: false,
+      columnSetDialogTitle: "设置显示字段列表",
+      tableId: 'produce_stock_table',
+      pictLoading: false,
+      //默认列表数据
+      showTableColumnsDefault: [
+        {title: "入库日期", prop_: "inOutTime", select: true},
+        {title: "单据编号", prop_: "inheadCode", select: true},
+        {title: "生产部门", prop_: "deptName", select: true},
+        {title: "物料代码", prop_: "serialno", select: true},
+        {title: "物料名称", prop_: "materielName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "批号", prop_: "batch", select: true},
+        {title: "主计量单位", prop_: "unitName", select: true},
+        {title: "主单位数量", prop_: "count", select: true},
+        {title: "辅助单位", prop_: "supportUomName", select: true},
+        {title: "入库数量", prop_: "inCount", select: true},
+        {title: "单价（元）", prop_: "unitPrice", select: true},
+        {title: "金额（元）", prop_: "amount", select: true},
+        {title: "仓库", prop_: "warehouseName", select: true},
+        {title: "仓位", prop_: "warehLocationName", select: true},
+        {title: "源单类型", prop_: "sourceTypeName", select: true},
+        {title: "源单单号", prop_: "sourceCode", select: true},
+        {title: "审核状态", prop_: "auditSignName", select: true},
+      ],
+      ///弹出页面列表数据
+      showTableColumns: [
+        {title: "入库日期", prop_: "inOutTime", select: true},
+        {title: "单据编号", prop_: "inheadCode", select: true},
+        {title: "生产部门", prop_: "deptName", select: true},
+        {title: "物料代码", prop_: "serialno", select: true},
+        {title: "物料名称", prop_: "materielName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "批号", prop_: "batch", select: true},
+        {title: "主计量单位", prop_: "unitName", select: true},
+        {title: "主单位数量", prop_: "count", select: true},
+        {title: "辅助单位", prop_: "supportUomName", select: true},
+        {title: "入库数量", prop_: "inCount", select: true},
+        {title: "单价（元）", prop_: "unitPrice", select: true},
+        {title: "金额（元）", prop_: "amount", select: true},
+        {title: "仓库", prop_: "warehouseName", select: true},
+        {title: "仓位", prop_: "warehLocationName", select: true},
+        {title: "源单类型", prop_: "sourceTypeName", select: true},
+        {title: "源单单号", prop_: "sourceCode", select: true},
+        {title: "审核状态", prop_: "auditSignName", select: true},
+      ],
+      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
+      //显示的列表字段
+      formTableData: [],
+    }
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search()
+      }
+    }
+  },
+  computed: {
+    ...mapGetters({
+      userInfo: "user/getUserInfo"
+    }),
+  },
+  mounted() {
+    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    // this.formData.createBy = this.userInfo.userId;
+    // this.formData.createByName =this.userInfo.name
+    // let t = new Date();
+    // this.$set(this.formData,'createTime',t.getFullYear() + '-' + this.settime((t.getMonth() + 1)) + '-' + this.settime(t.getDate()))
+    this.getList()
+    this.getTypeList();
+    this.getShowColumns();
+    this.initialize();
+  },
+  methods: {
+
+    /**
+       * 查看源单明细
+       */
+      viewDetail(r) {
+          let queryId = r.queryId
+        this.$router.push({ path: '/planManagement/production_add', query: {id:queryId,t: Date.now() } })
+      },
+    /**
+       * 初始化数据
+       */
+       initialize() {
+        Promise.all([this.$api.commonAPI.getDeptsTree()])
+          .then(([r1]) => {
+            if (r1.code === 0) {
+              this.depOptions=r1.data.children;
+              this.setDeptList(this.depOptions);
+            }
+          })
+          .catch(error => {
+            console.log(error);
+          });
+        if (this.formData.userId) {
+          this.loading = true;
+          this.$api.userAPI.detail(this.formData.userId).then(res => {
+            this.loading = false;
+            if (res.code === 0) {
+              this.formData = Object.assign({}, this.formData, res.user);
+              this.setDefaultDept();
+
+
+
+            }
+          });
+        }
+      },
+      //当选择器选项没有下一级时，将children设置为undefined，就能选则该项了
+      setDeptList(tree){
+        for (const data of tree) {
+          if(!data.hasChildren){
+            data.children=undefined;
+          }else{
+            this.setDeptList(data.children)
+          }
+        }
+
+      },
+      getTypeList() {
+        Promise.all([
+          this.$api.gylCommonAPI.getUsers(),
+          this.$api.gylCommonAPI
+            .getDictsByType({type: "audit_status"}),
+          this.$api.gylInventoryAPI
+            .getDepts()
+        ])
+          .then(([r1, r2, r3]) => {
+            if (r1.code === 0) {
+              this.createByList = r1.datas;
+            }
+            if (r2.code === 0) {
+              this.auditSignList = r2.datas;
+            }
+            if (r3.code === 0) {
+              this.companyList = r3.datas;
+            }
+          })
+          .catch(error => {
+            console.log(error);
+          });
+      },
+      /**
+       * 获取选择的用户
+       */
+       getUser(val){
+          if (val) {
+            this.$set(this.formData,'operatorName',val.name)
+            this.$set(this.formData,'operator',val.id)
+          }else{
+            this.$set(this.formData,'operatorName',"")
+            this.$set(this.formData,'operator',"")
+          }
+
+
+      },
+      getUser1(val) {
+        if (val) {
+            this.$set(this.formData,'createByName',val.name)
+            this.$set(this.formData,'createBy',val.id)
+          }else{
+            this.$set(this.formData,'createByName',"")
+            this.$set(this.formData,'createBy',"")
+          }
+      },
+      getMateriel(val){
+        if (val) {
+          this.$set(this.formData,'materiel',val.id)
+          this.$set(this.formData,'materielName',val.name)
+        }else{
+          this.$set(this.formData,'materiel',"")
+          this.$set(this.formData,'materielName',"")
+        }
+      },
+      //简单搜索时申请人改变
+      changeoperatorName(){
+        this.search_data.operator="";
+      },
+      settime(n) {
+        if (n.toString().length == 1) {
+          return "0" + n.toString()
+        } else {
+          return n;
+        }
+      },
+    // 查询
+    search() {
+        this.search_data.pageno = 1;
+        this.search_data.pagesize = 10;
+        this.getList();
+      },
+    /**
+     * 高级查询
+     */
+      moreSearch() {
+      this.advanceQueryDialogVisible = true;
+      this.$set(this.formData,'operator',this.search_data.operator?this.search_data.operator:"")
+      this.$set(this.formData,'operatorName',this.search_data.operatorName?this.search_data.operatorName:"")
+      this.formDataTime=this.time
+      this.dialogTitle = "高级查询";
+      },
+      save() {
+        for (var n in this.formData) {
+          this.search_data[n] = this.formData[n];
+        }
+        this.search_data.inOutTime = "";
+        this.time = this.formDataTime;
+        this.search_data.pageno = 1;
+        this.$nextTick(function () {
+          this.advanceQueryDialogVisible = false;
+          this.getList();
+        })
+      },
+      //清空
+      clear() {
+        for (var n in this.formData) {
+          this.formData[n] = '';
+        }
+        this.$forceUpdate()
+        this.formDataTime = "";
+        this.search_data.createTime = "";
+        this.selectDeptId = ""
+
+      },
+      changeFacility() {
+        this.$forceUpdate();
+      },
+      // 选择部门
+      handleChange:function(value){
+        this.formData.deptId=value.length>=1?value[value.length-1]:'';
+        this.selectDeptId=value;
+      },
+      showUser(n){
+        this.user_type=n;
+        this.chooseUserVisible=true;
+      },
+    // 生产入库列表
+    getList() {
+        this.pictLoading = true;
+        this.$api.produceStockAPI
+        .getProdeceList(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if(res.data) {
+            this.summary = res.data
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+            this.tableData.forEach(item => {
+              item.inOutTime = /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.inOutTime)[0]
+            })
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        }).catch(r => {
+            console.log(r);
+          });
+      },
+    // 前往详情页
+    gotoDetail(row) {
+        this.$router.push({ path: '/warehouse/produceStock_add', query: { id: row.id,t: Date.now() } })
+      },
+    // 前往新增页面
+    goAdd() {
+      this.$router.push({ path: '/warehouse/produceStock_add', query: {t: Date.now() } })
+      },
+    // 导出
+    exportExcel() {
+      delete this.search_data.pagesize
+      delete this.search_data.pageno
+      this.$api.produceStockAPI
+      .exportExcel(this.search_data)
+      .then(res => {
+        console.log(res)
+      })
+    },
+    // 审核
+    audit() {
+        let id = this.produceStockIds[0].id
+        this.$confirm("确认审核选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.produceStockAPI
+          .auditStatusChange({inHeadId: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                  message: res.msg,
+                  type: "success"
+                })
+                this. getList();
+            } else {
+              this.$message({
+                  message: res.msg,
+                  type: "error"
+                })
+            }
+          })
+        })
+
+      },
+
+      // 反审核
+      disAudit() {
+        let id = this.produceStockIds[0].id
+        this.$confirm("确认反审核选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.produceStockAPI
+          .reverseAuditChange({inHeadId: id})
+          .then(res => {
+            if(res.code === 0) {
+              this.$message({
+                  message: res.msg,
+                  type: "success"
+                })
+                this. getList();
+            } else {
+              this.$message({
+                  message: res.msg,
+                  type: "error"
+                })
+            }
+          })
+        })
+
+      },
+      /**
+       * 删除
+       */
+       remove() {
+        let ids = [];
+          this.produceStockIds.forEach(item => {
+            ids.push(item.id)
+          })
+        this.$confirm("确认删除选中的项吗?", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$api.produceStockAPI
+            .deleteAllStock({inHeadIds: ids})
+            .then(res => {
+              if (res.code === 0) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  message: res.msg ? res.msg : "删除失败，请重试",
+                  type: "error"
+                });
+              }
+            })
+            .catch(error => {
+              this.$message({
+                message: "删除失败，请重试",
+                type: "error"
+              });
+            });
+        });
+      },
+       /**
+       * 处理选中
+       */
+       handleSelectionChange(val) {
+         console.log(val)
+        this.produceStockIds= val;
+        this.setBtn(val);
+      },
+
+       // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+
+     /**
+     * 控件操作按钮状态
+     */
+     setBtn(val) {
+        let isFlag = true;
+        let isDelFlag = true;
+        if (val.length > 0) {
+          isDelFlag = false;
+          if (val.length == 1) {
+            isFlag = false;
+          }
+        } else {
+          isFlag = true;
+          isDelFlag = true;
+        }
+        this.btnOtherDisabled = isDelFlag;
+        this.btnDelDisabled = isFlag;
+      },
+       //设置显示字段
+    showColumnSetDialog() {
+        this.columnSetDialogVisible = true;
+        this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+      },
+      //前移
+      toUp(scope) {
+        if (scope.$index == 0) {
+          return false;
+        }
+        let n;
+        for (let i = 0; i < this.showTableColumns.length; i++) {
+          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+            n = i;
+          }
+        }
+        let temp = this.showTableColumns[n];
+        this.showTableColumns[n] = this.showTableColumns[n - 1];
+        this.showTableColumns[n - 1] = temp;
+        this.$forceUpdate();
+      },
+      //后移
+      toDown(scope) {
+        if (scope.$index == this.showTableColumns.length - 1) {
+          return false;
+        }
+        let n;
+        for (let i = 0; i < this.showTableColumns.length; i++) {
+          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+            n = i;
+          }
+        }
+        let temp = this.showTableColumns[n];
+        this.showTableColumns[n] = this.showTableColumns[n + 1];
+        this.showTableColumns[n + 1] = temp;
+        this.$forceUpdate();
+      },
+      //恢复默认
+      toDefault() {
+        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+        this.$forceUpdate();
+      },
+      //完成列表字段设置
+      saveAndCloseColumnSetDialog() {
+        let tableNo = this.tableId;
+        let tableColumns = JSON.stringify(this.showTableColumns);
+        this.columnSetDialogVisible = false;
+        this.$api.tableColumnAPI
+          .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
+          .then(res => {
+              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+              this.formTableData = [];
+              for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                      this.formTableData.push(arr[i]);
+                  }
+              }
+          })
+          .catch(r => {
+            console.log(r);
+          });
+      },
+      //关闭字段设置弹出
+      handleClose() {
+        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
+        this.columnSetDialogVisible = false;
+
+      },
+      /**
+       * 获取显示字段
+       */
+       getShowColumns() {
+        let tableNo = this.tableId;
+        this.formTableData = [];
+
+        this.$api.tableColumnAPI
+          .getShowColumns({tableNo:tableNo})
+          .then(res => {
+            if(res.code==0){
+              if(res.results){
+                this.showTableColumns = JSON.parse(res.results);
+                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+                for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                    this.formTableData.push(arr[i]);
+                  }
+                }
+                this.$forceUpdate();
+              }else{
+                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+                for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                    this.formTableData.push(arr[i]);
+                  }
+                }
+                this.$forceUpdate();
+              }
+            }else{
+              this.$message({
+                message: res.msg ? res.msg : "获取列表信息失败",
+                type: "error"
+              });
+            }
+
+          })
+          .catch(r => {
+            this.$message({
+              message: r,
+              type: "error"
+            });
+            console.log(r);
+          });
+      },
+      // 合计
+      getSummaries(param){
+        const { columns, data } = param;
+        let sums=[];
+        columns.forEach((column, index) => { //计算不含税金额总计
+
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          if ( column.property !== 'inCount' && column.property!='count'&&column.property!='amount') {
+            sums[index] = '';
+            return;
+          }
+
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = '';
+          }
+          if (column.property=='count') {
+            if(sums[index]) {
+              sums[index] = this.summary.toatalCount
+            }
+            return;
+          }
+          if (column.property === 'inCount') {
+            if(sums[index]) {
+              sums[index] = this.summary.totalInCount
+            }
+            return;
+          }
+          if (column.property=='amount') {
+            if(sums[index]) {
+              sums[index] = this.summary.toatalAmount
+            }
+            return;
+          }
+        });
+
+        return sums;
+      },
+
+  },
+  watch: {
+      time(val) {
+        if (val) {
+          this.search_data.startTime = val[0];
+          this.search_data.endTime = val[1];
+        } else {
+          this.search_data.startTime = "";
+          this.search_data.endTime = "";
+        }
+
+      },
+      formDataTime(val) {
+        if (val) {
+          this.formData.startTime = val[0];
+          this.formData.endTime = val[1];
+        } else {
+          this.formData.startTime = "";
+          this.formData.endTime = "";
+        }
+
+      },
+
+    }
+}
+</script>
+
+<style scoped>
+  >>>.sys-search .el-input__inner{
+    width: 100%;
+  }
+  .dialog-form{
+    position: relative;
+  }
+  .dialog-line{
+    position: relative;
+    display: flex;
+    justify-content: center;
+    width: 100%;
+  }
+  .dialog-line .dialog-form-inline{
+    position: relative;
+    width: 50%;
+    margin-right: 0;
+  }
+  .dialog-line  .dialog-form-inline-single{
+    position: relative;
+    width: 100%;
+    margin-right: 0;
+  }
+  >>>.dialog-line .el-input__inner{
+    width: 100% !important;;
+  }
+  >>>.dialog-line .el-form-item__content{
+    width: calc(100% - 80px) !important;;
+  }
+  >>>.dialog-line .el-input,>>>.dialog-line .el-cascader{
+    width: 100% !important;
+  }
+</style>
diff --git a/src/pages/scm/warehouse/stock/index.vue b/src/pages/scm/warehouse/stock/index.vue
index f633f0e..868162a 100644
--- a/src/pages/scm/warehouse/stock/index.vue
+++ b/src/pages/scm/warehouse/stock/index.vue
@@ -1,470 +1,469 @@
-<template>
-  <div class="sys-box">
-    <div class="sys-operate">
-      <el-button type="primary" @click="showColumnSetDialog">{{config.configureBtnName}}</el-button>
-    </div>
-    <div class="sys-search">
-      <el-form inline class="form_item_search_out">
-        <div class='form_item_input_out'>
-        <el-form-item label="物料" style='width:33%' class="form_item-inline">
-          <el-input v-model="search_data.fuzzySearch" placeholder="物料代码、名称和规格模糊查询" clearable ></el-input>
-        </el-form-item>
-        <el-form-item label="仓库" style='width:33%' class="form_item-inline">
-          <el-select v-model="search_data.facilityId" placeholder="请选择" clearable>
-            <el-option
-              v-for="item in fac_type_list1"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="批号" style='width:33%' class="form_item-inline">
-          <el-input v-model="search_data.batch" placeholder="请输入批号" clearable ></el-input>
-        </el-form-item>
-      </div>
-      <div class='form_item_btn_out'>
-        <el-form-item>
-          <el-button type="primary" @click="search()">查询</el-button>
-        </el-form-item>
-      </div>
-
-      </el-form>
-    </div>
-
-    <div class="sys-table">
-      <el-table border
-      v-if="formTableData.length>0"
-      id="out-table"
-        ref="tb"
-        v-loading="pictLoading"
-        show-summary
-        :summary-method="getSummaries"
-        :data="tableData"
-        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
-      >
-
-      <el-table-column v-for="(items,index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
-                         align="center" show-overflow-tooltip>
-
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="sys-pagination">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="search_data.pageno"
-        :page-sizes="pageSizes"
-        :page-size="search_data.pagesize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
-    </div>
-    <!-- 状态控制 -->
-    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px" :before-close="handleClose">
-      <el-table border
-                :data="showTableColumns"
-                :key="Math.random()"
-                max-height="350"
-                style="width: 100%">
-        <el-table-column
-          prop="title"
-          label="列表名称"
-          width="180" fixed>
-        </el-table-column>
-        <el-table-column
-          prop="select"
-          label="是否显示"
-          width="180">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.select">
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作"
-        >
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
-            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-import {mapState, mapActions, mapGetters} from "vuex";
-import config from "@/utils/config.js";
-import FileSaver from 'file-saver'
-export default {
-  data() {
-    return {
-      total: 0, //总条数
-      pageSizes: [10, 20, 50], //每页展示多少条
-      search_data: {
-        pageno: 1,
-        pagesize: 10,
-        isPC: -1
-      },
-      config: config,
-      tableData: [],
-      allotIds: [],
-      allotTime: '',
-      dialogTitle: "",
-      time: "",
-      selectDeptId:'',
-      formDataTime: "",
-      fac_type_list1:[],//仓库
-      fac_type_list2:[],//仓库
-      auditSignList: [],
-      companyList: [],
-      createByList: [],
-      depOptions: [],
-      formData: {
-
-      },
-      summary:{},
-      btnDelDisabled: true,
-      btnOtherDisabled: true,
-      chooseClientrVisible: false,
-      dialogLoading: false,
-      chooseUserVisible: false,
-      chooseMaterielVisible: false,
-      columnSetDialogVisible: false,
-      advanceQueryDialogVisible: false,
-      chooseSupplierVisible:false,//选择供应商
-      columnSetDialogTitle: "设置显示字段列表",
-      tableId: 'stock1_table',
-      pictLoading: false,
-      //默认列表数据
-      showTableColumnsDefault: [
-        {title: "仓库", prop_: "facilityName", select: true},
-        {title: "仓位", prop_: "facilityLocationName", select: true},
-        {title: "物料代码", prop_: "serialNo", select: true},
-        {title: "物料名称", prop_: "materielName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "批号", prop_: "batch", select: true},
-        {title: "主计量单位", prop_: "unitUomName", select: true},
-        {title: "主单位库存数量", prop_: "totalCount", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "辅助单位库存数量", prop_: "totalRepertoryCount", select: true},
-        {title: "换算系数", prop_: "convCoefficient", select: true}
-
-      ],
-      ///弹出页面列表数据
-      showTableColumns: [
-        {title: "仓库", prop_: "facilityName", select: true},
-        {title: "仓位", prop_: "facilityLocationName", select: true},
-        {title: "物料代码", prop_: "serialNo", select: true},
-        {title: "物料名称", prop_: "materielName", select: true},
-        {title: "规格型号", prop_: "specification", select: true},
-        {title: "批号", prop_: "batch", select: true},
-        {title: "主计量单位", prop_: "unitUomName", select: true},
-        {title: "主单位库存数量", prop_: "totalCount", select: true},
-        {title: "辅助单位", prop_: "supportUomName", select: true},
-        {title: "辅助单位库存数量", prop_: "totalRepertoryCount", select: true},
-        {title: "换算系数", prop_: "convCoefficient", select: true}
-      ],
-      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
-      //显示的列表字段
-      formTableData: [],
-    }
-  },
-  created() {
-    var _this = this;
-    document.onkeydown = e => {
-      if (e.key === "Enter") {
-        _this.search()
-      }
-    }
-  },
-  computed: {
-    ...mapGetters({
-      userInfo: "user/getUserInfo"
-    }),
-  },
-  mounted() {
-    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-    this.formData.createBy = this.userInfo.userId;
-    this.formData.createByName =this.userInfo.name
-    this.getList()
-    this.getShowColumns();
-    this.initialize();
-  },
-  methods: {
-    /**
-       * 初始化数据
-       */
-       initialize() {
-        this.$api.gylInventoryAPI
-        .facilityList({pageno:1,pagesize:1000,auditSign:179})
-        .then(res => {
-          this.fac_type_list1 = res.data.datas?res.data.datas:''
-          this.fac_type_list2 = res.data.datas?res.data.datas:''
-        }).catch(error => {
-          console.log(error)
-        })
-
-      },
-
-
-      settime(n) {
-        if (n.toString().length == 1) {
-          return "0" + n.toString()
-        } else {
-          return n;
-        }
-      },
-    // 查询
-    search() {
-        this.search_data.pageno = 1;
-        this.getList();
-      },
-
-    // 生产入库列表
-    getList() {
-        this.pictLoading = true;
-        this.$api.saleStockAPI
-        .getStockList(this.search_data)
-        .then(res => {
-          this.pictLoading = false;
-          if(res.data) {
-            console.log(res.data)
-            this.total = res.data.totalRows;
-            this.tableData = res.data.datas ? res.data.datas : [];
-            this.summary = res.total
-          } else {
-            this.total = 0;
-            this.tableData = [];
-          }
-        }).catch(r => {
-            console.log(r);
-          });
-      },
-
-       // 每页显示多少条
-    handleSizeChange(val) {
-      this.search_data.pagesize = val;
-      this.getList();
-    },
-    // 上下分页
-    handleCurrentChange(val) {
-      this.search_data.pageno = val;
-      this.getList();
-    },
-
-       //设置显示字段
-    showColumnSetDialog() {
-        this.columnSetDialogVisible = true;
-        this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
-      },
-      //前移
-      toUp(scope) {
-        if (scope.$index == 0) {
-          return false;
-        }
-        let n;
-        for (let i = 0; i < this.showTableColumns.length; i++) {
-          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-            n = i;
-          }
-        }
-        let temp = this.showTableColumns[n];
-        this.showTableColumns[n] = this.showTableColumns[n - 1];
-        this.showTableColumns[n - 1] = temp;
-        this.$forceUpdate();
-      },
-      //后移
-      toDown(scope) {
-        if (scope.$index == this.showTableColumns.length - 1) {
-          return false;
-        }
-        let n;
-        for (let i = 0; i < this.showTableColumns.length; i++) {
-          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
-            n = i;
-          }
-        }
-        let temp = this.showTableColumns[n];
-        this.showTableColumns[n] = this.showTableColumns[n + 1];
-        this.showTableColumns[n + 1] = temp;
-        this.$forceUpdate();
-      },
-      //恢复默认
-      toDefault() {
-        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-        this.$forceUpdate();
-      },
-      //完成列表字段设置
-      saveAndCloseColumnSetDialog() {
-        let tableNo = this.tableId;
-        let tableColumns = JSON.stringify(this.showTableColumns);
-        this.columnSetDialogVisible = false;
-        this.$api.tableColumnAPI
-          .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
-          .then(res => {
-              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-              this.formTableData = [];
-              for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                      this.formTableData.push(arr[i]);
-                  }
-              }
-          })
-          .catch(r => {
-            console.log(r);
-          });
-      },
-    // 合计
-    getSummaries(param){
-      const { columns, data } = param;
-      let sums=[];
-      columns.forEach((column, index) => { //计算不含税金额总计
-        if (index === 0) {
-          sums[index] = '合计';
-          return;
-        }
-        if (column.property!=='totalRepertoryCount'
-          &&column.property!=='totalCount') {
-          sums[index] = '';
-          return;
-        }
-
-        const values = data.map(item => Number(item[column.property]));
-        if (!values.every(value => isNaN(value))) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0);
-        } else {
-          sums[index] = '';
-        }
-        if (column.property==='totalCount') {
-          if(sums[index]) {
-            sums[index] = this.summary.totalCount;
-          }
-          return;
-        }
-        if (column.property==='totalRepertoryCount') {
-          if(sums[index]) {
-            sums[index] = this.summary.totalRepertoryCount;
-          }
-          return;
-        }
-      });
-      console.log("------------------")
-      console.log(sums)
-      return sums;
-    },
-      //关闭字段设置弹出
-      handleClose() {
-        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
-        this.columnSetDialogVisible = false;
-
-      },
-      /**
-       * 获取显示字段
-       */
-       getShowColumns() {
-        let tableNo = this.tableId;
-        this.formTableData = [];
-
-        this.$api.tableColumnAPI
-          .getShowColumns({tableNo:tableNo})
-          .then(res => {
-            if(res.code==0){
-              if(res.results){
-                this.showTableColumns = JSON.parse(res.results);
-                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
-                for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                    this.formTableData.push(arr[i]);
-                  }
-                }
-                this.$forceUpdate();
-              }else{
-                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
-                for (let i = 0; i < arr.length; i++) {
-                  if (arr[i].select) {
-                    this.formTableData.push(arr[i]);
-                  }
-                }
-                this.$forceUpdate();
-              }
-            }else{
-              this.$message({
-                message: res.msg ? res.msg : "获取列表信息失败",
-                type: "error"
-              });
-            }
-
-          })
-          .catch(r => {
-            this.$message({
-              message: r,
-              type: "error"
-            });
-            console.log(r);
-          });
-      },
-
-  },
-
-}
-</script>
-
-<style scoped>
-  >>>.sys-search .el-input__inner{
-    width: 100%;
-  }
-  .dialog-form{
-    position: relative;
-  }
-  .dialog-line{
-    position: relative;
-    display: flex;
-    justify-content: center;
-    width: 100%;
-  }
-  .dialog-line .dialog-form-inline{
-    position: relative;
-    width: 50%;
-    margin-right: 0;
-  }
-  .dialog-line  .dialog-form-inline-single{
-    position: relative;
-    width: 100%;
-    margin-right: 0;
-  }
-  >>>.dialog-line .el-input__inner{
-    width: 100% !important;;
-  }
-  >>>.dialog-line .el-form-item__content{
-    width: calc(100% - 80px) !important;;
-  }
-  >>>.dialog-line .el-input,>>>.dialog-line .el-cascader{
-    width: 100% !important;
-  }
-</style>
-
-
-
-
+<template>
+  <div class="sys-box">
+    <div class="sys-operate">
+      <el-button type="primary" @click="showColumnSetDialog">{{config.configureBtnName}}</el-button>
+    </div>
+    <div class="sys-search">
+      <el-form inline class="form_item_search_out">
+        <div class='form_item_input_out'>
+        <el-form-item label="物料" style='width:33%' class="form_item-inline">
+          <el-input v-model="search_data.fuzzySearch" placeholder="物料代码、名称和规格模糊查询" clearable ></el-input>
+        </el-form-item>
+        <el-form-item label="仓库" style='width:33%' class="form_item-inline">
+          <el-select v-model="search_data.facilityId" placeholder="请选择" clearable>
+            <el-option
+              v-for="item in fac_type_list1"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="批号" style='width:33%' class="form_item-inline">
+          <el-input v-model="search_data.batch" placeholder="请输入批号" clearable ></el-input>
+        </el-form-item>
+      </div>
+      <div class='form_item_btn_out'>
+        <el-form-item>
+          <el-button type="primary" @click="search()">查询</el-button>
+        </el-form-item>
+      </div>
+
+      </el-form>
+    </div>
+
+    <div class="sys-table">
+      <el-table border
+      v-if="formTableData.length>0"
+      id="out-table"
+        ref="tb"
+        v-loading="pictLoading"
+        show-summary
+        :summary-method="getSummaries"
+        :data="tableData"
+        :header-cell-style="{fontWeight: 'normal', textAlign: 'center', backgroundColor: '#eceff4', color: '#222'}"
+      >
+
+      <el-table-column v-for="(items,index) in formTableData" :key="index" :prop="items.prop_" :label="items.title"
+                         align="center" show-overflow-tooltip>
+
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="sys-pagination">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="search_data.pageno"
+        :page-sizes="pageSizes"
+        :page-size="search_data.pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+    <!-- 状态控制 -->
+    <el-dialog :title="columnSetDialogTitle" center :visible.sync="columnSetDialogVisible" width="531px" :before-close="handleClose">
+      <el-table border
+                :data="showTableColumns"
+                :key="Math.random()"
+                max-height="350"
+                style="width: 100%">
+        <el-table-column
+          prop="title"
+          label="列表名称"
+          width="180" fixed>
+        </el-table-column>
+        <el-table-column
+          prop="select"
+          label="是否显示"
+          width="180">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.select">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="toUp(scope)">前移</el-button>
+            <el-button type="text" size="small" @click="toDown(scope)">后移</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row type="flex" class="row-bg" justify="center" style="margin-top: 10px;">
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="saveAndCloseColumnSetDialog">完成</el-button>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" size="middle" @click="toDefault">恢复默认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {mapState, mapActions, mapGetters} from "vuex";
+import config from "@/utils/config.js";
+import FileSaver from 'file-saver'
+export default {
+  data() {
+    return {
+      total: 0, //总条数
+      pageSizes: [10, 20, 50], //每页展示多少条
+      search_data: {
+        pageno: 1,
+        pagesize: 10,
+        isPC: -1
+      },
+      config: config,
+      tableData: [],
+      allotIds: [],
+      allotTime: '',
+      dialogTitle: "",
+      time: "",
+      selectDeptId:'',
+      formDataTime: "",
+      fac_type_list1:[],//仓库
+      fac_type_list2:[],//仓库
+      auditSignList: [],
+      companyList: [],
+      createByList: [],
+      depOptions: [],
+      formData: {
+
+      },
+      summary:{},
+      btnDelDisabled: true,
+      btnOtherDisabled: true,
+      chooseClientrVisible: false,
+      dialogLoading: false,
+      chooseUserVisible: false,
+      chooseMaterielVisible: false,
+      columnSetDialogVisible: false,
+      advanceQueryDialogVisible: false,
+      chooseSupplierVisible:false,//选择供应商
+      columnSetDialogTitle: "设置显示字段列表",
+      tableId: 'stock1_table',
+      pictLoading: false,
+      //默认列表数据
+      showTableColumnsDefault: [
+        {title: "仓库", prop_: "facilityName", select: true},
+        {title: "仓位", prop_: "facilityLocationName", select: false},
+        {title: "物料代码", prop_: "serialNo", select: true},
+        {title: "物料名称", prop_: "materielName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "批号", prop_: "batch", select: false},
+        {title: "主计量单位", prop_: "unitUomName", select: true},
+        {title: "主单位库存数量", prop_: "totalCount", select: true},
+        {title: "辅助单位", prop_: "supportUomName", select: false},
+        {title: "辅助单位库存数量", prop_: "totalRepertoryCount", select: false},
+        {title: "换算系数", prop_: "convCoefficient", select: false}
+      ],
+      ///弹出页面列表数据
+      showTableColumns: [
+        {title: "仓库", prop_: "facilityName", select: true},
+        {title: "仓位", prop_: "facilityLocationName", select: false},
+        {title: "物料代码", prop_: "serialNo", select: true},
+        {title: "物料名称", prop_: "materielName", select: true},
+        {title: "规格型号", prop_: "specification", select: true},
+        {title: "批号", prop_: "batch", select: false},
+        {title: "主计量单位", prop_: "unitUomName", select: true},
+        {title: "主单位库存数量", prop_: "totalCount", select: true},
+        {title: "辅助单位", prop_: "supportUomName", select: false},
+        {title: "辅助单位库存数量", prop_: "totalRepertoryCount", select: false},
+        {title: "换算系数", prop_: "convCoefficient", select: false}
+      ],
+      showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
+      //显示的列表字段
+      formTableData: [],
+    }
+  },
+  created() {
+    var _this = this;
+    document.onkeydown = e => {
+      if (e.key === "Enter") {
+        _this.search()
+      }
+    }
+  },
+  computed: {
+    ...mapGetters({
+      userInfo: "user/getUserInfo"
+    }),
+  },
+  mounted() {
+    this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+    this.formData.createBy = this.userInfo.userId;
+    this.formData.createByName =this.userInfo.name
+    this.getList()
+    this.getShowColumns();
+    this.initialize();
+  },
+  methods: {
+    /**
+       * 初始化数据
+       */
+       initialize() {
+        this.$api.gylInventoryAPI
+        .facilityList({pageno:1,pagesize:1000,auditSign:179})
+        .then(res => {
+          this.fac_type_list1 = res.data.datas?res.data.datas:''
+          this.fac_type_list2 = res.data.datas?res.data.datas:''
+        }).catch(error => {
+          console.log(error)
+        })
+
+      },
+
+
+      settime(n) {
+        if (n.toString().length == 1) {
+          return "0" + n.toString()
+        } else {
+          return n;
+        }
+      },
+    // 查询
+    search() {
+        this.search_data.pageno = 1;
+        this.getList();
+      },
+
+    // 生产入库列表
+    getList() {
+        this.pictLoading = true;
+        this.$api.saleStockAPI
+        .getStockList(this.search_data)
+        .then(res => {
+          this.pictLoading = false;
+          if(res.data) {
+            console.log(res.data)
+            this.total = res.data.totalRows;
+            this.tableData = res.data.datas ? res.data.datas : [];
+            this.summary = res.total
+          } else {
+            this.total = 0;
+            this.tableData = [];
+          }
+        }).catch(r => {
+            console.log(r);
+          });
+      },
+
+       // 每页显示多少条
+    handleSizeChange(val) {
+      this.search_data.pagesize = val;
+      this.getList();
+    },
+    // 上下分页
+    handleCurrentChange(val) {
+      this.search_data.pageno = val;
+      this.getList();
+    },
+
+       //设置显示字段
+    showColumnSetDialog() {
+        this.columnSetDialogVisible = true;
+        this.showTableColumnsTemp = JSON.parse(JSON.stringify(this.showTableColumns));
+      },
+      //前移
+      toUp(scope) {
+        if (scope.$index == 0) {
+          return false;
+        }
+        let n;
+        for (let i = 0; i < this.showTableColumns.length; i++) {
+          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+            n = i;
+          }
+        }
+        let temp = this.showTableColumns[n];
+        this.showTableColumns[n] = this.showTableColumns[n - 1];
+        this.showTableColumns[n - 1] = temp;
+        this.$forceUpdate();
+      },
+      //后移
+      toDown(scope) {
+        if (scope.$index == this.showTableColumns.length - 1) {
+          return false;
+        }
+        let n;
+        for (let i = 0; i < this.showTableColumns.length; i++) {
+          if (this.showTableColumns[i].prop_ == scope.row.prop_) {
+            n = i;
+          }
+        }
+        let temp = this.showTableColumns[n];
+        this.showTableColumns[n] = this.showTableColumns[n + 1];
+        this.showTableColumns[n + 1] = temp;
+        this.$forceUpdate();
+      },
+      //恢复默认
+      toDefault() {
+        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+        this.$forceUpdate();
+      },
+      //完成列表字段设置
+      saveAndCloseColumnSetDialog() {
+        let tableNo = this.tableId;
+        let tableColumns = JSON.stringify(this.showTableColumns);
+        this.columnSetDialogVisible = false;
+        this.$api.tableColumnAPI
+          .saveShowColumns({tableNo:tableNo,tableColumns:tableColumns})
+          .then(res => {
+              let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+              this.formTableData = [];
+              for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                      this.formTableData.push(arr[i]);
+                  }
+              }
+          })
+          .catch(r => {
+            console.log(r);
+          });
+      },
+    // 合计
+    getSummaries(param){
+      const { columns, data } = param;
+      let sums=[];
+      columns.forEach((column, index) => { //计算不含税金额总计
+        if (index === 0) {
+          sums[index] = '合计';
+          return;
+        }
+        if (column.property!=='totalRepertoryCount'
+          &&column.property!=='totalCount') {
+          sums[index] = '';
+          return;
+        }
+
+        const values = data.map(item => Number(item[column.property]));
+        if (!values.every(value => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+        } else {
+          sums[index] = '';
+        }
+        if (column.property==='totalCount') {
+          if(sums[index]) {
+            sums[index] = this.summary.totalCount;
+          }
+          return;
+        }
+        if (column.property==='totalRepertoryCount') {
+          if(sums[index]) {
+            sums[index] = this.summary.totalRepertoryCount;
+          }
+          return;
+        }
+      });
+      console.log("------------------")
+      console.log(sums)
+      return sums;
+    },
+      //关闭字段设置弹出
+      handleClose() {
+        this.showTableColumns = JSON.parse(JSON.stringify(this.showTableColumnsTemp));
+        this.columnSetDialogVisible = false;
+
+      },
+      /**
+       * 获取显示字段
+       */
+       getShowColumns() {
+        let tableNo = this.tableId;
+        this.formTableData = [];
+
+        this.$api.tableColumnAPI
+          .getShowColumns({tableNo:tableNo})
+          .then(res => {
+            if(res.code==0){
+              if(res.results){
+                this.showTableColumns = JSON.parse(res.results);
+                let arr = JSON.parse(JSON.stringify(this.showTableColumns));
+                for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                    this.formTableData.push(arr[i]);
+                  }
+                }
+                this.$forceUpdate();
+              }else{
+                let arr = JSON.parse(JSON.stringify(this.showTableColumnsDefault));
+                for (let i = 0; i < arr.length; i++) {
+                  if (arr[i].select) {
+                    this.formTableData.push(arr[i]);
+                  }
+                }
+                this.$forceUpdate();
+              }
+            }else{
+              this.$message({
+                message: res.msg ? res.msg : "获取列表信息失败",
+                type: "error"
+              });
+            }
+
+          })
+          .catch(r => {
+            this.$message({
+              message: r,
+              type: "error"
+            });
+            console.log(r);
+          });
+      },
+
+  },
+
+}
+</script>
+
+<style scoped>
+  >>>.sys-search .el-input__inner{
+    width: 100%;
+  }
+  .dialog-form{
+    position: relative;
+  }
+  .dialog-line{
+    position: relative;
+    display: flex;
+    justify-content: center;
+    width: 100%;
+  }
+  .dialog-line .dialog-form-inline{
+    position: relative;
+    width: 50%;
+    margin-right: 0;
+  }
+  .dialog-line  .dialog-form-inline-single{
+    position: relative;
+    width: 100%;
+    margin-right: 0;
+  }
+  >>>.dialog-line .el-input__inner{
+    width: 100% !important;;
+  }
+  >>>.dialog-line .el-form-item__content{
+    width: calc(100% - 80px) !important;;
+  }
+  >>>.dialog-line .el-input,>>>.dialog-line .el-cascader{
+    width: 100% !important;
+  }
+</style>
+
+
+
+
diff --git a/src/store/modules/common/index.js b/src/store/modules/common/index.js
index fcd9071..539cea1 100644
--- a/src/store/modules/common/index.js
+++ b/src/store/modules/common/index.js
@@ -1,92 +1,100 @@
-import base from "../../../api/base";
-import companyAPI from "../../../api/companyAPI";
-const state = {
-    commonUserList: [],
-    commonDepts: [],
-    logoUrl:undefined,
-    logoUrlFlag:false,
-}
-
-const mutations = {
-    setCommonUserList: (state, data) => {
-        state.commonUserList = data
-        sessionStorage.setItem("commonUserList", JSON.stringify(state.commonUserList));
-    },
-    setCommonDeptList: (state, data) => {
-        state.commonDepts = data
-        sessionStorage.setItem("commonUserList", JSON.stringify(state.commonDepts));
-    },
-    setLogoUrl:(state,data)=>{
-      if(data!=''){
-        state.logoUrl = base.ftpPrefix+data
-      }else {
-        state.logoUrl = undefined
-      }
-      state.logoUrlFlag = true
-      sessionStorage.setItem("logoUrl",state.logoUrl)
-    }
-}
-
-const actions = {
-    getUsers({ commit }, user) {
-        return new Promise((resolve, reject) => {
-            this.$api.commonAPI.getUsers().then(res => {
-                if (res.code === 0) {
-                    commit('setCommonUserList', res.datas)
-                }
-                resolve(res);
-            }).catch(r => {
-                console.log(r);
-                reject(r);
-            })
-        });
-    },
-    getDepts({ commit }, depts) {
-        return new Promise((resolve, reject) => {
-            this.$api.commonAPI.getDepts().then(res => {
-                if (res.code === 0) {
-                    commit('setCommonDeptList', res.datas)
-                }
-                resolve(res);
-            }).catch(r => {
-                console.log(r);
-                reject(r);
-            })
-        });
-    },
-    getLogoUrl({commit}){
-      return new Promise((resolve,reject) => {
-        console.log("cesssssss")
-        companyAPI.detail().then(res=>{
-          if(res.code ===0){
-            console.log("cesssssss")
-            commit('setLogoUrl',res.result.logoUrl)
-          }
-          resolve(res)
-        }).catch(r=>{
-          reject(r)
-        })
-      })
-    }
-}
-
-const getters = {
-    getCommonUserList: state => {
-        if (!state.commonUserList) {
-            state.commonUserList = sessionStorage.getItem("commonUserList");
-        }
-        return state.commonUserList;
-    },
-    getLogoUrl:state =>{
-      if(!state.logoUrl){
-        state.logoUrl = sessionStorage.getItem("logoUrl")
-      }
-    }
-}
-
-export default {
-    namespaced: true,
-    state,
-    mutations,
-    actions
-}
+import base from "../../../api/base";
+import companyAPI from "../../../api/companyAPI";
+const state = {
+    commonUserList: [],
+    commonDepts: [],
+    logoUrl:undefined,
+    logoUrlFlag:false,
+    companyInfo:{}
+}
+
+const mutations = {
+    setCommonUserList: (state, data) => {
+        state.commonUserList = data
+        sessionStorage.setItem("commonUserList", JSON.stringify(state.commonUserList));
+    },
+    setCommonDeptList: (state, data) => {
+        state.commonDepts = data
+        sessionStorage.setItem("commonUserList", JSON.stringify(state.commonDepts));
+    },
+    setLogoUrl:(state,data)=>{
+      if(data!=''){
+        state.logoUrl = base.ftpPrefix+data
+      }else {
+        state.logoUrl = undefined
+      }
+      state.logoUrlFlag = true
+      sessionStorage.setItem("logoUrl",state.logoUrl)
+    },
+    setCompanyInfo: (state, data) => {
+      state.companyInfo = data;
+      sessionStorage.setItem("companyInfo", JSON.stringify(data));
+  },
+
+}
+
+const actions = {
+    getUsers({ commit }, user) {
+        return new Promise((resolve, reject) => {
+            this.$api.commonAPI.getUsers().then(res => {
+                if (res.code === 0) {
+                    commit('setCommonUserList', res.datas)
+                }
+                resolve(res);
+            }).catch(r => {
+                console.log(r);
+                reject(r);
+            })
+        });
+    },
+    getDepts({ commit }, depts) {
+        return new Promise((resolve, reject) => {
+            this.$api.commonAPI.getDepts().then(res => {
+                if (res.code === 0) {
+                    commit('setCommonDeptList', res.datas)
+                }
+                resolve(res);
+            }).catch(r => {
+                console.log(r);
+                reject(r);
+            })
+        });
+    },
+    getLogoUrl({commit}){
+      return new Promise((resolve,reject) => {
+        console.log("cesssssss")
+        companyAPI.detail().then(res=>{
+          if(res.code ===0){
+            console.log("cesssssss")
+            commit('setLogoUrl',res.result.logoUrl)
+            commit('setCompanyInfo', res.result);
+
+          }
+          resolve(res)
+        }).catch(r=>{
+          reject(r)
+        })
+      })
+    },
+}
+
+const getters = {
+    getCommonUserList: state => {
+        if (!state.commonUserList) {
+            state.commonUserList = sessionStorage.getItem("commonUserList");
+        }
+        return state.commonUserList;
+    },
+    getLogoUrl:state =>{
+      if(!state.logoUrl){
+        state.logoUrl = sessionStorage.getItem("logoUrl")
+      }
+    }
+}
+
+export default {
+    namespaced: true,
+    state,
+    mutations,
+    actions
+}