XMLWAN 2 anos atrás
pai
commit
a7e3ea34fd

+ 4 - 4
src/xt_pages/data/components/editInspection.vue Ver arquivo

80
                     <el-table-column align="center" prop="name" label="单位" width="120">
80
                     <el-table-column align="center" prop="name" label="单位" width="120">
81
                         <template slot-scope="scope">
81
                         <template slot-scope="scope">
82
                             <div v-if="scope.row.type == 2">{{scope.row.unit}}</div>
82
                             <div v-if="scope.row.type == 2">{{scope.row.unit}}</div>
83
-                            <div v-if="scope.row.type == 3">{{getUnit(scope.row.unit)}}</div>
83
+                            <div v-if="scope.row.type == 3">{{scope.row.unit}}</div>
84
                         </template>
84
                         </template>
85
                     </el-table-column>
85
                     </el-table-column>
86
                     <el-table-column align="center" prop="name" label="单价" width="120">
86
                     <el-table-column align="center" prop="name" label="单价" width="120">
209
          
209
          
210
             var projectList = response.data.data.projectList
210
             var projectList = response.data.data.projectList
211
             var goodInfos = response.data.data.good_info
211
             var goodInfos = response.data.data.good_info
212
-
212
+            console.log("332323232323232",goodInfos)
213
             for (let i = 0; i < projectList.length; i++) {
213
             for (let i = 0; i < projectList.length; i++) {
214
               let obj = {
214
               let obj = {
215
                 id: projectList[i].id,
215
                 id: projectList[i].id,
233
                 statistical_classification: goodInfos[i].statistical_classification,
233
                 statistical_classification: goodInfos[i].statistical_classification,
234
                 number: '1',
234
                 number: '1',
235
                 project_name:goodInfos[i].good_name + " " + goodInfos[i].specification_name,
235
                 project_name:goodInfos[i].good_name + " " + goodInfos[i].specification_name,
236
-                unit: goodInfos[i].good_unit,
236
+                unit: goodInfos[i].packing_unit,
237
                 price: goodInfos[i].retail_price,
237
                 price: goodInfos[i].retail_price,
238
                 type: 3,
238
                 type: 3,
239
                 m_id: 0,
239
                 m_id: 0,
274
 
274
 
275
               } else {
275
               } else {
276
                 obj['project_name'] = hisList[i].good_info.good_name
276
                 obj['project_name'] = hisList[i].good_info.good_name
277
-                obj['unit'] = hisList[i].good_info.good_unit
277
+                obj['unit'] = hisList[i].good_info.packing_unit
278
                 obj['price'] = hisList[i].good_info.retail_price
278
                 obj['price'] = hisList[i].good_info.retail_price
279
               }
279
               }
280
               this.tableData.push(obj)
280
               this.tableData.push(obj)

+ 2 - 2
src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue Ver arquivo

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

+ 5 - 0
src/xt_pages/stock/stockInOrder.vue Ver arquivo

277
             {{ scope.row.license_number}}
277
             {{ scope.row.license_number}}
278
           </template>
278
           </template>
279
         </el-table-column>
279
         </el-table-column>
280
+        <el-table-column label="注册编号" align="center">
281
+          <template slot-scope="scope">
282
+            {{ scope.row.register_number}}
283
+          </template>
284
+        </el-table-column>
280
         <el-table-column label="备注" align="center">
285
         <el-table-column label="备注" align="center">
281
           <template slot-scope="scope">
286
           <template slot-scope="scope">
282
             {{ scope.row.remark }}
287
             {{ scope.row.remark }}

+ 14 - 1
src/xt_pages/stock/stockInOrderAdd.vue Ver arquivo

201
               </el-form-item>
201
               </el-form-item>
202
             </template>
202
             </template>
203
           </el-table-column>
203
           </el-table-column>
204
+         <el-table-column align="center" width="150">
205
+            <template slot="header" slot-scope="scope">
206
+              <span>注册编码</span>
207
+            </template>
208
+            <template slot-scope="scope">
209
+              <el-form-item style="padding-top: 20px">
210
+                <el-input placeholder="请输入注册编码" v-model="scope.row.register_number" ></el-input>
211
+              </el-form-item>
212
+            </template>
213
+          </el-table-column>
204
            <el-table-column label="经销商" align="center" width="150">
214
            <el-table-column label="经销商" align="center" width="150">
205
              <template slot-scope="scope">
215
              <template slot-scope="scope">
206
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
216
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
544
         tempObj['name'] = ''
554
         tempObj['name'] = ''
545
         tempObj['license_number'] = ""
555
         tempObj['license_number'] = ""
546
         tempObj["packing_price"] = ""
556
         tempObj["packing_price"] = ""
557
+        tempObj['register_number'] = ''
547
         this.recordInfo.recordData.push(tempObj)
558
         this.recordInfo.recordData.push(tempObj)
548
       }, handleDelete: function(index, row) {
559
       }, handleDelete: function(index, row) {
549
         if (this.recordInfo.recordData.length <= 1) {
560
         if (this.recordInfo.recordData.length <= 1) {
795
         this.currentIndex = val
806
         this.currentIndex = val
796
       },
807
       },
797
       handleSelect(val){
808
       handleSelect(val){
809
+        console.log("al32323232323223",val)
798
          for(let i=0;i<this.recordInfo.recordData.length;i++){
810
          for(let i=0;i<this.recordInfo.recordData.length;i++){
799
            if(this.currentIndex == i){
811
            if(this.currentIndex == i){
800
               this.recordInfo.recordData[i].good_type_id = val.id
812
               this.recordInfo.recordData[i].good_type_id = val.id
805
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
817
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
806
               this.recordInfo.recordData[i].remark = val.remark
818
               this.recordInfo.recordData[i].remark = val.remark
807
               this.recordInfo.recordData[i].license_number = val.number
819
               this.recordInfo.recordData[i].license_number = val.number
808
-           
820
+              this.recordInfo.recordData[i].register_number = val.register_number
809
               if(val.buy_price == 0){
821
               if(val.buy_price == 0){
810
                this.recordInfo.recordData[i].price = ""
822
                this.recordInfo.recordData[i].price = ""
811
               }else{
823
               }else{
861
       tempObj['name'] = ''
873
       tempObj['name'] = ''
862
       tempObj['license_number'] = ''
874
       tempObj['license_number'] = ''
863
       tempObj['packing_price']= ''
875
       tempObj['packing_price']= ''
876
+      tempObj['register_number'] = ''
864
       this.recordInfo.recordData.push(tempObj)
877
       this.recordInfo.recordData.push(tempObj)
865
       this.GetConfigInfo()
878
       this.GetConfigInfo()
866
       this.propForm.goodUnit = this.$store.getters.good_unit
879
       this.propForm.goodUnit = this.$store.getters.good_unit

+ 12 - 2
src/xt_pages/stock/stockInOrderEdit.vue Ver arquivo

245
             </template>
245
             </template>
246
           </el-table-column>
246
           </el-table-column>
247
 
247
 
248
-         
249
-        
250
            <el-table-column align="center" width="150">
248
            <el-table-column align="center" width="150">
251
             <template slot="header" slot-scope="scope">
249
             <template slot="header" slot-scope="scope">
252
               <span>批准文号</span>
250
               <span>批准文号</span>
261
               </el-form-item>
259
               </el-form-item>
262
             </template>
260
             </template>
263
           </el-table-column>
261
           </el-table-column>
262
+          <el-table-column align="center" width="150">
263
+            <template slot="header" slot-scope="scope">
264
+              <span>注册编码</span>
265
+            </template>
266
+            <template slot-scope="scope">
267
+              <el-form-item style="padding-top: 20px">
268
+                <el-input placeholder="请输入注册编码" v-model="scope.row.register_number" ></el-input>
269
+              </el-form-item>
270
+            </template>
271
+          </el-table-column>
264
           <el-table-column label="经销商" align="center" width="150">
272
           <el-table-column label="经销商" align="center" width="150">
265
              <template slot-scope="scope">
273
              <template slot-scope="scope">
266
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
274
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
785
             tempObj["dealer"] = "";
793
             tempObj["dealer"] = "";
786
             tempObj["manufacturer"] = "";
794
             tempObj["manufacturer"] = "";
787
             tempObj["license_number"] = ""
795
             tempObj["license_number"] = ""
796
+            tempObj["register_number"] = ""
788
             this.recordInfo.recordData.push(tempObj);
797
             this.recordInfo.recordData.push(tempObj);
789
           }
798
           }
790
         }
799
         }
837
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
846
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
838
             this.recordInfo.recordData[i].remark = val.remark
847
             this.recordInfo.recordData[i].remark = val.remark
839
             this.recordInfo.recordData[i].license_number = val.number
848
             this.recordInfo.recordData[i].license_number = val.number
849
+            this.recordInfo.recordData[i].register_number = val.register_number
840
             if(val.buy_price == 0){
850
             if(val.buy_price == 0){
841
                this.recordInfo.recordData[i].price= ""
851
                this.recordInfo.recordData[i].price= ""
842
             }else{
852
             }else{

+ 5 - 0
src/xt_pages/stock/stockOutOrder.vue Ver arquivo

294
               {{ scope.row.license_number}}
294
               {{ scope.row.license_number}}
295
             </template>
295
             </template>
296
           </el-table-column> -->
296
           </el-table-column> -->
297
+            <el-table-column label="注册编码" align="center">
298
+            <template slot-scope="scope">
299
+              {{ scope.row.register_number}}
300
+            </template>
301
+          </el-table-column>
297
           <el-table-column label="备注" align="center">
302
           <el-table-column label="备注" align="center">
298
             <template slot-scope="scope">
303
             <template slot-scope="scope">
299
               {{ scope.row.remark }}
304
               {{ scope.row.remark }}

+ 14 - 1
src/xt_pages/stock/stockOutOrderAdd.vue Ver arquivo

277
               <el-input placeholder="请输入批准文号" v-model="scope.row.license_number" ></el-input>
277
               <el-input placeholder="请输入批准文号" v-model="scope.row.license_number" ></el-input>
278
           </template>
278
           </template>
279
         </el-table-column>
279
         </el-table-column>
280
-
280
+       
281
+        <el-table-column align="center" width="150">
282
+            <template slot="header" slot-scope="scope">
283
+              <span>注册编码</span>
284
+            </template>
285
+            <template slot-scope="scope">
286
+              <el-form-item style="padding-top: 20px">
287
+                <el-input placeholder="请输入注册编码" v-model="scope.row.register_number" ></el-input>
288
+              </el-form-item>
289
+            </template>
290
+        </el-table-column>
281
 
291
 
282
           <el-table-column label="经销商"  width="150" align="center">
292
           <el-table-column label="经销商"  width="150" align="center">
283
             <template slot-scope="scope">
293
             <template slot-scope="scope">
515
       tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
525
       tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
516
       tempObj["buy_price"]= ""
526
       tempObj["buy_price"]= ""
517
       tempObj["stock_count"] = ""
527
       tempObj["stock_count"] = ""
528
+      tempObj['register_number'] = ''
518
       this.recordInfo.recordData.push(tempObj);
529
       this.recordInfo.recordData.push(tempObj);
519
     },
530
     },
520
     handleDelete: function(index, row) {
531
     handleDelete: function(index, row) {
799
             this.recordInfo.recordData[i].buy_price = val.buy_price
810
             this.recordInfo.recordData[i].buy_price = val.buy_price
800
             this.recordInfo.recordData[i].stock_count = total_count
811
             this.recordInfo.recordData[i].stock_count = total_count
801
             this.recordInfo.recordData[i].license_number = val.number
812
             this.recordInfo.recordData[i].license_number = val.number
813
+            this.recordInfo.recordData[i].register_number = val.register_number
802
             if(val.packing_price == 0){
814
             if(val.packing_price == 0){
803
               this.recordInfo.recordData[i].price =""
815
               this.recordInfo.recordData[i].price =""
804
             }else{
816
             }else{
890
     tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
902
     tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
891
     tempObj["buy_price"]= ""
903
     tempObj["buy_price"]= ""
892
     tempObj["stock_count"] = ""
904
     tempObj["stock_count"] = ""
905
+    tempObj['register_number'] = ''
893
     this.recordInfo.recordData.push(tempObj);
906
     this.recordInfo.recordData.push(tempObj);
894
     this.GetConfigInfo();
907
     this.GetConfigInfo();
895
   
908
   

+ 12 - 0
src/xt_pages/stock/stockOutOrderEdit.vue Ver arquivo

261
           </template>
261
           </template>
262
         </el-table-column>
262
         </el-table-column>
263
 
263
 
264
+        <el-table-column align="center" width="150">
265
+            <template slot="header" slot-scope="scope">
266
+              <span>注册编码</span>
267
+            </template>
268
+            <template slot-scope="scope">
269
+              <el-form-item style="padding-top: 20px">
270
+                <el-input placeholder="请输入注册编码" v-model="scope.row.register_number" ></el-input>
271
+              </el-form-item>
272
+            </template>
273
+        </el-table-column>
274
+
264
           <el-table-column label="经销商"  width="150" align="center">
275
           <el-table-column label="经销商"  width="150" align="center">
265
             <template slot-scope="scope">
276
             <template slot-scope="scope">
266
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商"  :disabled="stockShow">
277
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商"  :disabled="stockShow">
492
         tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
503
         tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
493
         tempObj["buy_price"]= ""
504
         tempObj["buy_price"]= ""
494
         tempObj["stock_count"] = ""
505
         tempObj["stock_count"] = ""
506
+        tempObj['register_number'] = ''
495
         this.recordInfo.recordData.push(tempObj)
507
         this.recordInfo.recordData.push(tempObj)
496
       },
508
       },
497
       handleDelete: function(index, row) {
509
       handleDelete: function(index, row) {