09121144

src/components/OP/SuppliesInventory.vue

@@ -243,7 +243,7 @@
                     <template slot-scope="scope">
                         <el-button size="mini" title="编辑" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
                         <el-button size="mini" @click="instorage(scope.row)" type="primary">入库</el-button>
-                        <el-button size="mini" type="success">领用</el-button>
+                        <el-button size="mini" @click="GoodsReceiveList(scope.row)" type="success">领用</el-button>
                         <el-button size="mini" title="删除" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
                     </template>
                 </el-table-column>
@@ -733,6 +733,34 @@ export default {
             this.ClaimsruleForm.id=0;
             this.$refs[formName].resetFields();
         },
+        //领用列表
+        GoodsReceiveList(row){
+            this.ID=row.id;
+            var url = "/api/PersonnelModule/GoodsReceiveList"
+            var that = this
+            this.$axios({
+                method: 'POST',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' 
+                },
+                data:{
+                    portType:1,
+                    pageIndex:1,
+                    pageSize:10,
+                    goodsId:row.id,
+                    currUserId:that.Userid,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            }).catch(function (error) {
+                that.$message.error("操作错误，联系信息部!");
+            });
+        },
     },
     mounted(){
         this.Userid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;

src/components/Resource/OpOfficialActivities.vue

@@ -265,7 +265,7 @@
                             name="files"
                             >
                                 <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-                                <span style="color: red;font-size: 12px;">* 需上传：对方初次回复的邮件/微信截图和最后确认会面的信息截图</span>
+                                <span style="color: red;font-size: 12px;">* 需上传，对方初次回复的邮件/微信截图和最后确认会面的信息截图（截图显示对方有效邮箱地址）</span>
                                 <!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button> -->
                             </el-upload>
                         </el-form-item>