opt: 任务与工单

lms/nladmin-ui/src/views/wms/ext/record/index.vue

@@ -25,8 +25,18 @@
                 v-for="item in interact_name_list"
                 :key="item"
                 :label="item"
-                :value="item">
-              </el-option>
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="响应编码">
+            <el-select v-model="query.http_code" placeholder="响应编码" clearable>
+              <el-option
+                v-for="item in http_codes"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="请求方向">
@@ -35,8 +45,8 @@
                 v-for="item in dict.interact_direction"
                 :key="item.value"
                 :label="item.label"
-                :value="item.value">
-              </el-option>
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
           <rrOperation />
@@ -54,28 +64,28 @@
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
           <el-form-item label="对接名称">
-            <el-input v-model="form.interact_name" style="width: 370px;" disabled/>
+            <el-input v-model="form.interact_name" style="width: 370px;" disabled />
           </el-form-item>
           <el-form-item label="响应编码">
-            <el-input v-model="form.code" style="width: 370px;" disabled/>
+            <el-input v-model="form.code" style="width: 370px;" disabled />
           </el-form-item>
           <el-form-item label="响应信息">
-            <el-input v-model="form.message" style="width: 370px;" disabled/>
+            <el-input v-model="form.message" style="width: 370px;" disabled />
           </el-form-item>
           <el-form-item label="请求报文">
-            <el-input v-model="formattedRequestParam" :autosize="{ minRows: 3 }" type="textarea" style="width: 370px;"/>
+            <el-input v-model="formattedRequestParam" :autosize="{ minRows: 3 }" type="textarea" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="响应结果">
-            <el-input v-model="formattedResponseParam" :autosize="{ minRows: 3 }" type="textarea" style="width: 370px;" disabled/>
+            <el-input v-model="formattedResponseParam" :autosize="{ minRows: 3 }" type="textarea" style="width: 370px;" disabled />
           </el-form-item>
           <el-form-item label="记录时间">
-            <el-input v-model="form.record_time" style="width: 370px;" disabled/>
+            <el-input v-model="form.record_time" style="width: 370px;" disabled />
           </el-form-item>
           <el-form-item label="请求方向">
-<!--            <el-input v-model="form.direction" style="width: 370px;" disabled/>-->
+            <!--            <el-input v-model="form.direction" style="width: 370px;" disabled/>-->
             <el-select
-              disabled
               v-model="form.direction"
+              disabled
               size="mini"
               placeholder="点位状态"
               class="filter-item"
@@ -136,7 +146,7 @@
         </el-table-column>
         <el-table-column prop="is_success" label="请求状态" :min-width="flexWidth('is_success',crud.data,'是否成功')">
           <template slot-scope="scope">
-            {{ scope.row.is_success ? '成功' : '失败'}}
+            {{ scope.row.is_success ? '成功' : '失败' }}
           </template>
         </el-table-column>
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
@@ -197,12 +207,19 @@ export default {
     return {
       permission: {},
       rules: {},
-      interact_name_list: []
+      interact_name_list: [],
+      http_codes: [
+        {
+          'label': '200',
+          'value': '200'
+        },
+        {
+          'label': '400',
+          'value': '400'
+        }
+      ]
     }
   },
-  created() {
-    this.getNameList()
-  },
   computed: {
     formattedRequestParam: {
       get() {
@@ -233,13 +250,16 @@ export default {
       }
     }
   },
+  created() {
+    this.getNameList()
+  },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
     getNameList() {
-      crudSysInteractRecord.getAllName().then((res)=>{
+      crudSysInteractRecord.getAllName().then((res) => {
         this.interact_name_list = res
       })
     }

lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue

@@ -668,7 +668,7 @@ export default {
     submits(row) {
       this.fullscreenLoading = true
       crudPdmBdWorkorder.submits(row).then(res => {
-        this.crud.notify('报工完成', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       }).catch(() => {
         this.fullscreenLoading = false
@@ -690,7 +690,7 @@ export default {
     forceFinish(row) {
       this.fullscreenLoading = true
       crudPdmBdWorkorder.forceFinish(row).then(res => {
-        this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.notify('报工完成', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       }).catch(() => {
         this.fullscreenLoading = false

lms/nladmin-ui/src/views/wms/sch/group/index.vue

@@ -47,6 +47,24 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="泥料编码">
+            <el-input
+              v-model="query.raw_material_code"
+              clearable
+              size="mini"
+              placeholder="泥料编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.material_code"
+              clearable
+              size="mini"
+              placeholder="物料编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="绑定状态">
             <el-select
               v-model="query.group_bind_material_status"
@@ -273,9 +291,10 @@
           </template>
         </el-table-column>
         <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
-        <el-table-column prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
-        <el-table-column prop="material_code" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
-        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
+        <el-table-column prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_name',crud.data,'物料数量')" />
+        <el-table-column prop="raw_material_code" label="泥料编码" show-overflow-tooltip :min-width="flexWidth('raw_material_code',crud.data,'物料数量')" />
+        <el-table-column prop="material_code" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_code',crud.data,'物料数量')" />
+        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料数量')" />
         <el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
         <el-table-column prop="material_weight" label="物料重量" :min-width="flexWidth('material_weight',crud.data,'物料重量')" />
         <el-table-column prop="group_number" label="组盘次数" :min-width="flexWidth('group_number',crud.data,'组盘次数')" />