更新维修记录、精工车间开发流程，新增文档和物料采购进度功能

src/api/PurchasingManagement/MaterialPurchaseProgress.js

@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+
+export function getMaterialPurchaseProgress(query) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_物料采购进度_查询',
+      param: query
+    }
+  })
+}

src/views/DeviceManagement/RepairRecord/index.vue

@@ -32,6 +32,7 @@
           </template>
         </el-table-column>
         <el-table-column label="原因" prop="整修原因" align="center" show-overflow-tooltip />
+        <el-table-column label="整修方案" prop="整修方案" align="center" show-overflow-tooltip />
       </el-table>
       <div class="block" style="margin-top: 10px">
         <el-pagination

src/views/PurchasingManagement/MaterialPurchaseProgress/index.vue

@@ -0,0 +1,110 @@
+<template>
+  <div class="app-container">
+    <el-card style="height: 850px;padding: 0">
+      <div style="margin-top: 7px; margin-bottom: 7px; margin-left: 7px">
+        <el-input
+          v-model="orderNo"
+          size="small"
+          clearable
+          style="width:180px;"
+          placeholder="订单号"
+          @keyup.enter.native="search"/>
+        <el-input
+          v-model="materialName"
+          size="small"
+          clearable
+          style="width:180px;margin-left: 10px"
+          placeholder="物料名称"
+          @keyup.enter.native="search"/>
+        <el-input
+          v-model="drawingNo"
+          size="small"
+          clearable
+          style="width:180px;margin-left: 10px"
+          placeholder="图号"
+          @keyup.enter.native="search"/>
+        <el-button type="primary" size="mini" style="margin-left: 10px" icon="el-icon-search" @click="search">查询</el-button>
+      </div>
+      <el-table
+        v-loading="loading"
+        :data="tableData"
+        border
+        stripe
+        size="mini"
+        height="750">
+        <el-table-column type="index" width="50" label="序号" align="center"/>
+        <el-table-column label="状态" prop="状态" align="center" show-overflow-tooltip width="100"/>
+        <el-table-column label="订单号" prop="订单编号" align="center" show-overflow-tooltip width="150"/>
+        <el-table-column label="物料编码" prop="物料编码" align="center" show-overflow-tooltip width="150"/>
+        <el-table-column label="物料名称" prop="物料名称" align="center" show-overflow-tooltip min-width="100"/>
+        <el-table-column label="图号" prop="图号或型号" align="center" show-overflow-tooltip width="260"/>
+        <el-table-column label="采购数" prop="数量" align="center" show-overflow-tooltip width="100"/>
+        <el-table-column label="已入库数量" prop="已到货数量" align="center" show-overflow-tooltip width="100"/>
+        <el-table-column label="采购合同" prop="采购合同编号" align="center" show-overflow-tooltip min-width="150"/>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 50, 100]"
+          :page-size="pageSize"
+          :total="total"
+          :pager-count="5"
+          layout="total, prev, pager, next"
+          @size-change="handleSizeChanges"
+          @current-change="handleCurrentChanges"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getMaterialPurchaseProgress } from '@/api/PurchasingManagement/MaterialPurchaseProgress'
+
+export default {
+  data() {
+    return {
+      orderNo: '',
+      materialName: '',
+      drawingNo: '',
+      loading: false,
+      tableData: [],
+      total: 0,
+      pageCurrent: 1,
+      pageSize: 50
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.loading = true
+      var param = []
+      param[0] = ['订单号', this.orderNo]
+      param[1] = ['物料名称', this.materialName]
+      param[2] = ['图号', this.drawingNo]
+      var requestData = this.CreateData('11', '物料_采购进度_查询', param, this.pageSize, this.pageCurrent)
+      this.ExecDatabase(requestData).then(response => {
+        this.tableData = response.data.rows || []
+        this.total = response.data.total || 0
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    search() {
+      this.pageCurrent = 1
+      this.fetchData()
+    },
+    handleSizeChanges(val) {
+      this.pageSize = val
+      this.pageCurrent = 1
+      this.fetchData()
+    },
+    handleCurrentChanges(val) {
+      this.pageCurrent = val
+      this.fetchData()
+    }
+  }
+}
+</script>

src/views/SeikoWorkshop/DevelopProcess/index.vue

@@ -88,17 +88,25 @@
                   <el-input :disabled="scope.row.加工状态 === 1 || Number(scope.row.是否选进外协单中) === 1" v-model="scope.row.工艺要求" size="mini" style="margin: 0;width: 100%" @change="updateProcess(scope.row)"/>
                 </template>
               </el-table-column>
-              <el-table-column width="130px" label="定额工时" align="center" prop="" show-overflow-tooltip>
+              <el-table-column width="90px" label="定额工时" align="center" prop="" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <el-input :disabled="scope.row.加工状态 === 1 || Number(scope.row.是否选进外协单中) === 1" v-model="scope.row.定额工时" size="mini" style="margin: 0;width: 100%" @change="updateProcess(scope.row)"/>
                 </template>
               </el-table-column>
-              <el-table-column width="130px" label="准结工时" align="center" prop="" show-overflow-tooltip>
+              <el-table-column width="90px" label="准结工时" align="center" prop="" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <el-input :disabled="scope.row.加工状态 === 1 || Number(scope.row.是否选进外协单中) === 1" v-model="scope.row.准结工时" size="mini" style="margin: 0;width: 100%" @change="updateProcess(scope.row)"/>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" align="center" width="230px">
+              <el-table-column label="是否变更" align="center" width="100px">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.是否变更" size="mini" style="width: 80px" @change="changeAllow(scope.row)">
+                    <el-option label="允许" :value="1"/>
+                    <el-option label="不许" :value="0"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" width="200px">
                 <template slot-scope="scope">
                   <el-tooltip :open-delay="700" effect="dark" content="下移工序" placement="top">
                     <el-button :disabled="scope.row.加工状态 === 1 || Number(scope.row.是否选进外协单中) === 1" type="text" icon="el-icon-bottom" size="mini" style="margin-right: 5px" @click="downOne(scope.row)"/>
@@ -145,6 +153,14 @@
                   <el-input v-model="scope.row.准结工时" size="mini" style="margin: 0;width: 100%" @change="updateProcess(scope.row)"/>
                 </template>
               </el-table-column>
+              <el-table-column label="是否变更" align="center" width="100px">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.是否变更" size="mini" style="width: 80px" @change="changeAllow(scope.row)">
+                    <el-option label="允许" :value="1"/>
+                    <el-option label="不许" :value="0"/>
+                  </el-select>
+                </template>
+              </el-table-column>
               <el-table-column label="操作" align="center" width="230px">
                 <template slot-scope="scope">
                   <el-tooltip :open-delay="700" effect="dark" content="下移工序" placement="top">
@@ -834,6 +850,14 @@ export default {
       }
       this.searchTable()
     },
+    changeAllow(row) {
+      var param = []
+      param[0] = ['工艺计划流水号', row.工艺计划流水号]
+      param[1] = ['工序顺序', row.工序顺序]
+      param[2] = ['是否变更', row.是否变更]
+      var Data = this.CreateData('12', '车间生产管理工艺_零件工序_变更允许', param)
+      this.ExecDatabase(Data)
+    },
     updateProcess(row) {
       if (!this.checked) {
         var param = []