Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/data/components/consumables.vue

               min_unit:"",
               total:"",
               register_number:"",
+              is_user:"2",
             },
             isVisibility: false,
           }
             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.goodInfo.goodInfoDialog.formValue.is_user = response.data.data.goodInfo.is_user.toString()
+            
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
 
           }
         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)
        },
     },
     created() {
+      this.goodInfo.goodInfoDialog.formValue.is_user = "2"
       this.getAllGoodType();
       this.getAllDealer();
       this.getAllManufacturer();

src/xt_pages/stock/Dialog/goodInfoDailog.vue

       },
       show(id,form) {
          console.log("form",this.form)
-        this.form.is_user = "2"
+        
         if(form!=undefined){
           this.unitList = []
           var arr =  getDataConfig('hemodialysis','units')
               default_count_unit:"",
               min_unit:"",
               total:"",
-              is_user:"2",
+              is_user:"",
             }
           this.good_status = []
           for (let key in tempform) {

src/xt_pages/stock/config/goodInfo.vue

               packing_unit:"",
               packing_price:'',
               default_count_unit:"",
-              is_user:"2",
+             
             },
 
             isVisibility: false
             }
 
           
-            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(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) {
             }
           })
         } 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) {
         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_user = "2"
+       // this.goodInfo.goodInfoDialog.formValue.is_user = "2"
 
       
       },