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/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: '修改成功',