Merge remote-tracking branch 'origin/dev' into dev

src/views/storehouse/inStockManage/inStockPlan/detailsPage.vue

@@ -50,7 +50,7 @@
                             url="/blade-sales-part/tire/center/warehouse/storage/list?current=1&size=5"
                             :filterable="true" :remote="true" dataName="cname"
                             @selectChange="dicChange('storageName', $event)"
-                            :disabled="editButton || form.status == 1"></dic-select>
+                            :disabled="editButton || form.status == 1||form.planItemsList.length>0"></dic-select>
                     </tempalte>
                     <tempalte slot="warehouseKeeperName">
                         <dic-select v-model="form.warehouseKeeperName" placeholder="库管" key="id" label="realName"
@@ -828,10 +828,11 @@ export default {
             row.subTotalMoney = _.multiply(Number(row.price ? row.price : 0), Number(row.goodsNum ? row.goodsNum : 0)).toFixed(2)
         },
         addRow() {
-            if (!this.form.id) {
-                return this.$message.error('请保存数据')
-            }
+            // if (!this.form.id) {
+            //     return this.$message.error('请保存数据')
+            // }
             this.form.centerShipCostList.push({
+                goodsNum:this.form.goodsTotalNum,
                 $cellEdit: true
             })
         },

src/views/storehouse/outStockManage/configuration/commodityxsho.json

@@ -22,6 +22,12 @@
   "searchIcon": true,
   "searchIndex": 2,
   "column": [
+      {
+          "label": "入库单号",
+          "prop": "planNo",
+          "minWidth": 80,
+          "overHidden": true
+      },
     {
       "label": "商品名称",
       "prop": "cname",

src/views/storehouse/outStockManage/outStockPlan/detailsPage.vue

@@ -16,7 +16,7 @@
                 <el-button class="el-button--small-yh" v-if="form.id && form.status == 0" style="margin-left: 6px;"
                     type="success" size="small" @click="editCustomer(1)" :disabled="form.status == 1">提 交
                 </el-button>
-                <el-dropdown v-if="form.status == 1">
+                <!-- <el-dropdown v-if="form.status == 1">
                     <el-button style="margin-left: 6px;" type="success" size="small">
                         审 核<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
@@ -24,7 +24,7 @@
                         <el-dropdown-item @click.native="auditPlan(2)">通过</el-dropdown-item>
                         <el-dropdown-item @click.native="approve()">驳回</el-dropdown-item>
                     </el-dropdown-menu>
-                </el-dropdown>
+                </el-dropdown> -->
             </div>
         </div>
         <div style="margin-top: 50px">
@@ -34,7 +34,7 @@
                         <!-- 联系人 -->
                         <el-select v-model="form.contacts" placeholder="请选择" size="small" style="width:60%" clearable
                             filterable allow-create default-first-option @change="contactsChange($event)"
-                            :disabled="editButton || form.status == 2">
+                            :disabled="editButton || form.status == 1">
                             <el-option v-for="item in contactsOption" :key="item.cname" :label="item.cname"
                                 :value="item.contacts" />
                         </el-select>
@@ -43,20 +43,20 @@
                         <dic-select v-model="form.customerName" placeholder="货主" key="id" label="cname" res="records"
                             url="/blade-sales-part/corpsDesc/list?current=1&size=20&&enableOrNot=1" :filterable="true"
                             :remote="true" dataName="cname" @selectChange="dicChange('customerName', $event)"
-                            :disabled="editButton || form.status == 2"></dic-select>
+                            :disabled="editButton || form.status == 1"></dic-select>
                     </tempalte>
                     <tempalte slot="storageName">
                         <dic-select v-model="form.storageName" placeholder="货主" key="id" label="cname" res="records"
                             url="/blade-sales-part/tire/center/warehouse/storage/list?current=1&size=5"
                             :filterable="true" :remote="true" dataName="cname"
                             @selectChange="dicChange('storageName', $event)"
-                            :disabled="editButton || form.status == 2"></dic-select>
+                            :disabled="editButton || form.status == 1||form.planItemsList.length>0"></dic-select>
                     </tempalte>
                     <tempalte slot="warehouseKeeperName">
                         <dic-select v-model="form.warehouseKeeperName" placeholder="库管" key="id" label="realName"
                             res="records" url="/blade-user/page?current=1&size=5&userType=2" :filterable="true"
                             :remote="true" dataName="realName" @selectChange="dicChange('warehouseKeeperName', $event)"
-                            :disabled="editButton || form.status == 2"></dic-select>
+                            :disabled="editButton || form.status == 1"></dic-select>
                     </tempalte>
                 </avue-form>
             </trade-card>
@@ -69,15 +69,15 @@
                             @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.6)"
                             @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.6)">
                             <template slot-scope="{scope,row}" slot="menuLeft">
-                                <el-button type="primary" icon="el-icon-plus" size="small" :disabled="form.status == 2"
+                                <el-button type="primary" icon="el-icon-plus" size="small" :disabled="form.status == 1"
                                     @click="rowAdd(row, 1)">添加商品</el-button>
-                                <el-button type="success" size="small" :disabled="form.status == 2"
+                                <el-button type="success" size="small" :disabled="form.status == 1"
                                     icon="el-icon-bottom" @click="excelDialogfun('code')">按Code导入
                                 </el-button>
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
                                 <!-- <el-button type="danger" plain size="small" @click="batchDelete"
-                                    :disabled="form.status == 2">一键删除</el-button> -->
+                                    :disabled="form.status == 1">一键删除</el-button> -->
                                 <!-- <el-popover width="600" trigger="click">
                                     <avue-crud :data="inventoryData" :option="inventoryOption"></avue-crud>
                                     <el-button type="primary" plain size="small" slot="reference" @click="viewInventory"
@@ -98,11 +98,11 @@
                                     style="width: 100%" @change="moneyChange(row)"></el-input-number>
                                 <span v-else>{{ row.goodsNum }}</span>
                             </template>
-                            <template slot="price" slot-scope="{ row }">
+                            <!-- <template slot="price" slot-scope="{ row }">
                                 <el-input v-if="row.$cellEdit" size="small" v-model="row.price" style="width: 100%"
                                     @change="moneyChange(row)"></el-input>
                                 <span v-else>{{ row.price }}</span>
-                            </template>
+                            </template> -->
                             <template slot="remarks" slot-scope="{ row }">
                                 <el-input v-if="!mingxibaocun" size="small" v-model="row.remarks"
                                     style="width: 100%"></el-input>
@@ -695,7 +695,7 @@ export default {
                 column: [
                     {
                         label: '入库单号',
-                        prop: 'planId',
+                        prop: 'billNo',
                         width: 100,
                         overHidden: true,
                     },
@@ -733,12 +733,12 @@ export default {
                             trigger: "blur"
                         }]
                     },
-                    {
-                        label: '价格',
-                        prop: 'price',
-                        overHidden: true,
-                        width: 100
-                    },
+                    // {
+                    //     label: '价格',
+                    //     prop: 'price',
+                    //     overHidden: true,
+                    //     width: 100
+                    // },
                     {
                         label: '库存',
                         prop: 'inventory',
@@ -925,7 +925,7 @@ export default {
     },
     methods: {
         inEdit() {
-            if (this.form.status != 2) {
+            if (this.form.status != 1) {
                 this.editButton = false
                 this.$set(this.optionForm, 'disabled', false)
                 this.$set(this.optionContactsBack, 'disabled', false)
@@ -938,17 +938,17 @@ export default {
             row.subTotalMoney = _.multiply(Number(row.price ? row.price : 0), Number(row.goodsNum ? row.goodsNum : 0)).toFixed(2)
         },
         addRowD() {
-            if (!this.form.id) {
-                return this.$message.error('请保存数据')
-            }
+            // if (!this.form.id) {
+            //     return this.$message.error('请保存数据')
+            // }
             this.form.centerShipCostList.push({
                 $cellEdit: true
             })
         },
         addRowC() {
-            if (!this.form.id) {
-                return this.$message.error('请保存数据')
-            }
+            // if (!this.form.id) {
+            //     return this.$message.error('请保存数据')
+            // }
             this.form.centerShipPaymentCostList.push({
                 $cellEdit: true
             })
@@ -1149,7 +1149,9 @@ export default {
                 }
                 page.goodsId = item.goodsId
                 let obj = {
-                    goodsId: item.id,
+                    billId: item.planId,
+                    billNo: item.planNo,
+                    goodsId: item.goodsId,
                     price: item.price,
                     goodsName: item.cname,
                     goodsNum: item.goodsNum,
@@ -1314,7 +1316,7 @@ export default {
                 this.$nextTick(() => {
                     this.$refs.formContacts.doLayout()
                 })
-                if (res.data.data.status == 2) {
+                if (res.data.data.status == 1) {
                     this.$set(this.optionForm, 'disabled', true)
                     this.$set(this.optionContactsBack, 'disabled', true)
                     this.editButton = true