Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-02-27 e8ba2a1bec7ffbd78cb941521b31d000890e66de

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -37,6 +37,7 @@
//定义接收加载表头下拉数据
const titleSelectJson = ref({
  paymentTerms:[],
  payMethod:[]
})

// 定义表头上传数据
@@ -101,7 +102,7 @@

  if(res.code==200){
    titleSelectJson.value=deepClone(res.data)
    titleUploadData.value.paymentTerms = titleSelectJson.value.paymentTerms[0].basicName
    console.log(titleSelectJson.value)
    const today = new Date
    today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
    titleUploadData.value.deliveryDate = today.getFullYear() +
@@ -131,6 +132,8 @@


        titleUploadData.value=deepClone(res.data.title)
        titleUploadData.value.paymentTerms = titleSelectJson.value.paymentTerms[0].basicName
        titleUploadData.value.payMethod = titleSelectJson.value.payMethod[0].basicName
        const today = new Date
        today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
        titleUploadData.value.deliveryDate=today.getFullYear() +
@@ -150,8 +153,7 @@
        produceList = deepClone(res.data.data)
        xGrid.value.loadData(produceList)

        //let arr =  Object.values(gridOptions.toolbarConfig);
        //arr[0].splice(1,2)

        //禁用按钮
        gridOptions.toolbarConfig.buttons[1].disabled  = true
        gridOptions.toolbarConfig.buttons[2].disabled = true
@@ -160,7 +162,6 @@
        gridOptions.loading=false
      }else{
        ElMessage.warning(res.msg)
        router.push("/login")
      }
    })
  }
@@ -181,9 +182,10 @@


        //根据审核状态显示审核按钮或者是反审按钮
        gridOptions.toolbarConfig.buttons[0].disabled = true
        if(titleUploadData.value.deliveryState===1){

        if(titleUploadData.value.deliveryState!==0){
          gridOptions.toolbarConfig.buttons[1].disabled = true
          gridOptions.toolbarConfig.buttons[0].disabled = true
        }
        if(titleUploadData.value.deliveryState===0){
          gridOptions.toolbarConfig.buttons[2].disabled = true
@@ -192,12 +194,13 @@
        produceList = deepClone(res.data.data)
        xGrid.value.loadData(produceList)
        //隐藏复选框
        xGrid.value.hideColumn("select")
        /*xGrid.value.hideColumn("select")
        gridOptions.loading=false*/
        xGrid.value.showColumn("select")
        gridOptions.loading=false

      }else{
        ElMessage.warning(res.msg)
        router.push("/login")
      }
    })
  }
@@ -413,28 +416,14 @@
            ElMessage.error('请输入收款方式！')
            return
          }
          const contacts = titleUploadData.value.contacts
          if(contacts === null || contacts === undefined || contacts === ''){
            ElMessage.error('请输入联系人！')
            return
          }

          const contactNumber = titleUploadData.value.contactNumber
          if(contactNumber === null || contactNumber === undefined || contactNumber === ''){
            ElMessage.error('请输入联系电话！')
            return
          }
          const deliveryAddress = titleUploadData.value.deliveryAddress
          if(deliveryAddress === null || deliveryAddress === undefined || deliveryAddress === ''){
            ElMessage.error('请输入送货地址！')
            return
          }



          let flowData = ref({
            delivery: selectRecords,
            title: titleUploadData.value
            title: titleUploadData.value,
            deliveryId: route.query.deliveryID

          })
          console.log(flowData)
@@ -522,11 +511,11 @@
    <div class="order-primary" style="background-color: white">
      <el-row>
        <el-col  :span="2"><el-text>客户编码:</el-text></el-col>
        <el-col  :span="3"><el-input style="font-size: large;color: #181818" v-model="titleUploadData.customerId" ></el-input></el-col>
        <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>客户名称:</el-text></el-col>
        <el-col  :span="5"><el-input  v-model="titleUploadData.customerName"></el-input></el-col>
        <el-col  :span="5"><el-input  v-model="titleUploadData.customerName" :readonly="true"></el-input></el-col>
        <el-col  :span="2"><el-text>项目名称:</el-text></el-col>
        <el-col  :span="5"><el-input v-model="titleUploadData.project"></el-input></el-col>
        <el-col  :span="5"><el-input v-model="titleUploadData.project" :readonly="true"></el-input></el-col>
      </el-row>
      <el-row>
        <el-col  :span="2"><el-text>付款条件：</el-text></el-col>
@@ -540,8 +529,8 @@
            />
          </el-select>
        </el-col>
        <el-col  :span="2"><el-text>收款方式:</el-text></el-col>
        <el-col  :span="5"><el-input v-model="titleUploadData.payMethod"></el-input></el-col>
        <el-col  :span="2"><el-text>联系人:</el-text></el-col>
        <el-col  :span="5"><el-input v-model="titleUploadData.contacts"/></el-col>
        <el-col  :span="2"><el-text>收款日期:</el-text></el-col>
        <el-col  :span="5">
          <el-date-picker
@@ -552,8 +541,18 @@

      </el-row>
      <el-row>
        <el-col  :span="2"><el-text>联系人:</el-text></el-col>
        <el-col  :span="3"><el-input v-model="titleUploadData.contacts"/></el-col>

        <el-col  :span="2"><el-text>收款方式：</el-text></el-col>
        <el-col  :span="3">
          <el-select v-model="titleUploadData.payMethod"  clearable placeholder=""  >
            <el-option
                v-for="item in titleSelectJson['payMethod']"
                :key="item.id"
                :label="item.basicName"
                :value="item.basicName"
            />
          </el-select>
        </el-col>
        <el-col  :span="2"><el-text>联系电话:</el-text></el-col>
        <el-col  :span="5"><el-input v-model="titleUploadData.contactNumber"/></el-col>
        <el-col  :span="2"><el-text>送货地址:</el-text></el-col>
@@ -563,7 +562,7 @@
        <el-col  :span="2"><el-text>备注:</el-text></el-col>
        <el-col  :span="3"><el-input v-model="titleUploadData.remarks"/></el-col>
        <el-col  :span="2"><el-text>报表日期:</el-text></el-col>
        <el-col  :span="5"><el-input v-model="titleUploadData.createTime"></el-input></el-col>
        <el-col  :span="5"><el-input v-model="titleUploadData.createTime" :readonly="true"></el-input></el-col>
        <el-col  :span="2"><el-text>发货报表日期:</el-text></el-col>
        <el-col  :span="5">
          <el-date-picker
@@ -574,9 +573,9 @@
      </el-row>
      <el-row>
        <el-col  :span="2"><el-text>业务员:</el-text></el-col>
        <el-col  :span="3"><el-input v-model="titleUploadData.salesman"/></el-col>
        <el-col  :span="3"><el-input v-model="titleUploadData.salesman" :readonly="true"/></el-col>
        <el-col  :span="2"><el-text>发货员:</el-text></el-col>
        <el-col  :span="5"><el-input v-model="titleUploadData.creator"/></el-col>
        <el-col  :span="5"><el-input v-model="titleUploadData.creator" :readonly="true"/></el-col>
      </el-row>
    </div>
    <div class="order-detail">