样式

2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
--- a/src/views/PurchasingCenter/CreateInquirySheet/Export2Excel.js
+++ b/src/views/PurchasingCenter/CreateInquirySheet/Export2Excel.js
@@ -1,12 +1,7 @@
 /* eslint-disable */
 require('script-loader!file-saver');
-<<<<<<< HEAD
-// import XLSX from 'xlsx'
-import XLSX from 'xlsx-style'
-=======
 import XLSX from 'xlsx'

->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 function generateArray(table) {
  var out = [];
  var rows = table.querySelectorAll('tr');
@@ -150,76 +145,6 @@ export function export_table_to_excel(id) {
 }

 export function export_json_to_excel({
-<<<<<<< HEAD
-  headerGroup,
-  dataGroup,
-  sheetGroup,
-  filename,
-  autoWidth = true,
-  bookType=  'xlsx'
-} = {}) {
-  var wb = new Workbook()
-  for (let i = 0; i < dataGroup.length; i++) {
-    /* original data */
-    let data = dataGroup[i]
-    filename = filename || 'excel-list'
-    data = [...data]
-    data.unshift(headerGroup[i]);
-    var ws_name = sheetGroup[i];
-    var ws = sheet_from_array_of_arrays(data);
-
-    if (autoWidth) {
-      /*设置worksheet每列的最大宽度*/
-      const colWidth = data.map(row => row.map(val => {
-        /*先判断是否为null/undefined*/
-        if (val == null) {
-          return {
-            'wch': 10
-          };
-        }
-        /*再判断是否为中文*/
-        else if (val.toString().charCodeAt(0) > 255) {
-          return {
-            'wch': val.toString().length * 2
-          };
-        } else {
-          return {
-            'wch': val.toString().length
-          };
-        }
-      }))
-      /*以第一行为初始值*/
-      let result = colWidth[0];
-      for (let i = 1; i < colWidth.length; i++) {
-        for (let j = 0; j < colWidth[i].length; j++) {
-          if (result[j]['wch'] < colWidth[i][j]['wch']) {
-            result[j]['wch'] = colWidth[i][j]['wch'];
-          }
-        }
-      }
-      ws['!cols'] = result;
-    }
-    let R = 0;
-    data.map(item => {
-      let C = 0;
-      item.map(itm => {
-        var cell_ref = XLSX.utils.encode_cell({c:C,r:R});
-        var cell = {v: itm }
-        cell.s= {
-          alignment: {
-            horizontal: "center"
-          }
-        }
-        ws[cell_ref] = cell;
-        C++;
-      })
-      R++;
-    })
-    /* add worksheet to workbook */
-    wb.SheetNames.push(ws_name);
-    wb.Sheets[ws_name] = ws;
-  }
-=======
  multiHeader = [],
  header,
  data,
@@ -284,7 +209,6 @@ export function export_json_to_excel({
  wb.SheetNames.push(ws_name);
  wb.Sheets[ws_name] = ws;

->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
  var wbout = XLSX.write(wb, {
    bookType: bookType,
    bookSST: false,
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -706,13 +706,6 @@
    <el-dialog :visible.sync="dialogVisible2" :title="title2" center style="min-height: 300px" width="400px">
      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="90px">
        <el-form-item label="询价单号" prop="inquirySheetNum">
-<<<<<<< HEAD
-          <el-input v-model="form2.inquirySheetNum" size="small"/>
-        </el-form-item>
-        <el-form-item label="供应商" prop="supplierName">
-          <el-input v-model="form2.supplierName" size="small" readonly @focus="dialogVisible1=true;enterpriseNature = '';createDate = '';registeredCapital = '';taxNum = '';EMail = '';address = '';account = '';openingBank = '';phone = '';fax = '';goodTime = ''"/>
-        </el-form-item>
-=======
          <el-input v-model="form2.inquirySheetNum" readonly size="small"/>
        </el-form-item>
        <el-form-item label="供应商" prop="supplierNameValue">
@@ -727,7 +720,6 @@
        <!--<el-form-item label="供应商" prop="supplierName">-->
        <!--<el-input v-model="form2.supplierName" size="small" readonly @focus="dialogVisible1=true;enterpriseNature = '';createDate = '';registeredCapital = '';taxNum = '';EMail = '';address = '';account = '';openingBank = '';phone = '';fax = '';goodTime = ''"/>-->
        <!--</el-form-item>-->
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" @click="dialogVisible2=false">取消</el-button>
@@ -735,11 +727,7 @@
          v-show="title2==='创建询价单'"
          type="primary"
          size="small"
-<<<<<<< HEAD
-          @click="submitCreateInquirySheet">确定</el-button>
-=======
          @click="submitCreateInquirySheet1">确定</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
        <el-button
          v-show="title2==='编辑询价单'"
          type="primary"
@@ -878,11 +866,7 @@
 </template>

 <script>
-<<<<<<< HEAD
-import { searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
-=======
 import { getBillNum, searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
  createInquirySheet, deleteInquirySheet, addInquirySheet1, addInquirySheet2, outInquirySheet, searchAllMaterial, materialChange, saveOrder,
  submitUseInventory, initProject, searchMachine, searchGroup, searchBaseInfo, editBaseInfo, getExport1, getExport2, searchMerge } from '@/api/PurchasingCenter/CreateInquirySheet'
 import { mapGetters } from 'vuex'
@@ -894,10 +878,7 @@ export default {
  name: '', // 创建询价单
  data() {
    return {
-<<<<<<< HEAD
-=======
      supplierNames: [], // 供应商下拉框
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      switchValue: false, // 物料变更列显示开关
      source: [
        {
@@ -1021,13 +1002,6 @@ export default {
        inquirySheetNumValue: '', // 询价单流水号
        inquirySheetNum: '',
        supplierName: '',
-<<<<<<< HEAD
-        supplierValue: ''
-      },
-      rules2: { // 表单验证规则
-        inquirySheetNum: [{ required: true, message: '请填写询价单号' }],
-        supplierName: [{ required: true, message: '请选择供应商' }]
-=======
        supplierValue: '',
        supplierNameValue: ''
      },
@@ -1035,7 +1009,6 @@ export default {
        inquirySheetNum: [{ required: true, message: '请填写询价单号' }],
        supplierName: [{ required: true, message: '请选择供应商' }],
        supplierNameValue: [{ required: true, message: '请选择供应商', trigger: 'change' }]
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      },
      groupPartNum: [], // 组件零件流水号
      groupPartBasicNum: [], // 组件零件基本件流水号
@@ -1323,8 +1296,6 @@ export default {
          })
        }
      })
-<<<<<<< HEAD
-=======
      searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
        for (let i = 0; i < response.data.length; i++) {
          this.supplierNames.push({
@@ -1333,7 +1304,6 @@ export default {
          })
        }
      })
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
    },
    projectChange() {
      this.machine = []
@@ -1510,21 +1480,11 @@ export default {
      this.pageCurrent2 = val
      this.searchTable2()
    },
-<<<<<<< HEAD
-    createInquirySheet() { // 创建空单据--询价单
-=======
    createInquirySheet() { // 创建空单据--询价单9745
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      if (this.$refs['form2'] !== undefined) {
        this.$refs['form2'].resetFields()
      }
      this.title2 = '创建询价单'
-<<<<<<< HEAD
-      this.form2.inquirySheetNum = ''
-      this.form2.supplierValue = ''
-      this.form2.supplierName = ''
-      this.dialogVisible2 = true
-=======
      getBillNum().then(response => { // 查询询价单号
        this.form2.inquirySheetNum = response.data[0].单号
        this.form2.supplierValue = ''
@@ -1532,7 +1492,6 @@ export default {
        this.form2.supplierName = ''
        this.dialogVisible2 = true
      })
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
    },
    submitCreateInquirySheet() { // 提交创建询价单
      this.$refs['form2'].validate((valid) => {
@@ -1546,11 +1505,7 @@ export default {
            if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1) {
              this.$message.error('该询价单号已存在')
            } else {
-<<<<<<< HEAD
-              createInquirySheet(this.form2.inquirySheetNum, this.form2.supplierValue, '', this.id).then(response => {
-=======
              createInquirySheet(this.form2.inquirySheetNum, this.id, this.form2.supplierValue, '').then(response => {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                if (response.data[0].result === '1') {
                  this.$message.success('创建成功')
                  this.inquirySheetNum = ''
@@ -1568,8 +1523,6 @@ export default {
        }
      })
    },
-<<<<<<< HEAD
-=======
    submitCreateInquirySheet1() { // 提交创建询价单
      this.$refs['form2'].validate((valid) => {
        if (valid) {
@@ -1588,7 +1541,6 @@ export default {
        }
      })
    },
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
    deleteInquirySheet(row) { // 删除询价单
      this.$confirm('确定删除该询价单?', '提示', {
        confirmButtonText: '确定',