Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

package.json

@@ -43,6 +43,7 @@
     "clipboard": "^1.7.1",
     "codemirror": "5.32.0",
     "connect": "3.6.6",
+    "cross-spawn": "^7.0.6",
     "default-passive-events": "^2.0.0",
     "driver.js": "0.5.2",
     "dropzone": "5.2.0",
@@ -115,6 +116,7 @@
     "html-webpack-plugin": "2.30.1",
     "lint-staged": "7.2.0",
     "node-notifier": "5.1.2",
+    "node-sass": "^4.14.1",
     "optimize-css-assets-webpack-plugin": "3.2.0",
     "ora": "1.3.0",
     "portfinder": "1.0.13",

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -3113,6 +3113,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '17:30'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10745){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '17:30'
+            }
            }else if (this.$store.getters.xt_user.org.id == 10551){
             var date = new Date()
             var year = date.getFullYear()

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1454,7 +1454,7 @@
                           <td width="50" v-if="org_id == 9671">在线尿素监测</td>
                           <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">血容量<br />(L)</td>
                           <td width="50" v-if="org_id == 10490">碳酸氢钠<br />(ml)</td>
-                          <td width="50" v-if="org_id == 10598">护士签名</td>
+                          <td width="50" v-if="org_id == 10598 || org_id == 10726">护士签名</td>
                           <td width="50" v-if="org_id == 9829">SpO₂<br />(%)</td>
                           <td width="200">病情变化及处理</td>
                         </tr>
@@ -1663,7 +1663,7 @@
                           <td width="50" v-if="org_id == 10490">
                             {{ monitor.dicarbonate ? monitor.dicarbonate : "" }}
                           </td>
-                          <td width="50" v-if="org_id == 10598">
+                          <td width="50" v-if="org_id == 10598 || org_id == 10726">
                             <span v-if="monitor.creator == 0">
                               <span v-if="setAdminUserES(monitor.modify) == ''">{{ getAdminUser(monitor.modify)
                                 }}</span>

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -844,6 +844,7 @@ export default {
     exportListDetai(){
       console.log("hwhhwhwhwhwhw",this.tableData)
      
+     
       import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','使用人','数量','总价']
        const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','manufacturer_name','dealer_name','number_bath','product_date_name','expiry_date_name','time','user_name','in_price','price','patient_name','count','total_price']
@@ -892,18 +893,25 @@ export default {
               if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit ==this.tableData[i].min_unit){
                 this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
               }
+            }
 
-              this.tableData[i].number_bath =""
-              this.tableData[i].number_bath =  this.tableData[i].batch_number
+            this.tableData[i].number_bath =""
+            this.tableData[i].number_bath =  this.tableData[i].batch_number
 
-              this.tableData[i].expiry_date_name = this.getTime(this.tableData[i].expiry_date)
+            console.log("批次额",this.tableData[i].number_bath)
 
-              this.tableData[i].product_date_name = this.getTime(this.tableData[i].product_date)
-            }
+            this.tableData[i].expiry_date_name = this.getTime(this.tableData[i].expiry_date)
+
+            console.log("经销商",this.tableData[i].expiry_date_name)
+
+            this.tableData[i].product_date_name = this.getTime(this.tableData[i].product_date)
+
+            console.log("生产日期",this.tableData[i].product_date_name)
          }
        }
-      
-      
+
+       console.log("tabldateData",this.tableData)
+     
        const data = this.formatJson(filterVal, this.tableData)
 
 
@@ -954,6 +962,18 @@ export default {
             }
             
          }
+         this.tableData[i].number_bath =""
+        this.tableData[i].number_bath =  this.tableData[i].batch_number
+
+        console.log("批次额",this.tableData[i].number_bath)
+
+        this.tableData[i].expiry_date_name = this.getTime(this.tableData[i].expiry_date)
+
+        console.log("经销商",this.tableData[i].expiry_date_name)
+
+        this.tableData[i].product_date_name = this.getTime(this.tableData[i].product_date)
+
+        console.log("生产日期",this.tableData[i].product_date_name)
        }
        const data = this.formatJson(filterVal, this.tableData)
 
@@ -1101,6 +1121,7 @@ export default {
            
             this.dealerList = response.data.data.dealerList
             this.manufacturerList = response.data.data.manufacturerList
+            console.log("生产昌吉-----------",this.manufacturerList)
             let objInfo = {}
             if(this.org_id == 9919){
               list.forEach((item,index)=>{

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -316,16 +316,18 @@
             </span>
           </template>
         </el-table-column>
-        <!-- <el-table-column label="拆零零售价" align="center">
-          <template slot-scope="scope">
-            {{scope.row.retail_price}}
-          </template>
-        </el-table-column> -->
+      
         <el-table-column label="进货价" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0">{{ scope.row.price }}</span> 
           </template>
         </el-table-column>
+
+        <el-table-column label="拆零零售价" align="center">
+          <template slot-scope="scope">
+            {{scope.row.retail_price}}
+          </template>
+        </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             <!-- {{scope.row.total_price}} -->

src/xt_pages/stock/stockInOrder.vue

@@ -71,23 +71,7 @@
             @change="endTimeChange"
           ></el-date-picker>
         </div>
-        <!-- <div style="margin-left: 10px">
-          <span>审核状态:</span>
-          <el-select
-            v-model="check_id"
-            style="width: 140px; margin-right: 10px"
-            placeholder="请选择"
-            @change="changeTypeName"
-          >
-            <el-option
-              v-for="item in checkList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </div> -->
+       
 
       </div>
 
@@ -294,11 +278,7 @@
            <span v-if="scope.row.is_total == 0">{{ scope.row.warehousing_count}}{{scope.row.GoodInfo.packing_unit}} </span> 
           </template>
         </el-table-column>
-         <!-- <el-table-column label="零售价" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.packing_price}}
-          </template>
-        </el-table-column> -->
+       
         <el-table-column label="进货价" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0">
@@ -306,6 +286,12 @@
             </span> 
           </template>
         </el-table-column>
+
+        <el-table-column label="零售价" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.packing_price}}
+          </template>
+        </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total==0">

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
 //  // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))