Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/data/components/addDrugs.vue

@@ -463,7 +463,6 @@
       },
       getDataConfig(module, filed_name){
         return getDataConfig(module, filed_name)
-
       },
       _close: function(done) {
         // this.clear()
@@ -490,12 +489,7 @@
           }
 
           this.form.drug_classify = parseInt(this.form.drug_classify)
-          this.form.max_unit = parseInt(this.form.max_unit)
-          this.form.min_unit = parseInt(this.form.min_unit)
-
           this.form['id'] = id
-
-          console.log(this.form.drug_status.length)
           this.drug_status = []
           if(this.form.drug_status.length > 0){
             for (let i = 0; i <  this.form.drug_status.split(",").length; i++){

src/xt_pages/data/components/drugs.vue

@@ -305,7 +305,7 @@
         return ''
       },
       goodInfoDialogComfirm: function(val) {
-        
+
         //修改自备药
         var untit = ""
         var untis = getDataConfig('hemodialysis','units')
@@ -370,7 +370,7 @@
         // this.$refs.maintain.show();
       },
       openForm(id) {
-        
+
         this.getAllManufacturer()
         if (id > 0) {
           this.current_id = id
@@ -387,23 +387,15 @@
               }
 
               if(this.formValue.is_special_diseases <= 0){
-
                 this.formValue.is_special_diseases = ''
               } else{
-
                 this.formValue.is_special_diseases = this.formValue.is_special_diseases.toString()
-
-
               }
 
               if(this.formValue.is_record <= 0){
-
                 this.formValue.is_record = ''
               } else{
-
                 this.formValue.is_record = this.formValue.is_record.toString()
-
-
               }
 
 

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -108,6 +108,17 @@
           </template>
         </el-table-column>
 
+        <el-table-column min-width="35" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>出库方式</span>
+          </template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_sys == 1">{{"自动出库"}}</span>
+            <span v-if="scope.row.is_sys != 1">{{"手动出库"}}</span>
+
+          </template>
+        </el-table-column>
+
         <el-table-column label="厂家" align="center">
           <template slot-scope="scope">
             {{scope.row.manufacturers ? scope.row.manufacturers.manufacturer_name:''}}
@@ -119,14 +130,7 @@
             {{scope.row.dealers ? scope.row.dealers.dealer_name:''}}
           </template>
         </el-table-column>
-        <el-table-column min-width="35" align="center">
-          <template slot="header" slot-scope="scope">
-            <span>出库方式</span>
-          </template>
-          <template slot-scope="scope">
-            <span v-if="scope.row.is_sys == 1">{{"自动出库"}}</span>
-          </template>
-        </el-table-column>
+
 
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">