廖井涛
2024-07-29 7caea3022ed0fcc469ff58cb921c2e9713d60bf6
修改中英文切换
4个文件已修改
12 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/lang/en.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/zh.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/en.js
@@ -230,6 +230,8 @@
        sheet3:'View shipping information',
        sheet5:'Production and processing of single curved glass (single sheet)',
        oneClickStorage:'One-click completion',
        quantityMount:'Quantity and Amount',
        msg:{
            productCheck:'Please select a product',
            tableLengthNot:'No table data',
north-glass-erp/northglass-erp/src/lang/zh.js
@@ -230,6 +230,8 @@
        sheet3:'浏览发货信息',
        sheet5:'生产加工单弯钢(单片)',
        oneClickStorage:'一键完工',
        quantityMount:'数量金额',
        msg:{
            productCheck:'请选择产品',
            tableLengthNot:'没有表格数据',
north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
@@ -208,7 +208,7 @@
            v-model="basic.basicType"
            @change="handleChange"
            :options="options"
            placeholder=""
            :placeholder="$t('processCard.pleaseSelect')"
            :disabled="props.rowIndex"
        />
      </el-col>
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -725,6 +725,7 @@
  request.post(`/order/getOrderById/${str}`).then((res) => {
    if(res.code==200){
      console.log(res.data.order)
      titleUploadData.value = res.data.order
      if(history.state.orderId!=null){
        titleUploadData.value.orderId=''
@@ -785,6 +786,9 @@
        }
      }
      if(res.data.order.productionOrder !==0 ){
        gridOptions.toolbarConfig.buttons[2].disabled = true
      }
      if(res.data.order.warehousing !==0 ){
        gridOptions.toolbarConfig.buttons[2].disabled = true
      }
      const orderDetails = res.data.orderDetails
@@ -1380,7 +1384,7 @@
          <el-select @change="changeCalculateType" v-model="titleUploadData.calculateType"   placeholder=" " >
            <el-option :value="1" :label="t('order.areaAmountPerPiece')"/>
            <el-option :value="2" :label="t('order.areaAmountAge')"/>
            <el-option :value="3" :label="'数量金额'"/>
            <el-option :value="3" :label="t('order.quantityMount')"/>
          </el-select>
        </el-col>
        <el-col  :span="2"><el-text>*{{$t('order.salesman')}}:</el-text></el-col>