From 18447662cfb89267d2bb30fc051515299c2db90f Mon Sep 17 00:00:00 2001
From: lixin <lixin@meswork.com>
Date: Thu, 27 Dec 2018 17:31:14 +0800
Subject: [PATCH] lx

---
 src/api/Inventory/PartOut.js                  |   4 +-
 src/views/Inventory/OfflinePartOut/index.vue  |   5 +-
 src/views/Inventory/OfflinePurchase/index.vue | 105 +++++++++++++++++-
 src/views/Inventory/PartOut/index.vue         |  29 +++--
 .../Inventory/PartsReplacement/index.vue      |  13 ++-
 src/views/Inventory/PickingList/index.vue     |   4 +-
 6 files changed, 132 insertions(+), 28 deletions(-)

diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js
index fed72d7e..170cfc0e 100644
--- a/src/api/Inventory/PartOut.js
+++ b/src/api/Inventory/PartOut.js
@@ -73,14 +73,14 @@ export function WorkShopPart(data1, data2, data3, data4, data5) {
   })
 }
 // 车间采购件零件出库
-export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8) {
+export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '零件出库_零件出库_异常出库',
-      param: '项目流水号=' + data1 + '&机床流水号=' + data2 + '&组件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&工艺计划流水号=' + data5 + '&货位流水号=' + data6 + '&异常数量=' + data7 + '&异常原因=' + data8
+      param: '项目流水号=' + data1 + '&机床流水号=' + data2 + '&组件流水号=' + data3 + '&名称=' + data4 + '&人员编号=' + data5 + '&采购合同明细流水号=' + data6 + '&请购单明细流水号=' + data7 + '&工艺计划流水号=' + data8 + '&货位流水号=' + data9 + '&异常数量=' + data10 + '&异常原因=' + data11 + '&零件类型=' + data12
     }
   })
 }
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index 0dd2b790..7e062217 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -7,7 +7,9 @@
         size="mini"
         border
         style="width: 100%;"
-        height="200">
+        height="200"
+        @row-click = "searchoutRecord"
+      >
         <el-table-column
           label="序号"
           align="center"
@@ -41,7 +43,6 @@
         <el-table-column label="操作" align="center" min-width="120">
           <template slot-scope="scope" align="center">
             <el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="parOut(scope.row)">出库</el-button>
-            <el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="searchoutRecord(scope.row)">选择</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Inventory/OfflinePurchase/index.vue b/src/views/Inventory/OfflinePurchase/index.vue
index 8ce6ab3d..43ad22ca 100644
--- a/src/views/Inventory/OfflinePurchase/index.vue
+++ b/src/views/Inventory/OfflinePurchase/index.vue
@@ -162,6 +162,7 @@
         <el-table-column label="操作" align="center" width="280" fixed="right">
           <template slot-scope="scope">
             <el-button :disabled="parseInt(scope.row.离线合同状态) === 1" type="danger" size="mini" icon="el-icon-delete" @click="deleteOfflineContract(scope.row)">作废</el-button>
+            <el-button type="warning" size="mini" icon="el-icon-download" @click="exportCard(scope.row)">导出</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -198,6 +199,16 @@
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
+        <el-table-column label="物料品种" align="center" min-width="200">
+          <template slot-scope="scope">
+            {{ scope.row.物料品种 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="物料类别" align="center" min-width="200">
+          <template slot-scope="scope">
+            {{ scope.row.物料类别 }}
+          </template>
+        </el-table-column>
         <el-table-column label="数量" align="center" min-width="100">
           <template slot-scope="scope">
             <el-input v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
@@ -210,12 +221,69 @@
         </el-table-column>
       </el-table>
     </el-card>
+    <el-dialog :visible.sync="dialogVisibleExport" center style="min-height: 300px" width="60%">
+      <el-card>
+        <div id="print">
+          <div style="text-align: center">
+            <h2>离 线 请 购 单</h2>
+            <hr>
+            <table class="tgClass" style="table-layout: fixed; width: 820px;margin: auto">
+              <colgroup>
+                <col style="width: 73px">
+                <col style="width: 78px">
+                <col style="width: 84px">
+                <col style="width: 88px">
+                <col style="width: 94px">
+                <col style="width: 80px">
+              </colgroup>
+              <tr>
+                <td class="tg-s268">请购单号:</td>
+                <td class="tg-0lax" style=" text-align: left">{{ inbondCard[0] }}</td>
+                <td class="tg-0lax">请购人:</td>
+                <td class="tg-0lax" style="text-align: left">{{ inbondCard[1] }}</td>
+              </tr>
+              <tr>
+                <td class="tg-0lax">仓库名称:</td>
+                <td class="tg-0lax" style="text-align: left">{{ inbondCard[2] }}</td>
+                <td class="tg-0lax">请购时间:</td>
+                <td class="tg-0lax" style="text-align: left">{{ inbondCard[3] }}</td>
+              </tr>
+            </table>
+            <div style="margin-top: 10px">
+              <table class="tg" style="table-layout: fixed; width: 820px; margin: auto">
+                <tr>
+                  <th class="tg-c3ow">物料名称</th>
+                  <th class="tg-c3ow">物料规格</th>
+                  <th class="tg-c3ow">物料型号</th>
+                  <th class="tg-c3ow">物料品种</th>
+                  <th class="tg-c3ow">物料类别</th>
+                  <th class="tg-c3ow">数量</th>
+                </tr>
+                <tr v-for="(list, index) in tableData3" :key="index">
+                  <td class="tg-c3ow">{{ list.物料名称 }}</td>
+                  <td class="tg-c3ow">{{ list.物料规格 }}</td>
+                  <td class="tg-c3ow">{{ list.物料型号 }}</td>
+                  <td class="tg-c3ow">{{ list.物料品种 }}</td>
+                  <td class="tg-c3ow">{{ list.物料类别 }}</td>
+                  <td class="tg-c3ow">{{ list.数量 }}</td>
+                </tr>
+              </table>
+            </div>
+          </div>
+        </div>
+      </el-card>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisibleExport=false">取消</el-button>
+        <el-button type="primary" size="small" @click="printCard">打印</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { searchRequestCard, initWarehouse, addRequestCard, searchInventoryNum, SeeDetail, addRequestCardDetail, deleteRequest, deleteRequestDetail, alterNumber, setSafeValue } from '@/api/Inventory/OfflinePurchase'
 import { mapGetters } from 'vuex'
+import $ from 'jquery'
 
 export default {
   data() {
@@ -285,7 +353,9 @@ export default {
       disable4: true,
       disable: false, // 其他的禁用
       House: [],
-      HouseNumber: ''
+      HouseNumber: '',
+      dialogVisibleExport: false, // 导出表单
+      inbondCard: [] // 导出表格表头
     }
   },
   computed: {
@@ -348,6 +418,14 @@ export default {
         this.total1 = response.data.total
       })
     },
+    handleSizeChange1(val) { // 离线请购单列表分页
+      this.pageSize1 = val
+      this.searchTable1()
+    },
+    handleCurrentChange1(val) { // 离线请购单列表分页
+      this.pageCurrent1 = val
+      this.searchTable1()
+    },
     handleSizeChange2(val) { // 离线请购单列表分页
       this.pageSize2 = val
       this.searchTable2()
@@ -455,6 +533,27 @@ export default {
         }
       })
     },
+    exportCard(row) {
+      this.dialogVisibleExport = true
+      this.inbondCard[0] = row.请购单编号
+      this.inbondCard[1] = row.姓名
+      this.inbondCard[2] = row.仓库名称
+      this.inbondCard[3] = row.请购时间.split(' ')[0]
+      SeeDetail(this.purchasecardnumber).then(response => {
+        this.tableData3 = response.data
+      })
+    },
+    // 打印请购单
+    printCard() {
+      const htmlNode = $('#print').html() // #print为需要打印的dom节点id
+      const body = $('body')
+      body.children().hide()
+      const printNode = $(htmlNode)
+      body.append(printNode)
+      window.print()
+      body.children().show()
+      printNode.remove()
+    },
     // 传递请购单
     doneRequestCard() {
       this.$confirm('确定传递请购单?', '提示', {
@@ -518,4 +617,8 @@ export default {
     right: 15px;
     top: 5px;
   }
+  .tg  {border-collapse:collapse;border-spacing:0;}
+  .tg td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
+  .tg th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
+  .tg .tg-c3ow{border-color:inherit;text-align:center;vertical-align:top}
 </style>
diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue
index 40b6bceb..9e346b64 100644
--- a/src/views/Inventory/PartOut/index.vue
+++ b/src/views/Inventory/PartOut/index.vue
@@ -10,7 +10,8 @@
         border
         size="mini"
         style="width: 100%;"
-        height="300">
+        height="300"
+        @row-click = "chooseListinfor">
         <el-table-column
           label="序号"
           align="center"
@@ -31,11 +32,6 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="200px">
-          <template slot-scope="scope" align="center">
-            <el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="chooseListinfor(scope.row)">选择</el-button>
-          </template>
-        </el-table-column>
       </el-table>
       <el-table
         v-loading="listLoading1"
@@ -100,9 +96,6 @@
     <!--异常出库对话框-->
     <el-dialog :visible.sync="dialogFormVisible" title="异常出库" center width="380px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left">
-        <el-form-item label="出库数量" prop="ContractNumberValue" label-width="100px" size="small">
-          <el-input v-model="form.ErrorNumber" size="small" placeholder="出库数量" style="width: 200px"/>
-        </el-form-item>
         <el-form-item label="异常数量" prop="ContractNumberValue" label-width="100px" size="small">
           <el-input v-model="form.ErrorNumber" size="small" placeholder="异常数量" style="width: 200px"/>
         </el-form-item>
@@ -167,9 +160,12 @@ export default {
       projectnumber: '',
       machinenumber: '',
       teamnumber: '',
-      teanmpartnumber: '',
-      craftnumber: '',
-      locatenumber: ''
+      purchaseDeatileNumber: '', // 采购合同明细流水号
+      askPurchaseNumber: '', // 请购单明细流水号
+      craftnumber: '', // 工艺计划流水号
+      partType: '', // 零件类型
+      locatenumber: '',
+      partName: '' // 名称
     }
   },
   computed: {
@@ -184,7 +180,6 @@ export default {
     // 获取人员编号
     getpeopleid() {
       this.picikingPeople = this.id
-      console.log(this.picikingPeople)
     },
     // 查询领料单
     searchListinfor() {
@@ -249,20 +244,24 @@ export default {
       }
     },
     ErrorpartOut(row) {
+      console.log(row, 1111)
       this.dialogFormVisible = true
       this.projectnumber = row.项目流水号
       this.machinenumber = row.机床流水号
       this.teamnumber = row.组件流水号
-      this.teanmpartnumber = row.采购合同明细流水号
+      this.purchaseDeatileNumber = row.采购合同明细流水号
+      this.askPurchaseNumber = row.请购单明细流水号
       this.craftnumber = row.工艺计划流水号
       this.locatenumber = row.货位流水号
+      this.partType = row.零件类型
+      this.partName = row.名称
     },
     callOff(form) {
       this.form = []
       this.dialogFormVisible = false
     },
     submitEdit() {
-      ErrorOut(this.projectnumber, this.machinenumber, this.teamnumber, this.teanmpartnumber, this.craftnumber, this.locatenumber, this.form.ErrorNumber, this.form.Reason).then(response => {
+      ErrorOut(this.projectnumber, this.machinenumber, this.teamnumber, this.partName, this.picikingPeople, this.purchaseDeatileNumber, this.askPurchaseNumber, this.craftnumber, this.locatenumber, this.form.ErrorNumber, this.form.Reason, this.partType).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('添加成功')
           this.dialogFormVisible = false
diff --git a/src/views/Inventory/PartsReplacement/index.vue b/src/views/Inventory/PartsReplacement/index.vue
index 58f43481..909a80b3 100644
--- a/src/views/Inventory/PartsReplacement/index.vue
+++ b/src/views/Inventory/PartsReplacement/index.vue
@@ -77,6 +77,7 @@
         </el-table-column>
         <el-table-column label="修改原因" min-width="100" align="center">
           <template slot-scope="scope">
+
             {{ scope.row.修改原因 }}
           </template>
         </el-table-column>
@@ -87,7 +88,7 @@
         </el-table-column>
         <el-table-column label="修改日期" min-width="100" align="center">
           <template slot-scope="scope">
-            {{ scope.row.修改日期 }}
+            {{ scope.row.修改日期 ? scope.row.修改日期.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="仓库" min-width="100" align="center">
@@ -160,7 +161,7 @@
         </el-table-column>
         <el-table-column label="记录时间" min-width="100" align="center">
           <template slot-scope="scope">
-            {{ scope.row.记录时间 }}
+            {{ scope.row.记录时间 ? scope.row.记录时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="零件类型" min-width="100" align="center">
@@ -225,7 +226,7 @@
         </el-table-column>
         <el-table-column label="补投时间" align="center" min-width="250">
           <template slot-scope="scope">
-            {{ scope.row.补投时间 }}
+            {{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="仓库名称" align="center" min-width="250">
@@ -470,10 +471,10 @@ export default {
       } else {
         this.GroupNumValue_check = 1
       }
-      searchAlterRecord(this.pageCurrent, this.pageSize, this.rojectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+      searchAlterRecord(this.pageCurrent, this.pageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
         this.tableData1 = response.data.rows
-        console.log(response.data)
-        console.log(this.tableData1)
+        console.log(response.data.rows)
+        console.log(this.tableData1, 112233)
         this.total = response.data.total
         this.loading = false
       })
diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index 14118acd..0aee6caf 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -14,7 +14,7 @@
         style="width: 100%;"
         size="mini"
         height="200"
-        @row-click = "searchListDetailt()">
+        @row-click = "chooseListinfor">
         <el-table-column
           label="序号"
           align="center"
@@ -37,7 +37,6 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="200px">
           <template slot-scope="scope" align="center">
-            <el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="chooseListinfor(scope.row)">选择</el-button>
             <el-button size="mini" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropListinfor(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -813,6 +812,7 @@ export default {
     // 选择领料单
     chooseListinfor(row) {
       this.pickingListNumberx = row.领料单流水号
+      this.searchListDetailt()
     },
     // 增加基本件领料单明细
     addBasicListDetailinfor(row) {