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

package.json

@@ -17,6 +17,7 @@
     "echarts": "^4.2.0-rc.2",
     "element-ui": "2.4.6",
     "file-saver": "^1.3.8",
+    "jquery": "^3.3.1",
     "js-cookie": "2.2.0",
     "node-sass": "^4.10.0",
     "normalize.css": "7.0.0",

src/api/PurchasingCenter/PurchaseContractApproval.js

@@ -11,15 +11,14 @@ export function initContract() {
     }
   })
 }
-// 初始化采购员   考核部门编号：采购部16
+// 初始化采购员
 export function initBuyer() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=16'
+      name: '人事档案管理_人员与角色_查询数据_采购员'
     }
   })
 }

src/api/PurchasingCenter/PurchaseContractSearch.js

@@ -11,15 +11,14 @@ export function initContract() {
     }
   })
 }
-// 初始化采购员(考核部门编号：采购部：16)
+// 初始化采购员
 export function initBuyer() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=16'
+      name: '人事档案管理_人员与角色_查询数据_采购员'
     }
   })
 }

src/api/PurchasingCenter/PurchaseTaskAllocate.js

@@ -34,15 +34,14 @@ export function initProject() {
     }
   })
 }
-// 初始化采购员   考核部门编号：采购部16
+// 初始化采购员
 export function initBuyer() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=16'
+      name: '人事档案管理_人员与角色_查询数据_采购员'
     }
   })
 }

src/views/PurchasingCenter/ProjectTotalSearch/index.vue

@@ -57,7 +57,7 @@
         </el-table-column>
         <el-table-column label="优惠后小计(元)" align="center" min-width="100" prop="金额">
           <template slot-scope="scope">
-            {{ scope.row.金额 = Number(scope.row.优惠后单价) * Number(scope.row.数量) }}
+            {{ scope.row.金额 = (Number(scope.row.优惠后单价) * Number(scope.row.数量)).toFixed(2) }}
           </template>
         </el-table-column>
       </el-table>

src/views/PurchasingCenter/PurchaseContractSearch/index.vue

@@ -142,7 +142,7 @@
       <b>二维码：</b><br>
       <img id="img">
     </div>
-    <div style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
+    <div id="print" class="print" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
     <el-card v-show="searchView">
       <!--将新一般处理页添加至通讯服务器-->
       <div>附件图：</div>
@@ -155,7 +155,8 @@
 import { initContract, initBuyer, searchTable1, searchTable2 } from '@/api/PurchasingCenter/PurchaseContractSearch'
 import { searchFile } from '@/api/PurchasingCenter/CreateContract'
 import QRCode from 'qrcode'
-import { exportExcelMethod } from './exportExcel'
+import $ from 'jquery'
+// import { exportExcelMethod } from './exportExcel'
 
 export default {
   data() {
@@ -212,8 +213,16 @@ export default {
   },
   methods: {
     download() {
-      if (this.contract) {
-        exportExcelMethod('print', '采购合同', '采购合同sheet1')
+      if (this.contractValue) {
+        // exportExcelMethod('print', '采购合同', '采购合同sheet1')
+        const htmlNode = $('#print').html()
+        const body = $('body')
+        body.children().hide()
+        const printNode = $(htmlNode)
+        body.append(printNode)
+        window.print()
+        body.children().show()
+        printNode.remove()
       } else {
         this.$message.error('请选择合同')
       }
@@ -237,7 +246,7 @@ export default {
     },
     searchPic() {
       // 读取图片时，查找合同流水号，获取其下所有图片id，根据拼接成的路径，查询图片显示出来。
-      searchFile(this.contract).then(response => {
+      searchFile(this.contractValue).then(response => {
         if (response.data.length !== 0) {
           this.searchView = 'http://localhost:8022/Img/' + response.data[0].文件名
         } else {

src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue

@@ -84,7 +84,7 @@
             stripe
             @selection-change="handleSelectionChange1">
             <el-table-column :selectable="selectable" align="center" type="selection"/>
-            <el-table-column align="center" label="采购情况" min-width="70px">
+            <el-table-column align="center" label="采购情况" min-width="80px">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>
                 <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -218,7 +218,7 @@
             stripe
             @selection-change="handleSelectionChange2">
             <el-table-column :selectable="selectable" align="center" type="selection"/>
-            <el-table-column align="center" label="采购情况" min-width="70px">
+            <el-table-column align="center" label="采购情况" min-width="80px">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>
                 <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>