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/addDrugs.vue

@@ -267,6 +267,10 @@
                             <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
+                      <el-form-item label="省编码 : " prop="provinces_code">
+                        <el-input v-model="form.provinces_code" style="width:160px;" placeholder=""
+                                  maxlength="30"></el-input>
+                      </el-form-item>
                         <el-form-item label="生产厂商 : " prop="manufacturer">
 
                             <el-select v-model="form.manufacturer" style="width:160px;" filterable placeholder="请选择">
@@ -543,6 +547,7 @@
           drug_dose: '',//药品剂量
           drug_dose_unit: '',
           medical_insurance_number: '',//医保编号
+          provinces_code:"",//省编码
           manufacturer: '', //生产产商
           pharmacology_category: '',//药理分类
           statistics_category: '',//统计分类
@@ -851,6 +856,10 @@
         form['drug_dose'] = this.form.drug_dose
         form['drug_dose_unit'] = this.form.drug_dose_unit
         form['medical_insurance_number'] = this.form.medical_insurance_number
+        form['provinces_code'] = this.form.provinces_code
+
+
+
         form['manufacturer'] = this.form.manufacturer
         form['pharmacology_category'] = this.form.pharmacology_category
         form['statistics_category'] = this.form.statistics_category

src/xt_pages/data/components/addProject.vue

@@ -230,7 +230,7 @@
                             :value="item.value">
                             </el-option>
                         </el-select>
-                    </el-form-item>       
+                    </el-form-item>
                 </el-form>
             </el-tab-pane>
         </el-tabs>
@@ -259,8 +259,8 @@ export default {
             form:{
               project_name:"",
               pinyin:"",
-              wubi:"", 
-              price:"", 
+              wubi:"",
+              price:"",
               unit:"",
               cost_classify:"",
               executive_section:"",

src/xt_pages/data/components/consumables.vue

@@ -307,6 +307,8 @@
               good_unit:'',
               retail_price:'',
               medical_insurance_number:'',
+              provinces_code:'',
+
               is_special_diseases:'',
               is_record:'',
               statistics_category:'',
@@ -598,6 +600,9 @@
             this.goodInfo.goodInfoDialog.formValue.medical_insurance_number =
               response.data.data.goodInfo.medical_insurance_number;
 
+            this.goodInfo.goodInfoDialog.formValue.provinces_code =
+                response.data.data.goodInfo.provinces_code;
+
 
             if (response.data.data.goodInfo.is_special_diseases <= 0) {
               this.goodInfo.goodInfoDialog.formValue.is_special_diseases = ''
@@ -810,7 +815,7 @@
         })
       },
       goodInfoDialogComfirm: function(val) {
-        
+
         if (val.isCreated == 2) {
           //修改
           val['id'] = this.goodInfo.editGoodId;
@@ -958,11 +963,11 @@
             this.$message.error(response.data.msg);
             return false
           } else {
-           
+
             for(let i=0;i<response.data.data.goodType.length;i++){
               this.goodTypeList.push(response.data.data.goodType[i])
             }
- 
+
             for (let i = 0; i < response.data.data.goodType.length; i++) {
               if (response.data.data.goodType[i].type == 1) {
                 response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
@@ -1036,6 +1041,8 @@
         this.goodInfo.goodInfoDialog.formValue.medical_insurance_level = '';
         this.goodInfo.goodInfoDialog.formValue.retail_price = '';
         this.goodInfo.goodInfoDialog.formValue.medical_insurance_number = '';
+        this.goodInfo.goodInfoDialog.formValue.provinces_code = '';
+
         this.goodInfo.goodInfoDialog.formValue.is_special_diseases = '';
         this.goodInfo.goodInfoDialog.formValue.is_record = '';
         this.goodInfo.goodInfoDialog.formValue.statistics_category = '';
@@ -1300,6 +1307,14 @@
               }
            }
 
+           if (results[i]['省编码'] === undefined) {
+             obj['provinces_code'] = ''
+           } else {
+             if (key == '省编码') {
+               obj['provinces_code'] = results[i][key].replace(/\s/g,"")
+             }
+           }
+
           if (results[i]['是否特病目录'] === undefined) {
                 obj['is_special_diseases'] = ''
               } else {
@@ -1498,7 +1513,7 @@
        getInitializtion().then(response=>{
          if(response.data.state == 1){
            var goodKindList = response.data.data.goodKindList;
-           
+
            this.goodKindList = goodKindList
            var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
            console.log("医保等级",medicalInsuranceLevelList)
@@ -1509,7 +1524,7 @@
       exportList(){
         import('@/vendor/Export2Excel').then(excel => {
          console.log("this.table",this.goodInfo.goodInfoDialog.formValue.goodType)
-         
+
          for(let i=0;i<this.goodInfo.goodInfoData.length;i++){
            for(let j=0;j<this.goodKindList.length;j++){
               if(this.goodInfo.goodInfoData[i].good_kind == this.goodKindList[j].value){
@@ -1518,7 +1533,7 @@
            }
            for(let z=0;z<this.goodInfo.goodInfoDialog.formValue.goodType.length;z++){
               if(this.goodInfo.goodInfoData[i].good_type_id == this.goodInfo.goodInfoDialog.formValue.goodType[z].id){
-                
+
                  this.goodInfo.goodInfoData[i].good_type_name = this.goodInfo.goodInfoDialog.formValue.goodType[z].type_name
               }
            }
@@ -1534,27 +1549,27 @@
                 this.goodInfo.goodInfoData[i].manufacturer_name =  this.manufacturers[s].manufacturer_name
              }
            }
-          
+
           for(let a=0;a<this.dealers.length;a++){
              if(this.dealers[a].id == this.goodInfo.goodInfoData[i].dealer){
-                 this.goodInfo.goodInfoData[i].dealer_name = this.dealers[a].dealer_name 
-             } 
+                 this.goodInfo.goodInfoData[i].dealer_name = this.dealers[a].dealer_name
+             }
           }
          }
          console.log("hhhadhh233323232",this.goodInfo.goodInfoData)
-       
+
          const tHeader = ['耗材名称','耗材种类','耗材类型','医保等级','规格型号','生产厂商','单位','零价','库存警戒','经销商','最新进价','医保编码','社保目录编码']
-         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code'] 
-         
+         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code']
+
          const data = this.formatJson(filterVal,this.goodInfo.goodInfoData)
-     
+
          excel.export_json_to_excel({
            header: tHeader,
            data,
            filename: '耗材信息'
          })
           this.downloadLoading = false
-    
+
         })
        },
        formatJson(filterVal, jsonData) {

src/xt_pages/data/components/drugs.vue

@@ -96,13 +96,13 @@
           </div>
         </template>
       </el-table-column>
-  
+
       <el-table-column prop="date" label="进货价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.last_price}}</div>
         </template>
       </el-table-column>
-     
+
       <el-table-column label="拆零零售价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.min_price}}</div>
@@ -296,6 +296,7 @@
           drug_dose: '',//药品剂量
           drug_dose_unit: '',
           medical_insurance_number: '',//医保编号
+          provinces_code:'',//省编码
           manufacturer: '', //生产产商
           pharmacology_category: '',//药理分类
           statistics_category: '',//统计分类
@@ -349,6 +350,7 @@
           drug_dose: '',//药品剂量
           drug_dose_unit: '',
           medical_insurance_number: '',//医保编号
+          provinces_code:"",
           manufacturer: '', //生产产商
           pharmacology_category: '',//药理分类
           statistics_category: '',//统计分类
@@ -705,7 +707,7 @@
                  this.formValue.drug_classify = ""
               }
 
-              
+
 
               this.$refs.addDrugs.show(id, this.formValue)
 
@@ -970,7 +972,7 @@
            console.log("isHasMinUnit",isHasMinUnit)
           var isHasPackingUnit = header.includes('*包装单位')
           console.log("isHasPackingUnit",isHasPackingUnit)
-        
+
           var isHasDrugType =  header.includes('*药品类型');
           console.log("isHasDrugType",isHasDrugType)
           var isHasDrugStockLimit =  header.includes('*库存警戒');
@@ -979,14 +981,14 @@
           console.log("isHasDrugOriginPlace",isHasDrugOriginPlace)
           var isHasDrugDosageForm = header.includes('*药品剂型');
           console.log("isHasDrugDosageForm",isHasDrugDosageForm)
-         
+
           var isHasRetailPrice = header.includes('*拆零零售价');
           console.log("isHasRetailPrice",isHasRetailPrice)
           var isHasPackingPrice= header.includes('*包装零售价');
           console.log("isHasLastPrice",isHasPackingPrice)
           var isHasLastPrice = header.includes('*进货价');
           console.log("进货价",isHasLastPrice)
-          
+
           var isHasDrugClassifye = header.includes('*药物分类');
          console.log("isHasDrugClassifye",isHasDrugClassifye)
          var isHasManufacturer = header.includes('*生产厂商');
@@ -997,7 +999,7 @@
          console.log("isDrugDoseUnit",isDrugDoseUnit)
           if (!(isHasDrugName  && isHasDosage && isHasMaxUnit && isHasUnval && isHasMinUnit && isHasPackingUnit && isHasDrugType &&  isHasDrugStockLimit && isHasDrugOriginPlace &&
           isHasDrugDosageForm &&  isHasRetailPrice && isHasPackingPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit)) {
-           
+
             this.dialogVisible = true;
             return
           }
@@ -1037,7 +1039,7 @@
            }
 
 
-  
+
           if (results[i]['*拆零'] === undefined) {
                 obj['min_number'] = ''
               } else {
@@ -1251,6 +1253,17 @@
               }
            }
 
+           if (results[i]['省编码'] === undefined) {
+             obj['provinces_code'] = ''
+           } else {
+             if (key == '省编码') {
+               obj['provinces_code'] = results[i][key].replace(/\s/g,"")
+             }
+           }
+
+
+
+
             if (results[i]['药理分类'] === undefined) {
                 obj['pharmacology_category'] = ''
               } else {
@@ -1415,7 +1428,7 @@
           'drugs':tableData
         };
         console.log("params222222222",params)
-        
+
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;
@@ -1485,15 +1498,15 @@
 
       exportList(){
          import('@/vendor/Export2Excel').then(excel => {
-         
-        
+
+
          console.log("this.table",this.list)
 
          for(let i=0;i<this.list.length;i++){
           for(let j=0;j<this.drugCategoryList.length;j++){
               if(this.list[i].drug_category == this.drugCategoryList[j].value){
                  this.list[i].drug_category_name = this.drugCategoryList[j].name
-              }  
+              }
           }
            for(let z=0;z<this.drugDosageFormList.length;z++){
               if(this.list[i].drug_dosage_form == this.drugDosageFormList[z].value){
@@ -1525,17 +1538,17 @@
          }
 
          const tHeader = ['药品名称','药品规格','剂量','剂量单位','拆零','拆零单位','包装单位','药品类型','库存警戒','产地','药品剂型','拆零零售价','包装零售价','进货价','药物分类','默认单次用量','默认单次用量单位','生产厂商','经销商','医保编码','社保目录编码']
-         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit_name','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code'] 
-         
+         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit_name','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code']
+
          const data = this.formatJson(filterVal,this.list)
-     
+
          excel.export_json_to_excel({
            header: tHeader,
            data,
            filename: '药品信息'
          })
           this.downloadLoading = false
-    
+
         })
        },
        formatJson(filterVal, jsonData) {

src/xt_pages/hospitalStation/chargeDetailManagement.vue

@@ -1149,7 +1149,8 @@ export default {
                 fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
                 overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
                 preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
-                inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt
+                inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt,
+                execution_state: prescription.advices[b].execution_state,
 
               }
               tempAdvice.push(obj)
@@ -1175,7 +1176,9 @@ export default {
                 fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,
                 overlmt_amt: prescription.project[b].order_info.overlmt_amt,
                 preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
-                inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt
+                inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt,
+                execution_state: prescription.project[b].execution_state,
+
 
               }
 

src/xt_pages/hospitalStation/components/ChargePrescriptionTable.vue

@@ -48,6 +48,13 @@
       </el-table-column>
 
 
+      <el-table-column align="center" prop="name" width="60" label="执行状态">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_state == 1?'已执行':'未执行'}}</div>
+        </template>
+      </el-table-column>
+
+
 
       <el-table-column align="center" prop="name" width="60" label="医保编码">
         <template slot-scope="scope">
@@ -170,6 +177,12 @@
         </template>
       </el-table-column>
 
+      <el-table-column align="center" prop="name" width="60" label="执行状态">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_state == 1?'已执行':'未执行'}}</div>
+        </template>
+      </el-table-column>
+
 
 
 

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1619,7 +1619,7 @@ export default {
       return total
 
     },
-    getTotalTwo() {
+    getTotalTwo() {de
       var total = 0
       for (let i = 0; i < this.month_prescriptions.length; i++) {
 

src/xt_pages/hospitalStation/index.vue

@@ -73,6 +73,17 @@
                         </el-select>
                     </el-form-item>
 
+                  <el-form-item label="参保地：">
+                    <el-select v-model="form.insuplc_admdvs" placeholder="请选择" style="width:100%;">
+                      <el-option
+                          v-for="item in InsuplcAdmdvs"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+
                     <!--<el-form-item class="specialFormItem" label="医保卡号：">-->
                     <!--<div style="display:flex;">-->
                     <!--<el-input v-model="form.medicalInsuranceCard"></el-input>-->
@@ -277,7 +288,8 @@
           phone: '',
           id_card_type: 2,
           med_type: '',
-          settlement_value: 1
+          settlement_value: 1,
+          insuplc_admdvs:''
 
         },
 
@@ -442,11 +454,19 @@
                 }).then(() => {
 
 
+
                 }).catch(() => {
                 })
               } else {
                 // console.log(parseNumber(response.data.data.info.output.insuinfo.psn_type))
                 // console.log(parseNumber(response.data.data.insutype))
+                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,
+                    label:response.data.data.info.output.insuinfo[i].insuplc_admdvs,
+                  })
+
+                }
 
                 that.form.psn_type = parseInt(response.data.data.info.output.insuinfo[0].psn_type)
                 that.form.social_type = parseInt(response.data.data.insutype)
@@ -693,7 +713,8 @@
               start_time: this.form.start_time,
               social_type: this.form.social_type,
               psn_type: this.form.psn_type,
-              balance_accounts_type: this.form.settlement_value
+              balance_accounts_type: this.form.settlement_value,
+              insuplc_admdvs: this.form.insuplc_admdvs
 
             }
             params['record_time'] = this.record_date

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -47,6 +47,12 @@
         </template>
       </el-table-column>
 
+      <el-table-column align="center" prop="name" width="60" label="执行状态">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_state == 1 ? '已执行':'未执行'}}</div>
+        </template>
+      </el-table-column>
+
 
       <el-table-column align="center" prop="name" width="120" label="医保编码">
         <template slot-scope="scope">
@@ -150,6 +156,11 @@
         <template slot-scope="scope">{{scope.row.price}}元</template>
       </el-table-column>
 
+      <el-table-column align="center" prop="name" width="60" label="执行状态">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_state == 1 ? '已执行':'未执行'}}</div>
+        </template>
+      </el-table-column>
 
 
       <el-table-column align="center" prop="name" width="120" label="医保编码">

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -110,6 +110,18 @@
       <!--</el-select>-->
       <!--</el-form-item>-->
 
+      <el-form-item label="参保地：">
+        <el-select v-model="form.insuplc_admdvs" placeholder="请选择" style="width:100%;">
+          <el-option
+              v-for="item in InsuplcAdmdvs"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
 
       <el-form-item label="结算类型：">
         <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
@@ -247,6 +259,7 @@
 
         form: {
           id: '',
+          insuplc_admdvs:'',
           settlement_value: 1,
           medical_insurance_card: '',
           name: '',
@@ -288,6 +301,7 @@
           { value: 7, label: '合同' },
           {value: 8, label: '医保自费'},
 
+        ],InsuplcAdmdvs:[
         ],
         sex: [{
           value: 1,
@@ -544,6 +558,55 @@
           '-' +
           birth.substr(6, 2)
         this.form.age = jsGetAge(births, '-')
+
+
+
+        var that = this
+        let params={
+          id_card_no: this.form.id_card,
+          admin_user_id:this.$store.getters.xt_user.user.id,
+
+        }
+        axios.get('http://127.0.0.1:9532/zh/api/patient/info', {
+          params: params,
+          headers: {
+            'Permission': 5
+          }
+        })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                that.loadingone = false
+                return false
+              } else {
+                that.loadingone = false
+                if (response.data.data.failed_code == -10) {
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                } else {
+                  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,
+                      label:response.data.data.info.output.insuinfo[i].insuplc_admdvs,
+                    })
+
+                  }
+
+
+                  that.form.social_type = parseInt(response.data.data.insutype)
+                }
+              }
+            })
+            .catch(function(error) {
+
+            })
+
       },
       querySearchAsync(keyword, cb) {
         let key = ''
@@ -630,6 +693,7 @@
         this.form.cost = ''
         this.form.phone = ''
         this.form.social_type = ''
+        this.form.insuplc_admdvs =''
 
         this.form.p_type = 14
         this.form.sick_type = this.sick[0].id

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1232,6 +1232,7 @@ export default {
                 prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                 medical_insurance_number: prescription.advices[b].med_list_codg,
 
+
                 code: prescription.advices[b].drug.medical_insurance_number,
                 spec: spec,
                 det_item_fee_sumamt: prescription.advices[b].order_info.det_item_fee_sumamt,
@@ -1239,7 +1240,8 @@ export default {
                 fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
                 overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
                 preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
-                inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt
+                inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt,
+                execution_state: prescription.advices[b].execution_state,
 
               }
               tempAdvice.push(obj)
@@ -1267,7 +1269,10 @@ export default {
                 fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,
                 overlmt_amt: prescription.project[b].order_info.overlmt_amt,
                 preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
-                inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt
+                inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt,
+
+                execution_state: prescription.project[b].execution_state,
+
 
               }
 
@@ -3611,7 +3616,8 @@ export default {
                       fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
                       overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
                       preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
-                      inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt
+                      inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt,
+                      execution_state:prescription.advices[b].execution_state,
 
                     }
                     tempAdvice.push(obj)
@@ -3634,6 +3640,7 @@ export default {
                       // medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].unit,
                       type: prescription.project[b].type,
+                      execution_state:prescription.project[b].execution_state,
 
                       det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt,
                       fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2296,7 +2296,7 @@
                   this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
                 }
               }
-            
+
               let data = {
                 'prescriptions': this.prescriptions
               }
@@ -2864,7 +2864,8 @@
                   medical_insurance_number: temp[b].medical_insurance_number,
                   drug: temp[b],
                   groupno: index + temp_index,
-                  hosp_appr_flag: '1'
+                  hosp_appr_flag: '1',
+                  execution_state:2,
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
@@ -2893,7 +2894,9 @@
                   remark: '',
                   medical_code: temp2[b].medical_code,
                   unit: temp2[b].unit,
-                  type: temp2[b].type
+                  type: temp2[b].type,
+                  execution_state:2,
+
                 }
 
                 if (temp2[b].type == 2){

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -983,6 +983,9 @@ export default {
             // price = price + project_month_prescriptions.project[a].price
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
 
+
+
+
           }
         }
         obj['total'] = count
@@ -1445,7 +1448,8 @@ export default {
                   id: prescription.advices[b].drug_id,
                   drug: prescription.advices[b].drug,
                   groupno: prescription.advices[b].groupno,
-                  hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
+                  hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                  execution_state: prescription.advices[b].execution_state,
 
                 }
                 tempAdvice.push(obj)
@@ -1467,7 +1471,9 @@ export default {
                   remark: prescription.project[b].remark,
                   medical_code: prescription.project[b].project.medical_code,
                   unit: prescription.project[b].project.unit,
-                  type: prescription.project[b].type
+                  type: prescription.project[b].type,
+                  execution_state: prescription.project[b].execution_state,
+
 
                 }
 
@@ -1575,7 +1581,9 @@ export default {
                     id: prescription.advices[b].drug_id,
                     drug: prescription.advices[b].drug,
                     groupno: prescription.advices[b].groupno,
-                    hosp_appr_flag: '1'
+                    hosp_appr_flag: '1',
+                    execution_state: 2,
+
 
                   }
 
@@ -1620,7 +1628,8 @@ export default {
                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].project.unit,
-                    type: prescription.project[b].type
+                    type: prescription.project[b].type,
+                    execution_state: 2,
 
                   }
 
@@ -1845,7 +1854,9 @@ export default {
                         id: prescription.advices[b].drug_id,
                         drug: prescription.advices[b].drug,
                         groupno: prescription.advices[b].groupno,
-                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
+                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                        execution_state: prescription.advices[b].execution_state,
+
 
                       }
                       tempAdvice.push(obj)
@@ -1867,7 +1878,8 @@ export default {
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].project.unit,
-                        type: prescription.project[b].type
+                        type: prescription.project[b].type,
+                        execution_state: prescription.project[b].execution_state,
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -1977,7 +1989,9 @@ export default {
                           drug: prescription.advices[b].drug,
                           groupno: prescription.advices[b].groupno,
 
-                          hosp_appr_flag: '1'
+                          hosp_appr_flag: '1',
+                          execution_state: 2,
+
 
                         }
                         console.log('看看数据1：')
@@ -2021,7 +2035,8 @@ export default {
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].project.unit,
-                          type: prescription.project[b].type
+                          type: prescription.project[b].type,
+                          execution_state: 2,
 
                         }
 
@@ -2344,7 +2359,8 @@ export default {
                         id: prescription.advices[b].drug_id,
                         drug: prescription.advices[b].drug,
                         groupno: prescription.advices[b].groupno,
-                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
+                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                        execution_state: prescription.advices[b].execution_state,
 
                       }
                       tempAdvice.push(obj)
@@ -2365,7 +2381,9 @@ export default {
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].project.unit,
-                        type: prescription.project[b].type
+                        type: prescription.project[b].type,
+                        execution_state: prescription.project[b].execution_state,
+
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -2469,7 +2487,9 @@ export default {
                           drug: prescription.advices[b].drug,
                           groupno: prescription.advices[b].groupno,
 
-                          hosp_appr_flag: '1'
+                          hosp_appr_flag: '1',
+                          execution_state: 2,
+
 
                         }
                         console.log('看看数据2：')
@@ -2511,7 +2531,9 @@ export default {
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].project.unit,
-                          type: prescription.project[b].type
+                          type: prescription.project[b].type,
+                          execution_state: 2,
+
                         }
 
                         if (prescription.project[b].type == 2) {
@@ -2823,7 +2845,9 @@ export default {
                       id: prescription.advices[b].drug_id,
                       drug: prescription.advices[b].drug,
                       groupno: prescription.advices[b].groupno,
-                      hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
+                      hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                      execution_state: prescription.advices[b].execution_state
+
 
                     }
                     tempAdvice.push(obj)
@@ -2844,7 +2868,9 @@ export default {
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].project.unit,
-                      type: prescription.project[b].type
+                      type: prescription.project[b].type,
+                      execution_state: prescription.project[b].execution_state
+
                     }
 
                     if (prescription.project[b].type == 2) {
@@ -2948,7 +2974,9 @@ export default {
                         drug: prescription.advices[b].drug,
                         groupno: prescription.advices[b].groupno,
 
-                        hosp_appr_flag: '1'
+                        hosp_appr_flag: '1',
+                        execution_state: 2
+
 
                       }
                       console.log('看看数据3：')
@@ -2990,7 +3018,9 @@ export default {
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].project.unit,
-                        type: prescription.project[b].type
+                        type: prescription.project[b].type,
+                        execution_state: 2
+
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -3362,7 +3392,9 @@ export default {
                         id: prescription.advices[b].drug_id,
                         drug: prescription.advices[b].drug,
                         groupno: prescription.advices[b].groupno,
-                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
+                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                        execution_state: prescription.advices[b].execution_state
+
 
                       }
                       tempAdvice.push(obj)
@@ -3383,7 +3415,9 @@ export default {
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].project.unit,
-                        type: prescription.project[b].type
+                        type: prescription.project[b].type,
+                        execution_state: prescription.project[b].execution_state
+
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -3494,7 +3528,9 @@ export default {
                           drug: prescription.advices[b].drug,
                           groupno: prescription.advices[b].groupno,
 
-                          hosp_appr_flag: '1'
+                          hosp_appr_flag: '1',
+                          execution_state: 2,
+
 
                         }
                         console.log('看看数据4：')
@@ -3536,7 +3572,8 @@ export default {
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].project.unit,
-                          type: prescription.project[b].type
+                          type: prescription.project[b].type,
+                          execution_state: 2,
                         }
 
                         if (prescription.project[b].type == 2) {
@@ -3931,7 +3968,9 @@ export default {
                         id: prescription.advices[b].drug_id,
                         drug: prescription.advices[b].drug,
                         groupno: prescription.advices[b].groupno,
-                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
+                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                        execution_state: prescription.advices[b].execution_state
+
 
                       }
                       tempAdvice.push(obj)
@@ -3953,7 +3992,9 @@ export default {
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].project.unit,
-                        type: prescription.project[b].type
+                        type: prescription.project[b].type,
+                        execution_state: prescription.project[b].execution_state
+
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -4064,7 +4105,9 @@ export default {
                           drug: prescription.advices[b].drug,
                           groupno: prescription.advices[b].groupno,
 
-                          hosp_appr_flag: '1'
+                          hosp_appr_flag: '1',
+                          execution_state: 2
+
 
                         }
                         console.log('看看数据5：')
@@ -4107,7 +4150,9 @@ export default {
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].project.unit,
-                          type: prescription.project[b].type
+                          type: prescription.project[b].type,
+                          execution_state: 2
+
                         }
 
                         if (prescription.project[b].type == 2) {

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -108,7 +108,11 @@
             </el-form-item>
             <el-form-item label="医保编码 : " prop="medical_insurance_number">
               <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder=""
-                        maxlength="30"></el-input>
+                        ></el-input>
+            </el-form-item>
+            <el-form-item label="省编码 : " prop="provinces_code">
+              <el-input v-model="form.provinces_code" style="width:160px;" placeholder=""
+                        ></el-input>
             </el-form-item>
             <el-form-item label="是否特病目录:" prop="is_special_diseases">
               <el-select v-model="form.is_special_diseases" style="width:160px;" placeholder="请选择">
@@ -342,6 +346,7 @@
           good_unit: '',
           retail_price: '',
           medical_insurance_number: '',
+          provinces_code:'',
           is_special_diseases: '',
           is_record: '',
           statistics_category: '',
@@ -475,6 +480,7 @@
               good_unit: '',
               retail_price: '',
               medical_insurance_number: '',
+            provinces_code:'',
               is_special_diseases: '',
               is_record: '',
               statistics_category: '',
@@ -559,6 +565,8 @@
         form['manufacturer'] = this.form.manufacturer
         form['retail_price'] = this.form.retail_price
         form['medical_insurance_number'] = this.form.medical_insurance_number
+        form['provinces_code'] = this.form.provinces_code
+
         form['is_special_diseases'] = this.form.is_special_diseases
         form['is_record'] = this.form.is_record
         form['statistics_category'] = this.form.statistics_category