修改提示框

src/api/stock.js

@@ -385,9 +385,9 @@ export function DeleteWarehouseInfoItem(params) {
   })
 }
 
-export function EditWarehouse(params, warehousing_time, id) {
+export function EditWarehouse(params, warehousing_time, id,type) {
   return request({
-    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id,
+    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id+"&type="+type,
     method: 'post',
     data: params
   })
@@ -433,9 +433,9 @@ export function deleteSalesReturnInfo(params) {
   })
 }
 
-export function editSalesReturnInfo(params, return_time, id) {
+export function editSalesReturnInfo(params, return_time, id,type) {
   return request({
-    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id,
+    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id+"&type="+type,
     method: 'post',
     data: params
   })
@@ -473,9 +473,9 @@ export function getWarehouseOutInfo(params) {
   })
 }
 
-export function editWarehouseoutInfo(params, warehouse_out_time, id) {
+export function editWarehouseoutInfo(params, warehouse_out_time, id,type) {
   return request({
-    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id,
+    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id+"&type="+type,
     method: 'post',
     data: params
   })
@@ -489,9 +489,9 @@ export function getCancelStockList(params) {
   })
 }
 
-export function editCancelStockInfo(params, cancel_stock_time, id) {
+export function editCancelStockInfo(params, cancel_stock_time, id,type) {
   return request({
-    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id,
+    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id+"&type="+type,
     method: 'post',
     data: params
   })

src/xt_pages/data/components/tableson.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="">
     <div class="filter-container">
-      <el-button style="float: right;margin-right: 20px" class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
+      <el-button style="float: right" class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
     </div>
 
     <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -41,61 +41,38 @@
       </el-row>
 
       <el-row>
-        <el-col :span="8">
-          <el-form-item label="生产厂家" prop="dealer">
-            <el-select  v-model="form.manufacturer" placeholder="请选择">
-              <el-option
-                v-for="item in form.manufacturers"
-                :key="item.id"
-                :label="item.manufacturer_name"
-                :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="经销商" prop="manufacturer">
-            <el-select  v-model="form.dealer" placeholder="请选择">
-              <el-option
-                v-for="item in form.dealers"
-                :key="item.id"
-                :label="item.dealer_name"
-                :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
 
         <el-col :span="8">
           <el-form-item label="进货价" prop="buy_price">
             <el-input  type="number" v-model="form.buy_price"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
 
-      <el-row>
         <el-col :span="8">
           <el-form-item label="出货价" prop="sell_price">
             <el-input  type="number" v-model="form.sell_price"></el-input>
           </el-form-item>
         </el-col>
-
         <el-col :span="8">
           <el-form-item label="有效期预警天数" prop="expiry_date_warn_day_count">
             <el-input type="number" v-model="form.expiry_date_warn_day_count"></el-input>
           </el-form-item>
         </el-col>
 
+
+      </el-row>
+
+
+      <el-row>
+
         <el-col :span="8">
           <el-form-item label="库存预警数量" prop="stock_warn_count">
             <el-input  type="number" v-model="form.stock_warn_count"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
 
-      <el-row>
-       <el-col :span="16">
+
+        <el-col :span="16">
         <el-form-item label="是否可复用" prop="is_reuse">
             <el-radio v-model="form.is_reuse" label="1">可以</el-radio>
             <el-radio v-model="form.is_reuse" label="2">不可以</el-radio>

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -302,7 +302,7 @@
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
-            editCancelStockInfo(params, this.return_time, this.$route.query.id).then(response => {
+            editCancelStockInfo(params, this.return_time, this.$route.query.id,this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -53,7 +53,7 @@
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
 
-          <el-table-column label="单据编号" align="center">
+          <el-table-column label="单据编号" align="center" width="200">
             <template slot-scope="scope">
               {{scope.row.order_number}}
             </template>

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -2,7 +2,7 @@
   <div class="main-contain">
     <div class="app-container">
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -56,9 +56,9 @@
 
 
 
-          <el-table-column label="单据编号" align="center">
+          <el-table-column label="单据编号" align="center"  width="200">
             <template slot-scope="scope">
-              {{scope.row.order_number}}
+              {{scope.row.SalesReturn.order_number}}
             </template>
           </el-table-column>
 

src/xt_pages/stock/detail/stockInDetail.vue

@@ -2,7 +2,7 @@
   <div class="main-contain">
     <div class="app-container">
       <div class="cell clearfix">
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -53,7 +53,7 @@
 
         >
 
-          <el-table-column label="单据编号" align="center">
+          <el-table-column label="单据编号" align="center"  width="200">
             <template slot-scope="scope">
               {{scope.row.warehousing_order}}
             </template>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -2,7 +2,7 @@
   <div class="main-contain">
     <div class="app-container">
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -57,7 +57,7 @@
 
 
 
-          <el-table-column label="单据编号" align="center">
+          <el-table-column label="单据编号" align="center"  width="200">
             <template slot-scope="scope">
               {{scope.row.warehouse_out_order_number}}
             </template>

src/xt_pages/stock/salesReturnEdit.vue

@@ -315,7 +315,7 @@
             const params = {
               'salesReturn': this.recordInfo.recordData
             }
-            editSalesReturnInfo(params, this.return_time, this.$route.query.id).then(response => {
+            editSalesReturnInfo(params, this.return_time, this.$route.query.id,this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/stockInOrderEdit.vue

@@ -423,7 +423,7 @@ export default {
             const params = {
               'stockIn': this.recordInfo.recordData
             }
-            EditWarehouse(params, this.warehousing_time, this.$route.query.id).then(response => {
+            EditWarehouse(params, this.warehousing_time, this.$route.query.id,this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -336,7 +336,7 @@
             const params = {
               'stockOut': this.recordInfo.recordData
             }
-            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id).then(response => {
+            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id,this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/user/courseOfDisease.vue

@@ -3,19 +3,31 @@
     <div class="position">
        <bread-crumb></bread-crumb>
     </div> -->
-    <div class="patient-container ">
+    <div class="patient-container">
         <patient-sidebar :id="patient_id" defaultActive="1-2"></patient-sidebar>
         <!-- <div class="app-container"> -->
-            <div class="container" v-loading="loading">
-                <div>
+            <div  v-loading="loading">
+              <div class="patient-app-container advice-container app-container">
+
+              <div>
                     <span style="margin-left: 10px;float:right;">
                         <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="show_dialog = true">新增</el-button>
                         <el-button  size="small" v-show="selectingRows.length > 0" type="danger" @click="deleteAction">删除</el-button>
                     </span>
-                    <span class="filter_title">日期查询</span>
-                    <el-date-picker size="small" v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestCourseRecords()"></el-date-picker>
-
+                    <!--<span class="filter_title">日期查询</span>-->
+                    <!--<el-date-picker size="small" v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestCourseRecords()"></el-date-picker>-->
                 </div>
+              <!--<div></div>-->
+              <div class="cell clearfix">
+                <label class="title"><span class="name">日期查询</span> : </label>
+                <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                                type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+                <span class="">-</span>
+                <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                                type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+              </div>
                 <div class="record">
                     <el-row :gutter="15">
                         <el-col :span="10">
@@ -66,7 +78,9 @@
             </div>
         </el-dialog>
     </div>
-<!-- </div> -->
+    </div>
+
+  <!-- </div> -->
 </template>
 
 <script>
@@ -87,6 +101,8 @@ export default {
 
             patient_id: 0,
             date: [],
+            start_time: '',
+            end_time: '',
 
             records: [],
             doctors: [],
@@ -114,14 +130,43 @@ export default {
         var now = new Date()
         this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
 
-        this.requestCourseRecords()
+
+
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+
+
+      this.requestCourseRecords()
+
+
+
     },
     methods: {
         requestCourseRecords: function() {
-            var startTime = new Date(this.date[0])
-            var endTime = new Date(this.date[1])
             this.loading = true
-            getCourseOfDiseaseRecords(this.patient_id, parseTime(startTime, "{y}-{m}-{d}"), parseTime(endTime, "{y}-{m}-{d}")).then(rs => {
+            getCourseOfDiseaseRecords(this.patient_id, this.start_time,this.end_time).then(rs => {
                 this.loading = false
                 var resp = rs.data
                 if (resp.state == 1) {
@@ -223,7 +268,11 @@ export default {
                 this.loading = false
                 this.$message.error(err)
             })
-        },
+        },startTimeChange(val) {
+        this.requestCourseRecords()
+      }, endTimeChange(val) {
+        this.requestCourseRecords()
+      }
     },
 }
 </script>