Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei

src/views/supplier/batch/realBatch.vue

@@ -8,6 +8,12 @@
 											clearable
                       v-model="form.artid">
             </el-input>
+          </el-form-item>
+					<el-form-item>
+            <el-input placeholder="产线ID"
+											clearable
+                      v-model="form.planresourceid">
+            </el-input>
           </el-form-item>
 					<el-form-item>
 						<el-button type="primary" icon="el-icon-search" @click="searchList">搜索</el-button>
@@ -82,6 +88,7 @@ export default {
     return {
       form: {
         artid: undefined,
+				planresourceid: undefined,
         pageNumber: 1,
         pageSize: 10,
       },
@@ -91,6 +98,7 @@ export default {
         'LOG_ArtDemandHeadCache-ArtId',
 				'LOG_ArtDemandHeadCache-DemandCtrlPara3',
         'LOG_ArtDemandHeadCache-DemandId',
+				'LOG_ArtDemandHeadCache-PlanResourceId',
         'LOG_ArtDemandHeadCache-DemandDate',
         'LOG_ArtDemandHeadCache-DemandQty',
         'LOG_ArtDemandHeadCache-OrderType',
@@ -125,6 +133,7 @@ export default {
     //搜索
     searchList() {
 			if (this.form.artid === '') this.form.artid = undefined
+			if (this.form.planresourceid === '') this.form.planresourceid = undefined
       this.form.pageNumber = 1
       this.getList()
     },
@@ -132,6 +141,7 @@ export default {
     resetQuery() {
 			this.form = {
         artid: undefined,
+				planresourceid: undefined,
         pageNumber: 1,
         pageSize: 10,
       }

src/views/supplier/detail/realDetail.vue

@@ -14,6 +14,12 @@
 											clearable
                       v-model="form.artid">
             </el-input>
+          </el-form-item>
+					<el-form-item>
+            <el-input placeholder="产线ID"
+											clearable
+                      v-model="form.planresourceid">
+            </el-input>
           </el-form-item>
 					<el-form-item>
 						<el-button type="primary" icon="el-icon-search" @click="searchList">搜索</el-button>
@@ -84,6 +90,7 @@ export default {
       form: {
         demandid: undefined,
         artid: undefined,
+				planresourceid: undefined,
         pageNumber: 1,
         pageSize: 10,
       },
@@ -93,6 +100,7 @@ export default {
         'LOG_ArtDemandLstCache-DemandId',
         'LOG_ArtDemandLstCache-ArtId',
 				'LOG_ArtDemandLstCache-DemandCtrlPara3',
+				'LOG_ArtDemandLstCache-PlanResourceId',
         'LOG_ArtDemandLstCache-DemandDate',
         'LOG_ArtDemandLstCache-DemandQty',
         'LOG_ArtDemandLstCache-OrderType',
@@ -122,6 +130,7 @@ export default {
     searchList() {
 			if (this.form.artid === '') this.form.artid = undefined
 			if (this.form.demandid === '') this.form.demandid = undefined
+			if (this.form.planresourceid === '') this.form.planresourceid = undefined
       this.form.pageNumber = 1
       this.getList()
     },
@@ -129,6 +138,7 @@ export default {
     resetQuery() {
 			this.form = {
         artid: undefined,
+				planresourceid: undefined,
         pageNumber: 1,
         pageSize: 10,
       }