仓库修改

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -1488,11 +1488,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>
@@ -1881,11 +1883,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -1001,11 +1001,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>
@@ -1402,11 +1404,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -967,6 +967,7 @@
                   remote
                   @change="changeGoods"
                   placeholder="请选择状态"
+                  disabled
                 >
                   <el-option
                     label="计划"
@@ -1007,6 +1008,7 @@
                   value-format="timestamp"
                   placeholder="入库日期"
                   format="yyyy-MM-dd"
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 >
                 </el-date-picker>
               </template>
@@ -1033,6 +1035,7 @@
                   remote
                   @change="changeGoods"
                   placeholder="请选择品名"
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 >
                   <el-option
                     v-for="(dict, index) in goodsOptions"
@@ -1055,6 +1058,7 @@
                   v-model="scope.row.fBusinessType"
                   filterable
                   size="small"
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                   placeholder="请选择商品属性"
                 >
                   <el-option
@@ -1078,6 +1082,7 @@
                   v-model="scope.row.fMarks"
                   placeholder="请填写属性描述"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1102,6 +1107,7 @@
                   v-model="scope.row.fWarehouselocid"
                   filterable
                   size="small"
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                   placeholder="请选择库区"
                 >
                   <el-option
@@ -1126,6 +1132,7 @@
                   placeholder="请选择箱型"
                   style="width: 100%"
                   v-model="scope.row.fCntrtype"
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 >
                   <el-option
                     v-for="(item, index) in cntrList"
@@ -1149,6 +1156,7 @@
                   v-model="scope.row.fCntqty"
                   placeholder="箱量"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1166,6 +1174,7 @@
                   v-model="scope.row.fPlanqty"
                   placeholder="计划件数"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1183,6 +1192,7 @@
                   v-model="scope.row.fPlangrossweight"
                   placeholder="计划毛重(kg)"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1200,6 +1210,7 @@
                   v-model="scope.row.fPlannetweight"
                   placeholder="计划净重"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1216,6 +1227,7 @@
                   v-model="scope.row.fQty"
                   placeholder="入库件数"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1232,6 +1244,7 @@
                   v-model="scope.row.fGrossweight"
                   placeholder="入库毛重(kg)"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1248,6 +1261,7 @@
                   v-model="scope.row.fNetweight"
                   placeholder="入库净重"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1263,6 +1277,7 @@
                   v-model="scope.row.fPackagespecs"
                   placeholder="包装规格"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1278,6 +1293,7 @@
                   v-model="scope.row.fTruckno"
                   placeholder="*车号"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1293,6 +1309,7 @@
                   v-model="scope.row.fDriverName"
                   placeholder="司机名"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1309,6 +1326,7 @@
                   v-model="scope.row.fDriverTel"
                   placeholder="司机电话"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1324,6 +1342,7 @@
                   v-model="scope.row.fDriverIdCar"
                   placeholder="司机身份证"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1339,6 +1358,7 @@
                   v-model="scope.row.fSerialNumber"
                   placeholder="流水号"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1355,6 +1375,7 @@
                   v-model="scope.row.fCntrno"
                   placeholder="箱号"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1371,6 +1392,7 @@
                   v-model="scope.row.fGoodsval"
                   placeholder="货值"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 >
                   <template slot="append">万</template>
                 </el-input>
@@ -1388,6 +1410,7 @@
                   v-model="scope.row.fLntype"
                   placeholder="装卸方式"
                   style="width: 100%"
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 >
                   <el-option
                     v-for="(item, index) in unloadModes"
@@ -1410,6 +1433,7 @@
                   v-model="scope.row.fForkliftman"
                   placeholder="叉车工"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1425,6 +1449,7 @@
                   v-model="scope.row.fStevedore"
                   placeholder="装卸工"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1440,6 +1465,7 @@
                   v-model="scope.row.fLocalcntrno"
                   placeholder="库内箱号"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1455,6 +1481,7 @@
                   v-model="scope.row.fSealno"
                   placeholder="封号"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
@@ -1471,55 +1498,10 @@
                   v-model="scope.row.remark"
                   placeholder="备注"
                   show-word-limit
+                  :disabled="form.warehouseStatus > 3 || browseStatus"
                 />
               </template>
             </el-table-column>
-<!--            <el-table-column-->
-<!--                v-for="(item, index) in getRowList"-->
-<!--                :key="index"-->
-<!--                :label="item.name"-->
-<!--                :width="item.width"-->
-<!--                :prop="item.label"-->
-<!--                align="center"-->
-<!--                :fixed="item.fixed"-->
-<!--                :show-overflow-tooltip="true"-->
-<!--                sortable-->
-<!--            >-->
-<!--              <template slot-scope="scope">-->
-<!--                <span v-if="item.label == 'fBillstatus'">-->
-<!--                  {{ scope.row.fBillstatus | fBillstatusFormat }}-->
-<!--                </span>-->
-<!--                <span v-else-if="item.label == 'fBsdate'">-->
-<!--                  {{ scope.row.fBsdate | fBsdateFormat }}-->
-<!--                </span>-->
-<!--                <span v-else-if="item.label == 'fGoodsid'">-->
-<!--                  {{ scope.row.fGoodsid | goodsFormat(goodsOptions) }}-->
-<!--                </span>-->
-<!--                <span v-else-if="item.label == 'fBusinessType'">-->
-<!--                  {{-->
-<!--                    scope.row.fBusinessType-->
-<!--                        | fStorageTypeFormat(fStorageTypeOptions)-->
-<!--                  }}-->
-<!--                </span>-->
-<!--                <span v-else-if="item.label == 'fCntrtype'">-->
-<!--                  {{ scope.row.fCntrtype | fCntrtypeFormat(cntrList) }}-->
-<!--                </span>-->
-<!--                <span v-else-if="item.label == 'fLntype'">-->
-<!--                  {{ scope.row.fLntype | fLntypeFormat(unloadModes) }}-->
-<!--                </span>-->
-<!--                <span v-else-if="item.label == 'fFleet'">-->
-<!--                  {{ scope.row.fFleet | fFleetFormat(fleetOptions) }}-->
-<!--                </span>-->
-<!--                <span v-else-if="item.label == 'fLocalcntrno'">-->
-<!--                  <el-input-->
-<!--                      v-model="scope.row.fLocalcntrno"-->
-<!--                      placeholder="库内箱号"-->
-<!--                      v-Alphabet-->
-<!--                  />-->
-<!--                </span>-->
-<!--                <span v-else>{{ scope.row[item.label] }}</span>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
             <el-table-column
                 header-align="center"
                 align="center"
@@ -1538,6 +1520,7 @@
                     type="text"
                     @click.native.prevent="wDeleteRow(scope.$index, detailList1)"
                     size="small"
+                    :disabled="browseStatus"
                 >移除</el-button>
               </template>
             </el-table-column>
@@ -1731,7 +1714,7 @@
                   <el-date-picker
                       v-model="scope.row.fBsdate"
                       style="width: 138px"
-                      :disabled="browseStatus || scope.row.fBillstatus >= 20"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                       type="date"
                       value-format="timestamp"
                       placeholder="业务日期"
@@ -1749,6 +1732,7 @@
                     remote
                     @change="changeGoods"
                     placeholder="请选择品名"
+                    :disabled="browseStatus || form.warehouseStatus > 3"
                   >
                   <el-option
                     v-for="(dict, index) in goodsOptions"
@@ -1763,6 +1747,7 @@
                       v-model="scope.row.fBusinessType"
                       filterable
                       placeholder="请选择商品属性"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                   >
                     <el-option
                         v-for="(item, index) in fStorageTypeOptions"
@@ -1777,6 +1762,7 @@
                     v-model="scope.row.fMarks"
                     placeholder="请填写属性描述"
                     show-word-limit
+                    :disabled="browseStatus || form.warehouseStatus > 3"
                   />
                 </span>
                 <span v-else-if="item.label =='fWarehouselocid'">
@@ -1785,6 +1771,7 @@
                     filterable
                     size="small"
                     placeholder="请选择库区"
+                    :disabled="browseStatus || form.warehouseStatus > 3"
                   >
                     <el-option
                       v-for="(dict, index) in fWarehouseidOptions"
@@ -1798,32 +1785,35 @@
                   <el-input
                     v-model="scope.row.fPlanqty"
                     placeholder="结余库存"
+                    :disabled="browseStatus || form.warehouseStatus > 3"
                   ></el-input>
                 </span>
                 <span v-else-if="item.label =='fPlangrossweight'">
                   <el-input
                     v-model="scope.row.fPlangrossweight"
                     placeholder="结余毛重(kg)"
+                    :disabled="browseStatus || form.warehouseStatus > 3"
                   ></el-input>
                 </span>
                 <span v-else-if="item.label =='fPlannetweight'">
                   <el-input
                     v-model="scope.row.fPlannetweight"
                     placeholder="结余净重(kg)"
+                    :disabled="browseStatus || form.warehouseStatus > 3"
                   ></el-input>
                 </span>
                 <span v-else-if="item.label =='fNowCarton'">
                   <el-input
                       v-model="scope.row.fNowCarton"
-                      :disabled="browseStatus || scope.row.fBillstatus == 40"
                       placeholder="现箱号"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                   />
                 </span>
                 <span v-else-if="item.label =='fCartypeId'">
                   <el-select
                       style="width: 80%"
                       v-model="scope.row.fCartypeId"
-                      :disabled="browseStatus || scope.row.fBillstatus == 40"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                   >
                     <el-option
                         v-for="(dict, index) in cartypeId"
@@ -1837,13 +1827,13 @@
                   <el-input
                       @change="qtyChange(scope.row)"
                       v-model="scope.row.fQty"
-                      :disabled="browseStatus || scope.row.fBillstatus == 40"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                       placeholder="出库件数"
                   />
                 </span>
                 <span v-else-if="item.label == 'fGrossweight'">
                   <el-input
-                      :disabled="browseStatus || scope.row.fBillstatus == 40"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                       v-model="scope.row.fGrossweight"
                       @change="changeOutStock(scope.row)"
                       placeholder="出库毛重"
@@ -1852,7 +1842,7 @@
                 <span v-else-if="item.label == 'fNetweight'">
                   <el-input
                       v-model="scope.row.fNetweight"
-                      :disabled="browseStatus || scope.row.fBillstatus == 40"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                       @change="changeOutStock(scope.row)"
                       placeholder="出库净重"
                   />
@@ -1860,7 +1850,7 @@
                 <span v-else-if="item.label == 'fPackagespecs'">
                   <el-input
                       v-model="scope.row.fPackagespecs"
-                      :disabled="browseStatus || scope.row.fBillstatus >= 20"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                       placeholder="包装规格"
                   />
                 </span>
@@ -1869,6 +1859,7 @@
                     placeholder="请选择箱型"
                     style="width: 100%"
                     v-model="scope.row.fCntrtype"
+                    :disabled="browseStatus || form.warehouseStatus > 3"
                   >
                   <el-option
                     v-for="(item, index) in cntrList"
@@ -1884,55 +1875,56 @@
                       oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                       v-model="scope.row.fCntqty"
                       placeholder="箱量"
-                      :disabled="browseStatus || scope.row.fBillstatus >= 20"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                   />
                 </span>
                 <span v-else-if="item.label == 'fCntrno'">
                   <el-input
                     v-model="scope.row.fCntrno"
                     placeholder="箱号"
+                    :disabled="browseStatus || form.warehouseStatus > 3"
                   />
                 </span>
                 <span v-else-if="item.label == 'fGoodsval'">
                   <el-input
                       v-model="scope.row.fGoodsval"
                       placeholder="货值"
-                      :disabled="browseStatus || scope.row.fBillstatus >= 20"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                   />
                 </span>
                 <span v-else-if="item.label == 'fTruckno'">
                   <el-input
                       v-model="scope.row.fTruckno"
                       placeholder="车号"
-                      :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                   />
                 </span>
                 <span v-else-if="item.label == 'fDriverName'">
                   <el-input
                       v-model="scope.row.fDriverName"
                       placeholder="司机名"
-                      :disabled="browseStatus || scope.row.fBillstatus >= 20"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                   />
                 </span>
                 <span v-else-if="item.label == 'fDriverTel'">
                   <el-input
                       v-model="scope.row.fDriverTel"
                       placeholder="司机电话"
-                      :disabled="browseStatus || scope.row.fBillstatus >= 20"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                   />
                 </span>
                 <span v-else-if="item.label == 'fDriverIdCar'">
                   <el-input
                       v-model="scope.row.fDriverIdCar"
                       placeholder="司机身份证"
-                      :disabled="browseStatus || scope.row.fBillstatus >= 20"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                   />
                 </span>
                 <span v-else-if="item.label == 'fIsPass'">
                   <el-select
                       v-model="scope.row.fIsPass"
                       placeholder="是否放行"
-                      :disabled="browseStatus || scope.row.fBillstatus == 40"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                       style="width: 80%"
                   >
                     <el-option
@@ -1947,7 +1939,7 @@
                   <el-select
                       v-model="scope.row.fFleet"
                       placeholder="车队"
-                      :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                       style="width: 80%"
                   >
                     <el-option
@@ -1962,7 +1954,7 @@
                   <el-select
                       v-model="scope.row.fLntype"
                       placeholder="装卸方式"
-                      :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                       style="width: 80%"
                   >
                     <el-option
@@ -1977,14 +1969,14 @@
                   <el-input
                       v-model="scope.row.fForkliftman"
                       placeholder="叉车工"
-                      :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                   />
                 </span>
                 <span v-else-if="item.label == 'fLocalcntrno'">
                   <el-input
                       v-model="scope.row.fLocalcntrno"
                       placeholder="库内箱号"
-                      :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                       v-Alphabet
                   />
                 </span>
@@ -1992,20 +1984,21 @@
                   <el-input
                       v-model="scope.row.fSealno"
                       placeholder="封号"
-                      :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                   />
                 </span>
                 <span v-else-if="item.label =='fSerialNumber'">
                   <el-input
                     v-model="scope.row.fSerialNumber"
                     placeholder="流水号"
+                    :disabled="browseStatus || form.warehouseStatus > 3"
                   ></el-input>
                 </span>
                 <span v-else-if="item.label == 'remark'">
                   <el-input
                       v-model="scope.row.remark"
                       placeholder="备注"
-                      :disabled="browseStatus"
+                      :disabled="browseStatus || form.warehouseStatus > 3"
                       show-word-limit
                   />
                 </span>
@@ -2095,6 +2088,7 @@
                 size="small"
                 :disabled="browseStatus"
                 type="warning"
+                v-if="false"
             >计算仓储费
             </el-button>
             <el-button
@@ -2133,7 +2127,7 @@
                   filterable
                   clearable
                   placeholder="客户名称"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
               >
                 <el-option
                     v-for="(item, index) in fMblnoOptions"
@@ -2157,7 +2151,7 @@
                   clearable
                   filterable
                   placeholder="费用名称"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
               >
                 <el-option
                     v-for="(item, index) in fDNameOptions"
@@ -2203,7 +2197,7 @@
                   v-model="scope.row.fFeeUnitid"
                   placeholder="请选择计价单位"
                   clearable
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   @change="changeFeeUnit(scope.row)"
               >
                 <el-option
@@ -2227,7 +2221,7 @@
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   v-model="scope.row.fUnitprice"
                   placeholder="数量"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   @change="changeContractAmt(scope.row)"
                   show-word-limit
               />
@@ -2245,7 +2239,7 @@
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   v-model="scope.row.fQty"
                   placeholder="单价"
-                  :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   @change="changeContractAmt(scope.row)"
                   show-word-limit
               />
@@ -2260,7 +2254,7 @@
           >
             <template slot-scope="scope">
               <el-input
-                  :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   v-model="scope.row.fAmount"
                   placeholder="金额"
@@ -2279,7 +2273,7 @@
               <el-select
                   v-model="scope.row.fStltypeid"
                   placeholder="请选择结算表票结、月结"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
               >
                 <el-option
                     v-for="(item, index) in fStltypeOptions"
@@ -2300,7 +2294,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fCurrency"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   placeholder="币别"
                   show-word-limit
               />
@@ -2316,7 +2310,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fExrate"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   placeholder="汇率"
                   show-word-limit
               />
@@ -2332,7 +2326,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fTaxrate"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   placeholder="税率"
                   show-word-limit
               />
@@ -2348,7 +2342,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fMblno"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   placeholder="提单号"
                   show-word-limit
               />
@@ -2364,7 +2358,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fProductName"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   placeholder="品名"
                   show-word-limit
               />
@@ -2380,7 +2374,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fMarks"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   placeholder="品牌"
                   show-word-limit
               />
@@ -2421,7 +2415,7 @@
               label="业务单号"
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fMblno" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入业务单号"></el-input>
+              <el-input v-model="scope.row.fMblno" :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3" placeholder="请输入业务单号"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -2432,7 +2426,7 @@
               label="唛头"
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fMarks" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入唛头"></el-input>
+              <el-input v-model="scope.row.fMarks" :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3" placeholder="请输入唛头"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -2445,7 +2439,7 @@
             <template slot-scope="scope">
               <el-date-picker
                   style="width: 100%;"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   v-model="scope.row.fBsdate"
                   type="date"
                   placeholder="选择日期">
@@ -2463,7 +2457,7 @@
               <el-select
                   v-model="scope.row.fBillingway"
                   placeholder="请选择计费单位"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   clearable
               >
                 <el-option
@@ -2483,7 +2477,7 @@
               label="计费数量"
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fBillingQty" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入计费数量"></el-input>
+              <el-input v-model="scope.row.fBillingQty" :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3" placeholder="请输入计费数量"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -2496,7 +2490,7 @@
             <template slot-scope="scope">
               <el-date-picker
                   style="width: 100%;"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   v-model="scope.row.fChargedate"
                   type="date"
                   placeholder="选择日期">
@@ -2513,7 +2507,7 @@
             <template slot-scope="scope">
               <el-date-picker
                   style="width: 100%;"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   v-model="scope.row.fBillingDeadline"
                   type="date"
                   placeholder="选择日期">
@@ -2528,7 +2522,7 @@
               label="计费天数"
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fBillingDays" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入计费天数"></el-input>
+              <el-input v-model="scope.row.fBillingDays" :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3" placeholder="请输入计费天数"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -2539,7 +2533,7 @@
               label="库存天数"
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fInventoryDays" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入库存天数"></el-input>
+              <el-input v-model="scope.row.fInventoryDays" :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3" placeholder="请输入库存天数"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -2550,7 +2544,7 @@
               label="计费金额"
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fAmt" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入计费金额"
+              <el-input v-model="scope.row.fAmt" :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3" placeholder="请输入计费金额"
                         @change="calculationFAmt(scope.row)"></el-input>
             </template>
           </el-table-column>
@@ -2564,7 +2558,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.remark"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   placeholder="备注"
                   show-word-limit
               />
@@ -2581,7 +2575,7 @@
               <el-button
                   @click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
                   size="small"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
               >移除
               </el-button
               >
@@ -2589,11 +2583,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>
@@ -2619,7 +2615,7 @@
           <div>
             <el-button
                 type="primary"
-                :disabled="browseStatus"
+                :disabled="browseStatus || form.warehouseStatus > 3"
                 @click.prevent="addpayment()"
                 size="small"
             >新行
@@ -2628,7 +2624,7 @@
                 type="primary"
                 size="small"
                 @click="saveForm"
-                :disabled="browseStatus"
+                :disabled="browseStatus || form.warehouseStatus > 3"
             >保 存
             </el-button
             >
@@ -2642,7 +2638,7 @@
             <el-button
               type="primary"
               size="small"
-              v-if="browseStatus"
+              v-if="browseStatus || form.warehouseStatus > 3"
               @click="feeChange('D')"
             >
               费用变更
@@ -2679,7 +2675,7 @@
                   filterable
                   clearable
                   placeholder="客户名称"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
               >
                 <el-option
                     v-for="(item, index) in fMblnoOptions"
@@ -2703,7 +2699,7 @@
                   clearable
                   filterable
                   placeholder="费用名称"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
               >
                 <el-option
                     v-for="(item, index) in fCNameOptions"
@@ -2750,7 +2746,7 @@
                   v-model="scope.row.fFeeUnitid"
                   placeholder="请选择计价单位"
                   clearable
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   @change="changeFeeUnit(scope.row)"
               >
                 <el-option
@@ -2773,7 +2769,7 @@
               <el-input
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
                   v-model="scope.row.fQty"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   @change="changeContractAmt(scope.row)"
                   placeholder="数量"
                   show-word-limit
@@ -2791,7 +2787,7 @@
               <el-input
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   v-model="scope.row.fUnitprice"
-                  :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   @change="changeContractAmt(scope.row)"
                   placeholder="单价"
                   show-word-limit
@@ -2826,7 +2822,7 @@
               <el-select
                   v-model="scope.row.fStltypeid"
                   placeholder="请选择结算表票结、月结"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
               >
                 <el-option
                     v-for="(item, index) in fStltypeOptions"
@@ -2848,7 +2844,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fCurrency"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   placeholder="币别"
                   show-word-limit
               />
@@ -2864,7 +2860,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fExrate"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   placeholder="汇率"
                   show-word-limit
               />
@@ -2880,7 +2876,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fTaxrate"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   placeholder="税率"
                   show-word-limit
               />
@@ -2897,7 +2893,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fMblno"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   placeholder="提单号"
                   show-word-limit
               />
@@ -2913,7 +2909,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fProductName"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   placeholder="品名"
                   show-word-limit
               />
@@ -2930,7 +2926,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fMarks"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   placeholder="品牌"
                   show-word-limit
               />
@@ -2959,7 +2955,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.remark"
-                  :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
                   placeholder="备注"
                   show-word-limit
               />
@@ -2977,7 +2973,7 @@
               <el-button
                   @click.native.prevent="deleteRow(scope.$index, warehouseCrList)"
                   size="small"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || form.warehouseStatus > 3 || scope.row.fBillstatus == 6"
               >移除
               </el-button
               >
@@ -2985,11 +2981,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>

src/views/Warehousing/inAndOutStock/index.vue

@@ -466,6 +466,11 @@
               size="mini"
               type="text"
               icon="el-icon-delete"
+              v-if="
+                scope.row.fBillstatus == '录入' ||
+                scope.row.fBillstatus == '暂存' ||
+                scope.row.fBillstatus == '驳回'
+              "
               @click="handleDelete(scope.row)"
               v-hasPermi="['warehouseBusiness:outStock:remove']"
               >删除

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -215,6 +215,7 @@
                 :disabled="detailList.findIndex(function(item){return item.fWarehouseInformation}) == -1?false:true"
                 style="width: 80%"
                 placeholder="请选择"
+                @change="warehouseChange"
             >
               <el-option
                   v-for="(item, index) in warehouseOptions"
@@ -1331,6 +1332,13 @@
                       v-Alphabet
                   />
                 </span>
+                <span v-else-if="item.label == 'fSerialNumber'">
+                  <el-input
+                    v-model="scope.row.fSerialNumber"
+                    placeholder="流水号"
+                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                  />
+                </span>
                 <span v-else>{{ scope.row[item.label] }}</span>
               </template>
             </el-table-column>
@@ -1856,7 +1864,7 @@
             <div>
             </div>
             <div>
-              <div>流水号：{{ form.fBillno }}</div>
+              <div>办单号：{{ form.fBillno }}</div>
               <div>办单日期：{{ nowTime }}</div>
             </div>
           </div>
@@ -6261,6 +6269,7 @@ import upLoad from "../components/upLoad";
 import incomeMoney from "../components/incomeMoney";
 import payMoney from "../components/payMoney";
 import uploadExcel from "./uploadExcel";
+import { getDept } from "@/api/basicdata/dept";
 
 export default {
   name: "inStock",
@@ -9264,6 +9273,13 @@ export default {
         query: { data: data},
       });
     },
+    // 获取仓库信息
+    warehouseChange() {
+      getDept(this.form.fWarehouseid).then(res => {
+        this.$set(this.form, 'fContacts', res.data.fContacts)
+        this.$set(this.form, 'fTel', res.data.fTel)
+      })
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -1749,11 +1749,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>
@@ -2151,11 +2153,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>
@@ -6500,7 +6504,9 @@ export default {
         await addJoblist(formData).then((response) => {
           if (response.code == 200) {
             this.Printinglist.forEach((item, index) => {
-              item.fSerialNumber = response.data.warehousebillsitems[index].fSerialNumber
+              if (!item.fSerialNumber) {
+                this.$set(item, 'fSerialNumber', response.data.warehousebillsitems[index].fSerialNumber)
+              }
             })
             for (let item in this.detailList) {
               this.zcList[item] = this.detailList[item]

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -198,6 +198,7 @@
               :disabled="browseStatus || detailList.length > 0"
               style="width: 80%"
               placeholder="请选择"
+              @change="warehouseChange"
             >
               <el-option
                 v-for="(item, index) in warehouseOptions"
@@ -1046,6 +1047,13 @@
                     :disabled="browseStatus || scope.row.fBillstatus >= 40"
                   />
                 </span>
+                <span v-else-if="item.label == 'fSerialNumber'">
+                  <el-input
+                    v-model="scope.row.fSerialNumber"
+                    placeholder="流水号"
+                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                  />
+                </span>
                 <span v-else-if="item.label == 'remark'">
                   <el-input
                     v-model="scope.row.remark"
@@ -1813,11 +1821,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>
@@ -2214,11 +2224,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>
@@ -3269,6 +3281,8 @@ import Cookies from "js-cookie";
 import { addSet, select, resetModule } from "@/api/system/set";
 import upLoad from "../components/upLoad";
 import draggable from "vuedraggable";
+import { getDept } from "@/api/basicdata/dept";
+
 export default {
   name: "inStock",
   props: {
@@ -5999,6 +6013,12 @@ export default {
         this.$message.error("请选择需要打印的明细!");
       }
     },
+    warehouseChange() {
+      getDept(this.form.fWarehouseid).then(res => {
+        this.$set(this.form, 'fContacts', res.data.fContacts)
+        this.$set(this.form, 'fTel', res.data.fTel)
+      })
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变