~jt/MES-PDA.git

			@@ -644,7 +644,7 @@
			<script>
			import Base64 from '../../components/js-base64/base64.js'
			import pickerAddress from '../../js/pickerAddress/pickerAddress.vue'
			import classUtils from "@/js/utils.js"
			import utils from "@/js/utils.js"
			export default {
			modules: {
			Base64,
			@@ -720,7 +720,7 @@
			$this.$data.classAttrList = success.result;
			success.result.forEach(async (group, index) => {
			group.attr_list.forEach(async (attr, key) => {
			if (classUtils.attrTypeIsDict(attr.type))
			if (utils.classUtils.attrTypeIsDict(attr.type))
			// if (attr.type == "字典-字符串" \|\| attr.type == "字典-整数" \|\|attr.type == "dict-char" \|\| attr.type == "dict-int")
			{
			await $this.DictItemGetList(attr, key, index, 'mast');
			@@ -765,7 +765,7 @@
			$this.$data.subClassAttrList = success.result;
			success.result.forEach(async (group, index) => {
			group.attr_list.forEach(async (attr, key) => {
			if (classUtils.attrTypeIsDict(attr.type)) {
			if (utils.classUtils.attrTypeIsDict(attr.type)) {
			//if (attr.type == "字典-字符串" \|\| attr.type == "字典-整数" \|\|attr.type == "dict-char" \|\| attr.type == "dict-int"){
			await $this.DictItemGetList(attr, key, index, 'sub');
			}
			@@ -1072,7 +1072,7 @@
			}
			// console.log(ca.dictitem);
			}
			if (classUtils.attrTypeIsDate(ca
			if (utils.classUtils.attrTypeIsDate(ca
			.Type
			)) // if(ca.Type=='日期' \|\| ca.Type=='时间' \|\|ca.Type=='date' \|\| ca.Type=='datetime')
			{
			@@ -1085,15 +1085,15 @@
			ca.Value = date.year + '-' + (date.month >= 10 ? date.month : '0' + date
			.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day);
			}
			if (classUtils.attrTypeIsObjRefMulti(ca
			if (utils.classUtils.attrTypeIsObjRefMulti(ca
			.Type)) // if(ca.Type=='引用对象(多个)' \|\| ca.Type=='obj-ref-multi'){
			{
			ca.RelClsList = ca.RelCls;
			ca.Value = '请选择';
			}
			if (classUtils.attrTypeIsRegion(ca.Type)) //if(ca.Type=='省市区'\|\| ca.Type=='region')
			if (utils.classUtils.attrTypeIsRegion(ca.Type)) //if(ca.Type=='省市区'\|\| ca.Type=='region')
			ca.Value = '请选择';
			if (classUtils.attrTypeIsBool(ca.Type)) //if(ca.Type=='布尔值'\|\| ca.Type=='bool')
			if (utils.classUtils.attrTypeIsBool(ca.Type)) //if(ca.Type=='布尔值'\|\| ca.Type=='bool')
			ca.Value = false;

			attr.push(ca);
			@@ -1228,7 +1228,7 @@
			}
			}
			}
			if (classUtils.attrTypeIsDate(ca.Type)) //if(ca.Type=='日期' \|\| ca.Type=='时间')
			if (utils.classUtils.attrTypeIsDate(ca.Type)) //if(ca.Type=='日期' \|\| ca.Type=='时间')
			{
			var nowDate = new Date();
			var date = {
			@@ -1239,14 +1239,14 @@
			ca.Value = date.year + '-' + (date.month >= 10 ? date.month : '0' + date
			.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day);
			}
			if (classUtils.attrTypeIsObjRefMulti(ca.Type)) //if(ca.Type=='引用对象(多个)')
			if (utils.classUtils.attrTypeIsObjRefMulti(ca.Type)) //if(ca.Type=='引用对象(多个)')
			{
			ca.RelClsList = ca.RelCls;
			ca.Value = '请';
			}
			if (classUtils.attrTypeIsRegion(ca.Type)) //if(ca.Type=='省市区'\|\|ca.Type=='region')
			if (utils.classUtils.attrTypeIsRegion(ca.Type)) //if(ca.Type=='省市区'\|\|ca.Type=='region')
			ca.Value = '请选择';
			if (classUtils.attrTypeIsBool(ca.Type)) //if(ca.Type=='布尔值'\|\|ca.Type=='bool')
			if (utils.classUtils.attrTypeIsBool(ca.Type)) //if(ca.Type=='布尔值'\|\|ca.Type=='bool')
			ca.Value = false;

			attr.push(ca);
			@@ -1378,7 +1378,7 @@
			for (var j = 0; j < attr.length; j++) {
			var ar = attr[j];
			if (ar.Value == '请选择' \|\| ar.Value == '——请选择——') ar.Value = '';
			if (classUtils.attrTypeIsDict(ar
			if (utils.classUtils.attrTypeIsDict(ar
			.Type)) //if (ar.Type == '字典' \|\| ar.Type == '字典-字符串' \|\| ar.Type == '字典-整数' ) {
			if (ar.select == true) { //判断下拉是否多选
			var valStr = "";
			@@ -1950,7 +1950,7 @@
			for (var j = 0; j < attr
			.length; j++) {
			var ar = attr[j];
			if (classUtils.attrTypeIsDict(
			if (utils.classUtils.attrTypeIsDict(
			ar.Type
			)) //if(ar.Type=='字典' \|\| ar.Type=='字典-字符串' \|\| ar.Type=='字典-整数')
			req.push({
			@@ -2470,7 +2470,7 @@
			if (ar.Value == '请选择' \|\| ar
			.Value == '——请选择——') ar.Value =
			'';
			if (classUtils.attrTypeIsDict(ar.Type)) {
			if (utils.classUtils.attrTypeIsDict(ar.Type)) {
			if (ar.select ==
			true) { //判断下拉是否多选
			var valStr = "";
			@@ -2807,7 +2807,7 @@
			ca
			.Name
			) {
			if (classUtils.attrTypeIsDict(ca.Type)) {
			if (utils.classUtils.attrTypeIsDict(ca.Type)) {
			var
			dictItemList = [];
			for (
			@@ -3122,7 +3122,7 @@
			]
			.attr
			) {
			if (classUtils.attrTypeIsDict(attr[j].Type)) {
			if (utils.classUtils.attrTypeIsDict(attr[j].Type)) {
			var
			dictItemList = [];
			for (
			@@ -4291,7 +4291,7 @@
			ca
			.Name
			) {
			if (classUtils.attrTypeIsDict(ca.Type)) {
			if (utils.classUtils.attrTypeIsDict(ca.Type)) {
			var
			dictItemList = [];
			for (
			@@ -4613,7 +4613,7 @@
			]
			.attr
			) {
			if (classUtils.attrTypeIsDict(attr[j].Type)) {
			if (utils.classUtils.attrTypeIsDict(attr[j].Type)) {
			var
			dictItemList = [];
			for (
			@@ -5293,7 +5293,7 @@
			if (ar.Value == '请选择' \|\| ar
			.Value == '——请选择——') ar.Value =
			'';
			if (classUtils.attrTypeIsDict(ar.Type)) {
			if (utils.classUtils.attrTypeIsDict(ar.Type)) {
			if (ar.select ==
			true) { //判断下拉是否多选
			var valStr = "";
			@@ -5347,7 +5347,7 @@
			if (ar.Value == '请选择' \|\| ar
			.Value == '——请选择——') ar
			.Value = '';
			if (classUtils.attrTypeIsDict(ar.Type)) {
			if (utils.classUtils.attrTypeIsDict(ar.Type)) {
			if (ar.select ==
			true) { //判断下拉是否多选
			var valStr = "";
			@@ -5541,15 +5541,15 @@
			},

			formatAttr(attr) {
			if (classUtils.attrTypeIsObjRefMulti(attr.Type)) //if(ar.Type=='引用对象(多个)')
			if (utils.classUtils.attrTypeIsObjRefMulti(attr.Type)) //if(ar.Type=='引用对象(多个)')
			if (attr.Value == '请') ar.Value = '';
			if (classUtils.attrTypeIsUser(attr.Type) \|\| classUtils.attrTypeIsProject(attr
			if (utils.classUtils.attrTypeIsUser(attr.Type) \|\| utils.classUtils.attrTypeIsProject(attr
			.Type)) //if(ar.Type=='引用人员' \|\| ar.Type=='引用项目')
			return {
			attr: attr.Name,
			value: attr.ValID ? attr.ValID : ''
			};
			else if (classUtils.attrTypeIsBool(attr.Type)) //if(ar.Type=='布尔值')
			else if (utils.classUtils.attrTypeIsBool(attr.Type)) //if(ar.Type=='布尔值')
			return {
			attr: attr.Name,
			value: attr.Value ? '1' : '0'