修改

src/components/empower/empowerManage.vue

@@ -49,7 +49,7 @@
             <el-table-column prop="DomainName" label="域名"></el-table-column>
             <el-table-column prop="Account" label="关联erp账号"></el-table-column>
             <el-table-column prop="MallUserName" label="电商员工姓名"></el-table-column>
-            <el-table-column prop="EmpName" label="创建人姓名"></el-table-column>
+            <!-- <el-table-column prop="EmpName" label="创建人姓名"></el-table-column> -->
             <el-table-column  label="状态">
               <template slot-scope="scope">
                   <span v-if="scope.row.Status==1">待审核</span>

src/components/empower/printManage.vue

@@ -130,7 +130,8 @@
         <div class="xuanzhong"  id = 'xuanzhong' style="display:none" >
             <!-- <div  v-for="(item,index) in checkList" :key="index" class="xuanzhong_item" :id = "item.page" > -->
             <div  v-for="(item,index) in checkList" :key="index" :id = "item.page" style=" width: 283px; height: 283px;padding: 10px;display: flex;flex-direction: column; justify-content: space-around;">
-                <div style=" width:100%; height:40px;text-overflow: ellipsis; display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;">
+                <!-- <div style=" width:100%; height:40px;text-overflow: ellipsis; display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;"> -->
+                <div style=" width:100%; height:30px;text-overflow: ellipsis; line-height: 20px;">
                   {{item.GoodsName}}
                 </div>
                 <div style=' width:100%; display: flex;flex-direction: row;align-items: center;margin-top:10px'>
@@ -346,15 +347,16 @@ export default {
                       setTimeout(()=>{
                           that.batchprint(num)
                       },200)
-                       if(conunt == num){
+                       
+                    }else{
+                      console.log('打印完成')
+                      
                           that.loading = false;
                            that.checkList=[];
                            that.dataList.forEach((x,i)=>{
                              x.Ischeck = false;
                         
                         })
-                        }
-                    }else{
                        
                       return
                     }
@@ -363,7 +365,7 @@ export default {
                 }
             }
             LODOP.PRINT()
-            
+            //  LODOP.PREVIEW()//预览打印
           }
           // else{
             

src/components/orderMan/outboundManage.vue

@@ -23,14 +23,6 @@
         layout="prev, pager, next" :total="total">
       </el-pagination>
     </div>
-    <!-- 选择是否公账 -->
-    <el-dialog title="请选择" :visible.sync="choiceFin" width="400px">
-      
-      <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="choiceFin=false">取消</el-button>
-        <el-button type="primary" size="small" @click="setFince()">确定</el-button>
-      </span>
-    </el-dialog>
 
   </div>
 </template>
@@ -40,7 +32,7 @@
     data() {
       return {
         loading: false,
-        choiceFin: false,
+
        tableData:[],
        total: 0,
        outobj:{
@@ -96,24 +88,36 @@
 
       },
       outapplyfor(){
-        if(this.ERPEmpId==0){
-          this.Error('您还未授权，暂不能出库');
+        let that = this
+        if(that.ERPEmpId==0){
+          that.Error('您还未授权，暂不能出库');
         }else{
-           if (this.outobj.WarehouseOutGoodsList.length == 0) {
-            this.Info('请选择商品');
+
+
+           if (that.outobj.WarehouseOutGoodsList.length == 0) {
+            that.Info('请选择商品');
             return
          } 
-         this.loading = true;
-        this.assetsApipost("/api/WarehouseOut/SetWarehouseOutApply", this.outobj, res => {
-          this.loading = false;
+           that.$confirm('是否申请出库?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+            that.loading = true;
+          that.assetsApipost("/api/WarehouseOut/SetWarehouseOutApply", that.outobj, res => {
+            that.loading = false;
             if (res.data.resultCode == 1) {
-            this.Success(res.data.message);
-            this.outobj.WarehouseOutGoodsList = []
-            this.getList();
+              that.Success(res.data.message);
+              that.outobj.WarehouseOutGoodsList = []
+              that.getList();
             }else{
-            this.Error(res.data.message);
+              that.Error(res.data.message);
             }
           })
+        }).catch(() => {
+
+        });
+         
         }