970319330@qq.com 1 週間 前
コミット
e7b1c0fe8a

+ 4 - 4
src/bgj/ServiceMaterialClass/index.vue

@@ -6,8 +6,8 @@
         add:'bgj/ServiceMaterialClass/modules',
       }"
       tableName="brandTable"
-      idName="sa_brandid"
-      :apiId="{query:20220922085104,del:20220922085203}"
+      idName="sa_brand_bgjid"
+      :apiId="{query:20220922085104,del:20220922085204}"
       :options="options"
     >
       <div slot="custom">
@@ -17,7 +17,7 @@
       </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname === 'brandLoge'">
-          <previewImage v-if="scope.data.column.data.attinfos && scope.data.column.data.attinfos[0]" style="height:40px;width:40px;" :image="scope.data.column.data.attinfos[0]" :list="scope.data.column.data.attinfos" :deletebtn="false"></previewImage>
+          <previewImage v-if="scope.data.column.data.attinfos && scope.data.column.data.attinfos[0]" style="height:40px;width:40px;margin-bottom:10px" :image="scope.data.column.data.attinfos[0]" :list="scope.data.column.data.attinfos" :deletebtn="false"></previewImage>
         </div>
         <div v-else>
           {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
@@ -25,7 +25,7 @@
       </template>
       <template v-slot:tbOpreation="scope">
         <edit v-if="tool.checkAuth($route.name,'update')" :data="scope.data.data" @onSuccess="$refs.basicLayout.listData()" :type="'text'"></edit>
-        <brand_del v-if="tool.checkAuth($route.name,'onDelete')" :data="scope.data.data" @onSuccess="$refs.basicLayout.listData()" :type="'text'"></brand_del>
+        <brand_del v-if="tool.checkAuth($route.name,'delete')" :data="scope.data.data" @onSuccess="$refs.basicLayout.listData()" :type="'text'"></brand_del>
       </template>
     </basicLayout>
   </div>

+ 1 - 1
src/bgj/ServiceMaterialClass/modules/add.vue

@@ -15,7 +15,7 @@
             <el-input v-model="form.brandname"  :placeholder="$t(`输入品牌名称`)" style="width:300px"></el-input>
           </el-form-item>
           <el-form-item  :label="$t(`品牌logo`)">
-            <uploadFile ref="upload" v-if="!form.attinfos || form.attinfos.length === 0" style="margin-top:10px" :folderid="folderid" accept=".JPG,.PNG,.jpg,.png" btntype="image" :bindData="{ownertable:'sa_brand',ownerid:form.sa_brandid,usetype:'default'}" @onSuccess="uploadSuccess"></uploadFile>
+            <uploadFile ref="upload" v-if="!form.attinfos || form.attinfos.length === 0" style="margin-top:10px" :folderid="folderid" accept=".JPG,.PNG,.jpg,.png" btntype="image" :bindData="{ownertable:'sa_brand_bgj',ownerid:form.sa_brand_bgjid,usetype:'default'}" @onSuccess="uploadSuccess"></uploadFile>
             <previewImage v-else  :image="form.attinfos[0]" :deletebtn="true"
               @onSuccess="clearCover"></previewImage>
             <small style="display:block;margin-top:20px" class="info">{{$t(`注:建议上传图片大小`)}}1024x1024px,{{$t('大小不超过')}}2M,{{$t('格式为')}}JPG/PNG</small>

+ 2 - 2
src/bgj/ServiceMaterialClass/modules/delete.vue

@@ -15,10 +15,10 @@ export default {
   methods: {
     async deleteRow(){
       const res = await this.$api.requested({
-        "id": "20220922085203",
+        "id": "20220922085204",
         "version":1,
         "content": {
-          "sa_brandid": this.data.sa_brandid
+          "sa_brand_bgjid": this.data.sa_brand_bgjid
         }
       })
       this.tool.showMessage(res, () => {

+ 1 - 1
src/bgj/ServiceMaterialClass/modules/edit.vue

@@ -15,7 +15,7 @@
             <el-input v-model="form.brandname"  :placeholder="$t(`输入品牌名称`)" style="width:300px"></el-input>
           </el-form-item>
           <el-form-item  :label="$t(`品牌logo`)">
-            <uploadFile ref="upload" v-if="!form.attinfos || form.attinfos.length === 0" style="margin-top:10px" :folderid="folderid" accept=".JPG,.PNG,.jpg,.png" btntype="image" :bindData="{ownertable:'sa_brand',ownerid:form.sa_brandid,usetype:'default'}" @onSuccess="uploadSuccess"></uploadFile>
+            <uploadFile ref="upload" v-if="!form.attinfos || form.attinfos.length === 0" style="margin-top:10px" :folderid="folderid" accept=".JPG,.PNG,.jpg,.png" btntype="image" :bindData="{ownertable:'sa_brand_bgj',ownerid:form.sa_brand_bgjid,usetype:'default'}" @onSuccess="uploadSuccess"></uploadFile>
             <previewImage v-else  :image="form.attinfos[0]" :deletebtn="true"
               @onSuccess="clearCover"></previewImage>
             <small style="display:block;margin-top:20px" class="info">{{$t(`注:建议上传图片大小`)}}1024x1024px,{{$t('大小不超过')}}2M,{{$t('格式为')}}JPG/PNG</small>

+ 22 - 19
src/bgj/integrationrule/index.vue

@@ -5,18 +5,18 @@
             <el-table :data="ruleData" border style="width: 100%">
                 <el-table-column prop="remarks" label="规则名称" min-width="200" show-overflow-tooltip />
                 <el-table-column prop="value" label="积分" width="200" align="center" />
-                <!-- <el-table-column label="操作" width="120" align="center">
+                <el-table-column label="操作" width="120" align="center">
                     <template slot-scope="scope">
                         <el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
                     </template>
-                </el-table-column> -->
+                </el-table-column>
             </el-table>
         </div>
 
         <div class="section-box mt-16">
             <div class="section-title">积分规则编辑器</div>
             <el-table :data="editorData" border>
-                <el-table-column label="工单模版" width="180" align="center">
+                <el-table-column label="工单模版" align="center">
                     <template slot-scope="scope">
                         <el-select
                             v-model="scope.row.sc_workorder_templateid"
@@ -34,7 +34,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="A积分规则" align="center">
-                    <el-table-column label="团队定位" width="120" align="center">
+                    <el-table-column label="团队定位" align="center">
                         <template slot-scope="scope">
                             <el-select v-model="scope.row.a_team" placeholder="请选择" disabled size="small">
                                 <el-option label="组长" value="组长"></el-option>
@@ -42,7 +42,7 @@
                             </el-select>
                         </template>
                     </el-table-column>
-                    <el-table-column label="符号" width="80" align="center">
+                    <el-table-column label="符号" align="center">
                         <template slot-scope="scope">
                             <el-select v-model="scope.row.a_symbol" size="small">
                                 <el-option label="=" value="="></el-option>
@@ -54,19 +54,19 @@
                             </el-select>
                         </template>
                     </el-table-column>
-                    <el-table-column label="人数" width="160" align="center">
+                    <el-table-column label="人数" align="center">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.a_count" size="small" placeholder="请输入" oninput="value = value.replace(/[^\d]/g, '')"></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column label="积分占比(%)" width="160" align="center">
+                    <el-table-column label="积分占比(%)" align="center">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.a_ratio" size="small" placeholder="0-100" oninput="value = value.replace(/[^\d]/g, ''); if(value>100)value=100"></el-input>
                         </template>
                     </el-table-column>
                 </el-table-column>
                 <el-table-column label="C积分规则" align="center">
-                    <el-table-column label="团队定位" width="160" align="center">
+                    <el-table-column label="团队定位" align="center">
                         <template slot-scope="scope">
                             <el-select v-model="scope.row.c_team" placeholder="请选择" disabled size="small">
                                 <el-option label="组长" value="组长"></el-option>
@@ -74,7 +74,7 @@
                             </el-select>
                         </template>
                     </el-table-column>
-                    <el-table-column label="符号" width="80" align="center">
+                    <el-table-column label="符号" align="center">
                         <template slot-scope="scope">
                             <el-select v-model="scope.row.c_symbol" size="small">
                                 <el-option label="=" value="="></el-option>
@@ -86,12 +86,12 @@
                             </el-select>
                         </template>
                     </el-table-column>
-                    <el-table-column label="人数" width="160" align="center">
+                    <el-table-column label="人数"  align="center">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.c_count" size="small" placeholder="请输入" oninput="value = value.replace(/[^\d]/g, '')"></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column label="积分占比(%)" width="160" align="center">
+                    <el-table-column label="积分占比(%)" align="center">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.c_ratio" size="small" placeholder="0-100" oninput="value = value.replace(/[^\d]/g, ''); if(value>100)value=100"></el-input>
                         </template>
@@ -133,7 +133,7 @@
             </el-table>
         </div>
 
-        <el-dialog :visible.sync="dialogVisible" title="编辑积分规则" width="400px">
+        <el-dialog :visible.sync="dialogVisible" title="编辑积分规则" width="400px" append-to-body>
             <el-form label-width="100px">
                 <el-form-item label="规则名称">
                     <el-input v-model="editForm.remarks" disabled></el-input>
@@ -221,13 +221,16 @@ export default {
         },
         async handleSave() {
             const res = await this.$api.requested({
-                classname: "sysmanage.develop.optiontype.optiontype",
-                method: "optiontypeupdate",
-                content: {
-                    typename: "bathroomprepoints",
-                    value: this.editForm.value,
-                    remarks: this.editForm.remarks
-                }
+                "id":20220901092601,
+                "content":{
+                    "optiontypeid":165,
+                    "optiontypemxid":15156,
+                    "isused":"1",
+                    "value":this.editForm.value,
+                    "remarks":"卫生间每间积分",
+                    "sequence":2,
+                    "subvalues":[]
+                },
             });
             this.tool.showMessage(res, () => {
                 this.dialogVisible = false;