Browse Source

页面修改

liumy 11 months ago
parent
commit
367e9bcabe

+ 13 - 5
src/views/components/early-warning.vue

@@ -56,11 +56,19 @@ 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>")
-    },
+      if(this.info.msgColumnList.length==1){
+        this.a=this.info.msgText.replace('msg_1',this.info.msgColumnList[0].msgColumn)
+      }else if(this.info.msgColumnList.length==2){
+        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>")
+      }else{
+        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>")
+      }
+      
+     },
   };
 </script>
   

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

@@ -87,9 +87,9 @@
             </template>
             <el-table-column fixed type="index" label="序号" width="60" />
             <el-table-column label="订单编号" prop="id" />
-            <el-table-column label="订单种类" prop="detlCnt" />
-            <el-table-column label="订单总数量" prop="qtySum" />
-            <el-table-column label="剩余出库量" prop="delvCnt" />
+            <el-table-column label="订单种类" prop="detlCnt"/>
+            <el-table-column label="订单总数量" prop="qtySum"  width="100px" />
+            <el-table-column label="剩余出库量" prop="delvCnt"  width="100px" />
             <el-table-column label="订单总金额" prop="purcAmt" width="100px" />
             <el-table-column label="客户名称" prop="branchName" />
             <el-table-column label="来源部门" prop="deptName" />
@@ -164,20 +164,6 @@
                 style="width: 230px"
               />
             </el-form-item>
-            <!-- <el-form-item label="当前状态" prop="purcOrdStas">
-                <el-select
-                    v-model="listQuery.purcOrdStas"
-                    placeholder="请选择"
-                    clearable
-                >
-                    <el-option
-                        v-for="item in stasOptions"
-                        :key="item.value"
-                        :label="item.lable"
-                        :value="item.value"
-                    ></el-option>
-                </el-select>
-            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" @click="getOutboundDataC('search')"
                 >查询
@@ -200,10 +186,10 @@
             </template>
             <el-table-column fixed type="index" label="序号" width="60" />
             <el-table-column label="出库单号" prop="delvOrdId" />
-            <el-table-column label="关联采购单" prop="purcOrdId" />
-            <el-table-column label="采购品种数" prop="detlCnt" />
-            <el-table-column label="采购总数量" prop="qtySum" />
-            <el-table-column label="本次出库量" prop="bcckl" />
+            <el-table-column label="关联采购单" prop="purcOrdId" width="100px"/>
+            <el-table-column label="采购品种数" prop="detlCnt"  width="100px"/>
+            <el-table-column label="采购总数量" prop="qtySum"  width="100px"/>
+            <el-table-column label="本次出库量" prop="bcckl"  width="100px"/>
             <el-table-column label="客户验收数量" prop="shppCnt" width="100px" />
             <el-table-column label="剩余出库量" prop="toDelvCnt" width="100px" />
             <el-table-column label="客户名称" prop="branchName" />
@@ -340,6 +326,7 @@ export default {
     }
   },
   methods: {
+    // 左侧栏
     tabClick(tab) {
       if (tab.label == "按机构") {
         this.defaultProps.label = "spdName";
@@ -350,8 +337,8 @@ export default {
       //     // this.listQuery.type = 'grp';
       // }
     },
+    // tab栏
     handleClick(tab) {
-      // console.log(tab.name, "name");
       if (tab.name == "first") {
         this.getOutboundData();
       } else {
@@ -366,10 +353,10 @@ 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");
         })
         .catch((err) => {});
     },
+    // 待出库列表
     getOutboundData(type) {
       if (type == "search") {
         this.listQuery.current = 1;
@@ -390,7 +377,6 @@ export default {
     },
     // 点击获取耗材列表
     handleNodeClick(data) {
-      // console.log(data, "data");
       this.listLoading = true;
       this.listQuery.docmkDateStart = this.listQuery.docmkDate[0];
       this.listQuery.docmkDateEnd = this.listQuery.docmkDate[1];
@@ -401,17 +387,17 @@ export default {
           this.list = res.data.records;
           this.total = res.data.total;
           this.listLoading = false;
-          // console.log(res, "医院目录");
         })
         .catch((err) => {
           this.listLoading = false;
         });
     },
+    // 查询框重置
     reset() {
       this.$refs.queryForm.resetFields();
       this.getOutboundData();
     },
-    // 详情
+    // 详情跳转
     handleDetail(row) {
       if (this.spdId) {
         this.routespdId = this.spdId;
@@ -441,6 +427,7 @@ export default {
         },
       });
     },
+    // 已出库
     getOutboundDataC(type) {
       if (type == "search") {
         this.listQueryC.current = 1;
@@ -463,7 +450,7 @@ export default {
       this.$refs.queryFormC.resetFields();
       this.getOutboundDataC();
     },
-    // 详情
+    // 已出库详情
     handleDetailC(row) {
       if (this.spdId) {
         this.routespdId = this.spdId;