build:商品活动修改

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

@@ -137,39 +137,21 @@
                 show-overflow-tooltip
                 width="170"
               />
-              <el-table-column prop="good_name" label="商品名称" width="160px" show-overflow-tooltip />
+              <el-table-column prop="good_name" label="商品名称" show-overflow-tooltip />
 
-              <el-table-column prop="is_activity" label="是否使用活动价" :width="type === 'view' ? '110px' : '220px'">
-                <template slot-scope="scope">
-                   <el-select v-if="type !== 'view'" v-model="scope.row.is_activity" placeholder="是否使用活动价">
-                      <el-option value="1" label="是" />
-                      <el-option value="0" label="否" />
-                   </el-select>
-
-                   <span v-else>{{scope.row.is_activity === '1' ? '是' : '否'}}</span>
-                 </template>
-              </el-table-column>
-
-              <el-table-column prop="settle_price" label="结算金额">
-                <template slot-scope="scope">
-                  <digital-input
-                    v-if="type !== 'view'"
-                    :values="ruleForm.settle_price"
-                    :placeholder="'结算金额'"
-                    :min="0"
-                    :max="100000000000"
-                    :position="'right'"
-                    :precision="2"
-                    :size="'mini'"
-                    :disabled="type === 'view'"
-                    :controls="false"
-                    :append="'元'"
-                    @reschange="budget_total_change($event,scope)"
-                   />
+              <template v-if="Number(sitem.status) > 2">
+                <el-table-column prop="is_activity" label="是否使用活动价" width="110px">
+                  <template slot-scope="scope">
+                    <span>{{scope.row.is_activity === '1' ? '是' : '否'}}</span>
+                  </template>
+                </el-table-column>
 
-                   <span v-else>{{scope.row.settle_price}}</span>
-                </template>
-              </el-table-column>
+                <el-table-column prop="settle_price" label="结算金额">
+                  <template slot-scope="scope">
+                    <span>{{scope.row.settle_price}}</span>
+                  </template>
+                </el-table-column>
+              </template>
 
               <el-table-column prop="activity_stock" label="活动库存" width="180">
                 <template slot-scope="scope">
@@ -488,9 +470,6 @@ export default {
     this.initForm();
   },
   methods: {
-    budget_total_change(e,scope){
-      scope.row.settle_price = e + "";
-    },
     async initForm() {
       this.loading = true;
       this.resetFormData();
@@ -642,9 +621,7 @@ export default {
             list.forEach((e) => {
               let item = {
                 skuCode: e.skuCode,
-                activity_stock: e.activity_stock,
-                is_activity:e.is_activity,
-                settle_price:e.settle_price
+                activity_stock: e.activity_stock
               };
               newList.push(item);
             });

src/views/goodStore/active/components/finance-exam-two-form.vue

@@ -18,6 +18,32 @@
         label="商品名称"
         show-overflow-tooltip
       />
+      <el-table-column prop="is_activity" label="是否使用活动价" width="220px">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.is_activity" placeholder="是否使用活动价" size="mini">
+              <el-option value="1" label="是" />
+              <el-option value="0" label="否" />
+          </el-select>
+        </template>
+      </el-table-column>
+
+     <el-table-column prop="settle_price" label="结算金额" width="120px">
+        <template slot-scope="scope">
+            <digital-input
+              :values="scope.row.settle_price"
+              :placeholder="'结算金额'"
+              :min="0"
+              :max="100000000000"
+              :position="'right'"
+              :precision="2"
+              :size="'mini'"
+              :controls="false"
+              :append="'元'"
+              @reschange="budget_total_change($event,scope)"
+            />
+        </template>
+      </el-table-column>
+
       <el-table-column
         prop="activity_stock"
         label="活动库存"
@@ -131,6 +157,9 @@ export default {
     this.initForm();
   },
   methods: {
+    budget_total_change(e,scope){
+      scope.row.settle_price = e + "";
+    },
     async initForm() {
       this.loading = true;
       this.resetFormData();
@@ -175,6 +204,8 @@ export default {
           let item = {
             id: e.id,
             activity_price: e.activity_price,
+            is_activity:e.is_activity,
+            settle_price:e.settle_price
           };
           newlist.push(item);
         });