设备管理页面调整

96e8eda3 · zhoumaotao · c1dba9c6 · 96e8eda3 · 96e8eda3 · 96e8eda3
Commit 96e8eda3 authored Nov 16, 2022 by zhoumaotao
9 changed files
--- a/src/views/equipment/archives/edit.vue
+++ b/src/views/equipment/archives/edit.vue
@@ -10,7 +10,7 @@
                </el-col>

                <el-col :span="12">
-                    <el-form-item label="名称"  ref="name" prop="name">
+                    <el-form-item label="设备名称"  ref="name" prop="name">
                        <el-input :readonly="readonly"  v-model="form.name" ></el-input>
                    </el-form-item>
                </el-col>

--- a/src/views/equipment/archives/index.vue
+++ b/src/views/equipment/archives/index.vue
@@ -100,11 +100,11 @@
 				},
 				/* 表格标题对应参数*/
 				tableTitle: [
-         // {label: "设备编码", prop: "code", fieldType: "ftString",width:300},
-         	{label: "档案编号", prop: "dabh", fieldType: "ftString",width:300},
+        	{label: "档案编号", prop: "dabh", fieldType: "ftString",width:100},
+          {label: "设备编号", prop: "code", fieldType: "ftString",width:140},
+          {label: "设备名称", prop: "name", fieldType: "ftString",width:160},
         	// {label: "系统分类", prop: "xtflName", fieldType: "ftString",width:48},
         	// {label: "设备分类", prop: "sbflName", fieldType: "ftString",width:96},
-         	{label: "名称", prop: "name", fieldType: "ftString",width:300},
         	{label: "制造商", prop: "productor", fieldType: "ftString",width:300},
         	{label: "型号", prop: "model", fieldType: "ftString",width:300},
         	{label: "出厂编号", prop: "serialno", fieldType: "ftString",width:300},
@@ -116,10 +116,9 @@
         	{label: "用途", prop: "yt", fieldType: "ftString",width:300},
         	{label: "数量", prop: "sl", fieldType: "int"},
         	{label: "出厂日期", prop: "ccrq", fieldType: "ftDateTime"},
-      
          {label: "备注", prop: "bz", fieldType: "ftString",width:300},
-			{label: "是否已入档", prop: "doc", fieldType: "ftString",width:300,show:false},
-			{label: "是否已入档", prop: "docName", fieldType: "ftString",width:300}
+          {label: "是否已入档", prop: "doc", fieldType: "ftString",width:160,show:false},
+          {label: "是否已入档", prop: "docName", fieldType: "ftString",width:160}
  
 				]
 			}

--- a/src/views/equipment/environment/edit.vue
+++ b/src/views/equipment/environment/edit.vue
@@ -14,7 +14,7 @@
                </el-form-item>
            </el-col>
            <el-col :span="12">
-                 <el-form-item label="名称"  ref="name" prop="name">
+                 <el-form-item label="设备名称"  ref="name" prop="name">
                     <el-input :readonly="readonly"  v-model="form.name" ></el-input>
                 </el-form-item>
             </el-col>

--- a/src/views/equipment/environment/index.vue
+++ b/src/views/equipment/environment/index.vue
@@ -120,8 +120,9 @@
 					},
 					/* 表格标题对应参数*/
 					tableTitle: [
-	         {label: "设备编码", prop: "code", fieldType: "ftString",width:300},
-	         	// {label: "档案编号", prop: "dabh", fieldType: "ftString",width:300},
+	        	{label: "档案编号", prop: "dabh", fieldType: "ftString",width:100},
+            {label: "设备编号", prop: "code", fieldType: "ftString",width:140},
+            {label: "设备名称", prop: "name", fieldType: "ftString",width:160},
 	         	// {label: "系统分类", prop: "xtflName", fieldType: "ftString",width:48},
 				    // {label: "设备分类", prop: "sbflName", fieldType: "ftString",width:96},
            {label: "系统名称", prop: "xtmc", fieldType: "ftString",width:180},
@@ -226,4 +227,3 @@
 	<style scoped>
 	
 	</style>
-	
\ No newline at end of file
--- a/src/views/equipment/maintain/edit.vue
+++ b/src/views/equipment/maintain/edit.vue
@@ -3,18 +3,18 @@
        <!-- 填写表单内容，slot=form必写-->
        <el-form slot="form" ref="form" :model="form" label-width="110px" :rules="rules">
            <el-row :gutter="20">
-                <el-col :span="24">
+                <!--  <el-col :span="24">
                    <el-form-item label="档案编号"  ref="dabh" prop="dabh">
                        <el-input :readonly="readonly"  v-model="form.dabh" ></el-input>
                    </el-form-item>
-                </el-col>
+                </el-col>-->
                 <el-col :span="12">
                    <el-form-item label="设备编码"  ref="code" prop="code">
                        <el-input :readonly="readonly"  v-model="form.code" ></el-input>
                    </el-form-item>
                </el-col>
                 <el-col :span="12">
-                    <el-form-item label="名称"  ref="name" prop="name">
+                    <el-form-item label="设备名称"  ref="name" prop="name">
                        <el-input :readonly="readonly"  v-model="form.name" ></el-input>
                    </el-form-item>
                </el-col>

--- a/src/views/equipment/maintain/index.vue
+++ b/src/views/equipment/maintain/index.vue
@@ -90,8 +90,9 @@
 					},
 					/* 表格标题对应参数*/
 					tableTitle: [
-	         {label: "设备编码", prop: "code", fieldType: "ftString",width:300},
-	         	{label: "档案编号", prop: "dabh", fieldType: "ftString",width:300},
+	        	{label: "档案编号", prop: "dabh", fieldType: "ftString",width:100},
+            {label: "设备编号", prop: "code", fieldType: "ftString",width:140},
+            {label: "设备名称", prop: "name", fieldType: "ftString",width:160},
 	         	// {label: "系统分类", prop: "xtflName", fieldType: "ftString",width:48},
 	         	// {label: "设备分类", prop: "sbflName", fieldType: "ftString",width:96},
 	         	{label: "名称", prop: "name", fieldType: "ftString",width:300},
@@ -205,4 +206,3 @@
 	<style scoped>
 	
 	</style>
-	
\ No newline at end of file
--- a/src/views/equipment/specialEquipment/edit.vue
+++ b/src/views/equipment/specialEquipment/edit.vue
@@ -3,11 +3,6 @@
        <!-- 填写表单内容，slot=form必写-->
        <el-form slot="form" ref="form" :model="form" label-width="130px" style="height: 70vh;overflow: auto;overflow-x: hidden;padding-right: 30px;" :rules="rules">
            <el-row :gutter="20">
-          <!--      <el-col :span="12">
-                    <el-form-item label="设备编码"  ref="code" prop="code">
-                        <el-input :readonly="readonly"  v-model="form.code" ></el-input>
-                    </el-form-item>
-                </el-col> -->
                <el-col :span="12">
                  <el-form-item label="设备编码"  ref="code" prop="code">
                        <el-input :readonly="readonly"  v-model="form.code" ></el-input>
@@ -24,7 +19,7 @@
                    </el-form-item>
                </el-col> -->
                <el-col :span="12">
-                    <el-form-item label="名称"  ref="name" prop="name">
+                    <el-form-item label="设备名称"  ref="name" prop="name">
                        <el-input :readonly="readonly"  v-model="form.name" ></el-input>
                    </el-form-item>
                </el-col>

--- a/src/views/equipment/specialEquipment/index.vue
+++ b/src/views/equipment/specialEquipment/index.vue
@@ -131,7 +131,8 @@
 				/* 表格标题对应参数*/
 				tableTitle: [
         	{label: "档案编号", prop: "dabh", fieldType: "ftString",width:100},
-         	{label: "名称", prop: "name", fieldType: "ftString",width:200},
+         	{label: "设备编号", prop: "code", fieldType: "ftString",width:140},
+         	{label: "设备名称", prop: "name", fieldType: "ftString",width:160},
         	{label: "制造商", prop: "productor", fieldType: "ftString",width:200},
  
         	{label: "使用状态", prop: "tybzName", fieldType: "ftString",width:80},

--- a/src/views/outsourcingDirector/process/edit.vue
+++ b/src/views/outsourcingDirector/process/edit.vue
@@ -25,7 +25,7 @@
          <el-form-item label="单位类型" prop="type">
            <RelSelect
              src="/aqgl/wxgl/wxdwsb/init/dwlx"
-              :match="{value:'id',label:'bmmc'}"
+              :match="{value:'id',label:'name'}"
              v-model="form.dwlx"
            ></RelSelect>
          </el-form-item>