导出

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/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();