SpaceOfCheng
/
admin
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 2 Activity
Browse Source

ytj

yuantianjiao 6 years ago
parent
32bcc4a9af 9c7d3b710d
commit
7f94a90f3d
4 changed files with 62 additions and 59 deletions
Split View Show Diff Stats
  1. 1
    1
      dist/index.html
  2. 7
    0
      src/pages/system/caseManager/caseTableManager/edit.vue
  3. 45
    46
      src/pages/system/courseManager/courseList/index.vue
  4. 9
    12
      src/pages/system/goodsManager/goodManager/edit.vue

+ 1
- 1
dist/index.html View File 

@@ -1 +1 @@
1 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.fdb208b4bbd1ccfe0f211a34c6c91d95.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.7e921535e20f729cf046.js></script><script type=text/javascript src=./static/js/app.0f762915754ac8b23700.js></script></body></html>
1 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.fdb208b4bbd1ccfe0f211a34c6c91d95.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.7e921535e20f729cf046.js></script><script type=text/javascript src=./static/js/app.0f762915754ac8b23700.js></script></body></html>

+ 7
- 0
src/pages/system/caseManager/caseTableManager/edit.vue View File 

@@ -127,6 +127,13 @@ export default {
127 127 
         })
128 128 
         return false
129 129 
       }
130 
+      if (this.postData.AreaId === '' || this.CaseId === '') {
131 
+        this.$message({
132 
+          type: 'error',
133 
+          message: '请选择案场/区域'
134 
+        })
135 
+        return false
136 
+      }
130 137 
       this.postData.OrgId = this.OrgId
131 138 
       this.$ajax(this.$api.caseManager.editCaseTable.url, {
132 139 
         method: this.$api.caseManager.editCaseTable.method,

+ 45
- 46
src/pages/system/courseManager/courseList/index.vue View File 

@@ -57,14 +57,6 @@
57 57 
         :data="courses.list"
58 58 
         stripe
59 59 
         style="width: 100%">
60 
-        <!-- <el-table-column
61 
-          prop="CourseName"
62 
-          label="发布状态"
63 
-          width="150">
64 
-          <template slot-scope="scope">
65 
-            <label>{{scope.row.Status===1?'已发布':'未发布'}}</label>
66 
-          </template>
67 
-        </el-table-column> -->
68 60 
         <el-table-column
69 61 
           prop="CourseName"
70 62 
           label="课程名称"

@@ -110,45 +102,47 @@
110 102 
         <el-table-column
111 103 
           fixed="right"
112 104 
           label="操作"
113 
-          width="600">
105 
+          min-width="300">
114 106 
           <template slot-scope="scope">
115 
-            <el-button
116 
-              size="mini"
117 
-              type="success"
118 
-              @click="addDetail(scope.row)">添加课程详情</el-button>
119 
-            <el-button
120 
-              size="mini"
121 
-              type="warning"
122 
-              v-if="scope.row.Status===0"
123 
-              @click="toSchedule(scope.row)"
124 
-              >排课</el-button>
125 
-            <el-button
126 
-              size="mini"
127 
-              type="primary"
128 
-              @click="handleCopy(scope.row)"
129 
-              >复制课程</el-button>
130 
-            <el-button
131 
-              size="mini"
132 
-              type="warning"
133 
-              @click="handlePublic(scope.row)"
134 
-              v-if="scope.row.Status===0"
135 
-              >发布</el-button>
136 
-            <el-button
137 
-              size="mini"
138 
-              type="danger"
139 
-              @click="handleUnPublic(scope.row)"
140 
-              v-if="scope.row.Status===1"
141 
-              >取消发布</el-button>
142 
-            <el-button
143 
-              size="mini"
144 
-              type="warning"
145 
-              v-if="scope.row.Status===0"
146 
-              @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
147 
-            <el-button
148 
-              size="mini"
149 
-              type="danger"
150 
-              v-if="scope.row.Status===0"
151 
-              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
107 
+            <div style="width: 100%" class="btnBox">
108 
+              <el-button
109 
+                size="mini"
110 
+                type="success"
111 
+                @click="addDetail(scope.row)">添加课程详情</el-button>
112 
+              <el-button
113 
+                size="mini"
114 
+                type="warning"
115 
+                v-if="scope.row.Status===0"
116 
+                @click="toSchedule(scope.row)"
117 
+                >排课</el-button>
118 
+              <el-button
119 
+                size="mini"
120 
+                type="primary"
121 
+                @click="handleCopy(scope.row)"
122 
+                >复制课程</el-button>
123 
+              <el-button
124 
+                size="mini"
125 
+                type="warning"
126 
+                @click="handlePublic(scope.row)"
127 
+                v-if="scope.row.Status===0"
128 
+                >发布</el-button>
129 
+              <el-button
130 
+                size="mini"
131 
+                type="danger"
132 
+                @click="handleUnPublic(scope.row)"
133 
+                v-if="scope.row.Status===1"
134 
+                >取消发布</el-button>
135 
+              <el-button
136 
+                size="mini"
137 
+                type="warning"
138 
+                v-if="scope.row.Status===0"
139 
+                @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
140 
+              <el-button
141 
+                size="mini"
142 
+                type="danger"
143 
+                v-if="scope.row.Status===0"
144 
+                @click="handleDelete(scope.$index, scope.row)">删除</el-button>
145 
+            </div>
152 146 
           </template>
153 147 
         </el-table-column>
154 148 
       </el-table>

@@ -435,4 +429,9 @@ export default {
435 429 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
436 430 
 <style lang="scss" scoped>
437 431 
 @import "page.scss";
432 
+.btnBox{
433 
+  >*{
434 
+    margin-bottom: 10px;
435 
+  }
436 
+}
438 437 
 </style>

+ 9
- 12
src/pages/system/goodsManager/goodManager/edit.vue View File 

@@ -63,7 +63,7 @@
63 63 
             <div style="width:50%">
64 64 
               <el-select v-model="detailSpecs" multiple placeholder="请选择" style="width:100%;">
65 65 
                 <el-option
66 
-                  v-for="item in (Case === '' ? [] : specs.list)"
66 
+                  v-for="item in ((Case || '') === '' ? [] : specs.list)"
67 67 
                   :key="item.SpecId"
68 68 
                   :label="item.SpecName"
69 69 
                   :value="item.SpecId">
 
@@ -78,7 +78,7 @@
78 78 
             <div style="width:50%">
79 79 
               <el-select v-model="TypeId" placeholder="请选择商品类型">
80 80 
                 <el-option
81 
-                  v-for="item in (Case === '' ? [] : types.list)"
81 
+                  v-for="item in ((Case || '') === '' ? [] : types.list)"
82 82 
                   :key="item.TypeId"
83 83 
                   :label="item.TypeName"
84 84 
                   :value="item.TypeId">
 
@@ -172,6 +172,13 @@ export default {
172 172 
           return x.ImgUrl
173 173 
         }
174 174 
       }).join(',')
175 
+      if ((this.detail.CaseId || '') === '') {
176 
+        this.$message({
177 
+          type: 'error',
178 
+          message: '案场不能为空'
179 
+        })
180 
+        return false
181 
+      }
175 182 
       if ((this.detail.GoodsName || '') === '') {
176 183 
         this.$message({
177 184 
           type: 'error',
 
@@ -202,16 +209,6 @@ export default {
202 209 
       }
203 210 
       if ((this.detail.GoodsId || '') === '') {
204 211 
         this.detail.OrgId = this.orgid
205 
-        if (!this.detail.CaseId || this.detail.CaseId === '') {
206 
-          this.detail.CaseId = this.caseid
207 
-        }
208 
-        if ((this.detail.CaseId || '') === '') {
209 
-          this.$message({
210 
-            type: 'error',
211 
-            message: '案场不能为空'
212 
-          })
213 
-          return false
214 
-        }
215 212 
         this.AddGoods(this.detail)
216 213 
       } else {
217 214 
         if ((this.detail.CaseId || '') === '') {