jufubao-admin-library 1.1.52 → 1.1.54

package/library/pageComponents/modules/JfbRuleCreate.vue

@@ -79,10 +79,13 @@
         </el-form-item>
       </template>
 			</xd-base-dynamic-field>
-			<div class="adjust-btn" style="margin-left: 140px">
+			<div v-if="!isView" class="adjust-btn" style="margin-left: 140px">
 				<el-button @click="handleClick(true)" type="primary">{{btnName}}并返回</el-button>
 				<el-button @click="handleClick(false)" type="primary">{{btnName}}</el-button>
 			</div>
+      <div v-else>
+        <el-button @click="handleBack" type="primary">返回</el-button>
+      </div>
 		</div>
 	</div>
 
@@ -130,73 +133,77 @@
         handTimeOptions:[{start:'',end:''}],
         timeList:[
           {
-            label:'1',
+            label:'0时',
+            value:'0',
+          },
+          {
+            label:'1时',
             value:'1',
           },{
-            label:'2',
+            label:'2时',
             value:'2',
           },{
-            label:'3',
+            label:'3时',
             value:'3',
           },{
-            label:'4',
+            label:'4时',
             value:'4',
           },{
-            label:'5',
+            label:'5时',
             value:'5',
           },{
-            label:'6',
+            label:'6时',
             value:'6',
           },{
-            label:'7',
+            label:'7时',
             value:'7',
           },{
-            label:'8',
+            label:'8时',
             value:'8',
           },{
-            label:'9',
+            label:'9时',
             value:'9',
           },{
-            label:'10',
+            label:'10时',
             value:'10',
           },{
-            label:'11',
+            label:'11时',
             value:'11',
           },{
-            label:'12',
+            label:'12时',
             value:'12',
           },{
-            label:'13',
+            label:'13时',
             value:'13',
           },{
-            label:'14',
+            label:'14时',
             value:'14',
           },{
-            label:'15',
+            label:'15时',
             value:'15',
           },{
-            label:'16',
+            label:'16时',
             value:'16',
           },{
-            label:'17',
+            label:'17时',
             value:'17',
           },{
-            label:'18',
+            label:'18时',
             value:'18',
           },{
-            label:'19',
+            label:'19时',
             value:'19',
           },{
-            label:'20',
+            label:'20时',
             value:'20',
           },{
-            label:'21',
+            label:'21时',
             value:'21',
           },{
-            label:'22',
+            label:'22时',
             value:'22',
           },{
-            label:'23',
+            label:'23时',
             value:'23',
           },
         ]
@@ -243,7 +250,18 @@
           let params = {};
           params[this.keyword.role] = this.select_policy_id
 					let res = await this.getRole(params);
-
+          if(this.isView) {
+            switch (this.editType) {
+              case 'MP':
+                res.data = res.data.modify_price
+                break;
+              case 'SE':
+                res.data = res.data.select
+                break;
+              default:
+                break;
+            }
+          }
           //电影
           if(this.isMovie) {
             formData = this.setMovieForm(res.data)

package/library/pageComponents/modules/lib/JfbRuleCreate.js

@@ -635,7 +635,8 @@ export default {
             { "label": "按城市", "value": 'CITY' },
             { "label": "按院线", "value": 'LINE' },
             { "label": "按号段", "value": 'CARD' },
-            { "label": "按影院", "value": 'CINE' }
+            { "label": "按影院", "value": 'CINE' },
+            { "label": "按影片", "value": 'FILM' },
           ]
         },
 
@@ -667,6 +668,32 @@ export default {
             { required: false, message: '请选择院线', trigger: 'change' },
           ]
         },
+        params.adjust_type === 'FILM' && {
+          label: '按影片:',
+          ele: 'xd-remote-select',
+          valueKey: 'FILM_valid_data',
+          value: params['FILM_valid_data'] || [],
+          className: 'input50',
+          placeholder: '请选择影片',
+          multiple: true,
+          collapseTags: false,
+          remoteSearch: (query, resolve) => {
+             ///movie-partner/v1/{xsiteid}/film/options
+             getOptions({
+              server: 'movie-partner',
+              fn: "film",
+              path: "p2",
+              params: {
+                keyword: query,
+              },
+            }).then(res=>{
+              resolve(res.data.list)
+            })
+          },
+          rules: [
+            { required: false, message: '请选择院线', trigger: 'change' },
+          ]
+        },
         params.adjust_type === 'CITY' && {
           label: '按城市:',
           placeholder: '请选择城市',

package/library/viewModules/viewsThird/viewsThird/list.vue

@@ -1175,6 +1175,9 @@ export default {
             }
           });
           this.listForm = listForm;
+          this.formKey = Date.now();
+          this.status = true;
+          this.dialogShow = true;
           console.log(this.listForm, "llll");
         });
       } else {
@@ -1268,11 +1271,11 @@ export default {
           }
         });
         this.listForm = listForm;
+        this.formKey = Date.now();
+        this.status = true;
+        this.dialogShow = true;
         console.log(this.listForm, "llll");
       }
-      this.dialogShow = true;
-      this.formKey = Date.now();
-      this.status = true;
     },
     funOpenAppEdit() {
       let params = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.52",
+  "version": "1.1.54",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {