大中型流程优化4

src/views/major/todoDetail.vue

@@ -378,7 +378,7 @@
                   <el-row class="row-style">
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item label="终端客户类型：" prop="terminalClienteleType"
-                        :rules="{ required: true, message: '终端客户类型不能为空', trigger: 'blur' }" label-width="140px"
+                         label-width="140px"
                         class="postInfo-container-item">
                         <el-select v-model="major.terminalClienteleType" placeholder="请选择" readonly disabled style=" width: 100%">
                           <el-option label="企业" value="企业"></el-option>
@@ -663,7 +663,7 @@
               <el-col :xs="24" :sm="12" :lg="6" :span="6">
                 <el-form-item label="出具产品类型：" prop="production" label-width="160px" class="postInfo-container-item">
                   <el-checkbox-group v-model="feedback.production" style="width:300px">
-                    <el-tooltip :disabled="!feedback.production.includes('STATEMENT')" class="item" effect="dark" content="意见书已送达，无法取消此类型产品！" placement="top-start">
+                    <el-tooltip :disabled="!feedback.production.includes('STATEMENT')" class="item" effect="dark" content="若意见书已送达，无法取消此类型产品！" placement="top-start">
                       <el-checkbox-button label="STATEMENT" name="production">价值意见书</el-checkbox-button>
                     </el-tooltip>
                     <el-checkbox-button label="REPORT" name="production">报告</el-checkbox-button>
@@ -729,33 +729,37 @@
               <el-form label-position="left" :model="props.row" class="form-container" :ref="'productionFrom'+props.row.id"
                 :rules="rules">
                 <div>
-                  <!-- <el-tag effect="plain" size="medium" disable-transitions><span style="font-size:16px ; margin-top:10px">基本信息</span></el-tag> -->
-                  <!-- <div style="margin-left:10px;margin-bottom:10px;margin-top:10px">
-                    <el-button round type="danger" @click="saveProduction(props.row)">更新产品信息</el-button>
-                  </div> -->
                   <el-row class="row-style">
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                    <el-col :xs="24" :sm="12" :lg="12" :span="6">
                       <el-form-item prop="name" :rules="{ required: true, message: '项目不能为空', trigger: 'blur' }"
                         label-width="120px" class="postInfo-container-item" label="项目名称:">
                         <el-input v-model="props.row.name" class="filter-item" />
                       </el-form-item>
                     </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                    <el-col :xs="24" :sm="12" :lg="12" :span="6">
                       <el-form-item prop="clientName" :rules="{ required: true, message: '委托方不能为空', trigger: 'blur' }"
                         label-width="120px" class="postInfo-container-item" label="委托方：">
                         <el-input v-model="props.row.clientName" class="filter-item" />
                       </el-form-item>
                     </el-col>
+                  </el-row>
+                  <el-row class="row-style">
+                    <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                      <el-form-item prop="clientAddress" :rules="{ required: true, message: '委托方地址不能为空', trigger: 'blur' }"
+                        label-width="140px" class="postInfo-container-item" label="委托方地址：">
+                        <el-input v-model="props.row.clientAddress" class="filter-item" />
+                      </el-form-item>
+                    </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                      <el-form-item prop="clientTel" label-width="120px" class="postInfo-container-item" label="委托方电话：">
+                      <el-form-item prop="clientTel" label-width="140px" class="postInfo-container-item" label="委托方电话：">
                         <el-input v-model="props.row.clientTel" class="filter-item" />
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                      <el-form-item prop="clientAddress" :rules="{ required: true, message: '委托方地址不能为空', trigger: 'blur' }"
-                        label-width="120px" class="postInfo-container-item" label="委托方地址：">
-                        <el-input v-model="props.row.clientAddress" class="filter-item" />
+                      <el-form-item prop="qrCode" label-width="140px" class="postInfo-container-item" label="二维码：">
                       </el-form-item>
+                      <img style="width:200px;height:200px; display:flex ;position:absolute;top:0;right:0"
+                      :src="props.row.qrCode" alt="NULL" />
                     </el-col>
                   </el-row>
                   <el-row class="row-style">
@@ -818,12 +822,6 @@
                       <el-form-item prop="signatoryId" label-width="120px" class="postInfo-container-item">
                       </el-form-item>
                     </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                      <el-form-item prop="qrCode" label-width="120px" class="postInfo-container-item" label="二维码：">
-                      </el-form-item>
-                      <img style="width:130px;height:120px; display:flex ;position:absolute;top:0;right:0"
-                        :src="props.row.qrCode" alt="NULL" />
-                    </el-col>
                   </el-row>
                   <el-row class="row-style">
                     <el-col :xs="24" :sm="12" :lg="18" :span="6">
@@ -1291,7 +1289,7 @@
           <el-row>
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item label="使用权类型：" :rules="{ required: true, message: '使用权类型不能为空', trigger: 'blur' }"
-                prop="useRightType" label-width="120px" class="postInfo-container-item">
+                prop="useRightType" label-width="140px" class="postInfo-container-item">
                 <el-input v-model.trim="landTarget.useRightType" class="filter-item" />
               </el-form-item>
             </el-col>
@@ -1409,7 +1407,7 @@
                       <i class="el-icon-question" /></el-tooltip>
                     ：
                   </span>
-                  <el-input v-model="landTarget.checkValue" :placeholder="landTarget.evaluateValue" style="width:100%"
+                  <el-input v-model="landTarget.checkValue" :placeholder="landTarget.evaluateValue" style="width:100%" 
                     class="filter-item">
                     <template slot="append">万</template>
                   </el-input>
@@ -1486,6 +1484,7 @@ import YDetailPageLayout from '@/components/YDetailPageLayout/index_detail'
 import WorkflowBoard from '@/components/workflowBoard'
 import ScanEntry from '@/components/ScanEntry'
 import { isNumber, phoneNumber, postiveInteger, isIdNumber } from '@/utils/validate'
+import { readonly } from 'vue'
 
 export default {
   name: 'majorTodoDetail',
@@ -1520,11 +1519,10 @@ export default {
     feedback: {
       handler(newValue, oldVal) {
         let ps = newValue.production;
-        let isPay = newValue.isPay;
         if (this.currentNode.nodeCode === 'QUOTATION_FEEDBACK' || this.currentNode.nodeCode === 'STATEMENT_FEEDBACK') {
           if (ps.length > 1 && this.currentNode.nodeCode != 'STATEMENT_FEEDBACK' && ps.includes("STATEMENT")) {
             this.$message({
-              message: '警告，一次只能选择一种产品类型',
+              message: '一次只能选择一种产品类型',
               type: 'error'
             });
             this.validFeed = true;
@@ -1535,13 +1533,13 @@ export default {
           }
           else if (ps.includes("REPORT") && ps.includes("LETTER")) {
             this.$message({
-              message: '警告，报告和复评函只能选其一。',
+              message: '报告和复评函只能选其一。',
               type: 'error'
             });
             this.validFeed = true;
           } else if ((ps.includes("REPORT") && ps.includes("NONE")) || (ps.includes("LETTER") && ps.includes("NONE"))) {
             this.$message({
-              message: '警告，产品类型选择有误',
+              message: '产品类型选择有误',
               type: 'error'
             });
             this.validFeed = true;
@@ -2040,6 +2038,7 @@ export default {
       this.landTarget.majorId = this.major.id;
       this.landTarget.principalId = this.major.principalId;
       this.landTarget.sites = this.major.membersId;
+      this.landTarget.owner = this.major.owner;
 
     },
     saveLandTarget(targetType) {