4.09

jwtech-admin-page/src/views/building/photoManagement/index.vue

@@ -189,12 +189,12 @@ export default {
     },
     handleView(row) {
       console.log(row);
-      if (!row.proNo) {
+      if (!row.proId) {
         this.$message.warning("暂无项目信息");
         return;
       }
       this.$router.push({
-        path: `/building/projectInfo/projectProcess?baseDataId=${row.proNo}&activeName=missIdentification`  ,
+        path: `/building/projectInfo/projectProcess?baseDataId=${row.proId}&activeName=missIdentification`  ,
       });
     },
   },

jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/applyInfo.vue

@@ -94,7 +94,7 @@
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
-        <template slot-scope="scope">
+        <template slot-scope="scope" v-if="scope.row.status == '0'">
           <el-button
             size="mini"
             type="text"
@@ -124,7 +124,7 @@
     <!-- 添加或修改资金支付-立项对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="所属项目" prop="projectName">
+        <!-- <el-form-item label="所属项目" prop="projectName">
           <el-input v-model="form.projectName" placeholder="请输入所属项目" disabled />
         </el-form-item>
         <el-form-item label="项目编码" prop="proCode">
@@ -132,7 +132,7 @@
         </el-form-item>
         <el-form-item label="项目编号" prop="proNo">
           <el-input v-model="form.proNo" placeholder="请输入项目编号" disabled />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="支付日期" prop="payDate">
           <el-date-picker clearable size="small" style="width: 100%"
             v-model="form.payDate"
@@ -396,15 +396,15 @@ export default {
       getPayInfo(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改资金支付-立项";
+        this.title = "修改资金支付";
       });
     },
-    // 审核通过
+    // 审核不通过
-    handlePass() {
+    handleNoPass() {
       this.form.status = '2'
       this.submitForm()
     },
-    // 审核不通过
+    // 审核通过
     handlePass() {
       this.form.status = '1'
       this.submitForm()

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue

@@ -1103,6 +1103,9 @@ export default {
       behavior: "",
       // 表单校验
       rules: {
+        attachment:[
+        {required: true, message: "请上传附件", trigger: "blur"},
+        ],
         administrativeUnit: [
           {required: true, message: "请填写水行政主管部门", trigger: "blur"},
         ],
@@ -1394,8 +1397,16 @@ export default {
           }
         };
         getChildren(res, items.data[0].parentid);
-        // console.log("areasOptions", res);
+        console.log("----------------areasOptions-----------------", res);
-        this.areasOptions = res;
+
+        this.areasOptions = res.map((item) => {
+          // if (item.children.length == 0) {
+           item.children = item.children.map((childrenItem) => {
+             delete childrenItem.children;
+             return childrenItem;
+           })
+          return item;
+        })
         // 当不是admin时，默认行政区域
         // if (this.$userProfile.createUid != "admin") {
         //   this.queryParams.data.adcd = this.areasOptions[0].value;

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/index.vue

@@ -50,7 +50,7 @@
       >
         <resourcesArchives v-if="activeName==='resourcesArchives'"  :enterpriseId="$route.query.baseDataId" />
       </el-tab-pane>
-      <el-tab-pane
+      <!-- <el-tab-pane
         v-if="checkPermi(['market:gcyjjl:index'])"
         label="工程业绩记录"
         name="performanceRecord"
@@ -58,7 +58,7 @@
         :lazy="true"
       >
         <performanceRecord v-if="activeName==='performanceRecord'" :enterpriseId="$route.query.baseDataId" />
-      </el-tab-pane>
+      </el-tab-pane> -->
       <el-tab-pane
         v-if="checkPermi(['market:scxwyxy:index'])"
         label="获奖情况"

jwtech-pc-page/src/views/enterpriseInformation/enterpriseInDetail.vue

@@ -126,12 +126,12 @@ export default {
           atImg: require("@/assets/image/项目业绩_at.png"),
           normalImg: require("@/assets/image/项目业绩.png")
         },
-        {
+        // {
-          label: "工程获奖",
+        //   label: "工程获奖",
-          name: "projectAward",
+        //   name: "projectAward",
-          atImg: require("@/assets/image/工程获奖_at.png"),
+        //   atImg: require("@/assets/image/工程获奖_at.png"),
-          normalImg: require("@/assets/image/工程获奖.png")
+        //   normalImg: require("@/assets/image/工程获奖.png")
-        },
+        // },
         {
           label: "动态信用",
           name: "credit",

jwtech-pc-page/src/views/home/index.vue

@@ -173,9 +173,9 @@
         <div class="sw-left">
           <statistics-left />
         </div>
-        <div class="sw-right">
+        <!-- <div class="sw-right">
           <statistics-right />
-        </div>
+        </div> -->
       </div>
     </div>
 
@@ -530,7 +530,7 @@ export default {
       margin: 0 auto;
       display: flex;
       .sw-left {
-        width: 300px;
+        width: 100%;
       }
       .sw-right {
         height: 100%;