Merge pull request 'dj' (#875) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/875

src/views/project-management/implementation/phase.vue

@@ -15,6 +15,12 @@
           </el-option>
         </el-select>
       </el-form-item>
+<!--      <el-form-item label="是否项目终止" label-width="110"  prop="isStop">-->
+<!--        <el-radio-group v-model="formData.isStop" >-->
+<!--          <el-radio label="1">是</el-radio>-->
+<!--          <el-radio label="0">否</el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
     </el-form>
     <user-picker :multiple="true" ref="userPicker" title="请选择抄送人员" v-model:value="userList"
                  @ok="ccPersonPickerOkOrCancel" @cancelOrClear="ccPersonPickerOkOrCancel"/>
@@ -79,7 +85,8 @@ const singleList = ref([])
 const name = ref(router.currentRoute.value.name)
 const loading = ref(false)
 const formData = ref({
-  changeState:'0'
+  changeState:'0',
+  isStop:'0'
 })
 const file = ref({})
 const deploymentId = ref()
@@ -291,6 +298,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '是否在预算内',
+      prop: 'isWithinBudget',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget?
+                  <span>{'预算内'}</span>
+                  : <span>{'预算外'}</span>:'--'
+            }
+          </div>
+      )
+    },
     {
       label: '部门分管领导',
       prop: 'optionalChargeLeadership',

src/views/project-management/implementation/upload.vue

@@ -41,7 +41,7 @@ import {useTagsView} from '@/stores/tagsview.js'
 import {uploadFileList} from "@/api/project-manage/attachment";
 import {computed, ref} from "vue";
 import {getBaseInfoApi} from "@/components/steps/api";
-import {downloadFile, deleteFile} from "@/api/project-demand";
+import {deleteFile, downloadFile} from "@/api/project-demand";
 
 import {useCacheStore} from '@/stores/cache.js'
 
@@ -338,6 +338,13 @@ const filePreviewParam = ref({
   fileType: 'pdf'
 })
 const filePreviewShow = ref(false)
+if(localStorage.getItem('implementFile')){
+  fileList.value=JSON.parse(localStorage.getItem('implementFile'))
+}
+const changeImplementFile=()=>{
+  localStorage.setItem('implementFile', JSON.stringify(fileList.value))
+}
+
 const clickToPreview=(row)=>{
   filePreviewShow.value = false
   filePreviewParam.value = {
@@ -392,6 +399,7 @@ const handleDelete = (row) => {
     })
     if (res.code === 1000) {
       fileList.value.splice(fileList.value.findIndex((item) => item.fileId === row.fileId), 1);
+      changeImplementFile()
     }
   });
 }
@@ -459,6 +467,7 @@ const getFile = (val) => {
   nextTick(() => {
     showTable.value = true
   })
+  changeImplementFile()
 }
 const handleSubmit = async (instance) => {
   if (!instance) return
@@ -514,6 +523,7 @@ const handleSubmit = async (instance) => {
           })
         }
       }
+      localStorage.removeItem('implementFile')
     }
   })
 }