|
@@ -6,7 +6,7 @@
|
|
|
:title="title"
|
|
:title="title"
|
|
|
append-to-body
|
|
append-to-body
|
|
|
:close-on-click-modal="false"
|
|
:close-on-click-modal="false"
|
|
|
- :width="isRight ? '800px' : '450px'"
|
|
|
|
|
|
|
+ :width="modelWidth"
|
|
|
:before-close="cancel"
|
|
:before-close="cancel"
|
|
|
:maxable="true"
|
|
:maxable="true"
|
|
|
:resizable="true"
|
|
:resizable="true"
|
|
@@ -62,6 +62,17 @@
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
+
|
|
|
|
|
+ <!-- 客户名称 -->
|
|
|
|
|
+ <template v-slot:eom_contact="scope">
|
|
|
|
|
+ <div class="eom_contact">
|
|
|
|
|
+ <el-input
|
|
|
|
|
+ v-model="scope.model.eom_contact.name"
|
|
|
|
|
+ style="width: 100%"
|
|
|
|
|
+ @click.native="addContact('eom_contact')"
|
|
|
|
|
+ ></el-input>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </template>
|
|
|
</fm-generate-form>
|
|
</fm-generate-form>
|
|
|
</div>
|
|
</div>
|
|
|
<div
|
|
<div
|
|
@@ -269,6 +280,10 @@
|
|
|
@confirm="getTreeList"
|
|
@confirm="getTreeList"
|
|
|
></staffSelection>
|
|
></staffSelection>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+ <parentList
|
|
|
|
|
+ ref="parentRef"
|
|
|
|
|
+ @changeParent="handleConcatConfirm"
|
|
|
|
|
+ ></parentList>
|
|
|
</ele-modal>
|
|
</ele-modal>
|
|
|
</template>
|
|
</template>
|
|
|
<script>
|
|
<script>
|
|
@@ -295,11 +310,12 @@
|
|
|
import staffSelection from '@/components/staffSelection/staffSelection.vue';
|
|
import staffSelection from '@/components/staffSelection/staffSelection.vue';
|
|
|
import { topLevel1, topLevel2, topLevel3 } from '@/enum/dict';
|
|
import { topLevel1, topLevel2, topLevel3 } from '@/enum/dict';
|
|
|
import dayjs from 'dayjs';
|
|
import dayjs from 'dayjs';
|
|
|
|
|
+ import parentList from './components/parentList.vue';
|
|
|
import { number } from 'echarts';
|
|
import { number } from 'echarts';
|
|
|
import { del } from 'vue';
|
|
import { del } from 'vue';
|
|
|
export default {
|
|
export default {
|
|
|
name: 'processSubmitDialog',
|
|
name: 'processSubmitDialog',
|
|
|
- components: { visibilityRangeDialog, staffSelection },
|
|
|
|
|
|
|
+ components: { visibilityRangeDialog, staffSelection, parentList },
|
|
|
mixins: [dictMixins],
|
|
mixins: [dictMixins],
|
|
|
props: {
|
|
props: {
|
|
|
processSubmitDialogFlag: {
|
|
processSubmitDialogFlag: {
|
|
@@ -357,7 +373,15 @@
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
computed: {
|
|
computed: {
|
|
|
- ...mapGetters(['user'])
|
|
|
|
|
|
|
+ ...mapGetters(['user']),
|
|
|
|
|
+ modelWidth() {
|
|
|
|
|
+ let width = this.jsonData.config?.platform && this.jsonData.config.platform === 'pc' ? 1100 : 450;
|
|
|
|
|
+ if(this.isRight) {
|
|
|
|
|
+ return width + 350 + 'px'
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return width + 'px'
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
},
|
|
},
|
|
|
async created() {
|
|
async created() {
|
|
|
let typeObj = await getProduceTreeByCode(
|
|
let typeObj = await getProduceTreeByCode(
|
|
@@ -433,6 +457,37 @@ this.postOptions.push(...response.data);
|
|
|
input_jd9ouzyh: num
|
|
input_jd9ouzyh: num
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
|
|
+
|
|
|
|
|
+ async addContact(type) {
|
|
|
|
|
+ console.log(type);
|
|
|
|
|
+ let data = await this.$refs.generateForm.getData(false);
|
|
|
|
|
+ console.log('data', data);
|
|
|
|
|
+ data[type] = {
|
|
|
|
|
+ id: '',
|
|
|
|
|
+ name: ''
|
|
|
|
|
+ };
|
|
|
|
|
+ this.$refs.generateForm.setData({
|
|
|
|
|
+ type: data[type]
|
|
|
|
|
+ });
|
|
|
|
|
+ let item = {
|
|
|
|
|
+ id: data[type].id
|
|
|
|
|
+ };
|
|
|
|
|
+ this.$refs.parentRef.open(item);
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
|
|
+ async handleConcatConfirm(item) {
|
|
|
|
|
+ console.log('选择的客户', item);
|
|
|
|
|
+
|
|
|
|
|
+ let data = await this.$refs.generateForm.getData(false);
|
|
|
|
|
+ data['eom_contact'] = {
|
|
|
|
|
+ id: item.id,
|
|
|
|
|
+ name: item.name
|
|
|
|
|
+ }
|
|
|
|
|
+ this.$refs.generateForm.setData({
|
|
|
|
|
+ 'eom_contact': data['eom_contact']
|
|
|
|
|
+ });
|
|
|
|
|
+ console.log('data~~~~', data);
|
|
|
|
|
+ },
|
|
|
async init(row = {}) {
|
|
async init(row = {}) {
|
|
|
this.title = row.name; //'新建' + row.name + '单';
|
|
this.title = row.name; //'新建' + row.name + '单';
|
|
|
this.form = _.cloneDeep(row);
|
|
this.form = _.cloneDeep(row);
|
|
@@ -444,7 +499,7 @@ this.postOptions.push(...response.data);
|
|
|
this.$set(this.form, 'key', '');
|
|
this.$set(this.form, 'key', '');
|
|
|
this.$set(this.form, 'valueJson', {});
|
|
this.$set(this.form, 'valueJson', {});
|
|
|
this.jsonData = JSON.parse(this.form.formJson.makingJson);
|
|
this.jsonData = JSON.parse(this.form.formJson.makingJson);
|
|
|
- console.log(this.jsonData);
|
|
|
|
|
|
|
+ console.log('jsonData', this.jsonData);
|
|
|
|
|
|
|
|
this.jsonData.config.dataSource &&
|
|
this.jsonData.config.dataSource &&
|
|
|
this.jsonData.config.dataSource.forEach((item) => {
|
|
this.jsonData.config.dataSource.forEach((item) => {
|