fix: 1.生产工单size计算优化; 2.角色管理表格增加角色字段显示; 3.刀模版台账弹窗细节优化

.env.development

@@ -5,8 +5,8 @@ VUE_APP_TITLE = 宝绅-生产执行系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.3.181:8100'
-VUE_APP_BASE_API = 'http://192.168.3.181:8101'
+VUE_APP_BASE_API = 'http://192.168.3.181:8100'
+# VUE_APP_BASE_API = 'http://192.168.3.181:8101'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/views/mes/md/workunit/index.vue

@@ -159,6 +159,14 @@
           />
         </template>
       </el-table-column>
+      <!-- <el-table-column label="是否配送刀模版" align="center" prop="toolDelivery">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no_number"
+            :value="scope.row.toolDelivery"
+          />
+        </template>
+      </el-table-column> -->
       <el-table-column label="固化时间" align="center" prop="solidifyTime" />
       <el-table-column
         label="加工处理最小厚度"
@@ -489,12 +497,16 @@
               :rules="rules"
               label-width="120px"
             >
-            <el-form-item label="配送刀模版">
-              <el-radio-group v-model="form.toolDelivery">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
+            <!-- <el-form-item label="是否配送刀模版">
+              <el-radio-group v-model="form.toolDelivery" @input="handleToolDeliveryChange">
+                <el-radio
+                    v-for="dict in dict.type.sys_yes_no_number"
+                    :key="dict.value"
+                    :label="Number(dict.value)"
+                    >{{ dict.label }}</el-radio
+                  >
               </el-radio-group>
-            </el-form-item>
+            </el-form-item> -->
           </el-form>
           </el-col>
         </el-row>
@@ -600,7 +612,7 @@ import { genCode } from "@/api/system/autocode/rule";
 export default {
   name: "Workunit",
   components: { WorkstationSelect },
-  dicts: ["sys_yes_no"],
+  dicts: ["sys_yes_no", "sys_yes_no_number"],
   data() {
     return {
       optType: undefined,
@@ -836,6 +848,11 @@ export default {
         this.form.workunitCode = null;
       }
     },
+    handleToolDeliveryChange(val) {
+      updateWorkunit(this.form).then((response) => {
+        this.$modal.msgSuccess("修改成功");
+      });
+    }
   },
 };
 </script>

src/views/mes/pro/workorder/proofingInfo.vue

@@ -321,7 +321,6 @@
           </el-col> -->
         </el-row>
       </el-form>
-
       <el-tabs type="border-card" @tab-click="tabClick">
         <el-tab-pane label="BOM">
           <ProogingBom ref="ProogingBomRef" />
@@ -554,10 +553,10 @@ export default {
         console.log('this.currentData', this.currentData)
         this.currentData.saleDirectiveList = this.$refs["WorkOrderSaleRef"].tableData
         this.form.quantity = quantity
+        this.handleChangeQuantity()
       }
     },
     handleChangeQuantity() {
-    // console.log(quantity);
       // 计算补单的时候 数量变更修改
       if (this.mode === 'make') {
         // this.form.quantity

src/views/mes/tm/tool/index.vue

@@ -362,7 +362,7 @@
         label-width="120px"
       >
         <el-row>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="刀模版具类型" prop="toolTypeId">
               <el-select
                 style="width: 100%"
@@ -378,7 +378,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="物料编码" prop="sapItemCode">
               <el-input v-model="form.sapItemCode" placeholder="请选择物料编码">

vue.config.js

@@ -37,8 +37,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://localhost:8080`,
-        // target: `http://192.168.3.181:8100`,
-        target: `http://192.168.3.181:8101`,
+        target: `http://192.168.3.181:8100`,
+        // target: `http://192.168.3.181:8101`,
         // target: `http://192.168.4.122:8080`,
         changeOrigin: true,
         pathRewrite: {