11月14日 库存扣减更新

src/views/layout/Layout.vue

@@ -16,10 +16,10 @@
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
-        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
-         <i class="iconfont icon-kccx navIcon"></i>
-          <p>采购管理</p>
-        </div>
+<!--        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">-->
+<!--         <i class="iconfont icon-kccx navIcon"></i>-->
+<!--          <p>采购管理</p>-->
+<!--        </div>-->
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>

src/xt_pages/data/components/consumables.vue

@@ -558,6 +558,7 @@
             this.goodInfo.goodInfoDialog.formValue.stock_warn_count =
               response.data.data.goodInfo.stock_warn_count;
             this.goodInfo.goodInfoDialog.formValue.is_reuse = response.data.data.goodInfo.is_reuse.toString();
+
             this.goodInfo.goodInfoDialog.formValue.remark =
               response.data.data.goodInfo.remark;
             this.goodInfo.goodInfoDialog.isCreated = 2;
@@ -729,6 +730,12 @@
             this.goodInfo.goodInfoDialog.formValue.packing_price = response.data.data.goodInfo.packing_price
             this.goodInfo.goodInfoDialog.formValue.default_count_unit = response.data.data.goodInfo.default_count_unit
             this.goodInfo.goodInfoDialog.formValue.register_number = response.data.data.goodInfo.register_number
+
+            if (response.data.data.goodInfo.is_user <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.is_user = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.is_user = response.data.data.goodInfo.is_user.toString()
+            }
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
 
           }
@@ -1010,9 +1017,7 @@
               if (response.data.data.goodType[i].type == 1) {
                 response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
               }
-              this.goodInfo.goodInfoDialog.formValue.goodType.push(
-                response.data.data.goodType[i]
-              )
+              this.goodInfo.goodInfoDialog.formValue.goodType.push(response.data.data.goodType[i])
             }
             if (this.goodInfo.goodInfoDialog.formValue.goodType.length <= 0) {
               this.$message.error('请先新增商品类型');
@@ -1058,6 +1063,7 @@
         this.goodInfo.goodInfoDialog.formValue.agent = '';
         this.goodInfo.goodInfoDialog.formValue.good_number = '';
         this.goodInfo.goodInfoDialog.formValue.register_number = '';
+        this.goodInfo.goodInfoDialog.formValue.is_user = "2"
 
 
         this.$refs.addConsumable.show(0)

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -198,7 +198,18 @@
             <el-form-item label="注册编码:" >
               <el-input v-model="form.register_number" style="width:180px"></el-input>
             </el-form-item>
+            
+            <el-form-item label="是否零用:">
 
+              <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择">
+                  <el-option
+                          v-for="(item,index) in userList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                  </el-option>
+              </el-select>
+             </el-form-item>
 
 
             <el-form-item label="备注 : " prop="name" style="width:100%;">
@@ -371,6 +382,7 @@
           min_unit:"",
           total:"",
           register_number:"",
+          is_user:"2",
         },
 
         rules: {
@@ -410,6 +422,10 @@
         statisticsCategoryList:[],
         unitList:[],
         showMinNumber:false,
+        userList: [
+         {id: "1",name: "是"},
+         {id: "2",name: "否"}
+        ],
       }
     },
     props: {
@@ -424,7 +440,6 @@
       isCreated: {
         type: Number,
         default: 1
-
       }
 
     },
@@ -436,8 +451,8 @@
         return getDataConfig(module, filed_name)
       },
       show(id,form) {
-        console.log("form",form)
-
+         console.log("form",this.form)
+        this.form.is_user = "2"
         if(form!=undefined){
           this.unitList = []
           var arr =  getDataConfig('hemodialysis','units')
@@ -480,7 +495,7 @@
               good_unit: '',
               retail_price: '',
               medical_insurance_number: '',
-            provinces_code:'',
+              provinces_code:'',
               is_special_diseases: '',
               is_record: '',
               statistics_category: '',
@@ -501,11 +516,13 @@
               default_count_unit:"",
               min_unit:"",
               total:"",
+              is_user:"2",
             }
           this.good_status = []
           for (let key in tempform) {
             this.form[key] = tempform[key]
           }
+          console.log("iser23232322323233223",this.form)
         } else {
           for (let key in form) {
             this.form[key] = form[key]
@@ -592,7 +609,7 @@
         form["default_count_unit"] = this.form.default_count_unit
         form["total"] = this.form.total
         form["register_number"] = this.form.register_number
-
+        form["is_user"] = this.form.is_user
 
         return form
       }, changeSelected: function(val) {
@@ -674,7 +691,9 @@
     },
     watch: {
       visible(val) {
+       
         this.form = this.formValue
+       
         this.good_unit = this.formValue.good_unit
 
         if (this.isCreated == 1) {
@@ -683,6 +702,7 @@
       }
     },
     created(){
+      
       this.getlist()
       //获取所有经销商
       this.GetAllConfig()

src/xt_pages/stock/config/goodInfo.vue

@@ -213,7 +213,8 @@
               min_number:"",
               packing_unit:"",
               packing_price:'',
-              default_count_unit:""
+              default_count_unit:"",
+              is_user:"2",
             },
 
             isVisibility: false
@@ -308,6 +309,12 @@
                 response.data.data.goodInfo.good_kind
             }
 
+          
+            if(this.goodInfo.goodInfoDialog.formValue.is_user <= 0){
+                this.goodInfo.goodInfoDialog.formValue.is_user = ''
+              } else{
+                this.goodInfo.goodInfoDialog.formValue.is_user = this.goodInfo.goodInfoDialog.is_user.toString()
+              }
 
 
             if (response.data.data.goodInfo.medical_insurance_level <= 0) {
@@ -561,29 +568,21 @@
             } else {
               this.$refs.dialog.hide()
 
-              this.goodInfo.goodInfoData[
-                this.goodInfo.editGoodIndex
-                ].specification_name =
-                response.data.data.goodInfo.specification_name
-              this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].good_unit =
-                response.data.data.goodInfo.good_unit
-              this.goodInfo.goodInfoData[
-                this.goodInfo.editGoodIndex
-                ].buy_price = response.data.data.goodInfo.buy_price.toString()
-              this.goodInfo.goodInfoData[
-                this.goodInfo.editGoodIndex
-                ].sell_price = response.data.data.goodInfo.sell_price.toString()
-              this.goodInfo.goodInfoData[
-                this.goodInfo.editGoodIndex
-                ].expiry_date_warn_day_count = response.data.data.goodInfo.expiry_date_warn_day_count.toString()
-              this.goodInfo.goodInfoData[
-                this.goodInfo.editGoodIndex
-                ].stock_warn_count = response.data.data.goodInfo.stock_warn_count.toString()
+              this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].specification_name = response.data.data.goodInfo.specification_name
+              this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].good_unit = response.data.data.goodInfo.good_unit
+              this.goodInfo.goodInfoData[ this.goodInfo.editGoodIndex].buy_price = response.data.data.goodInfo.buy_price.toString()
+              this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].sell_price = response.data.data.goodInfo.sell_price.toString()
+              this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].expiry_date_warn_day_count = response.data.data.goodInfo.expiry_date_warn_day_count.toString()
+              this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].stock_warn_count = response.data.data.goodInfo.stock_warn_count.toString()
 
               this.$message.success('修改成功')
             }
           })
         } else if (val.isCreated == 1) {
+          console.log("val23232323232323",val)
+          if(val.is_user == 0){
+            val.is_user = 2
+          }
           //新增
           createGoodInfo(val).then(response => {
             if (response.data.state == 0) {
@@ -639,7 +638,7 @@
         this.goodInfo.goodInfoDialog.formValue.dealer = ''
         this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count = ''
         this.goodInfo.goodInfoDialog.formValue.stock_warn_count = ''
-        this.goodInfo.goodInfoDialog.formValue.is_reuse = '2'
+        this.goodInfo.goodInfoDialog.formValue.is_user = "2"
 
       
       },