Merge branch 'greenUrgent' into allTestUrgent

# Conflicts:
#	src/components/dialogTemplate/index2.vue

src/HDrpManagement/projectChange/modules/detail.vue

@@ -21,6 +21,7 @@
     <!-- 使用此插槽可不传[tags] -->
 <!--    <tagPanl slot="tags" :data="tagObj" ownertable="sa_project" :id="mainData.sa_projectid" @onSuccess="queryMainData"/>-->
     <div slot="customOperationBef">
+      <updProject class="inline-16" v-if="tool.checkAuth($route.name,'updProject')" :data="mainData" @updSuccess="queryMainData"></updProject>
       <commissionSet class="inline-16" v-if="tool.checkAuth($route.name,'commissionSet')" ownertable="sa_project" @setSuccess="queryMainData" :data="mainData"></commissionSet>
     </div>
     <div slot="customOperation">
@@ -151,6 +152,7 @@ import initiateAuthorization from '../components/initiateAuthorization'
 import auditAuthorization from '../components/auditAuthorization'
 import importFile from '@/template/importFile/index'
 import commissionSet from '@/components/commissionSetNew/index.vue'
+import updProject from './modules/updProject/index'
 export default {
   components:{
     reportingProgress,
@@ -177,7 +179,8 @@ export default {
     PortraitDetail,
     initiateAuthorization,
     auditAuthorization,
-    commissionSet
+    commissionSet,
+    updProject
   },
   data () {
     return {

src/HDrpManagement/projectChange/modules/modules/updProject/index.vue

@@ -0,0 +1,95 @@
+<template>
+  <dialogTemplate ref="dialogRef" btn-type="primary" btn-title="修改项目" dialog-title="修改项目" @dialogShow="dialogShow" @onSubmit="onSubmit">
+    <template #formRule>
+      <el-row :gutter="20">
+        <el-form :model="form" :rules="rules" ref="stageData" :label-width="tool.onlyZh('110px')" label-position="right" size="mini">
+          <el-col :span="24">
+            <el-form-item :label="$t(`项目名称`)+':'" prop="projectname">
+              <el-input v-model="form.projectname" :placeholder="$t(`请输入项目名称`)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item :label="$t('省市县') + ':'" prop="province">
+              <el-cascader :placeholder="$t('请选择')"
+                           style="width: 100%"
+                           v-model="value"
+                           :options="basicData.data().areaData"
+                           @change="cascaderChange"
+                           clearable
+              >
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item :label="$t('详细地址') + ':'" prop="address">
+              <el-input
+                  v-model="form.address"
+                  :placeholder="$t('请输入详细地址')"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+    </template>
+  </dialogTemplate>
+</template>
+
+<script>
+import dialogTemplate from "@/components/dialogTemplate/index2";
+export default {
+  name: "index",
+  components:{dialogTemplate},
+  props:{
+    data:Object
+  },
+  data(){
+    return {
+      form:{
+        "sa_projectid": this.$route.query.id,
+        "projectname": "",
+        "province": "",
+        "city": "",
+        "county": "",
+        "address": ""
+      },
+      value:[],
+      rules:{}
+    }
+  },
+  methods:{
+    dialogShow(){
+      console.log(this.data)
+      this.form = {
+        "sa_projectid": this.$route.query.id,
+        "projectname": this.data.projectname,
+        "province": this.data.province,
+        "city": this.data.city,
+        "county": this.data.county,
+        "address": this.data.address
+      }
+      this.value = [this.data.province,this.data.city,this.data.county]
+      console.log(this.form.province)
+    },
+    async onSubmit(){
+      const res = await this.$api.requested({
+        "content": this.form,
+        "id": 2025111016330802,
+      })
+      this.tool.showMessage(res,()=>{
+        this.$refs.dialogRef.dialogTableVisible = false
+        this.$emit('updSuccess')
+      })
+    },
+    cascaderChange(val){
+      this.value = [val[0],val[1],val[2]]
+      this.form.province = val[0]
+      this.form.city = val[1]
+      this.form.county = val[2]
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/dialogTemplate/index2.vue

@@ -38,7 +38,7 @@ export default {
 </script>
 
 <style scoped>
-  /deep/ .el-dialog__body {
-    padding: 0 20px 20px 20px !important;
-  }
+/deep/ .el-dialog__body {
+  padding: 0 20px 20px 20px !important;
+}
 </style>