瀏覽代碼

Merge remote-tracking branch 'origin/master'

yumeng 2 年之前
父節點
當前提交
3451c74118
共有 2 個文件被更改,包括 105 次插入0 次删除
  1. 10 0
      src/api/goodsManagement/goods.js
  2. 95 0
      src/views/goodsManagement/samplingList.vue

+ 10 - 0
src/api/goodsManagement/goods.js

@@ -161,6 +161,16 @@ export function batchProcess(query) {
     })
 }
 
+//领样人修改-查询人员列表
+export function getUserList(query) {
+    return request({
+        url: '/itemCollectSamples/getUserList',
+        method: 'get',
+        params: query
+    })
+}
+
+
 
 //领样作废
 

+ 95 - 0
src/views/goodsManagement/samplingList.vue

@@ -373,6 +373,16 @@
               <div v-if="!!scope.row.collectSampleName">
                 {{ scope.row.collectSampleName }}
                 <a
+                  v-if="
+                    $store.getters.roles[0] == 'admin' ||
+                    $store.getters.roles[0] == 'associationManager' ||
+                    $store.getters.roles[0] == 'bdManager'
+                  "
+                  style="text-align: center"
+                  @click="getUserList(scope.row)"
+                  >编辑</a
+                >
+                <a
                   v-if="scope.row.sampleVoucherStatus == 2"
                   style="text-align: center"
                   @click="
@@ -989,6 +999,52 @@
     >
       <img :src="lookImage" style="width: 100%; height: auto" alt="" />
     </el-dialog>
+    <!-- 上传作业 -->
+    <el-dialog
+      title="修改领样人"
+      :visible.sync="editUserIdVisible"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="formUser"
+        :model="formUser"
+        :rules="formUserRules"
+        label-width="100px"
+        :inline="true"
+      >
+        <el-form-item label="选择人员" prop="userData">
+          <el-select
+            v-model="formUser.userData"
+            placeholder="请选择"
+            clearable
+            filterable
+          >
+            <el-option
+              v-for="item in userList"
+              :key="item.code"
+              :label="item.userName"
+              :value="item.userId + '@' + item.userName"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormUser" :loading="confirmLoading"
+          >确 定</el-button
+        >
+        <el-button
+          @click="
+            confirmLoading = false;
+            editUserIdVisible = false;
+            formUser = {};
+          "
+          >取 消</el-button
+        >
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -1011,6 +1067,8 @@ import {
   updateCourierNumber,
   toUpdateTask,
   batchProcess,
+  updatePreview,
+  getUserList,
 } from "@/api/goodsManagement/goods";
 import { getSupplyChainUserList } from "@/api/supplyChain/supplyChain";
 import selectTree from "./selectTree.vue";
@@ -1037,6 +1095,8 @@ export default {
       }
     };
     return {
+      editUserIdVisible: false,
+      userList: [],
       lookImageVisible: false,
       lookImage: undefined,
       noticeContent: "",
@@ -1109,6 +1169,14 @@ export default {
       },
       // 表单参数
       form: {},
+      formUserRules: {
+        userData: {
+          required: true,
+          message: "人员必选",
+          trigger: "change",
+        },
+      },
+      formUser: {},
       formBroadcast: {},
       //上传报表下拉数据
       formList: {},
@@ -1252,6 +1320,33 @@ export default {
     },
   },
   methods: {
+    getUserList(item) {
+      getUserList({ userId: this.userId })
+        .then((res) => {
+          this.editUserIdVisible = true;
+          this.userList = res.data;
+          this.ids = item.id;
+        })
+        .catch(() => {});
+    },
+    submitFormUser() {
+      this.$refs["formUser"].validate((valid) => {
+        if (valid) {
+          this.confirmLoading = true;
+          let params = {};
+          params.collectSampleId = this.formUser.userData.split("@")[0];
+          params.collectSampleName = this.formUser.userData.split("@")[1];
+          params.id = this.ids;
+          updatePreview(params).then((res) => {
+            this.confirmLoading = false;
+            this.editUserIdVisible = false;
+            this.formUser = {};
+            this.getList();
+            this.$modal.msgSuccess("修改成功");
+          });
+        }
+      });
+    },
     sortChange(col, prop, order) {
       this.prop =
         col.prop == "createTime"