فهرست منبع

1.修改输入框选择框宽度
2.处理列表查询回车页面刷新
3.加宽列表字段展示宽度
4.隐藏删除基本信息按钮

002390 2 سال پیش
والد
کامیت
8b8e4cf48c
3فایلهای تغییر یافته به همراه33 افزوده شده و 26 حذف شده
  1. 25 16
      src/views/material/basicFile/details.vue
  2. 7 7
      src/views/material/basicFile/index.vue
  3. 1 3
      vue.config.js

+ 25 - 16
src/views/material/basicFile/details.vue

@@ -10,7 +10,7 @@
           <el-button-group>
             <!-- <el-button size="small" @click="handleInster">新增</el-button> -->
             <el-button size="small" @click="handleBasicEdit">修改</el-button>
-            <el-button size="small" @click="handleDel">删除</el-button>
+            <!-- <el-button size="small" @click="handleDel">删除</el-button> -->
             <!-- <el-button size="small" @click="handleCopy">复制</el-button> -->
           </el-button-group>
         </el-col>
@@ -29,7 +29,7 @@
               </el-dropdown-menu>
             </el-dropdown>
 
-                                                                                          <el-button size="small" @click="handleQuery">查询</el-button> -->
+                                                                                                <el-button size="small" @click="handleQuery">查询</el-button> -->
             <el-button size="small" @click="handleRefresh">刷新</el-button>
 
           </el-button-group>
@@ -49,7 +49,7 @@
                 <el-dropdown-item :command="isInvoke(true)">启用</el-dropdown-item>
                 <el-dropdown-item :command="isInvoke(false)">停用</el-dropdown-item>
               </el-dropdown-menu>
-                                                                                                                                         </el-dropdown> -->
+                                                                                                                                               </el-dropdown> -->
           </el-button-group>
         </el-col>
 
@@ -58,7 +58,7 @@
           <el-button-group>
             <el-button size="small" @click="handleQueryForm">申请单查询</el-button>
           </el-button-group>
-                                                                                  </el-col> -->
+                                                                                        </el-col> -->
 
         <!-- 导入导出 -->
       <!-- <el-col :span="1.5">
@@ -66,7 +66,7 @@
             <el-button size="small" @click="handleImport">批量导入</el-button>
             <el-button size="small" @click="handleExport">批量导出</el-button>
           </el-button-group>
-                                                                                    </el-col> -->
+                                                                                          </el-col> -->
 
       </el-row>
 
@@ -92,8 +92,8 @@
     <el-row :gutter="10" class="mb10" v-show="activeMainTab != 'material'">
       <el-col :span="1.5">
         <el-button-group>
-          <el-button size="small" @click="handleEdit">修改</el-button>
-          <el-button size="small" @click="handleDel">删除</el-button>
+          <el-button size="small" @click="handleOtherEdit">修改</el-button>
+          <!-- <el-button size="small" @click="handleOtherDel">删除</el-button> -->
         </el-button-group>
         <el-button-group>
           <el-button size="small" @click="handleRefresh">刷新</el-button>
@@ -112,7 +112,7 @@
           <!-- 附件管理 -->
         <!-- <el-button-group>
             <el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button>
-                                                                                  </el-button-group> -->
+                                                                                        </el-button-group> -->
 
           <!-- 切换 -->
         <!-- <el-button-group>
@@ -124,7 +124,7 @@
               @click="handleChangePage('next')" />
             <el-button size="small" icon="el-icon-d-arrow-right" :disabled="!handleBasicEdit"
               @click="handleChangePage('end')" />
-                                                                                  </el-button-group> -->
+                                                                                        </el-button-group> -->
         </el-col>
       </el-row>
 
@@ -390,8 +390,8 @@
         <el-row :gutter="10" class="mb10">
           <el-col :span="1.5" v-if="!otherDeatils.isEdit">
             <el-button-group>
-              <el-button size="small" @click="handleEdit">修改</el-button>
-              <el-button size="small" @click="handleDel">删除</el-button>
+              <el-button size="small" @click="handleOtherEdit">修改</el-button>
+              <el-button size="small" @click="handleOtherDel">删除</el-button>
             </el-button-group>
             <el-button-group>
               <el-button size="small" @click="handleOtherRefresh">刷新</el-button>
@@ -411,7 +411,7 @@
             <el-form :inline="true" label-position="right" :model="basicData.value">
             <!-- <el-form-item label="所属组织">
                   <el-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       </el-form-item> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             </el-form-item> -->
               <el-form-item label="物料编码">
                 <el-input v-model="basicData.value.code" size="small" readonly placeholder="物料编码"></el-input>
               </el-form-item>
@@ -423,7 +423,7 @@
               </el-form-item>
             <!-- <el-form-item label="版本号">
                 <el-input v-model="basicData.value.version"  placeholder="版本号"></el-input>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       </el-form-item> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             </el-form-item> -->
 
             </el-form>
           </el-collapse-item>
@@ -1212,7 +1212,7 @@ export default {
       });
     },
     // 除基本信息之后的修改
-    handleEdit() {
+    handleOtherEdit() {
       console.log('除基本信息之后的修改', this.otherDeatils.queryKey);
 
       if ((this.otherDeatils.queryKey && this.otherDeatils.queryKey != '') || this.mainMsg.checkedList.length == 1) {
@@ -1237,6 +1237,10 @@ export default {
     handleOtherRefresh() {
       this.getOtherListDetails(this.activeMainTab, this.otherDeatils.queryKey);
     },
+    // 其他标签详情弹窗-删除
+    handleOtherDel() {
+
+    },
     // 修改
     handleBasicEdit() {
       console.log('修改基本信息');
@@ -1252,7 +1256,8 @@ export default {
     },
     // 删除
     handleDel() {
-      console.log('删除');
+      console.log('删除----基本信息');
+
     },
     // 复制
     handleCopy() {
@@ -1704,6 +1709,10 @@ export default {
     padding: 12px;
     overflow-y: auto;
     overflow-x: auto;
+
+    .el-select {
+      width: 100%;
+    }
   }
 
   .md-content {
@@ -1724,7 +1733,7 @@ export default {
           overflow-x: hidden;
 
           .el-checkbox {
-            padding: 0 50%;
+            padding: 0 58%;
           }
         }
       }

+ 7 - 7
src/views/material/basicFile/index.vue

@@ -9,7 +9,7 @@
         <el-button-group>
           <!-- <el-button size="small" @click="handleInster">新增</el-button> -->
           <el-button size="small" @click="handleEdit">修改</el-button>
-          <el-button size="small" @click="handleDel">删除</el-button>
+          <!-- <el-button size="small" @click="handleDel">删除</el-button> -->
           <!-- <el-button size="small" @click="handleCopy">复制</el-button> -->
         </el-button-group>
       </el-col>
@@ -26,7 +26,7 @@
               <el-dropdown-item :command="filterCondition('stop')">显示停用</el-dropdown-item>
               <el-dropdown-item :command="filterCondition('allot')">显示已分配</el-dropdown-item>
             </el-dropdown-menu>
-                      </el-dropdown> -->
+                          </el-dropdown> -->
 
           <!-- <el-button size="small" @click="handleQuery">查询</el-button> -->
           <el-button size="small" @click="handleRefresh">刷新</el-button>
@@ -45,14 +45,14 @@
             </el-dropdown-menu>
           </el-dropdown>
         </el-button-group>
-                  </el-col> -->
+                      </el-col> -->
 
       <!-- 申请单查询 -->
     <!-- <el-col :span="1.5">
         <el-button-group>
           <el-button size="small" @click="handleQueryForm">申请单查询</el-button>
         </el-button-group>
-                  </el-col> -->
+                      </el-col> -->
 
       <!-- 导入导出 -->
       <el-col :span="1.5">
@@ -64,7 +64,7 @@
 
       <el-col :span="1.5">
         <!-- 查询框 -->
-        <el-form :inline="true" :model="queryForm" class="mb-query">
+        <el-form :inline="true" :model="queryForm" class="mb-query" @submit.native.prevent>
           <el-form-item label="物料名称">
             <el-input size="small" v-model="queryForm.name" placeholder="物料名称"></el-input>
           </el-form-item>
@@ -86,9 +86,9 @@
 
     <el-card class="material-list" v-loading="loading">
       <el-table :data="taskList" @cell-dblclick="handledbClick" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="20" />
         <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column v-for="h in  tableHeader" v-if="h.show" :label="h.name" align="center" :prop="h.prop"
+        <el-table-column width="150" v-for="h in  tableHeader" v-if="h.show" :label="h.name" align="center" :prop="h.prop"
           show-overflow-tooltip />
       </el-table>
 

+ 1 - 3
vue.config.js

@@ -37,12 +37,10 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://172.16.100.107:8080/ruoyi-admin`, //生产
-        target: `http://172.16.100.107:8080/drp-admin`, //测试
         // target: `http://test-sy.derom.com/drp-admin`, //测试
-        // target: `http://172.16.63.202:8000/drp-admin`, // 谁的本地
         // target: `http://172.16.62.241:8000/drp-admin`, //笑寒本地
         // target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地
-        // target: `http://172.16.13.47:8000/drp-admin`, //石本地
+        target: `http://172.16.13.47:8000/drp-admin`, //石本地
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''