cloud-web-corejs 1.1.0-dev.11 → 1.1.0-dev.13

package/src/components/mobile/wf/addTaskUserdialog.vue

@@ -1,100 +1,100 @@
-<template>
-  <!-- 外壳改成 el-dialog + append-to-body，说明见 urgingDialog.vue。
-       里面的 h5SearchDialog（.pop-screen-box）跟着一起进了 body：它自己是
-       position:fixed + z-index:99，在 wrapper 这个层叠上下文内部照样盖住本弹层，
-       样式同样要走顶层选择器，见 xform/styles/h5.scss。 -->
-  <el-dialog
-    :visible.sync="dialogVisible"
-    :append-to-body="true"
-    :modal="false"
-    :show-close="false"
-    :close-on-click-modal="false"
-    :destroy-on-close="true"
-    custom-class="h5-pop-dialog"
-    width="100%"
-    top="0px"
-    @close="dialogClose"
-  >
-    <div>
-      <div class="header-box">
-        <i class="back el-icon-close" @click="dialogClose"></i>
-        选择用户
-      </div>
-      <div class="search-H5box">
-        <div class="txt">
-          <el-input placeholder="姓名" suffix-icon="el-icon-search" v-model="formData.nickName"
-                    @keyup.enter.native="searchEvent">
-            <el-button slot="append" @click="searchEvent"> 搜索</el-button>
-          </el-input>
-        </div>
-        <div class="icon-screen" @click="popStatus = true">
-          <i class="iconfont icon-shaixuan1"></i>
-          <span>高级筛选</span>
-        </div>
-      </div>
-      <div class="flex">
-        <div class="checkbox-all_list" @scroll="handleScroll">
-          <div v-for="(row,rowIndex) in page.records" :key="rowIndex" class="order-item"
-               :class="{on:checkList.includes(row.id)}" @click="changeCheck(row,rowIndex)">
-            <div class="is-checked" v-if="checkList.includes(row.id)"><i class="el-icon-check"></i>已选择</div>
-            <div class="t1">
-              <i class="icon"></i>
-              <span>{{ row.nickName }}</span>
-            </div>
-            <div class="t2">
-              <p>登录名：{{ row.loginAccount }}</p>
-              <p>角色：{{ row.roleNames }}</p>
-              <p>机构：{{ row.saleOrgNames }}</p>
-              <p>邮编：{{ row.zipCode }}</p>
-              <p>地址：{{ row.address }}</p>
-              <p>性别：{{ genderMap[row.gender] }}</p>
-              <p>所属组织：{{ row.companyNames }}</p>
-            </div>
-          </div>
-        </div>
-        <div class="checkbox-all">
-          <div class='ca-t'>已选择用户：</div>
-          <div class="ca-c">
-          <span v-for="(checkRow, rowIndex) in checkRows" :key="rowIndex">{{ checkRow.nickName }}<i
-            class="el-icon-delete" @click="changeCheck(checkRow)"></i></span>
-          </div>
-        </div>
-      </div>
-      <div class="fixed-bottom-btns">
-        <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">取 消
-        </el-button>
-        <el-button type="primary" class="btn" @click="dialogPrimary" icon="el-icon-check">确 定</el-button>
-      </div>
-      <h5SearchDialog v-if="popStatus" :visiable.sync="popStatus" @searchEvent="confirmSearchDialog"
-                      @resetEvent="resetSearchDialog">
-        <el-form label-position="top">
-          <el-form-item label="登录名">
-            <el-input v-model="formData.loginAccount" class="txt" clearable/>
-          </el-form-item>
-          <el-form-item label="姓名">
-            <el-input v-model="formData.nickName" class="txt" clearable/>
-          </el-form-item>
-          <el-form-item label="手机号">
-            <el-input v-model="formData.mobile" class="txt" clearable/>
-          </el-form-item>
-        </el-form>
-      </h5SearchDialog>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import selectDialogMixins from '../../../mixins/mobile/selectDialog/index.js';
-import mixin from './mixins/addTaskUserdialogMixin';
-
-export default {
-  name: 'userDialog',
-  props: ['visiable', 'multi', 'rows', 'param'],
-  mixins: [selectDialogMixins, mixin],
-  data() {
-    return {
-      dialogVisible: true
-    };
-  }
-};
-</script>
+<template>
+  <!-- 外壳改成 el-dialog + append-to-body，说明见 urgingDialog.vue。
+       里面的 h5SearchDialog（.pop-screen-box）跟着一起进了 body：它自己是
+       position:fixed + z-index:99，在 wrapper 这个层叠上下文内部照样盖住本弹层，
+       样式同样要走顶层选择器，见 xform/styles/h5.scss。 -->
+  <el-dialog
+    :visible.sync="dialogVisible"
+    :append-to-body="true"
+    :modal="false"
+    :show-close="false"
+    :close-on-click-modal="false"
+    :destroy-on-close="true"
+    custom-class="h5-pop-dialog"
+    width="100%"
+    top="0px"
+    @close="dialogClose"
+  >
+    <div>
+      <div class="header-box">
+        <i class="back el-icon-close" @click="dialogClose"></i>
+        选择用户
+      </div>
+      <div class="search-H5box">
+        <div class="txt">
+          <el-input placeholder="姓名" suffix-icon="el-icon-search" v-model="formData.nickName"
+                    @keyup.enter.native="searchEvent">
+            <el-button slot="append" @click="searchEvent"> 搜索</el-button>
+          </el-input>
+        </div>
+        <div class="icon-screen" @click="popStatus = true">
+          <i class="iconfont icon-shaixuan1"></i>
+          <span>高级筛选</span>
+        </div>
+      </div>
+      <div class="flex">
+        <div class="checkbox-all_list" @scroll="handleScroll">
+          <div v-for="(row,rowIndex) in page.records" :key="rowIndex" class="order-item"
+               :class="{on:checkList.includes(row.id)}" @click="changeCheck(row,rowIndex)">
+            <div class="is-checked" v-if="checkList.includes(row.id)"><i class="el-icon-check"></i>已选择</div>
+            <div class="t1">
+              <i class="icon"></i>
+              <span>{{ row.nickName }}</span>
+            </div>
+            <div class="t2">
+              <p>登录名：{{ row.loginAccount }}</p>
+              <p>角色：{{ row.roleNames }}</p>
+              <p>机构：{{ row.saleOrgNames }}</p>
+              <p>邮编：{{ row.zipCode }}</p>
+              <p>地址：{{ row.address }}</p>
+              <p>性别：{{ genderMap[row.gender] }}</p>
+              <p>所属组织：{{ row.companyNames }}</p>
+            </div>
+          </div>
+        </div>
+        <div class="checkbox-all">
+          <div class='ca-t'>已选择用户：</div>
+          <div class="ca-c">
+          <span v-for="(checkRow, rowIndex) in checkRows" :key="rowIndex">{{ checkRow.nickName }}<i
+            class="el-icon-delete" @click="changeCheck(checkRow)"></i></span>
+          </div>
+        </div>
+      </div>
+      <div class="fixed-bottom-btns">
+        <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">取 消
+        </el-button>
+        <el-button type="primary" class="btn" @click="dialogPrimary" icon="el-icon-check">确 定</el-button>
+      </div>
+      <h5SearchDialog v-if="popStatus" :visiable.sync="popStatus" @searchEvent="confirmSearchDialog"
+                      @resetEvent="resetSearchDialog">
+        <el-form label-position="top">
+          <el-form-item label="登录名">
+            <el-input v-model="formData.loginAccount" class="txt" clearable/>
+          </el-form-item>
+          <el-form-item label="姓名">
+            <el-input v-model="formData.nickName" class="txt" clearable/>
+          </el-form-item>
+          <el-form-item label="手机号">
+            <el-input v-model="formData.mobile" class="txt" clearable/>
+          </el-form-item>
+        </el-form>
+      </h5SearchDialog>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import selectDialogMixins from '../../../mixins/mobile/selectDialog/index.js';
+import mixin from './mixins/addTaskUserdialogMixin';
+
+export default {
+  name: 'userDialog',
+  props: ['visiable', 'multi', 'rows', 'param'],
+  mixins: [selectDialogMixins, mixin],
+  data() {
+    return {
+      dialogVisible: true
+    };
+  }
+};
+</script>

package/src/components/mobile/wf/content.vue

@@ -202,7 +202,7 @@
         </div>
       </div>
     </div>
-    <div class="pop-tipsBox h5-pop-tips" style="display: block;" v-show="rejectDialogVisible"
+    <div class="pop-tipsBox h5-pop-tips" style="display: block;" v-show="rejectDialogVisible"
          v-append-to-body>
       <div>
         <i class="icon"></i>
@@ -239,7 +239,7 @@
         </div>
       </div>
     </div>
-    <div class="pop-tipsBox h5-pop-tips" style="display: block;" v-show="agreeDialogVisible"
+    <div class="pop-tipsBox h5-pop-tips" style="display: block;" v-show="agreeDialogVisible"
          v-append-to-body>
       <div>
         <i class="icon"></i>
@@ -282,7 +282,7 @@
         </div>
       </div>
     </div>
-    <div class="pop-tipsBox h5-pop-tips" style="display: block;" v-show="changeWfDialogVisible"
+    <div class="pop-tipsBox h5-pop-tips" style="display: block;" v-show="changeWfDialogVisible"
          v-append-to-body>
       <div>
         <i class="icon"></i>
@@ -326,7 +326,7 @@
         </div>
       </div>
     </div>
-    <div class="pop-tipsBox h5-pop-tips" style="display: block;" v-show="showAddIncreaseSignDialog"
+    <div class="pop-tipsBox h5-pop-tips" style="display: block;" v-show="showAddIncreaseSignDialog"
          v-append-to-body>
       <div>
         <i class="icon"></i>

package/src/components/mobile/wf/deleteTaskUserDialog.vue

@@ -1,73 +1,73 @@
-<template>
-  <!-- 外壳改成 el-dialog + append-to-body，说明见 urgingDialog.vue。
-       原来的 :style="'z-index:'+zIndex" 去掉了：层级由 element 的 PopupManager
-       统一分配给 .el-dialog__wrapper，再手写一层反而会和它打架。 -->
-  <el-dialog
-    :visible.sync="dialogVisible"
-    :append-to-body="true"
-    :modal="false"
-    :show-close="false"
-    :close-on-click-modal="false"
-    :destroy-on-close="true"
-    custom-class="h5-pop-dialog"
-    width="100%"
-    top="0px"
-    @close="dialogClose"
-  >
-    <div>
-      <div class="header-box">
-        <i class="back el-icon-close" @click="dialogClose"></i>
-        {{ $t2('减签', 'components.wf.deleteIncreaseSign') }}
-        <template v-if="!wfInfo.wfAdmin">
-          ({{ $t2('注：只允许删除本人新增的加签', 'components.wf.deleteIncreaseSignTip2') }})
-        </template>
-        <span>—</span>
-        <b class="f-red">
-          {{ $t2('节点', 'components.wf.node') }}：{{ wfInfo.taskName }}
-        </b>
-      </div>
-      <div class="flex">
-        <div class="checkbox-all_list" @scroll="handleScroll">
-          <div v-for="(row,rowIndex) in page.records" :key="rowIndex" class="order-item"
-               :class="{on:checkList.includes(row.id)}" @click="changeCheck(row,rowIndex)">
-            <div class="is-checked" v-if="checkList.includes(row.id)"><i class="el-icon-check"></i>已选择</div>
-            <div class="t1">
-              <i class="icon"></i>
-              <span>{{ row.name }}</span>
-            </div>
-            <div class="t2">
-              <p>候选人ID：{{ row.id }}</p>
-            </div>
-          </div>
-        </div>
-        <div class="checkbox-all">
-          <div class='ca-t'>已选择候选人：</div>
-          <div class="ca-c">
-          <span v-for="(checkRow, rowIndex) in checkRows" :key="rowIndex">{{ checkRow.name }}<i
-            class="el-icon-delete" @click="changeCheck(checkRow)"></i></span>
-          </div>
-        </div>
-      </div>
-      <div class="fixed-bottom-btns">
-        <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">取 消
-        </el-button>
-        <el-button type="primary" class="btn" @click="dialogPrimary" icon="el-icon-check">确 定</el-button>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import selectDialogMixins from '../../../mixins/mobile/selectDialog/index.js';
-import mixin from './mixins/deleteTaskUserDialogMixin';
-
-export default {
-  name: 'deleteTaskUserDialog',
-  mixins: [selectDialogMixins, mixin],
-  data() {
-    return {
-      dialogVisible: true
-    };
-  }
-};
-</script>
+<template>
+  <!-- 外壳改成 el-dialog + append-to-body，说明见 urgingDialog.vue。
+       原来的 :style="'z-index:'+zIndex" 去掉了：层级由 element 的 PopupManager
+       统一分配给 .el-dialog__wrapper，再手写一层反而会和它打架。 -->
+  <el-dialog
+    :visible.sync="dialogVisible"
+    :append-to-body="true"
+    :modal="false"
+    :show-close="false"
+    :close-on-click-modal="false"
+    :destroy-on-close="true"
+    custom-class="h5-pop-dialog"
+    width="100%"
+    top="0px"
+    @close="dialogClose"
+  >
+    <div>
+      <div class="header-box">
+        <i class="back el-icon-close" @click="dialogClose"></i>
+        {{ $t2('减签', 'components.wf.deleteIncreaseSign') }}
+        <template v-if="!wfInfo.wfAdmin">
+          ({{ $t2('注：只允许删除本人新增的加签', 'components.wf.deleteIncreaseSignTip2') }})
+        </template>
+        <span>—</span>
+        <b class="f-red">
+          {{ $t2('节点', 'components.wf.node') }}：{{ wfInfo.taskName }}
+        </b>
+      </div>
+      <div class="flex">
+        <div class="checkbox-all_list" @scroll="handleScroll">
+          <div v-for="(row,rowIndex) in page.records" :key="rowIndex" class="order-item"
+               :class="{on:checkList.includes(row.id)}" @click="changeCheck(row,rowIndex)">
+            <div class="is-checked" v-if="checkList.includes(row.id)"><i class="el-icon-check"></i>已选择</div>
+            <div class="t1">
+              <i class="icon"></i>
+              <span>{{ row.name }}</span>
+            </div>
+            <div class="t2">
+              <p>候选人ID：{{ row.id }}</p>
+            </div>
+          </div>
+        </div>
+        <div class="checkbox-all">
+          <div class='ca-t'>已选择候选人：</div>
+          <div class="ca-c">
+          <span v-for="(checkRow, rowIndex) in checkRows" :key="rowIndex">{{ checkRow.name }}<i
+            class="el-icon-delete" @click="changeCheck(checkRow)"></i></span>
+          </div>
+        </div>
+      </div>
+      <div class="fixed-bottom-btns">
+        <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">取 消
+        </el-button>
+        <el-button type="primary" class="btn" @click="dialogPrimary" icon="el-icon-check">确 定</el-button>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import selectDialogMixins from '../../../mixins/mobile/selectDialog/index.js';
+import mixin from './mixins/deleteTaskUserDialogMixin';
+
+export default {
+  name: 'deleteTaskUserDialog',
+  mixins: [selectDialogMixins, mixin],
+  data() {
+    return {
+      dialogVisible: true
+    };
+  }
+};
+</script>

package/src/components/mobile/wf/setCandidateDialog.vue

@@ -1,69 +1,69 @@
-<template>
-  <div>
-    <!-- 外壳改成 el-dialog + append-to-body，说明见 urgingDialog.vue。
-         下面的选用户弹层是本弹层里再弹一层，两层都由 PopupManager 递增发号，
-         后开的天然在上，不用手写 z-index。 -->
-    <el-dialog
-      :visible.sync="dialogVisible"
-      :append-to-body="true"
-      :modal="false"
-      :show-close="false"
-      :close-on-click-modal="false"
-      :destroy-on-close="true"
-      custom-class="h5-pop-dialog"
-      width="100%"
-      top="0px"
-      @close="dialogClose"
-    >
-      <div>
-        <div class="header-box">
-          <i class="back el-icon-close" @click="dialogClose"></i>
-          {{ $t2('修改候选人', 'components.wf.setCandidateTitle') }}<span>—</span>
-          <b class="f-red">{{ $t2('节点', 'components.wf.node') }}：{{ wfInfo.taskName }}</b>
-        </div>
-        <div class="flex">
-          <div class="checkbox-all_list">
-            <div v-for="(row,rowIndex) in page.records" :key="rowIndex" class="order-item">
-              <div class="t1">
-                <i class="icon"></i>
-                <span>候选人：{{ getUsernames(row) }}</span>
-              </div>
-              <div class="t2">
-                <p>节点名称：{{ row.nodeName }}</p>
-              </div>
-              <div class="btns">
-                <el-button type="primary" plain class="btn" @click="openUserDialig(row, rowIndex)" icon="el-icon-edit">
-                  设置候选人
-                </el-button>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="fixed-bottom-btns">
-          <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">取 消</el-button>
-          <el-button type="primary" class="btn" @click="dialogClose" icon="el-icon-check">确 定</el-button>
-        </div>
-      </div>
-    </el-dialog>
-    <user-dialog v-if="showUserDialog" :visiable.sync="showUserDialog" @close="showUserDialog = false"
-                 @confirm="userConfirm" multi="true" :rows="userRows"></user-dialog>
-  </div>
-</template>
-
-<script>
-import selectDialogMixins from '../../../mixins/mobile/selectDialog/index.js';
-import mixin from './mixins/setCandidateDialogMixin';
-// 选用户弹层改用包内的 selectUserDialog（el-dialog 版）。原来引的
-// views/mobile/user/user/dialog.vue 仍是 .pop-box 版、且不随包发布，保持原样不动。
-import userDialog from "./selectUserDialog.vue";
-
-export default {
-  mixins: [selectDialogMixins, mixin],
-  components: {userDialog},
-  data() {
-    return {
-      dialogVisible: true
-    };
-  }
-};
-</script>
+<template>
+  <div>
+    <!-- 外壳改成 el-dialog + append-to-body，说明见 urgingDialog.vue。
+         下面的选用户弹层是本弹层里再弹一层，两层都由 PopupManager 递增发号，
+         后开的天然在上，不用手写 z-index。 -->
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :append-to-body="true"
+      :modal="false"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      custom-class="h5-pop-dialog"
+      width="100%"
+      top="0px"
+      @close="dialogClose"
+    >
+      <div>
+        <div class="header-box">
+          <i class="back el-icon-close" @click="dialogClose"></i>
+          {{ $t2('修改候选人', 'components.wf.setCandidateTitle') }}<span>—</span>
+          <b class="f-red">{{ $t2('节点', 'components.wf.node') }}：{{ wfInfo.taskName }}</b>
+        </div>
+        <div class="flex">
+          <div class="checkbox-all_list">
+            <div v-for="(row,rowIndex) in page.records" :key="rowIndex" class="order-item">
+              <div class="t1">
+                <i class="icon"></i>
+                <span>候选人：{{ getUsernames(row) }}</span>
+              </div>
+              <div class="t2">
+                <p>节点名称：{{ row.nodeName }}</p>
+              </div>
+              <div class="btns">
+                <el-button type="primary" plain class="btn" @click="openUserDialig(row, rowIndex)" icon="el-icon-edit">
+                  设置候选人
+                </el-button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="fixed-bottom-btns">
+          <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">取 消</el-button>
+          <el-button type="primary" class="btn" @click="dialogClose" icon="el-icon-check">确 定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+    <user-dialog v-if="showUserDialog" :visiable.sync="showUserDialog" @close="showUserDialog = false"
+                 @confirm="userConfirm" multi="true" :rows="userRows"></user-dialog>
+  </div>
+</template>
+
+<script>
+import selectDialogMixins from '../../../mixins/mobile/selectDialog/index.js';
+import mixin from './mixins/setCandidateDialogMixin';
+// 选用户弹层改用包内的 selectUserDialog（el-dialog 版）。原来引的
+// views/mobile/user/user/dialog.vue 仍是 .pop-box 版、且不随包发布，保持原样不动。
+import userDialog from "./selectUserDialog.vue";
+
+export default {
+  mixins: [selectDialogMixins, mixin],
+  components: {userDialog},
+  data() {
+    return {
+      dialogVisible: true
+    };
+  }
+};
+</script>