Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-08-26 d8a5e27ce721024c903d85c6925d5662628a9759

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/utils/decimal.js

@@ -10,22 +10,22 @@

// 封装减法函数
function subtract(num1, num2) {
    const decimal1 = new Decimal(num1===null?0:num1);
    const decimal2 = new Decimal(num2===null?0:num2);
    const decimal1 = new Decimal(num1===null || num1===''?0:num1);
    const decimal2 = new Decimal(num2===null || num2===''?0:num2);
    return decimal1.minus(decimal2).toFixed(2);
}

// 封装乘法函数
function multiply(num1, num2) {
    const decimal1 = new Decimal(num1===null?0:num1);
    const decimal2 = new Decimal(num2===null?0:num2);
    const decimal1 = new Decimal(num1===null || num1===''?0:num1);
    const decimal2 = new Decimal(num2===null || num2===''?0:num2);
    return decimal1.times(decimal2).toFixed(2)
}

// 封装除法函数
function divide(num1, num2) {
    const decimal1 = new Decimal(num1===null?0:num1);
    const decimal2 = new Decimal(num2===null?0:num2);
    const decimal1 = new Decimal(num1===null || num1===''?0:num1);
    const decimal2 = new Decimal(num2===null || num2===''?0:num2);
    return decimal1.dividedBy(decimal2).toFixed(2);
}
export {

 north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue

@@ -440,6 +440,10 @@

}

let enlargementFlag = ref(false)
const trademarkenlargement = () => {
  enlargementFlag.value = !enlargementFlag.value
}


</script>
@@ -645,13 +649,13 @@
          </el-col>
        </el-row>
      </div>
      <div style="width: 400px;height: 250px;border: 2px solid #000;float: left;position: relative;">
      <div v-if="!enlargementFlag" style="width: 400px;height: 250px;border: 2px solid #000;float: left;position: relative;">
        <div
            v-if="tagCheck(t('craft.upperLeft'))"
            style="float: left;width: 50px;height: 90px;margin-left: 1rem;margin-top: 15px">
          <el-row class="icon">
            <el-col class="icon" >
              <el-image style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}"  :src="iconNickname"/>
              <el-image @dblclick="trademarkenlargement" style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}"  :src="iconNickname"/>
            </el-col>
          </el-row>
          <el-row  >
@@ -669,7 +673,7 @@
            style="float: right;width: 50px;height: 90px;margin-right: 1rem;margin-top: 15px">
          <el-row class="icon">
            <el-col class="icon" >
              <el-image style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}"  :src="iconNickname"/>
              <el-image @dblclick="trademarkenlargement" style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}"  :src="iconNickname"/>
            </el-col>
          </el-row>
          <el-row  >
@@ -684,6 +688,7 @@


        <div

            v-if="tagCheck(t('craft.lowLeft'))"
            style="width: 50px;height: 90px;margin-left: 1rem;float: left;position: absolute;bottom: 15px" >
          <el-row  >
@@ -696,7 +701,7 @@
          </el-row>
          <el-row class="icon">
            <el-col class="icon" >
              <el-image style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}"  :src="iconNickname"/>
              <el-image @dblclick="trademarkenlargement" style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}"  :src="iconNickname"/>
            </el-col>
          </el-row>

@@ -716,7 +721,7 @@
          </el-row>
          <el-row class="icon">
            <el-col class="icon">
              <el-image style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}"  :src="iconNickname"/>
              <el-image style="width: 100%;height: 100%"  @dblclick="trademarkenlargement" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}"  :src="iconNickname"/>
            </el-col>
          </el-row>

@@ -725,6 +730,9 @@


      </div>
      <div v-if="enlargementFlag" style="width: 400px;height: 250px;float: left;position: relative;">
        <el-image  @dblclick="trademarkenlargement" style="z-index: 9999;max-width: 100%;max-height: 100%" :src="iconNickname"/>
      </div>
    </el-dialog>

  </div>

 north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue

@@ -159,7 +159,6 @@
      }
    }
  })

}

const  saveProducts=(product)=>{