瀏覽代碼

代码提交

baishaojie 1 月之前
父節點
當前提交
796bbb3308
共有 8 個文件被更改,包括 154 次插入99 次删除
  1. 3 3
      .env.development
  2. 1 1
      .env.production
  3. 0 0
      dist/index.html
  4. 二進制
      dist250415.zip
  5. 78 78
      src/permission.js
  6. 23 2
      src/views/cost/diesel/index.vue
  7. 30 1
      src/views/custom/purchase/index.vue
  8. 19 14
      src/views/custom/receive/index.vue

+ 3 - 3
.env.development

@@ -4,16 +4,16 @@ ENV = 'development'
 # base api
 # VUE_APP_BASE_API = '/dev-api'
 # 线上正式地址
-#  VUE_APP_BASE_API = 'http://eam.modernfarming.cn:8000/'
+# VUE_APP_BASE_API = 'http://eam.modernfarming.cn:8000/'
 
 
 
 
 # 线上测试
-# VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
+#VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 
 # 白少后台本地
-VUE_APP_BASE_API = 'http://192.168.1.79:8082/'
+VUE_APP_BASE_API = 'http://127.0.0.1:8081/'
 
 # VUE_APP_BASE_API = 'http://36.155.144.182:18090/'
 

+ 1 - 1
.env.production

@@ -5,7 +5,7 @@ ENV = 'production'
 #
 VUE_APP_BASE_API = '/'
 # 测试线
-# VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
+#VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 # 后台本地
 # VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
 # 牧场测试线

文件差異過大導致無法顯示
+ 0 - 0
dist/index.html


二進制
dist250415.zip


+ 78 - 78
src/permission.js

@@ -7,99 +7,99 @@ import { getToken, removeToken } from "@/utils/auth"; // get token from cookie
 import Cookies from "js-cookie";
 import getPageTitle from "@/utils/get-page-title";
 // 1为单点登录,0其他不是
-Cookies.set("sso", 1);
+Cookies.set("sso", 0);
 NProgress.configure({ showSpinner: false }); // NProgress Configuration
 
 const whiteList = ["/login"]; // no redirect whitelist
 
-router.beforeEach(async (to, from, next) => {
-  // start progress bar
-  NProgress.start();
+router.beforeEach(async(to, from, next) => {
+    // start progress bar
+    NProgress.start();
 
-  // set page title
-  document.title = getPageTitle(to.meta.title);
+    // set page title
+    document.title = getPageTitle(to.meta.title);
 
-  // determine whether the user has logged in
-  const hasToken = getToken();
+    // determine whether the user has logged in
+    const hasToken = getToken();
 
-  console.log("hasToken==>", hasToken);
-  if (hasToken) {
-    if (to.path === "/login") {
-      // if is logged in, redirect to the home page
-      next({ path: "/" });
-      NProgress.done();
-    } else {
-      // determine whether the user has obtained his permission roles through getInfo
-      const hasRoles = store.getters.roles && store.getters.roles.length > 0;
-      if (hasRoles) {
-        // console.log('%c 不用获取,直接进入页面', 'color:#4EA35F')
-        next();
-      } else {
-        try {
-          // get user info
-          // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
-          // console.log('%c 开始请求用户信息', 'color:#4EA35F')
-          const { roles } = await store.dispatch("user/getInfo");
+    console.log("hasToken==>", hasToken);
+    if (hasToken) {
+        if (to.path === "/login") {
+            // if is logged in, redirect to the home page
+            next({ path: "/" });
+            NProgress.done();
+        } else {
+            // determine whether the user has obtained his permission roles through getInfo
+            const hasRoles = store.getters.roles && store.getters.roles.length > 0;
+            if (hasRoles) {
+                // console.log('%c 不用获取,直接进入页面', 'color:#4EA35F')
+                next();
+            } else {
+                try {
+                    // get user info
+                    // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
+                    // console.log('%c 开始请求用户信息', 'color:#4EA35F')
+                    const { roles } = await store.dispatch("user/getInfo");
 
-          // generate accessible routes map based on roles
-          const accessRoutes = await store.dispatch(
-            "permission/generateRoutes",
-            roles
-          );
-          console.log(accessRoutes, "accessRoutes");
-          // dynamically add accessible routes
-          router.addRoutes(accessRoutes);
+                    // generate accessible routes map based on roles
+                    const accessRoutes = await store.dispatch(
+                        "permission/generateRoutes",
+                        roles
+                    );
+                    console.log(accessRoutes, "accessRoutes");
+                    // dynamically add accessible routes
+                    router.addRoutes(accessRoutes);
 
-          // hack method to ensure that addRoutes is complete
-          // set the replace: true, so the navigation will not leave a history record
-          // console.log('%c 马上载入页面', 'color:skyblue')
-          next({ ...to, replace: true });
-        } catch (error) {
-          // remove token and go to login page to re-login
-          await store.dispatch("user/resetToken");
-          Message.error(error || "Has Error");
-          // next(`/login?redirect=${to.path}`)    //跳转到退出前界面
-          removeToken();
-          next(`/login`);
-          NProgress.done();
+                    // hack method to ensure that addRoutes is complete
+                    // set the replace: true, so the navigation will not leave a history record
+                    // console.log('%c 马上载入页面', 'color:skyblue')
+                    next({...to, replace: true });
+                } catch (error) {
+                    // remove token and go to login page to re-login
+                    await store.dispatch("user/resetToken");
+                    Message.error(error || "Has Error");
+                    // next(`/login?redirect=${to.path}`)    //跳转到退出前界面
+                    removeToken();
+                    next(`/login`);
+                    NProgress.done();
+                }
+            }
         }
-      }
-    }
-  } else {
-    /* has no token*/
-
-    if (whiteList.indexOf(to.path) !== -1) {
-      // in the free login whitelist, go directly
-      next();
     } else {
-      // other pages that do not have permission to access are redirected to the login page.
+        /* has no token*/
 
-      // next(`/login?redirect=${to.path}`)    //跳转到退出前界面
+        if (whiteList.indexOf(to.path) !== -1) {
+            // in the free login whitelist, go directly
+            next();
+        } else {
+            // other pages that do not have permission to access are redirected to the login page.
 
-      next({ path: "/login" });
-      NProgress.done();
-      if (Cookies.get("sso") == 1) {
-        // 单点登录
-        // 构建要跳转的URL
-        var url = process.env.VUE_APP_BASE_API;
-        console.log(url, "url");
-        // 获取当前url
-        if (url.indexOf("/") == 0 && url.length == 1) {
-          url = window.location.protocol + "//" + window.location.host + url;
+            // next(`/login?redirect=${to.path}`)    //跳转到退出前界面
+
+            next({ path: "/login" });
+            NProgress.done();
+            if (Cookies.get("sso") == 1) {
+                // 单点登录
+                // 构建要跳转的URL
+                var url = process.env.VUE_APP_BASE_API;
+                console.log(url, "url");
+                // 获取当前url
+                if (url.indexOf("/") == 0 && url.length == 1) {
+                    url = window.location.protocol + "//" + window.location.host + url;
+                }
+                const externalURL =
+                    "https://id.xiandaimuye.com/api/v1/oauth2/authorize?response_type=code&client_id=fTBm64I4k3kqHYtoFTUpvirCDxxCfx7I&redirect_uri=" +
+                    url +
+                    "api/v1/oauth2/token";
+                // 使用 $router.push 进行页面跳转
+                // 注意: 这里的跳转是在当前窗口进行的,如果需要在新标签页打开,可以使用 window.open(externalURL)
+                window.open(externalURL, "_self");
+            }
         }
-        const externalURL =
-          "https://id.xiandaimuye.com/api/v1/oauth2/authorize?response_type=code&client_id=fTBm64I4k3kqHYtoFTUpvirCDxxCfx7I&redirect_uri=" +
-          url +
-          "api/v1/oauth2/token";
-        // 使用 $router.push 进行页面跳转
-        // 注意: 这里的跳转是在当前窗口进行的,如果需要在新标签页打开,可以使用 window.open(externalURL)
-        window.open(externalURL, "_self");
-      }
     }
-  }
 });
 
 router.afterEach(() => {
-  // finish progress bar
-  NProgress.done();
-});
+    // finish progress bar
+    NProgress.done();
+});

+ 23 - 2
src/views/cost/diesel/index.vue

@@ -230,8 +230,29 @@
           </el-col> -->
           <el-col :span="8">
             <el-form-item label="交易时间:" prop="selTime">
-              <el-date-picker v-model="temp.selTime" type="date" placeholder="交易时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width:100%;" :disabled="dialogStatus==='update'" />
-            </el-form-item>
+  <el-date-picker
+    v-model="temp.selTime"
+    type="date"
+    placeholder="交易时间"
+    format="yyyy-MM-dd"
+    value-format="yyyy-MM-dd"
+    style="width: 100%;"
+    :disabled="dialogStatus === 'update'"
+    :picker-options="{
+      disabledDate: (time) => {
+        const currentDate = new Date();
+        const currentDay = currentDate.getDate();
+        const currentMonth = currentDate.getMonth();
+        const selectedMonth = time.getMonth();
+
+        if (currentDay >= 6) {
+          return selectedMonth < currentMonth;
+        }
+        return false;
+      }
+    }"
+  />
+</el-form-item>
           </el-col>
 
         </el-row>

+ 30 - 1
src/views/custom/purchase/index.vue

@@ -1176,6 +1176,24 @@
                 :value="item.id"
               />
             </el-select>
+
+
+            <el-select
+              v-model="getdataListParm2.parammaps.uploadStatus"
+              clearable
+              style="width: 140px;"
+              placeholder="上传状态"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in uploadStatusList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+
+
             <el-button
               v-waves
               class="filter-item"
@@ -2754,6 +2772,13 @@ export default {
         { id: 3, name: "赠品申购" },
         { id: 4, name: "奶厅申购" }
       ], // 申购状态
+      uploadStatusList: [
+        { id: 0, name: "全部" },
+        { id: 1, name: "sap上传成功" },
+        { id: 2, name: "sap上传失败" },
+        { id: 3, name: "srm上传成功" },
+        { id: 4, name: "srm上传失败" }
+      ],
       findAllEmploye: [],
       findAllPasture: [],
       requestParams: [
@@ -2831,7 +2856,8 @@ export default {
           inputDatetime: "",
           // pastureId: Cookies.get('pastureid'),
           pastureName: Cookies.get("pasturename"),
-          purchase_type: ""
+          purchase_type: "",
+          uploadStatus :"",
         }
       },
       dialogFormVisibleConfirmation: false,
@@ -5285,3 +5311,6 @@ export default {
   }
 }
 </style>
+
+
+

+ 19 - 14
src/views/custom/receive/index.vue

@@ -83,25 +83,25 @@
           <el-button v-if="isReceiveUpdate && (row.SHStatus == 4 || row.SHStatus == 6 ||row.SHStatus == 8 || row.SHStatus == 10)" type="success" style="display:inline-block;width:60px;" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button v-else type="success" style="display:none;" size="mini" @click="form_edit(row)">编辑</el-button>
           <!-- 部门审核 -->
-          <el-button v-if="isContractExamineBM && row.SHStatus == 2 && (row.departmentId == getdataListParm.parammaps.logindeptId || depids.filter(function (item) { return item == row.departmentId; }).length != 0)" type="success" style="display:inline-block;width:60px;" size="mini" @click="handleExamine(row)">审核1</el-button>
+          <el-button v-if="isContractExamineBM && row.SHStatus == 2 &&  row.statue !==2  && (row.departmentId == getdataListParm.parammaps.logindeptId || depids.filter(function (item) { return item == row.departmentId; }).length != 0)" type="success" style="display:inline-block;width:60px;" size="mini" @click="handleExamine(row)">审核1</el-button>
           <el-button v-else type="success" style="display:none" size="mini" @click="handleExamine(row)">审核1</el-button>
 
           <!-- 设备处长审核 -->
-          <el-button v-if="isContractExamineSBCZ && row.SHStatus == 3" type="success" style="display:inline-block;width:60px;" size="mini" @click="handleExamine2(row)">审核2</el-button>
+          <el-button v-if="isContractExamineSBCZ && row.SHStatus == 3 &&  row.statue !==2  "  type="success" style="display:inline-block;width:60px;" size="mini" @click="handleExamine2(row)">审核2</el-button>
           <el-button v-else type="success" style="display:none" size="mini" @click="handleExamine2(row)">审核2</el-button>
 
           <!-- 场长助理审核 -->
-          <el-button v-if="isContractExamineCZZL && row.SHStatus == 5" type="success" style="display:inline-block;width:60px" size="mini" @click="handleExamine3(row)">审核3</el-button>
+          <el-button v-if="isContractExamineCZZL && row.SHStatus == 5 &&  row.statue !==2  " type="success" style="display:inline-block;width:60px" size="mini" @click="handleExamine3(row)">审核3</el-button>
           <el-button v-else type="success" style="display:none" size="mini" @click="handleExamine3(row)">审核3</el-button>
 
           <!-- 场长审核 -->
-          <el-button v-if="isContractExamineCZ && row.SHStatus == 7" type="success" style="display:inline-block;width:60px;" size="mini" @click="handleExamine4(row)">审核4</el-button>
+          <el-button v-if="isContractExamineCZ && row.SHStatus == 7 &&  row.statue !==2 " type="success" style="display:inline-block;width:60px;" size="mini" @click="handleExamine4(row)">审核4</el-button>
           <el-button v-else type="success" style="display:none" size="mini" @click="handleExamine4(row)">审核4</el-button>
           <!-- 删除 -->
           <el-button v-if="isReceiveDelete && (row.SHStatus == 4 || row.SHStatus == 6 ||row.SHStatus == 8 || row.SHStatus == 10)" style="display:inline-block;width:60px;" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
           <el-button v-if="row.statue === 1 && isReceiveDelete" style="display:none" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
-          <!-- 关单 -->
-          <el-button v-if="isReceiveClose && ( (row.SHStatus == 9 || row.SHStatus == 5 || row.SHStatus == 7 ) && row.statue < 2)" style="display:inline-block;width:60px;" type="danger" size="mini" @click="handleCustomsDeclaration(row)">关单</el-button>
+          <!-- 关单 ( (row.SHStatus == 9 || row.SHStatus == 5 || row.SHStatus == 7 )-->
+          <el-button v-if="isReceiveClose &&   row.statue < 2" style="display:inline-block;width:60px;" type="danger" size="mini" @click="handleCustomsDeclaration(row)">关单</el-button>
           <el-button v-else style="display:none" type="danger" size="mini" @click="handleCustomsDeclaration(row)">关单</el-button>
         </template>
       </el-table-column>
@@ -483,20 +483,20 @@
             <el-col>
               <el-form-item label="操作:">
                 <!-- 部门审核 -->
-                <el-button v-if="isContractExamineBM && seeTemp.SHStatus == 2 && (seeTemp.departmentId ==getdataListParm.parammaps.logindeptId)" type="success" style="display:inline-block" @click="handleExamine()">审核1</el-button>
-                <el-button v-else type="success" style="display:none" @click="handleExamine()">审核1</el-button>
+                <el-button v-if="isContractExamineBM && seeTemp.SHStatus == 2 && seeTemp.statue !==2    && (seeTemp.departmentId ==getdataListParm.parammaps.logindeptId)" type="success" style="display:inline-block" @click="handleExamine()">审核1</el-button>
+                <el-button  v-else-if="seeTemp.statue !== 2"    type="success" style="display:none" @click="handleExamine()">审核1</el-button>
 
                 <!-- 设备处长审核 -->
-                <el-button v-if="isContractExamineSBCZ && seeTemp.SHStatus == 3" type="success" style="display:inline-block" @click="handleExamine2()">审核2</el-button>
-                <el-button v-else type="success" style="display:none" @click="handleExamine2()">审核2</el-button>
+                <el-button v-if="isContractExamineSBCZ && seeTemp.SHStatus == 3  && seeTemp.statue !==2 " type="success" style="display:inline-block" @click="handleExamine2()">审核2</el-button>
+                <el-button  v-else-if="seeTemp.statue !== 2"  type="success" style="display:none" @click="handleExamine2()">审核2</el-button>
 
                 <!-- 场长助理审核 -->
-                <el-button v-if="isContractExamineCZZL && seeTemp.SHStatus == 5" type="success" style="display:inline-block" @click="handleExamine3()">审核3</el-button>
-                <el-button v-else type="success" style="display:none" @click="handleExamine3()">审核3</el-button>
+                <el-button v-if="isContractExamineCZZL && seeTemp.SHStatus == 5  && seeTemp.statue !==2 " type="success" style="display:inline-block" @click="handleExamine3()">审核3</el-button>
+                <el-button  v-else-if="seeTemp.statue !== 2"  type="success" style="display:none" @click="handleExamine3()">审核3</el-button>
 
                 <!-- 场长审核 -->
-                <el-button v-if="isContractExamineCZ && seeTemp.SHStatus == 7" type="success" style="display:inline-block" @click="handleExamine4()">审核4</el-button>
-                <el-button v-else type="success" style="display:none" @click="handleExamine4()">审核4</el-button>
+                <el-button v-if="isContractExamineCZ && seeTemp.SHStatus == 7  && seeTemp.statue !==2 " type="success" style="display:inline-block" @click="handleExamine4()">审核4</el-button>
+                <el-button  v-else-if="seeTemp.statue !== 2"  type="success" style="display:none" @click="handleExamine4()">审核4</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -1910,3 +1910,8 @@ export default {
     z-index: 1;
   }
 </style>
+
+
+
+
+

部分文件因文件數量過多而無法顯示