廖井涛
2025-09-18 00e006fd8a5254871d66689a7b63a63bf5378014
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -11,10 +11,13 @@
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
import { useI18n } from 'vue-i18n'
import OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue";
import FinishedGlassShelfInformation from "@/views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue";
import CreateFinishedGlassShelfEmit from "@/views/mm/finishedGlassShelf/CreateFinishedGlassShelfEmit.vue";
import footSum from "@/hook/footSum";
import {changeFilterEvent,filterChanged} from "@/hook"
import companyInfo from "@/stores/sd/companyInfo";
import {multiply} from "@/utils/decimal";
import MaterialAddition from "@/views/mm/ingredientStock/MaterialAddition.vue";
//语言获取
const { t } = useI18n()
@@ -24,6 +27,8 @@
const username = userStore.user.userName
const userid = userStore.user.userId
const company = companyInfo()
let dialogTableVisible = ref(false)
let dialogTableVisible2 = ref(false)
let produceList = ref([])
let cellArea = ref()
let otherMoneyVisible = ref(false)
@@ -351,7 +356,8 @@
    buttons: [
      {'code': 'add', 'name': t('basicData.save'),status: 'primary',icon: 'vxe-icon-save'},
      {'code': 'toExamine', 'name': t('basicData.review'),status: 'primary'},
      {'code': 'CounterExamination', 'name': t('basicData.cancelReview'),status: 'primary'}
      {'code': 'CounterExamination', 'name': t('basicData.cancelReview'),status: 'primary'},
      //{'code': 'glassShelf', 'name': t('finishedGlassShelf.finishedGlassShelfEmit'),status: 'primary'}
    ],
    /*import: false,
   export: true,
@@ -499,6 +505,16 @@
            ElMessage.error(t('basicData.msg.ServerConnectionError'))
            router.push("/login")
          })
          break
        }
        case 'glassShelf': {
          dialogTableVisible.value=true
          /*if(titleUploadData.value.deliveryId!=null&&titleUploadData.value.deliveryId!=''){
            router.push({path:'/main/finishedGlassShelf/finishedGlassShelfInformation',query:{deliveryID:titleUploadData.value.deliveryId}})
          }else if(number.value!=null){
            router.push({path:'/main/finishedGlassShelf/finishedGlassShelfInformation',query:{orderId:number.value}})
          }*/
          break
        }
@@ -653,6 +669,18 @@
  }
}
const datas=ref(null)
const handleChildResult = (data) => {
  datas.value=data
  dialogTableVisible.value=false
  dialogTableVisible2.value=true
};
const handleChildResult2 = (data) => {
  dialogTableVisible2.value=false
};
</script>
@@ -665,7 +693,7 @@
        <el-col  :span="3"><el-input style="font-size: large;color: #181818" v-model="titleUploadData.customerId" :readonly="true" ></el-input></el-col>
        <el-col  :span="2"><el-text>{{$t('customer.customerName')}}:</el-text></el-col>
        <el-col  :span="5"><el-input  v-model="titleUploadData.customerName" :readonly="true"></el-input></el-col>
        <el-col  :span="2"><el-text>{{$t('customer.customerNumber')}}:</el-text></el-col>
        <el-col  :span="2"><el-text>{{$t('order.project')}}:</el-text></el-col>
        <el-col  :span="5"><el-input v-model="titleUploadData.project" :readonly="true"></el-input></el-col>
      </el-row>
      <el-row>
@@ -741,7 +769,7 @@
    </div>
    <div class="main-table">
      <vxe-grid
          max-height="100%"
          height="100%"
          class="mytable-scrollbar"
          ref="xGrid"
          v-bind="gridOptions"
@@ -792,6 +820,37 @@
          :otherMoney="otherMoney"
          style="width: 100%;height: 100%" />
    </el-dialog>
    <!--    料架库存弹窗-->
    <el-dialog v-model="dialogTableVisible"
               :title="$t('finishedGlassShelf.finishedGlassShelfInformation')"
                style="width: 70%;height:75%"
                destroy-on-close
                :close-on-click-modal="false"
                :close-on-press-escape="false">
      <Finished-glass-shelf-information
          style="width: 100%;height: 600px"
          type=1
          @handle-result="handleChildResult"
      />
    </el-dialog>
    <!--    料架出库弹窗-->
    <el-dialog v-model="dialogTableVisible2"
               :title="$t('finishedGlassShelf.finishedGlassShelfEmit')"
               style="width: 70%;height:75% "
               destroy-on-close
               :close-on-click-modal="false"
               :close-on-press-escape="false">
      <Create-finished-glass-shelf-emit
          style="width: 100%;height: 600px"
          type=1
          :customerName="titleUploadData.customerName"
          :project="titleUploadData.project"
          :data="datas"
          @handle-result="handleChildResult2"
      />
    </el-dialog>
  </div>
</template>