瀏覽代碼

页面修改

liumy 1 年之前
父節點
當前提交
56a2b180be

+ 21 - 16
src/components/yl-upload-files/index.vue

@@ -40,6 +40,7 @@
       :auto-upload="false"
       ref="upload"
       class="upload-css"
+      v-if="btnShow"
     >
       <el-button type="primary" :disabled="canUp">点击上传</el-button>
       <div slot="tip" class="el-upload__tip"><slot name="dec"></slot></div>
@@ -87,10 +88,10 @@ export default {
       default: 10
     },
     // 传递的id值
-    fileId: {
-      type: [Number, String],
-      default: ""
-    },
+    // fileId: {
+    //   type: [Number, String],
+    //   default: ""
+    // },
     // 文件是否只读
     readonly: {
       type: Boolean,
@@ -103,7 +104,11 @@ export default {
     fileId:{
       type: Array,
       default: []
-    }
+    },
+    fileStas:{
+      type: String,
+      default: ""
+    },
   },
   data() {
     return {
@@ -114,6 +119,7 @@ export default {
       srcList: [""],
       type: "",
       discountFiles: [], //上传附件数组
+      btnShow:true,
     };
   },
   methods: {
@@ -156,9 +162,7 @@ export default {
         const res = await uploadData(data, this);
         if (res.success == true) {
           let obj = {id:res.data.id,fileName:res.data.fileName}
-          console.log(obj,"obj");
           this.discountFiles.push(obj)
-          console.log(this.discountFiles,"this.discountFiles");
           this.$emit("getUpload", this.discountFiles,index);
           // this.$emit("getUpload", res.data.id,this.index);
           this.loading = false;
@@ -169,7 +173,6 @@ export default {
     },
     // 表单点击预览
     check(item,index) {
-      console.log(item,"121212");
       this.pdfSrc = "";
       this.srcList = false;
       this.type = "";
@@ -185,9 +188,7 @@ export default {
           const fileName = res.data.fileName.split(".").slice(-1);
           if(fileName){
           // if (res.data.fileSufx === "pdf") {
-            // console.log(222)
             const b = this.dataURLtoBlob(res.data.fileContent.slice(28));
-            console.log(b,"bb")
             if (this.openFileType === "dialog") {
               this.dialogFile = true;
               this.pdfSrc = b;
@@ -208,7 +209,6 @@ export default {
 
     // 预览文件
     dataURLtoBlob(e) {
-      console.log(111)
       let bstr = atob(e);
       let n = bstr.length;
       let u8arr = new Uint8Array(n);
@@ -221,16 +221,21 @@ export default {
     },
 
     deltabpdf(item,index) {
-      console.log("要删除的文件编号是:" + index);
-      console.log(item,"要删除的文件");
       // this.discountFiles =  this.discountFiles.splice(index, 1);
       this.discountFiles = this.discountFiles.filter((currentValue, indedx, arr)=> indedx !== index);
       // this.discountFiles = this.discountFiles.filter(obj => obj.id !== item.id);
-      console.log(this.discountFiles);
       this.$emit("getUpload", this.discountFiles,index);
     },
-    mouseEnterHandler(){
-      console.log('鼠标悬浮在按钮上');
+  },
+  mounted(){
+    if(this.fileStas=="已录入发票"){
+      this.btnShow = false
+    }else if(this.fileStas=="未付款"){
+      this.btnShow = false
+    }else if(this.fileStas=="已付款"){
+      this.btnShow = false
+    }else{
+      this.btnShow = true
     }
   }
 };

+ 4 - 4
src/views/components/early-warning.vue

@@ -13,8 +13,8 @@
       <!-- <p  v-if="info.msgType=='A'" style="margin-left:23px;margin-top:5px">您提交的{{info.title}} <span style="color:#1093d7">【申领单号】</span>被<span style="color:#f9bd72">【审核人姓名】</span>退回,请注意及时查看处理。 </p> -->
       <!-- <p  v-if="info.msgType=='notice'" style="margin-left:23px;margin-top:5px"> <span style="color:#1093d7">【申领单号】</span>的商品资质<span style="color:#1093d7">【审核人姓名】</span>即将于【日期】到期,请注意及时更新。 </p>
       <p  v-if="info.msgType=='inform'" style="margin-left:23px;margin-top:5px"> <span style="color:#1093d7">【申领单号】</span>提交的<span style="color:#1093d7">【审核人姓名】</span>目录新增已到达,请注意及时审核。 </p> -->
-      <span class="StasSrc" v-if="info.msgStas=='1'"> 已读</span>
-      <span class="StasSrc" style="color:#1093d7" v-else> 未读</span>
+      <p class="StasSrc" v-if="info.msgStas=='1'"> 已读</p>
+      <p class="StasSrc" style="color:rgb(223 38 38);" v-else> 未读</p>
     </div>
 </template>
   
@@ -37,7 +37,6 @@ import {updateMsgStas} from "@/api/messageCenter/index"
     methods:{
       // 跳转
     getDetail(row) {
-      console.log(row,"www");
       updateMsgStas([{id:row.id,msgStas:"1"}]).then((res)=>{
         if(res.success==true){
           this.$router.push({
@@ -50,7 +49,6 @@ import {updateMsgStas} from "@/api/messageCenter/index"
     },
     },
     mounted() {
-      console.log(this.info);
       // this.info.msgColumnList.forEach((v,i) => {
       //   if(v.color=='red'){
       //     this.info.msgColumnList[i].color="#1093d7"
@@ -58,6 +56,7 @@ import {updateMsgStas} from "@/api/messageCenter/index"
       //     this.info.msgColumnList[i].color="#f9bd72"
       //   }
       // });
+      if(this.info.msgColumnList[0].msgColumn ||this.info.msgColumnList[1].msgColumn||this.info.msgColumnList[2].msgColumn)
       this.a=this.info.msgText.replace('msg_1',this.info.msgColumnList[0].msgColumn)
       this.a=this.a.replace('msg_2',"<span style='color:"+this.info.msgColumnList[1].msgColumnColor +"'>"+ '【'+ this.info.msgColumnList[1].msgColumn+'】'+"</span>")
       this.a=this.a.replace('msg_3',"<span style='color:"+this.info.msgColumnList[2].msgColumnColor +"'>"+ '【'+ this.info.msgColumnList[2].msgColumn+'】'+"</span>")
@@ -81,6 +80,7 @@ import {updateMsgStas} from "@/api/messageCenter/index"
         position: absolute;
         top:33px;
         right: 35px;
+        font-weight: 800; 
     }
     
 </style>

+ 16 - 13
src/views/page/messageCenter/index.vue

@@ -16,7 +16,17 @@
       </el-tree>
     </el-card>
   <div class="right-common-box">
-    <div style="position: absolute;left: 30%;z-index:1;top: 133px;">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      
+      <el-form
+        :model="listQuery"
+        ref="queryForm"
+        :inline="true"
+        style="display: flex; height: 33px;"
+      >
+      <!-- <div style="margin-left:10px"> -->
+        <div>
+        <!-- <div style="position: absolute;left: 30%;z-index:1;top: 133px;"> -->
           <el-radio-group v-model="msgClass" @input="clickMsg">
             <el-radio-button label="0">资质管理</el-radio-button>
             <el-radio-button label="1">业务</el-radio-button>
@@ -25,15 +35,6 @@
             <el-radio-button label="4">库存管理</el-radio-button>
           </el-radio-group>
         </div>
-    <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-form
-        :model="listQuery"
-        ref="queryForm"
-        :inline="true"
-        style="display: flex; height: 33px"
-      >
-        <el-button type="primary" @click="handleRead('search')">标为已读</el-button>
-        <el-button @click="handleDel('search')" type="danger" plain>全部删除</el-button>
         
         <div style="margin-left: 20px">
           <el-form-item>
@@ -43,6 +44,10 @@
           <el-button  @click="reset()">重置</el-button>
         </div>
       </el-form>
+      <div style="margin-top:10px">
+      <el-button type="primary" @click="handleRead('search')">标为已读</el-button>
+        <el-button @click="handleDel('search')" type="danger" plain>全部删除</el-button>
+      </div>
       <el-tab-pane label="全部" name="first">
         <el-table
           v-loading="listLoading"
@@ -51,7 +56,7 @@
           fit
           stripe
           border
-          height="500px"
+          height="480px"
           style="margin-top: 20px"
           @selection-change="handleSelectionChange"
           row-key="id"
@@ -339,7 +344,6 @@ export default {
         .then((res) => {
           this.listQuery.spdId = res.data[0].spdId;
           this.hosdata = res.data;
-          console.log(this.hosdata, "dadad");
         })
         .catch((err) => {});
     },
@@ -354,7 +358,6 @@ export default {
       // }
     },
     handleClick(tab) {
-      console.log(tab.name, "name");
       if (tab.name =="first") {
         this.listQuery.msgType = "";
         this.getMess();

+ 3 - 5
src/views/page/orderManage-sup/alreadyDelivery/alreadyDetail.vue

@@ -517,17 +517,17 @@ export default {
           // 先设置第一项
           this.cellList.push(1); // 初为1,若下一项和此项相同,就往cellList数组中追加0
           this.count = 0;
-          console.log("索引", 0, this.count);
+          // console.log("索引", 0, this.count);
         } else {
           // 判断当前项与上项的设备类别是否相同,因为是合并这一列的单元格
           if (tableData[i].prodCode == tableData[i - 1].prodCode) {
             this.cellList[this.count] += 1; // 增加计数
             this.cellList.push(0); // 相等就往cellList数组中追加0
-            console.log("索引", i, this.count);
+            // console.log("索引", i, this.count);
           } else {
             this.cellList.push(1); // 不等就往cellList数组中追加1
             this.count = i; // 将索引赋值为计数
-            console.log("索引", i, this.count);
+            // console.log("索引", i, this.count);
           }
         }
       }
@@ -660,7 +660,6 @@ export default {
     },
     // 结束订单
     handleOrderEnd() {
-      console.log(this.tableData, "tanleData");
       // this.tableData.forEach((item) => {
       //     if (!item.fa || !item.tong) {
       //         this.$message({
@@ -691,7 +690,6 @@ export default {
     // 查看UDI码
     handleudi(row) {
       this.udiData = row.udiList
-      console.log(this.udiData,"12121")
       this.udiData = this.udiData.map(item => ({
         ...item,
         spec:row.spec,

+ 2 - 2
src/views/page/orderManage-sup/purOrderAccept/acceptDetail.vue

@@ -318,8 +318,8 @@ export default {
     },
     // 是否驳回开关
     handleSwitch(index, row) {
-      console.log(row.flag);
-      console.log(row);
+      // console.log(row.flag);
+      // console.log(row);
       if (row.flag == false) {
         row.rejtRea = "";
       } else {

+ 3 - 3
src/views/page/orderManage-sup/purOrderAccept/index.vue

@@ -325,7 +325,7 @@ export default {
         .then((res) => {
           this.listQuery.spdId = res.data[0].spdId;
           this.data = res.data;
-          console.log(this.data, "dadad");
+          // console.log(this.data, "dadad");
         })
         .catch((err) => {});
     },
@@ -351,7 +351,7 @@ export default {
     },
     // 点击获取耗材列表
     handleNodeClick(data) {
-      console.log(data, "data");
+      // console.log(data, "data");
       this.listLoading = true;
       this.listQuery.docmkDateStart = this.listQuery.docmkDate[0];
       this.listQuery.docmkDateEnd = this.listQuery.docmkDate[1];
@@ -362,7 +362,7 @@ export default {
           this.list = res.data.records;
           this.total = res.data.total;
           this.listLoading = false;
-          console.log(res, "医院目录");
+          // console.log(res, "医院目录");
         })
         .catch((err) => {
           this.listLoading = false;

+ 1 - 1
src/views/page/orderManage-sup/purOrderConfirmed/confirmDetail.vue

@@ -314,7 +314,7 @@ export default {
     },
     // 是否驳回开关
     handleSwitch(index, row) {
-      console.log(row);
+      // console.log(row);
       if (row.flag == false) {
         row.memo = "";
         this.returnInfo = false;

+ 2 - 2
src/views/page/orderManage-sup/purOrderDelivery/deliveryDetail.vue

@@ -1420,7 +1420,7 @@ export default {
     pf(arr) {
       for (let i = 0; i < arr.length - 1; i++) {
         for (let j = i + 1; j < arr.length; j++) {
-          console.log(arr[i].prodCode, arr[j].prodCode);
+          // console.log(arr[i].prodCode, arr[j].prodCode);
           if (arr[i].prodCode == arr[j].prodCode) {
             var set = new Set(); //创建个集合Set对象(用object对象也可以)
             return arr.some(function (v, i) {
@@ -1438,7 +1438,7 @@ export default {
     udif(arr) {
       for (let i = 0; i < arr.length - 1; i++) {
         for (let j = i + 1; j < arr.length; j++) {
-          console.log(arr[i].prodCode, arr[j].prodCode);
+          // console.log(arr[i].prodCode, arr[j].prodCode);
           if (arr[i].prodCode == arr[j].prodCode) {
             var set = new Set(); //创建个集合Set对象(用object对象也可以)
             return arr.some(function (v, i) {

+ 4 - 4
src/views/page/orderManage-sup/purOrderDelivery/index.vue

@@ -346,7 +346,7 @@ export default {
       // }
     },
     handleClick(tab) {
-      console.log(tab.name, "name");
+      // console.log(tab.name, "name");
       if (tab.name == "first") {
         this.getOutboundData();
       } else {
@@ -361,7 +361,7 @@ export default {
           this.listQuery.spdId = res.data[0].spdId;
           this.listQueryC.spdId = res.data[0].spdId;
           this.data = res.data;
-          console.log(this.data, "dadad");
+          // console.log(this.data, "dadad");
         })
         .catch((err) => {});
     },
@@ -385,7 +385,7 @@ export default {
     },
     // 点击获取耗材列表
     handleNodeClick(data) {
-      console.log(data, "data");
+      // console.log(data, "data");
       this.listLoading = true;
       this.listQuery.docmkDateStart = this.listQuery.docmkDate[0];
       this.listQuery.docmkDateEnd = this.listQuery.docmkDate[1];
@@ -396,7 +396,7 @@ export default {
           this.list = res.data.records;
           this.total = res.data.total;
           this.listLoading = false;
-          console.log(res, "医院目录");
+          // console.log(res, "医院目录");
         })
         .catch((err) => {
           this.listLoading = false;

+ 5 - 3
src/views/page/procurement-settlement/invoiceManage/consumptionDetail.vue

@@ -126,6 +126,7 @@
             <yl-upload
                 v-else
               :fileId="listForm.invoFile"
+              :fileStas="listForm.stas"
               readonly
             >
             </yl-upload>
@@ -142,6 +143,7 @@
             <yl-upload
                 v-else
               :fileId="listForm.invoChkFile"
+              :fileStas="listForm.stas"
               readonly
             >
             </yl-upload>
@@ -385,17 +387,17 @@ export default {
       this.listForm.invoFile = id;
       if (id) {
         this.$refs.listform.clearValidate("invoFile");
-        console.log(this.listForm.invoFile,"this.listForm.invoFile")
+        // console.log(this.listForm.invoFile,"this.listForm.invoFile")
       } else {
         this.$refs.listform.validateField("invoFile");
       }
     },
     getUpload1(id) {
-      console.log(id,"ididi11111");
+      // console.log(id,"ididi11111");
       this.listForm.invoChkFile = id;
       if (id) {
         this.$refs.listform.clearValidate("invoChkFile");
-        console.log(this.listForm.invoChkFile,"this.listForm.invoChkFile")
+        // console.log(this.listForm.invoChkFile,"this.listForm.invoChkFile")
       } else {
         this.$refs.listform.validateField("invoChkFile");
       }

+ 4 - 4
src/views/page/procurement-settlement/invoiceManage/index.vue

@@ -210,7 +210,7 @@ export default {
     },
     // 点击获取医院药品列表
     handleNodeClick(data) {
-      console.log(data, "data");
+      // console.log(data, "data");
       this.listLoading = true;
       this.spdId = data.spdId;
       this.listQuery.spdId = this.spdId;
@@ -246,7 +246,7 @@ export default {
         .then((res) => {
           this.listQuery.spdId = res.data[0].spdId;
           this.data = res.data;
-          console.log(this.data, "dadad");
+          // console.log(this.data, "dadad");
           this.listLoading = false;
         })
         .catch((err) => {
@@ -255,7 +255,7 @@ export default {
     },
     // 多选
     handleSelectionChange(e) {
-      console.log(this.spdId, "sodpdp");
+      // console.log(this.spdId, "sodpdp");
       this.insertMcsList = e;
       newArr = this.insertMcsList.push({ spdId: this.spdId });
       // console.log(e, "ee");
@@ -273,7 +273,7 @@ export default {
       }
     },
     handleClick(tab) {
-      console.log(tab.name, "name");
+      // console.log(tab.name, "name");
       if (tab.name == "first") {
         this.getList();
       } else if(tab.name=="second") {

+ 6 - 6
src/views/page/procurement-settlement/paymentStatus/consumptionDetails.vue

@@ -81,13 +81,13 @@
               </div>
             </el-form-item>
             <el-form-item label="发票文件" prop="invoFile" >
-              <yl-upload :fileId="listForm.invoFile" readonly> </yl-upload>
+              <yl-upload :fileId="listForm.invoFile" :fileStas="listForm.stas" readonly> </yl-upload>
             </el-form-item>
             <el-form-item
               label="核验文件"
               prop="invoChkFile"
             >
-              <yl-upload :fileId="listForm.invoChkFile" readonly> </yl-upload>
+              <yl-upload :fileId="listForm.invoChkFile" :fileStas="listForm.stas" readonly> </yl-upload>
             </el-form-item>
           </div>
         </div>
@@ -132,7 +132,7 @@
               </div>
             </el-form-item>
             <el-form-item label="附件" prop="payFile">
-              <yl-upload :fileId="listForm.payFile" readonly> </yl-upload>
+              <yl-upload :fileId="listForm.payFile" :fileStas="listForm.stas" readonly> </yl-upload>
             </el-form-item>
           </div>
         </div>
@@ -214,7 +214,7 @@ export default {
     this.listForm.payDate = this.$route.query.payDate;
     this.listForm.payAmt = this.$route.query.payAmt;
     this.listForm.payFile = this.$route.query.payFile;
-    console.log(this.listForm.payFile,"this.listForm.payFile");
+    // console.log(this.listForm.payFile,"this.listForm.payFile");
   },
   mounted() {
     this.getData();
@@ -259,7 +259,7 @@ export default {
       this.listForm.invoFile = id;
       if (id) {
         this.$refs.listform.clearValidate("invoFile");
-        console.log(this.listForm.invoFile, "this.listForm.invoFile");
+        // console.log(this.listForm.invoFile, "this.listForm.invoFile");
       } else {
         this.$refs.listform.validateField("invoFile");
       }
@@ -268,7 +268,7 @@ export default {
       this.listForm.invoChkFile = id;
       if (id) {
         this.$refs.listform.clearValidate("invoChkFile");
-        console.log(this.listForm.invoChkFile, "this.listForm.invoChkFile");
+        // console.log(this.listForm.invoChkFile, "this.listForm.invoChkFile");
       } else {
         this.$refs.listform.validateField("invoChkFile");
       }

+ 5 - 0
src/views/page/procurement-settlement/reconciliation/index.vue

@@ -331,6 +331,11 @@ export default {
           this.listLoading = false;
         });
     }
+    if(this.$route.query.msgRouteUni && this.$route.query.spdId){
+      this.listQuery.spdId = this.$route.query.spdId;
+      this.listQuery.stmtNo = this.$route.query.msgRouteUni;
+      this.getList()
+    }
   },
 };
 </script>

+ 6 - 1
src/views/page/productreturnmanage-sup/returnOrderAccept/index.vue

@@ -146,6 +146,11 @@ export default {
           this.listLoading = false;
         });
     };
+    if(this.$route.query.msgRouteUni && this.$route.query.spdId){
+      this.listQuery.spdId = this.$route.query.spdId;
+      this.listQuery.id = this.$route.query.msgRouteUni;
+      this.getorderData()
+    }
   },
   methods: {
     tabClick(tab) {
@@ -180,7 +185,7 @@ export default {
         .then((res) => {
           this.listQuery.spdId = res.data[0].spdId;
           this.data = res.data;
-          console.log(this.data, "dadad");
+          // console.log(this.data, "dadad");
         })
         .catch((err) => {});
     },