src/components/makepager/CommonFormTableView.vue
@@ -133,13 +133,7 @@
                ></el-input-number>
              </el-form-item>
              <span v-else>
                <template v-if="pageName=='quotation'&&item.prop=='profit'">
                  {{ (scope.row.price&&scope.row.cost)?Number(scope.row.price)-Number(scope.row.cost):'' }}
                </template>
                <template v-if="pageName=='quotation'&&item.prop=='margin'">
                  {{ (scope.row.price&&scope.row.cost)?((Number(scope.row.price)-Number(scope.row.cost))*100/Number(scope.row.cost)).toFixed(2):'' }}
                </template>
                <template v-else>
                <template>
                  {{ scope.row[item.prop] }}
                </template>
              </span>
@@ -168,7 +162,7 @@
            <span v-else style="text-align: right">{{ scope.row[item.prop] }}</span>
          </template>
        </el-table-column>
        <el-table-column  label="操作" width="40" align="center">
        <el-table-column  label="操作" width="40" v-if="!detailEnter" align="center">
          <template slot-scope="scope">
            <el-button
              type="text"
@@ -421,10 +415,21 @@
            /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
          if (!reg2.test(value)||value==0) {
            this.$message.error("成本单价需要填写大于0的2位小数!")
            return true;
          } 
        this.$forceUpdate()
      }
      this.$emit("inputContent", val, prop, row)
      if(this.pageName=='quotation'){
        if(prop=='price'||prop=='cost'){
          if(scope.row.price&&scope.row.cost){
            let profit=Number(scope.row.price)-Number(scope.row.cost)
            scope.row.profit=profit+'';
            let margin=((Number(scope.row.price)-Number(scope.row.cost))*100/Number(scope.row.cost)).toFixed(2)
            scope.row.margin=margin+'';
          }
        }
      }
      this.$emit("inputContent", val, prop, row,scope)
    },
    // 清空
    empty() {
@@ -435,7 +440,7 @@
    deleteClick(scope){
      this.tableList.tableData.splice(scope.$index,1)
      this.$forceUpdate();
      this.$message.success('删除除成功!')
      this.$message.success('删除成功!')
      this.$emit("deleteClick",scope)
    },
    // 重算