修改项目名称为非必填项

guoyuji

2024-10-28 df5d02537176da7b2a25bc4678873c21b311e45e

修改项目名称为非必填项

 north-glass-erp/northglass-erp/src/lang/en.js

@@ -1127,7 +1127,7 @@
        glass:'玻璃',
        interlayer:'夹胶',
        hollow:'中空',
        craft:'工艺',
        process:'工艺',
        addProduce:'选择产品',
        reorder:'转订单'
    }

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -1128,7 +1128,7 @@
        glass:'玻璃',
        interlayer:'夹胶',
        hollow:'中空',
        craft:'工艺',
        process:'工艺',
        addProduce:'选择产品',
        reorder:'转订单'
    }

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -1128,7 +1128,7 @@
        glass:'玻璃',
        interlayer:'夹胶',
        hollow:'中空',
        craft:'工艺',
        process:'工艺',
        addProduce:'选择产品',
        reorder:'转订单'
    }

 north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceList.vue

@@ -54,7 +54,7 @@
  columns:[
    {title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
    {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
    {field: 'type',  title: t('product.msg.interlayerType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'type',  title: t('product.msg.interlayerType'),filters:[{ data: '' }],slots: { filter: 'num1_filter',default:'default_shape' }, sortable: true,filterMethod:filterChanged},
    {field: 'name',  title: t('orderBasicData.name'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'price',  title: t('menu.glassPrice') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'createTime',  title: t('basicData.creationTime'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged}
@@ -150,6 +150,10 @@
        </el-popconfirm>
      </template>

      <template #default_shape="{ row }">
        <span>{{ $t('glassPrice.'+row.type) }}</span>
      </template>


    </vxe-grid>
  </div>

 north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceSet.vue

@@ -74,7 +74,7 @@
      <el-tab-pane :name="3" :label="t('glassPrice.hollow')">
        <hollow @getChild="getChild" v-if="tabsValue===3" :basicData="BasicData"/>
      </el-tab-pane>
      <el-tab-pane :name="4" :label="t('glassPrice.craft')">
      <el-tab-pane :name="4" :label="t('glassPrice.process')">
        <process @getChild="getChild" v-if="tabsValue===4" :basicData="BasicData"/>
      </el-tab-pane>
    </el-tabs>

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

@@ -323,11 +323,11 @@
            return
          }

          const project = titleUploadData.value.project
          /*const project = titleUploadData.value.project
          if(project === null || project === undefined || project === ''){
            ElMessage.error(t('order.msg.projectCheck'))
            return
          }
          }*/
          const customer = titleUploadData.value.customerId
          if(customer === null || customer === undefined || customer === ''){
            ElMessage.error(t('order.msg.customerCheck'))
@@ -1402,7 +1402,7 @@
    <div class="order-primary" style="background-color: white">
      <el-row>
        <el-col  :span="2"><el-text>*{{$t('order.project')}}：</el-text></el-col>
        <el-col  :span="2"><el-input v-model="titleUploadData.project"/></el-col>
        <el-col  :span="2"><el-input v-model.trim="titleUploadData.project"/></el-col>
        <el-col  :span="2"><el-text>*{{$t('order.customers')}}：</el-text></el-col>
        <el-col  :span="2">
          <el-select  v-model="titleUploadData.customerId"