Merge branch 'dev' of http://app.bmetech.com/liuzhaohui/dctomproject into dev

src/views/closeManage/myAgency.vue

@@ -46,8 +46,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" class="default-btn" @click="onSearch">搜索</el-button>
-        <el-button  class="default-btn" @click="onReset">重置</el-button>
+        <el-button class="default-btn" @click="onSearch">查询</el-button>
+        <el-button type="primary"  class="default-btn" @click="onReset">重置</el-button>
       </el-form-item>
     </el-form>
     <div class="table-box">
@@ -644,12 +644,9 @@ const formInline = ref({
   eventName: '',
   keyword: '',
   warnType: '',
-  branchFactoryIds: '',
+  productionLineId: '',
   deviceType: '',
-  createTime: [
-    moment(new Date().getTime() - 1000 * 60 * 60 * 24).format('YYYY-MM-DD HH:mm:ss'),
-    moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
-  ]
+  createTime: ['','']
 });
 
 const workTicketNo = ref('');
@@ -881,7 +878,7 @@ const onReset =()=> {
   pageSize.value = 20;
   formInline.value.eventName = '';
   formInline.value.keyword = '';
-  formInline.value.branchFactoryIds = '';
+  formInline.value.productionLineId = '';
   formInline.value.deviceType = '';
   formInline.value.createTime = [
     moment(new Date().getTime() - 1000 * 60 * 60 * 24).format('YYYY-MM-DD HH:mm:ss'),
@@ -1084,7 +1081,7 @@ const getTableData = ()=> {
     warnType: formInline.value.warnType,
     createStartTime: formInline.value.createTime[0],
     createEndTime: formInline.value.createTime[1],
-    branchFactoryIds: realBtn,
+    productionLineId: formInline.value.productionLineId,
     keyword: keyWord,
     pageNum: currentPage.value,
     pageSize: pageSize.value,
@@ -1223,7 +1220,7 @@ const formModel = ref({
 const getProDuctLine = ()=>{
   const url = '/transaction/getProductionLine';
   getData(url).then(res => {
-    basicConfiguration.productLineList = res.data;
+    basicConfiguration.productLineList.push(...res.data);
   });
 }
 

src/views/closeManage/myDone.vue

@@ -46,7 +46,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button  class="default-btn" @click="onSearch">搜索</el-button>
+        <el-button  class="default-btn" @click="onSearch">查询</el-button>
         <el-button type="primary" class="default-btn" @click="onReset">重置</el-button>
       </el-form-item>
     </el-form>
@@ -746,10 +746,10 @@ const formInline = ref({
   eventName: '',
   keyword: '',
   warnType: '',
-  branchFactoryIds: '',
+  productionLineId: '',
   deviceType: '',
   createTime: [
-    moment(new Date().getTime() - 1000 * 60 * 60 * 24).format('YYYY-MM-DD HH:mm:ss'),
+    moment(new Date().getTime() - 1000 * 60 * 60 * 24 * 30).format('YYYY-MM-DD HH:mm:ss'),
     moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
   ]
 });
@@ -910,7 +910,7 @@ const workSheetDetail = ref(null);
 const getProDuctLine = ()=>{
   const url = '/transaction/getProductionLine';
   getData(url).then(res => {
-    basicConfiguration.productLineList = res.data;
+    basicConfiguration.productLineList.push(...res.data);
   });
 }
 
@@ -935,7 +935,7 @@ const onReset =()=> {
   pageSize.value = 20;
   formInline.value.eventName = '';
   formInline.value.keyword = '';
-  formInline.value.branchFactoryIds = '';
+  formInline.value.productionLineId = '';
   formInline.value.deviceType = '';
   formInline.value.createTime = [
     moment(new Date().getTime() - 1000 * 60 * 60 * 24).format('YYYY-MM-DD HH:mm:ss'),
@@ -1136,7 +1136,7 @@ const getTableData = ()=> {
     warnType: formInline.value.warnType,
     createStartTime: formInline.value.createTime[0],
     createEndTime: formInline.value.createTime[1],
-    branchFactoryIds: realBtn,
+    productionLineId: formInline.value.productionLine,
     keyword: keyWord,
     pageNum: currentPage.value,
     pageSize: pageSize.value,