imcs-bt-be/imcs-business-biz/src/main/resources/mapper_business/base/goods/GoodsMapper.xml

@@ -10,7 +10,6 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="update_user" jdbcType="BIGINT" property="updateUser"/>
         <result column="goods_cate_id" jdbcType="BIGINT" property="goodsCateId"/>
-        <result column="goods_cate_name" jdbcType="BIGINT" property="goodsCateName"/>
         <result column="goods_name" jdbcType="VARCHAR" property="goodsName"/>
         <result column="goods_shop_id" jdbcType="BIGINT" property="goodsShopId"/>
         <result column="goods_status" jdbcType="VARCHAR" property="goodsStatus"/>
@@ -36,8 +35,8 @@
     <sql id="Base_Column_List">
         id
         ,create_time,create_user,update_time,update_user,
-        goods_cate_id, goods_cate_name,goods_name, goods_shop_id, goods_status, goods_brand_id, goods_pic, goods_price,goods_weight,
-        goods_tag,goods_unit,goods_sale_type,goods_code,goods_vr_view,goods_rel_view,goods_vr_sales,goods_rel_sales,goods_detail_pic
+        goods_cate_id, goodsCateName,goods_name, goods_shop_id, goods_status, goods_brand_id, goods_pic, goods_price,goods_weight,
+        goods_tag,goods_unit,goods_sale_type,goods_code,goods_vr_view,goods_rel_view,goodsVrSales,goods_rel_sales,goods_detail_pic
     </sql>
 
     <sql id="EquGoods_Column_List">

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/material/material/components/Edit.vue

@@ -170,7 +170,8 @@ export default {
               } else {
                 if(vm.material.mtName===value){
                   console.log("tttt==="+vm.material.mtName)
-                  callback("原料名称未修改")
+                  //老姚修改，和孙总确认过 即使不修改名称也可以保存
+                  //callback("原料名称未修改")
                 }else{
                   materialApi.check(value)
                     .then((response) => {

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/place/Index.vue

@@ -138,8 +138,8 @@
                        prop="plcInoutdoor"
                        width="">
         <template slot-scope="scope">
-          {{ scope.row.plcStatus === '0' ? $t("place.outdoor") : '' }}
-          {{ scope.row.plcStatus === '1' ? $t("place.indoor") : '' }}
+          {{ scope.row.plcInoutdoor === '0' ? $t("place.outdoor") : '' }}
+          {{ scope.row.plcInoutdoor === '1' ? $t("place.indoor") : '' }}
         </template>
       </el-table-column>
       <el-table-column :label="$t('place.plcComid')" :show-overflow-tooltip="true" align="center" prop="plcComid"