cloud-web-corejs 1.0.54-dev.182 → 1.0.54-dev.183

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.182",
+  "version": "1.0.54-dev.183",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/views/user/home/default.vue

@@ -56,7 +56,7 @@
                 <i class="el-icon-refresh"></i>
               </el-button>
             </el-tooltip>
-            <el-button type="text" @click="$router.push('/basic/wf/wf_manage/list')" class="more">
+            <el-button type="text" @click="toWfManageList" class="more">
               <i class="el-icon-news"></i>
               <span>{{ $t1('查看更多+') }}</span>
             </el-button>
@@ -183,6 +183,9 @@ import corejsConfig from "@/corejsConfig";
 
 export default {
   name: 'home',
+  props: {
+    wf_manage_url: String
+  },
   components: {
     systemNoticeInfoDialog,
     commMenuDialog,
@@ -217,7 +220,7 @@ export default {
       unreadMessageNum: 0,
       activating: true,
       wfTimer: null,
-      homeConfig:corejsConfig.homeConfig || {}
+      homeConfig: corejsConfig.homeConfig || {}
     };
   },
   activated() {
@@ -467,11 +470,11 @@ export default {
         this.$router.push({path: path, query: {url: route.url}});
       } else {
         let path = this.getPath(route)
-        if(!path)return
+        if (!path) return
         this.$router.push(path);
       }
     },
-    getPath(route3){
+    getPath(route3) {
       let item = null;
       let path = null
       if (route3.type == 0) {
@@ -569,6 +572,10 @@ export default {
         this.showWfDialog = false;
         this.wfClose();
       }
+    },
+    toWfManageList() {
+      let url = this.wf_manage_url || '/basic/wf/wf_manage/list'
+      this.$router.push(url)
     }
   }
 };
@@ -761,7 +768,7 @@ body #app .index-home {
   }
 
   .fast-box {
-        margin: 6px 4px 4px;
+    margin: 6px 4px 4px;
     overflow: hidden;
 
     .item {
@@ -769,6 +776,7 @@ body #app .index-home {
       text-align: center;
       float: left;
       margin-right: 14px;
+
       p {
         color: #2a6494;
         border: solid 1px #e2e2e2;
@@ -801,7 +809,7 @@ body #app .index-home {
           position: absolute;
           left: -1px;
           top: 50%;
-          margin-top:-12px;
+          margin-top: -12px;
         }
 
         &:hover {
@@ -1006,6 +1014,9 @@ body #app .index-home {
       }
     }
   }
-  ::v-deep .el-card.is-always-shadow{box-shadow: 0 2px 2px 0 rgb(0 0 0 / 6%);}
+
+  ::v-deep .el-card.is-always-shadow {
+    box-shadow: 0 2px 2px 0 rgb(0 0 0 / 6%);
+  }
 }
 </style>

package/src/views/user/wf/wf_manage/list.vue

@@ -93,6 +93,56 @@
                       </el-select>
                     </template>
                   </vxe-form-item>
+
+                  <vxe-form-item :title="$t1('机构')+':'" field="param4">
+                    <template v-slot>
+                      <el-input
+                        class="search-input"
+                        max="200"
+                        v-model="formData.param4"
+                        @clear="
+                          formData.param3 = null;
+                          $forceUpdate();
+                        "
+                        v-el-readonly
+                        clearable
+                      >
+                        <i slot="suffix" class="el-input__icon el-icon-search"
+                           @click="showSaleOrgDialog = true"></i>
+                      </el-input>
+                    </template>
+                  </vxe-form-item>
+                  <vxe-form-item :title="$t1('大区')+':'" field="param6">
+                    <template v-slot>
+                      <el-input
+                        class="search-input"
+                        max="200"
+                        v-model="formData.param6"
+                        @clear="
+                          formData.param5 = null;
+                          $forceUpdate();
+                        "
+                        v-el-readonly
+                        clearable
+                      >
+                        <i slot="suffix" class="el-input__icon el-icon-search"
+                           @click="showAreaDialog = true"></i>
+                      </el-input>
+                    </template>
+                  </vxe-form-item>
+
+                  <vxe-form-item :title="$t1('产品线')+':'" field="param7">
+                    <template v-slot>
+                      <el-input v-model="formData.param7" size="small" clearable/>
+                    </template>
+                  </vxe-form-item>
+
+                  <vxe-form-item :title="$t1('授权医院')+':'" field="param8">
+                    <template v-slot>
+                      <el-input v-model="formData.param8" size="small" clearable/>
+                    </template>
+                  </vxe-form-item>
+
                 </vxe-form>
               </template>
             </vxe-grid>
@@ -152,6 +202,54 @@
                     </el-select>
                   </template>
                 </vxe-form-item>
+                <vxe-form-item :title="$t1('机构')+':'" field="param4">
+                  <template v-slot>
+                    <el-input
+                      class="search-input"
+                      max="200"
+                      v-model="formData2.param4"
+                      @clear="
+                        formData2.param3 = null;
+                        $forceUpdate();
+                      "
+                      v-el-readonly
+                      clearable
+                    >
+                      <i slot="suffix" class="el-input__icon el-icon-search"
+                         @click="showSaleOrgDialog = true"></i>
+                    </el-input>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('大区')+':'" field="param6">
+                  <template v-slot>
+                    <el-input
+                      class="search-input"
+                      max="200"
+                      v-model="formData2.param6"
+                      @clear="
+                        formData2.param5 = null;
+                        $forceUpdate();
+                      "
+                      v-el-readonly
+                      clearable
+                    >
+                      <i slot="suffix" class="el-input__icon el-icon-search"
+                         @click="showAreaDialog2 = true"></i>
+                    </el-input>
+                  </template>
+                </vxe-form-item>
+
+                <vxe-form-item :title="$t1('产品线')+':'" field="param7">
+                  <template v-slot>
+                    <el-input v-model="formData2.param7" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+
+                <vxe-form-item :title="$t1('授权医院')+':'" field="param8">
+                  <template v-slot>
+                    <el-input v-model="formData2.param8" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
               </vxe-form>
             </template>
           </vxe-grid>
@@ -162,15 +260,28 @@
                        @confirm="confirmInsertWfObjConfig" :multi="false"></wfObjConfigDialog>
     <wfObjConfigDialog v-if="showWfObjConfigDialog2" :visiable.sync="showWfObjConfigDialog2" :type="99"
                        @confirm="confirmInsertWfObjConfig2" :multi="false"></wfObjConfigDialog>
+
+
+
+    <saleOrgDialog v-if="showSaleOrgDialog" :visiable.sync="showSaleOrgDialog" @confirm="confirmInsertSaleOrg" :multi="false"></saleOrgDialog>
+
+    <saleOrgDialog v-if="showSaleOrgDialog2" :visiable.sync="showSaleOrgDialog2" @confirm="confirmInsertSaleOrg2" :multi="false"></saleOrgDialog>
+
+    <areaDialog v-if="showAreaDialog" :visiable.sync="showAreaDialog"
+                   @confirm="confirmInsertArea" :multi="false"></areaDialog>
+    <areaDialog v-if="showAreaDialog2" :visiable.sync="showAreaDialog2"
+                       @confirm="confirmInsertArea2" :multi="false"></areaDialog>
   </div>
 </template>
 <script>
 import {treeScollx} from '@base/utils/global.js';
-import wfObjConfigDialog from '../../../../views/user/wf/wf_obj_config/dialog.vue';
+import wfObjConfigDialog from '@base/views/user/wf/wf_obj_config/dialog.vue';
+import saleOrgDialog from '@base/views/user/sale_org/dialog.vue';
+import areaDialog from '@base/views/user/area/dialog.vue';
 
 export default {
   name: 'wf_manage:list',
-  components: {wfObjConfigDialog},
+  components: {wfObjConfigDialog,saleOrgDialog,areaDialog},
   created() {
   },
   async mounted() {
@@ -181,6 +292,12 @@ export default {
   },
   data() {
     return {
+      showSaleOrgDialog:false,
+      showSaleOrgDialog2:false,
+      showAreaDialog:false,
+      showAreaDialog2:false,
+
+
       activeName: 'second',
       // dataId: 0,
       // showEdit: false,
@@ -668,6 +785,36 @@ export default {
         this.$set(this.formData2, 'objTypeCode', row.objTypeCode);
       }
     },
+
+    confirmInsertArea(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        this.$set(this.formData, 'param5', row.id+"");
+        this.$set(this.formData, 'param6', row.name);
+      }
+    },
+    confirmInsertSaleOrg(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        this.$set(this.formData, 'param3', row.id+"");
+        this.$set(this.formData, 'param4', row.name);
+      }
+    },
+    confirmInsertArea2(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        this.$set(this.formData2, 'param3', row.id+"");
+        this.$set(this.formData2, 'param4', row.name);
+      }
+    },
+    confirmInsertSaleOrg2(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        this.$set(this.formData2, 'param5', row.id+"");
+        this.$set(this.formData2, 'param6', row.name);
+      }
+    },
+
   }
 };
 </script>