瀏覽代碼

借用详情调整,项目商机导出调整

qymljy 2 年之前
父節點
當前提交
9733bd71cf

+ 6 - 0
src/HDrpManagement/projectChange/index.vue

@@ -41,6 +41,8 @@
                 :key="item.value"
                 :label="item.value"
                 :value="item.value">
+              <span style="float: left">{{ item.value }}</span>
+              <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
             </el-option>
           </el-select>
         </div>
@@ -52,6 +54,8 @@
                 :key="item.value"
                 :label="item.value"
                 :value="item.value">
+              <span style="float: left">{{ item.value }}</span>
+              <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
             </el-option>
           </el-select>
         </div>
@@ -74,6 +78,8 @@
                 :key="item.value"
                 :label="item.value"
                 :value="item.value">
+              <span style="float: left">{{ item.value }}</span>
+              <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
             </el-option>
           </el-select>
         </div>

+ 1 - 1
src/HDrpManagement/toolBorrowingMag/detail/tabs/toolList.vue

@@ -24,7 +24,7 @@
         label="型号"
         width="150">
         <template slot-scope="scope">
-          <p><span>{{scope.row.model}}</span>></p>
+          <p><span>{{scope.row.model}}</span></p>
         </template>
       </el-table-column>
       <el-table-column

+ 4 - 0
src/components/export_excel/index.vue

@@ -44,6 +44,10 @@ export default {
               e.tag_sys = e.tag_sys
             }
           })
+        }else if(e.title === '项目类型'){
+          res.data.forEach(e => {
+            e.projecttype = e.projecttype + '-' + e.projecttype_remarks
+          })
         }
       });
       let hd = table.map(e=>{