From ae627cc8718485433efca4a4342fd4aa5e4e21dd Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Tue, 25 Dec 2018 10:55:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=98=E5=B8=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Assembly/AssemblyProcessAssignment.js         |  2 +-
 src/api/Assembly/AssemblyProcessPlanning.js           |  2 +-
 src/api/Assembly/AssemblyQuotaSetting.js              |  2 +-
 src/api/WorkshopProcurement/OfflineContract1.js       | 11 +++++++++++
 .../Assembly/TypicalAssemblyMaintenance/index.vue     |  2 +-
 src/views/BasicData/MaterialMaintenance/index.vue     |  6 ++++--
 .../WorkshopProcurement/OfflineContract1/index.vue    |  9 ++++++---
 7 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/api/Assembly/AssemblyProcessAssignment.js b/src/api/Assembly/AssemblyProcessAssignment.js
index fbe7519b..42d429e3 100644
--- 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'
     }
   })
 }
diff --git a/src/api/Assembly/AssemblyProcessPlanning.js b/src/api/Assembly/AssemblyProcessPlanning.js
index 41619c17..229319bb 100644
--- 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'
     }
   })
 }
diff --git a/src/api/Assembly/AssemblyQuotaSetting.js b/src/api/Assembly/AssemblyQuotaSetting.js
index f1769456..62050c24 100644
--- 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'
     }
   })
 }
diff --git a/src/api/WorkshopProcurement/OfflineContract1.js b/src/api/WorkshopProcurement/OfflineContract1.js
index 71d1a725..2d2f7bc9 100644
--- 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({
diff --git a/src/views/Assembly/TypicalAssemblyMaintenance/index.vue b/src/views/Assembly/TypicalAssemblyMaintenance/index.vue
index 423324e9..f06eeda4 100644
--- 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].组件流水号
           })
         }
       })
diff --git a/src/views/BasicData/MaterialMaintenance/index.vue b/src/views/BasicData/MaterialMaintenance/index.vue
index afd74ae3..bae4bedc 100644
--- 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' }]
       }
     }
diff --git a/src/views/WorkshopProcurement/OfflineContract1/index.vue b/src/views/WorkshopProcurement/OfflineContract1/index.vue
index df4379eb..8b37e4dc 100644
--- 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 {