jufubao-admin-library 1.1.183 → 1.1.185

package/library/viewModules/viewStat/schemas/supplier.stat.js

@@ -102,5 +102,14 @@ module.exports = {
       disabled: true,
       role: "STAT-PARTNER.SUPPLIER_STAT_NEW_ON"
     },
+    {
+      title: "统计-供应商统计-线下门店-无订单线下门店",
+      mapFn: "getNoOrderOfflineShop",
+      path: '/stat-partner/v1/supplier-stat/no-order-offline-shop',
+      isRule: false,
+      params: {},
+      disabled: true,
+      role: "STAT-PARTNER.TRADE_STAT_NO_ORDER_LINE_SHOP"
+    },
   ]
 }

package/library/viewModules/viewStat/viewsStat/product/components/table-product.vue

@@ -76,7 +76,11 @@
           :defaultSort="{ prop: 'total_product_num', order: 'descending' }"
           is-border
           @onSortChange="handleSortChange"
-        ></xd-table>
+        >
+        <template slot="discount" slot-scope="scope">
+          <div v-if="scope.row.discount">{{ scope.row.discount }}折</div>
+        </template>
+      </xd-table>
       </div>
       <div class="app-container__list-pagination">
         <xd-pagination
@@ -192,6 +196,18 @@ export default {
             data: ["按支付时间统计已支付客户订单进货价金额","包含商品进货价","自有商品按货源进货价","非自有商品按平台进货价计"],
           },
         },
+        {
+          type: "normal",
+          prop: "discount",
+          align: "center",
+          minWidth: 200,
+          label: "折扣",
+          unit: "元",
+          sort: "custom",
+          notice: {
+            data: ["折扣=查询结果按商品汇总的进货价金额/销售金额；","四舍五入并保留两位小数展示；","注：此数据仅供参考，不代表商品实际利润。"],
+          },
+        },
         {
           type: "normal",
           prop: "total_real_product_num",

package/library/viewModules/viewStat/viewsStat/supplier/components/table-store.vue

@@ -58,7 +58,10 @@
           <p>共计核销订单<span>{{ totalData.total_order_count }}</span>个，
             核销金额<span>{{totalData.total_settle_amount}}</span>，
             货源结算金额<span>{{totalData.total_purchase_discount_amount}}</span></p>
-          <el-button type="primary" @click="doExport">条件导出</el-button>
+          <div>
+            <el-button type="primary" v-if="isShowViewStore" @click="viewStore">查看无核销门店</el-button>
+            <el-button type="primary" @click="doExport">条件导出</el-button>
+          </div>
         </div>
       </div>
       <div class="app-container__list-table">
@@ -79,6 +82,94 @@
         ></xd-pagination>
       </div>
     </el-card>
+    <XdDialog
+      v-if="showViewStore"
+      :show.sync="showViewStore"
+      :isBtn="false"
+      @onClose="handleCloseView"
+      title="查看无核销门店"
+    >
+      <el-card class="app-container__search">
+        <xd-search
+          dateFilter
+          v-if="viewSearchForm.length > 0"
+          v-model="viewSearchParams"
+          :list="viewSearchForm"
+          @onSearch="handleViewSearch"
+          @onDone="getViewStoreList"
+        >
+        <template slot="trade-date">
+          <xd-stat-trade-date :typeOptions="typeOptions" :isRangeMonth="true" v-model="viewTradeTime"></xd-stat-trade-date>
+        </template>
+        <template slot="supplier">
+          <div>
+              <el-select
+                v-model="view_channel_code"
+                filterable
+                clearable
+                placeholder="请选择供应商类别"
+                style="margin-right: 10px"
+              >
+                <el-option
+                  v-for="item in channelList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+              <el-select
+                clearable
+                v-if="view_channel_code && showViewSupplier === 'Y'"
+                v-model="view_supplier_ids"
+                filterable
+                remote
+                reserve-keyword
+                placeholder="请输入供应商"
+                :remote-method="remoteViewMethod"
+              >
+                <el-option
+                  v-for="item in supplierList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </div>
+        </template>
+        </xd-search>
+      </el-card>
+      <el-card class="app-container__list">
+        <div class="app-container__list-pagination">
+          <div></div>
+          <div class="table-stat">
+            <div>
+              <el-button type="primary" @click="doViewExport">条件导出</el-button>
+            </div>
+          </div>
+        </div>
+         <div class="app-container__list-table">
+          <xd-table
+            :headers="viewStoreHeaders"
+            :list="viewStoreTables"
+            ref="myTable"
+            is-border
+          >
+          </xd-table>
+        </div>
+        <div class="app-container__list-pagination">
+          <xd-pagination
+            :page="view_page_token"
+            :total="view_total"
+            :limit.sync="view_page_size"
+            :autoScroll="false"
+            @onPagination="handleViewPagination"
+          ></xd-pagination>
+        </div>
+      </el-card>
+     
+  </XdDialog>
   </div>
 </template>
 
@@ -88,9 +179,12 @@ import XdSearch from "@/components/XdSearch";
 import XdPagination from "@/components/XdPagination.vue";
 import XdTable from "@/components/XdTable";
 import XdStatTradeDate from "@/components/XdStatTradeDate";
+import XdDialog from "@/components/XdDialog";
 import { baseJsDateToTime } from "@/utils/xd.base";
 import { mapActions } from "vuex"
 import { getOptions } from "@/utils/options"
+import checkPermission from "@/utils/permission"
+import Role from "@/constant/modules/supplierStat"
 
 export default {
   name: "ComponentTableSupplier",
@@ -99,6 +193,7 @@ export default {
     XdSearch, //搜查插件
     XdTable,
     XdStatTradeDate,
+    XdDialog
   },
   data() {
     return {
@@ -173,7 +268,38 @@ export default {
       supplier_text: "",
       channel_code_text: "",
       showSupplier: "N",
-      sourceList:[],
+      sourceList: [],
+      showViewStore: false,
+      viewSearchForm: [],
+      viewSearchParams: null, //搜索参数
+      viewTradeTime: null,
+      view_channel_code: null,
+      view_supplier_ids: null,
+      view_supplier_text: "",
+      view_channel_code_text: "",
+      showViewSupplier: 'N',
+      viewStoreTables: [],
+      viewStoreHeaders: [
+        { "type": "normal", "prop": "shop_id", "align": "center", "width": 100, "label": "门店ID" },
+        { "type": "normal", "prop": "shop_name", "align": "center", "minWidth": 200, "label": "门店名称" },
+        { "type": "normal", "prop": "brand_name", "align": "center", "width": 100, "label": "门店品牌" },
+        { "type": "normal", "prop": "supplier_name", "align": "center", "minWidth": 200, "label": "供应商" },
+      ],
+      //分页参数
+      view_page_token: 1, //当前页面数量
+      view_page_size: 20, //搜索参数
+      view_total: 0,
+      typeOptions: [
+        {
+          label: "按月",
+          value: "month"
+        }
+      ]
+    }
+  },
+  computed: {
+    isShowViewStore() {
+      return checkPermission(Role.getNoOrderOfflineShop)
     }
   },
   watch:{
@@ -198,6 +324,27 @@ export default {
         ).label;
       }
     },
+    view_channel_code(n, o) {
+      this.view_channel_code_text = "";
+      this.view_supplier_text = "";
+      this.view_supplier_ids = null;
+      if (n && n !== o) {
+        this.view_channel_code_text = this.channelList.find(
+          (item) => item.value === n
+        ).label;
+        this.showViewSupplier = this.channelList.find(
+          (item) => item.value === n
+        ).has_supplier;
+      }
+    },
+    view_supplier_ids(n, o) {
+      this.view_supplier_text = "";
+      if (n && n !== o) {
+        this.view_supplier_text = this.supplierList.find(
+          (item) => item.value === n
+        ).label;
+      }
+    },
   },
   created() {
     getOptions([{
@@ -216,7 +363,7 @@ export default {
     });
   },
   methods: {
-    ...mapActions("supplierStat", ["offlineShopSalesSupplier"]),
+    ...mapActions("supplierStat", ["offlineShopSalesSupplier",'getNoOrderOfflineShop']),
     //相除
     divide(price) {
       return this.$xdHelper.divisionFloatNumber(price, 100);
@@ -238,6 +385,23 @@ export default {
       }
       return params;
     },
+    getViewParams() {
+      let { brand_id,shop_id, ...other } = this.viewSearchParams;
+      
+      if(brand_id && brand_id.length > 0){
+        other.brand_id = brand_id[0].value;
+      }
+      if(shop_id && shop_id.length > 0){
+        other.shop_id = shop_id[0].value;
+      }
+      let params = {
+        ...other,
+        ...this.viewTradeTime,
+        supplier_id:this.view_supplier_ids,
+        channel_code: this.view_channel_code,
+      }
+      return params;
+    },
     doExport(){
       this.$prompt('请输入导出文件名称', '提示', {
         confirmButtonText: '确定',
@@ -264,6 +428,37 @@ export default {
         })
       })
     },
+    doViewExport() {
+      this.$prompt("请输入导出文件名称", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        inputPattern: /[\S]+/,
+        inputErrorMessage: "请填写正确的名称",
+      }).then(({ value }) => {
+        let params = {
+          ...this.getViewParams(),
+          export: true,
+          file_ext: "xlsx",
+          file_name: value,
+        };
+        let loading = this.$loading({});
+        this.getNoOrderOfflineShop(params)
+          .then((res) => {
+            loading.close();
+            this.$alert(
+              "导出任务已经开始执行，请去任务管理查看下载状态",
+              "提示",
+              {
+                confirmButtonText: "确定",
+              }
+            );
+          })
+          .catch((err) => {
+            this.$message.error(err.msg);
+            loading.close();
+          });
+      });
+    },
     /**
      * @description 获取数据列表
      */
@@ -294,6 +489,31 @@ export default {
         loading.close();
       })
     },
+    /**
+     * @description 获取数据列表
+     */
+    getViewStoreList() {
+      //请求数据
+      let params = {
+        ...this.getViewParams(),
+        page_token: this.view_page_token,
+        page_size: this.view_page_size,
+      };
+      if(!this.viewTradeTime || !this.viewTradeTime.time_range_start){
+        this.$message.error('请选择交易时间')
+        return
+      }
+
+      console.log(params)
+      let loading = this.$loading({});
+      this.getNoOrderOfflineShop(params).then(res => {
+        loading.close();
+        this.viewStoreTables = res.data.list;
+        this.view_total = res.data.total_size;
+      }).catch(err => {
+        loading.close();
+      })
+    },
     handleSortChange({ prop, order }) {
       if(order === null){
         this.sort_by = '';
@@ -324,6 +544,18 @@ export default {
       this.page_token = 1;
       this.getList();
     },
+    handleViewSearch({ action, form }) {
+      if(!this.viewTradeTime || !this.viewTradeTime.time_range_start){
+        this.$message.error('请选择交易时间')
+        return
+      }
+      if (action == "reset") {
+        this.view_channel_code = '';
+        this.view_supplier_ids = '';
+      }
+      this.view_page_token = 1;
+      this.getViewStoreList();
+    },
     /**
      * @description 初始化搜索模块
      */
@@ -410,6 +642,79 @@ export default {
         },
       ];
     },
+    initViewSearchForm() {
+      let yesterDay = new Date().getTime() - 24 * 60 * 60 * 1000;
+      yesterDay = baseJsDateToTime(yesterDay/1000);
+      yesterDay = yesterDay.split(' ')[0];
+      this.viewSearchForm = [
+        {
+            label: "交易时间:",
+            ele: "slot",
+            slot: "trade-date",
+          },
+          {
+            label: "供应商: ",
+            ele: "slot",
+            slot: "supplier",
+          },
+          {
+            label: "门店名称:", //label
+            ele: "xd-remote-select", //package 名称
+            valueKey: "shop_id", //form[valueKey]
+            value: [], //v-model
+            placeholder: "请选择门店名称",
+            multiple: false,
+            collapseTags: false,
+            className: "input40",
+            remoteSearch: (query, resolve) => {
+              getOptions({
+                server: "supplier-partner",
+                fn: "shop",
+                path: "p1",
+                params: {
+                  keyword: query,
+                  page_token: 1,
+                  page_size: 500,
+                },
+              })
+                .then((res) => {
+                  resolve(res.data.list);
+                })
+                .catch((err) => {
+                  console.log(err, "err");
+                });
+            },
+          },
+          {
+            label: "品牌名称:", //label
+            ele: "xd-remote-select", //package 名称
+            valueKey: "brand_id", //form[valueKey]
+            value: [], //v-model
+            placeholder: "请选择品牌名称",
+            multiple: false,
+            collapseTags: false,
+            className: "input40",
+            remoteSearch: (query, resolve) => {
+              getOptions({
+                server: "supplier-partner",
+                fn: "brand",
+                path: "p1",
+                params: {
+                  keyword: query,
+                  page_token: 1,
+                  page_size: 500,
+                },
+              })
+                .then((res) => {
+                  resolve(res.data.list);
+                })
+                .catch((err) => {
+                  console.log(err, "err");
+                });
+            },
+          },
+      ];
+    },
     /**
      * @description 翻页处理方法
      * @param page {Number} 访问页面页码数
@@ -418,6 +723,10 @@ export default {
       this.page_token = page;
       this.getList();
     }, //todo
+    handleViewPagination(page) {
+      this.view_page_token = page;
+      this.getViewStoreList();
+    },
     remoteMethod(query) {
       if (query !== "") {
         getOptions({
@@ -439,6 +748,36 @@ export default {
         this.supplierList = [];
       }
     },
+    remoteViewMethod(query) {
+      if (query !== "") {
+        getOptions({
+          server: "supplier-partner",
+          fn: "channel-supplier",
+          path: "p1",
+          params: {
+            channel_code: this.view_channel_code,
+            keyword: query,
+          },
+        })
+          .then((res) => {
+            this.supplierList = res.data.list;
+          })
+          .catch((err) => {
+            console.log(err, "err");
+          });
+      } else {
+        this.supplierList = [];
+      }
+    },
+    viewStore() {
+      this.initViewSearchForm()
+      this.showViewStore = true;
+    },
+    handleCloseView() {
+      this.showViewStore = false;
+      this.view_channel_code = "";
+      this.view_supplier_ids = [];
+    }
   }
 }
 </script>

package/library/viewModules/viewStore/schemas/store_selection.js

@@ -169,6 +169,19 @@ module.exports = {
       disabled: true,
       role: '@@@@.@@@.SELECT_SHOP_MARKET_SELECT',
     },
+    {
+      title: "门店集市批量选用",
+      mapFn: "selectShopMarketBatchSelect",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-market/batch-select",
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        ids: ['ids', 'String', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_MARKET_BATCH_SELECT',
+    },
     {
       title: "门店集市聚合渠道过滤器",
       mapFn: "selectShopMarketChannelFilters",
@@ -410,19 +423,6 @@ module.exports = {
       disabled: true,
       role: '@@@@.@@@.SELECT_SHOP_MARKET_MC_LIST',
     },
-   
-    {
-      title: "门店集市批量选用",
-      mapFn: "selectShopMarketBatchSelect",
-      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-market/batch-select',
-      isRule: false,
-      params: {
-        xsiteid: ['站点Id', 'String', '必填'],
-        xnamespace: ['命名空间', 'String', '必填'],
-        resource_shop_ids: ['resource_shop_ids', 'Array', '选填'],
-      },
-      disabled: true,
-    },
     {
       title: "已选门店查看门店服务类型",
       mapFn: "selectShopGetConsumeMode",

package/library/viewModules/viewStore/viewStore/market/list.vue

@@ -58,6 +58,9 @@
           :get-total="getCountList"
           @onPagination="handlePagination"
         ></xd-pagination-jfb>
+        <div>
+          <el-button v-if="isBatchUse" type="primary" @click="handleBatchUse">批量选用</el-button>
+        </div>
       </div>
       <div class="app-container__list-table">
         <xd-table
@@ -66,8 +69,10 @@
           :key="tableKey"
           :list="tables"
           is-border
+          selection-key="shop_id"
           :custom-function="handleCustom"
           @onClick="handleClick"
+          @onSelect="handleTableSelect"
         >
         <template slot="address" slot-scope="scope">
          <div>{{scope.row.province_name}}{{scope.row.city_name}}{{scope.row.area_name}}{{scope.row.street_name}}{{scope.row.address}}</div>
@@ -176,6 +181,8 @@ export default {
       searchForm: [], //搜索区域模块表单
       searchParams: null, // 搜索参数
       tables: [],
+      batchRowIds: [],
+      batchRowList: [],
       total: 0,
       isMain:true,
       channelActive: '',
@@ -222,8 +229,12 @@ export default {
     isChoose () {
       return checkPermission([permissions.store_selection.selectShopMarketSelect])
     },
+    isBatchUse(){
+      return checkPermission([permissions.store_selection.selectShopMarketBatchSelect])
+    },
     headers(){
       return [
+        { "type": "selection", "width": 50 },
         { "type": "normal", "prop": "resource_shop_id","width": 120, "align": "center", "label": "关联后门店ID" },
         { "type": "normal", "prop": "resource_shop_name", "align": "center", "label": "关联后门店名称" },
         { "type": "normal", "prop": "shop_id", "align": "center", "label": "门店ID" },
@@ -290,6 +301,7 @@ export default {
     ...mapActions('store_selection', [
       'selectShopMarketList',
       'selectShopMarketSelect',
+      'selectShopMarketBatchSelect',
       'selectShopMarketChannelFilters',
       'shopCategoryList'
     ]),
@@ -576,7 +588,20 @@ export default {
     getLink ({ row, value, index }) {
       return ``
     },
-
+    //批量选用
+    handleBatchUse(){
+      console.log(this.batchRowIds,'批量选用')
+      let ids = this.batchRowList.map(i=>({shop_id:i.shop_id,resource_shop_id:i.resource_shop_id}))
+      this.selectShopMarketBatchSelect({ids:ids, consume_mode:this.storeType, channel_code:this.channelActive}).then(res => {
+        this.$message.success('操作成功')
+        this.getList('list')
+      })
+    },
+    handleTableSelect({ select, ids }){
+      console.log("handleTableSelect", select, ids);
+      this.batchRowIds = ids;
+      this.batchRowList = select;
+    },
     /**操作按钮**/
     handleClick ({ row, value, index }) {
       console.log('handleClick', row, value, index)

package/library/viewModules/viewStore/viewStore/selected/list.vue

@@ -48,6 +48,8 @@
     </el-card>
     <el-card class="app-container__list">
       <div class="app-container__list-custom" style="text-align: right">
+        <el-button type="primary" :disabled="batchRowIds.length===0" @click="handleBatchDelete">批量删除</el-button>
+        <el-button type="primary" :disabled="batchRowIds.length===0" @click="handleBatchStatus">批量{{ mainFilterIndex === '0' ? '下架' : '上架' }}</el-button>
         <el-button type="primary" size="small" icon="el-icon-edit" @click="handleExport" v-if="isExport">条件导出</el-button>
       </div>
       <div class="app-container__list-pagination">
@@ -66,9 +68,11 @@
           :headers="headers"
           :key="tableKey"
           :list="tables"
+          selection-key="shop_id"
           is-border
           @onClick="handleClick"
           :custom-function="handleCustom"
+          @onSelect="handleTableSelect"
         >
         <template slot="resource_shop_id" slot-scope="scope">
           <div>{{scope.row.resource_shop_id?scope.row.resource_shop_id:'-'}}</div>
@@ -218,6 +222,8 @@ export default {
       tables: [],
       total: 0,
       mainFilterIndex:0,
+      batchRowIds:[],
+      batchRowList: [],
       tabData:[
         {
           label:'已上架',
@@ -316,6 +322,7 @@ export default {
     headers(){
       this.tableKey = Date.now()
       return [
+        { "type": "selection", "width": 50, "align": "center" },
         { "type": "normal", "prop": "resource_shop_id","width": 120, "align": "center", "label": "关联后门店ID" },
         { "type": "normal", "prop": "resource_shop_name", "align": "center", "label": "关联后门店名称" },
         this.storeType!=='AGG'&&this.storeType!=='SEAT'&&this.storeType!=='PRODUCT'&&{ "type": "normal", "prop": "shop_id", "align": "center", "label": "门店ID" },
@@ -724,7 +731,11 @@ export default {
     getLink ({ row, value, index }) {
       return ``
     },
-
+    handleTableSelect({ select, ids }){
+      console.log("handleTableSelect", select, ids);
+      this.batchRowIds = ids;
+      this.batchRowList = select;
+    },
     /**操作按钮**/
     handleClick ({ row, value, index }) {
       console.log('handleClick', row, value, index)
@@ -857,6 +868,46 @@ export default {
         return true
       }
     },
+    handleBatchStatus(){
+      let ids = this.batchRowList.map(item => ({shop_id: item.shop_id, resource_shop_id: item.resource_shop_id}))
+      if(this.mainFilterIndex=== '0'){
+        //下架
+        this.selectShopDown({consume_mode:this.storeType, ids}).then(res => {
+          this.$message({
+            showClose: true,
+            message: '下架成功',
+            type: 'success'
+          })
+          this.tables = this.tables.filter(item => !ids.map(id => id.shop_id).includes(item.shop_id))
+          // this.getList('list');
+        })
+      }else {
+        //上架
+        this.selectShopUp({consume_mode:this.storeType, ids}).then(res => {
+          this.$message({
+            showClose: true,
+            message: '上架成功',
+            type: 'success'
+          })
+          this.tables = this.tables.filter(item => !ids.map(id => id.shop_id).includes(item.shop_id))
+          // this.getList('list');
+        })
+      }
+    },
+    handleBatchDelete(){
+      //consume_mode:this.storeType
+      let ids = this.batchRowList.map(item => ({shop_id: item.shop_id, resource_shop_id: item.resource_shop_id}))
+      this.selectShopDelete({consume_mode:this.storeType, ids }).then(res => {
+        console.log(res, 'sss')
+        this.$message({
+          showClose: true,
+          message: '删除成功',
+          type: 'success'
+        })
+        this.tables = this.tables.filter(item => !ids.map(id => id.shop_id).includes(item.shop_id))
+        // this.getList('list');
+      })
+    },
     /**导出售后订单**/
     handleExport () {
        this.dialogExport = true

package/library/viewModules/viewsThird/viewsThird/components/PlusVip.vue

@@ -114,6 +114,7 @@ export default {
         {
           "type": "operate", "align": "center", "width": 180, "label": "操作",
           "values": [
+            { "ui": "text-button", "name": "查看", "type": "text", "event": "info" },
             { "ui": "text-button", "name": "操作记录", "type": "text", "event": "log" },
             { "ui": "text-button", "name": "编辑", "type": "text", "event": "edit" },
             // { "ui": "text-button", "name": "删除", "type": "text", "event": "delete" },
@@ -205,8 +206,8 @@ export default {
     },
     handleTableClick({ value, row }) {
       this.rule_id = row.rule_id
-      if (value.event == "edit") {
-        this.$router.push(`/apply/plus_edit/${row.rule_id}`);
+      if (value.event == "edit" || value.event == "info") {
+        this.$router.push(`/apply/plus_edit/${row.rule_id}?isEdit=${value.event==='edit'}`);
       }else if (value.event == "delete") {
         this.$confirm('删除后将无法恢复，确定是否删除？', '删除', {
           confirmButtonText: '确定',

package/library/viewModules/viewsThird/viewsThird/create.vue

@@ -15,7 +15,7 @@
       >
         <!-- #ifdef app-thirdmall -->
         <template slot="businessLines" slot-scope="scope">
-          <el-form ref="businessForm" :model="form" :label-width="scope.width">
+          <el-form ref="businessForm" :model="form" :label-width="scope.width" :disabled="isInfo">
             <el-form-item required label="业务线:">
               <el-select
                 v-model="form.site_id"
@@ -82,7 +82,7 @@
       </xd-base-dynamic-field>
       <div style="padding-left: 150px">
         <el-button @click="goBack" type="primary">返回</el-button>
-        <el-button @click="handleConfirm" type="primary">保存</el-button>
+        <el-button @click="handleConfirm" :disabled="isInfo" type="primary">保存</el-button>
       </div>
     </el-card>
   </div>
@@ -115,7 +115,11 @@ export default {
       typeList: [],
     };
   },
-  computed: {},
+  computed: {
+    isInfo(){
+      return this.$route.query.isEdit==='false'
+    }
+  },
   watch: {
     "formParams.card_number_type"(n, o) {
       if (n !== o) {
@@ -266,6 +270,7 @@ export default {
           valueKey: "rule_name", //form[valueKey]
           value: params.rule_name || "", //v-model
           placeholder: "输入规则名称",
+          disabled: this.isInfo,
           classNmae: "input40",
           rules: [
             {
@@ -282,6 +287,7 @@ export default {
           valueKey: "rule_desc",
           type: "textarea",
           placeholder: "请输入规则描述",
+          disabled: this.isInfo,
         },
         {
           label: "状态:", //label
@@ -289,6 +295,7 @@ export default {
           valueKey: "status", //form[valueKey]
           value: params.status || "Y", //v-model
           placeholder: "请选择状态",
+          disabled: this.isInfo,
           list: [
             { label: "启用", value: "Y" },
             { label: "禁用", value: "N" },
@@ -308,6 +315,7 @@ export default {
           type: "number",
           value: params.sort || "",
           placeholder: "请输入权重值",
+          disabled: this.isInfo,
           notice: "权重值大优先，同权重值的规则ID大优先",
           rules: [
             {
@@ -328,6 +336,7 @@ export default {
           valueKey: "card_number_type", //form[valueKey]
           value: params.card_number_type || "ALL", //v-model
           placeholder: "请选择",
+          disabled: this.isInfo,
           list: [
             { label: "全部号段", value: "ALL" },
             { label: "自定义号段", value: "CUSTOMIZE" },
@@ -347,6 +356,7 @@ export default {
           valueKey: "card_model", //form[valueKey]
           value: params.card_model || "d", //v-model
           placeholder: "请选择",
+          disabled: this.isInfo,
           list: [
             { label: "点卡", value: "d" },
             { label: "次卡", value: "c" },
@@ -367,6 +377,7 @@ export default {
           defaultValue: params["card_number_ranges"],
           valueKey: "card_number_ranges", //form[valueKey]
           placeholder: ["开始卡号", "结束卡号"],
+          disabled: this.isInfo,
           rules: [
             {
               required: true,
@@ -444,6 +455,7 @@ export default {
           isNumber: true,
           useCustomRules: false,
           notice: "仅支持正数，按商品总额x比例值计算（遇小数自动进位）",
+          disabled: this.isInfo,
           setting: {
             unit: "%",
             inline: true,
@@ -482,6 +494,7 @@ export default {
           valueKey: "settle_tag_type", //form[valueKey]
           value: params.settle_tag_type || "ALL", //v-model
           placeholder: "请选择标签类型",
+          disabled: this.isInfo,
           list: [
             { label: "全部", value: "ALL" },
             { label: "固定值", value: "FIXED" },
@@ -501,6 +514,7 @@ export default {
           valueKey: "fee_type", //form[valueKey]
           value: params.fee_type, //v-model
           placeholder: "请选择加收方式",
+          disabled: this.isInfo,
           list: this.typeList,
           rules: [
             {
@@ -518,6 +532,7 @@ export default {
           placeholder: {
             unitPlaceholder: "请输入数值",
           },
+          disabled: this.isInfo,
           setting: {
             unit: params["fee_type"] === "NUMBER" ? "元" : "%",
             pos: "append",
@@ -556,6 +571,7 @@ export default {
           let key = item.valueKey;
           item.list = this.brandList;
           item.value = params[key] || [];
+          item.disabled = this.isInfo;
 
           item.rules = [
             {

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

@@ -405,6 +405,7 @@ export default {
       appDialogForm: [],
       brandData: [],
       editId: "",
+      isEdit: false,
       brandShow: false,
       brandHeaders: [
         {
@@ -575,6 +576,12 @@ export default {
           isCheckHide: true,
           label: "操作",
           values: [
+            {
+              ui: "text-button",
+              name: "查看",
+              type: "text",
+              event: "open_info",
+            },
             {
               ui: "text-button",
               name: "编辑",
@@ -598,6 +605,12 @@ export default {
           isCheckHide: true,
           label: "操作",
           values: [
+            {
+              ui: "text-button",
+              name: "查看",
+              type: "text",
+              event: "app_info",
+            },
             {
               ui: "text-button",
               name: "编辑",
@@ -627,6 +640,12 @@ export default {
           isCheckHide: true,
           label: "操作",
           values: [
+            {
+              ui: "text-button",
+              name: "查看",
+              type: "text",
+              event: "service_info",
+            },
             // #ifdef partner
             this.isEdit&&{
               ui: "text-button",
@@ -753,17 +772,19 @@ export default {
       });
     },
     handleTableClick({ value, row }) {
-      if (value.event == "app_edit") {
+      if (value.event == "app_edit" || value.event == "app_info") {
         this.title = "编辑应用设置";
         this.editId = row.id;
+        this.isEdit = value.event == "app_edit" ? true : false;
         this.applyInfo({ app_id: row.id })
           .then((res) => {
             this.initForm(res.data);
           })
           .catch((err) => {});
-      } else if (value.event === "open_edit") {
+      } else if (value.event === "open_edit" || value.event === "open_info") {
         this.title = "编辑开通业务线";
         this.editId = row.id;
+        this.isEdit = value.event == "open_edit" ? true : false;
         this.getOpenAppInfo({ open_id: row.id })
           .then((res) => {
             this.openInfoData = res.data;
@@ -818,8 +839,8 @@ export default {
           this.apiList = res.data.api_urls;
           this.lookShow = true;
         });
-      } else if (value.event === "service_edit") {
-        this.$router.push(`/apply/edit/${row.id}`);
+      } else if (value.event === "service_edit" || value.event === "service_info") {
+        this.$router.push(`/apply/edit/${row.id}?isEdit=${value.event === "service_edit"}`);
       } else if (value.event === "service_delete") {
         this.$confirm("删除后将无法恢复，确定是否删除？", "删除", {
           confirmButtonText: "确定",
@@ -975,6 +996,7 @@ export default {
     },
     initForm(params = {}) {
       console.log("initForm", this.listValue, params);
+      let isDisabled = !this.isEdit;
       if (this.searchParams.tabType == "1") {
         let listForm = [];
         ///thirdmall-partner/v1/app/options
@@ -993,6 +1015,7 @@ export default {
               valueKey: "site_id", //form[valueKey]
               value: params.site_id || "", //v-model
               placeholder: "请选择站点",
+              disabled: isDisabled,
               multiple: false,
               collapseTags: false,
               list: this.siteData,
@@ -1011,6 +1034,7 @@ export default {
               valueKey: "business_code", //form[valueKey]
               value: params.business_code || "", //v-model
               placeholder: "请选择业务线",
+              disabled: isDisabled,
               multiple: false,
               collapseTags: false,
               list: this.businessData,
@@ -1029,6 +1053,7 @@ export default {
               valueKey: "config_id", //form[valueKey]
               value: params.config_id || "", //v-model
               placeholder: "请选择三方应用",
+              disabled: isDisabled,
               multiple: false,
               collapseTags: false,
               list: res.data.apps,
@@ -1083,6 +1108,7 @@ export default {
               className: "input100",
               valueKey: "pay_url_data",
               placeholder:'请选择业务线对应应用的三方支付页面',
+              disabled: isDisabled,
               value: params.pay_url_data || null,
               setting: {
                 site_id: params.site_id,
@@ -1163,6 +1189,7 @@ export default {
               className: "input100",
               valueKey: "phone_collect_url_data",
               placeholder:'请选择业务线对应应用的手机号收集页面',
+              disabled: isDisabled,
               value: params.phone_collect_url_data || null,
               setting: {
                 site_id: params.site_id,
@@ -1243,6 +1270,7 @@ export default {
               className: "input100",
               valueKey: "pay_error_url_data",
               placeholder:'请选择业务线对应应用的订单错误页面',
+              disabled: isDisabled,
               value: params.pay_error_url_data || null,
               setting: {
                 site_id: params.site_id,
@@ -1323,6 +1351,7 @@ export default {
               valueKey: "status",
               value: params.status || "Y",
               placeholder: "请选择状态",
+              disabled: isDisabled,
               list: [
                 { value: "Y", label: "启用" },
                 { value: "N", label: "禁用" },
@@ -1360,6 +1389,7 @@ export default {
               let key = item.valueKey;
               item.value = params[key] || [];
               item.list = this.brandData;
+              item.disabled = isDisabled;
               item.rules = [
                 {
                   required: true,
@@ -1388,6 +1418,7 @@ export default {
             valueKey: "app_name",
             value: params.app_name || "",
             placeholder: "请输入应用名称",
+            disabled: isDisabled,
             rules: [
               {
                 required: true,
@@ -1455,7 +1486,7 @@ export default {
           if(item.editDisabled&&this.editId){
             item.disabled = true
           }else{
-            item.disabled = false
+            item.disabled = isDisabled
           }
 
           if(item.type==='password'){

package/library/viewModules/viewsThird/viewsThird/plus_create.vue

@@ -15,7 +15,7 @@
         label-width="140px"
       >
       </xd-base-dynamic-field>
-      <div v-if="!isView" class="adjust-btn">
+      <div v-if="!(isView || isInfo)" class="adjust-btn">
         <el-button @click="handleClick(false)" type="primary">提交</el-button>
         <el-button @click="handleClick(true)" type="primary">提交并返回</el-button>
       </div>
@@ -74,6 +74,9 @@ export default {
     },
     log_id(){
       return this.$route.query.log_id
+    },
+    isInfo(){
+      return this.$route.query.isEdit==='false'
     }
   },
   watch: {
@@ -180,6 +183,7 @@ export default {
           valueKey: 'rule_name',
           value: params['rule_name'] || '',
           placeholder: '请输入规则名称',
+          disabled: this.isInfo,
           className: 'input20',
           rules: [{
             required: true,
@@ -194,6 +198,7 @@ export default {
           valueKey: 'rule_desc',
           value: params['rule_desc'] || '',
           placeholder: '请输入规则描述',
+          disabled: this.isInfo,
           className: 'input20',
           rules: [{
             required: true,
@@ -207,6 +212,7 @@ export default {
           valueKey: 'status',
           value: params.status || "",
           placeholder: '请选择规则启用',
+          disabled: this.isInfo,
           multiple: false,
           list: [
             { "label": "启用", "value": 'Y' },
@@ -225,6 +231,7 @@ export default {
           valueKey: 'sort',
           value: params.sort || '',
           placeholder: '请输入权重值',
+          disabled: this.isInfo,
           className: 'input20',
           rules: [{
             required: true,
@@ -246,6 +253,7 @@ export default {
           value: params.site_id || "",
           placeholder: '请选择站点',
           multiple: false,
+          disabled: this.isInfo,
           list: this.siteData,
           rules: [{
             required: true,
@@ -259,6 +267,7 @@ export default {
           valueKey: 'price_type',
           value: params['price_type'] || "",
           placeholder: '请选择调价基准',
+          disabled: this.isInfo,
           multiple: false,
           list: this.settingsData['price_type']||[],
           rules: [{
@@ -290,6 +299,7 @@ export default {
             unit: params.price_method === 'money' ? '元' : '%',
             pos: 'append'
           },
+          disabled: this.isInfo,
           rules: [
             {required: true, message: params['price_method'] === 'money' ? '请输入金额' : '请输入比例', trigger: 'blur'},
           ],
@@ -312,6 +322,7 @@ export default {
           valueKey: 'decimal_num',
           value: params.decimal_num || 2,
           placeholder: '请选择小数点保留位数',
+          disabled: this.isInfo,
           multiple: false,
           list: [
             { "label": "零位", "value": -1 },
@@ -332,6 +343,7 @@ export default {
           let key = item.valueKey;
           item.list = this.brandData;
           item.value = params[key] || [];
+          item.disabled = this.isInfo;
 
           item.rules = [
             {

package/package.json

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