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

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

             <div style="width:50px;">会计：</div><div style="width:100px;"></div>
             <div style="width:50px;">审核：</div><div style="width:100px;"></div>
             <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
-            <div v-if="orgId == 10024" style="display:flex;margin-top:20px;float:right;">
+          </div>
+          <div v-if="orgId == 10024" style="display:flex;margin-top:20px;float:right;">
             <div style="width:50px;">领料人：</div><div style="width:100px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;"></div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
             <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>
           </div>
-          </div>
         </div>
 
       </div>
         }
         return name
       },
+      handleSpanTempArr(){
+        this.tempArr = []
+
+        for (let i = 0; i < this.warehousingOutInfo.warehousingOutData.length; i++) {
+          if (i === 0) {
+            this.tempArr.push(1)
+            this.pos = 0
+          } else {
+            // 判断当前元素与上一个元素是否相同
+            if (this.warehousingOutInfo.warehousingOutData[i].drug_id === this.warehousingOutInfo.warehousingOutData[i - 1].drug_id) {
+              this.tempArr[this.pos] += 1
+              this.tempArr.push(0)
+            } else {
+              this.tempArr.push(1)
+              this.pos = i
+            }
+          }
+        }
+
+        let sameRowArr = [], sIdx = 0
+        this.warehousingOutInfo.warehousingOutData.forEach((item, index) => {
+          item.index = index
+          if (index === 0) {
+            sameRowArr.push([index])
+          } else {
+            if (item.drug_id === this.warehousingOutInfo.warehousingOutData[index - 1].drug_id) {
+              sameRowArr[sIdx].push(index)
+            } else {
+              sIdx = sIdx + 1
+              sameRowArr.push([index])
+            }
+          }
+        })
+        this.sameRowArr = sameRowArr
+      },
     },
     created() {
       const order_id = this.$route.query.id

src/xt_pages/stock/stockOutOrderDetailPrint.vue

                             </tbody>
                         </table>
 
-                        <div style="display:flex;margin-top:20px;float:right;">
-                            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
-                            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
-                            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
-                            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
-                            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
-                       </div>
+                        <div v-if="orgId != 10024" style="display:flex;margin-top:20px;float:right;">
+                          <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+                          <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+                          <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+                          <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+                          <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+                        </div>
+                        <div v-if="orgId == 10024" style="display:flex;margin-top:20px;float:right;">
+                          <div style="width:50px;">领料人：</div><div style="width:100px;"></div>
+                          <div style="width:80px;">审批：</div><div style="width:100px;"></div>
+                          <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
+                          <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
+                          <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>
+                        </div>
                     </div>
                 </div>
             </div>
             is_charge:"",
             list:[],
             wareoutList:[],
+            orgId:''
         }
     },
     methods:{
       
     },
     created(){
-
+      this.orgId = this.$store.getters.xt_user.org.id;
       const order_id = this.$route.query.id;
       const warehouse_out_time = this.$route.query.warehouse_out_time
       this.GetConfigInfo()