Merge branches 'ecp' and 'ecp' of http://git.echepei.com/gubersail/gubersail-platform-ui into ecp

src/api/goodsManage/index.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 /**
  * 商品管理分页查询
  * @param {number} current - 当前页码
- * @param {number} size - 每页大小     
+ * @param {number} size - 每页大小
  * @param {any} params
  */
 export const getList = (current, size, params) => {
@@ -53,9 +53,9 @@ export const detail = (params) => {
  */
 export const remove = (data) => {
     return request({
-        url: '/api/gubersail-admin/stockDesc/remove',
+        url: '/api/gubersail-admin/stockDesc/delGoodsDesc',
         method: 'post',
-        params: data
+        data: data
     })
 }
 /**

src/views/fc/customer/index.vue

@@ -363,11 +363,6 @@ export default {
             search: true
           },
           {
-            label: "商城价格",
-            prop: "priceSystem",
-            overHidden: true
-          },
-          {
             label: "客户分类",
             prop: "corpsTypeName",
             overHidden: true

src/views/goodsManage/detailsPage.vue

@@ -30,7 +30,7 @@
           >撤销
         </el-button>
         <el-button v-if="form.id" class="el-button--small-yh" style="margin-left: 6px;" size="small" @click="disabledStock"
-          >{{ form.upAndDownShelves == 1 ? "启用" : "禁用" }}
+          >{{ Number(form.upAndDownShelves) === 0 ? '启用' : '禁用' }}
         </el-button>
       </div>
     </div>
@@ -70,6 +70,9 @@
               dataName="cname"
             ></dic-select>
           </tempalte>
+            <tempalte slot="inventoryAmount">
+                <el-input v-model="inventoryAmountSum" placeholder="库存金额" disabled/>
+            </tempalte>
           <tempalte slot="storageName">
             <dic-select
               v-model="form.storageName"
@@ -117,38 +120,87 @@ export default {
           {
             label: "商品名称",
             prop: "cname",
-            span: 6
+            span: 6,
+              rules: [
+                  {
+                      required: true,
+                      message: "",
+                      trigger: "blur"
+                  }
+              ]
           },
           {
             label: "商品编码",
             prop: "code",
-            span: 6
+            span: 6,
+              rules: [
+                  {
+                      required: true,
+                      message: "",
+                      trigger: "blur"
+                  }
+              ]
           },
           {
             label: "分类",
             prop: "goodsTypeName",
-            span: 6
+            span: 6,
+              rules: [
+                  {
+                      required: true,
+                      message: "",
+                      trigger: "blur"
+                  }
+              ]
           },
           {
             label: "品牌",
             prop: "brandName",
-            span: 6
+            span: 6,
+              rules: [
+                  {
+                      required: true,
+                      message: "",
+                      trigger: "blur"
+                  }
+              ]
           },
           {
             label: "批次",
             prop: "dot",
-            span: 6
+            span: 6,
+              rules: [
+                  {
+                      required: true,
+                      message: "",
+                      trigger: "blur"
+                  }
+              ]
           },
           {
             label: "花纹",
             prop: "brandItem",
-            span: 6
+            span: 6,
+              rules: [
+                  {
+                      required: true,
+                      message: "",
+                      trigger: "blur"
+                  }
+              ]
           },
           {
             label: "规格型号",
-            prop: "typeno",
+            prop: "typeNo",
             span: 6,
-            row: true
+            row: true,
+              rules: [
+                  {
+                      required: true,
+                      message: "",
+                      trigger: "blur"
+                  }
+              ]
           },
           {
             label: "售价1",
@@ -173,16 +225,36 @@ export default {
           {
             label: "仓库",
             prop: "storageName",
-            span: 6
+            span: 6,
+              rules: [
+                  {
+                      required: true,
+                      message: "",
+                      trigger: "blur"
+                  }
+              ]
           },
           {
             label: "库存数量",
             prop: "balanceQuantity",
-            span: 6
+            span: 6,
+              type: "number",
+              min: 1,
+              max: 99999,
+              rules: [
+                  {
+                      required: true,
+                      message: "",
+                      trigger: "blur"
+                  }
+              ]
           },
           {
             label: "库存单价",
             prop: "inventoryCostPrice",
+              type: "number",
+              min: 0,
+              max: 99999,
             span: 6
           },
           {
@@ -241,6 +313,11 @@ export default {
   props: {
     detailData: Object
   },
+    computed:{
+        inventoryAmountSum(){
+            return Number(this.form.balanceQuantity) * Number(this.form.inventoryCostPrice)
+        }
+    },
   created() {
     if (this.detailData && this.detailData.id) {
       this.editBtn = true;
@@ -308,10 +385,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          let obj = {
-            ...this.form
-          };
-          revokeApproval(obj).then(res => {
+          revokeApproval({id: this.form.id, version: this.form.version}).then(res => {
             this.$message.success("操作成功");
             this.getDetail(this.form.id);
           });

src/views/goodsManage/index.vue

@@ -33,13 +33,17 @@
             </template>
             <template slot="menu" slot-scope="{ row, index }">
               <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
-              <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)" :disabled="row.auditStatus > 0">删除</el-button>
+              <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)" :disabled="row.upAndDownShelves == 1">删除</el-button>
             </template>
             <template slot="contractNo" slot-scope="{ row }">
               <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">
                 {{ row.contractNo }}
               </span>
             </template>
+
+              <template slot="upAndDownShelves" slot-scope="{ row }">
+              <span>{{Number(row.upAndDownShelves) === 0 ? '禁用' : '启用'}}</span>
+              </template>
           </avue-crud>
         </el-col>
       </el-row>
@@ -190,6 +194,12 @@ export default {
             dicUrl: "/api/gubersail-admin/storageDesc/list?current=1&size=5",
             width: 100
           },
+            {
+                label: "是否启用",
+                prop: "upAndDownShelves",
+                overHidden: true,
+                width: 80
+            },
           {
             label: "库存数量",
             prop: "balanceQuantity",
@@ -289,9 +299,9 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        remove({ ids: row.id }).then(res => {
+        remove([row.id]).then(res => {
           this.onLoad(this.page, this.query);
-          this.$message.success("成功删除");
+          this.$message.success("删除成功");
         });
       });
     },