Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url("~assets/css/font.css");
-@import url("//at.alicdn.com/t/font_2077629_fty5i519neb.css");
+@import url("//at.alicdn.com/t/font_2077629_ew7nihu6b4p.css");
 .q-scrollarea__thumb {
   z-index: 999999 !important;
 }

src/api/administration/AssetsShenpi.js

@@ -75,6 +75,44 @@ export function getBuyingRequisitionAuditDetail(data) {
   });
 }
 
+//耗材 入库单的审核
+export function suppliesStockInAuditOrRefund(data) {
+  return request({
+      url: '/supplies/SuppliesStockInAuditOrRefund',
+      method: 'post',
+      data
+  });
+}
+//耗材 入库单的详情
+export function getSuppliesStockInAuditDetail(data) {
+  return request({
+      url: '/supplies/GetSuppliesStockInAuditDetail',
+      method: 'post',
+      data
+  });
+}
+
+//资产 入库单的审核
+export function propertyStockInAuditOrRefund(data) {
+  return request({
+      url: '/property/PropertyStockInAuditOrRefund',
+      method: 'post',
+      data
+  });
+}
+
+//资产 入库单的详情
+export function getPropertyStockInAuditDetail(data) {
+  return request({
+      url: '/property/GetPropertyStockInAuditDetail',
+      method: 'post',
+      data
+  });
+}
+
+
+
+
 
 
 export  function UploadSelfFileT(path, files, successCall, ocr) {

src/components/global/user-right-box.vue

@@ -38,7 +38,7 @@
                     </q-item-section>
                 </q-item>
                 <!-- 跳转资产 -->
-                <q-item class="q-my-sm" clickable v-ripple @click="goUrlZC">
+                <q-item class="q-my-sm" clickable v-ripple @click="goUrlZC(1)">
                     <q-item-section avatar>
                         <q-avatar style="background-color: #F3F6F9;" rounded size="40px" text-color="primary">
                             <i class="iconfont icon-zichan"></i>
@@ -48,6 +48,28 @@
                         <q-item-label class="font-pfb">资产管理</q-item-label>
                     </q-item-section>
                 </q-item>
+                 <!-- 跳转资产 -->
+                 <q-item class="q-my-sm" clickable v-ripple @click="goUrlZC(2)">
+                    <q-item-section avatar>
+                        <q-avatar style="background-color: #F3F6F9;" rounded size="40px" text-color="primary">
+                            <i class="iconfont icon-qinggoudan"></i>
+                        </q-avatar>
+                    </q-item-section>
+                    <q-item-section>
+                        <q-item-label class="font-pfb">请购审核</q-item-label>
+                    </q-item-section>
+                </q-item>
+                 <!-- 跳转资产 -->
+                 <q-item class="q-my-sm" clickable v-ripple @click="goUrlZC(3)">
+                    <q-item-section avatar>
+                        <q-avatar style="background-color: #F3F6F9;" rounded size="40px" text-color="primary">
+                            <i class="iconfont icon-ruku"></i>
+                        </q-avatar>
+                    </q-item-section>
+                    <q-item-section>
+                        <q-item-label class="font-pfb">入库审核</q-item-label>
+                    </q-item-section>
+                </q-item>
             </q-list>
             <q-separator color="grey-2" class="q-my-md"></q-separator>
             <div class="text-weight-bold" style="font-size:16px;">常用功能</div>
@@ -170,13 +192,22 @@ export default {
           })
       },
 
-       goUrlZC() {
+       goUrlZC(type) {
         let userinfo = this.getLocalStorage();
         let token=Lockr.get("Token");
         // let  url = "http://www.test.com:8080/#/Autologin?ObjInfo=" + token + "&SecretKey=" + userinfo.UploadConfig.SecretKey;
         // let  url = "http://zcyx.oytour.com/#/Autologin?ObjInfo=" + token + "&SecretKey=" + userinfo.UploadConfig.SecretKey; 
-         let  url = url_jump_zc +"/#/Autologin?ObjInfo=" + token + "&SecretKey=" + userinfo.UploadConfig.SecretKey; 
-        window.open(url)
+         if(type==1){
+            let  url = url_jump_zc +"/#/Autologin?ObjInfo=" + token + "&SecretKey=" + userinfo.UploadConfig.SecretKey; 
+            window.open(url)
+         }else if(type==2){
+            let  url =  url_jump_zc +"/#/Autologin?ObjInfo=" + token + "&SecretKey=" + userinfo.UploadConfig.SecretKey+ "&ComeFrom=2"; 
+            window.open(url)
+         }else if(type==3){
+            let  url =  url_jump_zc +"/#/Autologin?ObjInfo=" + token + "&SecretKey=" + userinfo.UploadConfig.SecretKey+ "&ComeFrom=3"; 
+            window.open(url)
+
+         }
       },
     },
 }

src/pages/administration/AssetsSystem/RequisitionShenpi.vue

@@ -315,7 +315,7 @@
                     </div>
                 </template>
                 <div v-if="GetDetail.Is_CanAudit==1 && compType=='shenpi' && !needSign" class="_upload_box" style="margin-bottom:20px;padding-left:75px">
-                    <ul class="clearfix">
+                    <ul class="clearfix" style="padding: 0;margin: 0;">
                         <li v-for="(img,imgIndex) in uploadImgList" :key="imgIndex">
                             <img :src="img" alt="">
                             <div class="_delete_img" @click="deleteImg(imgIndex)">
@@ -406,7 +406,9 @@
 import CheckDetails from "./CheckDetails.vue";
 import {getAuditChangeLogPageList,setBuyingRequisitionManagers,getEmployeeList,bRAuditOrRefund,getBuyingRequisitionAuditDetail} from "../../../api/administration/AssetsShenpi"
 import {url_jump_zc,ViittoFileUrl} from "../../../utils/url"
-
+import {
+        UploadSelfFile
+    } from '../../../api/common/common'
 export default {
   name: 'PurchaseRequisitionDetail',
   components: {
@@ -574,8 +576,13 @@ export default {
             var fileName = `${that.uuid(10,10)}.png`;
             var path = `/assets/sign/`;
             newArr.push(this.dataURLtoFile(imgUrl,fileName))
-            this.UploadSelfFileT(path, newArr, x => {
-                this.addMsg.SignImage=that.domainManager().ViittoFileUrl+x.data.FilePath;
+            // this.UploadSelfFileT(path, newArr, x => {
+            //     this.addMsg.SignImage=that.domainManager().ViittoFileUrl+x.data.FilePath;
+            // }, 1);
+            UploadSelfFile('Temporary', this.dataURLtoFile(imgUrl,fileName), x => {
+                if(x.Code==1){
+                    this.addMsg.SignImage = x.FileUrl
+                }
             }, 1);
             
             this.signState=false;
@@ -784,10 +791,12 @@ export default {
             newArr.push(file.file)
             let path = "/Upload/Temporary/"
             this.$message.info('上传中...')
-            this.UploadSelfFileT(path, newArr, x => {
-                let obj = this.domainManager().ViittoFileUrl + x.data.FilePath
-                this.uploadImgList.push(obj)
-                this.$message.success('上传成功')
+            UploadSelfFile('Temporary', file.file, x => {
+                if(x.Code==1){
+                    let obj = x.FileUrl
+                    this.uploadImgList.push(obj)
+                    this.$message.success('上传成功')
+                }
             }, 1);
         },
         getDetail(){

src/router/routes.js

@@ -1183,6 +1183,16 @@ const routes = [{
     title: '资产管理'
   },
 },
+{
+  path: "/SuppliesStockInShenpi", //耗材入库审核
+  component: () =>
+    import("pages/administration/AssetsSystem/SuppliesStockInShenpi")
+},
+{
+  path: "/PropertyStockInShenpi", //资产入库审核
+  component: () =>
+    import("pages/administration/AssetsSystem/PropertyStockInShenpi")
+},
 {
   path: "/course/chapter-editor", //章节管理
   component: () =>