Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/views/saleManage/saleOrder/components/addDialog.vue

@@ -207,6 +207,12 @@
               </template>
             </el-input>
           </el-form-item>
+          <el-form-item
+            label="发起人所属部门"
+            prop="createDeptName"
+          >
+            <el-input v-model="form.createDeptName" :disabled="true"></el-input>
+          </el-form-item>
         </el-col>
       </el-row>
       <headerTitle title="基本信息" v-if="form.needProduce != 2"></headerTitle>
@@ -574,6 +580,7 @@
   import { parameterGetByCode } from '@/api/main/index.js';
   import quotationList from '@/views/contractManage/contractBook/components/quotationList.vue';
   import opportunityDialog from '@/views/financialManage/components/opportunityDialog.vue';
+  import { mapGetters } from 'vuex';
   export default {
     mixins: [dictMixins],
     components: {
@@ -650,7 +657,8 @@
         relationType: '',
         relationName: '',
         relationCode: '',
-        relationId: ''
+        relationId: '',
+        createDeptName: ''
       };
 
       return {
@@ -729,7 +737,7 @@
       };
     },
     computed: {
-
+      ...mapGetters(['user']),
       rules() {
         let isRequired = this.isRequired;
         return {
@@ -800,6 +808,7 @@
       }
     },
     created() {
+      console.log('user', this.user.info)
       this.changePersonel();
       this.getGroupAll();
       this.getEnterprisePage();
@@ -1275,7 +1284,8 @@
           saleTypeName,
           relationType,
           orderFiles,
-          remark
+          remark,
+          createDeptName: this.user.info.groupName
         });
         this.projectData = {};
 
@@ -1324,6 +1334,7 @@
           if (this.contactData.id) {
             this.changeParent({ id: this.contactData.id });
           }
+          this.form.createDeptName = this.user.info.groupName;
           this.form.saleType = 1;
           this.form.progress = 700;
           //嘉实默认值

src/views/saleManage/saleOrder/components/detailDialog.vue

@@ -163,6 +163,16 @@
                 </template>
               </el-input>
             </el-form-item>
+            <el-form-item
+              label="发起人所属部门"
+              prop="createDeptName"
+            >
+              <el-input
+                v-model="form.createDeptName"
+                disabled
+              >
+              </el-input>
+            </el-form-item>
           </el-col>
         </el-row>
         <headerTitle title="基本信息"></headerTitle>