Merge remote-tracking branch 'origin/master'

src/views/modules/program/registered/ProjectArchiveForm.vue

@@ -105,21 +105,6 @@
                 <el-input :disabled="true" v-model="inputForm.programProjectListInfo.contractNo" maxlength="64" placeholder="请填写合同编号"   clearable  ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="评估报告日" prop="evaluationReportDate"
-                            :rules="[
-                        {required: true, message:'评估报告日不能为空', trigger:'blur'}
-                 ]">
-                <el-date-picker
-                  style="width:100%;"
-                  v-model="inputForm.evaluationReportDate"
-                  type="date"
-                  placement="bottom-start"
-                  value-format="yyyy-MM-dd"
-                  placeholder="选择日期"clearable>
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
 
 
             <el-col :span="12">
@@ -142,6 +127,22 @@
             </el-col>
 
             <el-col :span="12">
+              <el-form-item label="评估报告日" prop="evaluationReportDate"
+                            :rules="[
+                        {required: true, message:'评估报告日不能为空', trigger:'blur'}
+                 ]">
+                <el-date-picker
+                  style="width:100%;"
+                  v-model="inputForm.evaluationReportDate"
+                  type="date"
+                  placement="bottom-start"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择日期"clearable>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
               <el-form-item label="废旧物资评估(万元)" prop="waystEvaluation"
                             :rules="[
                         {required: true, message:'废旧物资评估不能为空', trigger:'blur'}
@@ -218,14 +219,27 @@
                 </el-input-number>
               </el-form-item>
             </el-col>
+
             <el-col :span="12">
-<!--              原司法鉴定-->
-              <el-form-item label="其他" prop="forensics"
+              <el-form-item label="预估/实际收费(万元）" prop="actualCharges"
                             :rules="[
+                        {required: true, message:'预估/实际收费不能为空', trigger:'blur'}
                  ]">
-                <el-input v-model="inputForm.forensics" maxlength="64" placeholder="请填写其他"    clearable ></el-input>
+                <el-input-number
+                  v-model="inputForm.actualCharges"
+                  controls-position="right"
+                  :controls="false"
+                  :max="999999999999999"
+                  style="width:100%;"
+                  :precision="2"
+                  placeholder="请填写预估/实际收费"
+                  :step="0.01"
+                  :min="0"
+                  clearable>
+                </el-input-number>
               </el-form-item>
             </el-col>
+
             <el-col :span="12">
               <el-form-item label="报告收费(元)" prop="reportCharges"
                             :rules="[
@@ -279,25 +293,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="预估/实际收费(万元）" prop="actualCharges"
-                            :rules="[
-                        {required: true, message:'预估/实际收费不能为空', trigger:'blur'}
-                 ]">
-                <el-input-number
-                  v-model="inputForm.actualCharges"
-                  controls-position="right"
-                  :controls="false"
-                  :max="999999999999999"
-                  style="width:100%;"
-                  :precision="2"
-                  placeholder="请填写预估/实际收费"
-                  :step="0.01"
-                  :min="0"
-                  clearable>
-                </el-input-number>
-              </el-form-item>
-            </el-col>
+
             <el-col :span="12">
               <el-form-item label="合同是否存档" prop="isContractArchive"
                             :rules="[
@@ -328,6 +324,17 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="外勤是否已经报销" prop="isOpsReimbursement"
+                            :rules="[
+                        {required: true, message:'外勤是否已经报销不能为空', trigger:'blur'}
+                 ]">
+                <el-radio-group v-model="inputForm.isOpsReimbursement">
+                  <el-radio v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" :key="item.id">{{item.label}}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="报销外勤天数" prop="opsAmount"
                             :rules="[
@@ -348,16 +355,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="外勤是否已经报销" prop="isOpsReimbursement"
-                            :rules="[
-                        {required: true, message:'外勤是否已经报销不能为空', trigger:'blur'}
-                 ]">
-                <el-radio-group v-model="inputForm.isOpsReimbursement">
-                  <el-radio v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" :key="item.id">{{item.label}}</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
               <el-form-item label="已报销金额" prop="reimbursementAmount"
                             :rules="[
                         {required: true, message:'已报销金额不能为空', trigger:'blur'}
@@ -416,6 +413,14 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <!--              原司法鉴定-->
+              <el-form-item label="其他" prop="forensics"
+                            :rules="[
+                 ]">
+                <el-input v-model="inputForm.forensics" maxlength="64" placeholder="请填写其他"    clearable ></el-input>
+              </el-form-item>
+            </el-col>
 
             <!--<el-col :span="12">
               <el-form-item label="签字评估师1" prop="signatureEvaluatorFirst"

src/views/modules/program/registered/ProjectArchiveFormDialog.vue

@@ -111,21 +111,7 @@
                 <el-input :disabled="true" v-model="inputForm.programProjectListInfo.contractNo" maxlength="64" placeholder="请填写合同编号"   clearable  ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="评估报告日" prop="evaluationReportDate"
-                            :rules="[
-                        {required: true, message:'评估报告日不能为空', trigger:'blur'}
-                 ]">
-                <el-date-picker
-                  style="width:100%;"
-                  v-model="inputForm.evaluationReportDate"
-                  type="date"
-                  placement="bottom-start"
-                  value-format="yyyy-MM-dd"
-                  placeholder="选择日期"clearable>
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
+
 
 
             <el-col :span="12">
@@ -146,6 +132,21 @@
                 <UserSelect size="medium" :disabled="formReadOnly" :readonly="true" :limit='1' :value="inputForm.signatureEvaluatorSecond" @getValue='(value) => {inputForm.signatureEvaluatorSecond = value}'></UserSelect>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="评估报告日" prop="evaluationReportDate"
+                            :rules="[
+                        {required: true, message:'评估报告日不能为空', trigger:'blur'}
+                 ]">
+                <el-date-picker
+                  style="width:100%;"
+                  v-model="inputForm.evaluationReportDate"
+                  type="date"
+                  placement="bottom-start"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择日期"clearable>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="12">
               <el-form-item label="废旧物资评估(万元)" prop="waystEvaluation"
@@ -224,11 +225,22 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-<!--              原司法鉴定-->
-              <el-form-item label="其他" prop="forensics"
+              <el-form-item label="预估/实际收费(万元）" prop="actualCharges"
                             :rules="[
+                        {required: true, message:'预估/实际收费不能为空', trigger:'blur'}
                  ]">
-                <el-input v-model="inputForm.forensics" maxlength="64" placeholder="请填写其他"    clearable ></el-input>
+                <el-input-number
+                  v-model="inputForm.actualCharges"
+                  controls-position="right"
+                  :controls="false"
+                  :max="999999999999999"
+                  style="width:100%;"
+                  :precision="2"
+                  placeholder="请填写预估/实际收费"
+                  :step="0.01"
+                  :min="0"
+                  clearable>
+                </el-input-number>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -284,25 +296,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="预估/实际收费(万元）" prop="actualCharges"
-                            :rules="[
-                        {required: true, message:'预估/实际收费不能为空', trigger:'blur'}
-                 ]">
-                <el-input-number
-                  v-model="inputForm.actualCharges"
-                  controls-position="right"
-                  :controls="false"
-                  :max="999999999999999"
-                  style="width:100%;"
-                  :precision="2"
-                  placeholder="请填写预估/实际收费"
-                  :step="0.01"
-                  :min="0"
-                  clearable>
-                </el-input-number>
-              </el-form-item>
-            </el-col>
+
             <el-col :span="12">
               <el-form-item label="合同是否存档" prop="isContractArchive"
                             :rules="[
@@ -333,6 +327,17 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="外勤是否已经报销" prop="isOpsReimbursement"
+                            :rules="[
+                        {required: true, message:'外勤是否已经报销不能为空', trigger:'blur'}
+                 ]">
+                <el-radio-group v-model="inputForm.isOpsReimbursement">
+                  <el-radio v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" :key="item.id">{{item.label}}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="报销外勤天数" prop="opsAmount"
                             :rules="[
@@ -353,16 +358,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="外勤是否已经报销" prop="isOpsReimbursement"
-                            :rules="[
-                        {required: true, message:'外勤是否已经报销不能为空', trigger:'blur'}
-                 ]">
-                <el-radio-group v-model="inputForm.isOpsReimbursement">
-                  <el-radio v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" :key="item.id">{{item.label}}</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
               <el-form-item label="已报销金额" prop="reimbursementAmount"
                             :rules="[
                         {required: true, message:'已报销金额不能为空', trigger:'blur'}
@@ -421,6 +416,14 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <!--              原司法鉴定-->
+              <el-form-item label="其他" prop="forensics"
+                            :rules="[
+                 ]">
+                <el-input v-model="inputForm.forensics" maxlength="64" placeholder="请填写其他"    clearable ></el-input>
+              </el-form-item>
+            </el-col>
 
             <!--<el-col :span="12">
               <el-form-item label="签字评估师1" prop="signatureEvaluatorFirst"