Merge remote-tracking branch 'origin/master'

5 years ago · 065512f971
15 changed files with 465 additions and 65 deletions
--- a/dist.7z
+++ b/dist.7z
--- a/package-lock.json
+++ b/package-lock.json
@ -3531,6 +3531,11 @@
      "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.7.tgz",
      "integrity": "sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg="
    },
+    "dayjs": {
+      "version": "1.10.7",
+      "resolved": "https://r.cnpmjs.org/dayjs/download/dayjs-1.10.7.tgz",
+      "integrity": "sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg="
+    },
    "de-indent": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
--- a/package.json
+++ b/package.json
@ -17,6 +17,7 @@
    "axios": "0.17.1",
    "babel-plugin-component": "0.10.1",
    "babel-polyfill": "6.26.0",
+    "dayjs": "^1.10.7",
    "decimal.js": "^10.3.1",
    "element-ui": "2.8.2",
    "file-saver": "^2.0.5",
@ -37,8 +38,7 @@
    "vue-json-excel": "^0.3.0",
    "vue-router": "3.0.1",
    "vuex": "3.0.1",
-    "xlsx": "^0.17.0",
-    "dayjs": "1.10.7"
+    "xlsx": "^0.17.0"
  },
  "devDependencies": {
    "autoprefixer": "7.1.2",
--- a/src/api/base/site.js
+++ b/src/api/base/site.js
@ -83,3 +83,13 @@ export const deleteWorkCenterData = data => createAPI(`/base/deleteWorkCenterDat

 //校验客户编号是否存在
 export const checkCustomerID = data => createAPI(`/base/checkCustomerID`,'post',data)
+
+//------------会计单位信息----------------
+// 获取停机原因
+export const getCompanyInformation = data => createAPI(`/base/getCompanyInformation`,'post',data)
+
+// 保存修改停机原因
+export const saveCompanyInformation = data => createAPI(`/base/saveCompanyInformation`,'post',data)
+
+// 删除停机原因
+export const deleteCompanyInformation = data => createAPI(`/base/deleteCompanyInformation`,'post',data)
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@ -202,6 +202,7 @@
 .el-form-item__label {
  font-size: 12px;
 }
+
 /* checkbox__label */
 .el-checkbox__label {
  font-size: 12px;
--- a/src/router/index.js
+++ b/src/router/index.js
@ -40,7 +40,7 @@ const mainRoutes = {
    // { path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } }
  ],
  beforeEnter (to, from, next) {
-    let token = Vue.cookie.get('token')
+    let token =Vue.cookie.get('token')
    if (!token || !/\S/.test(token)) {
      clearLoginInfo()
      next({ name: 'login' })
--- a/src/utils/httpRequest.js
+++ b/src/utils/httpRequest.js
@ -19,7 +19,7 @@ const http = axios.create({
 * 请求拦截
 */
 http.interceptors.request.use(config => {
-  config.headers['token'] = Vue.cookie.get('token') // 请求头带上token
+  config.headers['token'] =Vue.cookie.get('token') // 请求头带上token
  return config
 }, error => {
  return Promise.reject(error)
@ -92,7 +92,7 @@ const instance = axios.create({
 * 请求拦截
 */
 instance.interceptors.request.use(config => {
-  config.headers['token'] = Vue.cookie.get('token') // 请求头带上token
+ config.headers['token'] =Vue.cookie.get('token') // 请求头带上token
  return config
 }, error => {
  return Promise.reject(error)
--- a/src/views/common/home.vue
+++ b/src/views/common/home.vue
@ -13,7 +13,7 @@
      languageRefresh(){
        let bool = localStorage.getItem('refresh')
        if (bool == '0'){
-          this.$router.go(0);
+         // this.$router.go(0);
          localStorage.setItem('refresh','1')
        }
      }
--- a/src/views/modules/base/companyInformation.vue
+++ b/src/views/modules/base/companyInformation.vue
@ -0,0 +1,380 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
+      <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'查询'}}</el-button>
+      <el-button @click="addModal()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'新增'}}</el-button>
+    </el-form>
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" @click="editData(scope.row)">修改</a>
+          <a type="text" size="small" @click="deleteData(scope.row)">删除</a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed"
+        :width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                             style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-dialog title="数据维护" :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="500px" >
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item :label="'会计单位编号：'">
+          <el-input v-model="modelData.companyID"  :disabled="modelInputFlag" style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'会计单位名称：'">
+          <el-input v-model="modelData.companyName"   style="width: 130px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'税号：'">
+          <el-input v-model="modelData.taxNo"  style="width: 130px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item :label="'开户行名称：'">
+          <el-input v-model="modelData.bankName"   style="width: 200px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'开户行账号：'">
+          <el-input v-model="modelData.bankAccount" style="width: 200px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item :label="'月结日期：'">
+          <el-select filterable v-model="modelData.cutoffDate" style="width: 130px">
+            <el-option label="自然月月底" value="自然月月底"></el-option>
+            <el-option label="每月固定日" value="每月固定日"></el-option>
+            <el-option label="不固定" value="不固定"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'每月几号：'">
+          <el-input v-model="modelData.cutoffDateFixDate"  style="width: 130px" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input>
+        </el-form-item>
+        <el-form-item :label="'在用：'">
+          <el-select filterable v-model="modelData.active" style="width: 130px">
+            <el-option label="Y" value="Y"></el-option>
+            <el-option label="N" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-footer  style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveData()">保存</el-button>
+        <el-button type="primary" @click="modelFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+  import {
+    getCompanyInformation,
+    saveCompanyInformation,
+    deleteCompanyInformation,
+  } from "@/api/base/site.js"
+
+  export default {
+    name: "companyInformation",
+    data() {
+      return {
+        height: 200,
+        modelFlag:false,
+        modelInputFlag:true,
+        selectList:[],
+        modelData: {
+          add:'',
+          companyID:'',
+          companyName:'',
+          active:'',
+          taxNo:'',
+          bankName:'',
+          bankAccount:'',
+          cutoffDate:'',
+          cutoffDateFixDate:'',
+        },
+        dataList:[],
+        dataListLoading: false,
+        buttons:{
+          search:'查询',
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6037,
+            serialNumber: '6037TableCompanyId',
+            tableId: "6037Table",
+            tableName: "会计单位信息表",
+            columnProp: "companyID",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "会计单位编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6037,
+            serialNumber: '6037TableCompanyName',
+            tableId: "6037Table",
+            tableName: "会计单位信息表",
+            columnProp: "companyName",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "会计单位名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 200
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6037,
+            serialNumber: '6037TableTaxNo',
+            tableId: "6037Table",
+            tableName: "会计单位信息表",
+            columnProp: "taxNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "税号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 200
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6037,
+            serialNumber: '6037TableBankName',
+            tableId: "6037Table",
+            tableName: "会计单位信息表",
+            columnProp: "bankName",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "开户行名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6037,
+            serialNumber: '6037TableBankAccount',
+            tableId: "6037Table",
+            tableName: "会计单位信息表",
+            columnProp: "bankAccount",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "开户行账号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 200
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6037,
+            serialNumber: '6037TableActive',
+            tableId: "6037Table",
+            tableName: "会计单位信息表",
+            columnProp: "active",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "在用",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 40
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6037,
+            serialNumber: '6037TableCutoffDate',
+            tableId: "6037Table",
+            tableName: "会计单位信息表",
+            columnProp: "cutoffDate",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "月结日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 6037,
+            serialNumber: '6037TableCutoffDateFixDate',
+            tableId: "6037Table",
+            tableName: "会计单位信息表",
+            columnProp: "cutoffDateFixDate",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "每月几号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+            columnWidth: 80
+          }
+        ],
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 180;
+      })
+    },
+    methods: {
+      getData(){
+        let data={};
+        getCompanyInformation(data).then(({data}) => {
+          this.dataList = data.rows
+        })
+      },
+      addModal(){
+        this.modelData={};
+        this.modelData.add=0;
+        this.modelInputFlag=false;
+        this.modelData.active='Y';
+        this.modelFlag=true;
+      },
+      editData(row){
+        this.modelData=JSON.parse(JSON.stringify(row));
+        this.modelData.add=1;
+        this.modelInputFlag=true;
+        this.modelFlag=true;
+      },
+      deleteData(row){
+        this.$confirm(`是否删除此条会计单位记录?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.modelData=JSON.parse(JSON.stringify(row));
+          deleteCompanyInformation(this.modelData).then(({data}) => {
+            if (data && data.code == 200) {
+              this.modelFlag = false
+              this.getData();
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      saveData(){
+        saveCompanyInformation(this.modelData).then(({data}) => {
+          if(this.modelData.companyID==''||this.modelData.companyID==null){
+            this.$alert("请输入会计单位编号！",'错误',{
+              confirmButtonText:'确定'
+            })
+            return false;
+          }
+          if(this.modelData.companyName==''||this.modelData.companyName==null){
+            this.$alert("请输入会计单位名称！",'错误',{
+              confirmButtonText:'确定'
+            })
+            return false;
+          }
+          if(this.modelData.active==''||this.modelData.active==null){
+            this.$alert("请选择是否在用！",'错误',{
+              confirmButtonText:'确定'
+            })
+            return false;
+          }
+          if(this.modelData.cutoffDate==''||this.modelData.cutoffDate==null){
+            this.$alert("请选择月结日期！",'错误',{
+              confirmButtonText:'确定'
+            })
+            return false;
+          }
+          if(this.modelData.cutoffDateFixDate==''||this.modelData.cutoffDateFixDate==null){
+            this.modelData.cutoffDateFixDate=0;
+          }
+          if(this.modelData.cutoffDateFixDate>31){
+            this.$alert("请输入正确的每月几号！",'错误',{
+              confirmButtonText:'确定'
+            })
+            return false;
+          }
+          if (data && data.code == 200) {
+            this.modelFlag = false
+            this.getData();
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      }
+    },
+    created() {
+      this.getData();
+    }
+  }
+</script>
+
+<style >
+  .el-textarea__inner {
+    padding: 5px 5px;
+  }
+</style>
--- a/src/views/modules/base/factoryInformation.vue
+++ b/src/views/modules/base/factoryInformation.vue
@ -158,6 +158,42 @@
            search:'查询',
          },
          columnList: [
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6001,
+              serialNumber: '6001TableSiteID',
+              tableId: "6001Table",
+              tableName: "工厂信息表",
+              columnProp: "siteID",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "工厂编码",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 60
+            },
+            {
+              userId: this.$store.state.user.name,
+              functionId: 6001,
+              serialNumber: '6001TableSiteName',
+              tableId: "6001Table",
+              tableName: "工厂信息表",
+              columnProp: "siteName",
+              headerAlign: "center",
+              align: "left",
+              columnLabel: "工厂名称",
+              columnHidden: false,
+              columnImage: false,
+              columnSortable: false,
+              sortLv: 0,
+              status: true,
+              fixed: false,
+              columnWidth: 120
+            },
            {
              userId: this.$store.state.user.name,
              functionId: 6001,
@ -374,42 +410,6 @@
              fixed: false,
              columnWidth: 50
            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableSiteName',
-              tableId: "6001Table",
-              tableName: "工厂信息表",
-              columnProp: "siteName",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "工厂名称",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 120
-            },
-            {
-              userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableSiteID',
-              tableId: "6001Table",
-              tableName: "工厂信息表",
-              columnProp: "siteID",
-              headerAlign: "center",
-              align: "left",
-              columnLabel: "工厂编码",
-              columnHidden: false,
-              columnImage: false,
-              columnSortable: false,
-              sortLv: 0,
-              status: true,
-              fixed: false,
-              columnWidth: 60
-            },
            {
              userId: this.$store.state.user.name,
              functionId: 6001,
--- a/src/views/modules/purchaseorder/purchaseRequisition.vue
+++ b/src/views/modules/purchaseorder/purchaseRequisition.vue
@ -212,7 +212,8 @@
                    v-model="currentPRDetailData.qty"></el-input>
        </el-form-item>
        <el-form-item :label="inputSearch8">
-          <el-input style="text-align: left;width: 143px" v-model="currentPRDetailData.price" @change="getNumber()"  oninput="value=value.replace(/^\.+|[^\d.]/g,'')"></el-input>
+          <el-input style="text-align: left;width: 143px" v-model="currentPRDetailData.price" @change="getNumber()"
+                    oninput="value=value.replace(/^\.+|[^\d.]/g,'')"></el-input>
        </el-form-item>
        <el-form-item :label="inputSearch9">
          <el-input style="text-align: left;width: 143px"
@ -325,12 +326,14 @@ import {
  getFileList,
 } from '@/api/purchaseorder/purchaseRequisition.js'
 import upload from "../common/upload";
+import axios from "axios";
+import Vue from "vue";

 export default {
  components: {upload},
  data() {
    return {
-      insertFileList : [],
+      insertFileList: [],
      fileList: [],
      // table 高度
      height: 0,
@ -369,7 +372,7 @@ export default {
        additionalCose: 0,
        orderref1: '',
        orderref2: '',
-        sysOssEntityList : [],
+        sysOssEntityList: [],
      },
      mainQueryData: {
        requisitionno: '',
@ -1001,28 +1004,26 @@ export default {

  methods: {
    //获取申请单号文件信息
-    getFileList(row){
+    getFileList(row) {
      let jsonData = {
-        site : row.site,
-        type : 'PRFile',
-        associatedField1 : row.requisitionno
+        site: row.site,
+        type: 'PRFile',
+        associatedField1: row.requisitionno
      }
      this.fileList = []
-      getFileList(jsonData).then(({data}) =>{
-        if(data.code == 0){
+      getFileList(jsonData).then(({data}) => {
+        if (data.code == 0) {
          this.fileList = data.row
        }
      })
    },
    // 文件下载
    fileDownload(row) {
-      this.$http({
-        url: this.$http.adornUrl('ftp/file/downFtpFile'),
-        method: 'post',
-        data: JSON.stringify(row),
+      axios.get('/api/ftp/file/downFtpFile/' + row.id, {
        responseType: 'blob',
        headers: {
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          'token':Vue.cookie.get('token')
        }
      }).then(({data}) => {
        // 不限制文件下载类型
@ -1033,7 +1034,7 @@ export default {
        const linkNode = document.createElement('a')
        linkNode.download = fileName // a标签的download属性规定下载文件的名称
        linkNode.style.display = 'none'
-        linkNode.href = URL.createObjectURL(blob) // 生成一个Blob URL
+        linkNode.href = window.URL.createObjectURL(blob) // 生成一个Blob URL
        document.body.appendChild(linkNode)
        linkNode.click() // 模拟在按钮上的一次鼠标单击
        URL.revokeObjectURL(linkNode.href) // 释放URL 对象
@ -1042,8 +1043,8 @@ export default {
    },
    childByValue(childValue) {
      // childValue就是子组件传过来的值
-      this.fileList.push( childValue )
-      this.insertFileList.push( childValue )
+      this.fileList.push(childValue)
+      this.insertFileList.push(childValue)
    },
    updateAuthorizeFlag(row) {
      let saveData = {
--- a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
+++ b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
@ -825,10 +825,10 @@
        getPartNoDetail(inData).then(({data}) => {
          if (data.total > 0) {
            this.dataForm.partDescription=data.rows[0].partDescription;
-            this.dataForm = JSON.parse(JSON.stringify(this.dataForm));
+            //this.dataForm = JSON.parse(JSON.stringify(this.dataForm));
          } else {
            this.dataForm.partNo = '';
-            this.dataForm = JSON.parse(JSON.stringify(this.dataForm));
+          // this.dataForm = JSON.parse(JSON.stringify(this.dataForm));
            this.$alert('该物料编码不存在', '错误', {
              confirmButtonText: '确定'
            })
@ -859,8 +859,8 @@
        getSupplierDetail(inData).then(({data}) => {
          let outList = data.rows
          if (outList.length>0){
-            // this.modelData.supplierName=outList[0].supplierName;
-            this.$set(this.dataForm,'supplierName',outList[0].supplierName)
+             this.dataForm.supplierName=outList[0].supplierName;
+           // this.$set(this.dataForm,'supplierName',outList[0].supplierName)
          }else {
            this.dataForm.supplierName='';
            this.dataForm.supplierID='';
--- a/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue
+++ b/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue
@ -1,5 +1,6 @@
 <template>
  <div class="mod-config">
+
    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
      <el-form-item :label="'录入日期：'">
        <el-date-picker
@ -1052,7 +1053,8 @@
  }
 </script>

-<style >
+<style scoped>
+
  .el-textarea__inner {
    padding: 5px 5px;
  }
--- a/src/views/modules/sys/language/common.vue
+++ b/src/views/modules/sys/language/common.vue
@ -727,6 +727,7 @@ import column from "../../common/column";
      createExportData() {
        // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
        // TODO:构造需要下载的数据返回
+
        if(this.dataListSelections.length>0){
          return this.dataListSelections;
        }
--- a/src/views/modules/sys/menu.vue
+++ b/src/views/modules/sys/menu.vue
@ -93,7 +93,7 @@
  export default {
    data () {
      return {
-        height: 450,
+       // height: 450,
        dataForm: {},
        dataList: [],
        dataListLoading: false,