入库流程以及表单页面调整

src/views/modules/materialManagement/wareHouse/WareHouseUpdateForm.vue

@@ -79,88 +79,91 @@
         </el-col>
       </el-row>
 
-      <el-divider content-position="left"><i class="el-icon-document"></i>
-        <el-link v-if="this.commonJS.isNotEmpty(this.inputForm.purchaseNo)" :underline="false" @click="viewContract(inputForm.purchaseNo)">采购详情</el-link>
-        <span v-else>采购详情</span>
-      </el-divider>
-      <el-row  :gutter="15" >
-        <vxe-table
-          border
-          show-footer
-          show-overflow
-          :footer-method="footerMethod"
-          ref="detailTable"
-          class="vxe-table-element"
-          :data="inputForm.detailInfos"
-          style="margin-left: 5em"
-          @cell-click=""
-          @edit-closed=""
-          highlight-current-row
-          :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
-        >
-          <vxe-table-column field="purchaserAgent" title="采购人" :edit-render="{}" :rules="[{required: true, message:'请选择采购人', trigger:'blur'}]">
-            <template v-slot:edit="scope">
-              <el-input :disabled='true' v-model="scope.row.purchaserAgent"></el-input>
-              <!--                <el-input v-model="scope.row.purchaser" @focus="userPullListForm(scope.$rowIndex)"></el-input>-->
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="procurementOffice" title="采购部门" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input :disabled='true' v-model="scope.row.procurementOffice" ></el-input>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="procurementType" title="采购类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
-            <template v-slot:edit="scope">
-              <el-input :disabled='true' v-model="scope.row.procurementType"></el-input>
-              <!--                <el-input v-model="scope.row.procurementType" @focus="typePullForm(scope.$rowIndex)"></el-input>-->
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="tradeName" width="250" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
-            <template v-slot:edit="scope">
-              <el-input :disabled='true' v-model="scope.row.tradeName"></el-input>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
-            <template v-slot:edit="scope">
-              <!--              <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @keyup.native="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>-->
-              <el-input :disabled='true' @change="changeValue" maxlength="15" v-model="scope.row.tradePrice"></el-input>
-              <!--                <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>-->
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="tradeNumber" title="商品数量" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <!--              <el-input @change="changeValue" v-model="scope.row.tradeNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>-->
-              <el-input :disabled='true' @change="changeValue" v-model="scope.row.tradeNumber" maxlength="10"></el-input>
-              <!--                <el-input @change="changeValue" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>-->
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="priceSum" title="商品总价" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input :disabled='true' v-model="scope.row.priceSum" maxlength="15"></el-input>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
-            <template v-slot:edit="scope">
-              <el-input :disabled='true' v-model="scope.row.company"></el-input>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="remarks" title="备注" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input :disabled='true' v-model="scope.row.remarks" ></el-input>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column title="操作" width="180">
-            <template v-slot="scope">
-              <el-button size="mini" type="primary" :disabled="false" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
-            </template>
-          </vxe-table-column>
-        </vxe-table>
-      </el-row>
+      <div v-if="commonJS.isNotEmpty(this.inputForm.purchaseNo)">
+        <el-divider content-position="left"><i class="el-icon-document"></i>
+          <el-link v-if="this.commonJS.isNotEmpty(this.inputForm.purchaseNo)" :underline="false" @click="viewContract(inputForm.purchaseNo)">采购详情</el-link>
+          <span v-else>采购详情</span>
+        </el-divider>
+        <el-row  :gutter="15" >
+          <vxe-table
+            border
+            show-footer
+            show-overflow
+            :footer-method="footerMethod"
+            ref="detailTable"
+            class="vxe-table-element"
+            :data="inputForm.detailInfos"
+            style="margin-left: 5em"
+            @cell-click=""
+            @edit-closed=""
+            highlight-current-row
+            :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
+          >
+            <vxe-table-column field="purchaserAgent" title="采购人" :edit-render="{}" :rules="[{required: true, message:'请选择采购人', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <el-input :disabled='true' v-model="scope.row.purchaserAgent"></el-input>
+                <!--                <el-input v-model="scope.row.purchaser" @focus="userPullListForm(scope.$rowIndex)"></el-input>-->
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="procurementOffice" title="采购部门" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input :disabled='true' v-model="scope.row.procurementOffice" ></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="procurementType" title="采购类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <el-input :disabled='true' v-model="scope.row.procurementType"></el-input>
+                <!--                <el-input v-model="scope.row.procurementType" @focus="typePullForm(scope.$rowIndex)"></el-input>-->
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="tradeName" width="250" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <el-input :disabled='true' v-model="scope.row.tradeName"></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <!--              <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @keyup.native="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>-->
+                <el-input :disabled='true' @change="changeValue" maxlength="15" v-model="scope.row.tradePrice"></el-input>
+                <!--                <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>-->
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="tradeNumber" title="商品数量" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <!--              <el-input @change="changeValue" v-model="scope.row.tradeNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>-->
+                <el-input :disabled='true' @change="changeValue" v-model="scope.row.tradeNumber" maxlength="10"></el-input>
+                <!--                <el-input @change="changeValue" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>-->
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="priceSum" title="商品总价" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input :disabled='true' v-model="scope.row.priceSum" maxlength="15"></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
+              <template v-slot:edit="scope">
+                <el-input :disabled='true' v-model="scope.row.company"></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="remarks" title="备注" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input :disabled='true' v-model="scope.row.remarks" ></el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column title="操作" width="180">
+              <template v-slot="scope">
+                <el-button size="mini" type="primary" :disabled="false" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
+              </template>
+            </vxe-table-column>
+          </vxe-table>
+        </el-row>
+      </div>
+
       <el-divider content-position="left"><i class="el-icon-document"></i>
         入库详情
-        <el-button style="margin-left: 20px" type="primary" @click="insertEvent('detail')" plain>
-          新增
-        </el-button>
+<!--        <el-button style="margin-left: 20px" type="primary" @click="insertEvent('detail')" plain>-->
+<!--          新增-->
+<!--        </el-button>-->
       </el-divider>
       <el-row  :gutter="15" >
         <vxe-table
@@ -625,20 +628,12 @@
               this.inputForm.files = []
             }
             this.inputForm.files = this.$refs.uploadComponent.getDataList()
-            console.log('this.inputForm.procInsId', this.inputForm.procInsId)
-            this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then(({data}) => {
-              if (this.commonJS.isNotEmpty(data)) {
-                console.log('进来了', data)
-                if (data === '公司领导审批') {
-                  this.inputForm.status = '5'
-                }
-              }
-              this.wareHouseService.save(this.inputForm).then(({data}) => {
-                callback(data.businessTable, data.businessId, this.inputForm)
-                this.loading = false
-              }).catch(() => {
-                this.loading = false
-              })
+            this.inputForm.status = '5'
+            this.wareHouseService.save(this.inputForm).then(({data}) => {
+              callback(data.businessTable, data.businessId, this.inputForm)
+              this.loading = false
+            }).catch(() => {
+              this.loading = false
             })
           } else {
             this.loading = false