修改bug

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -248,77 +248,77 @@
           </el-row>
         </el-col>
       </el-row>
-                <el-row>
-            <el-col :span="8">
-              <el-form-item label="是否质押" prop="isPledge">
-                <el-select v-model="form.isPledge" placeholder="请选择是否质押" clearable
-                  :disabled="browseStatus || form.warehouseStatus > 3" style="width: 80%" @change="feeUnitChange">
-                  <el-option v-for="(item, index) in isPledgeOptions" :key="index.dictValue" :label="item.dictLabel"
-                    :value="item.dictValue" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="备注" prop="remark">
-                <el-input style="width: 80%" v-model="form.remark" type="textarea"
-                  :disabled="browseStatus || form.warehouseStatus > 3" placeholder="请输入内容" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="收费指示" prop="remark">
-                <el-input style="width: 80%" v-model="form.fRemarksFees" type="textarea"
-                  :disabled="browseStatus || form.warehouseStatus > 3" placeholder="请输入内容" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item>
-                <div style="display: flex; align-items: center">
-                  <el-table :data="CntrTable" style="width: 80%" :header-cell-style="{ lineHeight: '16px' }">
-                    <el-table-column prop="fCntrid " label="箱型" header-align="center" align="center">
-                      <template slot-scope="scope">
-                        <el-select placeholder="请选择箱型" v-model="scope.row.fCntrid" size="mini">
-                          <el-option v-for="(item, index) in cntrList" :key="index.fId" :label="item.fName"
-                            :value="item.fId">
-                          </el-option>
-                        </el-select>
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="fCntrcount" label="箱量" header-align="center" align="center">
-                      <template slot-scope="scope">
-                        <el-input placeholder="请输入箱量" v-model="scope.row.fCntrcount" size="mini">
-                        </el-input>
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="fCntrcount" label="操作" header-align="center" align="center" width="50">
-                      <template slot-scope="scope">
-                        <el-button size="mini" type="text" @click.native.prevent="deleteRow(scope.$index, CntrTable)"
-                          icon="el-icon-delete"></el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                  <el-tag class="tag-hover" @click="addRow"><i class="el-icon-plus"></i></el-tag>
-                </div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :offset="16" :span="6">
-              <el-button v-if="dataShowcar == '0'" @click="
-                detailsHidden2
-                  ? (detailsHidden2 = false)
-                  : (detailsHidden2 = true)
-              ">{{ detailsHidden2 ? '隐藏' : '更多' }}
-              </el-button>
-              <el-button @click="
-                detailsHidden
-                  ? (detailsHidden = false)
-                  : (detailsHidden = true)
-              ">{{ detailsHidden ? '隐藏' : '展开' }}
-              </el-button>
-            </el-col>
-          </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="是否质押" prop="isPledge">
+            <el-select v-model="form.isPledge" placeholder="请选择是否质押" clearable
+              :disabled="browseStatus || form.warehouseStatus > 3" style="width: 80%" @change="feeUnitChange">
+              <el-option v-for="(item, index) in isPledgeOptions" :key="index.dictValue" :label="item.dictLabel"
+                :value="item.dictValue" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="备注" prop="remark">
+            <el-input style="width: 80%" v-model="form.remark" type="textarea"
+              :disabled="browseStatus || form.warehouseStatus > 3" placeholder="请输入内容" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="收费指示" prop="remark">
+            <el-input style="width: 80%" v-model="form.fRemarksFees" type="textarea"
+              :disabled="browseStatus || form.warehouseStatus > 3" placeholder="请输入内容" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item>
+            <div style="display: flex; align-items: center">
+              <el-table :data="CntrTable" style="width: 80%" :header-cell-style="{ lineHeight: '16px' }">
+                <el-table-column prop="fCntrid " label="箱型" header-align="center" align="center">
+                  <template slot-scope="scope">
+                    <el-select placeholder="请选择箱型" v-model="scope.row.fCntrid" size="mini">
+                      <el-option v-for="(item, index) in cntrList" :key="index.fId" :label="item.fName"
+                        :value="item.fId">
+                      </el-option>
+                    </el-select>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fCntrcount" label="箱量" header-align="center" align="center">
+                  <template slot-scope="scope">
+                    <el-input placeholder="请输入箱量" v-model="scope.row.fCntrcount" size="mini">
+                    </el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="fCntrcount" label="操作" header-align="center" align="center" width="50">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="text" @click.native.prevent="deleteRow(scope.$index, CntrTable)"
+                      icon="el-icon-delete"></el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-tag class="tag-hover" @click="addRow"><i class="el-icon-plus"></i></el-tag>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :offset="16" :span="6">
+          <el-button v-if="dataShowcar == '0'" @click="
+            detailsHidden2
+              ? (detailsHidden2 = false)
+              : (detailsHidden2 = true)
+          ">{{ detailsHidden2 ? '隐藏' : '更多' }}
+          </el-button>
+          <el-button @click="
+            detailsHidden
+              ? (detailsHidden = false)
+              : (detailsHidden = true)
+          ">{{ detailsHidden ? '隐藏' : '展开' }}
+          </el-button>
+        </el-col>
+      </el-row>
       <div v-if="detailsHidden">
         <el-row style="margin-top: 30px">
           <el-col :span="8">
@@ -2293,7 +2293,7 @@ addprint('rkd');
         <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
         <section ref="print">
           <p><span class="no-print">打印日期:</span><span style="padding-left: 100px">{{ new
-              Date().toLocaleDateString().replace(/\//g, '-')
+          Date().toLocaleDateString().replace(/\//g, '-')
           }}</span></p>
           <table class="table" valign="center">
             <tr>
@@ -2893,9 +2893,9 @@ print_lwqr = false;
               <td>{{ item.fTruckno }}</td>
               <td>{{ item.fSealno }}</td>
               <td>{{
-                  item.fWarehouseInformation ?
-                    item.fWarehouseInformation.substring((item.fWarehouseInformation.lastIndexOf('/')) + 1,
-                      item.fWarehouseInformation.length) : ''
+              item.fWarehouseInformation ?
+              item.fWarehouseInformation.substring((item.fWarehouseInformation.lastIndexOf('/')) + 1,
+              item.fWarehouseInformation.length) : ''
               }}
               </td>
               <td>{{ item.fQty }}</td>
@@ -4805,7 +4805,8 @@ export default {
       elabelList: [],
       isPledgeOptions: [],
       eId: '',
-      eRow: {}
+      eRow: {},
+      outWarehouseItem: ''
     }
   },
   computed: {
@@ -4931,6 +4932,9 @@ export default {
     this.getDicts('unload_mode').then((response) => {
       this.unloadModes = response.data
     })
+    this.getConfigKey("out_warehouse_item").then((response) => {
+      this.outWarehouseItem = response.msg;
+    });
     this.company = Cookies.get('companyName')
     this.$set(this.form, 'fBstime', Date.parse(new Date()))
     this.queryUser()
@@ -7611,14 +7615,38 @@ export default {
                 this.allfQty += e.fQty
               }
               this.$set(e, 'balanceQty', Number(e.fPlanqty) - Number(e.fQty))
-              let data = {
-                id: this.form.fId,
-                actId: 120,
-                fidStatus: 'f_billstatus'
+              if (this.outWarehouseItem == 0) {
+                let data = {
+                  id: this.form.fId,
+                  actId: 180,
+                  fidStatus: 'f_itemstatus'
+                }
+                listCharge(data).then(res => {
+                  if (res.data.length > 2) {
+                    res.data.forEach((item,index) => {
+                      console.log(item)
+                      if (index==1&&item.auditStatus == "A") {
+                        this.firstReviewer = item.userName
+                      } else if (index==2&&item.auditStatus == "A") {
+                        this.secondReviewer = item.userName
+                      }
+                    })
+                  } else {
+                    this.firstReviewer = ''
+                    this.secondReviewer = ''
+                  }
+                })
+              } else {
+                let data = {
+                  id: this.form.fId,
+                  actId: 120,
+                  fidStatus: 'f_billstatus'
+                }
+                listCharge(data).then((data) => {
+                  console.log(data.data)
+                })
               }
-              listCharge(data).then((data) => {
-                console.log(data.data)
-              })
+
             })
             if (command == 'a') {
               this.print_shd = true