소스 검색

Merge tag 'Hotfix-zh-297' into develop

Finish Hotfix-zh-297
howie 2 년 전
부모
커밋
6cfdd5c808
3개의 변경된 파일12개의 추가작업 그리고 11개의 파일을 삭제
  1. 2 1
      src/api/common.js
  2. 2 2
      src/views/supply/engin/components/home_form.vue
  3. 8 8
      src/views/supply/engin/home_list.vue

+ 2 - 1
src/api/common.js

@@ -44,8 +44,9 @@ export function getTypeList(params) {
 }
 // 销售类型-家用工程专用
 export function getHomeTypeList(params) {
+  // /sale/type/home/list
   return request({
-    url: '/sale/type/home/list',
+    url: '/sale/type/list',
     method: 'get',
     params
   })

+ 2 - 2
src/views/supply/engin/components/home_form.vue

@@ -824,8 +824,8 @@ export default {
 
     // 获取家用销售类型列表
     getHomeTypeList() {
-      getHomeTypeList().then((res) => {
-        this.salesTypeList = res.data
+      getHomeTypeList({ pageNum: 1, pageSize: -1 }).then((res) => {
+        this.salesTypeList = res.data.records
       })
     },
 

+ 8 - 8
src/views/supply/engin/home_list.vue

@@ -35,14 +35,14 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程编码" prop="enginNum">
-                <el-input
-                  v-model="screenForm.enginNum"
-                  placeholder="请输入工程编码"
-                />
-              </el-form-item>
-            </el-col>
+            <!--            <el-col :xs="24" :sm="12" :lg="6">-->
+            <!--              <el-form-item label="工程编码" prop="enginNum">-->
+            <!--                <el-input-->
+            <!--                  v-model="screenForm.enginNum"-->
+            <!--                  placeholder="请输入工程编码"-->
+            <!--                />-->
+            <!--              </el-form-item>-->
+            <!--            </el-col>-->
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程登录编号" prop="loginNum">
                 <el-input