Merge branch 'master' of http://114.67.93.201/xulili/ybf

ybf_admin/src/api/in/store.js

@@ -17,11 +17,18 @@ export function ApiStoreGetStoreDetail(inData) {
   })
 }
 
+export function ApiStoreAddStore(inData) {
+  return request({
+    url: '/admin/auth/stall/save',
+    method: 'post',
+    data: qs.stringify(inData)
+  })
+}
+
 export function ApiStoreDelStore(inData) {
   return request({
-    url: '/admin/auth/stall/delete',
+    url: `/admin/auth/stall/delete?stallId=${inData}`,
     method: 'delete',
-    params: inData
   })
 }
 

ybf_admin/src/pages/in/contact/store.vue

@@ -35,9 +35,9 @@
         <el-table-column prop="name" label="门店名称" align="center"></el-table-column>
         <el-table-column prop="type" label="门店类型" align="center" width="120"></el-table-column>
         <el-table-column prop="principal" label="门店负责人" align="center" width="120"></el-table-column>
-        <el-table-column prop="signNum" label="所属柜组" align="center" width="120"></el-table-column>
+        <el-table-column prop="shopId" label="所属柜组" align="center" width="120"></el-table-column>
         <el-table-column prop="location" label="位置" align="center" width="120"></el-table-column>
-        <el-table-column prop="shopId" label="门牌号" align="center" width="120"></el-table-column>
+        <el-table-column prop="signNum" label="门牌号" align="center" width="120"></el-table-column>
         <el-table-column label="操作" align="center" fixed="right" width="200">
           <template slot-scope="scope">
             <el-button type="text" @click="storeGetStoreDetail(scope.row.id)" class="btn">详情</el-button>
@@ -60,6 +60,108 @@
 
     <add-store ref="addStore"></add-store>
     <store-detail ref="storeDetail"></store-detail>
+
+    <div class="ztask-dialogs">
+      <el-dialog
+        title="门店详情"
+        :visible.sync="zcache.status.seeDialog"
+        width="50%"
+        :before-close="dialogSeeClose"
+      >
+        <div class="dialogMain">
+          <el-form :model="zdata.see" label-width="120px">
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="门店名称：">
+                  <el-input
+                    :disabled="true"
+                    v-model="zdata.see.storeName"
+                    autocomplete="off"
+                    placeholder="门店名称缺失"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="门店类型：">
+                  <el-input
+                    :disabled="true"
+                    v-model="zdata.see.storeType"
+                    autocomplete="off"
+                    placeholder="门店类型为空"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="所属柜组：">
+                  <el-input
+                    :disabled="true"
+                    v-model="zdata.see.storeFromBar"
+                    autocomplete="off"
+                    placeholder="柜组信息未知"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="门店负责人：">
+                  <el-input
+                    :disabled="true"
+                    v-model="zdata.see.storeBossName"
+                    autocomplete="off"
+                    placeholder="门店负责人未知"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="门牌号：">
+                  <el-input
+                    :disabled="true"
+                    v-model="zdata.see.storeDoorId"
+                    autocomplete="off"
+                    placeholder="门牌号未知"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="位置：">
+                  <el-input
+                    :disabled="true"
+                    v-model="zdata.see.storeAddress"
+                    autocomplete="off"
+                    placeholder="位置未知"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="店员：">
+                  <el-table class="list" :data="zdata.see.storeManList" tooltip-effect="dark">
+                    <el-table-column type="index" width="50"  align="center"></el-table-column>
+                    <el-table-column prop="userName" label="门店名称" align="center"></el-table-column>
+                    <el-table-column prop="userId" label="门店类型" align="center"></el-table-column>
+                    <el-table-column prop="mobile" label="门店类型" align="center"></el-table-column>
+                  </el-table>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button size="small" @click="dialogSeeClose">关 闭</el-button>
+          <!-- <el-button size="small" type="primary" @click="dialogSeeSubmitSend('seeForm')">任务下发</el-button> -->
+        </span>
+      </el-dialog>
+    </div>
   </div>
 </template>
 <script>
@@ -80,6 +182,33 @@ export default {
   },
   data() {
     return {
+      zcache: {
+        status: {
+          seeDialog: false
+        }
+      },
+      zdata: {
+        see: {
+          storeName: "storeName",
+          storeType: "storeType",
+          storeFromBar: "storeFromBar",
+          storeBossName: "storeBossName",
+          storeDoorId: "storeDoorId",
+          storeAddress: "storeAddress",
+          storeManList: [
+            {
+              userName: "Alice",
+              userId: "wx0001",
+              mobile: "110"
+            },
+            {
+              userName: "Bob",
+              userId: "wx0002",
+              mobile: "120"
+            }
+          ]
+        }
+      },
       page: {
         currentPage: 1,
         size: 20,
@@ -185,7 +314,14 @@ export default {
       detailDialog: false
     };
   },
-
+  watch: {
+    // addStoreDialog() {
+    addStoreDialog() {
+      if ((this.$refs.addStore.addStoreDialog = false)) {
+        this.storeGetMainList();
+      }
+    }
+  },
   // created() {
   //   this.storeGetMainList();
   //   zlog('--->Created!')
@@ -213,14 +349,8 @@ export default {
       let name = "";
 
       for (let i = 0; i < mainList.length; i++) {
-        console.log("--->list: Num =", i);
-
         id = this.list.main[i].principal;
-        console.log("id =", id);
-
         name = this.matchManIdAndManName(id);
-        console.log("name =", name);
-
         this.list.main[i].principal = name;
       }
     },
@@ -232,23 +362,39 @@ export default {
       };
 
       ApiStoreGetMainList(postData).then(res => {
-        // this.list.mainV = res.data.adminStalls;
         this.list.main = res.data.pageInfo_adminStalls.list[0];
         this.list.man = res.data.pageInfo_principals.list[0];
-        console.log("===>Main: Length =", this.list.main.length);
-        console.log("===>Man: Length =", this.list.man.length);
         this.transManIdToManName();
       });
     },
     storeGetStoreDetail(inData) {
+      let postData = {
+        isDetail: true,
+        stallId: inData
+      };
+
+      ApiStoreGetStoreDetail(postData)
+        .then(res => {
+          this.zdata.see.storeName = res.data.adminStall.name;
+          this.zdata.see.storeType = res.data.adminStall.type;
+          this.zdata.see.storeFromBar = res.data.adminStall.shopId;
+          this.zdata.see.storeBossName = res.data.principal.userName;
+          this.zdata.see.storeDoorId = res.data.adminStall.signNum;
+          this.zdata.see.storeAddress = res.data.adminStall.location;
+          this.zdata.see.storeManList = res.data.clerks_unselected
+        })
+        .catch(err => {});
+
+      this.zcache.status.seeDialog = true;
+
       // let postData = {
       //   isDetail: true,
       //   stallId: inData
       // };
 
-      this.msgId = id;
-      this.detailDialog = true;
-      this.$refs.storeDetail.detailDialog = true;
+      // this.msgId = id;
+      // this.detailDialog = true;
+      // this.$refs.storeDetail.detailDialog = true;
 
       // ApiStoreGetStoreDetail(postData).then(res => {
       // });
@@ -258,7 +404,28 @@ export default {
         stallId: 123456
       };
 
-      ApiStoreDelStore(inData).then(res => {});
+      ApiStoreDelStore(inData)
+        .then(res => {
+          console.log("--->delRes =", res);
+          if (res.result == "success") {
+            this.$message({
+              message: "删除成功",
+              type: "success"
+            });
+            this.storeGetMainList();
+          } else {
+            this.$message({
+              message: "删除失败！",
+              type: "error"
+            });
+          }
+        })
+        .catch(err => {
+          this.$message({
+            message: "删除失败！",
+            type: "error"
+          });
+        });
     },
 
     listPick() {},
@@ -280,6 +447,10 @@ export default {
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
+    },
+
+    dialogSeeClose() {
+      this.zcache.status.seeDialog = false;
     }
   }
 };

ybf_admin/src/pages/task/bar/index.vue

@@ -222,6 +222,7 @@
           <el-button size="small" type="primary" @click="dialogCreateSubmitSend('createForm')">保存并发布</el-button>
         </span>
       </el-dialog>
+      
       <el-dialog
         title="任务详情"
         :visible.sync="cache.status.seeDialog"

ybf_admin/tests/unit/.eslintrc.js

@@ -3,6 +3,6 @@ module.exports = {
     jest: true
   },
   rules: {
-    'import/no-extraneous-dependencies': 'off'
+    // 'import/no-extraneous-dependencies': 'off'
   }
 }
\ No newline at end of file

ybf_admin/yarn.lock

@@ -3684,6 +3684,11 @@ ejs@^2.6.1:
   resolved "https://registry.npm.taobao.org/ejs/download/ejs-2.7.4.tgz?cache=0&sync_timestamp=1574560175968&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fejs%2Fdownload%2Fejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha1-SGYSh1c9zFPjZsehrlLDoSDuybo=
 
+el-tree-transfer@^2.2.6:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/el-tree-transfer/-/el-tree-transfer-2.2.6.tgz#5115d49c13f15772a354fe250c6a63be412ef575"
+  integrity sha512-2vBex7F5uPiueP8e+5BpU1bad0A47DeS7DqlG/TA6DzXL4l3stHc5wTls6J0UQwKcUZO43eytebySKfrE58+uw==
+
 electron-to-chromium@^1.3.322:
   version "1.3.322"
   resolved "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8"