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

2018-12-29 09:34:46 +08:00
parent 679a6d3c90 2d69c5e288
commit 7ee74a318a
18 changed files with 46 additions and 61 deletions
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -631,6 +631,7 @@
 <script>
 import request from '@/utils/request'
 import elInput from 'element-ui/packages/input'
+import { readImg } from '@/utils/request'
 import { initProject, selectProvince, SelectMarketingManager, searchTable1, selectMachine, searchTableDataInvoiceRecord, searchTableContractCapitalManagement, searchTableSafetyMargin, searchTableBidBond, typeOfPerformanceBond, searchTableDataPerformanceBond, searchTableDataDeliveryManagement } from '@/api/MarketingCenter/ComprehensiveInquiryMS'
 export default {
  components: {
@@ -878,7 +879,7 @@ export default {
          name: `select * from 合同信息管理_履约保证金_履约保函 where 是否启用 = 1 and 项目流水号 = ${this.projectNum}`
        }
      })
-      this.url = 'http://localhost:8411/webpage/img/' + data[0].文件标识
+      this.url = readImg + data[0].文件标识
    },
    async handleRemove(file, fileList) {
      const { data } = await request({
--- a/src/views/MarketingCenter/DeliveryManagement/index.vue
+++ b/src/views/MarketingCenter/DeliveryManagement/index.vue
@@ -111,7 +111,7 @@
              :before-upload="beforeUpload"
              :on-success="onSuccess"
              :limit="5"
-              :action="'http://localhost:8411/submit/upload2.ashx?InvoiceNum='+ invoiceNum"
+              :action="upload2 + '?InvoiceNum=' + invoiceNum"
              list-type="picture-card">
              <i class="el-icon-plus"/>
            </el-upload>
@@ -609,12 +609,15 @@ import elInput from 'element-ui/packages/input'
 import $ from 'jquery'
 import { selectDelivery, submitRremove, searchCargoBoxDetailed, submitMoveInto, delCargoBox, addCargoBox, searchCargoBox, editInvoice, delInvoice, addInvoice, editAdress, addAdress, deleteAdress, citySearch, provinceSearch, addressSearch, searchParts, searchHost, searchSparePart, searchProjectName, searchPackingList, searchFile, searchInvoice } from '@/api//MarketingCenter/DeliveryManagement'
 import QRCode from 'qrcode'
+import { upload2, readImg } from '@/utils/request'
+
 export default {
  components: {
    elInput
  },
  data() {
    return {
+      upload2: upload2,
      btnAdd: false,
      btnDel: false,
      btnLoading: false,
@@ -1224,7 +1227,7 @@ export default {
        return {
          _id: item.附件号,
          name: item.文件标识,
-          url: 'http://localhost:8411/webpage/img/' + item.文件标识
+          url: readImg + item.文件标识
        }
      })
    },
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -209,7 +209,7 @@
                  :file-list="fileList"
                  :before-upload="beforeUpload"
                  :on-success="onSuccess"
-                  :action="'http://localhost:8411/submit/upload3.ashx?ProjectId='+ projectId"
+                  :action="upload3 + '?ProjectId=' + projectId"
                  list-type="picture-card">
                  <i class="el-icon-plus"/>
                </el-upload>
@@ -291,6 +291,7 @@
 <script>
 import request from '@/utils/request'
 import elInput from 'element-ui/packages/input'
+import { upload3, readImg } from '@/utils/request'
 import { initProject, searchTableData1, typeOfPerformanceBond, searchTableData2, takeBack, executionProgressID, initType, addPerformanceBond, editPerformanceBond, delPerformanceBond, addPerformanceGuarantee, delPerformanceGuarantee } from '@/api/MarketingCenter/PerformanceBond'
 export default {
  components: {
@@ -305,6 +306,7 @@ export default {
      }
    }
    return {
+      upload3: upload3,
      title1: '', //   履约保证金新增或编辑对话框
      entryNameValue: '', // 查询条件_项目名称
      entryName: [], // 查询条件_项目名称数组
@@ -722,7 +724,7 @@ export default {
        return {
          _id: item.履约保函流水号,
          name: item.文件标识,
-          url: 'http://localhost:8411/webpage/img/' + item.文件标识
+          url: readImg + item.文件标识
        }
      })
    },
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -143,7 +143,7 @@
          <template slot-scope="scope">
            <el-tag v-if="Number(scope.row.离线合同状态)===1" type="warning" size="small">编辑中</el-tag>
            <el-tag v-if="Number(scope.row.离线合同状态)===2&&Number(scope.row.总采购数量)!==Number(scope.row.总到货数量)" type="primary" size="small">已采购</el-tag>
-            <el-tag v-if="Number(scope.row.总采购数量)===Number(scope.row.总到货数量)" type="success" size="small">全部到货</el-tag>
+            <el-tag v-if="Number(scope.row.总采购数量)===Number(scope.row.总到货数量)&&Number(scope.row.总采购数量)!==0" type="success" size="small">全部到货</el-tag>
          </template>
        </el-table-column>
        <el-table-column label="离线合同编号" align="center" min-width="170">
@@ -755,6 +755,7 @@ export default {
          if (response.data[0].result === '1') {
            this.$message.success('删除成功')
            this.searchTable2()
+            this.disable = true
            searchMateriel(this.offlineContractNum).then(response => {
              this.tableData3 = response.data
            })
@@ -973,7 +974,7 @@ export default {
        const printNode = $(htmlNode)
        body.append(printNode)
        window.print()
-        body.children().show()
+        body.children().not('script').show()
        printNode.remove()
      }).catch(res => {
        console.log(res)
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -254,7 +254,7 @@ export default {
        const printNode = $(htmlNode)
        body.append(printNode)
        window.print()
-        body.children().show()
+        body.children().not('script').show()
        printNode.remove()
      } else {
        this.$message.error('请选择合同')
@@ -268,8 +268,6 @@ export default {
          quality: 0.3
        }
      }
-      // const str = 'http://192.168.1.111:8022/searchContract.html?contractNum=' + contractNum
-      // const str = 'http://192.168.1.111:8080/#/ContractInquiry/index?id=' + contractNum
      const str = contractNum
      QRCode.toDataURL(str, opts, function(err, url) {
        if (err) throw err
--- a/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue
+++ b/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue
@@ -279,7 +279,7 @@
 <script>
 import { searchInvoice, editInvoice, deleteInvoice, initSender, initSupplier, searchContract, searchOffline, invoiceDetail } from '@/api/PurchasingCenter/PurchaseInvoiceDelivery'
 import { mapGetters } from 'vuex'
-import { uploadInvoiceScan } from '@/utils/request'
+import { uploadInvoiceScan, readFile } from '@/utils/request'
 import request from '@/utils/request'

 export default {
@@ -557,7 +557,7 @@ export default {
          name: `select * from 采购管理_采购发票_附件 where 是否启用 = 1 and 发票交接流水号 = ${row.发票交接流水号}`
        }
      })
-      this.tableData1[i].scanSrc = 'http://localhost:8411/webpage/file/' + data[0].文件标识 + '.' + data[0].文件后缀
+      this.tableData1[i].scanSrc = readFile + data[0].文件标识 + '.' + data[0].文件后缀
    },
    async searchPicInner(row) {
      const { data } = await request({
@@ -568,7 +568,7 @@ export default {
          name: `select * from 采购管理_采购发票_附件 where 是否启用 = 1 and 发票交接流水号 = ${row.发票交接流水号}`
        }
      })
-      this.scanSrc = 'http://localhost:8411/webpage/file/' + data[0].文件标识 + '.' + data[0].文件后缀
+      this.scanSrc = readFile + data[0].文件标识 + '.' + data[0].文件后缀
    }
  }
 }
--- a/src/views/TechnologyCenter/CreatePackingList/index.vue
+++ b/src/views/TechnologyCenter/CreatePackingList/index.vue
@@ -16,6 +16,7 @@
        v-loading="loading"
        :data="receiptData"
        border
+        size="mini"
        style="margin-top:20px">
        <el-table-column
          label="装箱单号"
@@ -74,12 +75,14 @@
        v-loading="loading"
        :data="machineTableData"
        border
+        size="mini"
        style="margin-top:20px">
        <el-table-column type="expand">
          <template slot-scope="props">
            <el-table
              :data="props.row.groupData"
              border
+              size="mini"
              style="width: 90%">
              <el-table-column
                label="序号"
@@ -171,6 +174,7 @@
        v-loading="loading"
        :data="spareData"
        border
+        size="mini"
        style="margin-top:20px">
        <el-table-column
          label="序号"
@@ -228,6 +232,7 @@
        v-loading="fileLoading"
        :data="fileData"
        border
+        size="mini"
        style="margin-top:20px">
        <el-table-column
          label="序号"
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -26,6 +26,7 @@
        v-loading="listLoading"
        :data="tableData"
        :row-class-name="tableRowClassName"
+        size="mini"
        border>
        <el-table-column align="center" label="图号" min-width="150">
          <template slot-scope="scope">
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -27,6 +27,7 @@
        v-loading="listLoading"
        :data="tableData"
        :row-class-name="tableRowClassName"
+        size="mini"
        border>
        <el-table-column align="center" label="物料状态" min-width="100">
          <template slot-scope="scope">
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -36,6 +36,7 @@
        :data="tableData"
        highlight-current-row
        border
+        size="mini"
        style="width: 100%;max-height: 520px"
        height="520">
        <el-table-column
@@ -109,6 +110,7 @@
        v-loading="loadingWB"
        :data="tableDataWB"
        style="width: 100%;min-height: 600px;"
+        size="mini"
        height="600"
        highlight-current-row
        border>
@@ -211,8 +213,9 @@ export default {
  },
  watch: {
    project(val) {
+      console.log(val)
      if (val.length > 0) {
-        this.projectValue = val[1].value
+        this.projectValue = val[0].value
      }
    },
    projectValue(val) {
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -39,46 +39,6 @@
          <el-button :loading="loading" class="signIn" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
            登录
          </el-button>
-          <div class="tips">
-            <span>超级管理员</span>
-            <span>账号：0000</span>
-            <span>密码：admin</span>
-          </div>
-          <div class="tips">
-            <span>营销中心</span>
-            <span>账号：2001</span>
-            <span>密码：2001</span>
-          </div>
-          <div class="tips">
-            <span>技术中心</span>
-            <span>账号：3001</span>
-            <span>密码：3001</span>
-          </div>
-          <div class="tips">
-            <span>制造中心</span>
-            <span>账号：4001</span>
-            <span>密码：4001</span>
-          </div>
-          <div class="tips">
-            <span>采购部</span>
-            <span>账号：4101</span>
-            <span>密码：4101</span>
-          </div>
-          <div class="tips">
-            <span>仓库</span>
-            <span>账号：4201</span>
-            <span>密码：4201</span>
-          </div>
-          <div class="tips">
-            <span>金工车间</span>
-            <span>账号：4301</span>
-            <span>密码：4301</span>
-          </div>
-          <div class="tips">
-            <span>装配车间</span>
-            <span>账号：4401</span>
-            <span>密码：4401</span>
-          </div>
        </div>
      </el-form>
    </div>