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

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -590,6 +590,7 @@
                   }).catch(() => {
                   })
                 } else {
+                  that.InsuplcAdmdvs = []
                   for(let i =0; i < response.data.data.info.output.insuinfo.length; i++){
                     that.InsuplcAdmdvs.push({
                       value:response.data.data.info.output.insuinfo[i].insuplc_admdvs,

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -541,6 +541,7 @@
         let params = {
           'id_card_type': this.form.id_card_type,
           'admin_user_id':this.$store.getters.xt_user.user.id,
+          'certificates': this.form.certificates
 
         }
         this.read_loading = true

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -1,6 +1,8 @@
 <template>
   <div id="statement-print" class="statement-print">
     <div class="statementTitle" v-if="info.fixmedins_code == 'H32092103007'">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="info.fixmedins_code == 'H42138100547'">广水源生堂社会医疗保险医疗费用结算单</div>
+
     <div class="statementTitle" v-else>广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">

src/xt_pages/stock/detail/print.vue

@@ -51,7 +51,7 @@
               <td style="line-height: 50px">
                 <span v-if="type == 1"> {{ item.warehousing_count }}</span>
                 <span v-if="type == 2"> 
-                  <span  v-if= "org_id == 3907 || org_id ==9919">{{getStockCount(item.good_id) }}</span>  
+                  <span  v-if= "org_id == 3907 || org_id == 9919 || org_id == 9583">{{getStockCount(item.good_id) }}</span>  
                   <span v-else>{{item.count}}</span>
                 </span>
                

src/xt_pages/supply/components/addGoodOrder.vue

@@ -187,7 +187,7 @@
     </el-table-column>
     <el-table-column label="生产厂家" align="center" width="200px">
         <template slot-scope="scope">
-         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂家" :disabled="true">
+         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable  :disabled="true">
                 <el-option
                   v-for="(option, index) in manufactuerList"
                   :key="index"

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -113,7 +113,7 @@
                   v-model="scope.row.name"
                   style="width: 160px"
                   filterable
-                  placeholder="请选择"
+                  placeholder="请选择商品"
                   @change="changeName"
                   @input="changeGoodName(scope.$index)"
                   :disabled="disabled"
@@ -138,6 +138,7 @@
                 v-model="scope.row.supply_type"
                 style="width: 120px"
                 :disabled="true"
+                 placeholder="商品类别"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
@@ -145,6 +146,7 @@
           <el-table-column label="规格&单位" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
+                placeholder="规格&单位"
                 v-model="scope.row.supply_specification_name"
                 style="width: 150px"
                 :disabled="true"
@@ -197,6 +199,7 @@
               <el-form-item
                 :prop="'tableList.' + scope.$index + '.supply_count'"
                 :rules="tableRules.supply_count"
+                 placeholder="请输入数量"
               >
                 <el-input
                   v-model="scope.row.supply_count"
@@ -207,12 +210,13 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="购货单价" align="center" width="120px">
+          <el-table-column label="购货单价" align="center" width="140px">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.supply_price"
                 style="width: 80px"
                 :disabled="disabled"
+                 placeholder="请输入购货单价"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
@@ -230,7 +234,6 @@
                 size="small"
                 v-model="scope.row.supply_manufacturer"
                 filterable
-                placeholder="请选择生产厂家"
                 :disabled="true"
               >
                 <el-option
@@ -262,6 +265,7 @@
                 v-model="scope.row.supply_remake"
                 style="width: 160px"
                 :disabled="disabled"
+                placeholder="请输入备注"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
@@ -316,6 +320,7 @@
             style="width: 100px"
             v-model="rate_of_concession"
             @input="addressChange"
+            @placeholder="请输入优惠率"
           ></el-input
           >%</span
         >
@@ -324,6 +329,7 @@
           >优惠金额:<el-input
             style="width: 100px"
             v-model="discount_amount"
+            @placeholder="请输入优惠金额"
           ></el-input
         ></span>
       </div>

src/xt_pages/supply/components/editGoodOrder.vue

@@ -187,7 +187,7 @@
     </el-table-column>
     <el-table-column label="生产厂家" align="center" width="200px">
         <template slot-scope="scope">
-         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂家" :disabled="true">
+         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable  :disabled="true">
                 <el-option
                   v-for="(option, index) in manufactuerList"
                   :key="index"
@@ -837,7 +837,8 @@ getTimes(time) {
           this.$message.success("反审核成功!")
         }
         if(msg == 2){
-          this.$message.success("该单有自动出库或生成了退货单,反审核失败!")
+          this.$message.error("该单有自动出库或生成了退货单,反审核失败!")
+          
         }
 
         var purcaseOrder = response.data.data.purcaseOrder

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -137,36 +137,59 @@
                     v-for="(item, index) in tabList"
                     :key="index"
                     :label="item.supply_name"
-                    :value="item"
-                  >
-                                     
-                  </el-option>
-                                 
-                </el-select>
-                             
-              </el-form-item>
-                         
-            </template>
-                     
-          </el-table-column>
-           
-          <el-table-column align="center" width="150px">
-                       
-            <template slot="header" slot-scope="scope">
-                            <span>商品类别</span>            
-            </template>
-                       
-            <template slot-scope="scope">
-                           
-              <el-input
-                v-model="scope.row.supply_type"
-                style="width: 120px"
-                :disabled="true"
-              ></el-input>
-                         
-            </template>
-                     
-          </el-table-column>
+                    :value="item">
+                </el-option>
+             </el-select>
+           </el-form-item>
+        </template>
+    </el-table-column>
+    <el-table-column  align="center" width="150px">
+        <template slot="header" slot-scope="scope">
+            <span>商品类别</span>
+        </template>
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_type" style="width:120px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+    <el-table-column label="规格&单位" align="center" width="200px">
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_specification_name" style="width:150px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+     <el-table-column label="单位" align="center" width="120px">
+        <template slot="header" slot-scope="scope">
+            <span>单位<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+          <el-form-item :prop="'tableList.' + scope.$index + '.supply_unit'" :rules='tableRules.supply_unit'>
+            <el-select v-model="scope.row.supply_unit" style="width:100px;" filterable placeholder="请选择"  :disabled="disabled">
+                    <el-option
+                        v-for="(item,index) in scope.row.unitList"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                    </el-option>
+             </el-select>
+          </el-form-item>  
+        </template>
+    </el-table-column>
+   
+  
+    <el-table-column label="可用库存" align="center" width="130px">
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_total" style="width:100px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+    <el-table-column label="数量" align="center" width="120px">
+        <template slot="header" slot-scope="scope">
+            <span>数量<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+          <el-form-item  :prop="'tableList.' + scope.$index + '.supply_count'" :rules='tableRules.supply_count'>
+             <el-input v-model="scope.row.supply_count" style="width:80px" :disabled="disabled" placeholder="请输入数量"></el-input>
+          </el-form-item>
+        </template>
+    </el-table-column>
 
           <el-table-column label="规格&单位" align="center" width="200px">
                        
@@ -275,29 +298,9 @@
                      
           </el-table-column>
 
-             <el-table-column label="购货金额" align="center" width="120px">
-                       
-            <template slot-scope="scope">
-                           
-              {{ calculate(scope.row.supply_count * scope.row.supply_price) }}  
-                       
-            </template>
-                     
-          </el-table-column>
-
-                   
-          <el-table-column label="生产厂家" align="center" width="200px">
-                       
-            <template slot-scope="scope">
-                           
-              <el-select
-                size="small"
-                v-model="scope.row.supply_manufacturer"
-                filterable
-                placeholder="请选择厂商"
-                :disabled="disabled"
-              >
-                               
+    <el-table-column label="生产厂家" align="center" width="200px">
+        <template slot-scope="scope">
+           <el-select size="small" v-model="scope.row.supply_manufacturer" filterable :disabled="true">
                 <el-option
                   v-for="(option, index) in manufactuerList"
                   :key="index"