Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

2018-12-25 20:08:12 +08:00
parent baf94308ab a6e05ba121
commit 94fcf8db14
15 changed files with 111 additions and 81 deletions
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
    "nprogress": "0.2.0",
    "qrcode": "^1.3.2",
    "time-formater": "^1.0.3",
+    "v-viewer": "^1.3.1",
    "vue": "2.5.17",
    "vue-router": "3.0.1",
    "vuex": "3.0.1",
--- a/src/api/Assembly/AssemblyProcessAssignment.js
+++ b/src/api/Assembly/AssemblyProcessAssignment.js
@@ -30,7 +30,7 @@ export function initPerson() {
    data: {
      type: '1',
      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=17=int'
+      param: '考核部门编号=9=int'
    }
  })
 }
--- a/src/api/Assembly/AssemblyProcessPlanning.js
+++ b/src/api/Assembly/AssemblyProcessPlanning.js
@@ -8,7 +8,7 @@ export function initCraftmen() {
    data: {
      type: '1',
      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=17'
+      param: '考核部门编号=9'
    }
  })
 }
--- a/src/api/Assembly/AssemblyQuotaSetting.js
+++ b/src/api/Assembly/AssemblyQuotaSetting.js
@@ -8,7 +8,7 @@ export function initCraftmen() {
    data: {
      type: '1',
      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=17'
+      param: '考核部门编号=9'
    }
  })
 }
--- a/src/api/WorkshopProcurement/OfflineContract1.js
+++ b/src/api/WorkshopProcurement/OfflineContract1.js
@@ -59,6 +59,17 @@ export function deleteData(RequisitionList) {
    }
  })
 }
+export function updateStatus(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理_离线合同_导出更改状态',
+      param: '请购单流水号=' + num
+    }
+  })
+}
 // 查询离线合同明细
 export function searchMateriel(num) {
  return request({
--- a/src/main.js
+++ b/src/main.js
@@ -17,10 +17,17 @@ import curd from '@/utils/curd'
 import time from 'time-formater'

 import htmlToPdf from '@/vendor/htmlToPdf'
-
+import Viewer from 'v-viewer'
+import 'viewerjs/dist/viewer.css'
 Vue.use(curd)
 Vue.use(htmlToPdf)
 Vue.use(ElementUI)
+// 查看图片
+Vue.use(Viewer)
+Viewer.setDefaults({
+  Options: { 'inline': true, 'button': true, 'navbar': true, 'title': true, 'toolbar': true, 'tooltip': true, 'movable': true, 'zoomable': true, 'rotatable': true, 'scalable': true, 'transition': true, 'fullscreen': true, 'keyboard': true, 'url': 'data-source' }
+})
+
 // 处理时间字符串格式全局过滤器 '2018/1/23 00:00:00' to '2018-01-23'
 Vue.filter('formatTime', function(value) {
  if (!value) return ''
--- a/src/views/Assembly/TypicalAssemblyMaintenance/index.vue
+++ b/src/views/Assembly/TypicalAssemblyMaintenance/index.vue
@@ -286,7 +286,7 @@ export default {
        for (let i = 0; i < response.data.length; i++) {
          this.GroupNumber.push({
            label: response.data[i].组号,
-            value: response.data[i].组号
+            value: response.data[i].组件流水号
          })
        }
      })
--- a/src/views/BasicData/MaterialMaintenance/index.vue
+++ b/src/views/BasicData/MaterialMaintenance/index.vue
@@ -63,7 +63,7 @@
    </el-dialog>

    <el-dialog :visible.sync="dialogFormVisible2" title="编辑材料" center style="min-height: 200px" width="400px">
-      <el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="110px">
+      <el-form ref="form2" :model="form2" :rules="rules1" label-position="left" label-width="110px">
        <el-form-item label="材料名称" prop="MaterialName2" style="display: inline-block">
          <el-input v-model="form2.MaterialName2" size="small" clearable style="width:200px"/>
        </el-form-item>
@@ -97,7 +97,9 @@ export default {
        MaterialName2: ''
      },
      rules: {
-        MaterialName: [{ required: true, message: '请输入材料名称', trigger: 'blur' }],
+        MaterialName: [{ required: true, message: '请输入材料名称', trigger: 'blur' }]
+      },
+      rules1: {
        MaterialName2: [{ required: true, message: '请输入材料名称', trigger: 'blur' }]
      }
    }
--- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue
+++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue
@@ -253,7 +253,7 @@ export default {
      this.listLoading = true
      this.tableData = []
      this.num0 = ''
-      if (this.radio === 1) {
+      if (this.radio === 1) { // 未编制
        detailInfo(this.partNumValue).then(response => {
          if (response.data.length !== 0) {
            this.typeValue = response.data[0].零件类型名称
@@ -264,6 +264,7 @@ export default {
          }
        }).then(() => {
          mainTable(this.num0).then(response => {
+            console.log(response.data)
            if (response.data.length === 0) {
              this.listLoading = false
            } else {
--- a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue
+++ b/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue
@@ -98,7 +98,7 @@
      </div>
    </el-card>

-    <el-dialog :visible.sync="dialogFormVisible1" title="外协价格计算系数维护" center width="20%">
+    <el-dialog :visible.sync="dialogFormVisible1" title="外协价格计算系数维护" center width="400px">
      <el-form ref="form" :model="form" :rules="rules" label-position="left" class="demo-ruleForm" label-width="100px" style="width: 90%;margin: auto">
        <el-row style="margin: 2px 0 30px 30px;">
          <el-radio-group v-model="radio">
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -73,7 +73,7 @@
          </el-col>
        </el-row>
      </el-form>
-      <el-table :data="tableData1" border style="margin-bottom: 10px;max-height: 300px;" height="300px" size="mini" show-summary>
+      <el-table :data="tableData1" border style="margin: 10px 0;max-height: 300px;" height="300px" size="mini" show-summary>
        <el-table-column label="序号" align="center" width="50" type="index"/>
        <el-table-column label="交货期" align="center" min-width="130">
          <template slot-scope="scope">
@@ -510,8 +510,8 @@ export default {
        document.getElementById('untaxTotal') ? document.getElementById('untaxTotal').innerHTML = this.untaxTotal : ''
        document.getElementById('tax') ? document.getElementById('tax').innerHTML = this.tax : ''
        document.getElementById('taxTotal') ? document.getElementById('taxTotal').innerHTML = this.taxTotal : ''
-        document.getElementsByClassName('actualTotal') ? document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal : ''
-        document.getElementsByClassName('actualTotal') ? document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal : ''
+        document.getElementsByClassName('actualTotal')[0] ? document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal : ''
+        document.getElementsByClassName('actualTotal')[1] ? document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal : ''
        document.getElementById('actualTotal_zh') ? document.getElementById('actualTotal_zh').innerHTML = this.actualTotal_zh : ''
        this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
        this.$refs.tinymce.initTinymce()
@@ -579,4 +579,7 @@ export default {
  span{
    margin: 0 0 0 20px;
  }
+  .el-form-item{
+    margin: 0;
+  }
 </style>
--- a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
@@ -197,6 +197,7 @@ export default {
  },
  methods: {
    fetchData() {
+      this.person = []
      initBuyer().then(response => {
        for (let i = 0; i < response.data.length; i++) {
          this.person.push({
@@ -206,6 +207,7 @@ export default {
          })
        }
      })
+      this.contractNum = []
      initContract().then(response => {
        for (let i = 0; i < response.data.length; i++) {
          this.contractNum.push({
@@ -244,7 +246,12 @@ export default {
            if (response.data[0].result === '1') {
              this.$message.success('审批成功')
              this.dialogVisible3 = false
+              this.fetchData() // 重新初始化
+              this.contractNumValue = ''
+              this.personValue = ''
+              this.supplierName = ''
              this.searchTable1()
+              this.returns = ''
            } else { this.$message.error('审批失败') }
          })
        } else {
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -56,6 +56,7 @@
    <el-card>
      <el-table
        v-loading="loading1"
+        id="expandTable"
        :data="tableData1"
        size="mini"
        border
@@ -101,17 +102,22 @@
            <el-tag v-if="scope.row.审批情况内容==='不通过审批'" type="danger" size="small">未通过</el-tag>
          </template>
        </el-table-column>
-        <el-table-column label="采购合同号" align="center" min-width="130">
+        <el-table-column label="审批时间" align="center" min-width="140">
+          <template slot-scope="scope">
+            {{ scope.row.审批时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="采购合同号" align="center" min-width="160">
          <template slot-scope="scope">
            {{ scope.row.采购合同编号 }}
          </template>
        </el-table-column>
-        <el-table-column label="采购合同名称" align="center" min-width="130">
+        <el-table-column label="采购合同名称" align="center" min-width="150">
          <template slot-scope="scope">
            {{ scope.row.采购合同名称 }}
          </template>
        </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="200">
+        <el-table-column label="供应商" align="center" min-width="220">
          <template slot-scope="scope">
            {{ scope.row.供应商名称 }}
          </template>
@@ -363,7 +369,7 @@ export default {
  }
 </style>
 <style>
-  .el-form-item {
+  #expandTable .el-form-item {
    margin: 0;
  }
 </style>
--- a/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue
+++ b/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue
@@ -9,17 +9,6 @@
          :label="item.label"
          :value="item.value"/>
      </el-select>
-      <!--<span>采购合同号:</span>-->
-      <!--<el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>-->
-      <!--<el-option-->
-      <!--v-for="item in contractNums"-->
-      <!--:key="item.value"-->
-      <!--:label="item.label"-->
-      <!--:value="item.value">-->
-      <!--<div style="float: left">{{ item.label }}</div>-->
-      <!--<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>-->
-      <!--</el-option>-->
-      <!--</el-select>-->
      <el-button
        type="success"
        size="small"
@@ -36,34 +25,29 @@
    </el-card>

    <el-card>
-      <el-table v-loading="" :data="tableData1" show-summary size="mini" style="max-height: 400px" height="400px" stripe border highlight-current-row @row-click="searchPic">
+      <el-table id="expandTable" :data="tableData1" show-summary size="mini" style="max-height: 400px" height="400px" stripe border @row-click="searchPicInner">
        <el-table-column type="expand">
          <template slot-scope="scope">
            <el-form id="table" label-position="left" inline class="demo-table-expand">
              <el-row>
-                <el-col :span="8">
+                <el-col :span="10">
+                  <viewer>
+                    <img :src="scope.row.scanSrc" alt="发票扫描件" height="200px">
+                  </viewer>
+                </el-col>
+                <el-col :span="14">
                  <el-form-item label="接收人">
                    {{ scope.row.接收人 ? scope.row.接收人 : '—' }}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
+                  </el-form-item><br>
                  <el-form-item label="接收时间">
                    {{ scope.row.接收时间 ? scope.row.接收时间 : '—' }}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
+                  </el-form-item><br>
                  <el-form-item label="发票号">
                    {{ scope.row.发票号 ? scope.row.发票号 : '—' }}
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
+                  </el-form-item><br>
                  <el-form-item label="开户行">
                    {{ scope.row.开户行 ? scope.row.开户行 : '—' }}
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
+                  </el-form-item><br>
                  <el-form-item label="开票时间">
                    {{ scope.row.开票时间 ? scope.row.开票时间.split(' ')[0] : '—' }}
                  </el-form-item>
@@ -83,7 +67,7 @@
            {{ scope.row.供应商名称 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="关联合同" min-width="80px">
+        <el-table-column align="center" label="相关合同" min-width="80px">
          <template slot-scope="scope">
            <el-popover placement="right" width="400" trigger="click">
              <el-table :data="tableData01" stripe size="mini" show-summary>
@@ -104,15 +88,10 @@
                  </template>
                </el-table-column>
              </el-table>
-              <el-button slot="reference" plain type="success" size="mini" icon="el-icon-search" @click="invoiceDetail(scope.row)"/>
+              <el-button slot="reference" plain type="success" size="mini" icon="el-icon-document" @click="invoiceDetail(scope.row)"/>
            </el-popover>
          </template>
        </el-table-column>
-        <el-table-column align="center" label="备注" min-width="150px">
-          <template slot-scope="scope">
-            {{ scope.row.备注 ? scope.row.备注 : '—' }}
-          </template>
-        </el-table-column>
        <el-table-column align="center" label="开票金额" min-width="100px" prop="开票金额">
          <template slot-scope="scope">
            {{ scope.row.开票金额 }}
@@ -128,6 +107,11 @@
            {{ scope.row.传送时间 }}
          </template>
        </el-table-column>
+        <el-table-column align="center" label="备注" min-width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.备注 ? scope.row.备注 : '—' }}
+          </template>
+        </el-table-column>
        <el-table-column align="center" label="操作" fixed="right" width="200px">
          <template slot-scope="scope">
            <el-button
@@ -156,7 +140,6 @@
          @size-change="handleSizeChange1"
          @current-change="handleCurrentChange1"/>
      </div>
-      <img :src="scanSrc" alt="发票扫描件" width="100%">
    </el-card>

    <el-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="460px">
@@ -208,7 +191,8 @@
          <el-form-item label="备注">
            <el-input v-model="form1.remark" size="small" placeholder="备注"/>
          </el-form-item>
-          <el-form-item label="发票扫描件">
+          <b style="color: #f56c6c;margin: 0">* </b>
+          <el-form-item label="发票扫描件" style="display: inline-block">
            <el-upload
              id="invoiceScan"
              ref="upload"
@@ -233,17 +217,18 @@
    <el-dialog :title="title1" :visible.sync="dialogVisible2" center style="min-height: 300px" width="1200px">
      <el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="80px">
        <el-row>
+          <el-col style="width: 800px">
+            <viewer>
+              <img :src="scanSrc" style="margin: 0 auto" alt="发票扫描件" width="800px">
+            </viewer>
+          </el-col>
          <el-col :span="6">
            <el-form-item label="供应商">
              <el-input v-model="form1.supplierName" size="small" disabled placeholder="供应商"/>
            </el-form-item>
-          </el-col>
-          <el-col :span="6">
            <el-form-item label="开票金额">
              <el-input v-model="form1.money" size="small" disabled placeholder="开票金额"/>
            </el-form-item>
-          </el-col>
-          <el-col :span="6">
            <el-form-item label="传送人">
              <el-select v-model="form1.sendPersonValue" placeholder="传送人" size="small" disabled>
                <el-option
@@ -253,8 +238,6 @@
                  :value="item.value"/>
              </el-select>
            </el-form-item>
-          </el-col>
-          <el-col :span="6">
            <el-form-item label="接收人">
              <el-select v-model="form1.receivePersonValue" placeholder="接收人" size="small" disabled>
                <el-option
@@ -264,25 +247,15 @@
                  :value="item.value"/>
              </el-select>
            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
            <el-form-item label="备注">
              <el-input v-model="form1.remark" size="small" disabled placeholder="备注"/>
            </el-form-item>
-          </el-col>
-          <el-col :span="6">
            <el-form-item label="发票号" prop="invoiceNum">
              <el-input v-model="form1.invoiceNum" size="small" placeholder="发票号"/>
            </el-form-item>
-          </el-col>
-          <el-col :span="6">
            <el-form-item label="开户行" prop="bank">
              <el-input v-model="form1.bank" size="small" placeholder="开户行"/>
            </el-form-item>
-          </el-col>
-          <el-col :span="6">
            <el-form-item label="开票时间" prop="invoiceTime">
              <el-date-picker
                v-model="form1.invoiceTime"
@@ -294,11 +267,6 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <el-row>
-          <el-form-item label="扫描件">
-            <img :src="scanSrc" alt="发票扫描件" width="1000px">
-          </el-form-item>
-        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
@@ -320,7 +288,7 @@ export default {
    return {
      offline: '非离线',
      check1: 0,
-      office: false,
+      office: null, // 是否为办公室
      scanSrc: '',
      upload: uploadInvoiceScan,
      limit: 1,
@@ -374,12 +342,15 @@ export default {
      'sidebar',
      'avatar',
      'name',
+      'token', // 角色编号
      'id' // 人员编号
    ])
  },
  created() {
    this.fetchData()
    this.searchTable1()
+    console.log(this.token)
+    Number(this.token) === 8 ? this.office = true : this.office = false // 是否为办公室，8是办公室，2是采购部
  },
  methods: {
    offlineChange2() { // 切换离线非离线(内)
@@ -457,6 +428,13 @@ export default {
      this.contractNumValue ? this.check2 = 1 : this.check2 = 0
      searchInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.supplierNumValue, this.check2, this.contractNumValue).then(response => {
        this.tableData1 = response.data.rows
+        this.tableData1.map(v => {
+          this.$set(v, 'scanSrc', '')
+          return v
+        })
+        for (let i = 0; i < response.data.rows.length; i++) {
+          this.tableData1[i].scanSrc = this.searchPic(response.data.rows[i], i)
+        }
        this.total1 = response.data.total
      })
      this.scanSrc = ''
@@ -570,7 +548,18 @@ export default {
        })
      })
    },
-    async searchPic(row) {
+    async searchPic(row, i) {
+      const { data } = await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '3',
+          name: `select * from 采购管理_采购发票_附件 where 是否启用 = 1 and 发票交接流水号 = ${row.发票交接流水号}`
+        }
+      })
+      this.tableData1[i].scanSrc = 'http://localhost:8411/webpage/file/' + data[0].文件标识 + '.' + data[0].文件后缀
+    },
+    async searchPicInner(row) {
      const { data } = await request({
        url: '',
        method: 'post',
@@ -586,6 +575,9 @@ export default {
 </script>

 <style scoped>
+  #expandTable .el-form-item{
+    margin: 0;
+  }
  .el-tag{
    margin: 0
  }
@@ -601,9 +593,6 @@ export default {
  .el-input{
    width:200px
  }
-  span{
-    margin: 10px 0 10px 10px;
-  }
  .searchForm .el-form-item{
    margin-top: 1px;
    margin-bottom: 1px;
--- a/src/views/WorkshopProcurement/OfflineContract1/index.vue
+++ b/src/views/WorkshopProcurement/OfflineContract1/index.vue
@@ -136,7 +136,7 @@
        <el-table-column label="操作" align="center" width="350px" fixed="right">
          <template slot-scope="scope">
            <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button type="warning" size="mini" icon="el-icon-download" @click="exportTable('QG')">导出</el-button>
+            <el-button type="warning" size="mini" icon="el-icon-download" @click="exportTable('QG', scope.row)">导出</el-button>
            <el-button type="danger" size="mini" icon="el-icon-delete" style="margin-left: 15px" @click="handleDelete(scope.row)">作废</el-button>
          </template>
        </el-table-column>
@@ -249,7 +249,7 @@
 </template>

 <script>
-import { searchInventoryNum, searchOfflineContract, addData, editData, deleteData, searchMateriel, update,
+import { searchInventoryNum, searchOfflineContract, addData, editData, deleteData, searchMateriel, update, updateStatus,
  addMateriel, deleteMateriel, setSafeValue } from '@/api/WorkshopProcurement/OfflineContract1'
 import { mapGetters } from 'vuex'
 import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
@@ -375,7 +375,10 @@ export default {
      this.pageCurrent2 = val
      this.searchTable2()
    },
-    exportTable(tableid) {
+    exportTable(tableid, row) {
+      updateStatus(row.请购单流水号).then(response => {
+        this.searchTable2()
+      })
      if (this.tableData3.length === 0) {
        this.$message.warning('暂无数据')
      } else {