1

mobile
2024-06-20 14:10:33 +08:00 · 2024-06-20 14:10:06 +08:00
8 changed files with 180 additions and 83 deletions
--- a/ABAP_AS_WITH_POOL.jcoDestination
+++ b/ABAP_AS_WITH_POOL.jcoDestination
@ -1,5 +1,9 @@
 #for tests only !
+<<<<<<< HEAD
+#Thu Jun 20 12:02:54 CST 2024
+=======
 #Thu Jun 20 11:01:14 CST 2024
+>>>>>>> e4cb8bad7c55f817ead3e419a33f96f5d3492ee4
 jco.destination.pool_capacity=10
 jco.client.lang=ZH
 jco.client.ashost=172.19.0.125
@ -7,5 +11,9 @@ jco.client.saprouter=
 jco.client.user=RFC
 jco.client.sysnr=00
 jco.destination.peak_limit=10
+<<<<<<< HEAD
+jco.client.passwd=654321
+=======
 jco.client.passwd=w7hAeYb,##Zc}g(emH-GJL;?*-*mA;_enm-`{=LFKC[%7:pE
+>>>>>>> e4cb8bad7c55f817ead3e419a33f96f5d3492ee4
 jco.client.client=800
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/SHA1.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/SHA1.java
@ -32,6 +32,6 @@ public class SHA1 {
    }

    public static void main(String[] args) {
-        System.out.println(shaEncode("uy4MbH"+"8879"));
+        System.out.println(shaEncode("uy4MbH"+"990101"));
    }
 }
--- a/ruoyi-ui/src/assets/logo/xunJiaLogo.png
+++ b/ruoyi-ui/src/assets/logo/xunJiaLogo.png
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@ -53,6 +53,11 @@ export const constantRoutes = [
    component: () => import('@/views/ssoLogin'),
    hidden: true
  },
+  {
+    path: '/ssoMobileLogin',
+    component: () => import('@/views/ssoMobileLogin'),
+    hidden: true
+  },
  {
    path: '/register',
    component: () => import('@/views/register'),
@ -147,6 +152,18 @@ export const constantRoutes = [
      }
    ]
  },
+  {
+    path: '/mobile/index',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/mobile/index'),
+        name: 'mobileIndex'
+      }
+    ]
+  },
 ]

 // 动态路由，基于用户权限动态去加载
--- a/ruoyi-ui/src/views/mobile/index.vue
+++ b/ruoyi-ui/src/views/mobile/index.vue
@ -2,14 +2,14 @@
  <div class="app-container">
    <!-- Section 1 -->
    <div class="app-card">
-      <h2 class="app-title">报价</h2>
+      <p class="app-title">报价</p>
      <el-row :gutter="10">
        <el-col :span="8" class="app-icon-container">
          <el-card shadow="always" class="app-icon-card" >
            <div class="app-icon" @click="handleClick('quoteMobile')">
-              <img src="https://via.placeholder.com/50" alt="App1">
+              <img src="@/assets/logo/xunJiaLogo.png" alt="报价单">
            </div>
-            <div class="app-name">报价单</div>
+            <div class="app-name">询价单</div>
          </el-card>
        </el-col>
 <!--        <el-col :span="8" class="app-icon-container">-->
@ -106,17 +106,17 @@ export default {
 }

 .app-card {
-  background-color: #e0f7fa;
+  background-color: #F5F5F5;
  border-radius: 15px;
-  padding: 20px;
+  padding: 10px 20px 20px 20px;
  margin-bottom: 20px;
 }

 .app-title {
-  margin-bottom: 15px;
+  margin-bottom: 10px;
  font-size: 18px;
  color: #333;
-  text-align: center;
+  text-align: left;
 }

 .app-icon-container {
--- a/ruoyi-ui/src/views/mobile/quoteMobile/index.vue
+++ b/ruoyi-ui/src/views/mobile/quoteMobile/index.vue
@ -3,32 +3,37 @@
    <div class="search-container">
      <el-input
        v-model="queryParams.quotCustomerName"
+        style="margin-bottom: 10px"
        placeholder="请输入客户名称"
        class="search-input"
        clearable>
      </el-input>
-      <el-select
-        v-model="queryParams.quotApprovalStatus"
-        placeholder="请选择审批状态"
-        class="search-input"
-        clearable
-      >
-        <el-option
-          v-for="dict in dict.type.quot_approval_status"
-          :key="dict.value"
-          :label="dict.label"
-          :value="dict.value"
-        />
-      </el-select>
      <el-input
        v-model="queryParams.quotProject"
        placeholder="请输入项目名称"
+        style="margin-bottom: 10px"
        class="search-input"
        clearable>
-        <el-button slot="append" icon="el-icon-search" @click="handleSearch">搜索</el-button>
-        <el-button slot="append" icon="el-icon-plus" @click="handleAdd">新增</el-button>
      </el-input>
-
+      <div style="display: flex">
+        <el-select
+          v-model="queryParams.quotApprovalStatus"
+          placeholder="请选择审批状态"
+          style="width: 50%; margin-right: 10px"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.quot_approval_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+        <div style="width: 50%">
+          <el-button size="mini" icon="el-icon-search" @click="handleSearch">搜索</el-button>
+          <el-button size="mini" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+        </div>
+      </div>
    </div>
    <div v-if="quoteList.length === 0">内容为空</div>
      <div v-for="(quote, index) in quoteList" :key="index">
@ -36,9 +41,7 @@
          <el-card class="box-card">
            <div slot="header" class="clearfix">
              <span>{{quote.quotCode}}</span>
-              <el-button style="float: right; padding: 3px; " type="text" @click="handleEdit(quote, 'edit')">编辑</el-button>
-              <el-button style="float: right; padding: 3px; margin-right: 50px " type="text" @click="handleEdit(quote, 'view')">查看</el-button>
-
+              <el-button style="float: right; padding: 3px; " type="text" @click="handleEdit(quote)">编辑</el-button>
            </div>
            <div class="text item">
              <div v-if="false">订单号Id:{{quote.quotId}}</div>
@ -55,13 +58,16 @@
          </el-card>
        </div>
      </div>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="handleSearch"
-      />
+      <div style="margin-bottom: 40px">
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="handleSearch"
+        />
+      </div>
+

    </div>
 </template>
@ -99,13 +105,15 @@ export default {
    this.handleSearch();
  },
  mounted() {
+    this.$store.dispatch('app/toggleSideBarHide', true);
+    document.querySelector('.navbar').style.display = "none";
+    document.querySelector('.tags-view-container').style.display = "none";
  },
  methods: {
    handleSearch() {
      try {
        listQuot(this.queryParams).then(response => {
          this.quoteList = response.rows;
-          this.queryParams.pageNum++;
          this.total = response.total;
        });
      } catch (error) {
@ -115,10 +123,9 @@ export default {
    handleAdd() {
      this.$router.push('/quoteMobile/add');
    },
-    handleEdit(quote, name) {
-      const info = { quotId: quote.quotId, operate: name };
-      console.log(info);
-      this.$router.push({ path: '/quoteMobile/edit/edit', query: info });
+    handleEdit(quote) {
+      const info = {quotId : quote.quotId}
+      this.$router.push({ path: '/quoteMobile/edit/edit', query: info});
      console.log(quote)
    },

--- a/ruoyi-ui/src/views/mobile/quoteMobile/operation/add.vue
+++ b/ruoyi-ui/src/views/mobile/quoteMobile/operation/add.vue
@ -12,7 +12,7 @@
      <el-form-item label="客户" prop="quotCustomerName">
        <el-input readonly v-model="formData.quotCustomerName" placeholder="请输入客户" >
          <template slot="append">
-            <span  @click="openCustomer">选择</span>
+            <span v-if="!isVIf"  @click="openCustomer">选择</span>
          </template>
        </el-input>
      </el-form-item>
@ -20,11 +20,7 @@
        <el-input :readonly="isReadOnly" v-model="formData.quotAddress" placeholder="请输入地址" clearable>
        </el-input>
      </el-form-item>
-      <el-form-item label="审核人" prop="quotCheckUserNickname">
-        <el-input readonly v-model="formData.quotCheckUserNickname" placeholder="审核人" clearable
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="提交状态" prop="quotApprovalStatus">
+      <el-form-item v-if="isVIf" label="提交状态" prop="quotApprovalStatus">
        <el-input readonly
                  :value="formData.quotApprovalStatus === undefined ? '' :(formData.quotApprovalStatus === '0' ? '待提交' :
                      (formData.quotApprovalStatus === '1' ? '协助中' :
@ -33,7 +29,7 @@
        ></el-input>
      </el-form-item>
      <el-form-item label="项目名称" prop="quotProject">
-        <el-input v-model="formData.quotProject" placeholder="请输入项目名称" clearable >
+        <el-input :readonly="isReadOnly" v-model="formData.quotProject" placeholder="请输入项目名称" clearable >
        </el-input>
      </el-form-item>
      <el-form-item label="OA审批备注" prop="quotOAApprovalStatusRemark">
@ -41,16 +37,16 @@
        </el-input>
      </el-form-item>
      <el-form-item label="报价要求" prop="quotQuotationRequire">
-        <el-input v-model="formData.quotQuotationRequire" placeholder="请输入报价要求" clearable
+        <el-input :readonly="isReadOnly" v-model="formData.quotQuotationRequire" placeholder="请输入报价要求" clearable
                  ></el-input>
      </el-form-item>
      <el-form-item label="联系电话" prop="quotPhone">
-        <el-input v-model="formData.quotPhone" placeholder="请输入联系电话" clearable >
+        <el-input :readonly="isReadOnly" v-model="formData.quotPhone" placeholder="请输入联系电话" clearable >
        </el-input>
      </el-form-item>


-      <el-divider content-position="left" class="customer_divider_text">清单附件(先保存再上传且必须是EXCEL文件)</el-divider>
+      <el-divider content-position="left" >清单附件(先保存再上传且必须是EXCEL文件)</el-divider>
      <div v-hasPermi="['quot:quot:quotXjFile']">
        <el-upload class="upload-demo"
                   ref="quotXjFileUpload"
@ -62,7 +58,7 @@
                   :on-success="handleAvatarSuccess"
                   :show-file-list="false"
                   :limit="1"
-                   v-if="this.formData.quotApprovalStatus == '0' && !isReadOnly">
+                   v-if="this.formData.quotApprovalStatus == '0' ">
          <el-button size="small" type="primary" @click="uploadFile('quotXjFile')">上传文件</el-button>
        </el-upload>
      </div>
@ -73,14 +69,14 @@
            <el-button :key="Math.random()" size="small" type="text">
              <a @click="downloadFile(scope.row.fileUrl)">下载</a>
            </el-button>
-            <el-button :key="Math.random()" size="small" type="text" v-if="formData.quotApprovalStatus == '0' && !isReadOnly">
+            <el-button :key="Math.random()" size="small" type="text" v-if="formData.quotApprovalStatus == '0' ">
              <a @click="deleteFile(scope.row.fileId,'quotXjFile')">删除</a>
            </el-button>
          </template>
        </el-table-column>
      </el-table>

-      <el-divider content-position="left" class="customer_divider_text">技术附件(先保存再上传,如包含清单附件则不受理)</el-divider>
+      <el-divider content-position="left">技术附件(先保存再上传,如包含清单附件则不受理)</el-divider>
      <div v-hasPermi="['quot:quot:quotJsgfFile']">
        <el-upload class="upload-demo"
                   ref="quotJsgfFileUpload"
@ -92,7 +88,7 @@
                   :on-success="handleAvatarSuccess"
                   :show-file-list="false"
                   :limit="1"
-                   v-if="this.formData.quotApprovalStatus == '0' && !isReadOnly">
+                   v-if="this.formData.quotApprovalStatus == '0' ">
          <el-button size="small" type="primary" @click="uploadFile('quotJsgfFile')">上传文件</el-button>
        </el-upload>
      </div>
@ -103,29 +99,14 @@
            <el-button :key="Math.random()" size="small" type="text">
              <a @click="downloadFile(scope.row.fileUrl)">下载</a>
            </el-button>
-            <el-button :key="Math.random()" size="small" type="text" v-if="formData.quotApprovalStatus == '0' && !isReadOnly">
+            <el-button :key="Math.random()" size="small" type="text" v-if="formData.quotApprovalStatus == '0'">
              <a @click="deleteFile(scope.row.fileId,'quotJsgfFile')">删除</a>
            </el-button>
          </template>
        </el-table-column>
      </el-table>

-      <el-divider content-position="left" class="customer_divider_text">反馈附件</el-divider>
-      <div v-hasPermi="['quot:quot:quotFkFile']" >
-        <el-upload class="upload-demo"
-                   ref="quotFkFileUpload"
-                   name="quotFile"
-                   :action="uploadUrl"
-                   :headers="headers"
-                   :data="{ relation_id: this.formData.quotId,file_type: 'quotFkFile' }"
-                   :before-upload="beforeAvatarUploadQuotFkFile"
-                   :on-success="handleAvatarSuccess"
-                   :show-file-list="false"
-                   :limit="1"
-                   v-if="this.formData.quotApprovalStatus == '1'">
-          <el-button size="small" type="primary" @click="uploadFile('quotFkFile')">上传文件</el-button>
-        </el-upload>
-      </div>
+      <el-divider content-position="left">反馈附件</el-divider>
      <el-table class="down" v-loading="quotFkFileLoading" :data="quotFkFileList" border stripe style="width: 100%;margin-top: 10px;" height="200px">
        <el-table-column prop="fileName" label="文件名称"></el-table-column>
        <el-table-column width="150px" label="操作">
@ -139,8 +120,8 @@
      </el-table>

      <el-form-item style="margin-top: 15px">
-        <el-button v-if="!isReadOnly"  @click="saveForm">保存</el-button>
-        <el-button v-if="!isReadOnly" style="margin: 0px 15px 0px 20px" type="primary" @click="commitForm">提交</el-button>
+        <el-button v-if="!isVIf"  @click="saveForm">保存</el-button>
+        <el-button v-if="!isVIf" style="margin: 0px 15px 0px 20px" type="primary" @click="commitForm">提交</el-button>
        <el-button  @click="closeForm">取消</el-button>
      </el-form-item>
    </el-form>
@ -175,6 +156,7 @@ export default {
  data() {
    return {
      isReadOnly: false,
+      isVIf: false,
      // 报价单-询价附件列表数据
      quotXjFileLoading: false,
      quotXjFileList: [],
@ -199,6 +181,7 @@ export default {
      formData: {
        quotId: null,
        quotCode: '',
+        quotApprovalStatus: undefined,
        quotCustomerName: '',
        quotAddress: '',
        quotCheckUserNickname: '',
@ -235,21 +218,21 @@ export default {
  computed: {},
  watch: {},
  created() {
-    const queryParams = this.$route.query;
-    console.log(queryParams);
-    const quotId = queryParams.quotId;
-    const operate = queryParams.operate;

-    if (quotId !== undefined && quotId !== null) {
-      const row = {'quotId':quotId}
+    const param = this.$route.query;
+
+    if (param.quotId !== undefined && param.quotId !== null) {
+      const row = {'quotId':param.quotId}
      this.handleUpdate(row);
    }
-    if (operate === 'view') {
-      this.isReadOnly = true;
-    }
-    console.log(quotId);
+
+
+  },
+  mounted() {
+    this.$store.dispatch('app/toggleSideBarHide', true);
+    document.querySelector('.navbar').style.display = "none";
+    document.querySelector('.tags-view-container').style.display = "none";
  },
-  mounted() {},
  methods: {
    //打开客户选择弹窗
    openCustomer(){
@ -293,11 +276,20 @@ export default {
          this.showQt = true;
          this.getQuotJsqrFileList('quotJsqrQtFkFile');
        }
+
      }
      this.getQuotXjFileList();
      this.getQuotJsgfFileList();
      this.getQuotHjFileList();
      this.getQuotFkFileList();
+      console.log("状态是" + this.formData.quotApprovalStatus)
+      if (this.formData.quotApprovalStatus === '0') {
+        this.isReadOnly = false;
+        this.isVIf = false
+      } else {
+        this.isReadOnly = true;
+        this.isVIf = true
+      }
    },

    /** 保存按钮 */
--- a/ruoyi-ui/src/views/ssoMobileLogin.vue
+++ b/ruoyi-ui/src/views/ssoMobileLogin.vue
@ -0,0 +1,73 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+  export default {
+    name: "NoPwdLogin",
+    data() {
+      return {
+
+        loginRules: {
+
+        },
+        loading: false,
+        // 验证码开关
+        captchaOnOff: true,
+        // 注册开关
+        register: false,
+        redirect: undefined,
+        userNoPswInfo:{
+          loginid:"",
+          token:""
+        }
+      };
+    },
+    watch: {
+      $route: {
+        handler: function(route) {
+          console.log("路由："+route)
+          this.redirect = route.query && route.query.redirect;
+        },
+        immediate: true
+      }
+    },
+    created() {
+      //平台单独的登录
+      this.getLoginByNameAndTokenJ();
+    },
+    methods: {
+      /**
+       * 三方平台单点登陆
+       * 只传递token
+       */
+      getLoginByNameAndTokenJ() {
+        //获取地址栏中的用户名和密码  这里使用了地址传参，需要在oa系统那里自己配置
+        var loginid = this.$route.query.loginid;
+        var token = this.$route.query.token;
+
+        //调用登录的接口
+        if (loginid == '' || loginid == undefined || loginid == null || token == '' || token == undefined || token == null) {
+          this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+        } else {
+          this.loading = true;//开启过渡动画
+          console.log("开启过渡动画")
+          this.userNoPswInfo  = {
+            loginid: loginid,
+            token: token
+          };
+
+          this.$store.dispatch("NoPwdLogin", this.userNoPswInfo).then(() => {
+            this.$router.push({ path: this.redirect || "/mobile/index" }).catch(()=>{});
+          }).catch(() => {
+            this.loading = false;
+            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+          });
+        }
+      }
+    }
+  };
+</script>
+<style rel="stylesheet/scss" lang="scss">
+
+</style>
Author	SHA1	Message	Date
JIAL	88a1f50a6b	1	2024-06-20 14:10:33 +08:00
JIAL	07412a67e7	mobile	2024-06-20 14:10:06 +08:00