暂存

src/App.vue

@@ -15,16 +15,6 @@ export default {
     };
   },
   async created() {
-    // let list1=''
-    // let list2=""
-    // const key=".",zhkey='xiaod',mmkey='223322'
-    // for(let i=0;i<500;i++){
-    //   list1+=`${i===0?'':key}${zhkey}${i+1}`
-    //   list2+=`${i===0?'':key}${mmkey}`
-
-    // }
-    // console.log(list1);
-    // console.log(list2);
     if (JudgeEnvironment() === "isDingDing") {
       await this.testing();
     } else {

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

@@ -851,60 +851,6 @@
       >
       <el-col :span="23" class="dmain">
         <el-row>
-          <el-col :span="6">
-            <el-form-item label="证书费" prop="cert_fee" label-width="75px">
-              <digital-input
-                :values="ruleForm.cert_fee"
-                :placeholder="'证书费'"
-                :min="0"
-                :name="'ruleForm.cert_fee'"
-                :disabled="type === 'view' || type === 'editBase'"
-                :max="100000000000"
-                :position="'right'"
-                :precision="2"
-                :size="'mini'"
-                :controls="false"
-                :append="'元'"
-                @reschange="number_change($event, 'cert_fee')"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="包装费" prop="packing_fee" label-width="75px">
-              <digital-input
-                :values="ruleForm.packing_fee"
-                :placeholder="'包装费'"
-                :min="0"
-                :name="'ruleForm.packing_fee'"
-                :disabled="type === 'view' || type === 'editBase'"
-                :max="100000000000"
-                :position="'right'"
-                :precision="2"
-                :size="'mini'"
-                :controls="false"
-                :append="'元'"
-                @reschange="number_change($event, 'packing_fee')"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="工艺费" prop="cost_fee" label-width="75px">
-              <digital-input
-                :values="ruleForm.cost_fee"
-                :placeholder="'工艺费'"
-                :min="0"
-                :name="'ruleForm.cost_fee'"
-                :disabled="type === 'view' || type === 'editBase'"
-                :max="100000000000"
-                :position="'right'"
-                :precision="2"
-                :size="'mini'"
-                :controls="false"
-                :append="'元'"
-                @reschange="number_change($event, 'cost_fee')"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item label="加标费" prop="mark_fee" label-width="75px">
               <digital-input
@@ -995,24 +941,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="裸价" prop="nake_price" label-width="75px">
-              <digital-input
-                :values="ruleForm.nake_price"
-                :placeholder="'裸价'"
-                :min="0"
-                :name="'ruleForm.nake_price'"
-                :disabled="type === 'view' || type === 'editBase'"
-                :max="100000000000"
-                :position="'right'"
-                :precision="2"
-                :size="'mini'"
-                :controls="false"
-                :append="'元'"
-                @reschange="number_change($event, 'nake_price')"
-              />
-            </el-form-item>
-          </el-col>
+
           <el-col :span="8" v-show="is_noble">
             <el-form-item
               label="供应商采购金价"
@@ -1077,9 +1006,13 @@
               style="width: 100%; margin: 0 0 20px 0"
             >
               <el-table-column prop="min_num" label="起订量(>=)" />
-              <el-table-column prop="nake_fee" label="成本合计" />
-              <el-table-column prop="cost_fee" label="工艺费" />
+              <el-table-column prop="nake_price" label="裸价" />
+              <el-table-column prop="cert_fee" label="证书费" />
+              <el-table-column prop="packing_fee" label="包装费" />
+              <el-table-column prop="cost_fee" label="成本工艺费" />
               <el-table-column prop="delivery_fee" label="物流费" />
+              <el-table-column prop="new_nake_fee" label="系统成本合计" />
+              <el-table-column prop="nake_fee" label="系统成本合计" />
               <el-table-column
                 fixed="right"
                 v-if="type === 'add' || type === 'editCoin' || type === 'edit'"