|
@@ -28,8 +28,8 @@
|
|
:range="projectList"
|
|
:range="projectList"
|
|
range-key="project_name"
|
|
range-key="project_name"
|
|
>
|
|
>
|
|
- <view class="proName" v-if="item.code_id">
|
|
|
|
- {{ item.project_name || getProjectName(item.code_id) }}
|
|
|
|
|
|
+ <view class="proNameEdit" v-if="item.project_name">
|
|
|
|
+ {{ item.project_name }}
|
|
</view>
|
|
</view>
|
|
<view class="selectPlaceholder" v-else>请选择项目</view>
|
|
<view class="selectPlaceholder" v-else>请选择项目</view>
|
|
</picker>
|
|
</picker>
|
|
@@ -82,6 +82,7 @@ import {
|
|
approvalEditLog,
|
|
approvalEditLog,
|
|
} from "@/services/daily";
|
|
} from "@/services/daily";
|
|
import { mapState, mapActions } from "vuex";
|
|
import { mapState, mapActions } from "vuex";
|
|
|
|
+import { formatDate } from "../../uni_modules/uni-dateformat/components/uni-dateformat/date-format";
|
|
export default {
|
|
export default {
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
@@ -130,16 +131,21 @@ export default {
|
|
return item ? item.project_name : "-";
|
|
return item ? item.project_name : "-";
|
|
},
|
|
},
|
|
selectProject(key, e) {
|
|
selectProject(key, e) {
|
|
|
|
+ console.log("---------befor----------", this.formData);
|
|
const select = this.projectList[e.target.value];
|
|
const select = this.projectList[e.target.value];
|
|
const item = this.formData.find((item) => item.key == key);
|
|
const item = this.formData.find((item) => item.key == key);
|
|
item.code_id = select.id;
|
|
item.code_id = select.id;
|
|
item.project_name = select.project_name;
|
|
item.project_name = select.project_name;
|
|
|
|
+ console.log("---------after----------", this.formData);
|
|
|
|
+ // this.formData = [...this.formData];
|
|
},
|
|
},
|
|
addFormData() {
|
|
addFormData() {
|
|
this.formData.push({
|
|
this.formData.push({
|
|
key: +new Date(),
|
|
key: +new Date(),
|
|
project_name: "",
|
|
project_name: "",
|
|
});
|
|
});
|
|
|
|
+
|
|
|
|
+ console.log("---------addFormData----------", this.formData);
|
|
},
|
|
},
|
|
removeFormData(key) {
|
|
removeFormData(key) {
|
|
let index = this.formData.findIndex((item) => item.key == key);
|
|
let index = this.formData.findIndex((item) => item.key == key);
|
|
@@ -234,7 +240,7 @@ export default {
|
|
}
|
|
}
|
|
.formItem {
|
|
.formItem {
|
|
}
|
|
}
|
|
- // .proName,
|
|
|
|
|
|
+ .proNameEdit,
|
|
.input,
|
|
.input,
|
|
.textarea,
|
|
.textarea,
|
|
.selectPlaceholder {
|
|
.selectPlaceholder {
|
|
@@ -243,6 +249,7 @@ export default {
|
|
border: 1rpx solid #c0c0c0;
|
|
border: 1rpx solid #c0c0c0;
|
|
}
|
|
}
|
|
.proName,
|
|
.proName,
|
|
|
|
+ .proNameEdit,
|
|
.input,
|
|
.input,
|
|
.selectPlaceholder {
|
|
.selectPlaceholder {
|
|
line-height: 72rpx;
|
|
line-height: 72rpx;
|
|
@@ -253,7 +260,8 @@ export default {
|
|
width: 400rpx;
|
|
width: 400rpx;
|
|
height: 200rpx;
|
|
height: 200rpx;
|
|
}
|
|
}
|
|
- .proName {
|
|
|
|
|
|
+ .proName,
|
|
|
|
+ .proNameEdit {
|
|
width: 400rpx;
|
|
width: 400rpx;
|
|
white-space: nowrap;
|
|
white-space: nowrap;
|
|
text-overflow: ellipsis;
|
|
text-overflow: ellipsis;
|