加工单调整 细码单调整

src/views/base/work-detail.vue

@@ -96,10 +96,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="卷长（米/卷）" prop="rollLength">
+            <el-form-item label="卷长" prop="rollLength">
               <el-input-number v-model="formModel.rollLength" :min="0"></el-input-number>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否取整" prop="isInteger">
+              <el-switch v-model="formModel.isInteger" active-color="#13ce66" inactive-color="#ff4949" active-text="整数" inactive-text="小数"></el-switch>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="formModel.remark" placeholder="请输入备注" style="width:93%"></el-input>

src/views/base/work-list.vue

@@ -49,10 +49,14 @@
       <el-table-column prop="name" label="品种及规格" width="180"></el-table-column>
       <el-table-column prop="width" label="幅宽" width="180"></el-table-column>
       <el-table-column prop="colour" label="色泽" width="180"></el-table-column>
-      <el-table-column prop="tagOperator" label="挂码运算" width="180"></el-table-column>
-      <el-table-column prop="tagFactor" label="挂码系数" width="180"></el-table-column>
+      <el-table-column prop="tagOperator" label="挂码" width="180"></el-table-column>
+      <!-- <el-table-column prop="tagFactor" label="挂码系数" width="180"></el-table-column> -->
       <el-table-column prop="totalStock" label="总卷数" width="180"></el-table-column>
-      <el-table-column prop="totalLength" label="总长度" width="180"></el-table-column>
+      <el-table-column prop="totalLength" label="总长度" width="180">
+        <template slot-scope="{row}">
+          {{ row.totalLength }} {{ row.tagUnit }}
+        </template>
+      </el-table-column>
       <el-table-column prop="processDate" label="投坯日" width="180"></el-table-column>
       <el-table-column prop="processVolume" label="投坯数" width="180"></el-table-column>
       <el-table-column prop="ratio" label="伸长率" width="180"></el-table-column>
@@ -61,7 +65,7 @@
       <el-table-column prop="reason" label="原因" width="180"></el-table-column>
       <el-table-column prop="clothPrice" label="坯布价" width="180"></el-table-column>
       <el-table-column prop="wages" label="力资（元/卷）" width="180"></el-table-column>
-      <el-table-column prop="rollLength" label="卷长（米/卷）" width="180"></el-table-column>
+      <el-table-column prop="rollLength" label="卷长" width="180"></el-table-column>
       <el-table-column prop="remark" label="备注"></el-table-column>
       <el-table-column label="操作" fixed="right" width="290px">
         <template slot-scope="{row}">

src/views/base/work-xmd.vue

@@ -12,14 +12,14 @@
           <td>订单号：{{dataNumber}}</td>
           <td>品名：{{dataName}}</td>
           <td>幅宽：{{dataWidth}}</td>
-          <td>单位：米</td>
+          <td>单位：{{dataUnit}}</td>
         </tr>
       </table>
       <el-table :data="dataList" style="min-height:400px;" v-loading="loading" stripe>
         <el-table-column prop="sort" label="序号"></el-table-column>
-        <el-table-column prop="length" label="米数"></el-table-column>
+        <el-table-column prop="length" label="长度"></el-table-column>
       </el-table>
-      <div>件数：{{totalCount}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;米数：{{totalLength}}</div>
+      <div>件数：{{totalCount}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;长度：{{totalLength}}</div>
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="closeDialog">关 闭</el-button>
@@ -41,6 +41,7 @@ export default {
       dataNumber: "",
       dataName: "",
       dataWidth: "",
+      dataUnit: "",
       dataList: [],
       totalCount: "",
       totalLength: ""
@@ -87,6 +88,7 @@ export default {
         self.dataNumber = jsonData.data.number;
         self.dataName = jsonData.data.name;
         self.dataWidth = jsonData.data.width;
+        self.dataUnit = jsonData.data.unit;
         self.dataList = jsonData.data.list;
         self.totalCount = jsonData.data.totalCount;
         self.totalLength = jsonData.data.totalLength;