数据

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -111,6 +111,26 @@
   export default {
     name: 'stockIn',
     created() {
+       var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      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 drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -150,6 +150,26 @@
   export default {
     name: 'stockIn',
     created() {
+       var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      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 drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 

src/xt_pages/stock/drugs/query.vue

@@ -7,7 +7,6 @@
           size="small"
           class="filter-item"
           type="primary"
-          icon="el-icon-search"
           @click="setting"
         >设置
         </el-button
@@ -16,7 +15,7 @@
           size="small"
           class="filter-item"
           type="primary"
-          icon="el-icon-search"
+          icon="el-icon-printer"
           @click="printOrder"
         >打印
       </el-button>
@@ -24,7 +23,6 @@
           size="small"
           class="filter-item"
           type="primary"
-          icon="el-icon-search"
           @click="exportStock"
         >导出
         </el-button>
@@ -178,6 +176,26 @@ import { min } from 'moment'
   export default {
     name: 'stockIn',
     created() {
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      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 drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
       var drugTypeList = getDictionaryDataConfig('system','drug_type') 
@@ -538,6 +556,7 @@ import { min } from 'moment'
           start_time:this.start_time,
           end_time:this.end_time,
          }
+         console.log("paramsw2ww",params)
         getDrugCountList(params).then(response=>{
           if(response.data.state == 1){
             var countlist =  response.data.data.countList
@@ -564,7 +583,7 @@ import { min } from 'moment'
         })
       },
       getInCount(id){
-        var count = ""
+        var count = 0
         for(let i=0;i<this.countList.length;i++){
            if(id == this.countList[i].drug_id){
              count = this.countList[i].count
@@ -574,7 +593,7 @@ import { min } from 'moment'
       },
 
       getOutCount(id){
-        var count = ""
+        var count = 0
         for(let i=0;i<this.outCountList.length;i++){
            if(id == this.outCountList[i].drug_id){
                count = this.outCountList[i].count
@@ -583,7 +602,7 @@ import { min } from 'moment'
         return count
       },
       getAutoCount(id){
-        var count= ""
+        var count= 0
         for(let i=0;i<this.autoCountList.length;i++){
           if(id == this.autoCountList[i].drug_id){
             count = this.autoCountList[i].count
@@ -592,7 +611,7 @@ import { min } from 'moment'
         return count
       },
       getMinCount(id){
-        var count=""
+        var count= 0
         for(let i=0;i<this.minCount.length;i++){
           if(id == this.minCount[i].drug_id){
             count = this.minCount[i].count

src/xt_pages/stock/stockBatchNumber.vue

@@ -118,6 +118,26 @@
   export default {
     name: 'stockIn',
     created() {
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      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.getlist()
       this.getStockDrugCount()
       this.packing_unit = this.$route.query.packing_unit

src/xt_pages/stock/stockFlow.vue

@@ -141,7 +141,26 @@
   export default {
     name: 'stockIn',
     created() {
-     
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      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.getlist()
       this.getStockDrugCount()
       this.getStockOutList()
@@ -211,17 +230,20 @@
       },
         
     startTimeChange: function(val) {
+      this.tableList = []
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
       
       if (time > 0) {
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
+        
         this.getlist()
         this.getStockOutList()
       }
     },
     endTimeChange: function(val) {
+      this.tableList = []
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
       if (time < 0) {
         this.$message.error("结束时间不能小于开始时间");

src/xt_pages/stock/stockInOrder.vue

@@ -227,6 +227,11 @@
             {{ getTime(scope.row.expiry_date,"{y}-{m}-{d}")}}
           </template>
         </el-table-column>
+       <el-table-column label="批准文号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.license_number}}
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
             {{ scope.row.remark }}

src/xt_pages/stock/stockInOrderAdd.vue

@@ -186,6 +186,17 @@
 
             </template>
           </el-table-column>
+
+         <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>批准文号</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px">
+                <el-input placeholder="请输入批号" v-model="scope.row.license_number"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
            <el-table-column label="经销商" align="center" width="150">
              <template slot-scope="scope">
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
@@ -512,6 +523,7 @@
         tempObj['good_unit'] = ''
         tempObj['specification_name'] = ''
         tempObj['name'] = ''
+        tempObj['license_number'] = ""
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -679,7 +691,7 @@
               'stockIn': this.recordInfo.recordData
             }
             console.log("stockIn",this.recordInfo.recordData)
-           
+            
             postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -792,6 +804,7 @@
       tempObj['good_name'] = ''
       tempObj['specification_name'] = ''
       tempObj['name'] = ''
+      tempObj['license_number'] = ''
       this.recordInfo.recordData.push(tempObj)
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -46,7 +46,7 @@
                             <tbody>
                                 <tr v-for='(item,index) in it.child' :key="index">
                                     <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
-                                    <td style="line-height:18px;">{{ item.remark }}</td>
+                                    <td style="line-height:18px;">{{ item.license_number }}</td>
                                     <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
                                     <td style="line-height:18px;">{{ getManufacturer(item.good_id) }}</td>
                                     <td style="line-height:18px;"><span v-if="item.good_id!=0">{{item.GoodInfo.packing_unit}}</span></td>
@@ -61,7 +61,7 @@
                                 </tr>
                                 <tr>
                                   <td>合计</td>
-                                  <td colspan="12" style="text-align:right;">{{allPrice.toFixed(2)}}</td>
+                                  <td colspan="12" style="text-align:right;">{{getAllPice(it.id).toFixed(2)}}</td>
                                </tr>
                             </tbody>
                         </table>
@@ -132,7 +132,8 @@ export default {
             orgName:'',
             orgId:'',
             adminUserOptions:[],
-            warehousingInfo:[]
+            warehousingInfo:[],
+            warehousList:[]
         }
     },
     methods:{
@@ -198,6 +199,7 @@ export default {
              console.log("info2222",info)
              var warehousing = response.data.data.warehousing
              console.log("warehousing",warehousing)
+             this.warehousList = info
              for(let i=0;i<warehousing.length;i++){
                 warehousing[i].child = []
               for(let j=0;j<info.length;j++){
@@ -207,11 +209,7 @@ export default {
               }
              }
              this.warehousingInfo = warehousing
-            var total_price = 0
-            for(let i=0;i<info.length;i++){
-               total_price += info[i].warehousing_count * info[i].price   
-            }
-            this.allPrice = total_price
+          
             }
         });
        },
@@ -340,6 +338,15 @@ export default {
         }
         return name;
       },
+      getAllPice(id){
+        var  total_price = 0 
+        for(let i=0;i<this.warehousList.length;i++){
+          if(id == this.warehousList[i].warehousing_id){
+             total_price += this.warehousList[i].warehousing_count * this.warehousList[i].price
+          }
+        }
+        return total_price
+      }
     },
     created(){
       this.orgName = this.$store.getters.xt_user.org.org_name;

src/xt_pages/stock/stockInOrderEdit.vue

@@ -263,6 +263,19 @@
                 value-format="yyyy-MM-dd"
               ></el-date-picker>
             </template>
+          </el-table-column>
+           <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>批准文号</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px">
+                <el-input
+                  placeholder="请输入批号"
+                  v-model="scope.row.license_number"
+                ></el-input>
+              </el-form-item>
+            </template>
           </el-table-column>
           <el-table-column label="经销商" align="center" width="150">
              <template slot-scope="scope">
@@ -511,6 +524,7 @@ export default {
       tempObj["dealer"] = "";
       tempObj["manufacturer"] = "";
       tempObj["number"] = ""
+      tempObj["license_number"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -634,10 +648,10 @@ export default {
               return;
             }
           }
-          console.log("昌吉",this.manufacturerList)
+         
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
-
+            
           for(let j=0;j<this.manufacturerList.length;j++){
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
                   this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
@@ -676,6 +690,7 @@ export default {
       const params = {
         id: order_id
       };
+      console.log("parm2222222222",params)
       getWarehouseInfoList(params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
@@ -699,17 +714,16 @@ export default {
             response.data.data.info[i].packing_unit = response.data.data.info[i].GoodInfo.packing_unit
             
            
-           
             this.recordInfo.recordData.push(response.data.data.info[i]);
            
             console.log("列表",this.recordInfo.recordData)
           }
 
           this.warehouse = response.data.data.warehousing;
-        
-
+          console.log("jhhahfhh",this.warehouse)
+ 
           this.warehousing_time = this.getTime(
-            this.warehouse.warehousing_time,
+            this.warehouse[0].warehousing_time,
             "{y}-{m}-{d}"
           );
 
@@ -726,6 +740,7 @@ export default {
             tempObj["remark"] = "";
             tempObj["dealer"] = "";
             tempObj["manufacturer"] = "";
+            tempObj["license_number"] = ""
             this.recordInfo.recordData.push(tempObj);
           }
         }

src/xt_pages/stock/stockOutOrder.vue

@@ -19,7 +19,7 @@
           style="width: 400px;"
           class="filter-item"
           v-model.trim="searchKey"
-          placeholder="单据编码/制单人/厂商"
+          placeholder="单据编码/制单人/耗材名称"
         />
         <el-button
           size="small"
@@ -108,6 +108,13 @@
             {{ getXuserName(scope.row.creater) }}
           </template>
         </el-table-column>
+
+       <el-table-column label="出库方式" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_sys == 1">自动出库</span>
+            <span v-if="scope.row.is_sys == 0">手动出库</span>
+          </template>
+        </el-table-column>
        
 
         <el-table-column label="操作" align="center" width="300px">
@@ -213,16 +220,21 @@
               {{ getManufactuerName(scope.row.manufacturer)}}
             </template>
           </el-table-column>
-          <!-- <el-table-column label="生产日期" align="center">
+          <el-table-column label="经销商" align="center">
+            <template slot-scope="scope">
+              {{getDealerName(scope.row.dealer) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="生产日期" align="center">
             <template slot-scope="scope">
-              {{ getTime(scope.row.product_date)}}
+              {{ getTime(scope.row.product_date,"{y}-{h}-{d}")}}
             </template>
           </el-table-column>
           <el-table-column label="有效期" align="center">
             <template slot-scope="scope">
-              {{ getTime(scope.row.expiry_date)}}
+              {{ getTime(scope.row.expiry_date,"{y}-{h}-{d}")}}
             </template>
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column label="备注" align="center">
             <template slot-scope="scope">
               {{ scope.row.remark }}
@@ -818,6 +830,7 @@ export default {
           return false;
         } else {
           console.log("parsm",response.data.data)
+          
           this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
             
@@ -936,11 +949,8 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      // this.$router.push({
-      //   name: "stockOutDetail",
-      //   query: { id: row.id, type: this.type,warehouse_out_time:row.warehouse_out_time }
-      // });
-      this.$router.push({path:'/stock/stockoutorderedit?id='+row.id})
+      
+      this.$router.push({path:'/stock/stockoutorderedit?id='+row.id+"&is_sys="+row.is_sys})
        
     },
     handleDelete: function(index, row) {

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -164,15 +164,15 @@
               <span>批号<span style="color: red"></span></span>
             </template>
             <template slot-scope="scope">
-               <!-- <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input> -->
-                <el-select v-model="scope.row.number" filterable placeholder="请选择">
+               <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
+                <!-- <el-select v-model="scope.row.number" filterable placeholder="请选择">
                   <el-option
                     v-for="(item,index) in numberList"
                     :key="index"
                     :label="item.number"
                     :value="item.number">
                   </el-option>
-                </el-select>
+                </el-select> -->
             </template>
           </el-table-column>
 
@@ -266,11 +266,11 @@
 
           <el-table-column label="经销商"  width="150" align="center">
             <template slot-scope="scope">
-               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+               <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
                 <el-option
-                  v-for="(option, index) in manufacturerList"
+                  v-for="(option, index) in dealerList"
                   :key="index"
-                  :label="option.manufacturer_name"
+                  :label="option.dealer_name"
                   :value="option.id">
                 </el-option>
                </el-select>
@@ -488,6 +488,8 @@ export default {
       tempObj["number"] = ""
       tempObj["specification_name"] = ""
       tempObj["number"] = ""
+      tempObj["expiry_date"] = ""
+      tempObj["product_date"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -601,7 +603,15 @@ export default {
             this.$message.success("请添加出库商品");
             return;
           }
+       
           for(let i=0;i<this.recordInfo.recordData.length;i++){
+            if(this.recordInfo.recordData[i].expiry_date == "" || this.recordInfo.recordData[i].expiry_date == undefined){
+              this.recordInfo.recordData[i].expiry_date = ""
+            } 
+            if(this.recordInfo.recordData[i].product_date == "" || this.recordInfo.recordData[i].product_date == undefined){
+              this.recordInfo.recordData[i].product_date = ""
+            }
+           
              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
           }
           for(let i=0;i<this.recordInfo.recordData.length;i++){
@@ -610,6 +620,11 @@ export default {
                  this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
               }
             }
+            for(let z=0;z<this.dealerList.length;z++){
+              if(this.recordInfo.recordData[i].dealer == this.dealerList[z].dealer_name){
+                  this.recordInfo.recordData[i].dealer = this.dealerList[z].id
+              }
+            }
           }
           const params = {
             stockOut: this.recordInfo.recordData
@@ -624,12 +639,25 @@ export default {
             this.type
           ).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
+              // this.$message.error(response.data.msg);
+              this.$message.error("库存不足")
               return false;
             } else {
-              this.$message.success("出库成功");
-              this.recordInfo.recordData = [];
-              this.$router.back(-1);
+               var msg = response.data.data.msg
+               var good_name = response.data.data.good_name
+               var specification_name = response.data.data.specification_name
+               var str = good_name +"*" + specification_name +"无库存,请入库"
+               console.log("msg222222222",msg)
+               if(msg == 1){
+                  this.$message.error(str)
+               }
+               if(msg == 2){
+                 this.$message.success("出库成功");
+                 this.recordInfo.recordData = [];
+                 this.$router.back(-1);
+               }
+             
+             
             }
           });
         } else {
@@ -657,13 +685,22 @@ export default {
             this.goodList = list
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
+            var dealerList =  response.data.data.dealerList
+            this.dealerList = dealerList
             for(let i=0;i<this.goodList.length;i++){
               for(let j=0;j<this.manufacturerList.length;j++){
                 if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
                     this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
                 }
               }
+
+              for(let z=0;z<this.dealerList.length;z++){
+                if(this.goodList[i].dealer == this.dealerList[z].id){
+                   this.goodList[i].dealer = this.dealerList[z].dealer_name
+                }
+              }
             }
+         
           
             cb(this.goodList)
         } else {
@@ -687,6 +724,7 @@ export default {
             this.recordInfo.recordData[i].price = val.buy_price
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
+            this.recordInfo.recordData[i].dealer = val.dealer
          }
       }
 

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -53,7 +53,7 @@
                                 <tr>
                                   <td>合计</td>
                                   <td colspan="7"></td>
-                                  <td>{{allPrice.toFixed(2)}}</td>
+                                  <td>{{getAllPice(it.id).toFixed(2)}}</td>
                                </tr>
                             </tbody>
                         </table>
@@ -326,14 +326,18 @@ export default {
              }
              console.log("详情打印222222",list)
              this.tableList = order
-             var total_price = 0
-             for(let i=0;i<list.length;i++){
-               total_price += response.data.data.list[i].price * response.data.data.list[i].count
-             }
-             this.allPrice =  total_price
            }
         })
      },
+     getAllPice(id){
+        var  total_price = 0 
+        for(let i=0;i<this.orderList.length;i++){
+          if(id == this.orderList[i].warehouse_out_id){
+             total_price += this.orderList[i].count * this.orderList[i].price
+          }
+        }
+        return total_price
+      }
 
     },
     created(){

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -32,30 +32,9 @@
       </div>
 
 
-      <!-- <div class="cell clearfix">
-        <label class="title"><span class="name">经销商</span> : </label>
-        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer" style="width: 200px;">
-          <el-option
-            v-for="(option, index) in dealer"
-            :key="index"
-            :label="option.dealer_name"
-            :value="option.id">
-          </el-option>
-        </el-select>
-      </div> -->
-
-
-      <!-- <div class="cell clearfix">
-        <label class="title"><span class="name">厂商</span> : </label>
-        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer" style="width: 200px;">
-          <el-option
-            v-for="(option, index) in manufacturer"
-            :key="index"
-            :label="option.manufacturer_name"
-            :value="option.id">
-          </el-option>
-        </el-select>
-      </div> -->
+    
+
+
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
@@ -80,6 +59,7 @@
                       @select="handleSelect"
                       @input="changeGoodName(scope.$index)"
                       style="width:150px;"
+                      :disabled="stockShow"
                     >
                       <i class="el-icon-search el-input__icon" slot="suffix"></i>
                     <template slot-scope="{ item }">
@@ -97,6 +77,7 @@
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
                 <el-input
+                 :disabled="stockShow"
                   placeholder="请输入商品类型"
                   v-model="scope.row.good_type_id"
                   :value="typeName(scope.row.good_type_id)"
@@ -112,7 +93,7 @@
             </template>
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
-                <el-input v-model="scope.row.name"></el-input>
+                <el-input v-model="scope.row.name"  :disabled="stockShow"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
@@ -123,19 +104,20 @@
             </template>
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
-               <el-select v-model="scope.row.number" filterable placeholder="请选择">
+                <el-input placeholder="请输入批号" v-model="scope.row.number"  :disabled="stockShow"></el-input>
+               <!-- <el-select v-model="scope.row.number" filterable placeholder="请选择">
                   <el-option
                     v-for="(item,index) in numberList"
                     :key="index"
                     :label="item.number"
                     :value="item.number">
                   </el-option>
-                </el-select>
+                </el-select> -->
               </el-form-item>
             </template>
           </el-table-column>
          
-          <el-table-column min-width="23" align="center">
+          <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>单价<span style="color: red">*</span></span>
             </template>
@@ -143,33 +125,33 @@
               <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
               <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
                             style="padding-top: 17px">
-                <el-input type="number" v-model="scope.row.price"></el-input>
+                <el-input type="number" v-model="scope.row.price"  :disabled="stockShow"></el-input>
               </el-form-item>
 
 
             </template>
           </el-table-column>
 
-          <el-table-column min-width="23" align="center">
+          <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
                             style="padding-top: 17px">
-                <el-input type="number" v-model="scope.row.count"></el-input>
+                <el-input type="number" v-model="scope.row.count"  :disabled="stockShow"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
 
-          <el-table-column label="总价" min-width="20" align="center">
+          <el-table-column label="总价" width="150" align="center">
             <template slot-scope="scope">
               {{calculate(scope.row.price*scope.row.count)}}
             </template>
           </el-table-column>
           <el-table-column label="生产厂商"  width="150" align="center">
             <template slot-scope="scope">
-               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商"  :disabled="stockShow">
                 <el-option
                   v-for="(option, index) in manufacturerList"
                   :key="index"
@@ -179,12 +161,56 @@
                </el-select>
             </template>   
           </el-table-column>
-          <el-table-column label="备注" min-width="20" align="center">
+         <el-table-column label="生产日期"  width="150" align="center">
+           <template slot-scope="scope">
+              <el-date-picker
+               :disabled="stockShow"
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.product_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+         </el-table-column>
+
+          <el-table-column label="有效期"  width="150" align="center">
+            <template slot-scope="scope">
+              <el-date-picker
+               :disabled="stockShow"
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.expiry_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+         
+
+          <el-table-column label="经销商"  width="150" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商"  :disabled="stockShow">
+                <el-option
+                  v-for="(option, index) in dealerList"
+                  :key="index"
+                  :label="option.dealer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>   
+          </el-table-column>
+
+          <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remark"></el-input>
+              <el-input v-model="scope.row.remark"  :disabled="stockShow"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" min-width="30"  fixed="right">
+          <el-table-column label="操作" align="center" width="150"  fixed="right">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
@@ -286,6 +312,7 @@
         goodType: [],
         goodInfo:[],
         numberList:[],
+        stockShow:false
       }
     },
     methods: {
@@ -365,6 +392,10 @@
         return name;
       }, 
       handleEdit: function(index, row) {
+        if(this.stockShow == true){
+         this.$message.error("自动出库数据无法编辑")
+         return
+        }
         const tempObj = {}
         tempObj['id'] = 0
         tempObj['good_type_id'] = 0
@@ -374,7 +405,12 @@
         tempObj['remark'] = ''
         tempObj['number'] = ""
         this.recordInfo.recordData.push(tempObj)
-      }, handleDelete: function(index, row) {
+      }, 
+      handleDelete: function(index, row) {
+        if(this.stockShow == true){
+         this.$message.error("自动出库数据无法删除")
+         return
+        }
         if (row.id == 0) {
           this.recordInfo.recordData.splice(index, 1)
         } else {
@@ -488,24 +524,31 @@
               }
             }
             for(let i=0;i<this.recordInfo.recordData.length;i++){
+              if(this.recordInfo.recordData[i].expiry_date == "" || this.recordInfo.recordData[i].expiry_date == undefined){
+                this.recordInfo.recordData[i].expiry_date = ""
+              } 
+              if(this.recordInfo.recordData[i].product_date == "" || this.recordInfo.recordData[i].product_date == undefined){
+                this.recordInfo.recordData[i].product_date = ""
+              }
                this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+            
               for(let j=0;j<this.manufacturerList.length;j++){
                 if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
                   this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
                 }
               }
+              for(let z=0;z<this.dealerList.length;z++){
+                if(this.recordInfo.recordData[i].dealer == this.dealerList[z].dealer_name){
+                    this.recordInfo.recordData[i].dealer = this.dealerList[z].id
+                }
+              }
             }
             const params = {
               'stockOut': this.recordInfo.recordData
             }
            
-            for(let i=0;i<this.goodList.length;i++){
-             
-            }
-
-           
             console.log("stockout",params)
-          
+            
             editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -520,43 +563,7 @@
           }
         })
       }, 
-      GetOrderDetail: function(order_id) {
-        const params = {
-          'id': order_id
-        }
-        getWarehouseOutInfo(params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            console.log("详情",response.data.data.list)
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              response.data.data.list[i].price = response.data.data.list[i].price.toString()
-              response.data.data.list[i].count = response.data.data.list[i].count.toString()
-              response.data.data.list[i].good_name = response.data.data.list[i].GoodInfo.good_name
-              response.data.data.list[i].name = response.data.data.list[i].GoodInfo.good_name + "*" + response.data.data.list[i].GoodInfo.specification_name
-
-              this.recordInfo.recordData.push(response.data.data.list[i])
-            }
-            this.warehouseOut = response.data.data.info
-            this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
-            this.form.manufacturer = this.warehouseOut.manufacturer
-            this.form.dealer = this.warehouseOut.dealer
-
-          }
-
-          if (this.recordInfo.recordData.length == 0) {
-            const tempObj = {}
-            tempObj['id'] = 0
-            tempObj['good_type_id'] = 0
-            tempObj['good_id'] = 0
-            tempObj['count'] = ''
-            tempObj['price'] = ''
-            tempObj['remark'] = ''
-            this.recordInfo.recordData.push(tempObj)
-          }
-        })
-      }, calculate: function(val) {
+     calculate: function(val) {
         if (val == 0) {
           return ''
         }
@@ -585,6 +592,11 @@
                     this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
                 }
               }
+             for(let z=0;z<this.dealerList.length;z++){
+                if(this.goodList[i].dealer == this.dealerList[z].id){
+                   this.goodList[i].dealer = this.dealerList[z].dealer_name
+                }
+              }
             }
           
             cb(this.goodList)
@@ -609,18 +621,17 @@
             this.recordInfo.recordData[i].price = val.buy_price
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
+             this.recordInfo.recordData[i].dealer = val.dealer
          }
       }
-      console.log("hhhhh232323232",val.xt_warehouse_info)
-      if(val.xt_warehouse_info.length > 0){
-         console.log("hhhhhhhhhh")
-          for(let j=0;j<val.xt_warehouse_info.length;j++){
-            this.numberList.push(val.xt_warehouse_info[j])
-          }
-         this.recordInfo.recordData[i].number = val.xt_warehouse_info[0].number
-      }else{
-        this.recordInfo.recordData[i].number = ""
-      }
+      // if(val.xt_warehouse_info.length > 0){
+      //     for(let j=0;j<val.xt_warehouse_info.length;j++){
+      //       this.numberList.push(val.xt_warehouse_info[j])
+      //     }
+      //    this.recordInfo.recordData[i].number = val.xt_warehouse_info[0].number
+      // }else{
+      //   this.recordInfo.recordData[i].number = ""
+      // }
     },
      getSingleOutOrderDetail(order_id){
        const params = {
@@ -632,7 +643,7 @@
           var dealerList = response.data.data.dealerList
           this.dealerList = dealerList
           var manufacturerList = response.data.data.manufacturerList
-          console.log("hhhhhhhhh",manufacturerList)
+          // console.log("hhhhhhhhh",manufacturerList)
           this.manufacturerList = manufacturerList
           this.goodType = response.data.data.goodType
           for (let i = 0; i < response.data.data.list.length; i++) {
@@ -642,7 +653,10 @@
             response.data.data.list[i].good_name = response.data.data.list[i].good_name
             response.data.data.list[i].name = response.data.data.list[i].specification_name + "/" + response.data.data.list[i].packing_unit
             response.data.data.list[i].good_type_id = response.data.data.list[i].good_type_id
-            this.numberList.push(response.data.data.list[i])
+            response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,"{y}-{m}-{d}")
+            response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,"{y}-{m}-{d}")
+            response.data.data.list[i].remark = response.data.data.list[i].remark
+            // this.numberList.push(response.data.data.list[i])
             this.recordInfo.recordData.push(response.data.data.list[i])
           }
          
@@ -664,6 +678,13 @@
       this.propForm.goodUnit = this.$store.getters.good_unit
       const order_id = this.$route.query.id  
       this.getSingleOutOrderDetail(order_id)
+      var is_sys = this.$route.query.is_sys
+      if(is_sys == 0){
+        this.stockShow = false
+      }
+      if(is_sys == 1){
+        this.stockShow = true
+      }
     }
 
   }

src/xt_pages/stock/stockQuery.vue

@@ -165,6 +165,26 @@ import {
 export default {
   name: "stockIn",
   created() {
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    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.GetAllGoodInfo();
     this.GetAllGoodType();
     this.getlist()
@@ -373,8 +393,8 @@ export default {
     exportList(){
          import('@/vendor/Export2Excel').then(excel => {
 
-         const tHeader = ['耗材类型', '耗材名称', '规格&单位','规格型号','进货单价','生产商','入库数量','出库数量','库存剩余量']
-         const filterVal = ['type_name', 'good_name', 'unit','specification_name','price','prodect_name','inCount','outCount','overplus']
+         const tHeader = ['耗材类型', '耗材名称', '规格&单位','进货单价','生产商','入库数量','出库数量','库存剩余量']
+         const filterVal = ['type_name', 'good_name', 'unit','price','prodect_name','inCount','outCount','overplus']
 
        
          for(let i=0;i<this.tableList.length;i++){
@@ -505,7 +525,7 @@ export default {
       })
     },
     getInCount(id){
-      var count= ""
+      var count= 0
      for(let i=0;i<this.countList.length;i++){
       if(id == this.countList[i].good_id){
           count = this.countList[i].count
@@ -514,7 +534,7 @@ export default {
      return count
     },
     getOutCount(id){
-      var count = ""
+      var count = 0
       for(let i=0;i<this.outCountList.length;i++){
          if(id == this.outCountList[i].good_id){
            count = this.outCountList[i].count
@@ -523,7 +543,7 @@ export default {
       return count
     },
    getAutoCount(id){
-     var count= ""
+     var count= 0
      for(let i=0;i<this.autoCountList.length;i++){
        if(id == this.autoCountList[i].good_id){
          count = this.autoCountList[i].count