change - 生产计划加进度字段、ERP页面同步订单、同步计划接口

src/api/mes/prod/prodOrderInfo.js

@@ -51,3 +51,19 @@ export function generateWorkOrder(query) {
     params: query
   })
 }
+
+// ERP获取生产计划管理
+export function getERPProductionPlan(objId) {
+  return request({
+    url: '/mes/prod/prodOrderInfo/getERPProductionPlan/' + objId,
+    method: 'get'
+  })
+}
+
+//获取ERP生产订单
+export function getERPWorkOrder(orderCode) {
+  return request({
+    url: '/mes/prod/prodOrderInfo/getERPWorkOrder/' + orderCode,
+    method: 'get'
+  })
+}

src/views/mes/prod/prodOrderInfo/index.vue

@@ -112,6 +112,29 @@
         >修改
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleOrder"
+          v-hasPermi="['mes/prod:prodOrderInfo:edit']"
+        >同步订单
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :disabled="multiple"
+          @click="handleSynchronizationPlan"
+          v-hasPermi="['mes/prod:prodOrderInfo:edit']"
+        >同步计划
+        </el-button>
+      </el-col>
 <!--      <el-col :span="1.5">-->
 <!--        <el-button-->
 <!--          type="danger"-->
@@ -408,6 +431,19 @@
 <!--        <el-button @click="cancel">取 消</el-button>-->
 <!--      </div>-->
 <!--    </el-dialog>-->
+
+    <!-- 同步ERP订单信息对话框 -->
+    <el-dialog :title="title" :visible.sync="orderOpen" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="100px">
+        <el-form-item label="订单编号" prop="orderCode">
+          <el-input v-model="form.orderCode" placeholder="请输入任务编号"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="orderSubmitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -417,7 +453,7 @@ import {
   getProdOrderInfo,
   delProdOrderInfo,
   addProdOrderInfo,
-  updateProdOrderInfo
+  updateProdOrderInfo, getERPProductionPlan, getERPWorkOrder
 } from '@/api/mes/prod/prodOrderInfo'
 import router from "@//router";
 
@@ -444,6 +480,7 @@ export default {
       title: '',
       // 是否显示弹出层
       open: false,
+      orderOpen: false,
       // 是否显示下达计划弹出层
       // releaseOpen: false,
       // 更新时间时间范围
@@ -552,6 +589,7 @@ export default {
     cancel() {
       this.open = false
       this.releaseOpen = false
+      this.orderOpen = false
       this.reset()
     },
     // 表单重置
@@ -620,6 +658,12 @@ export default {
         this.title = '修改订单信息'
       })
     },
+    /** 同步ERP订单按钮操作 */
+    handleOrder() {
+      this.reset()
+      this.orderOpen = true
+      this.title = '同步ERP订单信息'
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs['form'].validate(valid => {
@@ -640,6 +684,14 @@ export default {
         }
       })
     },
+    /** 提交按钮 */
+    orderSubmitForm() {
+      getERPWorkOrder(this.form.orderCode).then(response => {
+        this.$modal.msgSuccess('同步订单成功')
+        this.orderOpen = false
+        this.getList()
+      })
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const objIds = row.objId || this.ids
@@ -651,6 +703,16 @@ export default {
       }).catch(() => {
       })
     },
+    handleSynchronizationPlan(row) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认同步订单为"' + objIds + '"的数据项？').then(function() {
+        return getERPProductionPlan(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('同步成功')
+      }).catch(() => {
+      })
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('mes/prod/prodOrderInfo/export', {

src/views/mes/prod/prodPlanErpInfo/index.vue

@@ -129,6 +129,8 @@
           <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="工作量" align="center" prop="workload" v-if="columns[72].visible"/>
+      <el-table-column label="任务进度" align="center" prop="taskProgress" v-if="columns[73].visible"/>
       <el-table-column label="关联资源" align="center" prop="associationResource" v-if="columns[7].visible"/>
       <el-table-column label="工作效率" align="center" prop="workingEfficiency" v-if="columns[8].visible"/>
       <el-table-column label="设备码" align="center" prop="equipmentNo" v-if="columns[9].visible" width="100"/>
@@ -635,7 +637,9 @@ export default {
         { key: 68, label: `创建人`, visible: false },
         { key: 69, label: `创建时间`, visible: false },
         { key: 70, label: `更新人`, visible: false },
-        { key: 71, label: `更新时间`, visible: false }
+        { key: 71, label: `更新时间`, visible: false },
+        { key: 72, label: `工作量`, visible: true },
+        { key: 73, label: `任务进度`, visible: true },
       ]
     }
   },

src/views/mes/prod/prodPlanInfo/index.vue

@@ -273,6 +273,16 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="工单状态" prop="planStatus">
+          <el-radio-group v-model="form.planStatus">
+            <el-radio
+              v-for="dict in dict.type.plan_status"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="完成标识" prop="compFlag">
           <el-radio-group v-model="form.compFlag">
             <el-radio
@@ -283,30 +293,6 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="form.createdBy" placeholder="请输入创建人"/>
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createdTime">
-          <el-date-picker clearable
-                          v-model="form.createdTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择创建时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="form.updatedBy" placeholder="请输入更新人"/>
-        </el-form-item>
-        <el-form-item label="更新时间" prop="updatedTime">
-          <el-date-picker clearable
-                          v-model="form.updatedTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择更新时间"
-          >
-          </el-date-picker>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>