lizhenhao пре 2 година
родитељ
комит
79417dde16

+ 1 - 22
src/views/modules/sys/project/AssessForm.vue

@@ -285,7 +285,7 @@
                           :rules="[
                  ]">
               <!--              <el-input v-model="inputForm.status" placeholder="请填写项目状态"     ></el-input>-->
-              <el-select v-model="inputForm.status" placeholder="请选择">
+              <el-select v-model="inputForm.status" placeholder="请选择" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('project_status')"
                   :key="item.value"
@@ -295,27 +295,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="评估报告日message" prop="assessReportMessage"
-                          :rules="[
-                 ]">
-              <el-input v-model="inputForm.assessReportMessage" placeholder="请填写评估报告日message"     ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="评估基准日message" prop="assessBaseMessage"
-                          :rules="[
-                 ]">
-              <el-input v-model="inputForm.assessBaseMessage" placeholder="请填写评估基准日message"     ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开票日期message" prop="invoiceMessage"
-                          :rules="[
-                 ]">
-              <el-input v-model="inputForm.invoiceMessage" placeholder="请填写开票日期message"     ></el-input>
-            </el-form-item>
-          </el-col>
 
         </el-row>
       </el-form>

+ 13 - 13
src/views/modules/sys/project/AssessList.vue

@@ -54,36 +54,36 @@
                 :checkbox-config="{}">
                 <vxe-column type="seq" width="40"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
-                <vxe-column width="130px"  title="项目名称" field="projectName" sortable>
+                <vxe-column width="400px"  title="项目名称" field="projectName">
                     <template slot-scope="scope">
-                        <el-link  type="primary" :underline="false" v-if="hasPermission('sys:project:edit')" @click="edit(scope.row.id)">{{scope.row.projectName}}</el-link>
+                        <el-link  type="primary" :underline="false" v-if="hasPermission('sys:project:edit')" @click="view(scope.row.id)">{{scope.row.projectName}}</el-link>
                         <el-link  type="primary" :underline="false" v-else-if="hasPermission('sys:project:view')"  @click="view(scope.row.id)">{{scope.row.projectName}}</el-link>
                         <span v-else>{{scope.row.projectName}}</span>
                     </template>
                 </vxe-column>
-                <vxe-column width="130px"  title="文号" field="documentNum" sortable> </vxe-column>
-                <vxe-column width="130px"  title="协议号" field="protocolNum" sortable> </vxe-column>
-                <vxe-column width="130px"  title="客户名称" field="customerName" sortable> </vxe-column>
-                <vxe-column width="130px"  title="报告收费" field="reportCharges" sortable> </vxe-column>
-                <vxe-column width="130px" title="合同是否存档" field="isContractArchive" sortable>
+                <vxe-column width="200px"  title="文号" field="documentNum" > </vxe-column>
+                <vxe-column width="110px"  title="协议号" field="protocolNum" > </vxe-column>
+                <vxe-column width="200px"  title="客户名称" field="customerName" > </vxe-column>
+                <vxe-column width="80px"  title="报告收费" field="reportCharges" > </vxe-column>
+                <vxe-column width="110px" title="合同是否存档" field="isContractArchive" >
                   <template slot-scope="scope">
                     {{ $dictUtils.getDictLabel("yes_no", scope.row.isContractArchive, '-') }}
                   </template>
                 </vxe-column>
-                <vxe-column width="130px" title="底稿是否完好" field="isPapersIntact" sortable>
+                <vxe-column width="110px" title="底稿是否完好" field="isPapersIntact" >
                   <template slot-scope="scope">
                     {{ $dictUtils.getDictLabel("yes_no", scope.row.isPapersIntact, '-') }}
                   </template>
                 </vxe-column>
-                <vxe-column width="130px"  title="是否已经报销提成" field="isCommissionReimbursement" sortable>
+                <vxe-column width="130px"  title="是否已经报销提成" field="isCommissionReimbursement" >
                   <template slot-scope="scope">
                     {{ $dictUtils.getDictLabel("yes_no", scope.row.isCommissionReimbursement, '-') }}
                   </template>
                 </vxe-column>
-                <vxe-column width="130px"  title="项目负责人" field="projectHead" sortable> </vxe-column>
-                <vxe-column width="130px"  title="评估报告日" field="evaluationReportDate" sortable> </vxe-column>
-                <vxe-column width="130px"  title="开票日期" field="invoiceDate" sortable> </vxe-column>
-                <vxe-column width="130px"   title="状态" field="status" sortable>
+                <vxe-column width="110px"  title="项目负责人" field="projectHead" > </vxe-column>
+                <vxe-column width="130px"  title="评估报告日" field="evaluationReportDate" > </vxe-column>
+                <vxe-column width="130px"  title="开票日期" field="invoiceDate" > </vxe-column>
+                <vxe-column width="50px"   title="状态" field="status" >
                   <template slot-scope="scope">
                     {{ $dictUtils.getDictLabel("project_status", scope.row.status, '-') }}
                   </template>

+ 1 - 22
src/views/modules/sys/project/ConsultationForm.vue

@@ -285,7 +285,7 @@
                           :rules="[
                  ]">
 <!--              <el-input v-model="inputForm.status" placeholder="请填写项目状态"     ></el-input>-->
-              <el-select v-model="inputForm.status" placeholder="请选择">
+              <el-select v-model="inputForm.status" placeholder="请选择" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('project_status')"
                   :key="item.value"
@@ -295,27 +295,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="评估报告日message" prop="assessReportMessage"
-                          :rules="[
-                 ]">
-              <el-input v-model="inputForm.assessReportMessage" placeholder="请填写评估报告日message"     ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="评估基准日message" prop="assessBaseMessage"
-                          :rules="[
-                 ]">
-              <el-input v-model="inputForm.assessBaseMessage" placeholder="请填写评估基准日message"     ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开票日期message" prop="invoiceMessage"
-                          :rules="[
-                 ]">
-              <el-input v-model="inputForm.invoiceMessage" placeholder="请填写开票日期message"     ></el-input>
-            </el-form-item>
-          </el-col>
 
         </el-row>
       </el-form>

+ 34 - 34
src/views/modules/sys/project/ConsultationList.vue

@@ -55,40 +55,40 @@
                 :checkbox-config="{}">
                 <vxe-column type="seq" width="40"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
-                <vxe-column width="130px"  title="项目名称" field="projectName" sortable>
-                    <template slot-scope="scope">
-                        <el-link  type="primary" :underline="false" v-if="hasPermission('sys:project:edit')" @click="edit(scope.row.id)">{{scope.row.projectName}}</el-link>
-                        <el-link  type="primary" :underline="false" v-else-if="hasPermission('sys:project:view')"  @click="view(scope.row.id)">{{scope.row.projectName}}</el-link>
-                        <span v-else>{{scope.row.projectName}}</span>
-                    </template>
-                </vxe-column>
-                <vxe-column width="130px"  title="文号" field="documentNum" sortable> </vxe-column>
-                <vxe-column width="130px"  title="协议号" field="protocolNum" sortable> </vxe-column>
-                <vxe-column width="130px"  title="客户名称" field="customerName" sortable> </vxe-column>
-                <vxe-column width="130px"  title="报告收费" field="reportCharges" sortable> </vxe-column>
-                <vxe-column width="130px" title="合同是否存档" field="isContractArchive" sortable>
-                  <template slot-scope="scope">
-                    {{ $dictUtils.getDictLabel("yes_no", scope.row.isContractArchive, '-') }}
-                  </template>
-                </vxe-column>
-                <vxe-column width="130px" title="底稿是否完好" field="isPapersIntact" sortable>
-                  <template slot-scope="scope">
-                    {{ $dictUtils.getDictLabel("yes_no", scope.row.isPapersIntact, '-') }}
-                  </template>
-                </vxe-column>
-                <vxe-column width="130px"  title="是否已经报销提成" field="isCommissionReimbursement" sortable>
-                  <template slot-scope="scope">
-                    {{ $dictUtils.getDictLabel("yes_no", scope.row.isCommissionReimbursement, '-') }}
-                  </template>
-                </vxe-column>
-                <vxe-column width="130px"  title="项目负责人" field="projectHead" sortable> </vxe-column>
-                <vxe-column width="130px"  title="评估报告日" field="evaluationReportDate" sortable> </vxe-column>
-                <vxe-column width="130px"  title="开票日期" field="invoiceDate" sortable> </vxe-column>
-                <vxe-column width="130px"   title="状态" field="status" sortable>
-                  <template slot-scope="scope">
-                    {{ $dictUtils.getDictLabel("project_status", scope.row.status, '-') }}
-                  </template>
-                </vxe-column>
+              <vxe-column width="400px"  title="项目名称" field="projectName">
+                <template slot-scope="scope">
+                  <el-link  type="primary" :underline="false" v-if="hasPermission('sys:project:edit')" @click="view(scope.row.id)">{{scope.row.projectName}}</el-link>
+                  <el-link  type="primary" :underline="false" v-else-if="hasPermission('sys:project:view')"  @click="view(scope.row.id)">{{scope.row.projectName}}</el-link>
+                  <span v-else>{{scope.row.projectName}}</span>
+                </template>
+              </vxe-column>
+              <vxe-column width="200px"  title="文号" field="documentNum" > </vxe-column>
+              <vxe-column width="110px"  title="协议号" field="protocolNum" > </vxe-column>
+              <vxe-column width="200px"  title="客户名称" field="customerName" > </vxe-column>
+              <vxe-column width="80px"  title="报告收费" field="reportCharges" > </vxe-column>
+              <vxe-column width="110px" title="合同是否存档" field="isContractArchive" >
+                <template slot-scope="scope">
+                  {{ $dictUtils.getDictLabel("yes_no", scope.row.isContractArchive, '-') }}
+                </template>
+              </vxe-column>
+              <vxe-column width="110px" title="底稿是否完好" field="isPapersIntact" >
+                <template slot-scope="scope">
+                  {{ $dictUtils.getDictLabel("yes_no", scope.row.isPapersIntact, '-') }}
+                </template>
+              </vxe-column>
+              <vxe-column width="130px"  title="是否已经报销提成" field="isCommissionReimbursement" >
+                <template slot-scope="scope">
+                  {{ $dictUtils.getDictLabel("yes_no", scope.row.isCommissionReimbursement, '-') }}
+                </template>
+              </vxe-column>
+              <vxe-column width="110px"  title="项目负责人" field="projectHead" > </vxe-column>
+              <vxe-column width="130px"  title="评估报告日" field="evaluationReportDate" > </vxe-column>
+              <vxe-column width="130px"  title="开票日期" field="invoiceDate" > </vxe-column>
+              <vxe-column width="50px"   title="状态" field="status" >
+                <template slot-scope="scope">
+                  {{ $dictUtils.getDictLabel("project_status", scope.row.status, '-') }}
+                </template>
+              </vxe-column>