Explorar el Código

签章页面调整

lizhenhao hace 2 años
padre
commit
eb0dfe7887

+ 8 - 2
src/views/common/UpLoadComponentV2.1.vue

@@ -36,14 +36,17 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column v-if="auth !== 'view'" label="创建人" prop="createBy.name" align="center"></el-table-column>
-        <el-table-column v-if="auth !== 'view'" label="创建时间" prop="createDate" align="center"></el-table-column>
+        <el-table-column label="创建人" prop="createBy.name" align="center"></el-table-column>
+        <el-table-column label="创建时间" prop="createDate" align="center"></el-table-column>
         <el-table-column label="文件大小" prop="size" align="center">
           <template slot-scope="scope">
             {{getSize(scope.row.size)}}
           </template>
         </el-table-column>
         <el-table-column label="文件类型" prop="fileType" align="center">
+          <template slot="header" scope="scope">
+            <span style="color:red;font-size: 20px">* </span><span>文件类型</span>
+          </template>
           <template slot-scope="scope">
             <el-select v-if="auth !== 'view'" size="small" v-model="scope.row.fileType" placeholder="请选择">
               <el-option
@@ -57,6 +60,9 @@
           </template>
         </el-table-column>
         <el-table-column label="盖章类型" prop="sealType" align="center">
+          <template slot="header" scope="scope">
+            <span style="color:red;font-size: 20px">* </span><span>盖章类型</span>
+          </template>
           <template slot-scope="scope">
             <el-select v-if="auth !== 'view'" @change="sealTypeChange(scope)" size="small" v-model="scope.row.sealType" placeholder="请选择">
               <el-option

+ 365 - 385
src/views/modules/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -1,267 +1,253 @@
 <template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
   <div>
     <el-row>
-      <el-col :span="24">
+      <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="true"
+               label-width="135px" @submit.native.prevent>
 
-        <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="true"
-                 label-width="135px" @submit.native.prevent>
-          <el-row  :gutter="15">
-            <el-col :span="12">
-              <el-form-item label="单据编号" prop="documentNo"
-                            :rules="[
-
-                   ]">
-                <el-input :disabled="true" v-model="inputForm.documentNo" placeholder="自动生成" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="项目名称" prop="projectName"
-                            :rules="[
+        <el-divider content-position="left"><i class="el-icon-document"></i> 项目信息</el-divider>
+        <el-row  :gutter="0">
+          <el-col :span="12">
+            <el-form-item label="项目名称" prop="projectName"
+                          :rules="[
                               {required: true, message:'项目名称不能为空', trigger:'blur'},
                               {required: true, message:'项目名称不能为空', trigger:'change'}
                    ]">
-<!--                <el-input v-model="inputForm.projectName" placeholder="请填写项目名称" clearable></el-input>-->
-                <el-input size="medium" :readonly="true" @focus="openContractForm()" v-model="inputForm.projectName" placeholder="请选择项目名称">
-                  <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="项目编号" prop="projectNumber"
-                            :rules="[
+              <!--                <el-input v-model="inputForm.projectName" placeholder="请填写项目名称" clearable></el-input>-->
+              <el-input size="medium" :readonly="true" @focus="openContractForm()" v-model="inputForm.projectName" placeholder="请选择项目名称">
+                <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目编号" prop="projectNumber"
+                          :rules="[
                    ]">
-                <el-input :disabled="true" v-model="inputForm.projectNumber" placeholder="请填写项目编号" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="报告所属部门" prop="officeId"
-                            :rules="[
+              <el-input :disabled="true" v-model="inputForm.projectNumber" placeholder="请填写项目编号" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目经理" prop="projectMasterName"
+                          :rules="[
                    ]">
-                <SelectTree
-                  ref="officeTree"
-                  :props="{
+              <el-input :disabled="true" v-model="inputForm.projectMasterName" placeholder="请填写项目经理" clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
+        <el-row  :gutter="0">
+          <el-col :span="12">
+            <el-form-item label="单据编号" prop="documentNo"
+                          :rules="[
+
+                   ]">
+              <el-input :disabled="true" v-model="inputForm.documentNo" placeholder="自动生成" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="报告所属部门" prop="officeId"
+                          :rules="[
+                   ]">
+              <SelectTree
+                ref="officeTree"
+                :props="{
                   value: 'id',             // ID字段名
                   label: 'name',         // 显示名称
                   children: 'children'    // 子级字段名
                 }"
 
-                  :url="`/sys/office/treeData?type=2`"
-                  :value="inputForm.officeId"
-                  :accordion="true"
-                  @getValue="(value) => {inputForm.officeId=value}"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="项目经理" prop="projectMasterName"
-                            :rules="[
-                   ]">
-                <el-input :disabled="true" v-model="inputForm.projectMasterName" placeholder="请填写项目经理" clearable></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="盖章类型" prop="signatureType"
-                            :rules="[
+                :url="`/sys/office/treeData?type=2`"
+                :value="inputForm.officeId"
+                size="medium"
+                :accordion="true"
+                @getValue="(value) => {inputForm.officeId=value}"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="盖章类型" prop="signatureType"
+                          :rules="[
                               {required: true, message: '盖章类型不能为空', trigger: 'blur'}
                    ]">
-                <!--                <el-input v-model="inputForm.signatureType" placeholder="请填写盖章类型" clearable></el-input>-->
-                <el-select v-model="inputForm.signatureType" placeholder="请选择盖章类型" clearable style="width: 100%;">
-                  <el-option
-                    v-for="item in $dictUtils.getDictList('cw_signature_type')"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+              <!--                <el-input v-model="inputForm.signatureType" placeholder="请填写盖章类型" clearable></el-input>-->
+              <el-select v-model="inputForm.signatureType" placeholder="请选择盖章类型" clearable style="width: 100%;">
+                <el-option
+                  v-for="item in $dictUtils.getDictList('cw_signature_type')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-            <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
-              <el-form-item label="签字注师1" prop="signatureAnnotator1"
-                            :rules="[
+          <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
+            <el-form-item label="签字注师1" prop="signatureAnnotator1"
+                          :rules="[
                    ]">
-<!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-                <UserSelect size="medium" ref="userSelect1" :disabled="true" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
-              </el-form-item>
-            </el-col>
+              <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
+              <UserSelect size="medium" ref="userSelect1" :disabled="true" :readonly="true" :limit='1' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+            </el-form-item>
+          </el-col>
 
-            <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
-              <el-form-item label="签字注师2" prop="signatureAnnotator2"
-                            :rules="[
+          <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
+            <el-form-item label="签字注师2" prop="signatureAnnotator2"
+                          :rules="[
                    ]">
-<!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                <UserSelect size="medium" ref="userSelect2" :disabled="true" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
-              </el-form-item>
-            </el-col>
+              <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
+              <UserSelect size="medium" ref="userSelect2" :disabled="true" :readonly="true" :limit='1' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+            </el-form-item>
+          </el-col>
 
-            <el-col v-if="inputForm.signatureType === '2'" :span="12">
-              <el-form-item label="签字注师1" prop="signatureAnnotator1"
-                            :rules="[
+          <el-col v-if="inputForm.signatureType === '2'" :span="12">
+            <el-form-item label="签字注师1" prop="signatureAnnotator1"
+                          :rules="[
                               {required: true, message:'签字注师1不能为空', trigger:'blur'}
                    ]">
-                <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-                <UserSelect size="medium" ref="userSelect1" :disabled="true" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
-              </el-form-item>
-            </el-col>
+              <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
+              <UserSelect size="medium" ref="userSelect1" :disabled="true" :readonly="true" :limit='1' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+            </el-form-item>
+          </el-col>
 
-            <el-col v-if="inputForm.signatureType === '2'" :span="12">
-              <el-form-item label="签字注师2" prop="signatureAnnotator2"
-                            :rules="[
+          <el-col v-if="inputForm.signatureType === '2'" :span="12">
+            <el-form-item label="签字注师2" prop="signatureAnnotator2"
+                          :rules="[
                               {required: true, message:'签字注师2不能为空', trigger:'blur'}
                    ]">
-                <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                <UserSelect size="medium" ref="userSelect2" :disabled="true" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="报告实际制作人" prop="realCreate"
-                            :rules="[
+              <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
+              <UserSelect size="medium" ref="userSelect2" :disabled="true" :readonly="true" :limit='1' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="审计收费(元)" prop="auditFees"
+                          :rules="[
                    ]">
-                <UserSelect size="medium" :readonly="true" :disabled="true" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelect>
-              </el-form-item>
-            </el-col>
+              <el-input v-model="inputForm.auditFees" placeholder="请填写审计收费(元)" clearable></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="报告实际制作人" prop="realCreate"
+                          :rules="[
+                   ]">
+              <UserSelect size="medium" :readonly="true" :disabled="true" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="创建时间" prop="createDate"
+                          :rules="[
+                   ]">
+              <el-input :disabled="true" v-model="inputForm.createDate" placeholder="请填写创建时间" clearable></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-divider content-position="left"><i class="el-icon-document"></i> 详细信息</el-divider>
+        <el-row  :gutter="0">
+          <el-col :span="12">
+            <el-form-item label="被服务单位" prop="servedUnitName"
+                          :rules="[
+                            {required: true, message:'被服务单位不能为空', trigger:'blur'}
+                   ]">
+              <el-input @focus="openWorkClient()" v-model="inputForm.servedUnitName" placeholder="请填写被服务单位" clearable>
+                <el-button slot="append" icon="el-icon-search" @click="openWorkClient()"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="报告日期" prop="reportDate"
+                          :rules="[
+                            {required: true, message:'报告日期不能为空', trigger:'blur'}
+                   ]">
+              <el-date-picker
+                placement="bottom-start"
+                value-format="yyyy-MM-dd"
+                v-model="inputForm.reportDate"
+                style="width: 100%"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="报告类型" prop="reportType"
+                          :rules="[
+                            {required: true, message:'报告类型不能为空', trigger:'blur'}
+                   ]">
+              <el-select v-model="inputForm.reportType" placeholder="请选择报告类型" style="width:100%;">
+                <el-option
+                  v-for="item in $dictUtils.getDictList('cw_report_type')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="报告流水号" prop="reportNumber"
+                          :rules="[
+                   ]">
+              <el-input :disabled="true" v-model="inputForm.reportNumber" placeholder="自动生成" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="报告文号" prop="reportNo"
+                          :rules="[
+                   ]">
+              <el-input :disabled="true" v-model="inputForm.reportNo" placeholder="自动生成" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="true"
+                   label-width="135px" @submit.native.prevent>
             <el-col :span="12">
-              <el-form-item label="创建时间" prop="createDate"
+              <el-form-item label="意见类型" prop="opinionType"
                             :rules="[
-                   ]">
-                <el-input :disabled="true" v-model="inputForm.createDate" placeholder="请填写创建时间" clearable></el-input>
+                     ]">
+                <el-select v-model="inputForm.opinionType" placeholder="请选择意见类型" style="width:100%;">
+                  <el-option
+                    v-for="item in $dictUtils.getDictList('cw_opinion_type')"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
+          </el-form>
+          <el-col :span="12">
+            <el-form-item label="盖章状态" prop="sealType"
+                          :rules="[
+                   ]">
+              <el-input :disabled="true" v-model="inputForm.sealType" placeholder="请填写盖章状态" clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-          </el-row>
-        </el-form>
-        <el-tabs v-model="activeName" type="border-card" @tab-click="tabHandleClick">
-          <el-tab-pane label="报告信息列表" name="newRow">
-            <el-button type="primary" style="margin-bottom: 15px" size="mini" :disabled="true" @click="openWorkClient"
-                       v-if="inputForm.projectName !== '' & inputForm.projectName !== undefined"
-            >
-              新增行
-            </el-button>
-<!--            <el-button v-if="hasPermission('cw:reportManagement:del')" type="text" size="small" @click="del()">删除</el-button>-->
-            <el-row  :gutter="15">
-              <el-form :disabled="true">
-                <vxe-table
-                  border
-                  show-overflow
-                  show-footer
-                  :column-config="{resizable: true}"
-                  ref="clientTable"
-                  :key="tableKeyClient"
-                  class="vxe-table-element"
-                  :data="inputForm.cwProjectInfoList"
-                  style=""
-                  @cell-click=""
-                  @edit-closed=""
-                  highlight-current-row
-                  :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: false}"
-                >
-                  <vxe-table-column type="seq" align="center" width="80" title="序号"></vxe-table-column>
-                  <vxe-table-column align="center" field="servedUnitName" title="被服务单位" :edit-render="{}">
-                    <template v-slot:edit="scope">
-                      <el-input :readonly="true" v-model="scope.row.servedUnitName" placeholder="被服务单位" clearable></el-input>
-                    </template>
-                  </vxe-table-column>
-                  <vxe-table-column align="center" field="reportDate" title="报告日期" :edit-render="{}">
-                    <template v-slot:edit="scope">
-                      <el-date-picker
-                        v-model="scope.row.reportDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择报告日期"
-                        style="width:100%"
-                        placement="bottom-start"
-                        clearable>
-                      </el-date-picker>
-<!--                      <el-input :readonly="true" v-model="scope.row.reportDate" placeholder="报告日期" clearable></el-input>-->
-                    </template>
-                  </vxe-table-column>
-                  <vxe-table-column align="center" field="reportType" title="报告类型" :edit-render="{name: '$select', options: $dictUtils.getDictList('cw_report_type')}">
-                    <template v-slot:edit="scope">
-                      <vxe-select :disabled="true" v-model="scope.row.reportType" placeholder="请选择报告类型" clearable style="width: 100%;" transfer>
-                        <vxe-option
-                          v-for="item in $dictUtils.getDictList('cw_report_type')"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </vxe-option>
-                      </vxe-select>
-                    </template>
-<!--                    <template v-slot:edit="scope">-->
-<!--                      <el-select v-model="scope.row.reportType" placeholder="请选择报告类型" clearable style="width: 100%;">-->
-<!--                        <el-option-->
-<!--                          v-for="item in $dictUtils.getDictList('cw_report_type')"-->
-<!--                          :key="item.value"-->
-<!--                          :label="item.label"-->
-<!--                          :value="item.value">-->
-<!--                        </el-option>-->
-<!--                      </el-select>-->
-<!--&lt;!&ndash;                      <el-input v-model="scope.row.reportType" placeholder="报告类型" clearable></el-input>&ndash;&gt;-->
-<!--                    </template>-->
-                  </vxe-table-column>
-                  <vxe-table-column align="center" field="reportNumber" title="报告流水号" :edit-render="{}">
-                    <template v-slot:edit="scope">
-                      <el-input :readonly="true" v-model="scope.row.reportNumber" placeholder="报告流水号" clearable></el-input>
-                    </template>
-                  </vxe-table-column>
-                  <vxe-table-column align="center" field="reportNo" title="报告文号" :edit-render="{}">
-                    <template v-slot:edit="scope">
-                      <el-input :readonly="true" v-model="scope.row.reportNo" placeholder="报告文号" clearable></el-input>
-                    </template>
-                  </vxe-table-column>
-                  <vxe-table-column align="center" field="issueReport" title="是否出具报告" :edit-render="{}">
-                    <template v-slot:edit="scope">
-                      <el-input :readonly="true" v-model="scope.row.issueReport" placeholder="是否出具报告" clearable></el-input>
-                    </template>
-                  </vxe-table-column>
-                  <vxe-table-column align="center" field="opinionType" title="意见类型" :edit-render="{name: '$select', options: $dictUtils.getDictList('cw_opinion_type')}">
-                    <template v-slot:edit="scope">
-                      <el-select v-model="scope.row.opinionType" placeholder="请选择意见类型" clearable style="width: 100%;">
-                        <el-option
-                          v-for="item in $dictUtils.getDictList('cw_opinion_type')"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-<!--                      <el-input :readonly="true" v-model="scope.row.opinionType" placeholder="意见类型" clearable></el-input>-->
-                    </template>
-                  </vxe-table-column>
-                  <vxe-table-column align="center" field="sealType" title="盖章状态" :edit-render="{}">
-                    <template v-slot:edit="scope">
-                      <el-input :readonly="true" v-model="scope.row.sealType" placeholder="盖章状态" clearable></el-input>
-                    </template>
-                  </vxe-table-column>
-                  <vxe-table-column align="center" field="fileNumber" title="文件数" :edit-render="{}">
-                    <template v-slot:edit="scope">
-                      <el-input :readonly="true" v-model="scope.row.fileNumber" placeholder="文件数" clearable></el-input>
-                    </template>
-                  </vxe-table-column>
-                  <vxe-table-column align="center" title="操作" width="300">
-                    <template v-slot="scope">
-<!--                      <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'client')">删除</el-button>-->
-<!--                      <el-button size="mini" type="primary" @click="sss(scope.$rowIndex)">上传附件</el-button>-->
-<!--                      <el-button size="mini" v-if="formReadOnly" :disabled="false" type="primary" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>-->
-                        <el-button size="mini" :disabled="false" type="primary" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
-                    </template>
-                  </vxe-table-column>
-                </vxe-table>
-              </el-form>
-            </el-row>
-          </el-tab-pane>
+      </el-form>
+      <el-tabs v-model="activeName" type="border-card" @tab-click="tabHandleClick">
+        <!--        <el-tab-pane label="报告信息列表" name="newRow">-->
+        <!--          <el-button type="primary" style="margin-bottom: 15px" size="mini" :disabled="true" @click="sss"-->
+        <!--          >-->
+        <!--            新增行-->
+        <!--          </el-button>-->
+        <!--        </el-tab-pane>-->
+        <el-tab-pane label="附件" name="archiveFile">
+          <!--        附件-->
+          <UpLoadComponent ref="archiveFile"></UpLoadComponent>
+        </el-tab-pane>
 
 
-        </el-tabs>
-      </el-col>
+      </el-tabs>
     </el-row>
-    <UpLoadComponentDialog ref="upLoadComponentDialog" @getUpload="getUpload"></UpLoadComponentDialog>
-<!--    <ProjectInfoForm  ref="projectInfoForm" @getContract="getContract"></ProjectInfoForm>-->
+    <!--    <UpLoadComponentDialog ref="upLoadComponentDialog" @getUpload="getUpload"></UpLoadComponentDialog>-->
+    <!--    <ProjectInfoForm  ref="projectInfoForm" @getContract="getContract"></ProjectInfoForm>-->
     <ProjectRecoredChooseCom  ref="projectRecoredChooseCom" @getProject="getContract"></ProjectRecoredChooseCom>
     <ReportServiceUnitForm ref="reportServiceUnitForm" @getWorkClientChoose="getWorkClientChoose"></ReportServiceUnitForm>
   </div>
 </template>
 
 <script>
-  import UpLoadComponent from '@/views/common/UpLoadComponent'
+  // import UpLoadComponent from '@/views/common/UpLoadComponent'
+  import UpLoadComponent from '@/views/common/UpLoadComponentV2.1'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import UserSelect from '../workClientInfo/clientUserSelect'
@@ -270,7 +256,7 @@
   import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
   // import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
   import ReportServiceUnitForm from './ReportServiceUnitForm'
-  import UpLoadComponentDialog from '@/views/common/UpLoadComponentDialog'
+  // import UpLoadComponentDialog from '@/views/common/UpLoadComponentDialog'
   // import ProjectInfoForm from './ProjectInfoForm'
   import ProjectRecoredChooseCom from '../projectRecords/ProjectRecordsChooseCom'
   export default {
@@ -294,6 +280,13 @@
         method: '',
         loading: false,
         inputForm: {
+          opinionType: '',
+          reportNo: '',
+          reportNumber: '',
+          reportType: '',
+          reportDate: '',
+          servedUnitName: '', // 被服务单位
+          auditFees: '',
           projectId: '',
           id: '',
           createDate: '',
@@ -319,7 +312,7 @@
           realCreate: ''
         },
         keyWatch: '',
-        activeName: 'newRow',
+        activeName: 'archiveFile',
         tableKey: '',
         tableKeyClient: '1'
       }
@@ -335,6 +328,7 @@
     computed: {
       bus: {
         get () {
+          this.$refs.archiveFile.setDividerName('附件', false)
           // this.$refs.uploadComponent.setDividerName('附件', false)
           return this.businessId
         },
@@ -349,8 +343,6 @@
           if (this.commonJS.isNotEmpty(this.bus)) {
             this.init('', this.bus)
           } else {
-            console.log('bus', this.bus)
-            console.log('businessId', this.businessId)
             this.$nextTick(() => {
               this.$refs.inputForm.resetFields()
             })
@@ -365,30 +357,30 @@
       UserSelect,
       ReportServiceUnitForm,
       // ProjectInfoForm,
-      ProjectRecoredChooseCom,
-      UpLoadComponentDialog
+      ProjectRecoredChooseCom
+      // UpLoadComponentDialog
     },
     methods: {
-      seeFileInfo (index) {
-        if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList[index].cwFileInfoList)) {
-          this.inputForm.cwProjectInfoList[index].cwFileInfoList = []
-        }
-        this.$refs.upLoadComponentDialog.newUpload('view', this.inputForm.cwProjectInfoList[index].cwFileInfoList, null, null, null, null, null, false, index)
-      },
-      sss (index) {
-        if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList[index].cwFileInfoList)) {
-          this.inputForm.cwProjectInfoList[index].cwFileInfoList = []
-        }
-        this.$refs.upLoadComponentDialog.newUpload(null, this.inputForm.cwProjectInfoList[index].cwFileInfoList, null, null, null, null, null, false, index)
-      },
-      getUpload (p, index) {
-        p.then((list) => {
-          // list为返回数据
-          this.inputForm.cwProjectInfoList[index].cwFileInfoList = list
-          this.inputForm.cwProjectInfoList[index].fileNumber = list.length
-          this.tableKeyClient = Math.random()
-        })
-      },
+      // seeFileInfo (index) {
+      //   if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList[index].cwFileInfoList)) {
+      //     this.inputForm.cwProjectInfoList[index].cwFileInfoList = []
+      //   }
+      //   this.$refs.upLoadComponentDialog.newUpload('view', this.inputForm.cwProjectInfoList[index].cwFileInfoList, null, null, null, null, null, false, index)
+      // },
+      // sss (index) {
+      //   if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList[index].cwFileInfoList)) {
+      //     this.inputForm.cwProjectInfoList[index].cwFileInfoList = []
+      //   }
+      //   this.$refs.upLoadComponentDialog.newUpload(null, this.inputForm.cwProjectInfoList[index].cwFileInfoList, null, null, null, null, null, false, index)
+      // },
+      // getUpload (p, index) {
+      //   p.then((list) => {
+      //     // list为返回数据
+      //     this.inputForm.cwProjectInfoList[index].cwFileInfoList = list
+      //     this.inputForm.cwProjectInfoList[index].fileNumber = list.length
+      //     this.tableKeyClient = Math.random()
+      //   })
+      // },
       getKeyWatch (keyWatch) {
         this.keyWatch = keyWatch
       },
@@ -433,11 +425,19 @@
         }
       },
       init (method, id) {
-        this.activeName = 'newRow'
+        this.activeName = 'archiveFile'
         this.projectRecordsService = new ProjectRecordsService()
         this.projectReportService = new ProjectReportService()
         this.method = method
         this.inputForm = {
+          servedUnitId: '',  // 被服务单位id
+          opinionType: '',
+          reportNo: '',
+          reportNumber: '',
+          reportType: '',
+          reportDate: '',
+          servedUnitName: '', // 被服务单位
+          auditFees: '',
           projectId: '',
           id: '',
           createDate: '',
@@ -463,15 +463,27 @@
         this.inputForm.id = id
         this.loading = false
         this.$nextTick(() => {
+          this.$refs.archiveFile.clearUpload()
           this.$refs.inputForm.resetFields()
           this.loading = true
           this.projectReportService.queryBySignatureId(this.inputForm.id).then(({data}) => {
+            this.inputForm.status = data.status
             // this.$refs.uploadComponent.clearUpload()
             this.inputForm = this.recover(this.inputForm, data)
             this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
             if (this.commonJS.isEmpty(this.inputForm.createDate)) {
               this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
             }
+            if (this.commonJS.isEmpty(this.inputForm.officeId)) {
+              this.inputForm.officeId = JSON.parse(localStorage.getItem('user')).officeDTO.id
+            }
+            if (this.commonJS.isEmpty(this.inputForm.realCreate)) {
+              this.inputForm.realCreate = JSON.parse(localStorage.getItem('user')).id
+            }
+            if (this.formReadOnly) {
+              method = 'view'
+            }
+            this.$refs.archiveFile.newUpload('view', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
             this.loading = false
           })
           // this.projectRecordsService.queryById(this.inputForm.id).then(({data}) => {
@@ -512,76 +524,33 @@
         this.doSubmit('save', callback)
       },
       startForm (callback) {
-        // this.doSubmit('start', callback)
-        this.loading = true
-        this.projectReportService.saveData(this.inputForm).then(({data}) => {
-          if (this.inputForm.signatureType === '2') {
-            this.inputForm.assignee = this.inputForm.signatureAnnotator1
-          }
-          callback(data.businessTable, data.businessId, this.inputForm)
-          this.loading = false
-          throw new Error()
-        }).catch(() => {
-          this.loading = false
-          throw new Error('流程发起失败')
-        })
+        this.doSubmit('start', callback)
       },
-      agreeOperate (callback, param) {
-        this.loading = true
-        this.inputForm.commitParamDTO = param
-        this.projectReportService.saveFlowableParam(this.inputForm).then(({data}) => {
-          // 关闭当前页面
-          this.$store.dispatch('tagsView/delView', {fullPath: this.$route.fullPath})
-          if (data === '操作成功') {
-            this.$message.success('审核完成')
-            // 跳转回指定页面
-            if (param.num === '2') {
-              this.$router.push({path: '/sys/dashboard/workBench/Pending'})
-            } else if (param.num === '3') {
-              this.$router.push({path: '/sys/dashboard/workBench/PendingList'})
-            } else {
-              this.$router.push({path: '/flowable/task/TodoList'})
-            }
+      async agreeForm (callback) {
+        await this.projectReportService.queryById(this.inputForm.id).then(({data}) => {
+          if (data.status !== '2') { // 审核状态不是“待审核”,就弹出提示
+            this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
+            throw new Error()
           } else {
-            // 跳转回指定页面
-            if (param.num === '2') {
-              this.$router.push({path: '/sys/dashboard/workBench/Pending', query: {signatureUrl: data}})
-            } else {
-              this.$router.push({path: '/flowable/task/TodoList', query: {signatureUrl: data}})
-            }
-          }
-          this.loading = false
-          throw new Error()
-        }).catch(() => {
-          this.loading = false
-          throw new Error()
-        })
-      },
-      agreeForm (callback, param) {
-        this.projectReportService.queryById(this.inputForm.id).then(({data}) => {
-          if (data.signatureType === '1') {
-            if (data.status1 !== '2') { // 审核状态不是“待审核”,就弹出提示
-              this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
-              throw new Error()
-            } else {
-              this.agreeOperate(callback, param)
-            }
-          }
-          if (data.signatureType === '2') {
-            if (data.status2 !== this.inputForm.status2) { // 审核状态不是“待审核”,就弹出提示
-              this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
-              throw new Error()
-            } else {
-              if (data.status2 === '2') {
-                param.assignee = this.inputForm.signatureAnnotator2
-              }
-              this.agreeOperate(callback, param)
-            }
+            this.doSubmit('agree', callback)
           }
         })
+        // await this.projectRecordsService.queryById(this.inputForm.id).then(({data}) => {
+        //   if (this.inputForm.status !== '2') { // 审核状态不是“待审核”,就弹出提示
+        //     this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
+        //     throw new Error()
+        //   } else {
+        //     this.doSubmit('agree', callback)
+        //   }
+        // })
       },
       // 表单提交
       doSubmit (status, callback) {
+        if (this.inputForm.status === '2' && this.commonJS.isEmpty(this.inputForm.opinionType)) {
+          this.$message.error('意见类型不能为空')
+          this.loading = false
+          throw new Error('意见类型不能为空')
+        }
         if (status === 'save') {
           // 暂存
           this.inputForm.status = '1'
@@ -591,6 +560,10 @@
           //   return
           // }
           // this.inputForm.workAttachmentDtoList = this.$refs.uploadComponent.getDataList()
+          // this.inputForm.cwFileInfoList = this.$refs.archiveFile.getDataList()
+          this.$refs.archiveFile.getDataList().then((data) => {
+            this.inputForm.cwFileInfoList = data
+          })
           this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
           // 验证报告 日期报告 类型是否出具报告 意见类型 是否为空
           // eslint-disable-next-line no-unused-expressions
@@ -622,23 +595,23 @@
             if (this.commonJS.isEmpty(this.inputForm.createDate)) {
               this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
             }
-            this.inputForm.cwProjectInfoList.forEach((item, index) => {
-              if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList[index].reportDate)) {
-                this.$message.error('报告日期不能为空')
-                this.loading = false
-                throw new Error('报告日期不能为空')
-              }
-              if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList[index].reportType)) {
-                this.$message.error('报告类型不能为空')
-                this.loading = false
-                throw new Error('报告类型不能为空')
-              }
-              if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList[index].opinionType)) {
-                this.$message.error('意见类型不能为空')
-                this.loading = false
-                throw new Error('意见类型不能为空')
-              }
+            // if (this.commonJS.isEmpty(this.inputForm.reportType)) {
+            //   this.$message.error('报告类型不能为空')
+            //   this.loading = false
+            //   throw new Error('报告类型不能为空')
+            // }
+            this.$refs.archiveFile.getDataList().then((data) => {
+              this.inputForm.cwFileInfoList = data
             })
+            // let _this = this
+            // _this.inputForm.cwFileInfoList.forEach(info => {
+            //   if (this.commonJS.isEmpty(info.fileType)) {
+            //     throw new Error('文件类型不能为空')
+            //   }
+            //   if (this.commonJS.isEmpty(info.sealType)) {
+            //     throw new Error('盖章类型不能为空')
+            //   }
+            // })
             this.projectReportService.saveForm(this.inputForm).then(({data}) => {
               callback(data.businessTable, data.businessId, this.inputForm)
               this.loading = false
@@ -650,46 +623,49 @@
       },
       async updateStatusById (type) {
         if (type === 'reject' || type === 'reback') {
-          // if (await this.$refs.upLoadComponentDialog.checkProgress()) {
+          // if (await this.$refs.uploadComponent.checkProgress()) {
           //   this.loading = false
           //   throw new Error()
-          // } else {
+          // }
           await this.projectReportService.queryById(this.inputForm.id).then(({data}) => {
-            if (data.signatureType === '1') {
-              if (data.status1 !== '2') { // 审核状态不是“待审核”,就弹出提示
-                this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
-                throw new Error()
-              } else {
-                if (type === 'reject') {
-                  // 驳回
-                  this.inputForm.status = '4'
-                  let param = {status: '4', id: data.sid1}
-                  this.projectReportService.updateSignatureStatusById(param)
-                }
-                if (type === 'reback') {
-                  // 撤回
-                  let param = {status: '3', id: data.sid1}
-                  this.projectReportService.updateSignatureStatusById(param)
-                }
+            if (data.status !== '2') { // status的值不等于“审核中”就弹出提示
+              this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
+              throw new Error()
+            } else {
+              if (type === 'reject') {
+                // 驳回
+                this.inputForm.status = '4'
+                let param = {status: '4', id: this.inputForm.id}
+                this.projectReportService.updateStatusById(param)
+                // this.projectRecordsService.updateStatusById(param)
               }
-            }
-            if (data.signatureType === '2') {
-              if (data.status2 !== this.inputForm.status2) { // 审核状态不是“待审核”,就弹出提示
-                this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
-                throw new Error()
-              } else {
-                debugger
-                if (type === 'reject') {
-                  // 驳回
-                  this.projectReportService.updateSignatureStatusById({status: '4', id: data.sid2})
-                }
-                if (type === 'reback') {
-                  // 撤回
-                  this.projectReportService.updateSignatureStatusById({status: '3', id: data.sid2})
-                }
+              if (type === 'reback') {
+                // 撤回
+                let param = {status: '3', id: this.inputForm.id}
+                // this.projectRecordsService.updateStatusById(param)
+                this.projectReportService.updateStatusById(param)
               }
             }
           })
+          // await this.projectRecordsService.queryById(this.inputForm.id).then(({data}) => {
+          //   if (data.status !== '2') { // status的值不等于“审核中”就弹出提示
+          //     this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
+          //     throw new Error()
+          //   } else {
+          //     if (type === 'reject') {
+          //       // 驳回
+          //       this.inputForm.status = '4'
+          //       let param = {status: '4', id: this.inputForm.id}
+          //       this.projectRecordsService.updateStatusById(param)
+          //     }
+          //     if (type === 'reback') {
+          //       // 撤回
+          //       let param = {status: '3', id: this.inputForm.id}
+          //       // this.projectRecordsService.updateStatusById(param)
+          //       this.projectReportService.updateStatusById(param)
+          //     }
+          //   }
+          // })
         }
       },
       close () {
@@ -709,10 +685,10 @@
           signatureAnnotator2: '',
           signatureType: '',
           projectMasterName: '',
+          realCreate: '',
           status: '',
           status1: '',
-          status2: '',
-          realCreate: ''
+          status2: ''
         }
         // this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()
@@ -723,28 +699,29 @@
       // 删除
       removeEvent (row, rowIndex, type) {
         if (type === 'client') {
-          this.$refs.clientTable.remove(row)
-          this.inputForm.cwProjectInfoList.splice(rowIndex, 1)
+          // this.$refs.clientTable.remove(row)
+          // this.inputForm.cwProjectInfoList.splice(rowIndex, 1)
         }
       },
       openWorkClient () {
         this.$refs.reportServiceUnitForm.init(this.inputForm.projectId)
       },
       getWorkClientChoose (list) {
-        if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList)) {
-          this.inputForm.cwProjectInfoList = []
-        }
+        // if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList)) {
+        //   this.inputForm.cwProjectInfoList = []
+        // }
+        // eslint-disable-next-line no-unused-vars
         let _this = this
         let _list = list
         const waitForEach = function () {
           return new Promise(function (resolve, reject) {
             _list.forEach((item) => {
-              _this.inputForm.cwProjectInfoList.forEach(client => {
-                if (item.id === client.servedUnitId) {
-                  // _this.$message.error('已存在客户 “' + client.servedUnitName + '”,请重新选择')
-                  // throw new Error('已存在客户 “' + client.servedUnitName + '”,请重新选择')
-                }
-              })
+              // _this.inputForm.cwProjectInfoList.forEach(client => {
+              //   if (item.id === client.servedUnitId) {
+              //     // _this.$message.error('已存在客户 “' + client.servedUnitName + '”,请重新选择')
+              //     // throw new Error('已存在客户 “' + client.servedUnitName + '”,请重新选择')
+              //   }
+              // })
             })
             resolve()
           })
@@ -752,16 +729,19 @@
         waitForEach().then(() => {
           list.forEach(item => {
             // eslint-disable-next-line no-unused-vars
-            let d = {
-              servedUnitName: item.name, // 被服务单位名称
-              // reportNumber: this.inputForm.projectNumber + '-0' + (this.inputForm.cwProjectInfoList.length + 1), // 报告流水号
-              issueReport: '是',
-              sealType: '未盖章',
-              id: this.uuid,
-              servedUnitId: item.id
-            }
-            this.$refs.clientTable.insertAt(d)
-            this.inputForm.cwProjectInfoList.push(d)
+            // let d = {
+            //   servedUnitName: item.name, // 被服务单位名称
+            //   // reportNumber: this.inputForm.projectNumber + '-0' + (this.inputForm.cwProjectInfoList.length + 1), // 报告流水号
+            //   issueReport: '是',
+            //   sealType: '未盖章',
+            //   id: this.uuid,
+            //   servedUnitId: item.id
+            // }
+            // this.$refs.clientTable.insertAt(d)
+            // this.inputForm.cwProjectInfoList.push(d)
+            this.inputForm.servedUnitName = item.name
+            this.inputForm.servedUnitId = item.id
+            this.inputForm.sealType = '未盖章'
             this.tableKeyClient = Math.random()
           })
         })