LAPTOP-FO2T5SIU\35838 6 kuukautta sitten
vanhempi
commit
4ffa4d7109

+ 9 - 23
src/views/signingManagement/contractManagement/contractAdd.vue

@@ -63,8 +63,7 @@
                     v-model="item.relationship"
                     placeholder="与1的关系"
                     filterable
-                    :popper-append-to-body="false"
-                    popper-class="statistic_base"
+
                     disabled
                   >
                     <el-option
@@ -72,8 +71,6 @@
                       :key="relationship.value"
                       :label="relationship.label"
                       :value="relationship.value"
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                     />
                   </el-select>
                 </el-form-item>
@@ -124,8 +121,7 @@
                 <el-form-item>
                   <el-select
                     v-model="form.institution"
-                    :popper-append-to-body="false"
-                    popper-class="statistic_base"
+
                     placeholder=""
                     filterable
                     :disabled="isView"
@@ -133,8 +129,7 @@
                     <el-option
                       v-for="item in dc_data.MAPPING_INSTITUTION"
                       :key="item.value"
-                      popper-class="statistic_base"
-                      :popper-append-to-body="false"
+
                       :label="item.label"
                       :value="item.value"
                     />
@@ -148,7 +143,7 @@
                 <el-form-item>
                   <el-date-picker
                     v-model="form.signingDate"
-                    popper-class="statistic_base"
+
                     type="date"
                     placeholder="年月日"
                     value-format="yyyy-MM-dd"
@@ -207,16 +202,12 @@
                   <el-select
                     v-model="form.paymentMethod"
                     placeholder="请选择"
-                    size="small"
                     :disabled="isView"
-                    :popper-append-to-body="false"
-                    popper-class="statistic_base"
                   >
                     <el-option
                       v-for="item in dc_data.PAYMENT_METHODS"
                       :key="item.value"
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
+
                       :label="item.label"
                       :value="item.value"
                     />
@@ -233,14 +224,11 @@
                     placeholder="请选择"
                     size="small"
                     :disabled="isView"
-                    :popper-append-to-body="false"
-                    popper-class="statistic_base"
                   >
                     <el-option
                       v-for="item in dc_data.DOWN_PAYMENT_PROPORTION"
                       :key="item.value"
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
+
                       :label="item.label"
                       :value="item.value"
                     />
@@ -254,7 +242,7 @@
             <!--                <el-form-item>-->
             <!--                  <el-date-picker-->
             <!--                    v-model="form.deadline"-->
-            <!--                    popper-class="statistic_base"-->
+            <!--                    -->
             <!--                    type="date"-->
             <!--                    placeholder="年月日"-->
             <!--                    value-format="yyyy-MM-dd"-->
@@ -299,7 +287,7 @@
                     <el-button v-if="!isView" size="small" type="primary">点击上传</el-button>
                     <div slot="file" slot-scope="{file}">
                       <a :href="file.url">{{ file.name }}</a>
-                      <span class="el-upload-list__item-actions" v-show="!isView">
+                      <span v-show="!isView" class="el-upload-list__item-actions">
                         <i class="el-icon-delete" @click="handlePictureRemove(file,contractOriginalList)" />
                       </span>
                     </div>
@@ -320,7 +308,7 @@
                     <el-button v-if="!isView" size="small" type="primary">点击上传</el-button>
                     <div slot="file" slot-scope="{file}">
                       <a :href="file.url">{{ file.name }}</a>
-                      <span class="el-upload-list__item-actions" v-show="!isView">
+                      <span v-show="!isView" class="el-upload-list__item-actions">
                         <i class="el-icon-delete" @click="handlePictureRemove(file,contractOtherList)" />
                       </span>
                     </div>
@@ -559,6 +547,4 @@ export default {
     }
 }
 
-
-
 </style>

+ 0 - 4
src/views/signingManagement/contractManagement/index.vue

@@ -12,8 +12,6 @@
           clearable
           filterable
           placeholder="合同状态"
-          :popper-append-to-body="false"
-          popper-class="statistic_base"
           size="small"
           @change="handleSearch"
         >
@@ -22,8 +20,6 @@
             :key="item.value"
             :label="item.label"
             :value="item.value"
-            :popper-append-to-body="false"
-            popper-class="statistic_base"
           />
         </el-select>
         <div class="qyrqBox">

+ 3 - 0
src/views/workbench/components/myMenu.vue

@@ -149,6 +149,8 @@ export default {
             }
         },
         jumpInfo(ral) {
+            console.log('ral', ral)
+            ral.url = 'backstage?menuIndex=' + ral.pid + '&subMenu=' + ral.id
             // this.$router.push(ral)
             try {
                 this.baseRequest('listPermissionAll', {}).then(res => {
@@ -345,6 +347,7 @@ export default {
                 if (item.pid === node.id && item.type === 1) {
                     const c = {
                         id: item.id,
+                        pid: item.pid,
                         name: item.name,
                         icon: item.icon,
                         url: '/' + node.url + '/' + item.url

+ 14 - 3
src/views/workbench/components/tianqi.vue

@@ -6,14 +6,25 @@
 				 box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 				 border-radius: 5px;height: 100%"
   >
+    <!--    <iframe-->
+    <!--      scrolling="no"-->
+    <!--      src="https://widget.tianqiapi.com/?style=ti&skin=pitaya"-->
+    <!--      frameborder="0"-->
+    <!--      width="100%"-->
+    <!--      height="316"-->
+    <!--      allowtransparency="true"-->
+    <!--      style="width: 100%;margin-top: 10%"-->
+    <!--    />-->
     <iframe
       scrolling="no"
-      src="https://tianqiapi.com/api.php?style=ti&skin=pitaya"
+      src="https://widget.tianqiapi.com/?style=tw&skin=cucumber"
       frameborder="0"
       width="100%"
-      height="316"
+      height="375px"
       allowtransparency="true"
-      style="width: 100%;margin-top: 10%"
+      style="width: 100%"
+      fontsize="20px"
+      ;
     />
 
   </div>