Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

src/views/invoicing/components/addConsTakin.vue

@@ -21,7 +21,7 @@
         <el-input v-model="form.remark" placeholder="请输入备注" style="width: 180px;"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button @click="dialogVisible = false; form.remark = ''">取 消</el-button>
         <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
       </el-form-item>
     </el-form>
@@ -123,7 +123,7 @@ export default {
             let res = await tbConCheck({
               conInfoId: this.form.conInfoId,
               lpNum: this.profitNumber,
-              remark:this.form.remark
+              remark: this.form.remark
             });
             this.detail.num = this.form.lpNum;
             this.form.lpNum = 0;
@@ -136,6 +136,7 @@ export default {
               message: `添加成功`,
               type: "success"
             });
+            this.form.remark = ''
             this.getTableData();
           } catch (error) {
             this.loading = false;

src/views/invoicing/consumable/cons_record.vue

@@ -158,7 +158,7 @@ export default {
         });
         this.clickseetableData.loading = false;
         this.clickseetableData.data = res.content.map(v=>{
-          const productIds=v.productId.split(',')
+          const productIds=v.productId?v.productId.split(','):[]
           return{
             ...v,
             product:productIds.map((str,index)=>{

src/views/product/add_shop.vue

@@ -16,7 +16,7 @@
       <el-form-item label="商品名称" prop="name">
         <el-input v-model="form.name" placeholder="请输入商品名称" style="width: 500px;"></el-input>
       </el-form-item>
-      <el-form-item label="单位">
+      <el-form-item label="单位" prop="unitId">
         <el-select v-model="form.unitId" placeholder="请选择单位" style="width: 500px;" @change="selectUnitt">
           <el-option :label="item.name" :value="item.id" v-for="item in units" :key="item.id"></el-option>
         </el-select>
@@ -448,6 +448,11 @@ export default {
             message: "请输入商品名称"
           }
         ],
+        unitId: [{
+          required: true,
+          trigger: "change",
+          message: "请选择单位"
+        }],
         categoryId: [
           {
             required: true,

src/views/shop/shop_configuration.vue

@@ -5,7 +5,7 @@
             <el-tab-pane label="基础配置" name="2"></el-tab-pane>
             <!-- <el-tab-pane label="通知配置" name="3"></el-tab-pane> -->
             <el-tab-pane label="安全设置" name="4"></el-tab-pane>
-            <!-- <el-tab-pane label="扩展参数" name="5"></el-tab-pane> -->
+            <el-tab-pane label="扩展参数" name="5"></el-tab-pane>
             
         </el-tabs>
         <shopInfo v-if="activeName == 1" />