Переглянути джерело

出库管理,状态修正;出库申请部门;

yijing 1 рік тому
батько
коміт
c3d9600a22

+ 10 - 3
src/views/bpm/outgoingManagement/outbound.vue

@@ -61,7 +61,7 @@
               <el-input placeholder="登记人" disabled v-model="formData.extInfo.createUserName"
                 clearable /></el-form-item></el-col>
           <el-col :span="6">
-            <el-form-item label="领料人部门" prop="extInfo.verifyDeptCode">
+            <el-form-item :label="this.bizType == 10 ? '申请人部门' : '领料人部门'" prop="extInfo.verifyDeptCode">
               <selectTree ref="tree" class="form-ipt" size="medium" style="width: 100%" clearable
                 :value="formData.extInfo.verifyDeptCode" :options="treeList" :props="{
                   value: 'id',
@@ -71,8 +71,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="领料人" prop="fromId">
-              <el-select v-model="formData.fromId" filterable placeholder="请选择领料人">
+            <el-form-item :label="this.bizType == 10 ? '申请人' : '领料人'" prop="fromId">
+              <el-select v-model="formData.fromId" filterable placeholder="请选择">
                 <el-option v-for="item in llrLsit" :key="item.id" :label="item.name" :value="item.id"
                   @click.native="userSlected(item)">
                 </el-option>
@@ -629,7 +629,14 @@ export default {
       // 入库登记人
       this.formData.extInfo.createUserName = this.$store.state.user.info.name;
       this.formData.createUserId = this.$store.state.user.info.userId;
+
+      //
+      // this.formData.extInfo.verifyDeptCode = this.$store.state.user.info.groupId;
+      // this.formData.extInfo.verifyDeptName = this.$store.state.user.info.groupName;
+
+      console.log(this.$store.state.user.info, 'this.$store.state.user.info')
       // 生产相关逻辑
+      console.log(this.detailList, 'this.detailList')
       if (this.detailList?.length > 0) {
         // 获取领料人列表
         this.getStaffList({ id: this.form.executorDeptId }).then(() => {

+ 3 - 2
src/views/bpm/stockManagement/storage.vue

@@ -410,8 +410,9 @@
               <span>{{ qualityStatus[row.status] }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="是否质检" align="center" width="80" prop="qualityControl" :show-overflow-tooltip="true">
-            <template slot-scope="{ row, $index }" v-if="this.bizType != 1">
+          <el-table-column label="是否质检" align="center" width="80" prop="qualityControl" :show-overflow-tooltip="true"
+            v-if="this.bizType != 1">
+            <template slot-scope="{ row, $index }">
               {{ row.qualityControl == 1 ? '是' : row.qualityControl == 0 ? '否' : '' }}
             </template>
           </el-table-column>

+ 1 - 1
vue.config.js

@@ -34,7 +34,7 @@ module.exports = {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
 
-        target: 'http://192.168.1.116:28086',
+        target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18186',
         changeOrigin: true, // 只有这个值为true的情况下 s才表示开启跨域
         pathRewrite: {