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

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  // BASE_API: '"http://api.xt.test.sgjyun.com"',
-  BASE_API: '"http://localhost:9531"',
+  BASE_API: '"http://api.xt.test.sgjyun.com"',
+  // BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
      // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    // host: 'xt.test.sgjyun.com',
-    host: 'localhost',
+    host: 'xt.test.sgjyun.com',
+    // host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/data/components/addDrugs.vue

@@ -208,9 +208,22 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="代理商 : " prop="agent">
+            <!-- <el-form-item label="代理商 : " prop="agent">
               <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
-            </el-form-item>
+            </el-form-item> -->
+
+          <el-form-item label="经销商 : " prop="manufacturer" style="width:100%">
+             
+               <el-select v-model="form.dealer" style="width:100%;" filterable placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in dealer"
+                    :key="index"
+                    :label="item.dealer_name"
+                    :value="item.id">
+                  </el-option>
+              </el-select>
+           </el-form-item>
+
             <el-form-item label=""  style="display:none;">
               <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
@@ -343,7 +356,7 @@
   import {
     getAdviceConfig,
   } from '@/api/advice'
- import { getManufacturerList } from "@/api/stock";
+ import { getManufacturerList,GetAllConfig } from "@/api/stock";
   export default {
     data() {
       return {
@@ -414,6 +427,7 @@
           is_statistics_work: '',//是否统计工作量
           is_charge_use: '',//是否收费常用项
           drug_code:'',
+          dealer:'',
         },
 
         rules: {
@@ -436,7 +450,8 @@
         },
         page:1,
         limit:500,
-        manufacturerList:[]
+        manufacturerList:[],
+        dealer:[]
       }
     },
     props: {
@@ -599,6 +614,17 @@
            console.log("列表2222222",manufacturerList)
            this.manufacturerList = manufacturerList
         })
+      },
+       GetAllConfig(){
+        GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.dealer = response.data.data.dealer;
+          console.log("经销商",this.dealer)
+        }
+       });
       }
     }, watch: {
       visible(val) {
@@ -608,6 +634,8 @@
     },
     created(){
       this.getlist()
+     //获取所有经销商
+      this.GetAllConfig()
     }
   }
 </script>

src/xt_pages/device/airDisinfect.vue

@@ -385,7 +385,7 @@
                    check_out:parseInt(this.form.check_out),
                    modifications:parseInt(this.form.modifications),
                  }
-                 console.log("params",params)
+                //  console.log("params",params)
                 
                saveAirDisinfect(params).then(response=>{
                   if(response.data.state == 1){

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -2043,7 +2043,11 @@ export default {
 
           this.records = this.records.concat(resp.data.schedules);
 
-          console.log("记录", this.records);
+
+          for (const index in this.records) {
+            this.records[index].advices = this.records[index].advices.concat(this.records[index].his_advices)
+          }
+
 
           for (const recordIndex in this.records) {
             var dlegh = 0;

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

@@ -2193,9 +2193,11 @@
         }
 
         if (row.advice_desc) {
-          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')'
+          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')' + " " + row.remark
         }
 
+
+
         if (isChild == 1) {
           // 不是子药
 

src/xt_pages/dialysis/details/index.vue

@@ -1138,6 +1138,7 @@ export default {
           var prepare = resp.data.prepare
           this.preparestock = prepare
           console.log("prepare222222",prepare)
+
           for (let i = 0; i <  this.doctor_advices.length; i++){
             this.doctor_advices[i]['origin'] = 1
           }
@@ -1150,6 +1151,14 @@ export default {
             }
           }
 
+          const obj = {}
+          this.doctor_advices = this.doctor_advices.reduce((cur, next) => {
+            obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
+            return cur
+          }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+          console.log(this.doctor_advices)
+
 
           var device_map = {}
           for (let index = 0; index < this.devices.length; index++) {

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -513,7 +513,7 @@
                             <span>{{prescription.dialysis_dialyszers}}</span>
                             <span v-if="prescription.dialysis_irrigation!=''">/{{prescription.dialysis_irrigation}}</span>
                           </span>
-                        &nbsp;<span else>{{ prescription.dialyzer_perfusion_apparatus }}</span> 
+                        &nbsp;<span else>{{ prescription.dialyzer_perfusion_apparatus }}</span>
                       </div>
                     </td>
                   </tr>
@@ -531,7 +531,7 @@
 
                     <td width="70">医生签名:</td>
                     <td width="100">
-                     
+
                       <div class="under-line" v-if="org_id == 9987">
                          <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater)) }} </span>
                          <img class="es-img" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
@@ -633,7 +633,7 @@
             <td>
               &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
             </td>
-          
+
           </tr>
         </tbody>
       </table>
@@ -1384,7 +1384,10 @@ export default {
             this.AlPanel = this.anticoagulantsConfit[thisALID]
           }
 
-          this.advices = response.data.data.advices
+          // this.advices = response.data.data.advices
+
+          this.advices =  response.data.data.advices.concat(response.data.data.doctorAdvice)
+
           this.monitors = response.data.data.monitors
           this.summary = response.data.data.summary
           this.org_template_info = response.data.data.org_template_info
@@ -1631,7 +1634,7 @@ export default {
     this.precaution_arr = getDataConfig('hemodialysis', 'precaution')
     this.intake_arr = getDataConfig('hemodialysis', 'intake')
     this.nutrition_arr = getDataConfig('hemodialysis', 'nutrition')
-   
+
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
 
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -21,9 +21,9 @@
             </el-radio>
             <el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人
             </el-radio>
-            <el-radio :label=3>已退费<span
-              style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人
-            </el-radio>
+            <!--<el-radio :label=3>已退费<span-->
+              <!--style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人-->
+            <!--</el-radio>-->
             <el-radio :label=4>全部</el-radio>
 
           </el-radio-group>
@@ -68,18 +68,18 @@
           <!--</el-button>-->
 
 
-          <el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"
-                     @click="open(20)"
-                     type="primary">预结算！
-          </el-button>
+          <!--<el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"-->
+                     <!--@click="open(20)"-->
+                     <!--type="primary">预结算！-->
+          <!--</el-button>-->
 
-          <el-button v-loading="loadingtwo" v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1 " size="small"
-                     @click="open(21)"
-                     type="primary">收费！
-          </el-button>
+          <!--<el-button v-loading="loadingtwo" v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1 ||  this.order.order_status == 3" size="small"-->
+                     <!--@click="open(21)"-->
+                     <!--type="primary">收费！-->
+          <!--</el-button>-->
 
 
-          <el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"
+          <el-button v-loading="loadingtwo" v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1 ||  this.order.order_status == 3" size="small"
                      @click="open(4)"
                      type="primary">收费
           </el-button>
@@ -101,7 +101,7 @@
           <!--<el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(8)" type="primary"-->
           <!--&gt;明细对账-->
           <!--</el-button>-->
-          <el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(9)" type="primary"
+          <el-button v-if="this.order.order_status == 2" size="small" @click="open(9)" type="primary"
           >结算单
           </el-button>
 
@@ -126,9 +126,9 @@
           <!--&gt;查待遇-->
           <!--</el-button>-->
 
-          <!--<el-button  size="small" @click="query" type="primary"-->
-          <!--&gt;查询-->
-          <!--</el-button>-->
+          <el-button  size="small" @click="query" type="primary"
+          >查询
+          </el-button>
 
 
         </div>
@@ -481,7 +481,7 @@
     },
     methods: {
       query() {
-        if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 3877) {
+        if (this.$store.getters.xt_user.org_id == 9919) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/org/info', {
             params: {}
@@ -570,7 +570,7 @@
         this.loadingtwo = true
         if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
           var that = this
-          axios.get('http://127.0.0.1:9532/api/settle/get', {
+          axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form
           })
             .then(function(response) {
@@ -659,20 +659,14 @@
                     let three_count = 0
                     for (let i = 0; i < response.data.data.list.length; i++) {
                       that.all_table_data.push(response.data.data.list[i])
-                      if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1) {
+                      if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                         one_count = one_count + 1
                         that.patientTableData.push(response.data.data.list[i])
                       }
-
                       if (response.data.data.list[i].order.order_status == 2) {
                         two_count = two_count + 1
                         that.patientTableData.push(response.data.data.list[i])
                       }
-
-                      if (response.data.data.list[i].order.order_status == 3) {
-                        three_count = three_count + 1
-                        that.patientTableData.push(response.data.data.list[i])
-                      }
                     }
                     that.hisPatientDatas = response.data.data.list_two
                     that.cal_one = one_count
@@ -849,7 +843,7 @@
             let three_count = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.all_table_data.push(response.data.data.list[i])
-              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1) {
+              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                 one_count = one_count + 1
               }
 
@@ -857,9 +851,9 @@
                 two_count = two_count + 1
               }
 
-              if (response.data.data.list[i].order.order_status == 3) {
-                three_count = three_count + 1
-              }
+              // if (response.data.data.list[i].order.order_status == 3) {
+              //   three_count = three_count + 1
+              // }
             }
 
             switch (this.radio) {
@@ -940,7 +934,7 @@
 
             for (let i = 0; i < response.data.data.list_two.length; i++) {
               this.hisPatientDatas.push(response.data.data.list_two[i])
-              if (response.data.data.list_two[i].order.order_status == 0 || response.data.data.list_two[i].order.order_status == 1) {
+              if (response.data.data.list_two[i].order.order_status == 0 || response.data.data.list_two[i].order.order_status == 1 || response.data.data.list_two[i].order.order_status == 3) {
                 one_count = one_count + 1
               }
 
@@ -948,16 +942,16 @@
                 two_count = two_count + 1
               }
 
-              if (response.data.data.list_two[i].order.order_status == 3) {
-                three_count = three_count + 1
-              }
+              // if (response.data.data.list_two[i].order.order_status == 3) {
+              //   three_count = three_count + 1
+              // }
             }
             switch (this.radio) {
               case 1:
                 this.patientTableData = []
 
                 for (let i = 0; i < this.hisPatientDatas.length; i++) {
-                  if (this.hisPatientDatas[i].order.order_status == 0 || this.hisPatientDatas[i].order.order_status == 1) {
+                  if (this.hisPatientDatas[i].order.order_status == 0 || this.hisPatientDatas[i].order.order_status == 1 || this.hisPatientDatas[i].order.order_status == 3) {
                     this.patientTableData.push(this.hisPatientDatas[i])
                   }
 
@@ -972,15 +966,14 @@
 
                 }
                 break
-              case 3:
-                this.patientTableData = []
-                for (let i = 0; i < this.hisPatientDatas.length; i++) {
-                  if (this.hisPatientDatas[i].order.order_status == 3) {
-                    this.patientTableData.push(this.hisPatientDatas[i])
-                  }
-
-                }
-                break
+              // case 3:
+              //   this.patientTableData = []
+              //   for (let i = 0; i < this.hisPatientDatas.length; i++) {
+              //     if (this.hisPatientDatas[i].order.order_status == 3) {
+              //       this.patientTableData.push(this.hisPatientDatas[i])
+              //     }
+              //   }
+              //   break
               case 4:
                 this.patientTableData = []
                 this.patientTableData = this.hisPatientDatas
@@ -1702,7 +1695,7 @@
 
               for (let i = 0; i < response.data.data.list.length; i++) {
                 this.all_table_data.push(response.data.data.list[i])
-                if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1) {
+                if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                   one_count = one_count + 1
                 }
 
@@ -1710,9 +1703,9 @@
                   two_count = two_count + 1
                 }
 
-                if (response.data.data.list[i].order.order_status == 3) {
-                  three_count = three_count + 1
-                }
+                // if (response.data.data.list[i].order.order_status == 3) {
+                //   three_count = three_count + 1
+                // }
               }
 
             } else { //月结
@@ -1854,7 +1847,7 @@
             let three_count = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.all_table_data.push(response.data.data.list[i])
-              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1) {
+              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                 one_count = one_count + 1
               }
 
@@ -1862,9 +1855,9 @@
                 two_count = two_count + 1
               }
 
-              if (response.data.data.list[i].order.order_status == 3) {
-                three_count = three_count + 1
-              }
+              // if (response.data.data.list[i].order.order_status == 3) {
+              //   three_count = three_count + 1
+              // }
             }
 
             switch (this.radio) {
@@ -1873,7 +1866,7 @@
                 this.patientTableData = []
 
                 for (let i = 0; i < this.all_table_data.length; i++) {
-                  if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1) {
+                  if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1 || this.all_table_data[i].order.order_status == 3) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
 

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -131,7 +131,7 @@
               </el-checkbox-group>
             </el-form-item>
 
-           <el-form-item label="经销商 : " prop="manufacturer" style="width:100%">
+           <!-- <el-form-item label="经销商 : " prop="manufacturer" style="width:100%">
              
                <el-select v-model="form.dealer" style="width:100%;" filterable placeholder="请选择">
                   <el-option
@@ -141,7 +141,7 @@
                     :value="item.id">
                   </el-option>
               </el-select>
-           </el-form-item>
+           </el-form-item> -->
 
 
             <el-form-item label="备注 : " prop="name" style="width:100%;">
@@ -483,7 +483,7 @@
           return false;
         } else {
           this.dealer = response.data.data.dealer;
-          console.log("经销傻姑娘",this.dealer)
+          
         }
        });
       }

src/xt_pages/stock/cancelStockOrder.vue

@@ -199,26 +199,26 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    // this.start_time =
-    //   nowYear +
-    //   "-" +
-    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-    //   "-" +
-    //   (nowDay < 10 ? "0" + nowDay : nowDay);
-    var date1 = new Date();
-    var date2 = new Date(date1);
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // var date1 = new Date();
+    // var date2 = new Date(date1);
 
-    //-30为30天前，+30可以获得30天后的日期
-    date2.setDate(date1.getDate() - 30);
+    // //-30为30天前，+30可以获得30天后的日期
+    // date2.setDate(date1.getDate() - 30);
 
-    //30天前（月份判断是否小于10，小于10的前面+0）
-    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+    // //30天前（月份判断是否小于10，小于10的前面+0）
+    // var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
       
-    //当前日期
-    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+    // //当前日期
+    // var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
-     this.start_time = agoDay
-     console.log("333333332222",this.start_time)
+    //  this.start_time = agoDay
+    //  console.log("333333332222",this.start_time)
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -201,27 +201,27 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    // this.start_time =
-    //   nowYear +
-    //   "-" +
-    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-    //   "-" +
-    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
    
-    var date1 = new Date();
-    var date2 = new Date(date1);
+    // var date1 = new Date();
+    // var date2 = new Date(date1);
 
-    //-30为30天前，+30可以获得30天后的日期
-    date2.setDate(date1.getDate() - 30);
+    // //-30为30天前，+30可以获得30天后的日期
+    // date2.setDate(date1.getDate() - 30);
 
-    //30天前（月份判断是否小于10，小于10的前面+0）
-    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+    // //30天前（月份判断是否小于10，小于10的前面+0）
+    // var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
       
-    //当前日期
-    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+    // //当前日期
+    // var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
-     this.start_time = agoDay
-     console.log("333333332222",this.start_time)
+    //  this.start_time = agoDay
+    //  console.log("333333332222",this.start_time)
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/drugs/drugSalesReturnOrder.vue

@@ -197,27 +197,27 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    // this.start_time =
-    //   nowYear +
-    //   "-" +
-    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-    //   "-" +
-    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
     
-    var date1 = new Date();
-    var date2 = new Date(date1);
+    // var date1 = new Date();
+    // var date2 = new Date(date1);
 
-    //-30为30天前，+30可以获得30天后的日期
-    date2.setDate(date1.getDate() - 30);
+    // //-30为30天前，+30可以获得30天后的日期
+    // date2.setDate(date1.getDate() - 30);
 
-    //30天前（月份判断是否小于10，小于10的前面+0）
-    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+    // //30天前（月份判断是否小于10，小于10的前面+0）
+    // var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
       
-    //当前日期
-    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+    // //当前日期
+    // var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
-     this.start_time = agoDay
-     console.log("333333332222",this.start_time)
+    //  this.start_time = agoDay
+    //  console.log("333333332222",this.start_time)
     this.GetSalesReturn();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -315,27 +315,27 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    // this.start_time =
-    //   nowYear +
-    //   "-" +
-    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-    //   "-" +
-    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
     
-    var date1 = new Date();
-    var date2 = new Date(date1);
+    // var date1 = new Date();
+    // var date2 = new Date(date1);
 
-    //-30为30天前，+30可以获得30天后的日期
-    date2.setDate(date1.getDate() - 30);
+    // //-30为30天前，+30可以获得30天后的日期
+    // date2.setDate(date1.getDate() - 30);
 
-    //30天前（月份判断是否小于10，小于10的前面+0）
-    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+    // //30天前（月份判断是否小于10，小于10的前面+0）
+    // var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
       
-    //当前日期
-    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+    // //当前日期
+    // var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
-     this.start_time = agoDay
-     console.log("333333332222",this.start_time)
+    //  this.start_time = agoDay
+    //  console.log("333333332222",this.start_time)
     this.GetWarehouse();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -379,26 +379,26 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    // this.start_time =
-    //   nowYear +
-    //   "-" +
-    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-    //   "-" +
-    //   (nowDay < 10 ? "0" + nowDay : nowDay);
-       var date1 = new Date();
-    var date2 = new Date(date1);
-
-    //-30为30天前，+30可以获得30天后的日期
-    date2.setDate(date1.getDate() - 30);
-
-    //30天前（月份判断是否小于10，小于10的前面+0）
-    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    //    var date1 = new Date();
+    // var date2 = new Date(date1);
+
+    // //-30为30天前，+30可以获得30天后的日期
+    // date2.setDate(date1.getDate() - 30);
+
+    // //30天前（月份判断是否小于10，小于10的前面+0）
+    // var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
       
-    //当前日期
-    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+    // //当前日期
+    // var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
-     this.start_time = agoDay
-     console.log("333333332222",this.start_time)
+    //  this.start_time = agoDay
+    //  console.log("333333332222",this.start_time)
     this.GetWarehouseOut();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/salesReturnOrder.vue

@@ -198,27 +198,27 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    // this.start_time =
-    //   nowYear +
-    //   "-" +
-    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-    //   "-" +
-    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
     
-    var date1 = new Date();
-    var date2 = new Date(date1);
+    // var date1 = new Date();
+    // var date2 = new Date(date1);
 
-    //-30为30天前，+30可以获得30天后的日期
-    date2.setDate(date1.getDate() - 30);
+    // //-30为30天前，+30可以获得30天后的日期
+    // date2.setDate(date1.getDate() - 30);
 
-    //30天前（月份判断是否小于10，小于10的前面+0）
-    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+    // //30天前（月份判断是否小于10，小于10的前面+0）
+    // var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
       
-    //当前日期
-    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+    // //当前日期
+    // var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
-     this.start_time = agoDay
-     console.log("333333332222",this.start_time)
+    //  this.start_time = agoDay
+    //  console.log("333333332222",this.start_time)
     this.GetSalesReturn();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/stockInOrder.vue

@@ -589,28 +589,28 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    // this.start_time =
-    //   nowYear +
-    //   "-" +
-    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-    //   "-" +
-    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
      
   
-    var date1 = new Date();
-    var date2 = new Date(date1);
+    // var date1 = new Date();
+    // var date2 = new Date(date1);
 
-    //-30为30天前，+30可以获得30天后的日期
-    date2.setDate(date1.getDate() - 30);
+    // //-30为30天前，+30可以获得30天后的日期
+    // date2.setDate(date1.getDate() - 30);
 
-    //30天前（月份判断是否小于10，小于10的前面+0）
-    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+    // //30天前（月份判断是否小于10，小于10的前面+0）
+    // var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
       
-    //当前日期
-    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+    // //当前日期
+    // var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
-     this.start_time = agoDay
-     console.log("333333332222",this.start_time)
+    //  this.start_time = agoDay
+    //  console.log("333333332222",this.start_time)
 
       // this.warehousing_time =
       //   nowYear +

src/xt_pages/stock/stockOutOrder.vue

@@ -554,26 +554,26 @@ export default {
 
 
       
-    var date1 = new Date();
-    var date2 = new Date(date1);
+    // var date1 = new Date();
+    // var date2 = new Date(date1);
 
-    //-30为30天前，+30可以获得30天后的日期
-    date2.setDate(date1.getDate() - 30);
+    // //-30为30天前，+30可以获得30天后的日期
+    // date2.setDate(date1.getDate() - 30);
 
-    //30天前（月份判断是否小于10，小于10的前面+0）
-    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+    // //30天前（月份判断是否小于10，小于10的前面+0）
+    // var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
       
-    //当前日期
-    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
-
-     this.start_time = agoDay
-     console.log("333333332222",this.start_time)
-    // this.start_time =
-    //   nowYear +
-    //   "-" +
-    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-    //   "-" +
-    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    // //当前日期
+    // var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+
+    //  this.start_time = agoDay
+    //  console.log("333333332222",this.start_time)
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
     this.GetConfigInfo();
     this.GetWarehouseOut();