修改优化

src/views/basicData/equipmentTMR/index.vue

@@ -363,7 +363,7 @@ export default {
       const item = obj.tclassid;
       this.table.temp.tclassname = this.typeList.find(obj => obj.value == item).label
       // 如果是固定或小料 则无需设置速度必填
-      if(item == '2' || item.value == '4' ){
+      if(item == '2' || item == '4' ){
         obj.isSpeed = true;
         obj.speed=0;
         obj.volume_rate=0;

src/views/formulationPlan/dhedFormula/index.vue

@@ -453,7 +453,7 @@
                     <span>{{ scope.row.standard }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="奶牛需要" min-width="130px" align="center">
+                <el-table-column label="羊只需要" min-width="130px" align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.cowneed }}</span>
                   </template>

src/views/formulationPlan/recipeTemplate/index.vue

@@ -164,8 +164,8 @@
                 <el-button v-if="row.isUpdateSave && isRoleEdit" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
                 <span v-if="row.isUpdateSave && isRoleEdit" class="centerSpan">|</span>
                 <el-button v-if="row.isUpdateSave && isRoleEdit" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
-                <!-- <span v-if="row.NoEdit && isRoleEdit && ispastureuse ==0" icon="el-icon-data-line" class="centerSpan">|</span>
-                <el-button v-if="row.NoEdit && isRoleEdit && ispastureuse==0" icon="el-icon-data-line" class="miniSuccess" @click="handleFormulationEvaluation(row)" /> -->
+                <span v-if="row.NoEdit && isRoleEdit && ispastureuse ==0" icon="el-icon-data-line" class="centerSpan">|</span>
+                <el-button v-if="row.NoEdit && isRoleEdit && ispastureuse==0" icon="el-icon-data-line" class="miniSuccess" @click="handleFormulationEvaluation(row)" />
               </template>
             </el-table-column>
           </el-table>

src/views/statisticalAnalysis/formulationEvaluation/index.vue

@@ -277,125 +277,125 @@
             </el-table-column>
             <el-table-column label="羊只数" min-width="100px" align="center" prop="ccount" />
             <el-table-column label="干物质(kg)" min-width="130px" align="center">
-              <el-table-column prop="dry-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="dry-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="dry-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="dry-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="dry-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <!-- <el-table-column label="产奶净能(M)" min-width="130px" align="center">
-              <el-table-column prop="nm-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="nm-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="nm-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="nm-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="nm-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="奶牛能量单位(NND)" min-width="130px" align="center">
-              <el-table-column prop="nuint-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="nuint-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="nuint-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="nuint-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="nuint-S" label="采食量" min-width="58" align="center" />
             </el-table-column> -->
             <el-table-column label="粗蛋白(g)" min-width="130px" align="center">
-              <el-table-column prop="cp-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cp-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="cp-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="cp-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="cp-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="磷(g)" min-width="130px" align="center">
-              <el-table-column prop="p-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="p-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="p-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="p-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="p-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <!-- <el-table-column label="产奶净能(MCal/DM)" min-width="130px" align="center">
-              <el-table-column prop="nmd-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="nmd-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="nmd-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="nmd-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="nmd-S" label="采食量" min-width="58" align="center" />
             </el-table-column> -->
             <el-table-column label="粗蛋白(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cpd-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cpd-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="cpd-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="cpd-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="cpd-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="脂肪(%DM)" min-width="130px" align="center">
-              <el-table-column prop="fat-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="fat-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="fat-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="fat-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="fat-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="淀粉(%DM)" min-width="130px" align="center">
-              <el-table-column prop="starch-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="starch-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="starch-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="starch-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="starch-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="NDF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="ndf-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="ndf-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="ndf-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="ndf-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="ndf-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="粗料中的NDF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cndf-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cndf-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="cndf-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="cndf-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="cndf-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="ADF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="adf-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="adf-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="adf-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="adf-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="adf-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="钙(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cad-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cad-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="cad-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="cad-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="cad-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="磷(%DM)" min-width="130px" align="center">
-              <el-table-column prop="pd-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="pd-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="pd-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="pd-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="pd-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="(4.0)饲料转化效率(kg/DM)" min-width="130px" align="center">
-              <el-table-column prop="trans4f-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="trans4f-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="trans4f-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="trans4f-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="trans4f-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="(3.5)饲料转化效率(kg/DM)" min-width="130px" align="center">
-              <el-table-column prop="trans35f-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="trans35f-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="trans35f-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="trans35f-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="trans35f-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="精粗比(%)" min-width="130px" align="center">
-              <el-table-column prop="jcrate-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="jcrate-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="jcrate-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="jcrate-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="jcrate-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="日粮成本(元)" min-width="130px" align="center">
-              <el-table-column prop="uprice-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="uprice-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="uprice-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="uprice-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="uprice-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="干物质成本(元/公斤)" min-width="130px" align="center">
-              <el-table-column prop="upriced-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="upriced-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="upriced-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="upriced-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="upriced-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
-            <el-table-column label="日公斤奶成本(元)" min-width="130px" align="center">
-              <el-table-column prop="kprice-nur" label="奶牛需要" min-width="70" align="center" />
+            <!-- <el-table-column label="日公斤奶成本(元)" min-width="130px" align="center">
+              <el-table-column prop="kprice-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="kprice-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="kprice-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="kprice-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
         </div>
       </div>

src/views/statisticalAnalysis/formulationEvaluation/index备.vue

@@ -267,121 +267,121 @@
             </el-table-column>
             <el-table-column label="牛头数" min-width="100px" align="center" prop="ccount" />
             <el-table-column label="干物质(kg)" min-width="130px" align="center">
-              <el-table-column prop="dry-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="dry-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="dry-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="dry-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="dry-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="产奶净能(M)" min-width="130px" align="center">
-              <el-table-column prop="nm-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="nm-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="nm-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="nm-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="nm-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="奶牛能量单位(NND)" min-width="130px" align="center">
-              <el-table-column prop="nuint-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="nuint-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="nuint-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="nuint-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="nuint-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="粗蛋白(g)" min-width="130px" align="center">
-              <el-table-column prop="cp-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cp-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="cp-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="cp-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="cp-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="磷(g)" min-width="130px" align="center">
-              <el-table-column prop="p-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="p-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="p-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="p-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="p-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="产奶净能(MCal/DM)" min-width="130px" align="center">
-              <el-table-column prop="nmd-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="nmd-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="nmd-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="nmd-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="nmd-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="粗蛋白(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cpd-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cpd-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="cpd-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="cpd-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="cpd-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="脂肪(%DM)" min-width="130px" align="center">
-              <el-table-column prop="fat-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="fat-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="fat-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="fat-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="fat-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="淀粉(%DM)" min-width="130px" align="center">
-              <el-table-column prop="starch-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="starch-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="starch-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="starch-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="starch-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="NDF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="ndf-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="ndf-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="ndf-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="ndf-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="ndf-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="粗料中的NDF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cndf-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cndf-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="cndf-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="cndf-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="cndf-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="ADF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="adf-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="adf-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="adf-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="adf-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="adf-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="钙(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cad-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cad-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="cad-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="cad-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="cad-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="磷(%DM)" min-width="130px" align="center">
-              <el-table-column prop="pd-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="pd-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="pd-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="pd-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="pd-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="(4.0)饲料转化效率(kg/DM)" min-width="130px" align="center">
-              <el-table-column prop="trans4f-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="trans4f-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="trans4f-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="trans4f-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="trans4f-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="(3.5)饲料转化效率(kg/DM)" min-width="130px" align="center">
-              <el-table-column prop="trans35f-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="trans35f-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="trans35f-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="trans35f-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="trans35f-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="精粗比(%)" min-width="130px" align="center">
-              <el-table-column prop="jcrate-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="jcrate-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="jcrate-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="jcrate-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="jcrate-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="日粮成本(元)" min-width="130px" align="center">
-              <el-table-column prop="uprice-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="uprice-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="uprice-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="uprice-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="uprice-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="干物质成本(元/公斤)" min-width="130px" align="center">
-              <el-table-column prop="upriced-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="upriced-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="upriced-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="upriced-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="upriced-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
             <el-table-column label="日公斤奶成本(元)" min-width="130px" align="center">
-              <el-table-column prop="kprice-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="kprice-nur" label="羊只需要" min-width="70" align="center" />
               <el-table-column prop="kprice-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="kprice-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="kprice-S" label="采食量" min-width="58" align="center" />