cloud-web-corejs 1.0.54-dev.35 → 1.0.54-dev.351

package/src/components/tempStorage/index.vue

@@ -1,11 +1,11 @@
 <template>
   <span class="button-sty">
-      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" @click="openSubmitDialog" plain>暂存</el-button>
+      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" @click="openSubmitDialog" plain :disabled="disabled">暂存</el-button>
       <el-tooltip class="item" effect="dark" content="查看暂存数据" placement="top">
-        <el-button class="btn-connect" @click="openTempStorageDialog" icon="iconfont icon-chakanshuju" type="success" ></el-button>
+        <el-button class="btn-connect" @click="openTempStorageDialog" icon="iconfont icon-chakanshuju" type="success" :disabled="disabled"></el-button>
       </el-tooltip>
 
-      <tempStorageDialog v-if="showTempStorageDialog" :visiable.sync="showTempStorageDialog" 
+      <tempStorageDialog v-if="showTempStorageDialog" :visiable.sync="showTempStorageDialog"
                          @confirm="confirmTempStorageDialog" :storageType="storageType" multi="false"/>
     <el-dialog
       v-if="showSubmitDialog"
@@ -54,7 +54,8 @@ import tempStorageDialog from "./tempStorageDialog.vue";
 
 export default {
   props: {
-    option: Object
+    option: Object,
+    disabled: Boolean,
   },
   components: {
     tempStorageDialog
@@ -82,7 +83,10 @@ export default {
       let url = USER_PREFIX + '/temp_storage/save';
       let billData = this.option.data() || {};
       let data = JSON.stringify(billData)
-      this.$http({
+
+      let that = this.option.vue || this.$$attrs["parent-target"] || this.$parent;
+      this.showSubmitDialog = false;
+      that.$http({
         url: url,
         method: `post`,
         data: {
@@ -99,7 +103,6 @@ export default {
             duration: 500,
             onClose: t => {
               this.option.saveConfirm && this.option.saveConfirm(res);
-              this.showSubmitDialog = false;
             }
           });
         }

package/src/components/tempStorage/tempStorageDialog.vue

@@ -60,7 +60,7 @@
       <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
         class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
       <div class="list">
-        <div class="item" v-for="(checkRow, index) in checkRows">
+        <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
           <p>{{ checkRow.storageCode }}</p>
           <a class="el-icon-close" @click="clearTable1Select(index)"></a>
         </div>

package/src/components/vb-tabs/x-tabs.vue

@@ -36,14 +36,15 @@ export default {
     }
   },
   methods: {
-    openEditTab(row) {
+    openEditTab(row,param) {
       let paneKeyName = this.paneKeyName;
       let tab = this.tabs.find(tab => tab.data[paneKeyName] === row[paneKeyName])
       if (!tab) {
         tab = {
           data: row,
           showContent: false,
-          dataId: row[paneKeyName]
+          dataId: row[paneKeyName],
+          param
         }
         if (this.tabs.length >= 30) {
           this.tabs.splice(0, 1, tab);

package/src/components/wf/addOpinionButton.vue

@@ -0,0 +1,57 @@
+<template>
+  <el-button type="primary" class="button-sty" @click="openDialog"
+              icon="el-icon-plus">{{ $t1('补充意见') }}
+  <el-dialog
+        v-if="showDialog"
+        :visible.sync="showDialog"
+        :modal-append-to-body="false"
+        :close-on-click-modal="false"
+        :modal="false"
+        custom-class="dialog-style wf-dialog"
+        :destroy-on-close="true"
+        :append-to-body="true"
+        v-el-drag-dialog
+        v-el-dialog-center
+      >
+        <template #title>
+          <span class="el-dialog__title">{{ $t1('补充意见') }}</span>
+        </template>
+        <el-form ref="form" :model="formData">
+          <div id="containt">
+            <table class="table-detail">
+              <tbody>
+              <tr>
+                <th>
+                    <span class="t">
+                      {{ $t1('内容') }}
+                    </span>
+                </th>
+                <td>
+                  <el-form-item label="" field="opinion">
+                    <el-input type="textarea" :rows="8" v-model="formData.opinion"></el-input>
+                  </el-form-item>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button type="primary" plain class="button-sty" @click="showDialog=false">
+            <i class="el-icon-close el-icon"></i>
+            {{ $t2('取 消', 'system.button.cancel2') }}
+          </el-button>
+          <el-button type="primary" @click="confirmDialog" class="button-sty">
+            <i class="el-icon-check el-icon"></i>
+            {{ $t2('确 定', 'system.button.confirm2') }}
+          </el-button>
+        </span>
+      </el-dialog>
+  </el-button>
+</template>
+<script>
+import mixin from "./mixins/addOpinionButton";
+export default {
+  mixins: [mixin],
+}
+</script>