Merge branch 'sit'

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

@@ -54,9 +54,11 @@ export default {
       this.num = val;
     },
     newTime: function (val) {
-      // console.log(this.name + "=" + this.values);
-      this.num = this.values;
-      this.$emit("reschange", this.num);
+      if (val) {
+        // console.log(this.name + "=" + this.values);
+        this.num = this.values;
+        this.$emit("reschange", this.num);
+      }
     },
     min: function (val) {
       let a = this.accMul(val, "1");
@@ -99,8 +101,7 @@ export default {
         m += s2.split(".")[1].length;
       } catch (e) {}
       return (
-        (Number(s1.replace(".", "")) * Number(s2.replace(".", ""))) /
-        Math.pow(10, m)
+        (Number(s1.replace(".", "")) * Number(s2.replace(".", ""))) / Math.pow(10, m)
       );
     },
   },

src/views/sellOut/project/components/setPlan.vue

@@ -4,13 +4,7 @@
       <div class="project-setPlan-title">商品要求</div>
       <div class="project-setPlan-ask-table">
         <template v-if="ladder">
-          <el-table
-            :data="ladder"
-            :size="'mini'"
-            border
-            stripe
-            style="width: 100%"
-          >
+          <el-table :data="ladder" :size="'mini'" border stripe style="width: 100%">
             <el-table-column
               label="要求编码"
               prop="pgNo"
@@ -29,9 +23,8 @@
                   :size="'mini'"
                   v-text="
                     (
-                      statusOptions.find(
-                        (item) => item.value == scope.row.good_type
-                      ) || {}
+                      statusOptions.find((item) => item.value == scope.row.good_type) ||
+                      {}
                     ).label || '--'
                   "
                 ></el-tag
@@ -49,11 +42,7 @@
               width="110"
               show-overflow-tooltip
             />
-            <el-table-column
-              prop="cat_name"
-              label="商品分类"
-              show-overflow-tooltip
-            />
+            <el-table-column prop="cat_name" label="商品分类" show-overflow-tooltip />
             <el-table-column
               prop="good_img"
               label="图片"
@@ -75,11 +64,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="good_name"
-              label="商品名称"
-              show-overflow-tooltip
-            />
+            <el-table-column prop="good_name" label="商品名称" show-overflow-tooltip />
           </el-table>
         </template>
       </div>
@@ -94,11 +79,7 @@
           style="width: 100%"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column
-            type="selection"
-            width="40"
-            v-if="table_type === 'add'"
-          >
+          <el-table-column type="selection" width="40" v-if="table_type === 'add'">
           </el-table-column>
           <el-table-column
             prop="pgNo"
@@ -152,9 +133,7 @@
             <template slot-scope="scope">
               <span>{{ scope.row.good_name }}</span>
               <span v-for="(si, sii) in scope.row.specinfo" :key="si.id + sii">
-                {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{
-                  si.spec_value_name
-                }}]
+                {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{ si.spec_value_name }}]
               </span>
             </template>
           </el-table-column>
@@ -168,18 +147,12 @@
               <el-tag
                 :size="'mini'"
                 :type="scope.row.data_source === '1' ? 'success' : ''"
-                >{{
-                  scope.row.data_source === "1" ? "平台商品" : "采反商品"
-                }}</el-tag
+                >{{ scope.row.data_source === "1" ? "平台商品" : "采反商品" }}</el-tag
               >
             </template>
           </el-table-column>
 
-          <el-table-column
-            prop="class_cat"
-            label="商品分类"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="class_cat" label="商品分类" show-overflow-tooltip />
           <el-table-column
             prop="expire_day"
             label="信息有效期"
@@ -312,22 +285,24 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <digital-input
-                v-if="table_type === 'add'"
-                :values="scope.row.new_sale_price"
-                :placeholder="'售价'"
-                :min="0"
-                :max="100000000000"
-                :position="'right'"
-                :precision="2"
-                :size="'mini'"
-                :controls="false"
-                :append="''"
-                @reschange="
-                  moq_num_change($event, scope.$index, 'new_sale_price')
-                "
-              />
-              <span v-else>{{ scope.row.sale_price }}元</span>
+              <div v-if="table_type === 'add'">
+                <digital-input
+                  :values="scope.row.new_sale_price"
+                  :placeholder="'售价'"
+                  :min="0"
+                  :newTime="scope.row.time_price"
+                  :max="100000000000"
+                  :position="'right'"
+                  :precision="2"
+                  :size="'mini'"
+                  :controls="false"
+                  :append="''"
+                  @reschange="
+                    moq_num_change($event, scope.$index, 'new_sale_price', 'time_price')
+                  "
+                />
+              </div>
+              <span v-else>{{ scope.row.new_sale_price || scope.row.sale_price }}元</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -336,26 +311,23 @@
             width="110"
             show-overflow-tooltip
           />
-          <el-table-column
-            prop="num"
-            label="购买数量"
-            width="110"
-            show-overflow-tooltip
-          >
+          <el-table-column prop="num" label="购买数量" width="110" show-overflow-tooltip>
             <template slot-scope="scope">
-              <digital-input
-                v-if="table_type === 'add'"
-                :values="scope.row.origin_num"
-                :placeholder="'购买数量'"
-                :min="scope.row.origin_num"
-                :max="100000000000"
-                :position="'right'"
-                :precision="0"
-                :size="'mini'"
-                :controls="false"
-                :append="''"
-                @reschange="moq_num_change($event, scope.$index, 'num')"
-              />
+              <div v-if="table_type === 'add'">
+                <digital-input
+                  :values="scope.row.num"
+                  :placeholder="'购买数量'"
+                  :min="scope.row.origin_num"
+                  :max="100000000000"
+                  :position="'right'"
+                  :precision="0"
+                  :newTime="scope.row.time_num"
+                  :size="'mini'"
+                  :controls="false"
+                  :append="''"
+                  @reschange="moq_num_change($event, scope.$index, 'num', 'time_num')"
+                />
+              </div>
               <span v-else>{{ scope.row.num }}</span>
             </template>
           </el-table-column>
@@ -364,9 +336,7 @@
               <el-tag
                 :size="'mini'"
                 :type="scope.row.data_source === '1' ? 'success' : ''"
-                >{{
-                  scope.row.data_source === "1" ? "平台商品" : "采反商品"
-                }}</el-tag
+                >{{ scope.row.data_source === "1" ? "平台商品" : "采反商品" }}</el-tag
               >
             </template>
           </el-table-column>
@@ -404,17 +374,11 @@
             <template slot-scope="scope">
               <span>{{ scope.row.good_name }}</span>
               <span v-for="(si, sii) in scope.row.specinfo" :key="si.id + sii">
-                {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{
-                  si.spec_value_name
-                }}]
+                {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{ si.spec_value_name }}]
               </span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="class_cat"
-            label="商品分类"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="class_cat" label="商品分类" show-overflow-tooltip />
           <!-- <el-table-column
             prop="expiry_day"
             label="信息有效期"
@@ -459,9 +423,8 @@ export default {
   computed: {
     powers() {
       let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "projectDetail"
-        ) || {};
+        this.$store.getters.btnList.find((item) => item.menu_route == "projectDetail") ||
+        {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
       } else {
@@ -529,12 +492,9 @@ export default {
     },
     //项目下单
     place_order() {
-      const { company, khName, platform_name, arrtime, project_name } =
-        this.sitem;
-        // console.log("aaaaaaaaaaaaaaa",this.sitem)
-      this.bayGoodItem = JSON.parse(
-        JSON.stringify(this.allPlanList[this.index])
-      );
+      const { company, khName, platform_name, arrtime, project_name } = this.sitem;
+      // console.log("aaaaaaaaaaaaaaa",this.sitem)
+      this.bayGoodItem = JSON.parse(JSON.stringify(this.allPlanList[this.index]));
       this.bayGoodItem.in_company = company;
       this.bayGoodItem.in_khname = khName;
       this.bayGoodItem.in_platform_name = platform_name;
@@ -569,13 +529,13 @@ export default {
         feedback: [],
       };
     },
-    moq_num_change(e, index, key) {
+    moq_num_change(e, index, key, time) {
       this.plan_show.feedback[index][key] = e + "";
-      this.$set(
-        this.plan_show.feedback[index],
-        index,
-        this.plan_show.feedback[index]
-      );
+      if (time) {
+        this.plan_show.feedback[index][time] = new Date().valueOf;
+      }
+
+      this.$set(this.plan_show.feedback[index], index, this.plan_show.feedback[index]);
     },
     //初始化整个组件
     async initListData() {
@@ -601,6 +561,9 @@ export default {
       };
       this.multipleSelection.forEach((a, i) => {
         a.origin_sale_price = a.sale_price;
+        a.new_sale_price = a.sale_price;
+        console.log(a.origin_sale_price, a.sale_price);
+
         let fi = list.findIndex((b) => a.id === b.id && b.pgNo === a.pgNo);
         if (fi !== -1) {
           this.plan_show.feedback.push(JSON.parse(JSON.stringify(list[fi])));
@@ -611,11 +574,25 @@ export default {
         }
       });
       this.plan_show.feedback.map((e) => {
-        console.log(e.sale_price);
-        e.new_sale_price = e.sale_price;
         e.origin_num = e.num;
+        e.time_price = "";
+        e.time_num = "";
         return e;
       });
+
+      console.log(this.plan_show);
+      setTimeout(() => {
+        this.plan_show.feedback.forEach((a, index) => {
+          a.time_price = new Date().valueOf();
+          a.time_num = new Date().valueOf();
+          this.$set(
+            this.plan_show.feedback[index],
+            index,
+            this.plan_show.feedback[index]
+          );
+        });
+        console.log(this.plan_show);
+      }, 100);
     },
 
     async searchList() {
@@ -666,9 +643,7 @@ export default {
         let list = feedback;
         let isok = true;
         list.forEach((a) => {
-          let findex = list.findIndex(
-            (b) => b.pgNo === a.pgNo && a.id !== b.id
-          );
+          let findex = list.findIndex((b) => b.pgNo === a.pgNo && a.id !== b.id);
           if (findex !== -1) {
             isok = false;
           }
@@ -707,9 +682,7 @@ export default {
           };
           model.feedback.push(si);
         });
-        const { code, data, message } = await asyncRequest.project_make_plan(
-          model
-        );
+        const { code, data, message } = await asyncRequest.project_make_plan(model);
         if (code === 0) {
           await this.back_list();
         } else if (code >= 100 && code <= 104) {
@@ -725,9 +698,7 @@ export default {
       let model = {
         projectNo: this.projectNo,
       };
-      const { code, data, message } = await asyncRequest.get_project_plan(
-        model
-      );
+      const { code, data, message } = await asyncRequest.get_project_plan(model);
       if (code === 0) {
         this.allPlanList = JSON.parse(JSON.stringify(data));
         this.total = this.allPlanList.length;
@@ -791,7 +762,7 @@ export default {
 };
 </script>
 
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .project-setPlan {
   box-sizing: border-box;
   width: 100%;