luobang 2 anos atrás
pai
commit
46f5c36d1a

+ 2 - 2
build/utils.js

@@ -16,8 +16,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
-// let devModules = ['all']
-let devModules = ['index', 'statisticalReport']
+let devModules = ['all']
+// let devModules = ['index', 'statisticalReport']
 // let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']

+ 53 - 5
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -937,12 +937,23 @@
               <span>状态更新时间:</span>
               <span>{{ steelMap.orderStatusTime }}</span>
             </div>
-            <div class="steelMapClass43" v-if="steelMap.orderNo != null">
-              <span>备注:</span>
+          </div>
+          <div class="steelMapClass9">
+            <div
+              class="steelMapClass92"
+              v-if="
+                steelMap.orderNo != null && !notRoutList.includes('closeOrder')
+              "
+            >
               <el-input
-                style="width:300px"
                 v-model="steelMap.remark"
-                placeholder="填写备注">
+                placeholder="填写备注"
+                class="steelMapClass921"
+              >
+                <template slot="prepend">备注</template>
+                <template slot="prefix">
+                  {{ steelMap.remark }}
+                </template>
               </el-input>
             </div>
           </div>
@@ -1416,7 +1427,7 @@
               <span>状态更新时间:</span>
               <span>{{ steelMap.orderStatusTime }}</span>
             </div>
-             <div class="steelMapClass43" v-if="steelMap.orderNo != null">
+            <div class="steelMapClass43" v-if="steelMap.orderNo != null">
               <span>备注:</span>
               <span>{{ steelMap.remark }}</span>
             </div>
@@ -4639,6 +4650,43 @@ export default {
           }
         }
       }
+      .steelMapClass9 {
+        margin-top: 20px;
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: flex-start;
+        font-size: 16px;
+        .steelMapClass92 {
+          margin-left: 50px;
+          margin-right: 10px;
+          .steelMapClass921 {
+            text-align: start;
+            min-width: 250px;
+            .el-input {
+              width: auto;
+            }
+            /deep/ .el-input__prefix {
+              display: inline-block;
+              position: relative;
+              border: 1px solid #dcdfe6;
+              box-sizing: border-box;
+              color: #606266;
+              font-size: inherit;
+              height: 40px;
+              line-height: 40px;
+              padding: 0 30px;
+              transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+              padding-left: 30px;
+              left: 0;
+              visibility: hidden;
+            }
+            /deep/ .el-input__inner {
+              position: absolute;
+            }
+          }
+        }
+      }
       .steelMapClass6 {
         margin-top: 20px;
         display: flex;