1

src/components/Materialman/rukuDetails.vue

@@ -28,11 +28,7 @@
             </el-col>
             <el-col :span="12">
               <span>仓库名称 :</span>
-              <span>{{GetDetail.StockInNum}}</span>
-            </el-col>
-            <el-col :span="12">
-              <span>数量:</span>
-              <span>{{GetDetail.StockInNum}}</span>
+              <span>{{GetDetail.WareHouseName}}</span>
             </el-col>
             <el-col :span="12">
               <span>金额:</span>

src/components/Materialman/rukuExamine.vue

@@ -28,7 +28,7 @@
           <el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商"  @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
         </li>
         <li>
-          <el-input class="w200" size="small" v-model="msg.FinanceId" placeholder="财务单Id"  @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
+          <el-input class="w200" size="small" v-model="msg.FinanceId" placeholder="采购单据"  @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
         </li>
         <li>
           <el-select size="small" filterable clearable v-model="msg.WarehouseId" placeholder="仓库" @change="msg.pageIndex=1,getList()">
@@ -94,7 +94,7 @@
               <td>{{delist.UnitPrice}}</td>
               <td>{{delist.Money}}</td>
               <td>{{delist.Number}}</td>
-              <td >{{item.FinanceId}}</td>
+              <td :rowspan="item.DetailList.length" v-if="index==0">{{item.FinanceId}}</td>
               <td :rowspan="item.DetailList.length" v-if="index==0">
                 <p>{{item.UpdateBy}}</p>
                 <p>{{item.UpdateDate}}</p>
@@ -106,6 +106,9 @@
                 <el-tooltip class="item" effect="dark" content="审批" placement="top">
                   <img v-show="showTable==1" @click="See(item,'rukuDetails','rukuExamine','shenpi')" style="width:24px;height:24px" src="../../assets/img/shenpi.png" alt="">
                 </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="转交" placement="top">
+                  <img v-show="showTable==1" @click="ZhuanJiao(item)" style="width:24px;height:24px" src="../../assets/img/huifu.png" alt="">
+                </el-tooltip>
               </td>
 
             </tr>
@@ -126,6 +129,35 @@
                      :total="total">
       </el-pagination>
     </div>
+    <el-dialog :close-on-click-modal="false"
+               title="转交"
+               :visible.sync="dialogState"
+               width="530px">
+      <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
+        <div class="basefix">
+          <el-form-item label="" prop="AuditEmId">
+            <span class="label">转交人</span>
+            <el-select filterable size="small" v-model="addMsg.AuditEmId" placeholder="转交人" :filter-method="getEmployee">
+              <el-option
+                v-for="item in EmployeeList2"
+                :key="item.EmployeeId"
+                :label="item.EmName"
+                :value="item.EmployeeId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="">
+            <span class="label">备注</span>
+            <el-input v-model="addMsg.Description"></el-input>
+          </el-form-item>
+        </div>
+
+        <div class="btnformItem">
+          <span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span>
+          <span class="exitBtn" @click="dialogState=false">取消</span>
+        </div>
+      </el-form>
+    </el-dialog>
 
   </div>
 </template>
@@ -141,8 +173,10 @@
             morequery:false,
             dateList:[],
             tableData: [],
+            EmployeeList2:[],
             loading:false,
             total:0,
+            EmName:'',
             msg:{
               pageIndex:1,
               pageSize:10,
@@ -154,11 +188,23 @@
               EndTime:'',
             },
             getWareHouseList:[],
+            rules:{
+              AuditEmId: [
+                { required: true, message: '请选择转交人', trigger: 'change' }
+              ]
+            },
+            addMsg:{
+              AuditEmId:'',
+              WorkFlowId:'',
+              // TransferEmpId:'',
+              Description:'',
+            },
+            dialogState:false,
           }
         },
       mounted(){
-        this.getList()
-        this.getWareHouse()
+        this.getList();
+        this.getWareHouse();
       },
     methods:{
       getList(){
@@ -222,6 +268,44 @@
           null
         );
       },
+      submitForm(formName) {
+        let arr=[];
+        arr.push(this.addMsg);
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.apiJavaPost("/api/Supplies/AuditCareOf",arr,
+              res => {
+                if (res.data.resultCode === 1) {
+                  this.getList();
+                  this.Success(res.data.message)
+                  this.dialogState=false;
+
+                } else {
+                  this.Error(res.data.message);
+                }
+              },
+              null
+            );
+          } else {
+            return false;
+          }
+        });
+      },
+      getEmployee(val){//用户列表
+        if(val!=''){
+          this.EmName=val;
+        }
+        this.apiJavaPost("/api/User/GetEmployeeList",{EmName:this.EmName},
+          res => {
+            if (res.data.resultCode === 1) {
+                this.EmployeeList2=res.data.data;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
       See(item,path,backto,type){
         let shenpistr=type;
         this.$router.push({
@@ -238,6 +322,11 @@
         this.msg.pageIndex = val;
         this.getList();
       },
+      ZhuanJiao(item){
+        this.dialogState=true;
+        this.addMsg.WorkFlowId=item.Id;
+
+      },
     }
   }
 </script>