Merge branch 'master' of http://gitlab.91isoft.com:90/zhangbotao/nlt-e-cigarette

src/api/badDefinition.js

@@ -34,18 +34,7 @@ export function deleteLogical(businessId) {
     method: 'delete'
   })
 }
-// 不良定义修改
-export function updateStatus(data) {
-  const businessId = data.businessId
-  data = Qs.stringify(data)
-  console.log(data)
-  return request({
-    url: '/nltdisadvantage/update/' + businessId,
-    method: 'put',
-    data
-  })
-}
-// 不良定义修改状态
+// 不良定义
 export function updateData(data) {
   const businessId = data.businessId
   data = Qs.stringify(data)

src/api/workOrder.js

@@ -35,3 +35,29 @@ export function listOrderMater(query) {
     params: query
   })
 }
+// 查询工单-物料列表
+export function manualImport(query) {
+  return request({
+    url: '/nltscheduledresult/singleBom',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询工单-线别列表
+export function listOrderLine(query) {
+  return request({
+    url: '/nltifsorder/queryNltIfsOrderLineLogicByPagination',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询工单-工站列表
+export function listStation(query) {
+  return request({
+    url: '/nltifsorder/queryNltIfsOrderStationByPagination',
+    method: 'get',
+    params: query
+  })
+}

src/views/ProductionProcess/workOrder.vue

@@ -142,7 +142,7 @@
             <span>{{ getStatus(scope.row.status) || '-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" width="200px" class-name="small-padding fixed-width">
           <template slot="header">
             <div>操作</div>
             <div>Operation</div>
@@ -161,6 +161,7 @@
               @click="handleUpdate(scope.row)"
             >编辑生产模型</el-link>
             <el-link
+              v-if="scope.row.status === '0'"
               size="mini"
               type="danger"
               style="margin-left: 10px"
@@ -292,108 +293,124 @@
               :total="total1"
               :page.sync="rowsBom.page"
               :limit.sync="rowsBom.rows"
-              @pagination="handleDetail"
+              @pagination="getBomTable"
             />
           </el-tab-pane>
           <el-tab-pane label="工站信息">
             <el-table
-            :data="stationList"
-            border
+              v-loading="Loading3"
+              :data="stationList"
+              border
           >
               <el-table-column
                 type="index"
-                width="50">
+                width="60">
                 <template slot="header">
                   <div>排序</div>
                   <div>Sort</div>
                 </template>
               </el-table-column>
-              <el-table-column :show-overflow-tooltip="true" align="center" prop="partNo">
+              <el-table-column :show-overflow-tooltip="true" align="center" prop="staCode">
                 <template slot="header">
                   <div>工站编号</div>
                   <div>Position No.</div>
                 </template>
                 <template slot-scope="scope">
-                  <span>{{ scope.row.partNo || '-' }}</span>
+                  <span>{{ scope.row.staCode || '-' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column :show-overflow-tooltip="true" align="center" prop="materDesc">
+              <el-table-column :show-overflow-tooltip="true" align="center" prop="staName">
                 <template slot="header">
                   <div>工站名称</div>
                   <div>Position Name</div>
                 </template>
                 <template slot-scope="scope">
-                  <span>{{ scope.row.materDesc || '-' }}</span>
+                  <span>{{ scope.row.staName || '-' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column :show-overflow-tooltip="true" align="center" prop="unitMeas">
+              <el-table-column :show-overflow-tooltip="true" align="center" prop="staType">
                 <template slot="header">
                   <div>工站类型</div>
                   <div>Position Type</div>
                 </template>
                 <template slot-scope="scope">
-                  <span>{{ scope.row.unitMeas || '-' }}</span>
+                  <span>{{ scope.row.staType || '-' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column :show-overflow-tooltip="true" align="center" prop="qtyRequired">
+              <el-table-column :show-overflow-tooltip="true" align="center" prop="materCode">
                 <template slot="header">
                   <div>物料料号</div>
                   <div>Part No.</div>
                 </template>
                 <template slot-scope="scope">
-                  <span>{{ scope.row.qtyRequired || '-' }}</span>
+                  <span>{{ scope.row.materCode || '-' }}</span>
                 </template>
               </el-table-column>
             </el-table>
+            <pagination
+              v-show="total3>0"
+              :total="total3"
+              :page.sync="rowsStation.page"
+              :limit.sync="rowsStation.rows"
+              @pagination="getStationTable"
+            />
           </el-tab-pane>
           <el-tab-pane label="开工信息">
             <el-table
+              v-loading="Loading2"
               :data="lineList"
               border
             >
               <el-table-column
                 type="index"
-                width="50">
+                width="60">
                 <template slot="header">
                   <div>排序</div>
                   <div>Sort</div>
                 </template>
               </el-table-column>
-              <el-table-column :show-overflow-tooltip="true" align="center" prop="materDesc">
+              <el-table-column :show-overflow-tooltip="true" align="center" prop="lineCode">
                 <template slot="header">
                   <div>线别号</div>
                   <div>Line Beach No.</div>
                 </template>
                 <template slot-scope="scope">
-                  <span>{{ scope.row.materDesc || '-' }}</span>
+                  <span>{{ scope.row.lineCode || '-' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column :show-overflow-tooltip="true" align="center" prop="unitMeas">
+              <el-table-column :show-overflow-tooltip="true" align="center" prop="startTime">
                 <template slot="header">
                   <div>实际开工时间</div>
                 </template>
                 <template slot-scope="scope">
-                  <span>{{ scope.row.unitMeas || '-' }}</span>
+                  <span>{{ scope.row.startTime || '-' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column :show-overflow-tooltip="true" align="center" prop="qtyRequired">
+              <el-table-column :show-overflow-tooltip="true" align="center" prop="jobNo">
                 <template slot="header">
                   <div>工号</div>
                   <div>B/N</div>
                 </template>
                 <template slot-scope="scope">
-                  <span>{{ scope.row.qtyRequired || '-' }}</span>
+                  <span>{{ scope.row.jobNo || '-' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column :show-overflow-tooltip="true" align="center" prop="partNo">
+              <el-table-column :show-overflow-tooltip="true" align="center" prop="jobName">
                 <template slot="header">
                   <div>姓名</div>
                 </template>
                 <template slot-scope="scope">
-                  <span>{{ scope.row.partNo || '-' }}</span>
+                  <span>{{ scope.row.jobName || '-' }}</span>
                 </template>
               </el-table-column>
             </el-table>
+            <pagination
+              v-show="total2>0"
+              :total="total2"
+              :page.sync="rowsLine.page"
+              :limit.sync="rowsLine.rows"
+              @pagination="getLineTable"
+            />
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -402,7 +419,7 @@
       </div>
     </el-dialog>
     <el-dialog :close-on-click-modal="false" title="手动导入工单" class="workOrderDialog" :visible.sync="importDialog" width="40%" append-to-body>
-      <el-form ref="form" :model="form" size="small" :rules="rules" label-width="auto">
+      <el-form ref="formImport" :model="formImport" size="small" :rules="rules" label-width="auto">
         <el-row>
           <el-col :span="20">
             <el-form-item class="labelHeight" label="工单编号" prop="orderNo">
@@ -411,7 +428,7 @@
                 <div class="labelName">Work Order</div>
               </div>
               <el-input
-                v-model="orderNo"
+                v-model="formImport.orderNo"
                 :maxlength="20"
                 placeholder="请输入工单编号"
                 clearable
@@ -430,7 +447,7 @@
 </template>
 
 <script>
-import { delOrder, getOrder, listOrder, listOrderMater } from '@/api/workOrder'
+import { delOrder, getOrder, listOrder, listOrderLine, listOrderMater, listStation } from '@/api/workOrder'
 
 export default {
   name: 'WorkOrder',
@@ -448,6 +465,8 @@ export default {
       // 遮罩标志
       Loading: true,
       Loading1: true,
+      Loading2: true,
+      Loading3: true,
       // 生产工单表格数据
       orderList: [
         {
@@ -458,6 +477,8 @@ export default {
       total: 0,
       // 表格分页总数2
       total1: 0,
+      total2: 0,
+      total3: 0,
       // 对话框打开标志
       open: false,
       // 对话框表单数据
@@ -476,9 +497,21 @@ export default {
         orderNo: undefined,
         contract: undefined
       },
+      rowsLine: {
+        page: 1,
+        rows: 10,
+        businessId: undefined
+      },
+      rowsStation: {
+        page: 1,
+        rows: 10,
+        orderModelId: undefined
+      },
       // 导入弹窗
       importDialog: false,
-      orderNo: undefined,
+      formImport: {
+        orderNo: undefined
+      },
       rules: {
         orderNo: [
           { required: true, message: '请输入工单编号', trigger: 'blur' },
@@ -519,32 +552,49 @@ export default {
     },
     /** 导出按钮方法 */
     handleExport() {},
-    /** 导入按钮方法 */
-    handleImport() {
-      this.importDialog = true
-    },
+
     /** 详情按钮方法 */
     handleDetail(row) {
       getOrder(row.businessId).then(response => {
         this.form = response.data
         this.open = true
+        console.log(row)
       })
-      console.log(row)
-      let temp = JSON.parse(JSON.stringify(row.orderNo))
-      this.rowsBom.orderNo = temp
-      let temp1 = JSON.parse(JSON.stringify(row.contract))
-      this.rowsBom.contract = temp1
-      this.getBomTable()
+      this.getBomTable(row)
+      this.getLineTable(row)
+      this.getStationTable(row)
     },
     /** 查询工单BOM数据 */
-    getBomTable() {
+    getBomTable(row) {
       this.Loading1 = true
+      this.rowsBom.contract = row.contract
+      this.rowsBom.orderNo = row.orderNo
       listOrderMater(this.rowsBom).then(response => {
         this.bomList = response.rows
         this.total1 = response.total
         this.Loading1 = false
       })
     },
+    /** 查询工单线别数据 */
+    getLineTable(row) {
+      this.Loading2 = true
+      this.rowsLine.businessId = row.businessId
+      listOrderLine(this.rowsLine).then(response => {
+        this.lineList = response.rows
+        this.total2 = response.total
+        this.Loading2 = false
+      })
+    },
+    /** 查询工单工站数据 */
+    getStationTable(row) {
+      this.Loading3 = true
+      this.rowsStation.orderModelId = row.orderModelId
+      listStation(this.rowsStation).then(response => {
+        this.stationList = response.rows
+        this.total3 = response.total
+        this.Loading3 = false
+      })
+    },
     /**
      * 状态转换
      */
@@ -576,14 +626,42 @@ export default {
       this.bomList = []
       this.Loading1 = true
     },
+    /** 导入按钮方法 */
+    handleImport() {
+      this.importDialog = true
+      this.reset()
+    },
     /* 导入取消 */
     cancelImport() {
       this.importDialog = false
-      this.orderNo = undefined
+      this.reset()
+    },
+    /** 表单重置操作 */
+    reset() {
+      this.formImport = {
+        orderNo: undefined
+      }
+      this.resetForm('form')
     },
     /* 导入确定*/
     OKImport() {
-      this.importDialog = false
+      this.$refs['formImport'].validate(valid => {
+        if (valid) {
+          const params = {
+            orderNo: this.formImport.orderNo
+          }
+          manualImport(params).then(res => {
+            if (res.message === '操作成功') {
+              this.$message.success(res.message)
+              this.importDialog = false
+              this.formImport.orderNo = undefined
+              this.getOrderTable()
+            } else {
+              this.$message.error(res.message)
+            }
+          })
+        }
+      })
     },
     /** 删除按钮方法 */
     handleDelete(row) {

src/views/productionInfo/ProductionModel.vue

@@ -8,7 +8,7 @@
             <div>Part No.</div>
           </div>
           <el-input
-            v-model="queryParams.partNo"
+            v-model="queryParams.materCode"
             placeholder="请输入成品料号"
             clearable
             :maxlength="30"
@@ -255,7 +255,7 @@ export default {
         page: 1,
         rows: 10,
         modelType: undefined,
-        partNo: undefined
+        materCode: undefined
       },
       queryParam: {
         page: 1,
@@ -350,7 +350,7 @@ export default {
       this.queryParams.rows = 10
       this.queryParams.page = 1
       this.queryParams.modelType = undefined
-      this.queryParams.partNo = undefined
+      this.queryParams.materCode = undefined
       this.handleQuery()
     },
     /* 新增按钮操作 */
@@ -429,8 +429,10 @@ export default {
           return '北京'
         case 'NOSZ':
           return '苏州'
-        default:
+        case 'NB,NOSZ':
           return '北京,苏州'
+        default:
+          return contract
       }
     }
   }

src/views/productionInfo/badDefinition.vue

@@ -135,7 +135,7 @@
               <template slot-scope="scope">
                 <el-link
                   size="mini"
-                  type="primary"
+                  type="success"
                   style="margin-left: 10px"
                   @click="handleUpdate(scope.row)"
                 >修改</el-link>
@@ -505,7 +505,7 @@ export default {
       this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.businessId !== undefined) {
-            updateStatus(this.form).then(response => {
+            updateData(this.form).then(response => {
               if (response.code === 200) {
                 this.$message({
                   message: '修改成功',