数据

src/api/stock.js

@@ -835,9 +835,9 @@ export function updateStockPrice(params) {
   })
 }
 
-export function deleteStockPrice(id, params) {
+export function deleteStockPrice(params) {
   return request({
-    url: '/api/stock/deletestockprice?id=' + id,
+    url: '/api/stock/deletestockprice',
     method: 'Get',
     params: params
   })

src/xt_pages/stock/stockDamaged.vue

@@ -108,7 +108,7 @@
         <el-form :model="form" class="modifyDialog" label-width="120px">
           
             <el-form-item label="耗材ID">
-                <el-input v-model="form.good_id"></el-input>
+                <el-input v-model="form.good_id" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="耗材名称">
                   <el-autocomplete
@@ -129,7 +129,7 @@
                  </el-autocomplete>
             </el-form-item>
             <el-form-item label="规格">
-                <el-input v-model="form.specification_name"></el-input>
+                <el-input v-model="form.specification_name" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="批号">
                  <el-select v-model="form.number" filterable placeholder="请选择">
@@ -142,28 +142,31 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="单位">
-                <el-input v-model="form.warehousing_unit"></el-input>
+                <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="进货价">
-                <el-input v-model="form.buy_price"></el-input>
+                <el-input v-model="form.buy_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="零售价">
-                <el-input v-model="form.packing_price"></el-input>
+                <el-input v-model="form.packing_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="报损数量">
                 <el-input v-model="form.count"></el-input>
             </el-form-item>
             <el-form-item label="库存">
-                <el-input v-model="form.total"></el-input>
+                <el-input v-model="form.total" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="产地">
                 <el-input v-model="form.good_origin_place"></el-input>
             </el-form-item>
             <el-form-item label="批准文号">
-                <el-input v-model="form.license_number"></el-input>
+                <el-input v-model="form.license_number" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商">
-                <el-input v-model="form.manufacturer"></el-input>
+                <el-input v-model="form.manufacturer" :disabled="true"></el-input>
+            </el-form-item>
+           <el-form-item label="供应商">
+                <el-input v-model="form.dealer" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="备注">
                 <div style="display:flex;">
@@ -309,7 +312,23 @@
                     </template>
                     </el-autocomplete>
                 </el-form-item>
-               <el-form-item label="报损数量：">
+               <el-form-item label="规格：">
+                 <el-input v-model="form.specification_name" style="width:200px"></el-input>
+               </el-form-item>
+               <el-form-item label="批号">
+                 <el-select v-model="form.number" filterable placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in numberList"
+                    :key="index"
+                    :label="item.number"
+                    :value="item.number">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="单位">
+                 <el-input v-model="form.warehousing_unit"></el-input>
+              </el-form-item>
+                <el-form-item label="报损数量：">
                  <el-input v-model="form.count" style="width:200px"></el-input>
                </el-form-item>
              </el-col> 
@@ -512,6 +531,11 @@ export default {
           this.form.product_date = val.product_date
       },
       addStock(){
+
+        if(this.form.count == ""){
+          this.$message.error("请输入报损数量")
+          return 
+        }
         var obj = {
           good_id:this.form.good_id,
           good_name:this.form.good_name,
@@ -674,12 +698,20 @@ export default {
        this.tableData.splice(index,1)
      },
      toEdit(row){
+      console.log("row",row)
       this.form.good_name = row.good_name
-      this.form.packing_unit = row.packing_unit
+      this.form.warehousing_unit = row.warehousing_unit
       this.form.packing_price = row.packing_price
       this.form.count = row.count
       this.form.remark = row.remark
       this.form.id = row.id
+      this.form.specification_name = row.specification_name
+      this.form.dealer = row.dealer
+      this.form.manufacturer = row.manufacturer
+      this.form.good_origin_place = row.good_origin_place
+      this.form.total = row.total
+      this.form.number = row.number
+      this.form.license_number = row.license_number
       this.editPriceDialogVisible = true  
      },
      upatePrice(){
@@ -689,6 +721,13 @@ export default {
             this.tableData[i].packing_price = this.form.packing_price
             this.tableData[i].count = this.form.count
             this.tableData[i].remark = this.form.remark
+            this.tableData[i].good_name = this.form.specification_name
+            this.tableData[i].warehousing_unit  = this.form.warehousing_unit
+            this.tableData[i].total = this.form.total
+            this.tableData[i].number = this.form.number
+            this.tableData[i].license_number = this.form.license_number
+            this.tableData[i].manufacturer = this.form.manufacturer
+            this.tableData[i].good_origin_place = this.form.good_origin_place
          }
        }
        this.editPriceDialogVisible = false

src/xt_pages/stock/stockModifyPrice.vue

@@ -26,14 +26,16 @@
             v-model="start_time"
             type="date"
             style="margin-left:5px;width:140px;"
-            placeholder="选择日期">
+            placeholder="选择日期"
+            @change="changeStartTime">
             </el-date-picker>
             <el-date-picker
             size="small"
             v-model="end_time"
             type="date"
             style="margin-left:5px;width:140px;"
-            placeholder="选择日期">
+            placeholder="选择日期"
+            @change="changeEndTime">
             </el-date-picker>
         </div>
         <div>
@@ -168,15 +170,21 @@
                   </template>
                  </el-autocomplete>
             </el-form-item>
+            <el-form-item label="规格">
+                <el-input v-model="form.specification_name" :disabled="true"></el-input>
+            </el-form-item>
             <el-form-item label="原价格">
-                <el-input v-model="form.packing_price"></el-input>
+                <el-input v-model="form.packing_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="现价格">
                 <el-input v-model="form.new_price"></el-input>
             </el-form-item>
-            <!-- <el-form-item label="调价数量">
-                <el-input v-model="form.count" type="number"></el-input>
-            </el-form-item> -->
+            <el-form-item label="生产商">
+                <el-input v-model="form.manufacturer" :disabled="true"></el-input>
+            </el-form-item>
+            <el-form-item label="供应商">
+                <el-input v-model="form.dealer" :disabled="true"></el-input>
+            </el-form-item>
             <el-form-item label="备注" style="width:66%;">
                 <div style="display:flex;">
                     <el-input v-model="form.remark"></el-input>
@@ -205,11 +213,6 @@
                {{scope.row.warehousing_unit}}
                </template>
             </el-table-column>
-            <!-- <el-table-column prop="name" label="调价数量" width="100" align="center">
-              <template slot-scope="scope">
-                {{scope.row.count}}
-              </template> 
-            </el-table-column> -->
             <el-table-column prop="name" label="原进货价" width="100" align="center">
                <template slot-scope="scope">
                 {{scope.row.buy_price}}
@@ -288,26 +291,26 @@
                     </template>
                     </el-autocomplete>
                 </el-form-item>
+               <el-form-item label="规格">
+                 <el-input v-model="form.specification_name" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
+               <el-form-item label="生产厂商">
+                 <el-input v-model="form.manufacturer" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
+              <el-form-item label="供应商">
+                 <el-input v-model="form.dealer" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
                <el-form-item label="原价格：">
-                 <el-input v-model="form.packing_price" style="width:200px"></el-input>
+                 <el-input v-model="form.packing_price" style="width:200px" :disabled="true"></el-input>
                </el-form-item>
                <el-form-item label="现价格：">
                     <el-input v-model="form.new_price" style="width:200px"></el-input>
                 </el-form-item>
+               <el-form-item label="备注:">
+                    <el-input v-model="form.remark" style="width:200px"></el-input>
+                </el-form-item>
              </el-col> 
             </el-row>
-            <!-- <el-row>
-             <el-col>
-               <el-form-item label="调价数量：">
-                    <el-input v-model="form.count"  style="width:200px"></el-input>
-                </el-form-item>
-                <el-form-item label="备注：">
-                    <div style="display:flex;">
-                        <el-input v-model="form.remark"  style="width:200px"></el-input>
-                    </div>
-                </el-form-item>
-              </el-col>  
-            </el-row> -->
           </el-form>
         </span>
         <span slot="footer" class="dialog-footer">
@@ -379,7 +382,6 @@
                         placeholder="请输入耗材名称"
                         @select="handleSelect"
                         @input="changeGoodName(scope.$index)"
-                        :disabled="true"
                         style="width:160px;"
                     >
                         <i class="el-icon-search el-input__icon" slot="suffix"></i>
@@ -388,12 +390,21 @@
                     </template>
                     </el-autocomplete>
                 </el-form-item>
+               <el-form-item label="规格：">
+                 <el-input v-model="form.specification_name" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
                <el-form-item label="原价格：">
-                 <el-input v-model="form.packing_price" style="width:200px"></el-input>
+                 <el-input v-model="form.packing_price" style="width:200px" :disabled="true"></el-input>
                </el-form-item>
                <el-form-item label="现价格：">
                     <el-input v-model="form.new_price" style="width:200px"></el-input>
                 </el-form-item>
+               <el-form-item label="生产商">
+                 <el-input v-model="form.manufacturer" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
+              <el-form-item label="供应商">
+                 <el-input v-model="form.dealer" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
                 <el-form-item label="备注：">
                     <el-input v-model="form.remark" style="width:200px"></el-input>
                 </el-form-item>
@@ -534,11 +545,12 @@ export default {
           }else{
             this.form.dealer = val.dealer
           }
-          if(this.form.manufacturer == 0){
-            this.form.manufacturer = ""
-          }else{
-            this.form.manufacturer = val.manufacturer
-          }
+          // if(this.form.manufacturer == 0){
+          //   this.form.manufacturer = ""
+          // }else{
+          //   this.form.manufacturer = val.manufacturer
+          // }
+          this.form.manufacturer = val.manufacturer
           this.form.specification_name = val.specification_name
           this.form.remark = val.remark
           this.form.buy_price = val.buy_price
@@ -546,6 +558,10 @@ export default {
          
       },
       addPrice(){
+        if(this.form.new_price == ""){
+           this.$message.error("请输入现价格")
+           return
+        }
         var obj = {
          id:this.form.id,
          good_name:this.form.good_name,
@@ -601,9 +617,16 @@ export default {
       this.form.count = row.count
       this.form.remark = row.remark
       this.form.id = row.id
+      this.form.specification_name = row.specification_name
+      this.form.manufacturer = row.manufacturer
+      this.form.dealer = row.dealer
       this.editPriceDialogVisible = true  
      },
      upatePrice(){
+       if(this.form.new_price == ""){
+          this.$message.error("请输入现价格")
+          return false
+       }
        for(let i=0;i<this.tableData.length;i++){
          if(this.form.id == this.tableData[i].id){
             this.tableData[i].good_name = this.form.good_name
@@ -769,21 +792,30 @@ export default {
            }else{
              this.form.new_price = info.new_price
            }
-          
+           this.form.specification_name = info.specification_name
            this.form.packing_price = info.packing_price
            this.form.remark = info.remark
+           this.form.manufacturer = info.manufacturer
+           this.form.dealer = info.dealer
            this.modifyDialogVisible = true
          }
        })
      },
      updateStockPrice(){
+         if(this.form.new_price == ""){
+           this.$message.error("请输入现价格")
+           return
+         }
          var params = {
+
            new_price:this.form.new_price.toString(),
            id:this.id,
            packing_price:this.form.packing_price.toString(),
            remark:this.form.remark,
            good_id:this.form.good_id,
            good_name:this.form.good_name,
+           manufacturer:this.form.manufacturer,
+           dealer:this.form.dealer,
          }
          console.log("params",params)
        updateStockPrice(params).then(response=>{
@@ -808,6 +840,7 @@ export default {
           let params = {
             id:id,
           }
+          console.log("id23232322332233223",id)
           deleteStockPrice(params).then(response => {
             if (response.data.state == 1) {
               var msg = response.data.data.msg
@@ -818,6 +851,14 @@ export default {
         }).catch(() => {
           this.loading = false
         });
+     },
+     changeStartTime(val){
+       this.start_time = this.getTime(val)
+       this.getAllStockPrice()
+     },
+     changeEndTime(val){
+       this.end_time = this.getTime(val)
+       this.getAllStockPrice()
      }
     },
     created(){

src/xt_pages/user/templateSummary.vue

@@ -1559,6 +1559,9 @@
         if(this.form.template_plan_id == ""){
            this.form.template_plan_id = 0
         }
+        if(this.dialysis_count == ""){
+            this.dialysis_count = 0
+        }
         var params = {
             id:this.form.id,
             title:this.form.title,