Merge branch 'test' of http://106.55.241.82:3000/lzf/zhbsq-vue-web into test

src/components/DataAcquisition/index.vue

@@ -19,7 +19,7 @@
                 <el-form-item
                   prop="collCalue"
                   :label="
-                    listItem.normfeeName + '（' + listItem.funit_dictText + '）'
+                    listItem.normfeeName + '（' + listItem.funitName + '）'
                   "
                 >
                   <el-input
@@ -33,23 +33,6 @@
           </template>
         </el-row>
       </el-tab-pane>
-
-      <!-- <el-tab-pane label="审批记录" name="审批记录">
-        <el-timeline>
-          <el-timeline-item
-            v-for="(item, index) in taskList.formobj.taskVoList"
-            :timestamp="item.createTime"
-            placement="top"
-            :key="index + 'taskHisAction'"
-          >
-            <el-card>
-              <p>
-                {{ item.execId }} {{ item.acname }} 于 {{ item.createTime }}
-              </p>
-            </el-card>
-          </el-timeline-item>
-        </el-timeline>
-      </el-tab-pane> -->
       <div style="font-size: 18px; font-weight: 600; margin-bottom: 20px;">审批记录：</div>
       <el-timeline>
           <el-timeline-item
@@ -60,16 +43,12 @@
           >
             <el-card>
               <p>
-                {{ item.execId }} {{ item.acname }} 于 {{ item.createTime }}
+                {{ item.execName  +"------" +statusArr[item.status]+"------" +item.createTime }} <span v-if="item.comments != null">{{+"------备注："+ comments }}</span>
               </p>
             </el-card>
           </el-timeline-item>
         </el-timeline>
     </el-tabs>
-    <div class="remark" v-if="form.remark != null">
-      <div class="remark_title">驳回理由：</div>
-      <div class="remark_text">{{ taskList.remark }}</div>
-    </div>
   </div>
 </template>
 
@@ -92,13 +71,21 @@ export default {
       openDetail: false,
       form: {},
       edit: false,
-    };
+      statusArr:{
+        '0': '待审核',
+        '1': '同意',
+        '2': '驳回',
+        '3': '退回',
+    },
+  }
   },
   computed: {},
   methods: {
+
     handleClose() {
       this.check = false;
     },
+
     submitForm(type) {
       let p = [];
       p = this.form.feeLists.map((item, index) => {
@@ -197,7 +184,6 @@ export default {
     },
   },
   created() {
-    console.log(this.taskList);
 
     this.tabList = JSON.parse(JSON.stringify(this.taskList.formobj.feeLists));
     //去重获取tab

src/views/ENTERPRISETRADEPERFORMANCE/index.vue

@@ -163,6 +163,11 @@
                   <el-input v-model="form.gdzctz" placeholder="请输入固定资产投资"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="经营总收入" prop="jysr">
+                  <el-input v-model="form.jysr" placeholder="请输入经营总收入"></el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </el-tab-pane>
@@ -344,6 +349,9 @@ export default {
             trigger: "blur"
           }
         ],
+        jysr: [
+          { required: true, message: "经营总收入不能为空", trigger: "blur" },
+          ],
         zcfl: [
           { required: true, message: "资产分类 不能为空", trigger: "blur" },
         ],

src/views/GATHER/index.vue

@@ -476,7 +476,7 @@
                     :label="
                       listItem.normfeeName +
                       '（' +
-                      listItem.funit_dictText +
+                      listItem.funitName +
                       '）'
                     "
                     prop="collCalue"
@@ -519,7 +519,7 @@
           <!-- :rules="rules" ref="form" -->
           <el-form-item
             :label="
-              listItem.normfeeName + '（' + listItem.funit_dictText + '）'
+              listItem.normfeeName + '（' + listItem.funitName + '）'
             "
             prop="collCalue"
           >
@@ -578,7 +578,7 @@
                     :label="
                       listItem.normfeeName +
                       '（' +
-                      listItem.funit_dictText +
+                      listItem.funitName +
                       '）'
                     "
                   >
@@ -623,7 +623,7 @@
           <!-- :rules="rules" ref="form" -->z
           <el-form-item
             :label="
-              listItem.normfeeName + '（' + listItem.funit_dictText + '）'
+              listItem.normfeeName + '（' + listItem.funitName + '）'
             "
             prop="collCalue"
           >
@@ -637,22 +637,6 @@
           </el-form-item>
         </el-form>
       </template>
-
-      <!--
-      <el-form :model="form" v-else-if="this.form.type == 1">
-        <el-form-item
-          v-for="(listItem, listIndex) in form.feeLists"
-          :key="listIndex"
-          :label="listItem.normfeeName + '（' + listItem.funit_dictText + '）'"
-        >
-          <el-input
-            :disabled="!edit"
-            v-model="listItem.collCalue"
-            :placeholder="'请输入' + listItem.normfeeName"
-          ></el-input>
-        </el-form-item>
-      </el-form>
-      -->
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm('edit')" v-if="edit"
           >确 定</el-button

src/views/norm/feeindex.vue

@@ -99,7 +99,7 @@
         <el-table-column
           label="计量单位"
           align="center"
-          prop="funit_dictText"
+          prop="funitName"
           width="100"
         />
         <el-table-column

src/views/task/index.vue

@@ -85,7 +85,7 @@
       <span slot="footer" class="dialog-footer" v-if="taskList.status == 0">
         <el-button v-if="checkPermi(['task:instaction:approve'])" type="primary" @click="submitBtn('同意')">同意</el-button>
         <el-button  v-if="checkPermi(['task:instaction:reject'])"  type="warning" @click="submitBtn('驳回')">驳回</el-button>
-        <el-button  v-if="checkPermi(['task:instaction:goback'])"  type="danger" @click="submitBtn('退回')">退回</el-button>
+        <!-- <el-button  v-if="checkPermi(['task:instaction:goback'])"  type="danger" @click="submitBtn('退回')">退回</el-button> -->
       </span>
       <span slot="footer" class="dialog-footer" v-else>
         <el-button type="primary" @click="backDia">返回</el-button>