6.27

src/xt_pages/data/components/editInspection.vue

@@ -80,7 +80,7 @@
                     <el-table-column align="center" prop="name" label="单位" width="120">
                         <template slot-scope="scope">
                             <div v-if="scope.row.type == 2">{{scope.row.unit}}</div>
-                            <div v-if="scope.row.type == 3">{{getUnit(scope.row.unit)}}</div>
+                            <div v-if="scope.row.type == 3">{{scope.row.unit}}</div>
                         </template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单价" width="120">
@@ -209,7 +209,7 @@
          
             var projectList = response.data.data.projectList
             var goodInfos = response.data.data.good_info
-
+            console.log("332323232323232",goodInfos)
             for (let i = 0; i < projectList.length; i++) {
               let obj = {
                 id: projectList[i].id,
@@ -233,7 +233,7 @@
                 statistical_classification: goodInfos[i].statistical_classification,
                 number: '1',
                 project_name:goodInfos[i].good_name + " " + goodInfos[i].specification_name,
-                unit: goodInfos[i].good_unit,
+                unit: goodInfos[i].packing_unit,
                 price: goodInfos[i].retail_price,
                 type: 3,
                 m_id: 0,
@@ -274,7 +274,7 @@
 
               } else {
                 obj['project_name'] = hisList[i].good_info.good_name
-                obj['unit'] = hisList[i].good_info.good_unit
+                obj['unit'] = hisList[i].good_info.packing_unit
                 obj['price'] = hisList[i].good_info.retail_price
               }
               this.tableData.push(obj)

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div v-if="orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127">
+        <div v-if="orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -78,7 +78,7 @@
       </div> 
 
 
-      <div v-if="orgId == 9675 || orgId == 10210 || orgId == 10188 || orgId == 10127">
+      <div v-if="orgId == 9675 || orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877">
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>

src/xt_pages/stock/stockInOrder.vue

@@ -277,6 +277,11 @@
             {{ scope.row.license_number}}
           </template>
         </el-table-column>
+        <el-table-column label="注册编号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.register_number}}
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
             {{ scope.row.remark }}

src/xt_pages/stock/stockInOrderAdd.vue

@@ -201,6 +201,16 @@
               </el-form-item>
             </template>
           </el-table-column>
+         <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>注册编码</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px">
+                <el-input placeholder="请输入注册编码" v-model="scope.row.register_number" ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
            <el-table-column label="经销商" align="center" width="150">
              <template slot-scope="scope">
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
@@ -544,6 +554,7 @@
         tempObj['name'] = ''
         tempObj['license_number'] = ""
         tempObj["packing_price"] = ""
+        tempObj['register_number'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -795,6 +806,7 @@
         this.currentIndex = val
       },
       handleSelect(val){
+        console.log("al32323232323223",val)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(this.currentIndex == i){
               this.recordInfo.recordData[i].good_type_id = val.id
@@ -805,7 +817,7 @@
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
               this.recordInfo.recordData[i].remark = val.remark
               this.recordInfo.recordData[i].license_number = val.number
-           
+              this.recordInfo.recordData[i].register_number = val.register_number
               if(val.buy_price == 0){
                this.recordInfo.recordData[i].price = ""
               }else{
@@ -861,6 +873,7 @@
       tempObj['name'] = ''
       tempObj['license_number'] = ''
       tempObj['packing_price']= ''
+      tempObj['register_number'] = ''
       this.recordInfo.recordData.push(tempObj)
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit

src/xt_pages/stock/stockInOrderEdit.vue

@@ -245,8 +245,6 @@
             </template>
           </el-table-column>
 
-         
-        
            <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
               <span>批准文号</span>
@@ -261,6 +259,16 @@
               </el-form-item>
             </template>
           </el-table-column>
+          <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>注册编码</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px">
+                <el-input placeholder="请输入注册编码" v-model="scope.row.register_number" ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
           <el-table-column label="经销商" align="center" width="150">
              <template slot-scope="scope">
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
@@ -785,6 +793,7 @@ export default {
             tempObj["dealer"] = "";
             tempObj["manufacturer"] = "";
             tempObj["license_number"] = ""
+            tempObj["register_number"] = ""
             this.recordInfo.recordData.push(tempObj);
           }
         }
@@ -837,6 +846,7 @@ export default {
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
             this.recordInfo.recordData[i].license_number = val.number
+            this.recordInfo.recordData[i].register_number = val.register_number
             if(val.buy_price == 0){
                this.recordInfo.recordData[i].price= ""
             }else{

src/xt_pages/stock/stockOutOrder.vue

@@ -294,6 +294,11 @@
               {{ scope.row.license_number}}
             </template>
           </el-table-column> -->
+            <el-table-column label="注册编码" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.register_number}}
+            </template>
+          </el-table-column>
           <el-table-column label="备注" align="center">
             <template slot-scope="scope">
               {{ scope.row.remark }}

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -277,7 +277,17 @@
               <el-input placeholder="请输入批准文号" v-model="scope.row.license_number" ></el-input>
           </template>
         </el-table-column>
-
+       
+        <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>注册编码</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px">
+                <el-input placeholder="请输入注册编码" v-model="scope.row.register_number" ></el-input>
+              </el-form-item>
+            </template>
+        </el-table-column>
 
           <el-table-column label="经销商"  width="150" align="center">
             <template slot-scope="scope">
@@ -515,6 +525,7 @@ export default {
       tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
       tempObj["buy_price"]= ""
       tempObj["stock_count"] = ""
+      tempObj['register_number'] = ''
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -799,6 +810,7 @@ export default {
             this.recordInfo.recordData[i].buy_price = val.buy_price
             this.recordInfo.recordData[i].stock_count = total_count
             this.recordInfo.recordData[i].license_number = val.number
+            this.recordInfo.recordData[i].register_number = val.register_number
             if(val.packing_price == 0){
               this.recordInfo.recordData[i].price =""
             }else{
@@ -890,6 +902,7 @@ export default {
     tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
     tempObj["buy_price"]= ""
     tempObj["stock_count"] = ""
+    tempObj['register_number'] = ''
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
   

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -261,6 +261,17 @@
           </template>
         </el-table-column>
 
+        <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>注册编码</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px">
+                <el-input placeholder="请输入注册编码" v-model="scope.row.register_number" ></el-input>
+              </el-form-item>
+            </template>
+        </el-table-column>
+
           <el-table-column label="经销商"  width="150" align="center">
             <template slot-scope="scope">
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商"  :disabled="stockShow">
@@ -492,6 +503,7 @@
         tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
         tempObj["buy_price"]= ""
         tempObj["stock_count"] = ""
+        tempObj['register_number'] = ''
         this.recordInfo.recordData.push(tempObj)
       },
       handleDelete: function(index, row) {