plm抓取页面优化

陈翱
1 parent 1b185fe0
Showing 5 changed files with 84 additions and 19 deletions
src/views/prodectplm/modules/PlmPnoForm.vue
src/views/scheduler/SchedulerDetailList.vue
src/views/scheduler/modules/PBOMList.vue
src/views/scheduler/modules/importBom.vue
src/views/system/ProjectList.vue
@@ -8,11 +8,16 @@
               <a-input v-decorator="['pno', validatorRules.pno]" placeholder="请输入节点编码"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="24" v-if="play">
-            <a-form-item label="是否抓取过" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['falg']" placeholder="请输入是否抓取过"  ></a-input>
-            </a-form-item>
-          </a-col>
+
+
+          <a-form-item v-if="play"
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            label="是否抓取过">
+            <j-search-select-tag placeholder="请选择生产令号" v-decorator="['falg']"  :dictOptions="searchOptions">
+            </j-search-select-tag>
+          </a-form-item>
+
           <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
             <a-button @click="submitForm">提 交</a-button>
           </a-col>
@@ -28,6 +33,7 @@
   import pick from 'lodash.pick'
   import { checkPno } from '@api/api'
   import { validateDuplicateValue } from '@/utils/util'
+  import {ajaxGetDictItems} from "../../../api/api";
  
   export default {
     name: 'PlmPnoForm',
@@ -58,6 +64,7 @@
         form: this.$form.createForm(this),
         model: {},
         play:false,
+        searchOptions:[],
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -104,6 +111,7 @@
     created () {
       //如果是流程中表单，则需要加载流程表单data
       this.showFlowData();
+      this.getPlmStatus();
     },
     methods: {
       add () {
@@ -133,24 +141,36 @@
           });
         }
       },
+
+      getPlmStatus() {
+        ajaxGetDictItems('pstatus').then((res) => {
+          if (res.success) {
+            this.searchOptions = res.result
+          }
+        })
+      },
+
       validatePno(rule, value, callback){
         var params = {
           pno: value,
         };
-        checkPno(params).then((res) => {
-          if (res.success) {
-            callback()
-          } else {
-            callback("节点编号已存在!")
-          }
-        })
+        if (this.play==false){
+          checkPno(params).then((res) => {
+            if (res.success) {
+              callback()
+            } else {
+              callback("节点编号已存在!")
+            }
+          })
+        }else{
+          callback()
+        }
       },
  
       submitForm () {
         const that = this;
         // 触发表单验证
         this.form.validateFields((err, values) => {
-          debugger
           if (!err) {
             that.confirmLoading = true;
             let httpurl = '';
@@ -108,7 +108,7 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import SchedulerDetailModal from './modules/SchedulerDetailModal'
 import SchedulerCompleteModal from '@views/scheduler/modules/SchedulerCompleteModal'
-import { getTechnology, getTechnologyType } from '@api/api'
+import { getTechnology, getTechnologyType,deletePl } from '@api/api'
 import { queryDetailList } from '../../api/schedulerApi'
  
 export default {
@@ -140,6 +140,7 @@ export default {
       description: '生产计划管理页面',
       disableMixinCreated: true,
       expandedRowKeys: [],
+      id:'',
       // 表头
       columns: [
         {
@@ -261,7 +262,8 @@ export default {
       url: {
         list: '/scheduler/schedulerDetail/list',
         delete: '/scheduler/schedulerHeader/deleteSchedulerDetail',
-        deleteBatch: '/scheduler/schedulerHeader/deleteBatchSchedulerDetail',
+        // deleteBatch: '/scheduler/schedulerHeader/deleteBatchSchedulerDetail',
+        deleteBatch: '/scheduler/schedulerDetail/deleteBatch',
         exportXlsUrl: '/scheduler/schedulerHeader/exportSchedulerDetail',
         importUrl: '/scheduler/schedulerHeader/importSchedulerDetail'
       },
@@ -313,9 +315,13 @@ export default {
       this.$refs.modalForm.title = '增加'
       this.$refs.modalForm.disableSubmit = false
     },
-    selectChanges(selectedRowKeys, selectionRows) {
  
+
+    selectChanges(selectedRowKeys, selectionRows) {
+      this.selectedRowKeys = selectedRowKeys;
+      this.selectionRows = selectionRows;
     },
+
     getTechnologyTypeList() {
       const that = this
       let obj = getTechnologyType()
@@ -10,7 +10,7 @@
     </template>
  
       <a-row :gutter="12">
-        <a-col :md="7" :sm="8">
+        <a-col :md="5" :sm="8">
           <a-form-item label="节点编码" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
 <!--            <a-input placeholder="请输入节点编码" v-model="no" @keyup.enter="searchEnterFun($event)" ></a-input>-->
             <a-select
@@ -25,12 +25,18 @@
           </a-form-item>
         </a-col>
  
-        <a-col :md="7" :sm="8">
+        <a-col :md="4" :sm="8">
           <a-form-item label="物料名称" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
             <a-input placeholder="请输入物料名称" v-model="name" @keyup.enter="searchEnterFun($event)" ></a-input>
           </a-form-item>
         </a-col>
  
+        <a-col :md="5" :sm="8">
+          <a-form-item label="图号" :labelCol="{span: 3}" :wrapperCol="{span: 14, offset: 1}">
+            <a-input placeholder="请输入图号" v-model="f08" @keyup.enter="searchEnterFun($event)" ></a-input>
+          </a-form-item>
+        </a-col>
+
         <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="queryBom"   icon="search">查询</a-button>
@@ -88,6 +94,7 @@ export default {
       no: '',
       cno:'',
       name:'',
+      f08:'',
       loading: false,
       dataSource:[],
       bomIdList:[],
@@ -224,6 +231,7 @@ export default {
       var params = this.getQueryParams()//查询条件
       params.pno=this.no
       params.name=this.name
+      params.f08=this.f08
       this.uuid=this.no
       queryBomProcess(params).then((res) => {
         if (res.code==200) {
@@ -241,6 +249,8 @@ export default {
     searchReset() {
       var that = this;
       that.no = "";
+      that.name="";
+      that.f08="";
     }
  
  
@@ -38,6 +38,13 @@
           </j-search-select-tag>
         </a-form-item>
  
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="bom套数">
+          <a-input placeholder="请输入正整数"  :disabled="roleDisabled" v-decorator.trim="['multiple',validatorRules.multiple]" />
+        </a-form-item>
+
       </a-form>
     </a-spin>
   </a-modal>
@@ -83,7 +90,12 @@ export default {
           },{
             validator: this.validateName,
           }]
-        },
+        },multiple:{
+          rules: [
+              {validator: this.validateDigits},
+            ]
+        }
+
       },
     }
   },
@@ -136,6 +148,7 @@ export default {
     },
  
     handleOk () {
+
       const that = this;
       // 触发表单验证
       this.form.validateFields((err, values) => {
@@ -144,6 +157,7 @@ export default {
           values.projectName = (values.projectName || '').trim()
           values.orderNo = (values.orderNo || '').trim()
           values.no = (values.no || '').trim()
+          //values.multiple = (values.multiple || '').trim()
           let formData = Object.assign(this.model, values);
           let obj;
           obj=importBom(formData);
@@ -177,6 +191,14 @@ export default {
       })
     },
  
+    validateDigits(rule, value, callback){
+      if(!(/(^[1-9]\d*$)/.test(value))){
+        callback("输入正整数!")
+      }else{
+        callback()
+      }
+    },
+
   }
 }
 </script>
@@ -77,6 +77,13 @@ export default {
         list: '/oa/projectc/list'
       },
       dataSource: [],
+      pagination: {
+        defaultPageSize: 5,
+        showTotal: total => `共 ${total} 条数据`,
+        showSizeChanger: true,
+        pageSizeOptions: ['5', '10', '15', '20'],
+        onShowSizeChange: (current, pageSize) => this.pageSize = pageSize
+      },
       columns:[
         {
           title: '项目名称',