qq_41295110
5 天以前 e1b39f63fc0c2cd4d1080c36b7b7b73609c63a2a
修改容器模块部分页面BUG
7个文件已修改
99 ■■■■■ 已修改文件
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -19,7 +19,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="日期" prop="HDate">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-ddT">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd">
                </el-date-picker>
              </el-form-item>
            </el-col>
@@ -35,7 +35,7 @@
          <el-row>
            <el-col :span="6">
              <el-form-item label="往来类型" prop="HSupTypeID">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型" @change="form.HSupName='',form.HSupId=0">
                  <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
                  </el-option>
                </el-select>
@@ -628,7 +628,7 @@
      //新增获取单据号
      this.getHBillNo()
      let date = new Date()
      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
      this.form.HDate = moment(date).format('YYYY-MM-DD')
      if (this.OperationType == 1) {
        this.handleAddSysZb()
      }
@@ -665,7 +665,7 @@
          if (this.copyType == 1) {
            this.getHBillNo()
            let date = new Date()
            this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
            this.form.HDate = moment(date).format('YYYY-MM-DD')
          } else {
            this.form = {
                  "HBillNo": data.单据号
src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
@@ -131,10 +131,10 @@
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 2)">编辑</el-button>
      </el-col>
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">复制</el-button>
      </el-col>
      </el-col> -->
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-tickets" size="mini"
          @click="handlePush(row = rowForm, OperationType = 4)">下推(容器领用退库单)</el-button>
@@ -151,14 +151,14 @@
        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
          @click="set_CheckBill(2, form = rowForm)">返审核</el-button>
      </el-col>
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
          @click="set_CheckBillAll(1, ids)">审核(批量)</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
          @click="set_CheckBillAll(2, ids)">返审核(批量)</el-button>
      </el-col>
      </el-col> -->
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
      </el-col> -->
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -19,7 +19,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="日期" prop="HDate">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-ddT">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd">
                </el-date-picker>
              </el-form-item>
            </el-col>
@@ -35,7 +35,7 @@
          <el-row>
            <el-col :span="6">
              <el-form-item label="往来类型" prop="HSupTypeID">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型" @change="form.HSupName='',form.HSupId=0">
                  <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
                  </el-option>
                </el-select>
@@ -693,7 +693,7 @@
      //新增获取单据号
      this.getHBillNo()
      let date = new Date()
      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
      this.form.HDate = moment(date).format('YYYY-MM-DD')
      if (this.OperationType == 1) {
        this.handleAddSysZb()
      }
@@ -733,7 +733,7 @@
          if (this.copyType == 1) {
            this.getHBillNo()
            let date = new Date()
            this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
            this.form.HDate = moment(date).format('YYYY-MM-DD')
          } else {
            this.form = {
                  "HBillNo": data.单据号
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -19,7 +19,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="日期" prop="HDate">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-ddT">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd">
                </el-date-picker>
              </el-form-item>
            </el-col>
@@ -35,7 +35,7 @@
          <el-row>
            <el-col :span="6">
              <el-form-item label="往来类型" prop="HSupTypeID">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型" @change="form.HSupName='',form.HSupId=0">
                  <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
                  </el-option>
                </el-select>
@@ -721,7 +721,7 @@
      //新增获取单据号
      this.getHBillNo()
      let date = new Date()
      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
      this.form.HDate = moment(date).format('YYYY-MM-DD')
      if (this.OperationType == 1) {
        this.handleAddSysZb()
      }
@@ -758,7 +758,7 @@
          if (this.copyType == 1) {
            this.getHBillNo()
            let date = new Date()
            this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
            this.form.HDate = moment(date).format('YYYY-MM-DD')
          } else {
            this.form = {
                  "HBillNo": data.单据号
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -19,7 +19,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="日期" prop="HDate">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-ddT">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd">
                </el-date-picker>
              </el-form-item>
            </el-col>
@@ -35,7 +35,7 @@
          <el-row>
            <el-col :span="6">
              <el-form-item label="往来类型" prop="HSupTypeID">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型" @change="form.HSupName='',form.HSupId=0">
                  <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
                  </el-option>
                </el-select>
@@ -224,12 +224,12 @@
            </el-table-column>
            <el-table-column align="center" label="规格型号" width="120">
              <template slot-scope="scope">
                <span>{{ scope.row.HMaterSpec }}</span>
                <span>{{ scope.row.HMaterModel }}</span>
              </template>
            </el-table-column>
            <el-table-column align="center" label="计量单位代码" width="120">
              <template slot-scope="scope">
                <span>{{ scope.row.HUnitCode }}</span>
                <span>{{ scope.row.HUnitNumber }}</span>
              </template>
            </el-table-column>
            <el-table-column align="center" label="计量单位" width="120">
@@ -261,7 +261,7 @@
            </el-table-column>
            <el-table-column align="center" label="仓位代码" width="120">
              <template slot-scope="scope">
                <el-input v-model="scope.row.HSPCode" placeholder="请输入" @keyup.native.f7="openDataDialog(9, scope.row)"
                <el-input v-model="scope.row.HSPNumber" placeholder="请输入" @keyup.native.f7="openDataDialog(9, scope.row)"
                  @dblclick.native="openDataDialog(9, scope.row)" />
              </template>
            </el-table-column>
@@ -573,12 +573,19 @@
      this.form.HSupTypeID = data.HSupTypeID
      this.form.HSupID = data.HSupID
      this.form.HSupName = data.HSupName
      this.form.HEmpID = data.HEmpID
      this.form.HEmpName = data.HEmpName
      this.form.HManagerID = data.HManagerID
      this.form.HManagerName = data.HManagerName
      this.form.HKeeperID = data.HKeeperID
      this.form.HKeeperName = data.HKeeperName
      this.form.HSecManagerId = data.HSecManagerID
      this.form.HSecManagerName = data.HSecManagerName
      this.form.HDeptID = data.HDeptID
      this.form.HDeptName = data.HDeptName
      this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
      this.ifOrganizationEdit = true
      console.log(dataArray)
      //子表  赋值
      var rowdata = [];
      for (let i = 0; i < dataArray.length; i++) {
@@ -741,7 +748,7 @@
            this.openData = false
          } else if (num == 9){
            this.editData[this.zbIndex].HSPID = deptRow.HMainID
            this.editData[this.zbIndex].HSPCode = deptRow.仓位代码
            this.editData[this.zbIndex].HSPNumber = deptRow.仓位代码
            this.editData[this.zbIndex].HSPName = deptRow.仓位名称
            this.gyStockPlaceShow = false
            this.openData = false
@@ -858,7 +865,7 @@
      //新增获取单据号
      this.getHBillNo()
      let date = new Date()
      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
      this.form.HDate = moment(date).format('YYYY-MM-DD')
      if (this.OperationType == 1) {
        this.handleAddSysZb()
      }
@@ -888,7 +895,7 @@
      //新增获取单据号
      this.getHBillNo()
      let date = new Date()
      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
      this.form.HDate = moment(date).format('YYYY-MM-DD')
      //设置源单类型
      this.form.HSourceBillType = this.HSouceBillType
@@ -928,7 +935,7 @@
          if (this.copyType == 1) {
            this.getHBillNo()
            let date = new Date()
            this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
            this.form.HDate = moment(date).format('YYYY-MM-DD')
          } else {
            if (data[0].HSourceInterID != "0") {
              this.ifOrganizationEdit = true
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -19,7 +19,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="日期" prop="HDate">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-ddT">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd">
                </el-date-picker>
              </el-form-item>
            </el-col>
@@ -35,7 +35,7 @@
          <el-row>
            <el-col :span="6">
              <el-form-item label="往来类型" prop="HSupTypeID">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型" @change="form.HSupName='',form.HSupId=0">
                  <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
                  </el-option>
                </el-select>
@@ -622,6 +622,14 @@
      this.form.HSupTypeID = data.HSupTypeID
      this.form.HSupID = data.HSupID
      this.form.HSupName = data.HSupName
      this.form.HEmpID = data.HEmpID
      this.form.HEmpName = data.HEmpName
      this.form.HManagerID = data.HManagerID
      this.form.HManagerName = data.HManagerName
      this.form.HKeeperID = data.HKeeperID
      this.form.HKeeperName = data.HKeeperName
      this.form.HSecManagerId = data.HSecManagerID
      this.form.HSecManagerName = data.HSecManagerName
      this.form.HDeptID = data.HDeptID
      this.form.HDeptName = data.HDeptName
      this.form.HStockOrgID = data.HStockOutOrgID
@@ -930,7 +938,7 @@
      //新增获取单据号
      this.getHBillNo()
      let date = new Date()
      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
      this.form.HDate = moment(date).format('YYYY-MM-DD')
      if (this.OperationType == 1) {
        this.handleAddSysZb()
      }
@@ -960,7 +968,7 @@
      //新增获取单据号
      this.getHBillNo()
      let date = new Date()
      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
      this.form.HDate = moment(date).format('YYYY-MM-DD')
      //设置源单类型
      this.form.HSourceBillType = this.HSouceBillType
@@ -1000,7 +1008,7 @@
          if (this.copyType == 1) {
            this.getHBillNo()
            let date = new Date()
            this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
            this.form.HDate = moment(date).format('YYYY-MM-DD')
          } else {
            if (data[0].HSourceInterID != "0") {
              this.ifOrganizationEdit = true
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -19,7 +19,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="日期" prop="HDate">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-ddT">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd">
                </el-date-picker>
              </el-form-item>
            </el-col>
@@ -35,7 +35,7 @@
          <el-row>
            <el-col :span="6">
              <el-form-item label="往来类型" prop="HSupTypeID">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型">
                <el-select v-model="form.HSupTypeID" placeholder="请选择往来类型" @change="form.HSupName='',form.HSupId=0">
                  <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
                  </el-option>
                </el-select>
@@ -224,12 +224,12 @@
            </el-table-column>
            <el-table-column align="center" label="规格型号" width="120">
              <template slot-scope="scope">
                <span>{{ scope.row.HMaterSpec }}</span>
                <span>{{ scope.row.HMaterModel }}</span>
              </template>
            </el-table-column>
            <el-table-column align="center" label="计量单位代码" width="120">
              <template slot-scope="scope">
                <span>{{ scope.row.HUnitCode }}</span>
                <span>{{ scope.row.HUnitNumber }}</span>
              </template>
            </el-table-column>
            <el-table-column align="center" label="计量单位" width="120">
@@ -261,7 +261,7 @@
            </el-table-column>
            <el-table-column align="center" label="仓位代码" width="120">
              <template slot-scope="scope">
                <el-input v-model="scope.row.HSPCode" placeholder="请输入" @keyup.native.f7="openDataDialog(9, scope.row)"
                <el-input v-model="scope.row.HSPNumber" placeholder="请输入" @keyup.native.f7="openDataDialog(9, scope.row)"
                  @dblclick.native="openDataDialog(9, scope.row)" />
              </template>
            </el-table-column>
@@ -573,6 +573,12 @@
      this.form.HSupTypeID = data.HSupTypeID
      this.form.HSupID = data.HSupID
      this.form.HSupName = data.HSupName
      this.form.HEmpID = data.HEmpID
      this.form.HEmpName = data.HEmpName
      this.form.HManagerID = data.HManagerID
      this.form.HManagerName = data.HManagerName
      this.form.HKeeperID = data.HKeeperID
      this.form.HKeeperName = data.HKeeperName
      this.form.HSecManagerId = data.HSecManagerID
      this.form.HSecManagerName = data.HSecManagerName
      this.form.HDeptID = data.HDeptID
@@ -741,7 +747,7 @@
            this.openData = false
          } else if (num == 9){
            this.editData[this.zbIndex].HSPID = deptRow.HMainID
            this.editData[this.zbIndex].HSPCode = deptRow.仓位代码
            this.editData[this.zbIndex].HSPNumber = deptRow.仓位代码
            this.editData[this.zbIndex].HSPName = deptRow.仓位名称
            this.gyStockPlaceShow = false
            this.openData = false
@@ -857,7 +863,7 @@
      //新增获取单据号
      this.getHBillNo()
      let date = new Date()
      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
      this.form.HDate = moment(date).format('YYYY-MM-DD')
      if (this.OperationType == 1) {
        this.handleAddSysZb()
      }
@@ -887,7 +893,7 @@
      //新增获取单据号
      this.getHBillNo()
      let date = new Date()
      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
      this.form.HDate = moment(date).format('YYYY-MM-DD')
      //设置源单类型
      this.form.HSourceBillType = this.HSouceBillType
@@ -927,7 +933,7 @@
          if (this.copyType == 1) {
            this.getHBillNo()
            let date = new Date()
            this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
            this.form.HDate = moment(date).format('YYYY-MM-DD')
          } else {
            if (data[0].HSourceInterID != "0") {
              this.ifOrganizationEdit = true