no message

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

@@ -57,12 +57,13 @@
     </resultMap>
 
 
-    <select id="selectGoodsPage"  resultMap="goodsAndSpe">
+    <select id="selectGoodsPage" resultMap="goodsAndSpe">
         select
         <include refid="Base_Column_List"/>, org_id
         from (
         select goods.*,
         goods.goods_shop_id as org_id,
+        cate.goods_cate_name as goodsCateName,
         SUM (spe.spec_vr_sales) AS goodsVrSales,
         count (btorder.id) AS goodsRelSales
         FROM bt_goods goods
@@ -126,9 +127,9 @@
     </resultMap>
 
     <select id="getGoodsFromEqu" resultMap="EquGoodsAndSpe">
-        select eg.id    ,
-               eg.equ_id   ,
-               eg.goods_id  ,
+        select eg.id,
+               eg.equ_id,
+               eg.goods_id,
                eg.ud_status udStatus
         from bt_equ_goods eg
                  left join imcs_tenant_productionresource p on p.id = eg.equ_id

imcs-bt-be/imcs-business-biz/src/main/resources/mapper_business/base/productionresource/ProductionresourceMapper.xml

@@ -105,6 +105,7 @@
                  left join bt_goods_cate gc on g.goods_cate_id = gc.id
                  left join bt_spe s on s.goods_id = g.id
         where eg.equ_id = #{equId}
+        Group by g.id
     </select>
 
 </mapper>

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/main.js

@@ -32,6 +32,10 @@ import { VueJsonp } from 'vue-jsonp'
 Vue.use(VueJsonp)
 // 全局混入
 import mixin from './mixin';
+
+
+
+
 // 全局混入
 Vue.use(mixin);
 
@@ -78,7 +82,7 @@ Object.keys(filters).forEach(key => {
 })
 
 // 注册打印
-Vue.use(Print) 
+Vue.use(Print)
 
 Vue.config.productionTip = false
 

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/login/index.vue

@@ -204,6 +204,7 @@
   import oauthApi from '@/api/Oauth'
   import {Base64} from 'js-base64';
 
+
   export default {
     name: "Login",
     components: {LangSelect},
@@ -486,6 +487,8 @@
       },
       handleLogin() {
         this.loginForm.tenant = `${Base64.encode(this.loginForm.tenantView)}`;
+        //新增MD5加密
+        // this.loginForm.signPassword = md5(this.loginForm.tenantView);
         this.$refs.loginForm.validate((valid) => {
           if (valid) {
             this.loginSubmit();
@@ -575,7 +578,7 @@
       top: 44%;
       margin-top: -100px;
       color: #fff;
-      
+
 			img{
 				width: 300px;
 				margin-right: 40px;

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/goods/goodsManage/formula.vue

@@ -30,143 +30,272 @@
       </el-form-item>
 
       <el-form-item :label="$t('bt.productConfig.productTime')" prop="pcTime">
-        <el-input v-model="productConfig.productTime" controls-position="right"></el-input>
+        <el-input v-model="productConfig.pcTime" controls-position="right"></el-input>
       </el-form-item>
 
 
       <!--      配方-->
       <!--      prop="formula" v-model="productConfig.formula"-->
-<!--      <el-form-item :label="$t('bt.productConfig.formula')">-->
-        <!--                      <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddFormula">配方设置</el-button>-->
-        <!--              <el-button type="success" icon="el-icon-delete" size="mini" @click="handleDeleteSpec">删除</el-button>-->
-        <!--              <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteAllDetails">清空</el-button>-->
-        <el-table
-          v-loading="loading"
-          border
-          :data="productConfig.formula"
-          :row-class-name="rowClassName"
-          @selection-change="handleSelectionChange"
-          ref="table"
-        >
-
-          <el-table-column label="原料名称" align="center" prop="formulaMtId">
-            <template slot="header">
-              <p>
-                <span style="color: red; font-size: 16px">*</span
-                >&nbsp;原料名称
-              </p>
-            </template>
-            <template slot-scope="scope">
-              <el-form-item
-                :prop="'formula'+scope.$index+'formulaMtId'"
+      <!--      <el-form-item :label="$t('bt.productConfig.formula')">-->
+      <!--                      <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddFormula">配方设置</el-button>-->
+      <!--              <el-button type="success" icon="el-icon-delete" size="mini" @click="handleDeleteSpec">删除</el-button>-->
+      <!--              <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteAllDetails">清空</el-button>-->
+      <!--        <el-table-->
+      <!--          v-loading="loading"-->
+      <!--          border-->
+      <!--          :data="productConfig.formula"-->
+      <!--          :row-class-name="rowClassName"-->
+      <!--          @selection-change="handleSelectionChange"-->
+      <!--          ref="table"-->
+      <!--        >-->
+
+      <!--          <el-table-column label="原料名称" align="center" prop="formulaMtId">-->
+      <!--            <template slot="header">-->
+      <!--              <p>-->
+      <!--                <span style="color: red; font-size: 16px">*</span-->
+      <!--                >&nbsp;原料名称-->
+      <!--              </p>-->
+      <!--            </template>-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <el-form-item-->
+      <!--                :prop="'formula'+scope.$index+'formulaMtId'"-->
+      <!--              >-->
+      <!--                <el-select-->
+      <!--                  v-model="scope.row.formulaMtId"-->
+      <!--                  filterable-->
+      <!--                  placeholder="请选择原料"-->
+      <!--                  @change="-->
+      <!--                    fillMaterial(val,scope.$index)-->
+      <!--                  "-->
+      <!--                >-->
+      <!--                  <el-option-->
+      <!--                    v-for="item in materialData"-->
+      <!--                    :key="item.id"-->
+      <!--                    :label="item.mtName"-->
+      <!--                    :value="item.id"-->
+      <!--                  >-->
+      <!--                  </el-option>-->
+      <!--                </el-select>-->
+      <!--              </el-form-item>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+
+      <!--          <el-table-column label="类型" align="center" width="60" :prop="'formula'+scope.$index+'formulaMtType'">-->
+      <!--            <template slot="header">-->
+      <!--              <p>-->
+      <!--                <span style="color: red; font-size: 16px">*</span-->
+      <!--                >&nbsp;类型-->
+      <!--              </p>-->
+      <!--            </template>-->
+
+      <!--            <template slot-scope="scope">-->
+      <!--              <el-form-item :prop="'formula'+scope.$index+'formulaMtType'"-->
+      <!--              >-->
+      <!--                <el-input v-model="scope.row.formulaMtType" disabled></el-input>-->
+      <!--              </el-form-item>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+
+      <!--          <el-table-column label="配量" align="center" :prop="'formula'+scope.$index+'formulaMtType'">-->
+      <!--            <template slot="header">-->
+      <!--              <p>-->
+      <!--                <span style="color: red; font-size: 16px">*</span-->
+      <!--                >&nbsp;配量-->
+      <!--              </p>-->
+      <!--            </template>-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <el-form-item prop="productConfig.formula[scope.$index].formulaMtQuantity">-->
+      <!--                <el-input-number v-model="productConfig.formula[scope.$index].formulaMtQuantity"></el-input-number>-->
+      <!--              </el-form-item>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+
+      <!--          <el-table-column label="单位" align="center" width="60" prop="formulaMtUnit">-->
+      <!--            <template slot="header">-->
+      <!--              <p>-->
+      <!--                <span style="color: red; font-size: 16px">*</span-->
+      <!--                >&nbsp;单位-->
+      <!--              </p>-->
+      <!--            </template>-->
+
+      <!--            <template slot-scope="scope">-->
+      <!--              <el-form-item :prop="'formula'+scope.$index+'formulaMtUnit'">-->
+      <!--                <el-input v-model="scope.row.formulaMtUnit" disabled></el-input>-->
+      <!--              </el-form-item>-->
+
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+
+      <!--          <el-table-column label="是否加热" align="center" width="150" prop="formulaIsHot">-->
+      <!--            <template slot="header">-->
+      <!--              <p>-->
+      <!--                <span style="color: red; font-size: 16px">*</span-->
+      <!--                >&nbsp;是否加热-->
+      <!--              </p>-->
+      <!--            </template>-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <el-form-item :prop="'formula'+scope.$index+'formulaIsHot'">-->
+      <!--                <el-radio v-model="scope.row.formulaIsHot" label="1">是</el-radio>-->
+      <!--                <el-radio v-model="scope.row.formulaIsHot" label="0">否</el-radio>-->
+      <!--              </el-form-item>-->
+
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+
+      <!--          <el-table-column label="权重" align="center" width="60" prop="formulaWeight">-->
+      <!--            <template slot="header">-->
+      <!--              <p>-->
+      <!--                <span style="color: red; font-size: 16px">*</span-->
+      <!--                >&nbsp;权重-->
+      <!--              </p>-->
+      <!--            </template>-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <el-form-item :prop="'formula'+scope.$index+'formulaWeight'">-->
+      <!--                <el-input v-model="scope.row.formulaWeight" type="number"></el-input>-->
+      <!--              </el-form-item>-->
+
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column label="操作" align="center">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <el-button icon="el-icon-plus" type="primary" circle-->
+      <!--                         @click.prevent="addFormula()"></el-button>-->
+
+      <!--              <el-button icon="el-icon-delete" type="danger" circle-->
+      <!--                         @click.prevent="delFormula(scope.$index)"></el-button>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--        </el-table>-->
+      <!--      </el-form-item>-->
+
+
+      <el-table
+        v-loading="loading"
+        border
+        :data="productConfig.formula"
+        :row-class-name="rowClassName"
+        @selection-change="handleSelectionChange"
+        ref="table"
+      >
+
+        <el-table-column label="原料名称" align="center">
+          <template slot="header">
+            <p>
+                      <span style="color: red; font-size: 16px">*</span
+                      >&nbsp;原料名称
+            </p>
+          </template>
+          <template slot-scope="scope">
+            <el-form-item
+              :prop="'formula.'+scope.$index+'.formulaMtId'" :rules="rules.formulaMtId"
+
+            >
+              <el-select
+                v-model="scope.row.formulaMtId"
+                filterable
+                placeholder="请选择原料"
+                @change="(val)=>{ fillMaterial(val,scope.$index)}"
               >
-                <el-select
-                  v-model="scope.row.formulaMtId"
-                  filterable
-                  placeholder="请选择原料"
-                  @change="
-                    fillMaterial(val,scope.$index)
-                  "
+                <el-option
+                  v-for="item in materialData"
+                  :key="item.id"
+                  :label="item.mtName"
+                  :value="item.id"
                 >
-                  <el-option
-                    v-for="item in materialData"
-                    :key="item.id"
-                    :label="item.mtName"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="类型" align="center" width="60" :prop="'formula'+scope.$index+'formulaMtType'">
-            <template slot="header">
-              <p>
-                <span style="color: red; font-size: 16px">*</span
-                >&nbsp;类型
-              </p>
-            </template>
-
-            <template slot-scope="scope">
-              <el-form-item :prop="'formula'+scope.$index+'formulaMtType'"
-              >
-                <el-input v-model="scope.row.formulaMtType" disabled></el-input>
-              </el-form-item>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="配量" align="center" :prop="'formula'+scope.$index+'formulaMtType'">
-            <template slot="header">
-              <p>
-                <span style="color: red; font-size: 16px">*</span
-                >&nbsp;配量
-              </p>
-            </template>
-            <template slot-scope="scope">
-              <el-form-item prop="productConfig.formula[scope.$index].formulaMtQuantity">
-                <el-input-number v-model="productConfig.formula[scope.$index].formulaMtQuantity"></el-input-number>
-              </el-form-item>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="单位" align="center" width="60" prop="formulaMtUnit">
-            <template slot="header">
-              <p>
-                <span style="color: red; font-size: 16px">*</span
-                >&nbsp;单位
-              </p>
-            </template>
-
-            <template slot-scope="scope">
-              <el-form-item :prop="'formula'+scope.$index+'formulaMtUnit'">
-                <el-input v-model="scope.row.formulaMtUnit" disabled></el-input>
-              </el-form-item>
-
-            </template>
-          </el-table-column>
-
-          <el-table-column label="是否加热" align="center" width="150" prop="formulaIsHot">
-            <template slot="header">
-              <p>
-                <span style="color: red; font-size: 16px">*</span
-                >&nbsp;是否加热
-              </p>
-            </template>
-            <template slot-scope="scope">
-              <el-form-item :prop="'formula'+scope.$index+'formulaIsHot'">
-                <el-radio v-model="scope.row.formulaIsHot" label="1">是</el-radio>
-                <el-radio v-model="scope.row.formulaIsHot" label="0">否</el-radio>
-              </el-form-item>
-
-            </template>
-          </el-table-column>
-
-          <el-table-column label="权重" align="center" width="60" prop="formulaWeight">
-            <template slot="header">
-              <p>
-                <span style="color: red; font-size: 16px">*</span
-                >&nbsp;权重
-              </p>
-            </template>
-            <template slot-scope="scope">
-              <el-form-item :prop="'formula'+scope.$index+'formulaWeight'">
-                <el-input v-model="scope.row.formulaWeight" type="number"></el-input>
-              </el-form-item>
-
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button icon="el-icon-plus" type="primary" circle
-                         @click.prevent="addFormula()"></el-button>
-
-              <el-button icon="el-icon-delete" type="danger" circle
-                         @click.prevent="delFormula(scope.$index)"></el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-<!--      </el-form-item>-->
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="类型" align="center">
+          <template slot="header">
+            <p>
+                      <span style="color: red; font-size: 16px">*</span
+                      >&nbsp;类型
+            </p>
+          </template>
+
+          <template slot-scope="scope">
+            <el-form-item :prop="'formula.'+scope.$index+'.formulaMtType'"
+            >
+              <el-input v-model="scope.row.formulaMtType" disabled></el-input>
+            </el-form-item>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="配量" align="center">
+          <template slot="header">
+            <p>
+                      <span style="color: red; font-size: 16px">*</span
+                      >&nbsp;配量
+            </p>
+          </template>
+          <template slot-scope="scope">
+            <el-form-item :prop="'formula.'+scope.$index+'.formulaMtQuantity'" :rules="rules.formulaMtQuantity">
+              <el-input-number v-model="scope.row.formulaMtQuantity"></el-input-number>
+            </el-form-item>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单位" align="center">
+          <template slot="header">
+            <p>
+                      <span style="color: red; font-size: 16px">*</span
+                      >&nbsp;单位
+            </p>
+          </template>
+
+          <template slot-scope="scope">
+            <el-form-item :prop="'formula.'+scope.$index+'.formulaMtUnit'">
+              <el-input v-model="scope.row.formulaMtUnit" disabled></el-input>
+            </el-form-item>
+
+          </template>
+        </el-table-column>
+
+        <el-table-column label="是否加热" align="center">
+          <template slot="header">
+            <p>
+                      <span style="color: red; font-size: 16px">*</span
+                      >&nbsp;是否加热
+            </p>
+          </template>
+          <template slot-scope="scope">
+            <el-form-item :prop="'formula.'+scope.$index+'.formulaIsHot'" :rules="rules.formulaIsHot">
+              <el-radio v-model="scope.row.formulaIsHot" label="1">是</el-radio>
+              <el-radio v-model="scope.row.formulaIsHot" label="0">否</el-radio>
+            </el-form-item>
+
+          </template>
+        </el-table-column>
+
+        <el-table-column label="权重" align="center">
+          <template slot="header">
+            <p>
+                      <span style="color: red; font-size: 16px">*</span
+                      >&nbsp;权重
+            </p>
+          </template>
+          <template slot-scope="scope">
+            <el-form-item :prop="'formula.'+scope.$index+'.formulaWeight'">
+              <el-input v-model="scope.row.formulaWeight" type="number"></el-input>
+            </el-form-item>
+
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button icon="el-icon-plus" type="primary" circle
+                       @click.prevent="addFormula()"></el-button>
+
+            <el-button icon="el-icon-delete" type="danger" circle
+                       @click.prevent="delFormula(scope.$index)"></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+
     </el-form>
     {{ this.productConfig }}
   </el-dialog>
@@ -236,25 +365,25 @@ export default {
           trigger: "blur"
         },
 
-        'formula.formulaMtId': {
+        formulaMtId: {
           required: true,
           message: this.$t("rules.require"),
           trigger: "blur"
         },
 
 
-        'formula.mtQuantity': {
+        formulaMtQuantity: {
           required: true,
           message: this.$t("rules.require"),
           trigger: "blur"
         },
-        'formula.formulaIsHot': {
+        formulaIsHot: {
           required: true,
           message: this.$t("rules.require"),
           trigger: "blur"
         },
 
-        'formula.formulaWeight': {
+        formulaWeight: {
           required: true,
           message: this.$t("rules.require"),
           trigger: "blur"
@@ -325,6 +454,7 @@ export default {
   methods: {
     fillMaterial(val, index) {
       console.log("待填充的material对象为" + JSON.stringify(val))
+      console.log("select的change方法，val="+val)
       for (const mt of this.materialData) {
         if (val == mt.id) {
           this.productConfig.formula[index].formulaMtId = mt.id;
@@ -355,7 +485,7 @@ export default {
 
     delFormula(index) {
       console.log("lalalalal")
-      if (this.productConfig.formula[index].id) {
+      if (this.productConfig.formula[index].id && index > 0) {
         //  删除配方
         ProductConfigApi.delFormula({"formulaId": this.productConfig.formula[index].id}).then(res => {
           res = res.data
@@ -366,6 +496,7 @@ export default {
             });
           }
         })
+        this.productConfig.formula.splice(index, 1)
 
       } else {
         if (index > 0) {
@@ -415,8 +546,8 @@ export default {
 
       }
       console.log("else ,未配置")
-      this.productConfig.pcSpeId = val.id;
-      this.productConfig.pcSepcName = val.specName;
+      this.productConfig.pcSpeId = val['id'];
+      this.productConfig.pcSepcName = val['specName'];
 
     },
 
@@ -432,9 +563,9 @@ export default {
       if (this.screenWidth < 991) {
         return "90%";
       } else if (this.screenWidth < 1400) {
-        return "45%";
+        return "60%";
       } else {
-        return "1100px";
+        return "1400px";
       }
     },
 
@@ -449,6 +580,8 @@ export default {
         res = res.data
         if (res.isSuccess) {
           this.materialData = res.data
+          console.log("原材料列表为"+JSON.stringify(this.materialData))
+
         }
       })
     },

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/goods/goodsManage/specManage.vue

@@ -282,7 +282,6 @@ export default {
 
     formulaSuccess() {
       //更新配方的工艺配置状态
-
       this.getSpecList(this.goodsId);
     },
 

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/MaterialMgr.vue

@@ -90,10 +90,10 @@
                          prop="mtRepWar"
                          width="">
           <template slot-scope="scope">
-             <span v-if="scope.row.mtrResidue>20">
+             <span v-if="scope.row.mtrResidue>scope.row.residueWarn">
                 充足
              </span>
-            <span v-if="scope.row.mtrResidue<20">
+            <span v-if="scope.row.mtrResidue<=20">
                 不足
               </span>
           </template>

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/addMtr.vue

@@ -120,6 +120,8 @@ export default {
       this.equBarrel.mtrType = obj.mtType;
       this.equBarrel.mtrUnit = obj.mtUnit;
       this.equBarrel.mtrCode = obj.mtCode;
+      this.equBarrel.residueWarn = obj.mtRepWar;
+      this.equBarrel.residueWarn = obj.mtRepWar;
     },
 
 
@@ -196,7 +198,7 @@ export default {
         vm.update();
       } else {
         vm.save();
-      }      
+      }
     },
     save() {
       const vm = this;