Merge branch 'sit'

package.json

@@ -60,6 +60,7 @@
     "vue-puzzle-verification": "^1.0.2",
     "vue-quill-editor": "^3.0.6",
     "vue-splitpane": "1.0.4",
+    "vue2-editor": "^2.10.3",
     "vuedraggable": "2.20.0",
     "vuex": "^3.1.0",
     "xlsx": "0.14.1"

src/apis/service/system/updates/index.js

@@ -1,7 +1,9 @@
 // 版本日志
-import http from '@/apis/axios'
-const api = 'admin/'
+import http from "@/apis/axios";
+const api = "admin/";
 export default {
   // 分页查询
-  list: (data, params) => http(api + 'versionlist', data, 'post', params)
-}
+  list: (data, params) => http(api + "versionlist", data, "post", params),
+  // 分页查询
+  add: (data, params) => http(api + "versionAdd", data, "post", params),
+};

src/apis/service/youzan/othTransferOrderLog/index.js

@@ -11,4 +11,6 @@ export default {
     http("youzan/yz_check_status", data, "post", params),
   // 重新转单
   retry: (data, params) => http("youzan/yz_order_retry", data, "post", params),
+   // 重新转单
+   delete: (data, params) => http("youzan/yz_order_delete", data, "post", params),
 };

src/views/goodStore/goodsCost/components/baseFormAddEdit.vue

@@ -38,19 +38,22 @@
             <el-form-item label="规格值" prop="spec_value_id">
               <div
                 v-if="specVlist.length > 0"
-                style="max-height: 600px; overflow-y: scroll"
               >
-                <el-radio-group
+                <el-select
                   v-model="ruleForm.spec_value_id"
+                  placeholder="请选择规格值"
                   @change="spec_value_id_change"
+                  style="width:100%"
+                  filterable
                 >
-                  <el-radio
+                  <el-option
                     v-for="item in specVlist"
                     :key="item.id + item.spec_value"
-                    :label="item.id"
-                    >{{ item.spec_value }}</el-radio
+                    :label="item.spec_value"
+                    :value="item.id"
+                    >{{ item.spec_value }}</el-option
                   >
-                </el-radio-group>
+                </el-select>
               </div>
               <div class="no-data" v-else>暂无规格值,请添加！</div>
             </el-form-item>

src/views/purchaseIn/purchaseOrder/index.vue

@@ -157,6 +157,7 @@
                     <el-option label="商品名称" value="5"></el-option>
                     <el-option label="商品创建人" value="6"></el-option>
                     <el-option label="采购供应商编号" value="7"></el-option>
+                    <el-option label="采购供应商名称" value="10"></el-option>
                     <el-option label="订单编号" value="8"></el-option>
                     <el-option label="商品创建人部门" value="9"></el-option>
                   </el-select>
@@ -655,6 +656,7 @@ export default {
       this.parmValue.supplierNo = this.select === "7" ? this.input : ""; // 采购供应商编号
       this.parmValue.orderCode = this.select === "8" ? this.input : ""; // 采购供应商编号
       this.parmValue.company_name = this.select === "9" ? this.input : ""; // 部门
+      this.parmValue.supplier_name = this.select === "10" ? this.input : ""; // 采购供应商名称
       console.log(this.pageInfo);
       // this.wsm_supplierNo = [];
       const res = await asyncRequest.list(this.parmValue);

src/views/purchaseIn/workbench/components/baseFormAddEdit.vue

@@ -39,19 +39,22 @@
             <el-form-item label="规格值" prop="spec_value_id">
               <div
                 v-if="specVlist.length > 0"
-                style="max-height: 600px; overflow-y: scroll"
               >
-                <el-radio-group
+                <el-select
+                  placeholder="请选择规格值"
                   v-model="ruleForm.spec_value_id"
                   @change="spec_value_id_change"
+                  style="width:100%"
+                  filterable
                 >
-                  <el-radio
+                  <el-option
                     v-for="item in specVlist"
                     :key="item.id + item.spec_value"
-                    :label="item.id"
-                    >{{ item.spec_value }}</el-radio
+                    :label="item.spec_value"
+                    :value="item.id"
+                    >{{ item.spec_value }}</el-option
                   >
-                </el-radio-group>
+                </el-select>
               </div>
               <div class="no-data" v-else>暂无规格值,请添加！</div>
             </el-form-item>

src/views/sellOut/returnOrder/columns.js

@@ -16,11 +16,11 @@ export default [
   //   width: "160"
   // },
  
-  // {
-  //   prop: "orderCode",
-  //   label: "销售订单编号",
-  //   width: "160"
-  // },
+  {
+    prop: "orderCode",
+    label: "销售订单编号",
+    width: "160"
+  },
   {
     prop: "good_code",
     label: "商品属性编号",
@@ -109,4 +109,4 @@ export default [
     _slot_: "operation",
   },
 
-]
+]

src/views/sellOut/sellReturn/columns.js

@@ -25,6 +25,11 @@ export default [
     label: "商品成本编码",
     width: "160"
   },
+  {
+    prop: "skuCode",
+    label: "上线商品编码",
+    width: "160"
+  },
   {
     prop: "good_name",
     label: "商品名称",
@@ -86,4 +91,4 @@ export default [
 // returnCode	是	string	退货单编号
 // good_type_code	是	string	商品属性
 // good_name	是	string	商品名称
-// status	是	string	状态
+// status	是	string	状态

src/views/sellOut/sellReturn/index.vue

@@ -78,7 +78,8 @@
                       <el-option label="销售退货单编号" value="returnCode" />
                       <el-option label="销售订单编号" value="orderCode" />
                       <el-option label="申请人部门" value="company_name" />
-
+                      <el-option label="商品成本编号" value="good_code" />
+                      <el-option label="上线商品编号" value="skuCode" />
                       <el-option label="申请人" value="apply_name" />
                     </el-select>
                     <el-button
@@ -196,6 +197,8 @@ export default {
         returnCode: "", //销售退货code
         orderCode: "", //销售订单code
         company_name: "",
+        good_code:"",
+        skuCode:"",
         apply_name: "", //申请人
         start: "",
         end: "",
@@ -284,7 +287,7 @@ export default {
       this.parmValue = {
         order_type: "",
         company_name: "", //申请人部门
-
+        good_code:"",
         returnCode: "", //销售退货code
         orderCode: "", //销售订单code
         apply_name: "", //申请人
@@ -354,6 +357,10 @@ export default {
         this.select === "apply_name" ? this.s_input : "";
       this.parmValue.company_name =
         this.select === "company_name" ? this.s_input : "";
+      this.parmValue.good_code = this.select === "good_code" ? this.s_input : "";
+
+      this.parmValue.skuCode = this.select === "skuCode" ? this.s_input : "";
+
       let model = JSON.parse(JSON.stringify(this.parmValue));
 
       const res = await asyncRequest.list(model);

src/views/sellOut/zixunOrder/components/baseFormAddEdit.vue

@@ -39,19 +39,22 @@
             <el-form-item label="规格值" prop="spec_value_id">
               <div
                 v-if="specVlist.length > 0"
-                style="max-height: 600px; overflow-y: scroll"
               >
-                <el-radio-group
+                <el-select
                   v-model="ruleForm.spec_value_id"
+                  placeholder="请选择规格值"
                   @change="spec_value_id_change"
+                  style="width:100%"
+                  filterable
                 >
-                  <el-radio
+                  <el-option
                     v-for="item in specVlist"
                     :key="item.id + item.spec_value"
-                    :label="item.id"
-                    >{{ item.spec_value }}</el-radio
+                    :label="item.spec_value"
+                    :value="item.id"
+                    >{{ item.spec_value }}</el-option
                   >
-                </el-radio-group>
+                </el-select>
               </div>
               <div class="no-data" v-else>暂无规格值,请添加！</div>
             </el-form-item>

src/views/system/updates/addEdit.vue

@@ -0,0 +1,214 @@
+<template>
+  <el-dialog
+    v-loading="loading"
+    :title="title"
+    :center="true"
+    align="left"
+    top="8vh"
+    width="1040px"
+    :close-on-click-modal="false"
+    :visible.sync="showModelThis"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    @close="showModelThis = false"
+  >
+    <el-card style="margin: -20px 0 0 0">
+      <el-row :gutter="10">
+        <el-col :span="24">
+          <el-form
+            ref="ruleForm"
+            :model="ruleForm"
+            status-icon
+            :rules="rulesThis"
+            label-width="80px"
+            class="demo-ruleForm"
+          >
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="类型" prop="sys_type">
+                  <el-select
+                    v-model="ruleForm.sys_type"
+                    style="width: 100%"
+                    :disabled="id == '007'"
+                    placeholder="请选择类型"
+                  >
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select> </el-form-item
+              ></el-col>
+              <el-col :span="12">
+                <el-form-item label="版本号" prop="version">
+                  <el-input
+                    v-model="ruleForm.version"
+                    :disabled="id == '007'"
+                    placeholder="版本号"
+                    style="width: 100%"
+                    maxlength="50"
+                  /> </el-form-item
+              ></el-col>
+              <el-col :span="12">
+                <el-form-item label="标题" prop="module">
+                  <el-input
+                    v-model="ruleForm.module"
+                    :disabled="id == '007'"
+                    placeholder="标题"
+                    style="width: 100%"
+                    maxlength="50"
+                  /> </el-form-item
+              ></el-col>
+              <el-col :span="12">
+                <el-form-item label="时间" prop="addtime">
+                  <el-date-picker
+                    v-model="ruleForm.addtime"
+                    type="datetime"
+                    style="width: 100%"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="选择日期时间"
+                    :picker-options="pickerOptions"
+                  >
+                  </el-date-picker> </el-form-item
+              ></el-col>
+              <el-col :span="24">
+                <el-form-item label="内容" prop="system">
+                  <vue-editor v-model="ruleForm.system"></vue-editor>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="24" style="text-align: right">
+          <el-button v-if="id !== '007'" type="primary" @click="submitForm"
+            >保 存
+          </el-button>
+          <el-button @click="showModelThis = false">{{
+            id == "007" ? "关 闭" : "取 消"
+          }}</el-button>
+        </el-col>
+      </el-row>
+    </el-card>
+  </el-dialog>
+</template>
+<script>
+import asyncRequest from "@/apis/service/system/updates";
+import resToken from "@/mixins/resToken";
+
+import { VueEditor } from "vue2-editor";
+export default {
+  name: "terrace",
+  props: ["showModel"],
+  mixins: [resToken],
+  components: {
+    VueEditor,
+  },
+  data() {
+    return {
+      loading: false,
+      title: "添加版本信息",
+      showModelThis: this.showModel,
+      pickerOptions: {
+        disabledDate: (time) => {
+          return time.getTime() < new Date().valueOf();
+        },
+      },
+      options: [
+        { value: "VER", label: "版本信息" },
+        { value: "MSG", label: "维护通知" },
+      ],
+
+      ruleForm: {
+        sys_type: "VER",
+        version: "",
+        module: "",
+        system: "",
+        addtime: "",
+      },
+      rulesThis: this.rules,
+      rules: {
+        sys_type: [{ required: true, message: "请选择类型", trigger: "change" }],
+        version: [{ required: true, message: "版本号不能为空", trigger: "blur" }],
+        module: [{ required: true, message: "标题不能为空", trigger: "blur" }],
+        system: [{ required: true, message: "内容不能为空", trigger: "blur" }],
+        addtime: [{ required: true, message: "请选择时间", trigger: "change" }],
+      },
+    };
+  },
+  watch: {
+    showModel: function (val) {
+      this.showModelThis = val;
+      if (val) {
+        this.initForm();
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit("cancel");
+      }
+    },
+  },
+  methods: {
+    async initForm() {
+      this.loading = true;
+      this.rulesThis = this.rules;
+      await this.resetForm();
+      this.loading = false;
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          this.ruleForm = {
+            sys_type: "VER",
+            version: "",
+            module: "",
+            system: "",
+            addtime: "",
+          };
+        }
+      });
+    },
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          if (this.loading) {
+            return;
+          }
+          this.loading = true;
+          const model = JSON.parse(JSON.stringify(this.ruleForm));
+          const { code, data, message } = await asyncRequest.add(model);
+
+          if (code === 0) {
+            this.$notify.success({
+              title: "添加成功!",
+              message: "",
+            });
+            this.showModelThis = false;
+            // 刷新
+            this.$emit("refresh");
+          } else if (code >= 100 && code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(message);
+          }
+          this.loading = false;
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.terrace {
+}
+</style>

src/views/system/updates/index.vue

@@ -1,8 +1,29 @@
 <template>
   <div class="updates pagePadding" style="padding-top: 25px">
-    <div
-      v-if=" powers.some((i) => i == '001')"
-    >
+    <div v-if="powers.some((i) => i == '001')">
+      <el-row style="padding: 0 0 10px 0">
+        <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
+          <el-button type="primary" :size="searchSize" @click="searchList">
+            刷新
+          </el-button>
+        </el-col>
+        <el-col
+          :span="3"
+          class="fr"
+          style="width: 66px; padding: 0 0 0 10px"
+          v-if="powers.some((i) => i == '003')"
+        >
+          <el-button
+            :size="searchSize"
+            type="success"
+            style="float: right"
+            @click="showModel = true"
+          >
+            添加
+          </el-button>
+        </el-col>
+      </el-row>
+
       <el-table
         :data="tableData"
         v-loading="loading"
@@ -13,12 +34,7 @@
       >
         <el-table-column type="expand">
           <template slot-scope="props">
-            <el-form
-              :size="size"
-              label-position="top"
-              inline
-              class="demo-table-expand"
-            >
+            <el-form :size="size" label-position="top" inline class="demo-table-expand">
               <el-form-item label="更新内容">
                 <p v-html="props.row.system"></p>
               </el-form-item>
@@ -47,24 +63,27 @@
       </div>
     </div>
     <no-auth v-else></no-auth>
+    <!-- 弹窗 新增/修改 -->
+    <add-edit :show-model="showModel" @refresh="searchList" @cancel="showModel = false" />
   </div>
 </template>
 <script>
 import asyncRequest from "@/apis/service/system/updates";
-import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
+import addEdit from "./addEdit";
 export default {
   name: "updates",
-  mixins: [mixinPage, resToken],
+  components: {
+    addEdit,
+  },
+  mixins: [resToken],
   computed: {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       const tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "updates"
-        ) || {};
+        this.$store.getters.btnList.find((item) => item.menu_route == "updates") || {};
       const { action } = tran ?? {};
       return action ?? [];
     },
@@ -73,10 +92,7 @@ export default {
     return {
       loading: true,
       showModel: false,
-      isDetail: false,
-      modelId: 0,
       parmValue: {
-        type: "VER",
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -90,30 +106,24 @@ export default {
     this.searchList();
   },
   methods: {
-    restSearch() {
-        // 表格 - 分页
-      this.pageInfo = {
-        size: 15,
-        curr: 1,
-        total: 0,
-      };
-      this.parmValue = {
-        type: "VER",
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-      };
-      this.count = 0;
-      this.searchList();
+    async handlePageChange(e) {
+      this.parmValue.page = e;
+      await this.searchList();
+    },
+    async handleSizeChange(e) {
+      this.parmValue.size = e;
+      this.parmValue.page = 1;
+      await this.searchList();
     },
-
     // 刷新表格
     async searchList() {
       this.loading = true;
-      const res = await asyncRequest.list(this.parmValue);
-      if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
-        this.count = Number(res.data.count);
-      } else if (res && res.code >= 100 && res.code <= 104) {
+      const { code, data } = await asyncRequest.list(this.parmValue);
+      if (code === 0) {
+        const { list, count } = data;
+        this.tableData = list;
+        this.count = Number(count);
+      } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
         this.tableData = [];
@@ -125,11 +135,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
-
-
-
-
-
-
+<style lang="scss" scoped></style>

src/views/youzan/luckyDrawGood/index.vue

@@ -138,7 +138,7 @@
               :span="3"
               class="fr"
               style="width: 66px; padding: 0 0 0 10px"
-              v-if="powers.some((i) => i == '003')"
+              v-if="powers.some((i) => i == '087')"
             >
               <el-button
                 :size="searchSize"
@@ -153,7 +153,7 @@
               :span="3"
               class="fr"
               style="width: 66px; padding: 0 0 0 10px"
-              v-if="powers.some((i) => i == '003')"
+              v-if="powers.some((i) => i == '086')"
             >
               <el-button
                 :size="searchSize"
@@ -212,7 +212,7 @@ import { formatJson } from "@/utils/publicMethods";
 import weburlImport from "./weburlImport";
 import webUrlList from "./webUrlList";
 export default {
-  name: "active",
+  name: "luckyDrawGood",
   mixins: [mixinPage, resToken],
   components: { weburlImport, webUrlList },
   computed: {
@@ -220,7 +220,8 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       const tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "active") || {};
+        this.$store.getters.btnList.find((item) => item.menu_route == "luckyDrawGood") ||
+        {};
       const { action } = tran ?? {};
       return action ?? [];
     },

src/views/youzan/othTransferOrderLog/columns.js

@@ -1,9 +1,14 @@
 //列表
 const columns = [
+  {
+    type: "selection",
+    fixed: "left",
+    _noset_: true,
+    width: "50px",
+  },
   {
     type: "expand",
     _slot_: "expand",
-    fixed: "left",
     _noset_: true,
   },
   {
@@ -25,7 +30,7 @@ const columns = [
     prop: "pay_type",
     label: "支付类型",
     _slot_: "pay_type",
-    width: "100px",
+    width: "140px",
   },
   {
     prop: "status",

src/views/youzan/othTransferOrderLog/index.vue

@@ -21,7 +21,7 @@
           searchList();
         "
       >
-        <template #table-header="{}">
+        <template #table-header="{ selection }">
           <div style="width: 100%">
             <el-row style="padding: 0 0 10px 80px">
               <el-col :span="4" style="width: 140px">
@@ -100,6 +100,20 @@
                   </el-select>
                 </el-input>
               </el-col>
+              <el-col
+                :span="3"
+                class="fr"
+                style="width: 90px; padding: 0 0 0 10px"
+                v-if="powers.some((i) => i == '006')"
+              >
+                <el-button
+                  type="danger"
+                  :size="searchSize"
+                  @click="deleteItem(selection)"
+                >
+                  批量删除
+                </el-button>
+              </el-col>
             </el-row>
           </div>
         </template>
@@ -236,7 +250,7 @@ export default {
   },
   mounted() {
     if (this.$route.query.back) {
-      const { sinput = '', size, page, ...rest } = JSON.parse(this.$route.query.back)
+      const { sinput = "", size, page, ...rest } = JSON.parse(this.$route.query.back);
       this.sinput = sinput;
       this.parmValue = rest;
       this.pageInfo.curr = page;
@@ -280,6 +294,49 @@ export default {
         await this.searchList();
       }
     },
+    async deleteItem(list) {
+      if (list.length == 0) {
+        this.$message.warning("至少选择一条数据！");
+        return;
+      }
+      let isok = false;
+      let ids = [];
+      list.forEach((item) => {
+        ids.push(item.id);
+        if (item.status + "" !== "8") {
+          isok = true;
+        }
+      });
+      if (isok) {
+        this.$message.warning("只能选择转单失败的数据！");
+        return;
+      }
+      await this.$confirm("确定要删除？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          const model = {
+            id: ids,
+          };
+          const { code, data, message } = await asyncRequest.delete(model);
+          if (code === 0) {
+            this.$notify.success({
+              title: "删除成功",
+              message: "",
+            });
+            this.searchList();
+          } else if (code >= 100 && code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
     //点击详情
     getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
@@ -294,10 +351,12 @@ export default {
         // this.parmValue.sinput = this.sinput;
         //
         let routerModel = {
-          options: JSON.parse(JSON.stringify({
-            ...this.parmValue,
-            sinput: this.sinput
-          })),
+          options: JSON.parse(
+            JSON.stringify({
+              ...this.parmValue,
+              sinput: this.sinput,
+            })
+          ),
           router: this.$route.path,
         };
         model.preModel = JSON.stringify(routerModel);