暂存

src/components/globalComponents/digital-input/main.vue

@@ -50,15 +50,12 @@ export default {
   ],
   watch: {
     values: function (val) {
-      if (val) {
-        // console.log(this.name + "=" + val);
-        this.num = val;
-      }
+      console.log(this.name + "=" + val);
+      this.num = val;
     },
     newTime: function (val) {
-      if (val) {
-        this.num = this.values;
-      }
+      console.log(this.name + "=" + this.values);
+      this.num = this.values;
     },
   },
   data() {

src/components/search-good-online-modal/main.vue

@@ -291,10 +291,10 @@ export default {
         model.cat_id.length > 0 ? model.cat_id[model.cat_id.length - 1] : "";
       model.brandid =
         model.brandid.length > 0 ? model.brandid[model.brandid.length - 1] : "";
-      model.platform_code =
-        model.platform_code.length > 0
-          ? model.platform_code[model.platform_code.length - 1]
-          : "";
+      // model.platform_code =
+      //   model.platform_code.length > 0
+      //     ? model.platform_code[model.platform_code.length - 1]
+      //     : "";
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/components/show-good-data-modal/main.vue

@@ -111,7 +111,7 @@
             "
           />
         </template>
-        <template slot="purchase">
+        <!-- <template slot="purchase">
           <el-table
             :data="sitem.nakelist"
             :size="'mini'"
@@ -124,7 +124,7 @@
             <el-table-column prop="cost_fee" label="工艺费" />
             <el-table-column prop="delivery_fee" label="物流费" />
           </el-table>
-        </template>
+        </template> -->
         <template slot="ladderlist">
           <el-table
             :data="sitem.ladderlist"

src/views/goodStore/active/components/baseForm.vue

@@ -145,12 +145,23 @@
                 show-overflow-tooltip
               />
               <el-table-column
-                v-if="!(status === '' || status === '0')"
                 prop="activity_stock"
                 label="活动库存"
-                width="100"
-                show-overflow-tooltip
-              />
+                width="180"
+              >
+                <template slot-scope="scope">
+                  <el-input-number
+                    v-show="type !== 'view'"
+                    style="width: 100%"
+                    v-model="scope.row.activity_stock"
+                    :min="1"
+                    :max="100000000000"
+                    :precision="0"
+                    label="活动库存"
+                  ></el-input-number>
+                  <span v-show="type === 'view'">{{ scope.row.activity_stock }}</span>
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="moq_num"
                 label="起订量"
@@ -499,14 +510,14 @@ export default {
       //
     },
     platform_codesearchChange(e) {
-      let old = this.ruleForm.platform_code
+      let old = this.ruleForm.platform_code;
       console.log(e);
       if (e) {
         const { id, code, label } = e;
         this.ruleForm.platform_code = id || "";
       }
       this.$refs.ruleForm.validateField("platform_code");
-      let  newList= this.ruleForm.platform_code;
+      let newList = this.ruleForm.platform_code;
       if (old !== newList) {
         this.ruleForm.good_list = [];
       }
@@ -520,6 +531,9 @@ export default {
         let index = oldList.findIndex((a) => e.skucode === a.skucode);
         if (index === -1) {
           let item = JSON.parse(JSON.stringify(list[ei]));
+          item.activity_stock = "1";
+          item.newTime = new Date().valueOf();
+          console.log(item.activity_stock);
           this.ruleForm.good_list.push(item);
         }
       });
@@ -557,7 +571,7 @@ export default {
     },
     openEdit() {
       const { company_id, platform_code, is_stock } = this.ruleForm;
-      if (platform_code==='') {
+      if (platform_code === "") {
         this.$message.warning("请选择平台！");
         return;
       }
@@ -589,7 +603,7 @@ export default {
           list.forEach((e) => {
             let item = {
               skuCode: e.skuCode,
-              activity_stock: 1 + "",
+              activity_stock: e.activity_stock,
             };
             newList.push(item);
           });

src/views/goodStore/active/components/edit-minorder-form.vue

@@ -28,7 +28,7 @@
               <el-input
                 v-model="ruleForm.skuCode"
                 placeholder="商品编号"
-                minlength="100"
+                maxlength="100"
                 disabled
               />
             </el-form-item>
@@ -37,15 +37,15 @@
                 v-model="ruleForm.good_name"
                 disabled
                 placeholder="商品名称"
-                minlength="100"
+                maxlength="100"
               />
             </el-form-item>
             <el-form-item label="活动库存" prop="activity_stock">
               <el-input
                 v-model="ruleForm.activity_stock"
-                disabled
                 placeholder="活动库存"
-                minlength="100"
+                disabled
+                maxlength="100"
               />
             </el-form-item>
             <el-form-item label="起订量" prop="moq_num">
@@ -62,7 +62,6 @@
               />
             </el-form-item>
             <el-form-item label="成本单价" prop="cost_price">
-              
               <digital-input
                 :values="ruleForm.cost_price"
                 :placeholder="'起订量'"

src/views/goodStore/active/components/set-active-price-form.vue

@@ -29,7 +29,7 @@
               <el-input
                 v-model="ruleForm.skuCode"
                 placeholder="商品编号"
-                minlength="100"
+                maxlength="100"
                 disabled
               />
             </el-form-item>
@@ -38,15 +38,15 @@
                 v-model="ruleForm.good_name"
                 disabled
                 placeholder="商品名称"
-                minlength="100"
+                maxlength="100"
               />
             </el-form-item>
             <el-form-item label="活动库存" prop="activity_stock">
               <el-input
                 v-model="ruleForm.activity_stock"
-                disabled
                 placeholder="活动库存"
-                minlength="100"
+                 disabled
+                maxlength="100"
               />
             </el-form-item>
             <el-form-item label="起订量" prop="moq_num">
@@ -54,7 +54,7 @@
                 v-model="ruleForm.moq_num"
                 disabled
                 placeholder="起订量"
-                minlength="100"
+                maxlength="100"
               />
             </el-form-item>
             <el-form-item label="成本单价" prop="cost_price">
@@ -62,7 +62,7 @@
                 v-model="ruleForm.cost_price"
                 disabled
                 placeholder="成本单价"
-                minlength="100"
+                maxlength="100"
               >
                 <template slot="append">元</template></el-input
               >
@@ -72,7 +72,7 @@
                 v-model="ruleForm.sale_price"
                 disabled
                 placeholder="非活动价"
-                minlength="100"
+                maxlength="100"
               >
                 <template slot="append">元</template></el-input
               >
@@ -85,6 +85,7 @@
                 :max="100000000000"
                 :position="'right'"
                 :precision="2"
+                :size="'large'"
                 :controls="false"
                 :append="'元'"
                 @reschange="activity_price_change"

src/views/goodStore/brand/addEdit.vue

@@ -29,7 +29,7 @@
                 v-model="ruleForm.brand_name"
                 :disabled="id == '007'"
                 placeholder="品牌名称"
-                minlength="20"
+                maxlength="20"
               />
             </el-form-item>
             <el-form-item

src/views/goodStore/searchSort/addEdit.vue

@@ -30,7 +30,7 @@
                 v-model="ruleForm.cat_name"
                 disabled
                 placeholder="分类名称"
-                minlength="20"
+                maxlength="20"
               />
             </el-form-item>
             <el-form-item label="财务核算码" prop="fund_code">
@@ -38,7 +38,7 @@
                 v-model="ruleForm.fund_code"
                 disabled
                 placeholder="财务核算码"
-                minlength="50"
+                maxlength="50"
               />
             </el-form-item>
             <el-form-item label="预算→成本" prop="order_rate">

src/views/goodStore/sort/addEdit.vue

@@ -29,7 +29,7 @@
                 v-model="ruleForm.cat_name"
                 :disabled="id == '007'"
                 placeholder="分类名称"
-                minlength="20"
+                maxlength="20"
               >
                 <template slot="prepend" v-if="pid_name">{{
                   pid_name
@@ -58,7 +58,7 @@
                 v-model="ruleForm.fund_code"
                 :disabled="id == '007'"
                 placeholder="财务核算码"
-                minlength="50"
+                maxlength="50"
               />
             </el-form-item>
             <el-form-item label="售后说明" prop="cat_desc">
@@ -68,7 +68,7 @@
                 placeholder="售后说明"
                 type="textarea"
                 :rows="5"
-                minlength="2000"
+                maxlength="2000"
               />
             </el-form-item>
           </el-form>

src/views/goodStore/sort/addEditRate.vue

@@ -30,7 +30,7 @@
                 v-model="ruleForm.cat_name"
                 disabled
                 placeholder="分类名称"
-                minlength="20"
+                maxlength="20"
                 ><template slot="prepend" v-if="pid_name">{{
                   pid_name
                 }}</template></el-input
@@ -41,7 +41,7 @@
                 v-model="ruleForm.fund_code"
                 disabled
                 placeholder="财务核算码"
-                minlength="50"
+                maxlength="50"
               />
             </el-form-item>
             <el-form-item label="预算→成本" prop="order_rate">

src/views/goodStore/specs/addEdit.vue

@@ -29,7 +29,7 @@
                 v-model="ruleForm.spec_name"
                 :disabled="id == '007'"
                 placeholder="规格名称"
-                minlength="20"
+                maxlength="20"
               />
             </el-form-item>
         

src/views/goodStore/unit/addEdit.vue

@@ -29,7 +29,7 @@
                 v-model="ruleForm.unit"
                 :disabled="id == '007'"
                 placeholder="单位名称"
-                minlength="20"
+                maxlength="20"
               />
             </el-form-item>
           </el-form>

src/views/sellOut/salesOrder/components/addForm.vue

@@ -186,8 +186,15 @@
                     ></el-cascader>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">剩余库存：{{ ruleForm.stock }}</el-col>
-                <el-col :span="18">
+                <el-col :span="12">
+                  <el-form-item label="剩余库存">
+                    <el-input
+                      v-model="ruleForm.activity_stock"
+                      disabled
+                      placeholder="剩余库存"
+                    /> </el-form-item
+                ></el-col>
+                <el-col :span="12">
                   <el-form-item label="凭证文件" prop="proof_id">
                     <el-tooltip
                       effect="dark"
@@ -362,6 +369,7 @@
             border
             :size="'mini'"
             style="width: 100%"
+            max-height="200px"
             row-key="key"
           >
             <el-table-column type="index" width="50" show-overflow-tooltip />
@@ -601,7 +609,7 @@ import { isnumber, isMobile } from "@/utils/validate";
 import inAddrModel from "@/components/in-addr-model";
 import showVoucherModel from "@/components/show-voucher-model";
 import searchGoodOnlineModal from "@/components/search-good-online-modal";
-import {addColumns} from "./ShowDataTableColumns";
+import { addColumns } from "./ShowDataTableColumns";
 export default {
   name: "salesOrderDetail",
   mixins: [mixinPage, resToken],
@@ -663,6 +671,7 @@ export default {
       showVoucher: false,
       companyName: "",
       showModel: false,
+      addrmodel: false,
       addshowModel: {},
       pickerOptions: {
         disabledDate(time) {
@@ -713,7 +722,7 @@ export default {
         proof_id: "", //凭证ID
         proof_type: "", //凭证类型
         proof_url: "", //凭证地址
-
+        activity_stock: "0",
         is_activity: "0", //是否参与活动,
         goodtype: ["is_activity_0", "1"], //活动类型
         good_num: "", //商品数量
@@ -879,6 +888,7 @@ export default {
             proof_id: "", //凭证ID
             proof_type: "", //凭证类型
             proof_url: "", //凭证地址
+            activity_stock: "0",
             goodtype: ["is_activity_0", "1"], //活动类型
             good_num: "10", //商品数量
             good_price: "0", //商品单价
@@ -937,6 +947,10 @@ export default {
       this.ruleForm.proof_url = "";
       this.$refs.ruleForm.validateField("proof_id");
     },
+    addrRefresh(e) {
+      const { list } = e;
+      this.addrForm.order_addr.push(...list);
+    },
     async resultList(e) {
       this.showModel = false;
       if (e.length === 1) {
@@ -963,15 +977,25 @@ export default {
         companyNo: supplierNo,
         platform_id,
       };
-      let { code, data, message } = await asyncRequest.goods_active(model);
+      const { code, data, message } = await asyncRequest.goods_active(model);
       if (code === 0) {
-        let list =
-          data && data.length > 0 ? JSON.parse(JSON.stringify(data)) : [];
-        list.forEach((a) => {
+        const { act, good } = data;
+        let actlist = act.length > 0 ? JSON.parse(JSON.stringify(act)) : [];
+        actlist.forEach((a) => {
           a.value = a.activity_code;
           a.label = a.activity_name;
         });
-        this.goodtype_options[1].children = list;
+        this.goodtype_options[1].children = [];
+        this.goodtype_options[1].children.push(...actlist);
+        let goodItem =
+          good.length > 0 ? JSON.parse(JSON.stringify(good[0])) : {};
+        if (goodItem.good_name) {
+          this.goodtype_options[0].children.map((b) => {
+            b.activity_stock = goodItem ? goodItem.stock_num + "" : "0";
+            return b;
+          });
+          console.log(this.goodtype_options);
+        }
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
@@ -1038,8 +1062,6 @@ export default {
     async get_new_price() {
       const { goodtype, good_num } = this.ruleForm;
 
-     
-
       let oldGood_type = goodtype.length === 2 ? goodtype[1] : "";
       const { ogood_type, ogood_num } = this.order_good_num;
       console.log(
@@ -1052,38 +1074,32 @@ export default {
         };
         return;
       }
+
+      //activity_stock
+      if (goodtype.length === 2) {
+        this.goodtype_options.forEach((a) => {
+          if (a.children && a.children.length) {
+            a.children.forEach((b) => {
+              if (b.value === goodtype[1]) {
+                console.log(b.activity_stock);
+                this.ruleForm.activity_stock = b.activity_stock || "0";
+              }
+            });
+          }
+        });
+      } else {
+        this.ruleForm.activity_stock = 0 + "";
+      }
       if (!this.priceLoding) {
         const { isok, price } = await this.set_salegetprice();
         this.ruleForm.good_price = isok ? price : "0";
       }
-     
+
       this.order_good_num = {
         ogood_type: goodtype.length === 2 ? goodtype[1] : "",
         ogood_num: this.ruleForm.good_num,
       };
     },
-    async get_goods_active() {
-      const { good_code, supplierNo, platform_id } = this.ruleForm;
-      let model = {
-        skuCode: good_code,
-        companyNo: supplierNo,
-        platform_id,
-      };
-      let { code, data, message } = await asyncRequest.goods_active(model);
-      if (code === 0) {
-        let list =
-          data && data.length > 0 ? JSON.parse(JSON.stringify(data)) : [];
-        list.forEach((a) => {
-          a.value = a.activity_code;
-          a.label = a.activity_name;
-        });
-        this.goodtype_options[1].children = list;
-      } else if (code >= 100 && code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(message);
-      }
-    },
     change_good_code() {
       const { supplierNo, platform_id } = this.ruleForm;
       if (supplierNo === "") {
@@ -1179,12 +1195,7 @@ export default {
             JSON.stringify(this.ruleForm)
           );
           const { order_addr } = JSON.parse(JSON.stringify(this.addrForm));
-          console.log(sendtype, sendtype.length);
-          if (goodtype.length !== 2) {
-            this.$message.warning("请选择商品类型！");
-            this.loading = false;
-            return;
-          }
+
           let key_0 = goodtype[0];
           let key_1 = goodtype[1];
           if (order_addr.length === 0 && sendtype === "1") {

src/views/sellOut/salesOrder/detail.vue

@@ -9,7 +9,7 @@
       <div>
         <span>销售订单编号：</span
         ><span v-if="sitem">{{ sitem.orderCode }}</span>
-        <el-button
+        <!-- <el-button
           @click="statusConfirm('-1', '作废该条信息')"
           type="danger"
           plain
@@ -23,7 +23,7 @@
             powers.some((item) => item == '015')
           "
           >作废该条信息</el-button
-        >
+        > -->
         <el-button
           @click="statusConfirm('0', '取消审核流程')"
           plain
@@ -61,7 +61,7 @@
             :type="queryType"
             :sitem="sitem"
             :id="queryId"
-            @refresh="routeReGoto('zixunOrder', {})"
+            @refresh="routeReGoto('salesOrder', {})"
           />
         </el-tab-pane>
         <el-tab-pane label="业务详情" name="1" v-if="queryType !== 'add'">
@@ -70,6 +70,7 @@
               <show-data-table
                 style="margin: 0; padding: 0"
                 :sitem="sitem"
+                v-if="status"
                 :columns="ShowDataTableColumns"
               >
                 <template slot="good_name">
@@ -77,13 +78,13 @@
                     v-viewer
                     style="width: 23px; height: 23px; margin: 0 5px 0 0"
                     class="fl"
-                    v-if="goods_sitem.good_thumb_img"
-                    :src="goods_sitem.good_thumb_img"
+                    v-if="sitem.good_thumb_img"
+                    :src="sitem.good_thumb_img"
                     alt=""
                   />
-                  <span>{{ goods_sitem.good_name }}</span>
+                  <span>{{ sitem.good_name }}</span>
                   <span
-                    v-for="(si, i) in goods_sitem.specinfo"
+                    v-for="(si, i) in sitem.specinfo"
                     :key="si.spec_id + i"
                   >
                     <span>{{ i === 0 ? "--" : "__" }}</span
@@ -95,49 +96,49 @@
                     class="fl"
                     style="width: 23px; height: 23px; margin: 0 5px 0 0"
                     v-viewer
-                    v-for="(si, i) in goods_sitem.good_info_img"
+                    v-for="(si, i) in sitem.good_info_img"
                     :src="si"
                     :key="si + i"
                   />
                 </template>
                 <template slot="cat">
-                  <span v-for="(si, sii) in goods_sitem.cat_info" :key="si.id"
+                  <span v-for="(si, sii) in sitem.cat_info" :key="si.id"
                     ><span v-if="sii !== 0">_</span><span>{{ si.name }}</span>
                   </span>
                 </template>
                 <template slot="exclusive">
-                  <span v-for="(si, sii) in goods_sitem.exclusive" :key="si.id"
+                  <span v-for="(si, sii) in sitem.exclusive" :key="si.id"
                     ><span v-if="sii !== 0">/</span><span>{{ si.name }}</span>
                   </span>
                 </template>
                 <template slot="is_stock">
                   <el-tag :size="'mini'">{{
-                    goods_sitem.is_stock === "1" ? "是" : "否"
+                    sitem.is_stock === "1" ? "是" : "否"
                   }}</el-tag>
                 </template>
                 <template slot="weight">
                   <span
-                    >商品总重：{{ goods_sitem.new_weight }}/{{
-                      goods_sitem.weight_unit
+                    >商品总重：{{ sitem.new_weight }}/{{
+                      sitem.weight_unit
                     }}</span
                   >
-                  <span v-if="goods_sitem.metal_id"
+                  <span v-if="sitem.metal_id"
                     >--{{
-                      goods_sitem.noble_weight ? goods_sitem.noble_weight : "0"
-                    }}g--{{ goods_sitem.metal_name }}---{{
-                      goods_sitem.gold_price ? goods_sitem.gold_price : "0"
+                      sitem.noble_weight ? sitem.noble_weight : "0"
+                    }}g--{{ sitem.metal_name }}---{{
+                      sitem.gold_price ? sitem.gold_price : "0"
                     }}元/g--{{
-                      goods_sitem.is_gold_price === "0" ? "不" : ""
+                      sitem.is_gold_price === "0" ? "不" : ""
                     }}启用实时金价--{{
-                      goods_sitem.is_diff === "1" ? "有" : "无"
-                    }}工差--{{ goods_sitem.config }}---{{
-                      goods_sitem.other_config
+                      sitem.is_diff === "1" ? "有" : "无"
+                    }}工差--{{ sitem.config }}---{{
+                      sitem.other_config
                     }}</span
                   >
                 </template>
               </show-data-table>
             </el-collapse-item>
-            <el-collapse-item
+            <!-- <el-collapse-item
               title="发起申请流程"
               name="0"
               v-if="status === '0' && powers.some((item) => item == '012')"
@@ -152,8 +153,8 @@
                   >发起审核流程
                 </el-button>
               </div>
-            </el-collapse-item>
-            <el-collapse-item
+            </el-collapse-item> -->
+            <!-- <el-collapse-item
               title="采购反馈物流"
               name="1"
               v-if="
@@ -170,8 +171,8 @@
                 :id="queryId"
                 @refresh="initData()"
               />
-            </el-collapse-item>
-            <el-collapse-item
+            </el-collapse-item> -->
+            <!-- <el-collapse-item
               title="同意下单"
               name="6"
               v-if="status === '2' && powers.some((item) => item == '026')"
@@ -185,9 +186,8 @@
                 @click="statusConfirm('3', '同意下单')"
                 >同意下单，开始发货
               </el-button>
-            </el-collapse-item>
-            <el-collapse-item title="销售出库单" name="3">
-              <!-- && status == 3 && (status == 3 || status == 4)-->
+            </el-collapse-item> -->
+            <!-- <el-collapse-item title="销售出库单" name="3">
               <order-out-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -195,7 +195,7 @@
                 :id="queryId"
                 @refresh="initData()"
               />
-            </el-collapse-item>
+            </el-collapse-item> -->
           </el-collapse>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="2" v-if="queryType !== 'add'">

src/views/serviceParam/business/addEdit.vue

@@ -44,7 +44,7 @@
                     v-model="organName"
                     disabled
                     :placeholder="organName ? '上级组织' : '暂无上级组织'"
-                    minlength="100"
+                    maxlength="100"
                   />
                 </el-form-item>
               </el-col>
@@ -55,7 +55,7 @@
                     v-model="ruleForm.name"
                     :disabled="isDetail == '007'"
                     placeholder="组织名称"
-                    minlength="50"
+                    maxlength="50"
                   />
                 </el-form-item>
               </el-col>
@@ -65,7 +65,7 @@
                     v-model="ruleForm.companyName"
                     :disabled="isDetail == '007'"
                     placeholder="企业名称"
-                    minlength="50"
+                    maxlength="50"
                     ><template v-if="organName" slot="prepend">{{
                       organName
                     }}</template></el-input

src/views/serviceParam/exclusive/addEdit.vue

@@ -29,7 +29,7 @@
                 v-model="ruleForm.name"
                 :disabled="id == '007'"
                 placeholder="名称"
-                minlength="20"
+                maxlength="20"
               >
                 <template slot="prepend" v-if="pid_name">{{
                   pid_name

src/views/serviceParam/orderuse/addEdit.vue

@@ -29,7 +29,7 @@
                 v-model="ruleForm.order_use"
                 :disabled="id == '007'"
                 placeholder="订单用途"
-                minlength="20"
+                maxlength="20"
               />
             </el-form-item>
           </el-form>

src/views/serviceParam/parameter/addEdit.vue

@@ -29,7 +29,7 @@
                 v-model="ruleForm.parameter_name"
                 :disabled="id == '007'"
                 placeholder="系统参数名称"
-                minlength="20"
+                maxlength="20"
               />
             </el-form-item>
           </el-form>

src/views/serviceParam/terrace/addEdit.vue

@@ -29,7 +29,7 @@
                 v-model="ruleForm.platform_name"
                 :disabled="id == '007'"
                 placeholder="平台名称"
-                minlength="20"
+                maxlength="20"
               />
             </el-form-item>
             <el-form-item label="平台类型" prop="platform_type">