Merge remote-tracking branch 'origin/master'

src/views/sync/SysUdimsConfig.vue

@@ -371,9 +371,10 @@
                 prop="action"
                 show-overflow-tooltip
               ></el-table-column>
-              <el-table-column width="250" label="单据状态">
+              <el-table-column width="180" label="单据状态">
                 <template slot-scope="scope">
                   <el-select
+                    style="width: 80%"
                     v-model="scope.row.orderStatus"
                     placeholder="请选择单据状态"
                   >
@@ -384,6 +385,28 @@
                   </el-select>
                 </template>
               </el-table-column>
+
+              <el-table-column width="180" label="目标单据状态">
+                <template slot-scope="scope">
+                  <el-select style="width: 90%"
+                             v-model="scope.row.syncStatus"
+                  >
+                    <el-option label="草稿" :value="1">草稿</el-option>
+                    <el-option label="待审核" :value="3">待审核</el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+
+              <el-table-column width="180" label="是否自动补单">
+                <template slot-scope="scope">
+                  <el-select style="width: 90%"
+                             v-model="scope.row.syncChange"
+                  >
+                    <el-option label="是" :value="true">是</el-option>
+                    <el-option label="否" :value="false">否</el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
               <el-table-column label="操作" fixed="right">
                 <template slot-scope="scope">
                   <el-button
@@ -465,9 +488,10 @@
                 prop="action"
                 show-overflow-tooltip
               ></el-table-column>
-              <el-table-column width="250" label="单据状态">
+              <el-table-column width="180" label="单据状态">
                 <template slot-scope="scope">
                   <el-select
+                    style="width: 80%"
                     v-model="scope.row.orderStatus"
                     placeholder="请选择单据状态"
                   >
@@ -478,6 +502,29 @@
                   </el-select>
                 </template>
               </el-table-column>
+
+              <el-table-column width="180" label="目标单据状态">
+                <template slot-scope="scope">
+                  <el-select style="width: 90%"
+                             v-model="scope.row.syncStatus"
+                  >
+                    <el-option label="草稿" :value="1">草稿</el-option>
+                    <el-option label="待审核" :value="3">待审核</el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+
+              <el-table-column width="180" label="是否自动补单">
+                <template slot-scope="scope">
+                  <el-select style="width: 90%"
+                             v-model="scope.row.syncChange"
+                  >
+                    <el-option label="是" :value="true">是</el-option>
+                    <el-option label="否" :value="false">否</el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+
               <el-table-column label="操作" fixed="right">
                 <template slot-scope="scope">
                   <el-button
@@ -876,6 +923,8 @@ export default {
       selectData.forEach((obj) => {
         obj.outChange = false;
         obj.orderStatus = 7;
+        obj.syncStatus = 3;
+        obj.syncChange = false;
         obj.direct = 2;
         let isPut = true;
         for (let i = 0; i < this.checkedToInBusTypes.length; i++) {
@@ -894,6 +943,8 @@ export default {
         obj.outChange = false;
         obj.direct = 1;
         obj.orderStatus = 7;
+        obj.syncStatus = 3;
+        obj.syncChange = false;
         let isPut = true;
         for (let i = 0; i < this.checkedBusTypes.length; i++) {
           if (this.checkedBusTypes[i].action == obj.action) {