调整

src/views/equipment/archives/index.vue

@@ -10,6 +10,12 @@
         		<span class="search-span">设备信息:</span>
         		 	<el-input v-model="queryParams.sbxx"></el-input>
         	</div>
+        </el-col>
+        <el-col :span="4" class="search-col">
+          <div class="search-item">
+            <span class="search-span">公司:</span>
+            <RelSelect style="width: 100%;"  src='jcsj/common/bm/queryGs'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid' ></RelSelect>
+          </div>
         </el-col>
 				<!--<el-col :span="6" class="search-col">-->
 					<!--<div class="search-item">-->
@@ -91,6 +97,7 @@
 					sbxx: '',
 					doc:'',
 					xtfl:"0",
+          gsid:""
 				},
 				/* 表格标题对应参数*/
 				tableTitle: [
@@ -110,7 +117,7 @@
           {label: "制造日期", prop: "ccrq", fieldType: "ftDateTime"},
          	// {label: "计量单位", prop: "jldw", fieldType: "ftString",width:120},
          	{label: "启用日期", prop: "qyrq", fieldType: "ftDateTime"},
-         	{label: "检验日期", prop: "scjyrq", fieldType: "ftDateTime"},
+         	{label: "检验日期", prop: "scjyrq", fielNdType: "ftDateTime"},
          	{label: "下次检验日期", prop: "xcjyrq", fieldType: "ftDateTime"},
           {label: "检验周期", prop: "jyzq", fieldType: "ftString"},
          /* 	{label: "停用日期", prop: "tyrq", fieldType: "ftDateTime"}, */

src/views/equipment/sbbymx/byxm.vue

@@ -83,7 +83,7 @@
 			/* 表格标题对应参数*/
 			tableTitle: [
         {label: "编码", prop: "code", fieldType: "ftString",width:120},
-        {label: "名称111", prop: "name", fieldType: "ftString",width:300},
+        {label: "名称", prop: "name", fieldType: "ftString",width:300},
         {label: "保养周期-天", prop: "byzq", fieldType: "int",width:252},
         // {label: "公司", prop: "gsName", fieldType: "ftString",width:192},
         // {label: "停用标志", prop: "tybz", fieldType: "ftString",width:100},

src/views/equipment/sbbymx/ckxm.vue

@@ -81,9 +81,9 @@
         {label: "名称", prop: "byxmName", fieldType: "ftString",width:300},
         {label: "保养周期-天", prop: "byzq", fieldType: "int",width:252},
 
-        {label: "上次保养日期", prop: "scbyrq", ...this.$common('ftDate'),width:192},
+        {label: "上次保养日期", prop: "scbyrq", ...this.$common('ftDateTime'),width:192},
         {label: "上次保养人", prop: "scbyrName", fieldType: "ftString",width:200},
-        {label: "预计下次保养日期", prop: "xcbyrq", ...this.$common('ftDate'),width:192},
+        {label: "预计下次保养日期", prop: "xcbyrq", ...this.$common('ftDateTime'),width:192},
 
 
         // {label: "公司", prop: "gsName", fieldType: "ftString",width:192},

src/views/equipment/sbbymx/ckxmEdit.vue

@@ -108,7 +108,9 @@ props:['app'],
             if(res.success){
               this.$success('反馈成功')
               this.app.showDialog=false
-            }
+              this.app.$refs['TablePager'].pageQuery()
+
+              }
         })
       }
 

src/views/equipment/sbbymx/index.vue

@@ -9,19 +9,19 @@
 		<div class="search" v-condition>
 			<SearchButton :app='app'></SearchButton>
 			<el-row :gutter="20" class="search-row-1">
-        <el-col :span="6" class="search-col">
+        <!--<el-col :span="6" class="search-col">
         	<div class="search-item">
         		<span class="search-span">档案编号:</span>
         		<el-input v-model="queryParams.dabh"></el-input>
         	</div>
-        </el-col>
+        </el-col>-->
         <el-col :span="6" class="search-col">
         	<div class="search-item">
         		<span class="search-span">设备名称:</span>
         		 	<el-input v-model="queryParams.sbxx"></el-input>
         	</div>
         </el-col>
-				<el-col :span="6" class="search-col">
+				<!--<el-col :span="6" class="search-col">
 					<div class="search-item">
 						<span class="search-span">是否已入档:</span>
 						  <el-select v-model="queryParams.doc" placeholder="请选择">
@@ -33,7 +33,13 @@
 							</el-option>
 						</el-select>
 					</div>
-				</el-col>
+				</el-col>-->
+        <!--<el-col :span="4" class="search-col">
+          <div class="search-item">
+            <span class="search-span">公司:</span>
+            <RelSelect style="width: 100%;"  src='jcsj/common/bm/queryGs'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid' ></RelSelect>
+          </div>
+        </el-col>-->
 
 			</el-row>
 		</div>

src/views/equipment/sbbyxm/index.vue

@@ -10,6 +10,12 @@
 						<el-input v-model="queryParams.info"></el-input>
 					</div>
 				</el-col>
+        <el-col :span="4" class="search-col">
+          <div class="search-item">
+            <span class="search-span">公司:</span>
+            <RelSelect style="width: 100%;"  src='jcsj/common/bm/queryGs'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid' ></RelSelect>
+          </div>
+        </el-col>
 			</el-row>
 		</div>
 		<!-- 按钮操作-->
@@ -70,7 +76,8 @@
 			baseUrl: '/aqgl/sbgl/sbbyxm',
 			/* 查询参数*/
 			queryParams: {
-				info: ''
+				info: '',
+        gsid:''
 			},
 			/* 表格标题对应参数*/
 			tableTitle: [