Sfoglia il codice sorgente

bug修改 是否字段 时间字段 受理数量

liumy 1 anno fa
parent
commit
e6fb3e5459

+ 17 - 12
src/views/page/consumCataManage-sup/catalogdetails.vue

@@ -166,8 +166,8 @@
                 ></el-option>
               </el-select> -->
               <div class="content">
-                <span v-if="infoData.isPub == '0'">挂网</span>
-                <span v-if="infoData.isPub =='1'">非挂网</span>
+                <span v-if="infoData.isPub == '1'">挂网</span>
+                <span v-if="infoData.isPub =='0'">非挂网</span>
               </div>
             </el-form-item>
             <el-form-item label="  " prop="regcertno">
@@ -208,8 +208,8 @@
             </el-form-item>
             <el-form-item label="是否集采" prop="isFas" >
               <div class="content" v-if="isShow">
-                <span v-if="infoData.isFas == '0'">是</span>
-                <span v-if="infoData.isFas =='1'">否</span>
+                <span v-if="infoData.isFas == '1'">是</span>
+                <span v-if="infoData.isFas =='0'">否</span>
               </div>
               <el-select
                 v-else
@@ -368,13 +368,16 @@
         </div>
       </div>
     </el-form>
-    <div class="foot-button" v-if="btnShow">
-      <el-button type="success" @click="handleSave" :loading="saveLoad">保存</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitLoad"
+    <div class="foot-button" >
+      <el-button  v-if="btnShow" type="success" @click="handleSave" :loading="saveLoad">保存</el-button>
+      <el-button  v-if="btnShow" type="primary" @click="handleSubmit" :loading="submitLoad"
         >提交</el-button
       >
+    <!-- </div>
+    <div class="foot-button"> -->
       <el-button type="danger" @click="handleBack">返回</el-button>
     </div>
+    
   </div>
 </template>
 
@@ -398,8 +401,8 @@ export default {
         { value: "2", name: "进口" },
       ],
       iFjcData: [
-        { value: "0", name: "是" },
-        { value: "1", name: "否" },
+        { value: "1", name: "是" },
+        { value: "0", name: "否" },
       ],
       mcsTypeData: [
         { value: "0", name: "普通耗材" },
@@ -425,8 +428,8 @@ export default {
         { value: "非灭菌", name: "非灭菌" },
       ],
       isPubData: [
-        { value: "0", name: "挂网" },
-        { value: "1", name: "非挂网" },
+        { value: "1", name: "挂网" },
+        { value: "0", name: "非挂网" },
       ],
       purcUntData:[
         { value: "包", name: "包" },
@@ -453,7 +456,7 @@ export default {
     }else if(this.$route.query.status=="D"){
       this.reaDiv = true
     }
-    if(this.$route.query.isPub=='1'){
+    if(this.$route.query.isPub=='0'){
       this.isShow =false
     }else{
       this.isShow =true
@@ -507,7 +510,9 @@ export default {
         .then(() => {
           this.saveLoad = true;
           this.infoData.isPub=this.$route.query.isPub,
+          this.infoData.opeType=this.$route.query.opeType,
           this.infoData.status = "A";
+          // this.infoData.opeType = "修改"
           insertSplerMcsList(this.infoData)
             .then((response) => {
               this.$message({

+ 3 - 3
src/views/page/consumCataManage-sup/catalogdetailsadd.vue

@@ -332,7 +332,7 @@ export default {
         prodEntp: "",
         purcPric: null,
         status:"",
-        isPub:"1",
+        isPub:"0",
        },
       listLoading: false,
       planForm: {},
@@ -341,8 +341,8 @@ export default {
         { value: "2", name: "进口" },
       ],
       iFjcData: [
-        { value: "0", name: "是" },
-        { value: "1", name: "否" },
+        { value: "1", name: "是" },
+        { value: "0", name: "否" },
       ],
       mcsTypeData: [
         { value: "0", name: "普通耗材" },

+ 16 - 16
src/views/page/consumCataManage-sup/distributionmanage.vue

@@ -142,17 +142,17 @@
         <el-table-column label="材质" prop="matl" width="80" />
         <el-table-column label="是否集采" prop="isFas" width="80">
           <template #default="{ row }">
-            <span v-if="row.isFas == '1'">否</span>
-            <span v-if="row.isFas == '0'">是</span>
+            <span v-if="row.isFas == '0'">否</span>
+            <span v-if="row.isFas == '1'">是</span>
           </template>
         </el-table-column>
+        <el-table-column label="生效时间" prop="crteTime" width="130" />
         <el-table-column label="采购单位" prop="purcUnt" width="80" />
         <el-table-column label="采购价" prop="purcPric" width="80" />
-        <!-- <el-table-column label="驳回原因" prop="rejtRea" width="80" /> -->
         <el-table-column label="目录来源" prop="isPub" width="80" fixed="right">
           <template #default="{ row }">
-            <span v-if="row.isPub == '0'">挂网</span>
-            <span v-if="row.isPub == '1'">非挂网</span>
+            <span v-if="row.isPub == '1'">挂网</span>
+            <span v-if="row.isPub == '0'">非挂网</span>
           </template>
         </el-table-column>
         <!-- <el-table-column label="当前状态" prop="status" width="80" fixed="right">
@@ -363,8 +363,8 @@
           <el-table-column prop="pubonlnPric" label="挂网价格"> </el-table-column>
           <el-table-column prop="isFas" label="是否集采">
             <template #default="{ row }">
-              <span v-if="row.isFas == '1'">否</span>
-              <span v-if="row.isFas == '0'">是</span>
+              <span v-if="row.isFas == '0'">否</span>
+              <span v-if="row.isFas == '1'">是</span>
             </template>
           </el-table-column>
           <el-table-column prop="fasBtch" label="带量批次"> </el-table-column>
@@ -519,13 +519,13 @@ export default {
       tableLoading: false,
       supLoading: false,
       tableData: [],
-      crspFlgOption: [
-        { value: "0", name: "未对码" },
-        { value: "1", name: "已对码" },
-      ],
+      // crspFlgOption: [
+      //   { value: "0", name: "未对码" },
+      //   { value: "1", name: "已对码" },
+      // ],
       isFasData: [
-        { value: "0", name: "是" },
-        { value: "1", name: "否" },
+        { value: "1", name: "是" },
+        { value: "0", name: "否" },
       ],
       mcsTypeData: [
         { value: "0", name: "普通耗材" },
@@ -543,8 +543,8 @@ export default {
         { value: "R", name: "驳回" },
       ],
       isPubData: [
-        { value: "0", name: "挂网" },
-        { value: "1", name: "非挂网" },
+        { value: "1", name: "挂网" },
+        { value: "0", name: "非挂网" },
       ],
       dialogPrice: false,
       dialogDui: false,
@@ -896,7 +896,7 @@ export default {
       // console.log(row, "编辑");
       this.$router.push({
         name: "catalogdetails",
-        query: { id: row.id, status: row.status, spdId: this.spdId, isPub: row.isPub,type:"modify",page:"1" ,current:this.listQuery.current },
+        query: { id: row.id, status: row.status, spdId: this.spdId, isPub: row.isPub,type:"modify",page:"1" ,current:this.listQuery.current,opeType:"修改" },
       });
       // this.dialogDui = true;
       // this.consumableData = [];

+ 16 - 14
src/views/page/consumCataManage-sup/index.vue

@@ -129,8 +129,8 @@
         <el-table-column label="材质" prop="matl" width="80" />
         <el-table-column label="是否集采" prop="isFas" width="80">
           <template #default="{ row }">
-            <span v-if="row.isFas == '1'">否</span>
-            <span v-if="row.isFas == '0'">是</span>
+            <span v-if="row.isFas == '0'">否</span>
+            <span v-if="row.isFas == '1'">是</span>
           </template>
         </el-table-column>
         <el-table-column label="采购单位" prop="purcUnt" width="80" />
@@ -138,10 +138,12 @@
         <el-table-column label="驳回原因" prop="rejtRea" width="80" />
         <el-table-column label="目录来源" prop="isPub" width="80" fixed="right">
           <template #default="{ row }">
-            <span v-if="row.isPub == '0'">挂网</span>
-            <span v-if="row.isPub == '1'">非挂网</span>
+            <span v-if="row.isPub == '1'">挂网</span>
+            <span v-if="row.isPub == '0'">非挂网</span>
           </template>
         </el-table-column>
+        <!-- <el-table-column label="保存时间" prop="rejtRea" width="80" />
+        <el-table-column label="提交时间" prop="rejtRea" width="80" /> -->
         <el-table-column label="操作类型" prop="opeType" width="80" fixed="right">
         </el-table-column>
         <el-table-column label="当前状态" prop="status" width="80" fixed="right">
@@ -351,8 +353,8 @@
           </el-table-column>
           <el-table-column prop="isFas" label="是否集采">
             <template #default="{ row }">
-              <span v-if="row.isFas == '1'">否</span>
-              <span v-if="row.isFas == '0'">是</span>
+              <span v-if="row.isFas == '0'">否</span>
+              <span v-if="row.isFas == '1'">是</span>
             </template>
           </el-table-column>
           <el-table-column prop="fasBtch" label="带量批次"> </el-table-column>
@@ -449,13 +451,13 @@ export default {
       tableLoading: false,
       supLoading: false,
       tableData: [],
-      crspFlgOption: [
-        { value: "0", name: "未对码" },
-        { value: "1", name: "已对码" },
-      ],
+      // crspFlgOption: [
+      //   { value: "0", name: "未对码" },
+      //   { value: "1", name: "已对码" },
+      // ],
       isFasData: [
-        { value: "0", name: "是" },
-        { value: "1", name: "否" },
+        { value: "1", name: "是" },
+        { value: "0", name: "否" },
       ],
       mcsTypeData: [
         { value: "0", name: "普通耗材" },
@@ -473,8 +475,8 @@ export default {
         { value: "R", name: "驳回" },
       ],
       isPubData: [
-        { value: "0", name: "挂网" },
-        { value: "1", name: "非挂网" },
+        { value: "1", name: "挂网" },
+        { value: "0", name: "非挂网" },
       ],
       dialogPrice: false,
       dialogDui: false,

+ 23 - 2
src/views/page/orderManage-sup/orthOpedicDelivery/index.vue

@@ -13,7 +13,12 @@
         @node-click="handleNodeClick"
         default-expand-all="true"
         style="margin-top:10px;"
-      ></el-tree>
+      >
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+          <div>{{node.label}}</div>
+          <div class="redTit">{{data.wcknum}}</div> 
+        </span>
+      </el-tree>
     </el-card>
   <div class="right-common-box">
     <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -360,4 +365,20 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.custom-tree-node{
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+.custom-tree-node ::v-deep .redTit{
+  min-width: 30px;
+  background-color: #f56c6c;
+  min-height: 1px;
+  border-radius: 10px;
+  text-align: center;
+  margin-left: 10px;
+  padding: 1px;
+  color: #fff;
+}
+</style>

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

@@ -13,7 +13,12 @@
         @node-click="handleNodeClick"
         default-expand-all="true"
         style="margin-top:10px;"
-      ></el-tree>
+      >
+       <span class="custom-tree-node" slot-scope="{ node, data }">
+          <div>{{node.label}}</div>
+          <div class="redTit">{{data.wslnum}}</div> 
+        </span>
+      </el-tree>
     </el-card>
     <div class="right-common-box">
       <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -426,4 +431,19 @@ export default {
 .right-common-box ::v-deep .el-table__fixed-right {
   height: 100% !important;
 }
+.custom-tree-node{
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+.custom-tree-node ::v-deep .redTit{
+  min-width: 30px;
+  background-color: #f56c6c;
+  min-height: 1px;
+  border-radius: 10px;
+  text-align: center;
+  margin-left: 10px;
+  padding: 1px;
+  color: #fff;
+}
 </style>

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

@@ -13,7 +13,12 @@
         @node-click="handleNodeClick"
         default-expand-all="true"
         style="margin-top:10px;"
-      ></el-tree>
+      >
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+          <div>{{node.label}}</div>
+          <div class="redTit">{{data.wcknum}}</div> 
+        </span>
+      </el-tree>
     </el-card>
   <div class="right-common-box">
     <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -447,4 +452,20 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.custom-tree-node{
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+.custom-tree-node ::v-deep .redTit{
+  min-width: 30px;
+  background-color: #f56c6c;
+  min-height: 1px;
+  border-radius: 10px;
+  text-align: center;
+  margin-left: 10px;
+  padding: 1px;
+  color: #fff;
+}
+</style>